diff options
Diffstat (limited to 'addons/skin.confluence')
18 files changed, 201 insertions, 237 deletions
diff --git a/addons/skin.confluence/720p/DialogButtonMenu.xml b/addons/skin.confluence/720p/DialogButtonMenu.xml index ec8487b52e..06b33e6282 100644 --- a/addons/skin.confluence/720p/DialogButtonMenu.xml +++ b/addons/skin.confluence/720p/DialogButtonMenu.xml @@ -1,5 +1,5 @@ <window type="buttonMenu" id="111"> - <defaultcontrol always="true">13</defaultcontrol> + <defaultcontrol>9001</defaultcontrol> <include>dialogeffect</include> <coordinates> <system>1</system> @@ -7,6 +7,22 @@ <posy>0</posy> </coordinates> <controls> + <control type="button" id="9001"> + <description>Make sure we hit the first button in the group list and not the close window button</description> + <posx>-16</posx> + <posy>-16</posy> + <width>4</width> + <height>4</height> + <label>-</label> + <font>-</font> + <onfocus>down</onfocus> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onleft>9000</onleft> + <onright>9000</onright> + <onup>9000</onup> + <ondown>2</ondown> + </control> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -14,254 +30,208 @@ <height>720</height> <texture>black-back.png</texture> </control> - <control type="image"> - <posx>0</posx> + <control type="grouplist" id="9000"> + <posx>470</posx> <posy>0</posy> - <width>1280</width> + <width>340</width> <height>720</height> - <texture>black-back.png</texture> - <colordiffuse>99FFFFFF</colordiffuse> - </control> - <control type="group"> - <posx>305</posx> - <posy>245</posy> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>670</width> - <height>210</height> - <texture border="20">OverlayDialogBackground.png</texture> + <onleft>9000</onleft> + <onright>9000</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <itemgap>0</itemgap> + <align>center</align> + <control type="group" id="1"> + <width>340</width> + <height>30</height> + <control type="image"> + <description>background top image</description> + <posx>0</posx> + <posy>0</posy> + <width>340</width> + <height>30</height> + <texture border="20,19,20,0">DialogContextTop.png</texture> + </control> + <control type="button" id="20"> + <description>Close Window button</description> + <posx>260</posx> + <posy>5</posy> + <width>64</width> + <height>32</height> + <label>-</label> + <font>-</font> + <onclick>PreviousMenu</onclick> + <texturefocus>DialogCloseButton-focus.png</texturefocus> + <texturenofocus>DialogCloseButton.png</texturenofocus> + <onleft>13</onleft> + <onright>13</onright> + <onup>9</onup> + <ondown>2</ondown> + <visible>system.getbool(input.enablemouse)</visible> + </control> + </control> + <control type="button" id="2"> + <description>Exit button</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.Quit()</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>13012</label> + <visible>System.ShowExitButton</visible> + </control> + <control type="button" id="3"> + <description>Shutdown button</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.Powerdown()</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>13016</label> + </control> + <control type="button" id="4"> + <description>Custom Shutdown Timer</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.AlarmClock(shutdowntimer,XBMC.Powerdown())</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>20150</label> <visible>!System.HasAlarm(shutdowntimer)</visible> </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>670</width> - <height>235</height> - <texture border="20">OverlayDialogBackground.png</texture> + <control type="button" id="5"> + <description>Cancel Shutdown Timer</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.CancelAlarm(shutdowntimer)</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>20151</label> <visible>System.HasAlarm(shutdowntimer)</visible> </control> - <control type="image"> - <posx>10</posx> - <posy>5</posy> - <width>650</width> - <height>60</height> - <aspectratio>stretch</aspectratio> - <texture>GlassTitleBar.png</texture> - </control> - <control type="button"> - <description>Close Window button</description> - <posx>570</posx> - <posy>5</posy> - <width>64</width> - <height>32</height> - <label>-</label> - <font>-</font> - <onclick>PreviousMenu</onclick> - <texturefocus>DialogCloseButton-focus.png</texturefocus> - <texturenofocus>DialogCloseButton.png</texturenofocus> - <onleft>13</onleft> - <onright>13</onright> - <onup>13</onup> - <ondown>13</ondown> - <visible>system.getbool(input.enablemouse)</visible> + <control type="button" id="6"> + <description>Suspend button</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.Suspend()</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>13011</label> </control> - <control type="label" id="3100"> - <description>Label control</description> - <posx>10</posx> - <posy>15</posy> - <width>650</width> - <height>35</height> - <label>-</label> + <control type="button" id="7"> + <description>Reboot button</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>XBMC.Reset()</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>13013</label> </control> - <control type="image"> - <posx>10</posx> - <posy>60</posy> - <width>650</width> - <height>100</height> - <aspectratio>stretch</aspectratio> - <texture>GlassTitleBar.png</texture> - <colordiffuse>99FFFFFF</colordiffuse> + <control type="button" id="8"> + <description>Logoff button</description> + <width>340</width> + <height>40</height> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <textwidth>290</textwidth> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <onclick>dialog.close(all,true)</onclick> + <onclick>System.LogOff</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <label>$LOCALIZE[20126] $INFO[system.profilename]</label> + <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible> + <visible>System.Loggedon</visible> </control> - <control type="grouplist"> - <posx>15</posx> - <posy>85</posy> - <width>640</width> - <itemgap>20</itemgap> + <control type="togglebutton" id="9"> + <description>Master mode button</description> + <width>340</width> + <height>40</height> + <label>20046</label> + <altlabel>20045</altlabel> <align>center</align> - <orientation>Horizontal</orientation> - <control type="togglebutton" id="9"> - <description>Master mode button</description> - <width>90</width> - <height>90</height> - <label>20046</label> - <altlabel>20045</altlabel> - <texturefocus>ButtonMenuMasterFO.png</texturefocus> - <texturenofocus>ButtonMenuMasterNF.png</texturenofocus> - <usealttexture>!System.IsMaster</usealttexture> - <alttexturefocus>ButtonMenuNoMasterFO.png</alttexturefocus> - <alttexturenofocus>ButtonMenuNoMasterNF.png</alttexturenofocus> - <onclick>xbmc.mastermode</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <visible>System.HasLocks</visible> - </control> - <control type="button" id="10"> - <description>LogOff Profile</description> - <width>90</width> - <height>90</height> - <texturefocus>ButtonMenuLogOffFO.png</texturefocus> - <texturenofocus>ButtonMenuLogOffNF.png</texturenofocus> - <onclick>dialog.close(all,true)</onclick> - <onclick>System.LogOff</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>$LOCALIZE[20126] $INFO[system.profilename]</label> - <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible> - <visible>System.Loggedon</visible> - </control> - <control type="button" id="11"> - <description>Exit xbmc</description> - <width>90</width> - <height>90</height> - <texturefocus>ButtonMenuExitFO.png</texturefocus> - <texturenofocus>ButtonMenuExitNF.png</texturenofocus> - <onclick>XBMC.Quit()</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>$LOCALIZE[13012]</label> - <visible>System.ShowExitButton</visible> - </control> - <control type="group" id="13"> - <width>90</width> - <defaultcontrol always="true">15</defaultcontrol> - <control type="button" id="17"> - <description>Cancel Shutdown Timer button</description> - <posx>0</posx> - <posy>0</posy> - <width>90</width> - <height>90</height> - <texturefocus>-</texturefocus> - <texturenofocus>-</texturenofocus> - <onclick>XBMC.CancelAlarm(shutdowntimer)</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>20151</label> - <onleft>11</onleft> - <onright>12</onright> - <onup>15</onup> - <ondown>16</ondown> - <visible>System.HasAlarm(shutdowntimer)</visible> - </control> - <control type="button" id="16"> - <description>Custom Shutdown Timer button</description> - <posx>0</posx> - <posy>0</posy> - <width>90</width> - <height>90</height> - <texturefocus>-</texturefocus> - <texturenofocus>-</texturenofocus> - <onclick>XBMC.AlarmClock(shutdowntimer,XBMC.Powerdown())</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>20150</label> - <onleft>11</onleft> - <onright>12</onright> - <onup>17</onup> - <ondown>15</ondown> - </control> - <control type="button" id="15"> - <description>Shutdown button</description> - <posx>0</posx> - <posy>0</posy> - <width>90</width> - <height>90</height> - <texturefocus>-</texturefocus> - <texturenofocus>ButtonMenuShutdownNF.png</texturenofocus> - <onclick>XBMC.Powerdown()</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>13016</label> - <onleft>11</onleft> - <onright>12</onright> - <onup>16</onup> - <ondown>17</ondown> - </control> - <control type="image"> - <description>Shutdown focus image</description> - <posx>0</posx> - <posy>0</posy> - <width>90</width> - <height>90</height> - <texture>ButtonMenuShutdownFO.png</texture> - <visible>Control.HasFocus(15) | Control.HasFocus(16) | Control.HasFocus(17)</visible> - </control> - </control> - <control type="button" id="12"> - <description>Suspend xbmc</description> - <width>90</width> - <height>90</height> - <texturefocus>ButtonMenuSleepFO.png</texturefocus> - <texturenofocus>ButtonMenuSleepNF.png</texturenofocus> - <onclick>XBMC.Suspend()</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>$LOCALIZE[13011]</label> - </control> - <control type="button" id="14"> - <description>Reboot button</description> - <width>90</width> - <height>90</height> - <texturefocus>ButtonMenuRestartFO.png</texturefocus> - <texturenofocus>ButtonMenuRestartNF.png</texturenofocus> - <onclick>XBMC.Reset()</onclick> - <pulseonselect>no</pulseonselect> - <font>-</font> - <label>13013</label> - </control> + <aligny>center</aligny> + <textwidth>290</textwidth> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus> + <texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus> + <usealttexture>!System.IsMaster</usealttexture> + <alttexturefocus border="25,5,25,5">ShutdownButtonFocus.png</alttexturefocus> + <alttexturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</alttexturenofocus> + <onclick>xbmc.mastermode</onclick> + <pulseonselect>no</pulseonselect> + <font>font13</font> + <visible>System.HasLocks</visible> </control> - <control type="group"> - <include condition="System.ShowExitButton">ExitButtonOffset</include> - <include condition="!System.ShowExitButton">NoExitButtonOffset</include> - <posy>70</posy> - <visible>ControlGroup(13).HasFocus</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" start="0,0" end="55,0" time="0" condition="System.HasLocks">Conditional</animation> - <animation effect="slide" start="0,0" end="55,0" time="0" condition="[System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)] + System.LoggedOn">Conditional</animation> + <control type="group" id="11"> + <width>340</width> + <height>70</height> + <visible>System.HasAlarm(shutdowntimer)</visible> <control type="image"> - <description>Shutdown Arrow Up image</description> + <description>background top image</description> <posx>0</posx> <posy>0</posy> - <width>20</width> - <height>15</height> - <texture>ArrowUp.png</texture> + <width>340</width> + <height>70</height> + <texture border="25,5,25,5">DialogContextMiddle.png</texture> </control> - <control type="image"> - <description>Shutdown Arrow Down image</description> - <posx>0</posx> - <posy>107</posy> - <width>20</width> - <height>15</height> - <texture>ArrowDown.png</texture> + <control type="textbox"> + <posx>25</posx> + <posy>20</posy> + <width>290</width> + <height>50</height> + <font>font12</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <align>center</align> + <label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label> </control> </control> - <control type="label"> - <posx>10</posx> - <posy>190</posy> - <width>650</width> - <height>35</height> - <font>font12</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - <align>center</align> - <aligny>center</aligny> - <label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label> - <visible>System.HasAlarm(shutdowntimer)</visible> + <control type="image" id="10"> + <description>background bottom image</description> + <posx>0</posx> + <width>340</width> + <height>25</height> + <texture border="20,0,19,20">DialogContextBottom.png</texture> </control> </control> </controls> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 44122b3ff9..0fb34a537e 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -764,10 +764,4 @@ <animation effect="fade" time="300">Visible</animation> <animation effect="fade" time="300">Hidden</animation> </include> - <include name="ExitButtonOffset"> - <posx>270</posx> - </include> - <include name="NoExitButtonOffset"> - <posx>215</posx> - </include> </includes> diff --git a/addons/skin.confluence/media/ButtonMenuExitFO.png b/addons/skin.confluence/media/ButtonMenuExitFO.png Binary files differdeleted file mode 100644 index 03bcbf6bca..0000000000 --- a/addons/skin.confluence/media/ButtonMenuExitFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuExitNF.png b/addons/skin.confluence/media/ButtonMenuExitNF.png Binary files differdeleted file mode 100644 index 39d1e3cfdd..0000000000 --- a/addons/skin.confluence/media/ButtonMenuExitNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuLogOffFO.png b/addons/skin.confluence/media/ButtonMenuLogOffFO.png Binary files differdeleted file mode 100644 index 967e112b0c..0000000000 --- a/addons/skin.confluence/media/ButtonMenuLogOffFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuLogOffNF.png b/addons/skin.confluence/media/ButtonMenuLogOffNF.png Binary files differdeleted file mode 100644 index 965975bf58..0000000000 --- a/addons/skin.confluence/media/ButtonMenuLogOffNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuMasterFO.png b/addons/skin.confluence/media/ButtonMenuMasterFO.png Binary files differdeleted file mode 100644 index d6121584db..0000000000 --- a/addons/skin.confluence/media/ButtonMenuMasterFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuMasterNF.png b/addons/skin.confluence/media/ButtonMenuMasterNF.png Binary files differdeleted file mode 100644 index d67518e711..0000000000 --- a/addons/skin.confluence/media/ButtonMenuMasterNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuNoMasterFO.png b/addons/skin.confluence/media/ButtonMenuNoMasterFO.png Binary files differdeleted file mode 100644 index b2b1a88dd8..0000000000 --- a/addons/skin.confluence/media/ButtonMenuNoMasterFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuNoMasterNF.png b/addons/skin.confluence/media/ButtonMenuNoMasterNF.png Binary files differdeleted file mode 100644 index 34812a539b..0000000000 --- a/addons/skin.confluence/media/ButtonMenuNoMasterNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuRestartFO.png b/addons/skin.confluence/media/ButtonMenuRestartFO.png Binary files differdeleted file mode 100644 index 0c58722638..0000000000 --- a/addons/skin.confluence/media/ButtonMenuRestartFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuRestartNF.png b/addons/skin.confluence/media/ButtonMenuRestartNF.png Binary files differdeleted file mode 100644 index 21427da7f5..0000000000 --- a/addons/skin.confluence/media/ButtonMenuRestartNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuShutdownFO.png b/addons/skin.confluence/media/ButtonMenuShutdownFO.png Binary files differdeleted file mode 100644 index f573524c1d..0000000000 --- a/addons/skin.confluence/media/ButtonMenuShutdownFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuShutdownNF.png b/addons/skin.confluence/media/ButtonMenuShutdownNF.png Binary files differdeleted file mode 100644 index 2fb2767834..0000000000 --- a/addons/skin.confluence/media/ButtonMenuShutdownNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuSleepFO.png b/addons/skin.confluence/media/ButtonMenuSleepFO.png Binary files differdeleted file mode 100644 index da53ff4114..0000000000 --- a/addons/skin.confluence/media/ButtonMenuSleepFO.png +++ /dev/null diff --git a/addons/skin.confluence/media/ButtonMenuSleepNF.png b/addons/skin.confluence/media/ButtonMenuSleepNF.png Binary files differdeleted file mode 100644 index 49f93f2685..0000000000 --- a/addons/skin.confluence/media/ButtonMenuSleepNF.png +++ /dev/null diff --git a/addons/skin.confluence/media/ShutdownButtonFocus.png b/addons/skin.confluence/media/ShutdownButtonFocus.png Binary files differnew file mode 100644 index 0000000000..942a163e1e --- /dev/null +++ b/addons/skin.confluence/media/ShutdownButtonFocus.png diff --git a/addons/skin.confluence/media/ShutdownButtonNoFocus.png b/addons/skin.confluence/media/ShutdownButtonNoFocus.png Binary files differnew file mode 100644 index 0000000000..ae39bbb7b0 --- /dev/null +++ b/addons/skin.confluence/media/ShutdownButtonNoFocus.png |
