Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4615] trunk/plugins/VeraControl
|
From: <ba...@us...> - 2013-08-13 09:30:52
|
Revision: 4615
http://sourceforge.net/p/mp-plugins/code/4615
Author: bartev
Date: 2013-08-13 09:30:50 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/DevCategories.cs
trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
trunk/plugins/VeraControl/VeraBox.cs
trunk/plugins/VeraControl/VeraControl.cs
trunk/plugins/VeraControl/skin/Default/VeraControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
Added Paths:
-----------
trunk/plugins/VeraControl/skin/Titan/
trunk/plugins/VeraControl/skin/Titan/VeraControl.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogSceneControl.xml
Modified: trunk/plugins/VeraControl/DevCategories.cs
===================================================================
--- trunk/plugins/VeraControl/DevCategories.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/DevCategories.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -62,9 +62,9 @@
public string GetIconName()
- {
+ { //reference : http://wiki.micasaverde.com/index.php/Luup_UPNP_Files#Device_Categories
switch (id)
- {
+ {
case 1: // Interface
return "USB_UIRT";
Modified: trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -14,7 +14,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Bart Eversdijk")]
[assembly: AssemblyProduct("VeraControl")]
-[assembly: AssemblyCopyright("Copyright 2012")]
+[assembly: AssemblyCopyright("Copyright 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -28,4 +28,4 @@
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
Modified: trunk/plugins/VeraControl/VeraBox.cs
===================================================================
--- trunk/plugins/VeraControl/VeraBox.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/VeraBox.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -403,7 +403,7 @@
} else {
_status.system.SetFullReloadFlag();
- // catids: http://wiki.micasaverde.com/index.php/Luup_UPNP_Files
+ // catids: http://wiki.micasaverde.com/index.php/Luup_UPNP_Files#Device_Categories
switch (xn.Attributes["category"].Value)
{
//case "1": // TODO: Implement interface device ?
Modified: trunk/plugins/VeraControl/VeraControl.cs
===================================================================
--- trunk/plugins/VeraControl/VeraControl.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/VeraControl.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -30,7 +30,7 @@
using System.Windows;
using MediaPortal.Common.Utils;
-[assembly: CompatibleVersion("1.1.6.27644")]
+[assembly: CompatibleVersion("1.3.100.0","1.1.6.27644")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
@@ -93,11 +93,11 @@
[SkinControlAttribute(33)] protected GUILabelControl _deviceStatusText = null;
[SkinControl(500)] protected GUIButtonControl _actionVeraSelectButton = null;
- [SkinControl(501)] protected GUIToggleButtonControl _actionTriggerButton = null;
+ [SkinControl(501)] protected GUICheckButton _actionTriggerButton = null;
[SkinControl(502)] protected GUIButtonControl _actionSceneEditButton = null;
[SkinControl(503)] protected GUIButtonControl _actionFilterButton = null;
[SkinControl(504)] protected GUIButtonControl _actionSortButton = null;
- [SkinControl(505)] protected GUIToggleButtonControl _actionAutoRoomButton = null;
+ [SkinControl(505)] protected GUICheckButton _actionAutoRoomButton = null;
[SkinControl(506)] protected GUIButtonControl _actionViewButton = null;
@@ -126,7 +126,7 @@
private VeraFilterStyle _selectedFilterOption = VeraFilterStyle.NONE;
private bool [] _lastUpdateFailed = new bool[100];
- private string _titleTxt = "Micasa Verde - Vera control";
+ private string _titleTxt = "Selected: ";
private SortItem [] _sortOptions = new SortItem [] {
new SortItem(VeraSortStyle.NO, "No Sorting, keep Vera's sorting", "No"),
@@ -296,7 +296,7 @@
OnActionSceneEditButton((GUIButtonControl)control);
if (control == _actionTriggerButton)
- OnActionTrigger((GUIToggleButtonControl)control);
+ OnActionTrigger((GUICheckButton)control);
if(control == _actionVeraSelectButton)
{
@@ -313,7 +313,7 @@
OnActionSortButton((GUIButtonControl)control);
if (control == _actionAutoRoomButton)
- OnActionAutoRoomButton((GUIToggleButtonControl)control);
+ OnActionAutoRoomButton((GUICheckButton)control);
if (control == _actionViewButton)
OnActionViewButton((GUIButtonControl)control);
@@ -1105,7 +1105,7 @@
} else {
_flowList.SelectedListItemIndex = 0;
}
- _title.Label = _titleTxt + " - Scenes";
+ _title.Label = _titleTxt + "Scenes";
}
private void FillinSceneInfo(GUIListItem item, Scene scene)
@@ -1144,7 +1144,7 @@
}
}
}
- _title.Label = _titleTxt + " - " + _vera.GetRoomById(selectedRoom).name;
+ _title.Label = _titleTxt + _vera.GetRoomById(selectedRoom).name;
}
private void ListDevicesPerCategory(int selectedCategory)
@@ -1182,7 +1182,7 @@
}
}
}
- _title.Label = _titleTxt + " - " + _vera.GetCategoryById(selectedCategory).name;
+ _title.Label = _titleTxt + _vera.GetCategoryById(selectedCategory).name;
}
private void FillinDeviceInfo(GUIListItem item, DeviceGeneric dev)
@@ -1324,7 +1324,7 @@
}
}
- private void OnActionTrigger(GUIToggleButtonControl control)
+ private void OnActionTrigger(GUICheckButton control)
{
_enableSceneTrigger = control.Selected;
@@ -1480,7 +1480,7 @@
}
}
- private void OnActionAutoRoomButton(GUIToggleButtonControl control)
+ private void OnActionAutoRoomButton(GUICheckButton control)
{
_autoSelectRoom = control.Selected;
Modified: trunk/plugins/VeraControl/skin/Default/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -9,17 +9,20 @@
<id>1</id>
<posX>0</posX>
<posY>0</posY>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>background.png</texture>
</control>
+
+<import>common.time.xml</import>
+<import>common.window.xml</import>
<control>
<description>an Image</description>
<type>image</type>
<id>2</id>
- <posX>10</posX>
- <posY>320</posY>
+ <posX>120</posX>
+ <posY>520</posY>
<width>150</width>
<height>180</height>
<texture>hover_remote.png</texture>
@@ -29,9 +32,9 @@
<type>image</type>
<id>30</id>
<posX>300</posX>
- <posY>530</posY>
- <width>20</width>
- <height>20</height>
+ <posY>650</posY>
+ <width>25</width>
+ <height>25</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -41,7 +44,7 @@
<type>label</type>
<id>31</id>
<posX>320</posX>
- <posY>530</posY>
+ <posY>650</posY>
<label></label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -51,9 +54,9 @@
<type>image</type>
<id>32</id>
<posX>300</posX>
- <posY>500</posY>
- <width>20</width>
- <height>20</height>
+ <posY>620</posY>
+ <width>25</width>
+ <height>25</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -63,7 +66,7 @@
<type>label</type>
<id>33</id>
<posX>320</posX>
- <posY>500</posY>
+ <posY>620</posY>
<label></label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -74,7 +77,7 @@
<type>actiongroup</type>
<visible>!Control.HasFocus(200)</visible>
<dimColor>00ffffff</dimColor>
- <width>263</width>
+ <width>960</width>
<height>473</height>
<buttonX>0</buttonX>
<buttonY>0</buttonY>
@@ -88,28 +91,28 @@
<type>image</type>
<posX>15</posX>
<posY>63</posY>
- <width>206</width>
+ <width>290</width>
<height>472</height>
<texture>Backslide.png</texture>
<colorDiffuse>fffffffff</colorDiffuse>
<visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
- <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
- <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
</control>
<control>
<description>group element</description>
<type>group</type>
<visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
+ <posX>37</posX>
+ <posY>121</posY>
<layout>StackLayout</layout>
- <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
- <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
<control>
<id>500</id>
<description>Box Selector</description>
<type>button</type>
- <onup>505</onup>
+ <onup>506</onup>
<ondown>501</ondown>
<onright>40</onright>
<label>Box:</label>
@@ -117,15 +120,11 @@
<control>
<id>501</id>
<description>Enable disable scene triggers</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>500</onup>
<ondown>502</ondown>
<onright>40</onright>
<label>Scene Triggers</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>502</id>
@@ -157,15 +156,11 @@
<control>
<id>505</id>
<description>Instant Update Room List</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>504</onup>
<ondown>506</ondown>
<onright>40</onright>
<label>Show list on focus</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>506</id>
@@ -189,7 +184,7 @@
<id>20</id>
<label>Section:</label>
<posX>30</posX>
- <posY>55</posY>
+ <posY>75</posY>
<onleft>500</onleft>
<onright>50</onright>
<ondown>40</ondown>
@@ -209,8 +204,8 @@
<showrange>no</showrange>
<reverse>no</reverse>
<cycleItems>yes</cycleItems>
- <height>34</height>
- <width>250</width>
+ <height>40</height>
+ <width>300</width>
<font>font12</font>
<shadowAngle>45</shadowAngle>
<shadowDistance>1</shadowDistance>
@@ -236,9 +231,9 @@
<type>listcontrol</type>
<id>40</id>
<posX>30</posX>
- <posY>85</posY>
- <height>300</height>
- <width>250</width>
+ <posY>150</posY>
+ <height>430</height>
+ <width>400</width>
<spinx>300</spinx>
<onup>20</onup>
<ondown>20</ondown>
@@ -261,74 +256,35 @@
<keepaspectratio>yes</keepaspectratio>
</control>
</control>
+ <control>
+ <description>Cover Flow view</description>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="550" start="1960,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1960,0">WindowClose</animation>
- <control>
- <description>Cover Flow view</description>
<type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
<id>41</id>
<posX>0</posX>
<posY>160</posY>
- <width>720</width>
+ <width>950</width>
<height>576</height>
<onup>20</onup>
- <onleft>500</onleft>
- <selectedCard>0</selectedCard>
- <cardWidth>270</cardWidth>
- <cardHeight>270</cardHeight>
- <angle>65</angle>
- <sideShift>200</sideShift>
+ <onleft>500</onleft>
+ <cardWidth>270</cardWidth>
+ <cardHeight>270</cardHeight>
+ <sideShift>380</sideShift>
<sideGap>90</sideGap>
- <sideDepth>400</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <backgroundDiffuse>FF000000</backgroundDiffuse>
- <background>-</background>
- <showBackground>no</showBackground>
- <foregroundHeight>576</foregroundHeight>
- <foregroundWidth>720</foregroundWidth>
- <foregroundX>0</foregroundX>
- <foregroundY>0</foregroundY>
- <foregroundDiffuse>FF000000</foregroundDiffuse>
- <foreground>coverflow_foreground.png</foreground>
- <showForeground>no</showForeground>
- <showFrame>no</showFrame>
- <frame>Picture_cover2.png</frame>
- <frameFocus>Picture_cover2.png</frameFocus>
- <frameWidth>270</frameWidth>
- <frameHeight>270</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix>[</folderPrefix>
- <folderSuffix>]</folderSuffix>
- <font1>font15</font1>
- <font2>font10</font2>
- <label1>...</label1>
- <label2></label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>-30</label1YOff>
- <label2YOff>330</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>bar_hor.png</scrollbarBackground>
- <scrollbarLeft>mouse_left_horizontal.png</scrollbarLeft>
- <scrollbarRight>mouse_right_horizontal.png</scrollbarRight>
- <scrollbarYOff>285</scrollbarYOff>
- <showScrollbar>no</showScrollbar>
- <cards mask="Picturethumbmask.png">Picturethumbmask.png</cards>
- </control>
+ <sideDepth>550</sideDepth>
+ <angle>65</angle>
+ <selectedOffsetY>120</selectedOffsetY>
+ <offsetY>160</offsetY>
+ <label1YOff>-3000</label1YOff>
+ <font1>font14</font1>
+ <showScrollbar>no</showScrollbar>
+ <showFrame>no</showFrame>
+ </control>
-
-
<control>
<description>group element</description>
<type>group</type>
@@ -341,10 +297,10 @@
<description>right control</description>
<type>listcontrol</type>
<id>50</id>
- <posX>300</posX>
- <posY>55</posY>
- <height>460</height>
- <width>300</width>
+ <posX>500</posX>
+ <posY>150</posY>
+ <height>500</height>
+ <width>400</width>
<onleft>40</onleft>
<onright>500</onright>
<scrollOffset>5</scrollOffset>
@@ -372,10 +328,12 @@
<control>
<type>label</type>
- <posX>200</posX>
- <posY>17</posY>
+ <posX>20</posX>
+ <posY>10</posY>
<label>Micasa Verde - Vera control</label>
<id>10</id>
+ <font>font11</font>
+ <textcolor>ff6FAFE1</textcolor>
</control>
</controls>
</window>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -9,8 +9,8 @@
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -18,26 +18,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -56,8 +56,8 @@
<description>Play label</description>
<type>label</type>
<id>0</id>
- <posX>280</posX>
- <posY>130</posY>
+ <posX>380</posX>
+ <posY>170</posY>
<label>2553</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -66,8 +66,8 @@
<description>Paused label</description>
<type>label</type>
<id>0</id>
- <posX>370</posX>
- <posY>130</posY>
+ <posX>470</posX>
+ <posY>170</posY>
<label>19011</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -76,8 +76,8 @@
<description>Resume label</description>
<type>label</type>
<id>0</id>
- <posX>460</posX>
- <posY>130</posY>
+ <posX>560</posX>
+ <posY>170</posY>
<label>732</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -86,8 +86,8 @@
<description>Stop label</description>
<type>label</type>
<id>0</id>
- <posX>550</posX>
- <posY>130</posY>
+ <posX>650</posX>
+ <posY>170</posY>
<label>2552</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -99,8 +99,8 @@
<description>Music label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>160</posY>
+ <posX>260</posX>
+ <posY>200</posY>
<label>249</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -109,8 +109,8 @@
<control>
<description>Music started</description>
<id>20</id>
- <posX>280</posX>
- <posY>160</posY>
+ <posX>380</posX>
+ <posY>200</posY>
<onleft>23</onleft>
<onright>21</onright>
<onup>50</onup>
@@ -140,8 +140,8 @@
<control>
<description>Music paused</description>
<id>21</id>
- <posX>370</posX>
- <posY>160</posY>
+ <posX>470</posX>
+ <posY>200</posY>
<onup>51</onup>
<ondown>26</ondown>
<onleft>20</onleft>
@@ -171,8 +171,8 @@
<control>
<description>Music resumed</description>
<id>22</id>
- <posX>460</posX>
- <posY>160</posY>
+ <posX>560</posX>
+ <posY>200</posY>
<onup>52</onup>
<ondown>27</ondown>
<onleft>21</onleft>
@@ -202,8 +202,8 @@
<control>
<description>Music stopped</description>
<id>23</id>
- <posX>550</posX>
- <posY>160</posY>
+ <posX>650</posX>
+ <posY>200</posY>
<onup>2</onup>
<ondown>28</ondown>
<onleft>22</onleft>
@@ -235,8 +235,8 @@
<description>Video label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>190</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>291</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -244,8 +244,8 @@
<control>
<description>Video start</description>
<id>25</id>
- <posX>280</posX>
- <posY>190</posY>
+ <posX>380</posX>
+ <posY>230</posY>
<onup>20</onup>
<ondown>30</ondown>
<onleft>28</onleft>
@@ -275,8 +275,8 @@
<control>
<description>Video paused</description>
<id>26</id>
- <posX>370</posX>
- <posY>190</posY>
+ <posX>470</posX>
+ <posY>230</posY>
<onup>21</onup>
<ondown>31</ondown>
<onleft>25</onleft>
@@ -306,8 +306,8 @@
<control>
<description>Video resumed</description>
<id>27</id>
- <posX>460</posX>
- <posY>190</posY>
+ <posX>560</posX>
+ <posY>230</posY>
<onup>22</onup>
<ondown>32</ondown>
<onleft>26</onleft>
@@ -337,8 +337,8 @@
<control>
<description>Video stopped</description>
<id>28</id>
- <posX>550</posX>
- <posY>190</posY>
+ <posX>650</posX>
+ <posY>230</posY>
<onup>23</onup>
<ondown>33</ondown>
<onleft>27</onleft>
@@ -370,8 +370,8 @@
<description>TV label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>220</posY>
+ <posX>260</posX>
+ <posY>260</posY>
<label>605</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -379,8 +379,8 @@
<control>
<description>TV start</description>
<id>30</id>
- <posX>280</posX>
- <posY>220</posY>
+ <posX>380</posX>
+ <posY>260</posY>
<onup>25</onup>
<ondown>35</ondown>
<onleft>33</onleft>
@@ -410,8 +410,8 @@
<control>
<description>TV paused</description>
<id>31</id>
- <posX>370</posX>
- <posY>220</posY>
+ <posX>470</posX>
+ <posY>260</posY>
<onup>26</onup>
<ondown>36</ondown>
<onleft>30</onleft>
@@ -441,8 +441,8 @@
<control>
<description>TV resumed</description>
<id>32</id>
- <posX>460</posX>
- <posY>220</posY>
+ <posX>560</posX>
+ <posY>260</posY>
<onup>27</onup>
<ondown>37</ondown>
<onleft>31</onleft>
@@ -472,8 +472,8 @@
<control>
<description>TV stopped</description>
<id>33</id>
- <posX>550</posX>
- <posY>220</posY>
+ <posX>650</posX>
+ <posY>260</posY>
<onup>28</onup>
<ondown>38</ondown>
<onleft>32</onleft>
@@ -505,8 +505,8 @@
<description>Recordings label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>250</posY>
+ <posX>260</posX>
+ <posY>290</posY>
<label>652</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -514,8 +514,8 @@
<control>
<description>Recordings start</description>
<id>35</id>
- <posX>280</posX>
- <posY>250</posY>
+ <posX>380</posX>
+ <posY>290</posY>
<onup>30</onup>
<ondown>40</ondown>
<onleft>38</onleft>
@@ -545,8 +545,8 @@
<control>
<description>Recordings paused</description>
<id>36</id>
- <posX>370</posX>
- <posY>250</posY>
+ <posX>470</posX>
+ <posY>290</posY>
<onup>31</onup>
<ondown>41</ondown>
<onleft>35</onleft>
@@ -576,8 +576,8 @@
<control>
<description>Recordings resumed</description>
<id>37</id>
- <posX>460</posX>
- <posY>250</posY>
+ <posX>560</posX>
+ <posY>290</posY>
<onup>32</onup>
<ondown>42</ondown>
<onleft>36</onleft>
@@ -607,8 +607,8 @@
<control>
<description>Recordings stopped</description>
<id>38</id>
- <posX>550</posX>
- <posY>250</posY>
+ <posX>650</posX>
+ <posY>290</posY>
<onup>33</onup>
<ondown>43</ondown>
<onleft>37</onleft>
@@ -640,8 +640,8 @@
<description>Radio label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>280</posY>
+ <posX>260</posX>
+ <posY>320</posY>
<label>862</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -649,8 +649,8 @@
<control>
<description>Radio start</description>
<id>40</id>
- <posX>280</posX>
- <posY>280</posY>
+ <posX>380</posX>
+ <posY>320</posY>
<onup>35</onup>
<ondown>45</ondown>
<onleft>43</onleft>
@@ -680,8 +680,8 @@
<control>
<description>Radio paused</description>
<id>41</id>
- <posX>370</posX>
- <posY>280</posY>
+ <posX>470</posX>
+ <posY>320</posY>
<onup>36</onup>
<ondown>46</ondown>
<onleft>40</onleft>
@@ -711,8 +711,8 @@
<control>
<description>Radio resumed</description>
<id>42</id>
- <posX>460</posX>
- <posY>280</posY>
+ <posX>560</posX>
+ <posY>320</posY>
<onup>37</onup>
<ondown>47</ondown>
<onleft>41</onleft>
@@ -742,8 +742,8 @@
<control>
<description>Radio stopped</description>
<id>43</id>
- <posX>550</posX>
- <posY>280</posY>
+ <posX>650</posX>
+ <posY>320</posY>
<onup>38</onup>
<ondown>48</ondown>
<onleft>42</onleft>
@@ -775,8 +775,8 @@
<description>Unknown label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>310</posY>
+ <posX>260</posX>
+ <posY>350</posY>
<label>2014</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -784,8 +784,8 @@
<control>
<description>Unknown start</description>
<id>45</id>
- <posX>280</posX>
- <posY>310</posY>
+ <posX>380</posX>
+ <posY>350</posY>
<onup>40</onup>
<ondown>50</ondown>
<onleft>48</onleft>
@@ -815,8 +815,8 @@
<control>
<description>Unknown paused</description>
<id>46</id>
- <posX>370</posX>
- <posY>310</posY>
+ <posX>470</posX>
+ <posY>350</posY>
<onup>41</onup>
<ondown>51</ondown>
<onleft>45</onleft>
@@ -846,8 +846,8 @@
<control>
<description>Unknown resumed</description>
<id>47</id>
- <posX>460</posX>
- <posY>310</posY>
+ <posX>560</posX>
+ <posY>350</posY>
<onup>42</onup>
<ondown>52</ondown>
<onleft>46</onleft>
@@ -877,8 +877,8 @@
<control>
<description>Unknown stopped</description>
<id>48</id>
- <posX>550</posX>
- <posY>310</posY>
+ <posX>650</posX>
+ <posY>350</posY>
<onup>43</onup>
<ondown>100</ondown>
<onleft>47</onleft>
@@ -910,8 +910,8 @@
<description>Startup label</description>
<type>label</type>
<id>0</id>
- <posX>280</posX>
- <posY>340</posY>
+ <posX>380</posX>
+ <posY>380</posY>
<label>3017</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -920,8 +920,8 @@
<description>Sleep label</description>
<type>label</type>
<id>0</id>
- <posX>370</posX>
- <posY>340</posY>
+ <posX>470</posX>
+ <posY>380</posY>
<label>1032</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -930,8 +930,8 @@
<description>Exit label</description>
<type>label</type>
<id>0</id>
- <posX>460</posX>
- <posY>340</posY>
+ <posX>560</posX>
+ <posY>380</posY>
<label>1030</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -941,8 +941,8 @@
<description>MediaPortal label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>370</posY>
+ <posX>260</posX>
+ <posY>410</posY>
<label>MediaPortal</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -950,8 +950,8 @@
<control>
<description>MediaPortal start</description>
<id>50</id>
- <posX>280</posX>
- <posY>370</posY>
+ <posX>380</posX>
+ <posY>410</posY>
<onup>45</onup>
<ondown>20</ondown>
<onleft>100</onleft>
@@ -981,8 +981,8 @@
<control>
<description>MediaPortal Sleep</description>
<id>51</id>
- <posX>370</posX>
- <posY>370</posY>
+ <posX>470</posX>
+ <posY>410</posY>
<onup>46</onup>
<ondown>21</ondown>
<onleft>50</onleft>
@@ -1012,8 +1012,8 @@
<control>
<description>MediaPortal Exit</description>
<id>52</id>
- <posX>460</posX>
- <posY>370</posY>
+ <posX>560</posX>
+ <posY>410</posY>
<onup>47</onup>
<ondown>22</ondown>
<onleft>51</onleft>
@@ -1045,11 +1045,11 @@
<description>Store button</description>
<type>button</type>
<id>100</id>
- <posX>550</posX>
- <posY>360</posY>
+ <posX>620</posX>
+ <posY>445</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>37</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -8,26 +8,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -36,8 +36,8 @@
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -52,8 +52,8 @@
<control>
<type>image</type>
<id>5</id>
- <posX>510</posX>
- <posY>130</posY>
+ <posX>580</posX>
+ <posY>190</posY>
<width>100</width>
<height>200</height>
<texture>Vera\generic_sensor.png</texture>
@@ -63,8 +63,8 @@
<description>text label</description>
<type>label</type>
<id>6</id>
- <posX>180</posX>
- <posY>130</posY>
+ <posX>260</posX>
+ <posY>190</posY>
<label>Dit is een label!!!</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -73,8 +73,8 @@
<description>subtext label</description>
<type>label</type>
<id>7</id>
- <posX>180</posX>
- <posY>180</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>Dit is label 2</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -83,8 +83,8 @@
<description>subtext label</description>
<type>label</type>
<id>8</id>
- <posX>180</posX>
- <posY>210</posY>
+ <posX>260</posX>
+ <posY>270</posY>
<label>Dit is label 3</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -93,20 +93,19 @@
<control>
<type>image</type>
<id>30</id>
- <posX>180</posX>
- <posY>240</posY>
- <width>20</width>
- <height>20</height>
+ <posX>260</posX>
+ <posY>350</posY>
+ <width>30</width>
+ <height>30</height>
<texture></texture>
<visible>no</visible>
</control>
-
<control>
<description>commment label</description>
<type>label</type>
<id>31</id>
- <posX>200</posX>
- <posY>240</posY>
+ <posX>295</posX>
+ <posY>350</posY>
<label>comment</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -116,8 +115,8 @@
<description>Left button</description>
<type>button</type>
<id>10</id>
- <posX>180</posX>
- <posY>332</posY>
+ <posX>255</posX>
+ <posY>445</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -137,8 +136,8 @@
<description>Right button</description>
<type>button</type>
<id>11</id>
- <posX>440</posX>
- <posY>332</posY>
+ <posX>595</posX>
+ <posY>445</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -158,8 +157,8 @@
<description>Mode1 button</description>
<type>button</type>
<id>12</id>
- <posX>180</posX>
- <posY>300</posY>
+ <posX>255</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -179,8 +178,8 @@
<description>Mode2 button</description>
<type>button</type>
<id>13</id>
- <posX>310</posX>
- <posY>300</posY>
+ <posX>425</posX>
+ <posY>400</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -200,8 +199,8 @@
<description>Mode3 button</description>
<type>button</type>
<id>14</id>
- <posX>440</posX>
- <posY>300</posY>
+ <posX>595</posX>
+ <posY>400</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -222,8 +221,8 @@
<id>15</id>
<description>Dimmable Light</description>
<type>slider</type>
- <posX>330</posX>
- <posY>345</posY>
+ <posX>385</posX>
+ <posY>455</posY>
<spintype>Int</spintype>
<showrange>yes</showrange>
<textureSliderBar>osd_slider_bg.png</textureSliderBar>
@@ -240,7 +239,7 @@
<description>loading label</description>
<type>label</type>
<id>57</id>
- <posX>400</posX>
+ <posX>500</posX>
<posY>240</posY>
<label>Loading image...</label>
<font>font13</font>
@@ -250,7 +249,7 @@
<control>
<type>image</type>
<id>20</id>
- <posX>340</posX>
+ <posX>485</posX>
<posY>160</posY>
<width>600</width>
<height>240</height>
@@ -260,7 +259,7 @@
<control>
<type>image</type>
<id>21</id>
- <posX>340</posX>
+ <posX>485</posX>
<posY>160</posY>
<width>600</width>
<height>240</height>
@@ -271,11 +270,11 @@
<description>Cam Up</description>
<type>button</type>
<id>50</id>
- <posX>190</posX>
- <posY>180</posY>
+ <posX>295</posX>
+ <posY>260</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -293,11 +292,11 @@
<description>Cam left</description>
<type>button</type>
<id>51</id>
- <posX>140</posX>
- <posY>220</posY>
+ <posX>240</posX>
+ <posY>300</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -315,11 +314,11 @@
<description>Cam right</description>
<type>button</type>
<id>52</id>
- <posX>240</posX>
- <posY>220</posY>
+ <posX>350</posX>
+ <posY>300</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -337,11 +336,11 @@
<description>Cam down</description>
<type>button</type>
<id>53</id>
- <posX>190</posX>
- <posY>260</posY>
+ <posX>295</posX>
+ <posY>340</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -359,15 +358,15 @@
<description>Zoom min</description>
<type>button</type>
<id>55</id>
- <posX>140</posX>
- <posY>320</posY>
+ <posX>240</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
- <label>zoom -</label>
+ <label>zm -</label>
<font>font10</font>
<textalign>center</textalign>
<textvalign>middle</textvalign>
@@ -381,15 +380,15 @@
<description>Zoom plus</description>
<type>button</type>
<id>56</id>
- <posX>240</posX>
- <posY>320</posY>
+ <posX>350</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
- <label>zoom +</label>
+ <label>zm +</label>
<font>font10</font>
<textalign>center</textalign>
<textvalign>middle</textvalign>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -8,26 +8,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -36,8 +36,8 @@
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -52,8 +52,8 @@
<control>
<type>image</type>
<id>5</id>
- <posX>500</posX>
- <posY>130</posY>
+ <posX>580</posX>
+ <posY>190</posY>
<width>150</width>
<height>150</height>
<texture>hover_my videos.png</texture>
@@ -63,8 +63,8 @@
<description>text label</description>
<type>label</type>
<id>6</id>
- <posX>200</posX>
- <posY>150</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>Dit is een label!!!</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -72,10 +72,10 @@
<control>
<type>image</type>
<id>30</id>
- <posX>180</posX>
- <posY>240</posY>
- <width>20</width>
- <height>20</height>
+ <posX>260</posX>
+ <posY>370</posY>
+ <width>30</width>
+ <height>30</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -83,8 +83,8 @@
<description>commment label</description>
<type>label</type>
<id>31</id>
- <posX>200</posX>
- <posY>240</posY>
+ <posX>295</posX>
+ <posY>370</posY>
<label>comment</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -94,8 +94,8 @@
<description>Run button</description>
<type>button</type>
<id>11</id>
- <posX>330</posX>
- <posY>332</posY>
+ <posX>430</posX>
+ <posY>445</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -13,15 +13,18 @@
<height>720</height>
<texture>background.png</texture>
</control>
+
+<import>common.time.xml</import>
+<import>common.window.xml</import>
<control>
<description>an Image</description>
<type>image</type>
<id>2</id>
- <posX>20</posX>
- <posY>400</posY>
- <width>350</width>
- <height>250</height>
+ <posX>120</posX>
+ <posY>490</posY>
+ <width>300</width>
+ <height>200</height>
<texture>hover_remote.png</texture>
</control>
@@ -117,15 +120,11 @@
<control>
<id>501</id>
<description>Enable disable scene triggers</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>500</onup>
<ondown>502</ondown>
<onright>40</onright>
<label>Scene Triggers</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>502</id>
@@ -157,15 +156,11 @@
<control>
<id>505</id>
<description>Instant Update Room List</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>504</onup>
<ondown>506</ondown>
<onright>40</onright>
<label>Show list on focus</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>506</id>
@@ -185,7 +180,7 @@
<id>20</id>
<label>Section:</label>
<posX>60</posX>
- <posY>70</posY>
+ <posY>78</posY>
<onleft>500</onleft>
<onright>50</onright>
<onup>40</onup>
@@ -205,7 +200,7 @@
<reverse>no</reverse>
<cycleItems>yes</cycleItems>
<height>34</height>
- <width>500</width>
+ <width>350</width>
<font>font10</font>
<shadowAngle>45</shadowAngle>
<shadowDistance>1</shadowDistance>
@@ -231,8 +226,8 @@
<type>listcontrol</type>
<id>40</id>
<posX>60</posX>
- <posY>110</posY>
- <height>360</height>
+ <posY>140</posY>
+ <height>410</height>
<width>500</width>
<onup>20</onup>
<ondown>20</ondown>
@@ -259,71 +254,36 @@
<spinColor>00ffffff</spinColor>
<suffix>|</suffix>
</control>
- </control>
- <control>
- <description>Cover Flow view</description>
+ </control>
+
+ <control>
+ <description>Cover Flow view</description>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="550" start="1960,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1960,0">WindowClose</animation>
+
<type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
<id>41</id>
<posX>0</posX>
- <posY>200</posY>
+ <posY>90</posY>
<width>1280</width>
- <height>720</height>
+ <height>576</height>
<onup>20</onup>
- <onleft>500</onleft>
- <selectedCard>0</selectedCard>
- <cardWidth>360</cardWidth>
- <cardHeight>360</cardHeight>
- <angle>65</angle>
+ <onleft>500</onleft>
+ <cardWidth>270</cardWidth>
+ <cardHeight>270</cardHeight>
<sideShift>380</sideShift>
<sideGap>90</sideGap>
- <sideDepth>550</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <backgroundDiffuse>FF000000</backgroundDiffuse>
- <background>-</background>
- <showBackground>no</showBackground>
- <foregroundHeight>720</foregroundHeight>
- <foregroundWidth>1280</foregroundWidth>
- <foregroundX>0</foregroundX>
- <foregroundY>0</foregroundY>
- <foregroundDiffuse>FF000000</foregroundDiffuse>
- <foreground>coverflow_foreground.png</foreground>
- <showForeground>no</showForeground>
- <showFrame>no</showFrame>
- <frame>Picture_cover2.png</frame>
- <frameFocus>Picture_cover2.png</frameFocus>
- <frameWidth>360</frameWidth>
- <frameHeight>360</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix>[</folderPrefix>
- <folderSuffix>]</folderSuffix>
- <font1>font15</font1>
- <font2>font10</font2>
- <label1>...</label1>
- <label2></label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>-50</label1YOff>
- <label2YOff>430</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>bar_hor.png</scrollbarBackground>
- <scrollbarLeft>mouse_left_horizontal.png</scrollbarLeft>
- <scrollbarRight>mouse_right_horizontal.png</scrollbarRight>
- <scrollbarYOff>455</scrollbarYOff>
- <showScrollbar>no</showScrollbar>
- <cards mask="Picturethumbmask.png">Picturethumbmask.png</cards>
- </control>
+ <sideDepth>550</sideDepth>
+ <angle>65</angle>
+ <selectedOffsetY>120</selectedOffsetY>
+ <offsetY>160</offsetY>
+ <label1YOff>-3000</label1YOff>
+ <font1>font14</font1>
+ <showScrollbar>no</showScrollbar>
+ <showFrame>no</showFrame>
+ </control>
<control>
<description>group element</description>
@@ -338,8 +298,8 @@
<type>listcontrol</type>
<id>50</id>
<posX>600</posX>
- <posY>70</posY>
- <height>560</height>
+ <posY>140</posY>
+ <height>490</height>
<width>600</width>
<onleft>40</onleft>
<onright>500</onright>
@@ -368,10 +328,12 @@
<control>
<type>label</type>
- <posX>400</posX>
- <posY>17</posY>
+ <posX>20</posX>
+ <posY>10</posY>
<label>Micasa Verde - Vera control</label>
<id>10</id>
+ <font>font11</font>
+ <textcolor>ff6FAFE1</textcolor>
</control>
</controls>
</window>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -223,7 +223,7 @@
<description>Dimmable Light</description>
<type>slider</type>
<id>15</id>
- <posX>620</posX>
+ <posX>580</posX>
<posY>460</posY>
<spintype>int</spintype>
<showrange>yes</showrange>
Added: trunk/plugins/VeraControl/skin/Titan/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Titan/VeraControl.xml (rev 0)
+++ trunk/plugins/VeraControl/skin/Titan/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -0,0 +1,408 @@
+<window>
+ <id>1972</id>
+ <defaultcontrol>40</defaultcontrol>
+ <define>#header.label:Vera Control</define>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>background.png</texture>
+ </control>
+
+<import>common.time.xml</import>
+<import>common.overlay.xml</import>
+
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>2</id>
+ <posX>120</posX>
+ <posY>850</posY>
+ <width>300</width>
+ <height>200</height>
+ <texture>vera\IR_Transmitter.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>3</id>
+ <posX>1780</posX>
+ <posY>950</posY>
+ <texture>vera\Zwave.png</texture>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>30</id>
+ <posX>700</posX>
+ <posY>980</posY>
+ <width>30</width>
+ <height>30</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>31</id>
+ <posX>740</posX>
+ <posY>980</posY>
+ <label></label>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>32</id>
+ <posX>700</posX>
+ <posY>940</posY>
+ <width>30</width>
+ <height>30</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>33</id>
+ <posX>740</posX>
+ <posY>940</posY>
+ <label></label>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
+
+ <control>
+ <description>action menu</description>
+ <type>actiongroup</type>
+ <visible>!Control.HasFocus(200)</visible>
+ <dimColor>00ffffff</dimColor>
+ <width>568</width>
+ <height>900</height>
+ <buttonX>-460</buttonX>
+ <buttonY>155</buttonY>
+ <buttonwidth>499</buttonwidth>
+ <buttonheight>1080</buttonheight>
+ <onexit>40</onexit>
+ <defaultcontrol>500</defaultcontrol>
+ <textureFocus>-</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <control>
+ <type>image</type>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>semi_trans_back_hidden_menu.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450">visible</animation>
+ <animation effect="fade" time="400">hidden</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posY>0</posY>
+ <posX>0</posX>
+ <width>612</width>
+ <height>1074</height>
+ <texture>menu_bg.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="50">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <description>Menu label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>116</posX>
+ <posY>100</posY>
+ <label>924</label>
+ <font>fontB16</font>
+ <textcolor>393939</textcolor>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="50">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
+ <posX>110</posX>
+ <posY>160</posY>
+ <layout>StackLayout</layout>
+ <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <control>
+ <id>500</id>
+ <description>Box Selector</description>
+ <type>button</type>
+ <onup>506</onup>
+ <ondown>501</ondown>
+ <onright>40</onright>
+ <label>Box:</label>
+ </control>
+ <control>
+ <id>501</id>
+ <description>Enable disable scene triggers</description>
+ <type>checkbutton</type>
+ <onup>500</onup>
+ <ondown>502</ondown>
+ <onright>40</onright>
+ <label>Scene Triggers</label>
+ <textcolorNoFocus>FF444444</textcolorNoFocus>
+ </control>
+ <control>
+ <id>502</id>
+ <description>Edit Scene triggers</description>
+ <type>button</type>
+ <onup>501</onup>
+ <ondown>503</ondown>
+ <onright>40</onright>
+ <label>Edit Scene Triggers</label>
+ </control>
+ <control>
+ <id>503</id>
+ <description>Device filter</description>
+ <type>button</type>
+ <onup>502</onup>
+ <ondown>504</ondown>
+ <onright>40</onright>
+ <label>Filter:</label>
+ </control>
+ <control>
+ <id>504</id>
+ <description>Sort mode</description>
+ <type>button</type>
+ <onup>503</onup>
+ <ondown>505</ondown>
+ <onright>40</onright>
+ <label>Sort:</label>
+ </control>
+ <control>
+ <id>505</id>
+ <description>Instant Update Room List</description>
+ <type>checkbutton</type>
+ <onup>504</onup>
+ <ondown>506</ondown>
+ <onright>40</onright>
+ <label>Show list on focus</label>
+ <textcolorNoFocus>FF444444</textcolorNoFocus>
+ </control>
+ <control>
+ <id>506</id>
+ <description>Viewing mode</description>
+ <type>button</type>
+ <onup>505</onup>
+ <ondown>500</ondown>
+ <onright>40</onright>
+ <label>View:</label>
+ </control>
+ </control>
+ </control>
+
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <control>
+ <type>image</type>
+ <posX>70</posX>
+ <posY>110</posY>
+ <width>560</width>
+ <height>80</height>
+ <texture>panel_settings_main.png</texture>
+ <visible>Control.isvisible(20)</visible>
+ </control>
+ <control>
+ <description>category</description>
+ <type>spinbutton</type>
+ <id>20</id>
+ <label>Section:</label>
+ <posX>110</posX>
+ <posY>130</posY>
+ <onleft>500</onleft>
+ <onright>50</onright>
+ <onup>40</onup>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>30</spinWidth>
+ <spinHeight>30</spinHeight>
+ <spinXOff>20</spinXOff>
+ <spinTextXOff>7</spinTextXOff>
+ <spinalign>right</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>horizontal</orientation>
+ <showrange>no</showrange>
+ <reverse>no</reverse>
+ <cycleItems>yes</cycleItems>
+ <height>34</height>
+ <width>460</width>
+ <font>font10</font>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>1</shadowDistance>
+ <shadowColor>FF000000</shadowColor>
+ <textcolorFocus>0xffa0d0ff</textcolorFocus>
+ <textcolorNoFocus>0x60ffffff</textcolorNoFocus>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <textXOff>10</textXOff>
+ <textureFocus>button_focus.png</textureFocus>
+ <textureNoFocus>button_nofocus.png</textureNoFocus>
+ </control>
+ </control>
+
+
+
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="150" start="1900,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1900,0">WindowClose</animation>
+ <control>
+ <type>image</type>
+ <posX>60</posX>
+ <posY>185</posY>
+ <width>860</width>
+ <height>700</height>
+ <texture>panel_settings_main.png</texture>
+ <visible>Control.isvisible(40)</visible>
+ </control>
+ <control>
+ <description>left control</description>
+ <type>listcontrol</type>
+ <id>40</id>
+ <posX>110</posX>
+ <posY>235</posY>
+ <height>680</height>
+ <width>760</width>
+ <onup>20</onup>
+ <ondown>20</ondown>
+ <onleft>500</onleft>
+ <onright>50</onright>
+ <scrollOffset>5</scrollOffset>
+ <itemWidth>33</itemWidth>
+ <itemHeight>33</itemHeight>
+ <IconXOff>20</IconXOff>
+ <IconYOff>3</IconYOff>
+ <textXOff>25</textXOff>
+ <textYOff>3</textYOff>
+ <textXOff2>0</textXOff2>
+ <textYOff2>5</textYOff2>
+ <textXOff3>75</textXOff3>
+ <textYOff3>10</textYOff3>
+ <font>font10</font>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <keepaspectratio>yes</keepaspectratio>
+ <spinPosX>1650</spinPosX>
+ <spinPosY>1250</spinPosY>
+ <spinCanFocus>no</spinCanFocus>
+ <spinColor>00ffffff</spinColor>
+ <suffix>|</suffix>
+ <unfocusedAlpha applyToAll="true">ff</unfocusedAlpha>
+ </control>
+ </control>
+ <control>
+ <description>Cover Flow v...
[truncated message content] |
