diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2016-04-02 20:43:13 +0200 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2016-04-02 20:43:13 +0200 |
| commit | 0f81e96f96f0ca41c0f8695d8fbe2d8e32e91192 (patch) | |
| tree | 56d2aa06da7e068af1e2c2fad8d8fa29ef1a1519 /addons/skin.estuary | |
| parent | 0436322e75e271bd57a5c1597240f8fe0ef8add3 (diff) | |
[estuary] - skin sync
Diffstat (limited to 'addons/skin.estuary')
119 files changed, 207 insertions, 244 deletions
diff --git a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml index 7002f4e41a..a31de14250 100644 --- a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml +++ b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml @@ -57,7 +57,7 @@ <top>0</top> <width>382</width> <height>120</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="50" time="0">Unfocus</animation> </control> <control type="label"> @@ -77,7 +77,7 @@ <width>382</width> <aspectratio>keep</aspectratio> <height>120</height> - <texture>$INFO[ListItem.Art(thumb)]</texture> + <texture background="true">$INFO[ListItem.Art(thumb)]</texture> </control> </control> </focusedlayout> @@ -106,7 +106,7 @@ <width>382</width> <aspectratio>keep</aspectratio> <height>120</height> - <texture>$INFO[ListItem.Art(thumb)]</texture> + <texture background="true">$INFO[ListItem.Art(thumb)]</texture> </control> </itemlayout> <content> @@ -176,7 +176,7 @@ <label>-</label> <textoffsetx>40</textoffsetx> <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <radioposx>55</radioposx> <radioposy>0</radioposy> @@ -197,7 +197,7 @@ <label>-</label> <textoffsetx>40</textoffsetx> <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <radioposx>35</radioposx> <radioposy>0</radioposy> @@ -221,7 +221,7 @@ <label>-</label> <textoffsetx>40</textoffsetx> <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <radioposx>55</radioposx> <radioposy>0</radioposy> diff --git a/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml index 6c5b9860d3..0b8f3f46a8 100644 --- a/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml +++ b/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml @@ -12,7 +12,7 @@ <left>0</left> <top>0</top> <width>1920</width> - <height>80</height> + <height>83</height> <texture>frame/InfoBar.png</texture> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/Defaults.xml b/addons/skin.estuary/1080i/Defaults.xml index d57f20ecd6..617fb8614f 100644 --- a/addons/skin.estuary/1080i/Defaults.xml +++ b/addons/skin.estuary/1080i/Defaults.xml @@ -28,7 +28,7 @@ <default type="button"> <width>300</width> <height>42</height> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <font>font13</font> <textcolor>white</textcolor> @@ -40,9 +40,9 @@ <default type="togglebutton"> <width>20</width> <height>20</height> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <alttexturefocus border="40">buttons/button-theme-fo.png</alttexturefocus> + <alttexturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</alttexturefocus> <alttexturenofocus border="40">buttons/button-nofo.png</alttexturenofocus> <textcolor>white</textcolor> <label>-</label> @@ -88,7 +88,7 @@ <height>42</height> <spinwidth>32</spinwidth> <spinheight>60</spinheight> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <textureup>buttons/spinctrl/arrow-light-up-nf.png</textureup> <texturedown>buttons/spinctrl/arrow-light-down-nf.png</texturedown> @@ -115,7 +115,7 @@ <textureradiooffnofocus>buttons/radio-button-off.png</textureradiooffnofocus> <textureradioondisabled colordiffuse="disabled">buttons/radio-button-on.png</textureradioondisabled> <textureradiooffdisabled colordiffuse="disabled">buttons/radio-button-off.png</textureradiooffdisabled> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <font>font13</font> <textcolor>white</textcolor> @@ -150,7 +150,7 @@ <height>35</height> <textoffsetx>7</textoffsetx> <aligny>center</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <sliderwidth>150</sliderwidth> <sliderheight>28</sliderheight> @@ -162,17 +162,17 @@ <disabledcolor>disabled</disabledcolor> </default> <default type="mover"> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> </default> <default type="resize"> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> </default> <default type="edit"> <width>300</width> <height>42</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> <font>font13</font> <textcolor>white</textcolor> diff --git a/addons/skin.estuary/1080i/DialogAudioDSPManager.xml b/addons/skin.estuary/1080i/DialogAudioDSPManager.xml index e224105856..239c13d8ce 100644 --- a/addons/skin.estuary/1080i/DialogAudioDSPManager.xml +++ b/addons/skin.estuary/1080i/DialogAudioDSPManager.xml @@ -53,7 +53,7 @@ <width>330</width> <height>130</height> <animation effect="fade" start="100" end="20" time="200" condition="!Control.HasFocus(9000)">Conditional</animation> - <texture border="40">buttons/dialogbutton-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texture> </control> <control type="label"> <left>0</left> @@ -138,7 +138,7 @@ <label>$LOCALIZE[15064]</label> <font>font12_title</font> <textoffsetx>40</textoffsetx> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> </control> <include name="DefaultDialogButton"> diff --git a/addons/skin.estuary/1080i/DialogButtonMenu.xml b/addons/skin.estuary/1080i/DialogButtonMenu.xml index 319af26f1f..5c7bbf1d2d 100644 --- a/addons/skin.estuary/1080i/DialogButtonMenu.xml +++ b/addons/skin.estuary/1080i/DialogButtonMenu.xml @@ -55,7 +55,7 @@ <top>0</top> <width>500</width> <height>70</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(9000)</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/DialogContextMenu.xml b/addons/skin.estuary/1080i/DialogContextMenu.xml index bf62be4075..666a1a8ad4 100644 --- a/addons/skin.estuary/1080i/DialogContextMenu.xml +++ b/addons/skin.estuary/1080i/DialogContextMenu.xml @@ -41,7 +41,7 @@ <height>60</height> <font>fontContextMenu</font> <align>center</align> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus>lists/separator.png</texturenofocus> </control> <include name="UpDownArrows"> diff --git a/addons/skin.estuary/1080i/DialogGameControllers.xml b/addons/skin.estuary/1080i/DialogGameControllers.xml index 5c243d7aeb..00192f4325 100644 --- a/addons/skin.estuary/1080i/DialogGameControllers.xml +++ b/addons/skin.estuary/1080i/DialogGameControllers.xml @@ -50,7 +50,7 @@ <align>center</align> <aligny>center</aligny> <font>font12_title</font> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus>lists/separator.png</texturenofocus> </control> <control type="gamecontroller" id="31"> @@ -107,7 +107,7 @@ <align>center</align> <aligny>center</aligny> <font>font12_title</font> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus>lists/separator.png</texturenofocus> </control> <control type="grouplist" id="9001"> diff --git a/addons/skin.estuary/1080i/DialogKeyboard.xml b/addons/skin.estuary/1080i/DialogKeyboard.xml index 081a7919ad..0c3866a4d4 100644 --- a/addons/skin.estuary/1080i/DialogKeyboard.xml +++ b/addons/skin.estuary/1080i/DialogKeyboard.xml @@ -67,7 +67,7 @@ <onup>300</onup> <ondown>302</ondown> <textoffsetx>20</textoffsetx> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -156,7 +156,7 @@ <height>125</height> <onup>309</onup> <ondown>303</ondown> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <label>$LOCALIZE[20178]</label> <altlabel>[B][UPPERCASE]$LOCALIZE[20178][/UPPERCASE][/B]</altlabel> @@ -249,7 +249,7 @@ <altlabel>[B][UPPERCASE]$LOCALIZE[20179][/UPPERCASE][/B]</altlabel> <onup>302</onup> <ondown>307</ondown> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -339,7 +339,7 @@ <onup>303</onup> <ondown>300</ondown> <label>IP</label> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -352,7 +352,7 @@ <altlabel>ABC</altlabel> <onup>303</onup> <ondown>300</ondown> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -439,7 +439,7 @@ <description>DONE button</description> <width>290</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <label>$LOCALIZE[20177]</label> <align>center</align> @@ -453,7 +453,7 @@ <width>335</width> <height>125</height> <label>$LOCALIZE[20182]</label> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -469,7 +469,7 @@ <onup>164</onup> <ondown condition="!System.HasAddon(plugin.program.autocompletion)">104</ondown> <ondown condition="System.HasAddon(plugin.program.autocompletion)">9010</ondown> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -479,7 +479,7 @@ <label><</label> <width>125</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -493,7 +493,7 @@ <label>></label> <width>125</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -509,7 +509,7 @@ <label>Hide</label> <align>center</align> <aligny>center</aligny> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <onclick>SetFocus(502)</onclick> <onup>169</onup> @@ -523,7 +523,7 @@ <label>$LOCALIZE[222]</label> <align>center</align> <aligny>center</aligny> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <onclick>Close</onclick> <onup>171</onup> @@ -573,7 +573,7 @@ <control type="image"> <width>520</width> <height>90</height> - <texture border="40">buttons/dialogbutton-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texture> <animation effect="fade" start="0" end="100" time="200">Focus</animation> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> diff --git a/addons/skin.estuary/1080i/DialogMediaSource.xml b/addons/skin.estuary/1080i/DialogMediaSource.xml index b66b6a4332..b45d682065 100644 --- a/addons/skin.estuary/1080i/DialogMediaSource.xml +++ b/addons/skin.estuary/1080i/DialogMediaSource.xml @@ -77,7 +77,7 @@ <width>820</width> <height>61</height> <visible>Control.HasFocus(10)</visible> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> </control> <control type="label"> <left>10</left> diff --git a/addons/skin.estuary/1080i/DialogMusicInfo.xml b/addons/skin.estuary/1080i/DialogMusicInfo.xml index c5eb5635a0..fd3823b584 100644 --- a/addons/skin.estuary/1080i/DialogMusicInfo.xml +++ b/addons/skin.estuary/1080i/DialogMusicInfo.xml @@ -177,7 +177,7 @@ <top>-10</top> <width>595</width> <height>100</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> </control> <control type="label"> <left>40</left> diff --git a/addons/skin.estuary/1080i/DialogNumeric.xml b/addons/skin.estuary/1080i/DialogNumeric.xml index fe8b40f351..dcf5261cfc 100644 --- a/addons/skin.estuary/1080i/DialogNumeric.xml +++ b/addons/skin.estuary/1080i/DialogNumeric.xml @@ -45,7 +45,7 @@ <font>font12</font> <align>center</align> <aligny>center</aligny> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <label>$LOCALIZE[20181]</label> <onleft>13</onleft> @@ -61,7 +61,7 @@ <font>font12</font> <align>center</align> <aligny>center</aligny> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <label>$LOCALIZE[20177]</label> <angle>270</angle> @@ -159,7 +159,7 @@ <description>prev button</description> <width>125</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -179,7 +179,7 @@ <description>next button</description> <width>125</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> diff --git a/addons/skin.estuary/1080i/DialogPVRChannelManager.xml b/addons/skin.estuary/1080i/DialogPVRChannelManager.xml index fd19bb4540..64a6d14ade 100644 --- a/addons/skin.estuary/1080i/DialogPVRChannelManager.xml +++ b/addons/skin.estuary/1080i/DialogPVRChannelManager.xml @@ -95,7 +95,7 @@ <top>0</top> <width>600</width> <height>70</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="30" time="0" condition="!Control.HasFocus(20)">conditional</animation> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/DialogPVRChannelsOSD.xml b/addons/skin.estuary/1080i/DialogPVRChannelsOSD.xml index 79530a35ca..38f081d85f 100644 --- a/addons/skin.estuary/1080i/DialogPVRChannelsOSD.xml +++ b/addons/skin.estuary/1080i/DialogPVRChannelsOSD.xml @@ -172,7 +172,7 @@ <top>0</top> <width>580</width> <height>110</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(11)</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml b/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml index ed41e191c5..46f5b5660d 100644 --- a/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml @@ -118,7 +118,7 @@ <top>0</top> <width>580</width> <height>60</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(11)</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/DialogSelect.xml b/addons/skin.estuary/1080i/DialogSelect.xml index 4795d693a2..c9f8b10475 100644 --- a/addons/skin.estuary/1080i/DialogSelect.xml +++ b/addons/skin.estuary/1080i/DialogSelect.xml @@ -100,7 +100,7 @@ <top>0</top> <width>880</width> <height>125</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(6)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/DialogSubtitles.xml b/addons/skin.estuary/1080i/DialogSubtitles.xml index 135b0f1d21..8d2d2b808a 100644 --- a/addons/skin.estuary/1080i/DialogSubtitles.xml +++ b/addons/skin.estuary/1080i/DialogSubtitles.xml @@ -169,7 +169,7 @@ <top>0</top> <width>920</width> <height>100</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(120)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/DialogVideoInfo.xml b/addons/skin.estuary/1080i/DialogVideoInfo.xml index 34675fed18..79759cc3e2 100644 --- a/addons/skin.estuary/1080i/DialogVideoInfo.xml +++ b/addons/skin.estuary/1080i/DialogVideoInfo.xml @@ -207,6 +207,11 @@ <param name="label" value="[COLOR button_focus]$LOCALIZE[20459]: [/COLOR]$INFO[ListItem.Tag]" /> <param name="visible" value="!String.IsEmpty(ListItem.Tag)" /> </include> + <include name="InfoDialogMetadata"> + <param name="control_id" value="157" /> + <param name="label" value="[COLOR button_focus]$LOCALIZE[126]: [/COLOR]$INFO[ListItem.Status]" /> + <param name="visible" value="!String.IsEmpty(ListItem.Status)" /> + </include> </control> <control type="image"> <left>17</left> @@ -265,7 +270,7 @@ <left>20</left> <width>224</width> <height>277</height> - <texture fallback="DefaultActor.png">$INFO[ListItem.Thumb]</texture> + <texture fallback="DefaultActor.png" background="true">$INFO[ListItem.Thumb]</texture> <aspectratio aligny="center">scale</aspectratio> </control> <control type="image"> @@ -317,7 +322,7 @@ <left>20</left> <width>224</width> <height>277</height> - <texture>$INFO[ListItem.Thumb]</texture> + <texture fallback="DefaultActor.png" background="true">$INFO[ListItem.Thumb]</texture> <aspectratio aligny="center">scale</aspectratio> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/DialogVolumeBar.xml b/addons/skin.estuary/1080i/DialogVolumeBar.xml index 522ae99cd6..4946ace469 100644 --- a/addons/skin.estuary/1080i/DialogVolumeBar.xml +++ b/addons/skin.estuary/1080i/DialogVolumeBar.xml @@ -13,6 +13,14 @@ <animation effect="fade" start="0" end="100" time="150">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="image"> + <left>-5</left> + <top>-25</top> + <width>150</width> + <height>125</height> + <texture border="40">buttons/dialogbutton-nofo.png</texture> + <visible>Window.IsActive(fullscreenvideo) | Window.IsActive(slideshow)</visible> + </control> + <control type="image"> <left>6</left> <top>-11</top> <width>100</width> diff --git a/addons/skin.estuary/1080i/EventLog.xml b/addons/skin.estuary/1080i/EventLog.xml index 3db5155f4d..b57a9583d1 100644 --- a/addons/skin.estuary/1080i/EventLog.xml +++ b/addons/skin.estuary/1080i/EventLog.xml @@ -158,7 +158,7 @@ <top>0</top> <width>1260</width> <height>90</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(50)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/FileBrowser.xml b/addons/skin.estuary/1080i/FileBrowser.xml index c00254de71..8d43961cf9 100644 --- a/addons/skin.estuary/1080i/FileBrowser.xml +++ b/addons/skin.estuary/1080i/FileBrowser.xml @@ -112,7 +112,7 @@ <width>940</width> <height>71</height> <visible>Control.HasFocus(450)</visible> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> </control> <control type="image"> <left>10</left> @@ -185,7 +185,7 @@ <width>940</width> <height>71</height> <visible>Control.HasFocus(451)</visible> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> </control> <control type="image"> <left>10</left> diff --git a/addons/skin.estuary/1080i/FileManager.xml b/addons/skin.estuary/1080i/FileManager.xml index 45fe5232c8..548b0cf80b 100644 --- a/addons/skin.estuary/1080i/FileManager.xml +++ b/addons/skin.estuary/1080i/FileManager.xml @@ -4,24 +4,12 @@ <controls> <include>DefaultBackground</include> <control type="image"> + <description>Dialog Header image</description> <left>926</left> <top>495</top> <width>68</width> <height>68</height> - <texture colordiffuse="button_focus">icons/file-manager/left-right.png</texture> - <animation effect="fade" start="0" end="100" time="300" delay="100">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="160">WindowClose</animation> - </control> - <control type="image"> - <left>836</left> - <top>580</top> - <width>250</width> - <height>330</height> - <fadetime>200</fadetime> - <texture>$VAR[FileManagerImageVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - <aspectratio aligny="bottom">keep</aspectratio> + <texture colordiffuse="button_focus" border="2">icons/file-manager/left-right.png</texture> <animation effect="fade" start="0" end="100" time="300" delay="100">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="160">WindowClose</animation> </control> @@ -36,13 +24,13 @@ <param name="scrollbar_id" value="60" /> <param name="onleft_id" value="21" /> <param name="onright_id" value="21" /> - <param name="width" value="700" /> - <param name="bg_width" value="740" /> + <param name="width" value="800" /> + <param name="bg_width" value="840" /> <param name="header_haspath" value="true" /> </include> </control> <control type="group"> - <left>1120</left> + <left>1020</left> <top>190</top> <include>OpenClose_Right</include> <include name="FileManagerPanel"> @@ -52,8 +40,8 @@ <param name="scrollbar_id" value="61" /> <param name="onleft_id" value="60" /> <param name="onright_id" value="20" /> - <param name="width" value="700" /> - <param name="bg_width" value="740" /> + <param name="width" value="800" /> + <param name="bg_width" value="840" /> <param name="header_haspath" value="true" /> </include> </control> diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml index 7509274407..1c5ce6849c 100644 --- a/addons/skin.estuary/1080i/Home.xml +++ b/addons/skin.estuary/1080i/Home.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <menucontrol>9000</menucontrol> - <defaultcontrol>9000</defaultcontrol> +<!-- <menucontrol>9000</menucontrol> + --> <defaultcontrol>9000</defaultcontrol> <!-- <onload condition="ControlGroup(700).HasFocus">SetFocus(9000,0)</onload> --> <backgroundcolor>background</backgroundcolor> @@ -445,7 +445,7 @@ <param name="sortorder" value="descending"/> <param name="list_id" value="8500"/> <param name="onup_id" value="8400"/> - <param name="ondown_id" value="20001"/> + <param name="ondown_id" value="8600"/> <param name="single_label" value="$INFO[ListItem.Label]"/> <param name="main_label" value=""/> <param name="sub_label" value=""/> @@ -456,6 +456,7 @@ <param name="button_label" value="$LOCALIZE[31118]" /> <param name="button_onclick" value="ActivateWindow(addonbrowser)"/> <param name="button_id" value="8600"/> + <param name="onup_id" value="8100"/> <param name="visible" value="!Integer.IsGreater(Container(8100).NumItems,0) + !Integer.IsGreater(Container(8200).NumItems,0) + !Integer.IsGreater(Container(8300).NumItems,0) + !Integer.IsGreater(Container(8400).NumItems,0) + !Integer.IsGreater(Container(8500).NumItems,0)"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/> </include> @@ -523,7 +524,7 @@ <param name="button_onclick" value="ActivateWindow(videos,root)"/> <param name="button_id" value="11300"/> <param name="onup_id" value="11200"/> - <param name="visible" value="!Control.IsVisible(11100) + !Control.IsVisible(11200)"/> + <param name="visible" value="!Control.IsVisible(111000) + !Control.IsVisible(112000)"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/> </include> </control> @@ -596,7 +597,7 @@ <param name="label2" value="$INFO[PVR.NowRecordingTitle][CR][COLOR=grey]$INFO[PVR.NowRecordingChannel][/COLOR]" /> </include> </control> - <control type="group">> + <control type="group"> <visible>PVR.HasNonRecordingTimer</visible> <width>680</width> <include name="PVRWidget"> @@ -892,6 +893,7 @@ <width>382</width> <height>671</height> <pagecontrol>70</pagecontrol> + <onfocus>ClearProperty(listposition,home)</onfocus> <onright condition="String.IsEqual(Container(9000).ListItem.Property(id),movies) + Control.IsVisible(5000)">5000</onright> <onright condition="String.IsEqual(Container(9000).ListItem.Property(id),tvshows) + Control.IsVisible(6000)">6000</onright> <onright condition="String.IsEqual(Container(9000).ListItem.Property(id),music) + Control.IsVisible(7000)">7000</onright> @@ -918,7 +920,7 @@ <top>0</top> <width>390</width> <height>73</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)">Conditional</animation> </control> <control type="image"> @@ -1103,6 +1105,11 @@ <ondown>14200</ondown> <onright>2000</onright> <include name="BottomMainMenuItem"> + <param name="control_id" value="803" /> + <param name="onclick" value="ActivateWindow(favourites)" /> + <param name="icon" value="icons/favourites.png" /> + </include> + <include name="BottomMainMenuItem"> <param name="control_id" value="801" /> <param name="onclick" value="ActivateWindow(filemanager)" /> <param name="icon" value="icons/filemanager.png" /> @@ -1113,11 +1120,6 @@ <param name="icon" value="icons/settings.png" /> </include> <include name="BottomMainMenuItem"> - <param name="control_id" value="803" /> - <param name="onclick" value="ActivateWindow(favourites)" /> - <param name="icon" value="icons/favourites.png" /> - </include> - <include name="BottomMainMenuItem"> <param name="control_id" value="804" /> <param name="onclick" value="ActivateWindow(shutdownmenu)" /> <param name="icon" value="icons/power.png" /> @@ -1144,7 +1146,7 @@ <radioposy>0</radioposy> <radiowidth>34</radiowidth> <radioheight>34</radioheight> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> <textureradioonfocus>icons/now-playing/fullscreen.png</textureradioonfocus> <textureradioonnofocus>icons/now-playing/fullscreen.png</textureradioonnofocus> diff --git a/addons/skin.estuary/1080i/Includes.xml b/addons/skin.estuary/1080i/Includes.xml index d5aa2f8236..9c83295aa1 100644 --- a/addons/skin.estuary/1080i/Includes.xml +++ b/addons/skin.estuary/1080i/Includes.xml @@ -30,7 +30,7 @@ <constant name="DepthSideBlade">0.10</constant> <constant name="bg_alpha">79</constant> <expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-ExtendedInfo Script-DialogVideoInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-DialogInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-VideoList.xml)</expression> - <expression name="sidebar_focused">[ControlGroup(9000).HasFocus | Control.HasFocus(6130)]</expression> + <expression name="sidebar_focused">ControlGroup(9000).HasFocus | Control.HasFocus(6130)</expression> <include name="CommonScrollbars"> <control type="group"> <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> @@ -230,7 +230,7 @@ <top>0</top> <width>470</width> <height>80</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="image"> @@ -350,7 +350,7 @@ <top>0</top> <width>$PARAM[width]</width> <height>$PARAM[height]</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="label"> @@ -502,7 +502,7 @@ <top>0</top> <width>$PARAM[width]</width> <height>69</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus($PARAM[list_id])">Conditional</animation> </control> <control type="label"> @@ -882,8 +882,8 @@ <control type="image"> <left>0</left> <top>0</top> - <width>1920</width> - <height>80</height> + <width>2000</width> + <height>83</height> <texture>frame/InfoBar.png</texture> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration)">WindowClose</animation> </control> @@ -1073,9 +1073,9 @@ <animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup) | Window.Previous(visualisation)">WindowOpen</animation> <control type="image"> <left>0</left> - <top>1000</top> - <width>1920</width> - <height>80</height> + <top>995</top> + <width>2000</width> + <height>85</height> <texture flipy="true">frame/InfoBar.png</texture> </control> <control type="group"> diff --git a/addons/skin.estuary/1080i/Includes_Buttons.xml b/addons/skin.estuary/1080i/Includes_Buttons.xml index 37227d844f..10092b362c 100644 --- a/addons/skin.estuary/1080i/Includes_Buttons.xml +++ b/addons/skin.estuary/1080i/Includes_Buttons.xml @@ -44,7 +44,7 @@ <textcolor>white</textcolor> <invalidcolor>invalid</invalidcolor> <selectedcolor>selected</selectedcolor> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus border="5">lists/separator.png</texturenofocus> </definition> </include> @@ -61,11 +61,11 @@ </include> <include name="SettingsItemCommon"> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <height>100</height> <aligny>center</aligny> <textoffsetx>40</textoffsetx> - <alttexturefocus border="40">buttons/dialogbutton-fo.png</alttexturefocus> + <alttexturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</alttexturefocus> <alttexturenofocus border="40">buttons/dialogbutton-nofo.png</alttexturenofocus> </include> <include name="SettingsLabelCommon"> @@ -84,7 +84,7 @@ <invalidcolor>invalid</invalidcolor> <selectedcolor>selected</selectedcolor> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> </include> <include name="DefaultDialogButton"> <param name="width">300</param> @@ -104,7 +104,7 @@ <onclick>$PARAM[onclick]</onclick> <wrapmultiline>$PARAM[wrapmultiline]</wrapmultiline> <align>center</align> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> <visible>$PARAM[visible]</visible> </control> @@ -113,7 +113,7 @@ <include name="KeyboardButton"> <width>125</width> <height>125</height> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/button-alt-nofo.png</texturenofocus> <align>center</align> <aligny>center</aligny> @@ -203,7 +203,7 @@ <aligny>center</aligny> <onclick>$PARAM[onclick]</onclick> <font>-</font> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <radioposx>38</radioposx> <radioposy>0</radioposy> @@ -223,7 +223,7 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> @@ -247,7 +247,7 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> @@ -277,7 +277,7 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> diff --git a/addons/skin.estuary/1080i/Includes_Home.xml b/addons/skin.estuary/1080i/Includes_Home.xml index 1985d959bb..84d346f7fc 100644 --- a/addons/skin.estuary/1080i/Includes_Home.xml +++ b/addons/skin.estuary/1080i/Includes_Home.xml @@ -94,7 +94,7 @@ <height>110</height> <align>center</align> <aligny>center</aligny> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> </control> <control type="image"> <left>45</left> @@ -187,11 +187,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> - <onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> - <ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -359,7 +358,7 @@ <textoffsetx>40</textoffsetx> <onclick>$PARAM[button_onclick]</onclick> <align>center</align> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> <visible>$PARAM[visible_1]</visible> </control> @@ -371,7 +370,7 @@ <onclick>$PARAM[button2_onclick]</onclick> <onclick>SetFocus(9000)</onclick> <align>center</align> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> <visible>$PARAM[visible_2]</visible> </control> @@ -420,9 +419,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup>Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown>Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -578,11 +578,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> - <onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> - <ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -723,7 +722,7 @@ <param name="sortby">label</param> <param name="sortorder">ascending</param> <definition> - <control type="group"> + <control type="group" id="$PARAM[list_id]0"> <description>Square Widget including header and arrows</description> <height>$PARAM[height]</height> <left>0</left> @@ -750,11 +749,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> - <onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> - <ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -808,7 +806,7 @@ <control type="image"> <width>340</width> <height>340</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="0" end="100" time="200">Focus</animation> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> @@ -878,11 +876,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> - <onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> - <ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -940,7 +937,7 @@ <control type="image"> <width>340</width> <height>500</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="0" end="100" time="200">Focus</animation> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> @@ -1027,11 +1024,10 @@ <orientation>horizontal</orientation> <onleft>9000</onleft> <onright>noop</onright> - <onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup> - <onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup> + <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> + <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> + <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> <onup>$PARAM[onup_id]</onup> - <ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown> - <ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown> <ondown>$PARAM[ondown_id]</ondown> <onback>SetFocus(9000)</onback> <preloaditems>1</preloaditems> @@ -1095,7 +1091,7 @@ <top>20</top> <width>260</width> <height>350</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> diff --git a/addons/skin.estuary/1080i/Includes_MediaMenu.xml b/addons/skin.estuary/1080i/Includes_MediaMenu.xml index e20c37537d..937bf4989b 100644 --- a/addons/skin.estuary/1080i/Includes_MediaMenu.xml +++ b/addons/skin.estuary/1080i/Includes_MediaMenu.xml @@ -9,9 +9,9 @@ <aligny>center</aligny> <textcolor>white</textcolor> <invalidcolor>invalid</invalidcolor> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus border="30">lists/separator.png</texturenofocus> - <alttexturefocus>lists/focus.png</alttexturefocus> + <alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus> <alttexturenofocus border="30">lists/separator.png</alttexturenofocus> </include> <include name="PVRQuickNavItemsCommon"> @@ -23,7 +23,7 @@ <align>center</align> <aligny>center</aligny> <font>-</font> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> <radioposx>26</radioposx> <radioposy>0</radioposy> diff --git a/addons/skin.estuary/1080i/Includes_PVR.xml b/addons/skin.estuary/1080i/Includes_PVR.xml index 0f386d7b48..8f6fb0f4c6 100644 --- a/addons/skin.estuary/1080i/Includes_PVR.xml +++ b/addons/skin.estuary/1080i/Includes_PVR.xml @@ -86,7 +86,7 @@ <top>0</top> <width>470</width> <height>70</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="image"> @@ -223,7 +223,7 @@ <top>0</top> <width>1050</width> <height>58</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[container_id])</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/LoginScreen.xml b/addons/skin.estuary/1080i/LoginScreen.xml index 6c55d2617e..1aa63cee0a 100644 --- a/addons/skin.estuary/1080i/LoginScreen.xml +++ b/addons/skin.estuary/1080i/LoginScreen.xml @@ -98,7 +98,7 @@ <top>0</top> <width>690</width> <height>130</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <visible>Control.HasFocus(52)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/MusicOSD.xml b/addons/skin.estuary/1080i/MusicOSD.xml index 3d72af7131..d86f8f9157 100644 --- a/addons/skin.estuary/1080i/MusicOSD.xml +++ b/addons/skin.estuary/1080i/MusicOSD.xml @@ -181,8 +181,8 @@ <onup>201</onup> <ondown condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</ondown> <ondown>201</ondown> - <onright>PlayerControl(Forward)</onright> - <onleft>PlayerControl(Rewind)</onleft> + <onright condition="!Player.Forwarding32x">PlayerControl(Forward)</onright> + <onleft condition="!Player.Rewinding32x">PlayerControl(Rewind)</onleft> <visible>Player.SeekEnabled</visible> <onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick> </control> diff --git a/addons/skin.estuary/1080i/MyPVRChannels.xml b/addons/skin.estuary/1080i/MyPVRChannels.xml index 6dc7a8ff74..99e9cbc16e 100644 --- a/addons/skin.estuary/1080i/MyPVRChannels.xml +++ b/addons/skin.estuary/1080i/MyPVRChannels.xml @@ -49,7 +49,7 @@ <top>0</top> <width>1000</width> <height>58</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(50)</visible> </control> <control type="progress"> @@ -174,7 +174,7 @@ <top>0</top> <width>1000</width> <height>77</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(50)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/MyPVRGuide.xml b/addons/skin.estuary/1080i/MyPVRGuide.xml index 1b366c61b1..ec8c284d59 100644 --- a/addons/skin.estuary/1080i/MyPVRGuide.xml +++ b/addons/skin.estuary/1080i/MyPVRGuide.xml @@ -121,7 +121,7 @@ <left>2</left> <width>54</width> <height>54</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(10)</visible> </control> <control type="image" id="2"> @@ -280,7 +280,7 @@ <left>0</left> <width>1090</width> <height>58</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(13)</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/MyPVRRecordings.xml b/addons/skin.estuary/1080i/MyPVRRecordings.xml index be1c4670ce..cfe92f73dc 100644 --- a/addons/skin.estuary/1080i/MyPVRRecordings.xml +++ b/addons/skin.estuary/1080i/MyPVRRecordings.xml @@ -44,7 +44,7 @@ <top>0</top> <width>1050</width> <height>70</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(50)">Conditional</animation> </control> <control type="image"> @@ -61,6 +61,7 @@ <height>70</height> <width>1050</width> <aligny>center</aligny> + <scroll>true</scroll> <label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/MyPVRSearch.xml b/addons/skin.estuary/1080i/MyPVRSearch.xml index d719bcf0b9..56fb74fe69 100644 --- a/addons/skin.estuary/1080i/MyPVRSearch.xml +++ b/addons/skin.estuary/1080i/MyPVRSearch.xml @@ -9,7 +9,6 @@ <control type="group"> <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation> <control type="group"> - <description>TV Search group</description> <visible>Control.IsVisible(50)</visible> <include>OpenClose_Left</include> <include>Visible_Left</include> @@ -104,7 +103,7 @@ <top>0</top> <width>1050</width> <height>101</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(50)</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/MyPVRTimers.xml b/addons/skin.estuary/1080i/MyPVRTimers.xml index 223051636d..a1dbad88f7 100644 --- a/addons/skin.estuary/1080i/MyPVRTimers.xml +++ b/addons/skin.estuary/1080i/MyPVRTimers.xml @@ -6,7 +6,6 @@ <controls> <include>DefaultBackground</include> <control type="group"> - <description>Timers group</description> <visible>Control.IsVisible(50)</visible> <control type="group"> <include>OpenClose_Left</include> @@ -94,7 +93,7 @@ <top>0</top> <width>1700</width> <height>101</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(50)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/MyPlaylist.xml b/addons/skin.estuary/1080i/MyPlaylist.xml index 3f4a9a76bc..4a065d2139 100644 --- a/addons/skin.estuary/1080i/MyPlaylist.xml +++ b/addons/skin.estuary/1080i/MyPlaylist.xml @@ -52,7 +52,7 @@ <top>0</top> <width>800</width> <height>63</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> </control> <control type="label"> <left>30</left> diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml index ea36a2c309..6fef15bc0c 100644 --- a/addons/skin.estuary/1080i/MyVideoNav.xml +++ b/addons/skin.estuary/1080i/MyVideoNav.xml @@ -111,9 +111,9 @@ </control> <control type="grouplist"> <top>845</top> - <right>140</right> + <right>150</right> <orientation>horizontal</orientation> - <width>380</width> + <width>360</width> <align>center</align> <include name="InfoFlag"> <param name="visible" value="!String.IsEmpty(ListItem.duration)" /> @@ -142,7 +142,6 @@ <top>180</top> <left>106</left> <visible>Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(actors) | Container.Content(directors)</visible> - <visible>!Control.IsVisible(502)</visible> <visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(55)</visible> <include>OpenClose_Left</include> <include>Visible_Left</include> diff --git a/addons/skin.estuary/1080i/MyWeather.xml b/addons/skin.estuary/1080i/MyWeather.xml index 84bcaa2380..1e252b0d20 100644 --- a/addons/skin.estuary/1080i/MyWeather.xml +++ b/addons/skin.estuary/1080i/MyWeather.xml @@ -95,7 +95,7 @@ <onclick>SettingsLevelChange</onclick> <textoffsetx>40</textoffsetx> <textoffsety>0</textoffsety> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <onleft>3000</onleft> <onright>3000</onright> @@ -144,7 +144,7 @@ <top>0</top> <width>665</width> <height>107</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus($PARAM[list_id])">Conditional</animation> </control> <control type="image"> @@ -335,7 +335,7 @@ <top>0</top> <width>665</width> <height>107</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus($PARAM[list_id])">Conditional</animation> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/Settings.xml b/addons/skin.estuary/1080i/Settings.xml index 43470c64d4..a9b357d624 100644 --- a/addons/skin.estuary/1080i/Settings.xml +++ b/addons/skin.estuary/1080i/Settings.xml @@ -20,9 +20,9 @@ <texture border="40">buttons/button-nofo.png</texture> </control> <control type="image"> - <left>19</left> + <left>21</left> <top>179</top> - <width>359</width> + <width>358</width> <height>50</height> <texture colordiffuse="border_alpha">colors/black.png</texture> </control> @@ -48,10 +48,10 @@ <control type="group"> <depth>DepthContentPopout</depth> <animation type="Focus" reversible="false"> - <effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" /> + <effect type="zoom" center="200,125" start="100" end="108" time="250" tween="sine" /> </animation> <animation type="UnFocus" reversible="false"> - <effect type="zoom" center="auto" start="108" end="100" time="250" tween="sine" /> + <effect type="zoom" center="200,125" start="108" end="100" time="250" tween="sine" /> </animation> <control type="image"> <width>400</width> @@ -61,13 +61,13 @@ <control type="image"> <width>400</width> <height>250</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> <control type="image"> - <left>19</left> + <left>21</left> <top>179</top> - <width>359</width> + <width>358</width> <height>50</height> <texture colordiffuse="border_alpha">colors/black.png</texture> </control> diff --git a/addons/skin.estuary/1080i/SettingsCategory.xml b/addons/skin.estuary/1080i/SettingsCategory.xml index 02d030a7a3..52be3772eb 100644 --- a/addons/skin.estuary/1080i/SettingsCategory.xml +++ b/addons/skin.estuary/1080i/SettingsCategory.xml @@ -34,7 +34,7 @@ <aligny>center</aligny> <font>font13_title</font> <textcolor>white</textcolor> - <texturefocus>lists/focus.png</texturefocus> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus border="2">lists/separator.png</texturenofocus> </control> <control type="radiobutton" id="20"> @@ -46,7 +46,7 @@ <onclick>SettingsLevelChange</onclick> <textoffsetx>100</textoffsetx> <textoffsety>0</textoffsety> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texturefocus> <texturenofocus colordiffuse="71FFFFFF" border="40">buttons/button-alt-nofo.png</texturenofocus> <radioposx>40</radioposx> <radioposy>0</radioposy> diff --git a/addons/skin.estuary/1080i/SettingsProfile.xml b/addons/skin.estuary/1080i/SettingsProfile.xml index e28eaa80cc..36cfabf9b9 100644 --- a/addons/skin.estuary/1080i/SettingsProfile.xml +++ b/addons/skin.estuary/1080i/SettingsProfile.xml @@ -38,7 +38,7 @@ <control type="image"> <width>348</width> <height>74</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="50" time="40" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> @@ -131,7 +131,7 @@ <control type="image"> <width>325</width> <height>352</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(2)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml index 4fabca8765..d3d3279438 100644 --- a/addons/skin.estuary/1080i/Variables.xml +++ b/addons/skin.estuary/1080i/Variables.xml @@ -52,7 +52,7 @@ </variable> <variable name="GlobalFanartVar"> <value condition="Skin.HasSetting(use_custom_bg) + !String.IsEmpty(Skin.String(custom_background))">$INFO[Skin.String(custom_background)]</value> - <value>special://skin/extras/backgrounds/$INFO[Skin.CurrentTheme].jpg</value> + <value>special://skin/extras/backgrounds/$INFO[Skin.CurrentColourTheme].jpg</value> </variable> <variable name="FullScreenInfoTextBoxVar"> <value condition="Control.HasFocus(5552)">$INFO[VideoPlayer.Duration,$LOCALIZE[180]: [B],[/B][CR]]</value> @@ -313,6 +313,7 @@ <value condition="ListItem.IsParentFolder">-</value> <value condition="ListItem.IsResumable">overlays/watched/resume.png</value> <value condition="!String.IsEmpty(ListItem.Overlay)">$INFO[ListItem.Overlay]</value> + <value condition="ListItem.IsFolder + Container.Content(files)">overlays/folder.png</value> <value>OverlayUnwatched.png</value> </variable> <variable name="SettingsSectionIcon"> @@ -351,12 +352,6 @@ <value condition="!String.IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value> <value>$LOCALIZE[19199] - $LOCALIZE[19023]</value> </variable> - <variable name="FileManagerImageVar"> -<!-- <value condition="Control.HasFocus(20) + Container(20).ListItem.IsFolder">DefaultFolderSquare.png</value> - <value condition="Control.HasFocus(21) + Container(21).ListItem.IsFolder">DefaultFolderSquare.png</value> --> - <value condition="Control.HasFocus(21)">$INFO[Container(21).ListItem.FolderPath]</value> - <value condition="Control.HasFocus(20)">$INFO[Container(20).ListItem.FolderPath]</value> - </variable> <variable name="PVRAreaVar"> <value condition="Control.HasFocus(100)">$LOCALIZE[19019]</value> <value condition="Control.HasFocus(101)">$LOCALIZE[19069]</value> diff --git a/addons/skin.estuary/1080i/VideoOSD.xml b/addons/skin.estuary/1080i/VideoOSD.xml index 29090e0378..852036cd3e 100644 --- a/addons/skin.estuary/1080i/VideoOSD.xml +++ b/addons/skin.estuary/1080i/VideoOSD.xml @@ -240,8 +240,8 @@ <onup>201</onup> <onunfocus condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onunfocus> <ondown>201</ondown> - <onright>PlayerControl(Forward)</onright> - <onleft>PlayerControl(Rewind)</onleft> + <onright condition="!Player.Forwarding32x">PlayerControl(Forward)</onright> + <onleft condition="!Player.Rewinding32x">PlayerControl(Rewind)</onleft> <visible>Player.SeekEnabled</visible> <onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick> </control> diff --git a/addons/skin.estuary/1080i/View_50_List.xml b/addons/skin.estuary/1080i/View_50_List.xml index 2f6d867326..4b97836e58 100644 --- a/addons/skin.estuary/1080i/View_50_List.xml +++ b/addons/skin.estuary/1080i/View_50_List.xml @@ -54,7 +54,7 @@ <top>0</top> <width>710</width> <height>69</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="label"> diff --git a/addons/skin.estuary/1080i/View_51_Poster.xml b/addons/skin.estuary/1080i/View_51_Poster.xml index b3a4c6d732..abba3972dc 100644 --- a/addons/skin.estuary/1080i/View_51_Poster.xml +++ b/addons/skin.estuary/1080i/View_51_Poster.xml @@ -143,7 +143,7 @@ <shadowcolor>text_shadow</shadowcolor> <visible>!String.IsEmpty(ListItem.Duration)</visible> </control> - <control type="label">> + <control type="label"> <font>font12</font> <width>1160</width> <height>38</height> @@ -159,7 +159,7 @@ <shadowcolor>text_shadow</shadowcolor> <visible>[String.IsEmpty(ListItem.Director) | String.IsEmpty(ListItem.Duration)] + !String.IsEmpty(ListItem.Genre)</visible> </control> - <control type="label">> + <control type="label"> <font>font12</font> <width>1160</width> <height>38</height> diff --git a/addons/skin.estuary/1080i/View_52_IconWall.xml b/addons/skin.estuary/1080i/View_52_IconWall.xml index a18b79424f..deca515325 100644 --- a/addons/skin.estuary/1080i/View_52_IconWall.xml +++ b/addons/skin.estuary/1080i/View_52_IconWall.xml @@ -40,9 +40,9 @@ <align>center</align> </control> <control type="image"> - <left>19</left> + <left>21</left> <top>149</top> - <width>359</width> + <width>358</width> <height>75</height> <texture colordiffuse="border_alpha">colors/black.png</texture> </control> @@ -85,7 +85,7 @@ <control type="image"> <width>400</width> <height>245</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> <control type="image"> @@ -107,9 +107,9 @@ <visible>!String.EndsWith(ListItem.Overlay,watched.png)</visible> </control> <control type="image"> - <left>19</left> + <left>21</left> <top>149</top> - <width>359</width> + <width>358</width> <height>75</height> <texture colordiffuse="border_alpha">colors/black.png</texture> </control> @@ -161,7 +161,7 @@ <control type="image"> <width>330</width> <height>124</height> - <texture border="40">buttons/button-theme-fo.png</texture> + <texture border="40" colordiffuse="button_focus">buttons/button-theme-fo.png</texture> <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> </control> <control type="textbox"> diff --git a/addons/skin.estuary/1080i/View_55_WideList.xml b/addons/skin.estuary/1080i/View_55_WideList.xml index dae8d4fe0f..97b7d1a2d8 100644 --- a/addons/skin.estuary/1080i/View_55_WideList.xml +++ b/addons/skin.estuary/1080i/View_55_WideList.xml @@ -47,11 +47,11 @@ <top>0</top> <width>1396</width> <height>63</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(55)</visible> </control> <control type="label"> - <left>13</left> + <left>18</left> <top>2</top> <height>63</height> <width>70</width> @@ -62,7 +62,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> - <left>95</left> + <left>105</left> <top>0</top> <height>63</height> <width>960</width> @@ -85,7 +85,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="image"> - <left>21</left> + <left>26</left> <top>20</top> <width>32</width> <height>32</height> @@ -94,7 +94,7 @@ <animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation> </control> <control type="image"> - <left>21</left> + <left>26</left> <top>20</top> <width>32</width> <visible>String.IsEmpty(ListItem.Year)</visible> @@ -113,7 +113,7 @@ <texture border="90,3,90,3">lists/separator.png</texture> </control> <control type="label"> - <left>13</left> + <left>18</left> <top>2</top> <height>63</height> <width>70</width> @@ -124,7 +124,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> - <left>95</left> + <left>105</left> <top>0</top> <height>63</height> <width>960</width> @@ -146,7 +146,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="image"> - <left>21</left> + <left>26</left> <top>20</top> <visible>String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion)</visible> <width>32</width> @@ -173,30 +173,18 @@ <top>0</top> <width>1396</width> <height>63</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(55)</visible> </control> <control type="label"> - <left>12</left> - <top>-2</top> - <height>63</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <label>$INFO[ListItem.TrackNumber]</label> - <textcolor>button_focus</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>95</left> + <left>35</left> <top>0</top> <height>63</height> - <width>860</width> + <width>1030</width> <aligny>center</aligny> <scroll>true</scroll> <font>fontContextMenu</font> - <label>$VAR[SongTitleVar]</label> + <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> @@ -221,25 +209,13 @@ <texture border="90,3,90,3">lists/separator.png</texture> </control> <control type="label"> - <left>12</left> - <top>-2</top> - <height>63</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <label>$INFO[ListItem.TrackNumber]</label> - <textcolor>button_focus</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>95</left> + <left>35</left> <top>0</top> <height>63</height> - <width>960</width> + <width>1030</width> <aligny>center</aligny> <font>fontContextMenu</font> - <label>$VAR[SongTitleVar]</label> + <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> @@ -270,7 +246,7 @@ <top>0</top> <width>1396</width> <height>63</height> - <texture>lists/focus.png</texture> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(55)</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/addon.xml b/addons/skin.estuary/addon.xml index 71b34ff818..15c7a6054f 100644 --- a/addons/skin.estuary/addon.xml +++ b/addons/skin.estuary/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estuary" version="0.7.5" name="Estuary" provider-name="phil65, Piers"> +<addon id="skin.estuary" version="0.7.6" name="Estuary" provider-name="phil65, Piers"> <requires> <import addon="xbmc.gui" version="5.11.0"/> </requires> diff --git a/addons/skin.estuary/build.bat b/addons/skin.estuary/build.bat index c1ec334218..c483ea9da8 100644 --- a/addons/skin.estuary/build.bat +++ b/addons/skin.estuary/build.bat @@ -16,11 +16,6 @@ ECHO ---------------------------------------- ECHO Creating XBT File... START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input media -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\Textures.xbt START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\curial -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\curial.xbt -START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\green -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\green.xbt -START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\orange -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\orange.xbt -START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\pink -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\pink.xbt -START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\maroon -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\maroon.xbt -START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input themes\charcoal -output ..\..\project\Win32BuildSetup\BUILD_WIN32\application\addons\skin.estuary\media\charcoal.xbt ECHO ---------------------------------------- ECHO XBT Texture Files Created... diff --git a/addons/skin.estuary/colors/gold.xml b/addons/skin.estuary/colors/gold.xml new file mode 100644 index 0000000000..eb40643383 --- /dev/null +++ b/addons/skin.estuary/colors/gold.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<colors> + <color name="background">FF000000</color> + <color name="black">FF000000</color> + <color name="white">FFF0F0F0</color> + <color name="grey">FFA0A0A0</color> + <color name="blue">FF7ACAFE</color> + <color name="red">FFCE4421</color> + <color name="button_focus">FFCFA700</color> + <color name="text_shadow">22000000</color> + <color name="border_alpha">60FFFFFF</color> + <color name="disabled">40FFFFFF</color> + <color name="selected">FF11E7B1</color> + <color name="invalid">FFFF0000</color> +</colors> diff --git a/addons/skin.estuary/extras/backgrounds/gold.jpg b/addons/skin.estuary/extras/backgrounds/gold.jpg Binary files differnew file mode 100644 index 0000000000..8fa4e1d6ac --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/gold.jpg diff --git a/addons/skin.estuary/media/Makefile.in b/addons/skin.estuary/media/Makefile.in index ccdecd08ef..72db8d2e93 100644 --- a/addons/skin.estuary/media/Makefile.in +++ b/addons/skin.estuary/media/Makefile.in @@ -1,10 +1,5 @@ TARGET=Textures.xbt TARGET_CURIAL=curial.xbt -TARGET_GREEN=green.xbt -TARGET_ORANGE=orange.xbt -TARGET_PINK=pink.xbt -TARGET_MAROON=maroon.xbt -TARGET_CHARCOAL=charcoal.xbt all: TEXTURES @@ -13,19 +8,9 @@ all: TEXTURES TEXTURES: @TEXTUREPACKER@ -dupecheck -input . -output $(TARGET) @TEXTUREPACKER@ -dupecheck -input ../themes/curial -output $(TARGET_CURIAL) - @TEXTUREPACKER@ -dupecheck -input ../themes/green -output $(TARGET_GREEN) - @TEXTUREPACKER@ -dupecheck -input ../themes/orange -output $(TARGET_ORANGE) - @TEXTUREPACKER@ -dupecheck -input ../themes/pink -output $(TARGET_PINK) - @TEXTUREPACKER@ -dupecheck -input ../themes/maroon -output $(TARGET_MAROON) - @TEXTUREPACKER@ -dupecheck -input ../themes/charcoal -output $(TARGET_CHARCOAL) clean: rm -f $(TARGET) rm -f $(TARGET_CURIAL) - rm -f $(TARGET_GREEN) - rm -f $(TARGET_ORANGE) - rm -f $(TARGET_PINK) - rm -f $(TARGET_MAROON) - rm -f $(TARGET_CHARCOAL) distclean: clean diff --git a/addons/skin.estuary/media/buttons/button-nofo.png b/addons/skin.estuary/media/buttons/button-nofo.png Binary files differindex 053a149f0a..47e955c8f9 100644 --- a/addons/skin.estuary/media/buttons/button-nofo.png +++ b/addons/skin.estuary/media/buttons/button-nofo.png diff --git a/addons/skin.estuary/media/buttons/button-theme-fo.png b/addons/skin.estuary/media/buttons/button-theme-fo.png Binary files differindex 551306e5f3..d0ac15c23e 100644 --- a/addons/skin.estuary/media/buttons/button-theme-fo.png +++ b/addons/skin.estuary/media/buttons/button-theme-fo.png diff --git a/addons/skin.estuary/media/buttons/dialogbutton-fo.png b/addons/skin.estuary/media/buttons/dialogbutton-fo.png Binary files differindex 4aeb3c7818..1bc84ff158 100644 --- a/addons/skin.estuary/media/buttons/dialogbutton-fo.png +++ b/addons/skin.estuary/media/buttons/dialogbutton-fo.png diff --git a/addons/skin.estuary/media/buttons/radio-button-off.png b/addons/skin.estuary/media/buttons/radio-button-off.png Binary files differindex c201e24151..817c9eb984 100644 --- a/addons/skin.estuary/media/buttons/radio-button-off.png +++ b/addons/skin.estuary/media/buttons/radio-button-off.png diff --git a/addons/skin.estuary/media/buttons/radio-button-on.png b/addons/skin.estuary/media/buttons/radio-button-on.png Binary files differindex d1f6202bee..8e451d5ff6 100644 --- a/addons/skin.estuary/media/buttons/radio-button-on.png +++ b/addons/skin.estuary/media/buttons/radio-button-on.png diff --git a/addons/skin.estuary/media/frame/InfoBar.png b/addons/skin.estuary/media/frame/InfoBar.png Binary files differindex 0f5b43cc28..420b89de94 100644 --- a/addons/skin.estuary/media/frame/InfoBar.png +++ b/addons/skin.estuary/media/frame/InfoBar.png diff --git a/addons/skin.estuary/media/icons/defaulticons/DefaultAddonInputstream.png b/addons/skin.estuary/media/icons/defaulticons/DefaultAddonInputstream.png Binary files differnew file mode 100644 index 0000000000..dc3c8dbbb0 --- /dev/null +++ b/addons/skin.estuary/media/icons/defaulticons/DefaultAddonInputstream.png diff --git a/addons/skin.estuary/media/icons/favourites.png b/addons/skin.estuary/media/icons/favourites.png Binary files differindex e50f4beb9c..e65cda0dd8 100644 --- a/addons/skin.estuary/media/icons/favourites.png +++ b/addons/skin.estuary/media/icons/favourites.png diff --git a/addons/skin.estuary/media/icons/filemanager.png b/addons/skin.estuary/media/icons/filemanager.png Binary files differindex e8bd859ebf..77719826a4 100644 --- a/addons/skin.estuary/media/icons/filemanager.png +++ b/addons/skin.estuary/media/icons/filemanager.png diff --git a/addons/skin.estuary/media/icons/home/addons.png b/addons/skin.estuary/media/icons/home/addons.png Binary files differindex dc86cb433b..3c90f86e2c 100644 --- a/addons/skin.estuary/media/icons/home/addons.png +++ b/addons/skin.estuary/media/icons/home/addons.png diff --git a/addons/skin.estuary/media/icons/home/livetv.png b/addons/skin.estuary/media/icons/home/livetv.png Binary files differindex 7aa23cdfc4..f40cacf6d7 100644 --- a/addons/skin.estuary/media/icons/home/livetv.png +++ b/addons/skin.estuary/media/icons/home/livetv.png diff --git a/addons/skin.estuary/media/icons/home/movies.png b/addons/skin.estuary/media/icons/home/movies.png Binary files differindex d16abdcb1a..834c144ab8 100644 --- a/addons/skin.estuary/media/icons/home/movies.png +++ b/addons/skin.estuary/media/icons/home/movies.png diff --git a/addons/skin.estuary/media/icons/home/music.png b/addons/skin.estuary/media/icons/home/music.png Binary files differindex 7afd98aa54..6613626355 100644 --- a/addons/skin.estuary/media/icons/home/music.png +++ b/addons/skin.estuary/media/icons/home/music.png diff --git a/addons/skin.estuary/media/icons/home/pictures.png b/addons/skin.estuary/media/icons/home/pictures.png Binary files differindex d1f5609d21..f883a0bc9d 100644 --- a/addons/skin.estuary/media/icons/home/pictures.png +++ b/addons/skin.estuary/media/icons/home/pictures.png diff --git a/addons/skin.estuary/media/icons/home/radio.png b/addons/skin.estuary/media/icons/home/radio.png Binary files differindex 092e46d722..09e305ff6d 100644 --- a/addons/skin.estuary/media/icons/home/radio.png +++ b/addons/skin.estuary/media/icons/home/radio.png diff --git a/addons/skin.estuary/media/icons/home/tv.png b/addons/skin.estuary/media/icons/home/tv.png Binary files differindex d350263e87..49c57104fd 100644 --- a/addons/skin.estuary/media/icons/home/tv.png +++ b/addons/skin.estuary/media/icons/home/tv.png diff --git a/addons/skin.estuary/media/icons/home/videos.png b/addons/skin.estuary/media/icons/home/videos.png Binary files differindex d74b40edc4..6bfa876cba 100644 --- a/addons/skin.estuary/media/icons/home/videos.png +++ b/addons/skin.estuary/media/icons/home/videos.png diff --git a/addons/skin.estuary/media/icons/home/weather.png b/addons/skin.estuary/media/icons/home/weather.png Binary files differindex 42f380bdd1..0b2d000900 100644 --- a/addons/skin.estuary/media/icons/home/weather.png +++ b/addons/skin.estuary/media/icons/home/weather.png diff --git a/addons/skin.estuary/media/icons/now-playing/fullscreen.png b/addons/skin.estuary/media/icons/now-playing/fullscreen.png Binary files differindex 7b159c6d1d..32cc066301 100644 --- a/addons/skin.estuary/media/icons/now-playing/fullscreen.png +++ b/addons/skin.estuary/media/icons/now-playing/fullscreen.png diff --git a/addons/skin.estuary/media/icons/now-playing/next.png b/addons/skin.estuary/media/icons/now-playing/next.png Binary files differindex a923b15698..f86037cabb 100644 --- a/addons/skin.estuary/media/icons/now-playing/next.png +++ b/addons/skin.estuary/media/icons/now-playing/next.png diff --git a/addons/skin.estuary/media/icons/now-playing/pause.png b/addons/skin.estuary/media/icons/now-playing/pause.png Binary files differindex 67736afae0..f44f7b3d6e 100644 --- a/addons/skin.estuary/media/icons/now-playing/pause.png +++ b/addons/skin.estuary/media/icons/now-playing/pause.png diff --git a/addons/skin.estuary/media/icons/now-playing/play.png b/addons/skin.estuary/media/icons/now-playing/play.png Binary files differindex 84031fde3c..c066789800 100644 --- a/addons/skin.estuary/media/icons/now-playing/play.png +++ b/addons/skin.estuary/media/icons/now-playing/play.png diff --git a/addons/skin.estuary/media/icons/now-playing/stop.png b/addons/skin.estuary/media/icons/now-playing/stop.png Binary files differindex 1b1df08399..f44da872e5 100644 --- a/addons/skin.estuary/media/icons/now-playing/stop.png +++ b/addons/skin.estuary/media/icons/now-playing/stop.png diff --git a/addons/skin.estuary/media/icons/power.png b/addons/skin.estuary/media/icons/power.png Binary files differindex adc292b536..75c0014f7a 100644 --- a/addons/skin.estuary/media/icons/power.png +++ b/addons/skin.estuary/media/icons/power.png diff --git a/addons/skin.estuary/media/icons/settings.png b/addons/skin.estuary/media/icons/settings.png Binary files differindex dc4ef51326..dba29ffcfc 100644 --- a/addons/skin.estuary/media/icons/settings.png +++ b/addons/skin.estuary/media/icons/settings.png diff --git a/addons/skin.estuary/media/lists/focus.png b/addons/skin.estuary/media/lists/focus.png Binary files differindex 417f00012c..aa7b0e6d39 100644 --- a/addons/skin.estuary/media/lists/focus.png +++ b/addons/skin.estuary/media/lists/focus.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/bookmarks.png b/addons/skin.estuary/media/osd/fullscreen/buttons/bookmarks.png Binary files differindex ff20125dd8..81afd6f800 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/bookmarks.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/bookmarks.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/guide.png b/addons/skin.estuary/media/osd/fullscreen/buttons/guide.png Binary files differindex 7e74ab849c..c0a30dd3ad 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/guide.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/guide.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/home.png b/addons/skin.estuary/media/osd/fullscreen/buttons/home.png Binary files differindex 6abc2b9dc2..fff437b501 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/home.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/home.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/next.png b/addons/skin.estuary/media/osd/fullscreen/buttons/next.png Binary files differindex be12ca9f96..573761e3da 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/next.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/next.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/pause.png b/addons/skin.estuary/media/osd/fullscreen/buttons/pause.png Binary files differindex 2c99282fd1..641bc9fe33 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/pause.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/pause.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/play.png b/addons/skin.estuary/media/osd/fullscreen/buttons/play.png Binary files differindex e57c654331..913f2e2037 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/play.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/play.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/previous.png b/addons/skin.estuary/media/osd/fullscreen/buttons/previous.png Binary files differindex 0e381a333e..f59a9ed19e 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/previous.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/previous.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/random-off.png b/addons/skin.estuary/media/osd/fullscreen/buttons/random-off.png Binary files differindex 9b74807ba0..16e958b8d4 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/random-off.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/random-off.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/random-on.png b/addons/skin.estuary/media/osd/fullscreen/buttons/random-on.png Binary files differindex 3f28bc52f5..5855e5300b 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/random-on.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/random-on.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/rating.png b/addons/skin.estuary/media/osd/fullscreen/buttons/rating.png Binary files differindex c60b14ab65..7dff72a345 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/rating.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/rating.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-all.png b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-all.png Binary files differindex 51147691fb..859c6c3ec1 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-all.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-all.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-off.png b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-off.png Binary files differindex 8a8684299d..7aa85ed88c 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-off.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-off.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-one.png b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-one.png Binary files differindex 10a31c388a..25bd00304f 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-one.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/repeat-one.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/settings-subtitle.png b/addons/skin.estuary/media/osd/fullscreen/buttons/settings-subtitle.png Binary files differindex c819a496f9..310dd0f86a 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/settings-subtitle.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/settings-subtitle.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/stop.png b/addons/skin.estuary/media/osd/fullscreen/buttons/stop.png Binary files differindex 39f0f30236..a33c0d31be 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/stop.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/stop.png diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/teletext.png b/addons/skin.estuary/media/osd/fullscreen/buttons/teletext.png Binary files differindex 1565e50d73..f6dfd47695 100644 --- a/addons/skin.estuary/media/osd/fullscreen/buttons/teletext.png +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/teletext.png diff --git a/addons/skin.estuary/media/overlays/folder.png b/addons/skin.estuary/media/overlays/folder.png Binary files differnew file mode 100644 index 0000000000..a49798944c --- /dev/null +++ b/addons/skin.estuary/media/overlays/folder.png diff --git a/addons/skin.estuary/themes/charcoal/buttons/button-theme-fo.png b/addons/skin.estuary/themes/charcoal/buttons/button-theme-fo.png Binary files differdeleted file mode 100644 index 11e1387724..0000000000 --- a/addons/skin.estuary/themes/charcoal/buttons/button-theme-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/charcoal/buttons/dialogbutton-fo.png b/addons/skin.estuary/themes/charcoal/buttons/dialogbutton-fo.png Binary files differdeleted file mode 100644 index 11e1387724..0000000000 --- a/addons/skin.estuary/themes/charcoal/buttons/dialogbutton-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/charcoal/buttons/radio-button-off.png b/addons/skin.estuary/themes/charcoal/buttons/radio-button-off.png Binary files differdeleted file mode 100644 index ec04c8d0d5..0000000000 --- a/addons/skin.estuary/themes/charcoal/buttons/radio-button-off.png +++ /dev/null diff --git a/addons/skin.estuary/themes/charcoal/buttons/radio-button-on.png b/addons/skin.estuary/themes/charcoal/buttons/radio-button-on.png Binary files differdeleted file mode 100644 index 8e451d5ff6..0000000000 --- a/addons/skin.estuary/themes/charcoal/buttons/radio-button-on.png +++ /dev/null diff --git a/addons/skin.estuary/themes/charcoal/lists/focus.png b/addons/skin.estuary/themes/charcoal/lists/focus.png Binary files differdeleted file mode 100644 index c7b9231e39..0000000000 --- a/addons/skin.estuary/themes/charcoal/lists/focus.png +++ /dev/null diff --git a/addons/skin.estuary/themes/curial/buttons/button-nofo.png b/addons/skin.estuary/themes/curial/buttons/button-nofo.png Binary files differindex 212141f80d..a7f32dd112 100644 --- a/addons/skin.estuary/themes/curial/buttons/button-nofo.png +++ b/addons/skin.estuary/themes/curial/buttons/button-nofo.png diff --git a/addons/skin.estuary/themes/curial/buttons/button-theme-fo.png b/addons/skin.estuary/themes/curial/buttons/button-theme-fo.png Binary files differindex 983ce8709b..fc0d5a3b09 100644 --- a/addons/skin.estuary/themes/curial/buttons/button-theme-fo.png +++ b/addons/skin.estuary/themes/curial/buttons/button-theme-fo.png diff --git a/addons/skin.estuary/themes/curial/frame/InfoBar.png b/addons/skin.estuary/themes/curial/frame/InfoBar.png Binary files differindex 851c23e504..286bd8bed1 100644 --- a/addons/skin.estuary/themes/curial/frame/InfoBar.png +++ b/addons/skin.estuary/themes/curial/frame/InfoBar.png diff --git a/addons/skin.estuary/themes/curial/lists/focus.png b/addons/skin.estuary/themes/curial/lists/focus.png Binary files differindex c1d73456e7..35caa559bf 100644 --- a/addons/skin.estuary/themes/curial/lists/focus.png +++ b/addons/skin.estuary/themes/curial/lists/focus.png diff --git a/addons/skin.estuary/themes/green/buttons/button-theme-fo.png b/addons/skin.estuary/themes/green/buttons/button-theme-fo.png Binary files differdeleted file mode 100644 index b1feaf789e..0000000000 --- a/addons/skin.estuary/themes/green/buttons/button-theme-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/green/buttons/dialogbutton-fo.png b/addons/skin.estuary/themes/green/buttons/dialogbutton-fo.png Binary files differdeleted file mode 100644 index b1feaf789e..0000000000 --- a/addons/skin.estuary/themes/green/buttons/dialogbutton-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/green/buttons/radio-button-on.png b/addons/skin.estuary/themes/green/buttons/radio-button-on.png Binary files differdeleted file mode 100644 index 168b270eee..0000000000 --- a/addons/skin.estuary/themes/green/buttons/radio-button-on.png +++ /dev/null diff --git a/addons/skin.estuary/themes/green/lists/focus.png b/addons/skin.estuary/themes/green/lists/focus.png Binary files differdeleted file mode 100644 index 291e99893d..0000000000 --- a/addons/skin.estuary/themes/green/lists/focus.png +++ /dev/null diff --git a/addons/skin.estuary/themes/maroon/buttons/button-theme-fo.png b/addons/skin.estuary/themes/maroon/buttons/button-theme-fo.png Binary files differdeleted file mode 100644 index c2fd0b2c2e..0000000000 --- a/addons/skin.estuary/themes/maroon/buttons/button-theme-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/maroon/buttons/dialogbutton-fo.png b/addons/skin.estuary/themes/maroon/buttons/dialogbutton-fo.png Binary files differdeleted file mode 100644 index c2fd0b2c2e..0000000000 --- a/addons/skin.estuary/themes/maroon/buttons/dialogbutton-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/maroon/buttons/radio-button-on.png b/addons/skin.estuary/themes/maroon/buttons/radio-button-on.png Binary files differdeleted file mode 100644 index 3a99995744..0000000000 --- a/addons/skin.estuary/themes/maroon/buttons/radio-button-on.png +++ /dev/null diff --git a/addons/skin.estuary/themes/maroon/lists/focus.png b/addons/skin.estuary/themes/maroon/lists/focus.png Binary files differdeleted file mode 100644 index 7f51b35b32..0000000000 --- a/addons/skin.estuary/themes/maroon/lists/focus.png +++ /dev/null diff --git a/addons/skin.estuary/themes/orange/buttons/button-theme-fo.png b/addons/skin.estuary/themes/orange/buttons/button-theme-fo.png Binary files differdeleted file mode 100644 index ea6073ac74..0000000000 --- a/addons/skin.estuary/themes/orange/buttons/button-theme-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/orange/buttons/dialogbutton-fo.png b/addons/skin.estuary/themes/orange/buttons/dialogbutton-fo.png Binary files differdeleted file mode 100644 index ea6073ac74..0000000000 --- a/addons/skin.estuary/themes/orange/buttons/dialogbutton-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/orange/buttons/radio-button-on.png b/addons/skin.estuary/themes/orange/buttons/radio-button-on.png Binary files differdeleted file mode 100644 index 5c58bee733..0000000000 --- a/addons/skin.estuary/themes/orange/buttons/radio-button-on.png +++ /dev/null diff --git a/addons/skin.estuary/themes/orange/lists/focus.png b/addons/skin.estuary/themes/orange/lists/focus.png Binary files differdeleted file mode 100644 index a41dd9921e..0000000000 --- a/addons/skin.estuary/themes/orange/lists/focus.png +++ /dev/null diff --git a/addons/skin.estuary/themes/pink/buttons/button-theme-fo.png b/addons/skin.estuary/themes/pink/buttons/button-theme-fo.png Binary files differdeleted file mode 100644 index c76768a126..0000000000 --- a/addons/skin.estuary/themes/pink/buttons/button-theme-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/pink/buttons/dialogbutton-fo.png b/addons/skin.estuary/themes/pink/buttons/dialogbutton-fo.png Binary files differdeleted file mode 100644 index 96c6ebf4b5..0000000000 --- a/addons/skin.estuary/themes/pink/buttons/dialogbutton-fo.png +++ /dev/null diff --git a/addons/skin.estuary/themes/pink/buttons/radio-button-on.png b/addons/skin.estuary/themes/pink/buttons/radio-button-on.png Binary files differdeleted file mode 100644 index a85ec84239..0000000000 --- a/addons/skin.estuary/themes/pink/buttons/radio-button-on.png +++ /dev/null diff --git a/addons/skin.estuary/themes/pink/lists/focus.png b/addons/skin.estuary/themes/pink/lists/focus.png Binary files differdeleted file mode 100644 index b294a5f291..0000000000 --- a/addons/skin.estuary/themes/pink/lists/focus.png +++ /dev/null |
