diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2016-03-15 21:50:29 +0100 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2016-03-15 21:50:29 +0100 |
| commit | c8ff6e6231070501d4b7312332caf8edb154bba1 (patch) | |
| tree | 6aa22bb8214b2128c08c1a412660b01a387dbc57 /addons | |
| parent | f8afd18820d5cea13b08c757a5f8d7ae581c5e99 (diff) | |
[Estuary] Skin sync
Diffstat (limited to 'addons')
31 files changed, 827 insertions, 664 deletions
diff --git a/addons/skin.estuary/1080i/AddonBrowser.xml b/addons/skin.estuary/1080i/AddonBrowser.xml index 3694dfd266..f07c92dd71 100644 --- a/addons/skin.estuary/1080i/AddonBrowser.xml +++ b/addons/skin.estuary/1080i/AddonBrowser.xml @@ -25,9 +25,7 @@ <include>MediaMenuCommon</include> <control type="grouplist" id="9000"> <top>90</top> - <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis" value="False" /> - </include> + <include>MediaMenuListCommon</include> <control type="label" id="201"> <include>MediaMenuLabelCommon</include> <label>$LOCALIZE[31021]</label> @@ -61,7 +59,9 @@ <param name="breadcrumbs_label" value="$LOCALIZE[24001]" /> <param name="breadcrumbs_icon" value="icons/settings/addons.png" /> </include> - <include>BottomBar</include> + <include name="BottomBar"> + <param name="info_visible" value="true" /> + </include> <control type="group"> <top>1002</top> <visible>ControlGroup(9000).HasFocus | Control.HasFocus(6130)</visible> diff --git a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml index 1a44c3aaa1..7ca4b31636 100644 --- a/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml +++ b/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml @@ -3,48 +3,91 @@ <defaultcontrol>9000</defaultcontrol> <controls> <include>DefaultBackground</include> + <control type="multiimage"> + <depth>DepthBackground</depth> + <include>FullScreenDimensions</include> + <aspectratio>scale</aspectratio> + <fadetime>600</fadetime> + <animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation> + <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="300">WindowClose</animation> + <animation effect="fade" time="400">VisibleChange</animation> + <imagepath background="true" colordiffuse="40FFFFFF">$VAR[AddonsFanartVar]</imagepath> + <visible>!Player.HasMedia</visible> + </control> <control type="group"> - <left>90</left> - <top>185</top> - <include>OpenClose_Left</include> - <control type="image"> - <left>-20</left> - <top>-20</top> - <width>424</width> - <height>660</height> - <texture border="22">dialogs/dialog-bg.png</texture> - </control> - <control type="list" id="9000"> - <left>1</left> - <top>1</top> - <width>382</width> - <height>671</height> - <pagecontrol>70</pagecontrol> - <onup>700</onup> - <ondown>700</ondown> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),video) + Control.IsVisible(500)">500</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),music) + Control.IsVisible(501)">501</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),program) + Control.IsVisible(502)">502</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),picture) + Control.IsVisible(503)">503</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),outdated) + Control.IsVisible(504)">504</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),android) + Control.IsVisible(506)">506</onright> - <scrolltime tween="cubic" easing="out">500</scrolltime> - <focusedlayout height="120"> - <control type="image"> - <left>0</left> - <top>0</top> - <width>382</width> - <height>120</height> - <texture border="90,3,90,3">lists/separator.png</texture> - </control> - <control type="group"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation)">Conditional</animation> + <control type="group"> + <left>90</left> + <top>185</top> + <include>OpenClose_Left</include> + <control type="image"> + <left>-20</left> + <top>-20</top> + <width>424</width> + <height>660</height> + <texture border="22">dialogs/dialog-bg.png</texture> + </control> + <control type="list" id="9000"> + <left>1</left> + <top>1</top> + <width>382</width> + <height>671</height> + <pagecontrol>70</pagecontrol> + <onup>700</onup> + <ondown>700</ondown> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),video) + Control.IsVisible(500)">500</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),music) + Control.IsVisible(501)">501</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),addons) + Control.IsVisible(502)">502</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),pictures) + Control.IsVisible(503)">503</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),outdated) + Control.IsVisible(504)">504</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),android) + Control.IsVisible(506)">506</onright> + <scrolltime tween="cubic" easing="out">500</scrolltime> + <focusedlayout height="120"> <control type="image"> <left>0</left> <top>0</top> <width>382</width> <height>120</height> - <texture>lists/focus.png</texture> - <animation effect="fade" start="100" end="50" time="0">Unfocus</animation> + <texture border="90,3,90,3">lists/separator.png</texture> + </control> + <control type="group"> + <control type="image"> + <left>0</left> + <top>0</top> + <width>382</width> + <height>120</height> + <texture>lists/focus.png</texture> + <animation effect="fade" start="100" end="50" time="0">Unfocus</animation> + </control> + <control type="label"> + <left>20</left> + <top>55</top> + <height>70</height> + <width>350</width> + <aligny>center</aligny> + <align>center</align> + <font>font12</font> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="image"> + <left>0</left> + <top>-10</top> + <width>382</width> + <aspectratio>keep</aspectratio> + <height>120</height> + <texture>$INFO[ListItem.Art(thumb)]</texture> + </control> + </control> + </focusedlayout> + <itemlayout height="120"> + <control type="image"> + <left>0</left> + <top>0</top> + <width>382</width> + <height>120</height> + <texture border="90,3,90,3">lists/separator.png</texture> </control> <control type="label"> <left>20</left> @@ -65,216 +108,202 @@ <height>120</height> <texture>$INFO[ListItem.Art(thumb)]</texture> </control> - </control> - </focusedlayout> - <itemlayout height="120"> - <control type="image"> - <left>0</left> - <top>0</top> - <width>382</width> - <height>120</height> - <texture border="90,3,90,3">lists/separator.png</texture> - </control> - <control type="label"> - <left>20</left> - <top>55</top> - <height>70</height> - <width>350</width> - <aligny>center</aligny> - <align>center</align> - <font>font12</font> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="image"> - <left>0</left> - <top>-10</top> - <width>382</width> - <aspectratio>keep</aspectratio> - <height>120</height> - <texture>$INFO[ListItem.Art(thumb)]</texture> - </control> - </itemlayout> - <content> - <item id="1"> - <label>$LOCALIZE[1037]</label> - <onclick>ActivateWindow(videos,addons://sources/video/,return)</onclick> - <thumb>icons/settings/video.png</thumb> - <property name="id">video</property> - <property name="path">addons://sources/video/</property> - </item> - <item id="2"> - <label>$LOCALIZE[1038]</label> - <onclick>ActivateWindow(music,addons://sources/audio/,return)</onclick> - <thumb>icons/settings/music.png</thumb> - <property name="id">music</property> - <property name="path">addons://sources/audio/</property> - </item> - <item id="3"> - <label>$LOCALIZE[1043]</label> - <onclick>ActivateWindow(programs,addons://sources/executable/,return)</onclick> - <thumb>icons/settings/appearance.png</thumb> - <property name="id">program</property> - <property name="path">addons://sources/executable/</property> - </item> - <item id="4"> - <label>$LOCALIZE[1043]</label> - <onclick>ActivateWindow(programs,androidapps://,return)</onclick> - <thumb>icons/settings/android.png</thumb> - <property name="id">android</property> - <property name="path">androidapps://</property> - <visible>System.Platform.Android</visible> - </item> - <item id="5"> - <label>$LOCALIZE[1039]</label> - <onclick>ActivateWindow(programs,addons://sources/image/,return)</onclick> - <thumb>icons/settings/pictures.png</thumb> - <property name="id">picture</property> - <property name="path">addons://sources/executable/</property> - </item> -<!-- <item id="6"> - <label>Available Updates</label> - <onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick> - <thumb>icons/settings/update-available.png</thumb> - <property name="id">outdated</property> - </item> --> - </content> + </itemlayout> + <content> + <item id="1"> + <label>$LOCALIZE[1037]</label> + <onclick>ActivateWindow(videos,addons://sources/video/,return)</onclick> + <thumb>icons/settings/video.png</thumb> + <property name="id">video</property> + <property name="path">addons://sources/video/</property> + </item> + <item id="2"> + <label>$LOCALIZE[1038]</label> + <onclick>ActivateWindow(music,addons://sources/audio/,return)</onclick> + <thumb>icons/settings/music.png</thumb> + <property name="id">music</property> + <property name="path">addons://sources/audio/</property> + </item> + <item id="3"> + <label>$LOCALIZE[1043]</label> + <onclick>ActivateWindow(programs,addons://sources/executable/,return)</onclick> + <thumb>icons/settings/appearance.png</thumb> + <property name="id">addons</property> + <property name="path">addons://sources/executable/</property> + </item> + <item id="4"> + <label>$LOCALIZE[1043]</label> + <onclick>ActivateWindow(programs,androidapps://,return)</onclick> + <thumb>icons/settings/android.png</thumb> + <property name="id">android</property> + <property name="path">androidapps://</property> + <visible>System.Platform.Android</visible> + </item> + <item id="5"> + <label>$LOCALIZE[1039]</label> + <onclick>ActivateWindow(pictures,addons://sources/image/,return)</onclick> + <thumb>icons/settings/pictures.png</thumb> + <property name="id">pictures</property> + <property name="path">addons://sources/executable/</property> + </item> + <!-- <item id="6"> + <label>Available Updates</label> + <onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick> + <thumb>icons/settings/update-available.png</thumb> + <property name="id">outdated</property> + </item> --> + </content> + </control> </control> - </control> - <control type="grouplist" id="700"> - <orientation>horizontal</orientation> - <itemgap>-22</itemgap> - <left>70</left> - <top>795</top> - <onup>SetFocus(9000,99)</onup> - <onup>9000</onup> - <ondown>14200</ondown> - <include>OpenClose_Left</include> - <onright>2000</onright> - <control type="radiobutton" id="801"> - <width>157</width> - <height>110</height> - <align>right</align> - <aligny>center</aligny> - <onclick>ActivateWindow(addonbrowser,root)</onclick> - <font>font10</font> - <label>-</label> - <textoffsetx>40</textoffsetx> - <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <radioposx>55</radioposx> - <radioposy>0</radioposy> - <radiowidth>40</radiowidth> - <radioheight>40</radioheight> - <textureradioonfocus>icons/submenu/add-ons.png</textureradioonfocus> - <textureradioonnofocus>icons/submenu/add-ons.png</textureradioonnofocus> - <textureradioofffocus>icons/submenu/add-ons.png</textureradioofffocus> - <textureradiooffnofocus>icons/submenu/add-ons.png</textureradiooffnofocus> + <control type="grouplist" id="700"> + <orientation>horizontal</orientation> + <itemgap>-22</itemgap> + <left>70</left> + <top>795</top> + <onup>SetFocus(9000,99)</onup> + <onup>9000</onup> + <ondown>14200</ondown> + <include>OpenClose_Left</include> + <onright>400</onright> + <usecontrolcoords>true</usecontrolcoords> + <control type="radiobutton" id="801"> + <width>157</width> + <height>110</height> + <align>right</align> + <aligny>center</aligny> + <onclick>ActivateWindow(addonbrowser,root)</onclick> + <font>font10</font> + <label>-</label> + <textoffsetx>40</textoffsetx> + <textwidth>230</textwidth> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <radioposx>55</radioposx> + <radioposy>0</radioposy> + <radiowidth>40</radiowidth> + <radioheight>40</radioheight> + <textureradioonfocus>icons/submenu/add-ons.png</textureradioonfocus> + <textureradioonnofocus>icons/submenu/add-ons.png</textureradioonnofocus> + <textureradioofffocus>icons/submenu/add-ons.png</textureradioofffocus> + <textureradiooffnofocus>icons/submenu/add-ons.png</textureradiooffnofocus> + </control> + <control type="radiobutton" id="802"> + <width>157</width> + <height>110</height> + <align>right</align> + <aligny>center</aligny> + <onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick> + <font>font10</font> + <label>-</label> + <textoffsetx>40</textoffsetx> + <textwidth>230</textwidth> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <radioposx>35</radioposx> + <radioposy>0</radioposy> + <radiowidth>40</radiowidth> + <radioheight>40</radioheight> + <enable>IntegerGreaterThan(Container(8000).NumItems,0)</enable> + <textureradioonfocus>icons/submenu/updatelibrary.png</textureradioonfocus> + <textureradioonnofocus>icons/submenu/updatelibrary.png</textureradioonnofocus> + <textureradioofffocus>icons/submenu/updatelibrary.png</textureradioofffocus> + <textureradiooffnofocus>icons/submenu/updatelibrary.png</textureradiooffnofocus> + <textureradioondisabled colordiffuse="disabled">icons/submenu/updatelibrary.png</textureradioondisabled> + <textureradiooffdisabled colordiffuse="disabled">icons/submenu/updatelibrary.png</textureradiooffdisabled> + </control> + <control type="radiobutton" id="803"> + <width>157</width> + <height>110</height> + <align>right</align> + <aligny>center</aligny> + <onclick>ActivateWindow(systemsettings,addons)</onclick> + <font>font10</font> + <label>-</label> + <textoffsetx>40</textoffsetx> + <textwidth>230</textwidth> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <radioposx>55</radioposx> + <radioposy>0</radioposy> + <radiowidth>40</radiowidth> + <radioheight>40</radioheight> + <textureradioonfocus>icons/settings.png</textureradioonfocus> + <textureradioonnofocus>icons/settings.png</textureradioonnofocus> + <textureradioofffocus>icons/settings.png</textureradioofffocus> + <textureradiooffnofocus>icons/settings.png</textureradiooffnofocus> + </control> + <control type="label" id="804"> + <left>-217</left> + <top>20</top> + <height>70</height> + <width>100</width> + <aligny>center</aligny> + <align>center</align> + <font>font20_title</font> + <label>$VAR[AddonCountLabel]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> </control> - <control type="radiobutton" id="802"> - <width>157</width> - <height>110</height> - <align>right</align> - <aligny>center</aligny> - <onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick> - <font>font10</font> - <label>-</label> - <textoffsetx>40</textoffsetx> - <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <radioposx>55</radioposx> - <radioposy>0</radioposy> - <radiowidth>40</radiowidth> - <radioheight>40</radioheight> - <enable>!Stringcompare(Container(8000).NumItems,0)</enable> - <textureradioonfocus>icons/submenu/updatelibrary.png</textureradioonfocus> - <textureradioonnofocus>icons/submenu/updatelibrary.png</textureradioonnofocus> - <textureradioofffocus>icons/submenu/updatelibrary.png</textureradioofffocus> - <textureradiooffnofocus>icons/submenu/updatelibrary.png</textureradiooffnofocus> + <control type="group" id="400"> + <include>OpenClose_Right</include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="500" /> + <param name="visible" value="Container(9000).HasFocus(1)" /> + <param name="container_path" value="addons://sources/video/" /> + <param name="container_target" value="videos" /> + </include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="501" /> + <param name="visible" value="Container(9000).HasFocus(2)" /> + <param name="container_path" value="addons://sources/audio/" /> + <param name="container_target" value="music" /> + </include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="502" /> + <param name="visible" value="Container(9000).HasFocus(3)" /> + <param name="container_path" value="addons://sources/executable/" /> + <param name="container_target" value="programs" /> + </include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="506" /> + <param name="visible" value="Container(9000).HasFocus(4)" /> + <param name="container_path" value="androidapps://" /> + <param name="container_target" value="programs" /> + </include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="503" /> + <param name="visible" value="Container(9000).HasFocus(5)" /> + <param name="container_path" value="addons://sources/image/" /> + <param name="container_target" value="pictures" /> + </include> + <!-- <include name="AddonLauncherPanel"> + <param name="container_id" value="504" /> + <param name="visible" value="Container(9000).HasFocus(6)" /> + <param name="container_path" value="addons://outdated/" /> + <param name="container_target" value="" /> + </include> + <include name="AddonLauncherPanel"> + <param name="container_id" value="505" /> + <param name="visible" value="Container(9000).HasFocus(7)" /> + <param name="container_path" value="addons://all/" /> + <param name="container_target" value="" /> + </include> --> </control> - <control type="radiobutton" id="803"> - <width>157</width> - <height>110</height> - <align>right</align> - <aligny>center</aligny> - <onclick>ActivateWindow(systemsettings,addons)</onclick> - <font>font10</font> - <label>-</label> - <textoffsetx>40</textoffsetx> - <textwidth>230</textwidth> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <radioposx>55</radioposx> - <radioposy>0</radioposy> - <radiowidth>40</radiowidth> - <radioheight>40</radioheight> - <textureradioonfocus>icons/settings.png</textureradioonfocus> - <textureradioonnofocus>icons/settings.png</textureradioonnofocus> - <textureradioofffocus>icons/settings.png</textureradioofffocus> - <textureradiooffnofocus>icons/settings.png</textureradiooffnofocus> + <control type="scrollbar" id="531"> + <left>1907</left> + <top>80</top> + <width>13</width> + <height>919</height> + <onleft>400</onleft> + <onright>noop</onright> + <orientation>vertical</orientation> + <texturesliderbackground colordiffuse="22FFFFFF">colors/white.png</texturesliderbackground> + <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> + <animation effect="fade" start="100" end="0" time="200">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> </control> </control> - <control type="group"> - <include>OpenClose_Right</include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="500" /> - <param name="visible" value="Container(9000).HasFocus(1)" /> - <param name="container_path" value="addons://sources/video/" /> - <param name="container_target" value="videos" /> - </include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="501" /> - <param name="visible" value="Container(9000).HasFocus(2)" /> - <param name="container_path" value="addons://sources/audio/" /> - <param name="container_target" value="music" /> - </include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="502" /> - <param name="visible" value="Container(9000).HasFocus(3)" /> - <param name="container_path" value="addons://sources/executable/" /> - <param name="container_target" value="programs" /> - </include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="506" /> - <param name="visible" value="Container(9000).HasFocus(4)" /> - <param name="container_path" value="androidapps://" /> - <param name="container_target" value="programs" /> - </include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="503" /> - <param name="visible" value="Container(9000).HasFocus(5)" /> - <param name="container_path" value="addons://sources/image/" /> - <param name="container_target" value="pictures" /> - </include> -<!-- <include name="AddonLauncherPanel"> - <param name="container_id" value="504" /> - <param name="visible" value="Container(9000).HasFocus(6)" /> - <param name="container_path" value="addons://outdated/" /> - <param name="container_target" value="" /> - </include> - <include name="AddonLauncherPanel"> - <param name="container_id" value="505" /> - <param name="visible" value="Container(9000).HasFocus(7)" /> - <param name="container_path" value="addons://all/" /> - <param name="container_target" value="" /> - </include> --> - </control> - <control type="scrollbar" id="531"> - <left>1907</left> - <top>80</top> - <width>13</width> - <height>919</height> - <onleft>50</onleft> - <onright>50</onright> - <orientation>vertical</orientation> - <texturesliderbackground colordiffuse="22FFFFFF">colors/white.png</texturesliderbackground> - <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> - <animation effect="fade" start="100" end="0" time="200">Hidden</animation> - <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> - </control> <include name="UpDownArrows"> <param name="container_id" value="500" /> <param name="visible" value="!System.HasModalDialog" /> diff --git a/addons/skin.estuary/1080i/DialogAddonInfo.xml b/addons/skin.estuary/1080i/DialogAddonInfo.xml index fda5f3df96..360bac9dc3 100644 --- a/addons/skin.estuary/1080i/DialogAddonInfo.xml +++ b/addons/skin.estuary/1080i/DialogAddonInfo.xml @@ -5,14 +5,14 @@ <control type="group"> <include>OpenClose_Right</include> <control type="button"> - <left>815</left> + <left>840</left> <top>162</top> <width>1000</width> <height>509</height> <label>-</label> </control> <control type="label"> - <left>865</left> + <left>890</left> <top>200</top> <width>900</width> <height>396</height> @@ -22,15 +22,15 @@ <textcolor>button_focus</textcolor> </control> <control type="grouplist" id="9000"> - <left>88</left> + <left>90</left> <top>770</top> - <width>1920</width> + <width>1740</width> <height>768</height> <onleft>9000</onleft> <onright>9000</onright> <onup>9000</onup> <ondown>9000</ondown> - <align>left</align> + <align>center</align> <itemgap>-18</itemgap> <orientation>horizontal</orientation> <include name="InfoDialogButton"> @@ -59,43 +59,32 @@ <radioposy>14</radioposy> <radiowidth>100</radiowidth> <font>font12</font> + <visible>Control.IsEnabled(13)</visible> </control> <include name="InfoDialogButton"> <param name="id" value="10" /> <param name="icon" value="icons/infodialogs/changelog.png" /> <param name="label" value="$LOCALIZE[24036]" /> </include> - <include name="InfoDialogButton"> + <include name="InfoDialogToggleButton"> <param name="id" value="7" /> - <param name="icon" value="icons/infodialogs/disable.png" /> - <param name="label" value="$LOCALIZE[24021]" /> + <param name="icon_on" value="icons/infodialogs/enabled.png" /> + <param name="icon_off" value="icons/infodialogs/disable.png" /> + <param name="selected" value="ListItem.Property(addon.isenabled)" /> + <param name="label" value="" /> + </include> + <include name="InfoDialogToggleButton"> + <param name="id" value="6" /> + <param name="icon_on" value="icons/infodialogs/uninstall.png" /> + <param name="icon_off" value="icons/infodialogs/install.png" /> + <param name="selected" value="ListItem.Property(addon.isinstalled) | !Window.IsActive(addonbrowser)" /> + <param name="label" value="" /> </include> - <control type="radiobutton" id="6"> - <width>262</width> - <height>140</height> - <align>center</align> - <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <textoffsetx>35</textoffsetx> - <textoffsety>76</textoffsety> - <radioposx>110</radioposx> - <radioposy>14</radioposy> - <radiowidth>44</radiowidth> - <font>font12</font> - <textureradioonfocus colordiffuse="D0FFFFFF">icons/infodialogs/uninstall.png</textureradioonfocus> - <textureradioonnofocus colordiffuse="D0FFFFFF">icons/infodialogs/uninstall.png</textureradioonnofocus> - <textureradioondisabled colordiffuse="disabled">icons/infodialogs/uninstall.png</textureradioondisabled> - <textureradioofffocus colordiffuse="D0FFFFFF">icons/infodialogs/install.png</textureradioofffocus> - <textureradiooffnofocus colordiffuse="D0FFFFFF">icons/infodialogs/install.png</textureradiooffnofocus> - <textureradiooffdisabled colordiffuse="disabled">icons/infodialogs/install.png</textureradiooffdisabled> - <selected>ListItem.Property(addon.isinstalled) | !Window.IsActive(addonbrowser)</selected> - </control> </control> </control> <control type="group"> <include>OpenClose_Left</include> - <visible>Window.IsActive(eventlog) | Window.IsActive(home)</visible> + <visible>Window.IsActive(eventlog) | Window.IsActive(home) | Window.IsActive(1100)</visible> <include>Visible_Left</include> <include>ListThumbInfoPanel</include> </control> diff --git a/addons/skin.estuary/1080i/DialogGameControllers.xml b/addons/skin.estuary/1080i/DialogGameControllers.xml index 1946e95e01..5c243d7aeb 100644 --- a/addons/skin.estuary/1080i/DialogGameControllers.xml +++ b/addons/skin.estuary/1080i/DialogGameControllers.xml @@ -131,6 +131,11 @@ <param name="id" value="18" /> <param name="label" value="$LOCALIZE[186]" /> </include> + <include name="DefaultDialogButton"> + <param name="width" value="350" /> + <param name="id" value="17" /> + <param name="label" value="$LOCALIZE[10043]" /> + </include> </control> </control> </controls> diff --git a/addons/skin.estuary/1080i/DialogSettings.xml b/addons/skin.estuary/1080i/DialogSettings.xml index 6311ffc760..52d13b0f60 100644 --- a/addons/skin.estuary/1080i/DialogSettings.xml +++ b/addons/skin.estuary/1080i/DialogSettings.xml @@ -7,79 +7,83 @@ </coordinates> <include>Animation_DialogPopupOpenClose</include> <controls> - <include name="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1520" /> - <param name="DialogBackgroundHeight" value="870" /> - <param name="DialogHeaderLabel" value="-" /> - <param name="DialogHeaderId" value="2" /> - </include> - <control type="image"> - <left>10</left> - <top>80</top> - <width>1200</width> - <height>790</height> - <texture border="40">buttons/dialogbutton-nofo.png</texture> - </control> - <control type="grouplist" id="5"> - <description>control area</description> - <left>29</left> - <top>100</top> - <width>1160</width> - <height>750</height> - <onleft>9000</onleft> - <onright>9000</onright> - <onup>5</onup> - <ondown>5</ondown> - </control> - <control type="button" id="7"> - <description>Default Button</description> - <include>DefaultSettingButton</include> - </control> - <control type="radiobutton" id="8"> - <description>Default RadioButton</description> - <include>DefaultSettingButton</include> - </control> - <control type="spincontrolex" id="9"> - <description>Default SpinControlex</description> - <include>DefaultSettingButton</include> - </control> - <control type="image" id="11"> - <description>separator image</description> - <height>3</height> - <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture> - </control> - <control type="edit" id="12"> - <include>DefaultSettingButton</include> - </control> - <control type="sliderex" id="13"> - <description>Default Slider</description> - <include>DefaultSettingButton</include> - </control> - <control type="label" id="14"> - <description>Default Label</description> - <include>DefaultSettingLabel</include> - </control> - <control type="grouplist" id="9000"> - <left>1210</left> - <top>92</top> - <orientation>vertical</orientation> - <width>300</width> - <height>250</height> - <itemgap>-10</itemgap> - <onleft>5</onleft> - <onright>5</onright> - <include name="DefaultDialogButton"> - <param name="id" value="28" /> - <param name="label" value="-" /> - </include> - <include name="DefaultDialogButton"> - <param name="id" value="29" /> - <param name="label" value="-" /> - </include> - <include name="DefaultDialogButton"> - <param name="id" value="30" /> - <param name="label" value="-" /> + <control type="group"> + <include>Animation_DialogPopupVisible</include> + <visible>!Window.IsVisible(sliderdialog)</visible> + <include name="DialogBackgroundCommons"> + <param name="DialogBackgroundWidth" value="1520" /> + <param name="DialogBackgroundHeight" value="870" /> + <param name="DialogHeaderLabel" value="-" /> + <param name="DialogHeaderId" value="2" /> </include> + <control type="image"> + <left>10</left> + <top>80</top> + <width>1200</width> + <height>790</height> + <texture border="40">buttons/dialogbutton-nofo.png</texture> + </control> + <control type="grouplist" id="5"> + <description>control area</description> + <left>29</left> + <top>100</top> + <width>1160</width> + <height>750</height> + <onleft>9000</onleft> + <onright>9000</onright> + <onup>5</onup> + <ondown>5</ondown> + </control> + <control type="button" id="7"> + <description>Default Button</description> + <include>DefaultSettingButton</include> + </control> + <control type="radiobutton" id="8"> + <description>Default RadioButton</description> + <include>DefaultSettingButton</include> + </control> + <control type="spincontrolex" id="9"> + <description>Default SpinControlex</description> + <include>DefaultSettingButton</include> + </control> + <control type="image" id="11"> + <description>separator image</description> + <height>3</height> + <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture> + </control> + <control type="edit" id="12"> + <include>DefaultSettingButton</include> + </control> + <control type="sliderex" id="13"> + <description>Default Slider</description> + <include>DefaultSettingButton</include> + </control> + <control type="label" id="14"> + <description>Default Label</description> + <include>DefaultSettingLabel</include> + </control> + <control type="grouplist" id="9000"> + <left>1210</left> + <top>92</top> + <orientation>vertical</orientation> + <width>300</width> + <height>250</height> + <itemgap>-10</itemgap> + <onleft>5</onleft> + <onright>5</onright> + <include name="DefaultDialogButton"> + <param name="id" value="28" /> + <param name="label" value="-" /> + </include> + <include name="DefaultDialogButton"> + <param name="id" value="29" /> + <param name="label" value="-" /> + </include> + <include name="DefaultDialogButton"> + <param name="id" value="30" /> + <param name="label" value="-" /> + </include> + </control> </control> </controls> </window> diff --git a/addons/skin.estuary/1080i/DialogVideoInfo.xml b/addons/skin.estuary/1080i/DialogVideoInfo.xml index 20b8c2b6fb..e750df8220 100644 --- a/addons/skin.estuary/1080i/DialogVideoInfo.xml +++ b/addons/skin.estuary/1080i/DialogVideoInfo.xml @@ -414,7 +414,7 @@ <scrolltime tween="quadratic">200</scrolltime> <include name="InfoDialogButton"> <param name="id" value="8" /> - <param name="icon" value="icons/infodialogs/launch.png" /> + <param name="icon" value="icons/infodialogs/play.png" /> <param name="label" value="$LOCALIZE[208]" /> </include> <include name="InfoDialogButton"> diff --git a/addons/skin.estuary/1080i/EventLog.xml b/addons/skin.estuary/1080i/EventLog.xml index c9d952184b..dcd60dae45 100644 --- a/addons/skin.estuary/1080i/EventLog.xml +++ b/addons/skin.estuary/1080i/EventLog.xml @@ -10,30 +10,32 @@ <include>OpenClose_Left</include> <orientation>vertical</orientation> <itemgap>-8.5</itemgap> - <left>110</left> + <left>90</left> <top>162</top> <onup>9000</onup> <ondown>9000</ondown> <onleft>50</onleft> <onright>50</onright> + <usecontrolcoords>true</usecontrolcoords> <control type="togglebutton" id="4"> - <width>350</width> - <height>199</height> + <width>420</width> + <height>110</height> <align>center</align> <aligny>top</aligny> <font>font12</font> <textoffsetx>20</textoffsetx> - <textoffsety>130</textoffsety> + <textoffsety>35</textoffsety> <label>$LOCALIZE[31032]: $LOCALIZE[584]</label> <altlabel>$LOCALIZE[31032]: $LOCALIZE[585]</altlabel> </control> <control type="group" id="4100"> <height>0</height> <control type="image"> - <top>-150</top> + <posx>40</posx> + <top>-68</top> <width>350</width> - <height>70</height> - <aspectratio>keep</aspectratio> + <height>40</height> + <aspectratio align="left">keep</aspectratio> <texture>icons/eventlog/order.png</texture> </control> </control> @@ -43,21 +45,35 @@ <param name="label" value="" /> <param name="icon" value="icons/eventlog/settings.png" /> </include> - <include name="PlaylistWindowButton"> - <param name="control_id" value="22" /> - <param name="onclick" value="" /> - <param name="label" value="$LOCALIZE[190]" /> - <param name="icon" value="icons/eventlog/levels.png" /> - </include> + <control type="radiobutton" id="22"> + <width>420</width> + <height>110</height> + <align>center</align> + <aligny>top</aligny> + <font>font12</font> + <textoffsetx>20</textoffsetx> + <textoffsety>35</textoffsety> + <radioposx>-1</radioposx> + </control> <include name="PlaylistWindowButton"> <param name="control_id" value="20" /> <param name="onclick" value="" /> <param name="label" value="$LOCALIZE[192]" /> <param name="icon" value="DefaultIconError.png" /> </include> + <control type="image"> + <left>40</left> + <top>0</top> + <width>340</width> + <height>360</height> + <aspectratio aligny="bottom">keep</aspectratio> + <texture fallback="DefaultVideo.png">$INFO[ListItem.Icon]</texture> + <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> </control> <control type="group"> - <left>250</left> + <left>300</left> <visible>Control.IsVisible(50)</visible> <include>OpenClose_Right</include> <control type="image"> @@ -71,7 +87,7 @@ <left>230</left> <top>182</top> <width>1260</width> - <height>9000</height> + <height>700</height> <onleft>9000</onleft> <onright>60</onright> <onup>50</onup> @@ -79,19 +95,19 @@ <viewtype label="535">list</viewtype> <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="115" width="1260"> + <itemlayout height="90" width="1260"> <control type="image"> <left>0</left> <top>0</top> <width>1260</width> - <height>115</height> + <height>90</height> <texture border="90,3,90,3">lists/separator.png</texture> </control> <control type="image"> <left>5</left> <top>5</top> - <width>105</width> - <height>105</height> + <width>80</width> + <height>80</height> <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> @@ -101,25 +117,26 @@ <left>125</left> <top>0</top> <width>870</width> - <height>50</height> + <height>35</height> <aligny>center</aligny> - <label>[B]$INFO[ListItem.Label][/B]</label> + <font>font12</font> + <label>$INFO[ListItem.Label]</label> </control> <control type="textbox"> <left>125</left> - <top>40</top> + <top>34</top> <width>870</width> - <height>70</height> - <font>font10</font> + <height>60</height> + <font>font10_title</font> <textcolor>grey</textcolor> - <aligny>center</aligny> + <aligny>top</aligny> <label>$INFO[ListItem.Property(Event.Description)]</label> </control> <control type="label"> <left>125</left> <top>0</top> <width>1120</width> - <height>50</height> + <height>35</height> <font>font12</font> <textcolor>button_focus</textcolor> <align>right</align> @@ -127,12 +144,12 @@ <label>$INFO[ListItem.Label2]</label> </control> </itemlayout> - <focusedlayout height="115" width="1260"> + <focusedlayout height="90" width="1260"> <control type="image"> <left>0</left> <top>0</top> <width>1260</width> - <height>115</height> + <height>90</height> <texture border="90,3,90,3">lists/separator.png</texture> <visible>!Control.HasFocus(50)</visible> </control> @@ -140,15 +157,15 @@ <left>0</left> <top>0</top> <width>1260</width> - <height>115</height> + <height>90</height> <texture>lists/focus.png</texture> <visible>Control.HasFocus(50)</visible> </control> <control type="image"> <left>5</left> <top>5</top> - <width>105</width> - <height>105</height> + <width>80</width> + <height>80</height> <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> @@ -158,25 +175,26 @@ <left>125</left> <top>0</top> <width>870</width> - <height>50</height> + <height>35</height> <aligny>center</aligny> - <label>[B]$INFO[ListItem.Label][/B]</label> + <font>font12</font> + <label>$INFO[ListItem.Label]</label> </control> <control type="textbox"> <left>125</left> - <top>40</top> + <top>34</top> <width>870</width> - <height>70</height> - <font>font10</font> + <height>60</height> + <font>font10_title</font> <textcolor>grey</textcolor> - <aligny>center</aligny> + <aligny>top</aligny> <label>$INFO[ListItem.Property(Event.Description)]</label> </control> <control type="label"> <left>125</left> <top>0</top> <width>1120</width> - <height>50</height> + <height>35</height> <font>font12</font> <textcolor>button_focus</textcolor> <align>right</align> @@ -185,20 +203,20 @@ </control> </focusedlayout> </control> - <include name="UpDownArrows"> - <param name="container_id" value="50" /> - <param name="visible" value="!System.HasModalDialog" /> - </include> - <control type="scrollbar" id="60"> - <right>0</right> - <top>80</top> - <width>12</width> - <height>920</height> - <onleft>50</onleft> - <onright>9000</onright> - <orientation>vertical</orientation> - <visible>Control.IsVisible(50)</visible> - </control> + </control> + <include name="UpDownArrows"> + <param name="container_id" value="50" /> + <param name="visible" value="!System.HasModalDialog" /> + </include> + <control type="scrollbar" id="60"> + <right>0</right> + <top>80</top> + <width>12</width> + <height>920</height> + <onleft>50</onleft> + <onright>9000</onright> + <orientation>vertical</orientation> + <visible>Control.IsVisible(50)</visible> </control> </control> <include name="TopBar"> diff --git a/addons/skin.estuary/1080i/Font.xml b/addons/skin.estuary/1080i/Font.xml index 1809fbb0cd..5c868b9f34 100644 --- a/addons/skin.estuary/1080i/Font.xml +++ b/addons/skin.estuary/1080i/Font.xml @@ -41,7 +41,7 @@ <font> <name>font10_title</name> <filename>Lato-Bold.ttf</filename> - <size>18</size> + <size>20</size> </font> <font> <name>font12_title</name> diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml index a7a6f2e7d8..62d983b0a8 100644 --- a/addons/skin.estuary/1080i/Home.xml +++ b/addons/skin.estuary/1080i/Home.xml @@ -29,7 +29,7 @@ <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="300">WindowClose</animation> <animation effect="fade" time="400">VisibleChange</animation> - <imagepath background="true" colordiffuse="20FFFFFF">$VAR[HomeFanartVar]</imagepath> + <imagepath background="true" colordiffuse="40FFFFFF">$VAR[HomeFanartVar]</imagepath> <visible>!Player.HasMedia</visible> </control> <control type="group" id="2000"> @@ -145,7 +145,7 @@ </control> </control> <control type="group" id="6000"> - <visible>Stringcompare(Container(9000).ListItem.Property(id),tv)</visible> + <visible>Stringcompare(Container(9000).ListItem.Property(id),tvshows)</visible> <include>Visible_Right_Delayed</include> <control type="button" id="6888"> <width>1</width> @@ -464,7 +464,7 @@ </control> </control> <control type="group" id="11000"> - <visible>Stringcompare(Container(9000).ListItem.Property(id),videos)</visible> + <visible>Stringcompare(Container(9000).ListItem.Property(id),video)</visible> <include>Visible_Right_Delayed</include> <control type="button" id="11888"> <width>1</width> @@ -743,6 +743,8 @@ <top>215</top> <left>540</left> <orientation>horizontal</orientation> + <align>justify</align> + <itemgap>-50</itemgap> <include name="WeatherIcon"> <param name="label" value="Window(weather).Property(Current.Wind)" /> <param name="texture" value="icons/weather/wind.png" /> @@ -906,10 +908,10 @@ <height>671</height> <pagecontrol>70</pagecontrol> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),movies) + Control.IsVisible(5000)">5000</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),tv) + Control.IsVisible(6000)">6000</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),tvshows) + Control.IsVisible(6000)">6000</onright> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),music) + Control.IsVisible(7000)">7000</onright> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),addons) + Control.IsVisible(8000)">8000</onright> - <onright condition="Stringcompare(Container(9000).ListItem.Property(id),videos) + Control.IsVisible(11000)">11000</onright> + <onright condition="Stringcompare(Container(9000).ListItem.Property(id),video) + Control.IsVisible(11000)">11000</onright> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),livetv) + Control.IsVisible(12000)">12000</onright> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),radio) + Control.IsVisible(13000)">13000</onright> <onright condition="Stringcompare(Container(9000).ListItem.Property(id),weather) + Control.IsVisible(15000)">15000</onright> @@ -1050,7 +1052,7 @@ <onclick condition="Library.HasContent(tvshows)">ActivateWindow(Videos,TVShowTitles,return)</onclick> <onclick condition="!Library.HasContent(tvshows)">ActivateWindow(Videos,Files,return)</onclick> <thumb>icons/home/tv.png</thumb> - <property name="id">tv</property> + <property name="id">tvshows</property> <visible>!Skin.HasSetting(HomeMenuNoTVShowButton)</visible> </item> <item> @@ -1093,7 +1095,7 @@ <label>$LOCALIZE[3]</label> <onclick>ActivateWindow(Videos,root)</onclick> <thumb>icons/home/videos.png</thumb> - <property name="id">videos</property> + <property name="id">video</property> <visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible> </item> <item> diff --git a/addons/skin.estuary/1080i/Includes.xml b/addons/skin.estuary/1080i/Includes.xml index 50ba3636d4..c156d2f605 100644 --- a/addons/skin.estuary/1080i/Includes.xml +++ b/addons/skin.estuary/1080i/Includes.xml @@ -55,7 +55,7 @@ <onup>50</onup> <ondown>50</ondown> <orientation>horizontal</orientation> - <visible>Control.IsVisible(51) | Control.IsVisible(53)</visible> + <visible>Control.IsVisible(51) | Control.IsVisible(53) | Control.IsVisible(502)</visible> <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> <animation effect="fade" start="100" end="0" time="200">Hidden</animation> <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> @@ -384,7 +384,7 @@ </control> </include> <include name="MediaFlag"> - <param name="width">110</param> + <param name="width">115</param> <param name="height">60</param> <definition> <control type="image"> @@ -419,10 +419,10 @@ <width>1720</width> <align>right</align> <include name="MediaFlag"> - <param name="texture" value="$VAR[ResolutionFlagVar]" /> + <param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" /> </include> <include name="MediaFlag"> - <param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" /> + <param name="texture" value="$VAR[ResolutionFlagVar]" /> </include> </control> </include> @@ -610,52 +610,6 @@ <content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[container_target]">$PARAM[container_path]</content> </control> </include> - <include name="PlaylistWindowButtons"> - <param name="width">350</param> - <definition> - <control type="group"> - <include>OpenClose_Left</include> - <control type="grouplist" id="700"> - <orientation>vertical</orientation> - <itemgap>-9</itemgap> - <left>100</left> - <top>165</top> - <onup>700</onup> - <ondown>700</ondown> - <onleft>50</onleft> - <onright>50</onright> - <include name="PlaylistWindowButton"> - <param name="control_id" value="20" /> - <param name="onclick" value="" /> - <param name="label" value="$LOCALIZE[191]$INFO[Playlist.Random, : ]" /> - <param name="icon" value="osd/fullscreen/buttons/random-on.png" /> - <param name="width" value="$PARAM[width]" /> - </include> - <include name="PlaylistWindowButton"> - <param name="control_id" value="26" /> - <param name="onclick" value="" /> - <param name="label" value="" /> - <param name="icon" value="osd/fullscreen/buttons/repeat-all.png" /> - <param name="width" value="$PARAM[width]" /> - </include> - <include name="PlaylistWindowButton"> - <param name="control_id" value="21" /> - <param name="onclick" value="" /> - <param name="label" value="$LOCALIZE[190]" /> - <param name="icon" value="icons/playlist/save.png" /> - <param name="width" value="$PARAM[width]" /> - </include> - <include name="PlaylistWindowButton"> - <param name="control_id" value="22" /> - <param name="onclick" value="" /> - <param name="label" value="$LOCALIZE[192]" /> - <param name="icon" value="DefaultIconError.png" /> - <param name="width" value="$PARAM[width]" /> - </include> - </control> - </control> - </definition> - </include> <include name="InfoDialogTopBarInfo"> <param name="id">33333</param> <definition> @@ -960,48 +914,47 @@ <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> </control> - <control type="grouplist"> - <description>Right side of top bar</description> - <right>85</right> - <width>500</width> - <height>100</height> - <align>right</align> - <orientation>horizontal</orientation> - <usecontrolcoords>true</usecontrolcoords> - <animation effect="fade" start="0" end="100" time="300" condition="Window.IsActive(fullscreenvideo)">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation> - <animation effect="fade" time="150">VisibleChange</animation> - <visible>!Window.IsVisible(extendedprogressdialog)</visible> - <include condition="Skin.HasSetting(show_weatherinfo) | Window.IsActive(skinsettings)">TopWeatherIcon</include> - <control type="label"> - <include>BreadcrumbsLabel</include> - <label>$INFO[System.Time]</label> - </control> - </control> <control type="group"> <visible>!Window.IsVisible(extendedprogressdialog)</visible> <animation effect="fade" time="150">VisibleChange</animation> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation> - <control type="image"> - <right>25</right> - <top>20</top> - <height>40</height> - <width>40</width> - <texture colordiffuse="button_focus">frame/clock.png</texture> - <animation effect="fade" time="300">Visible</animation> - <animation effect="fade" time="150">Hidden</animation> - <aspectratio>keep</aspectratio> - <visible>!Window.IsActive(volumebar)</visible> - </control> - <control type="label"> - <top>40</top> - <label>$PARAM[time_sublabel]</label> - <font>font10</font> - <left>1340</left> - <shadowcolor>text_shadow</shadowcolor> - <height>100</height> + <animation effect="fade" start="0" end="100" time="300" condition="Window.IsActive(fullscreenvideo)">WindowOpen</animation> + <control type="grouplist"> + <description>Right side of top bar</description> + <right>85</right> <width>500</width> + <height>100</height> <align>right</align> + <orientation>horizontal</orientation> + <usecontrolcoords>true</usecontrolcoords> + <include condition="Skin.HasSetting(show_weatherinfo) | Window.IsActive(skinsettings)">TopWeatherIcon</include> + <control type="label"> + <include>BreadcrumbsLabel</include> + <label>$INFO[System.Time]</label> + </control> + </control> + <control type="group"> + <control type="image"> + <right>25</right> + <top>20</top> + <height>40</height> + <width>40</width> + <texture colordiffuse="button_focus">frame/clock.png</texture> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> + <aspectratio>keep</aspectratio> + <visible>!Window.IsActive(volumebar)</visible> + </control> + <control type="label"> + <top>40</top> + <label>$PARAM[time_sublabel]</label> + <font>font10</font> + <left>1340</left> + <shadowcolor>text_shadow</shadowcolor> + <height>100</height> + <width>500</width> + <align>right</align> + </control> </control> </control> </control> @@ -1072,6 +1025,7 @@ </include> <include name="BottomBar"> <param name="PageLabel">$VAR[BottomBarPageLabel]</param> + <param name="info_visible">False</param> <definition> <control type="group"> <depth>DepthBars</depth> @@ -1086,7 +1040,7 @@ <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation> </control> <control type="group"> - <visible>Window.IsMedia + !Window.IsActive(eventlog) + !Window.IsActive(musicplaylisteditor) + !Window.IsActive(MyPlaylist.xml)</visible> + <visible>$PARAM[info_visible]</visible> <visible>!System.HasModalDialog</visible> <animation effect="fade" time="400">VisibleChange</animation> <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation> diff --git a/addons/skin.estuary/1080i/Includes_Animations.xml b/addons/skin.estuary/1080i/Includes_Animations.xml index 00a0bbdf4c..494d00a02e 100644 --- a/addons/skin.estuary/1080i/Includes_Animations.xml +++ b/addons/skin.estuary/1080i/Includes_Animations.xml @@ -20,7 +20,6 @@ <effect type="zoom" start="100" end="80" center="960,540" easing="in" tween="back" time="240" /> <effect type="fade" start="100" end="0" time="240" /> </animation> - <depth>DepthDialog</depth> </include> <include name="Visible_Fade"> <animation effect="fade" end="100" time="200">Visible</animation> diff --git a/addons/skin.estuary/1080i/Includes_Buttons.xml b/addons/skin.estuary/1080i/Includes_Buttons.xml index 1fad389d33..a517781bc2 100644 --- a/addons/skin.estuary/1080i/Includes_Buttons.xml +++ b/addons/skin.estuary/1080i/Includes_Buttons.xml @@ -106,29 +106,182 @@ <font>font16</font> </include> <include name="PlaylistWindowButton"> - <param name="width">350</param> + <param name="width">420</param> <definition> <control type="button" id="$PARAM[control_id]"> <width>$PARAM[width]</width> - <height>199</height> - <align>center</align> + <height>110</height> + <align>left</align> <aligny>top</aligny> - <font>font12</font> - <textoffsetx>20</textoffsetx> - <textoffsety>130</textoffsety> + <font>font10</font> + <textoffsetx>100</textoffsetx> + <textwidth>200</textwidth> + <textoffsety>35</textoffsety> <label>$PARAM[label]</label> <selectedcolor>white</selectedcolor> </control> <control type="group" id="$PARAM[control_id]100"> <height>0</height> <control type="image"> - <top>-150</top> + <posx>40</posx> + <top>-70</top> <width>$PARAM[width]</width> - <height>70</height> - <aspectratio>keep</aspectratio> + <height>40</height> + <aspectratio align="left">keep</aspectratio> <texture>$PARAM[icon]</texture> </control> </control> </definition> </include> + <include name="PlaylistWindowButtons"> + <param name="width">350</param> + <definition> + <control type="group"> + <include>OpenClose_Left</include> + <control type="grouplist" id="700"> + <orientation>vertical</orientation> + <itemgap>-9</itemgap> + <left>100</left> + <top>165</top> + <onup>700</onup> + <ondown>700</ondown> + <onleft>50</onleft> + <onright>50</onright> + <include name="PlaylistWindowButton"> + <param name="control_id" value="20" /> + <param name="onclick" value="" /> + <param name="label" value="$LOCALIZE[191]$INFO[Playlist.Random, : ]" /> + <param name="icon" value="osd/fullscreen/buttons/random-on.png" /> + <param name="width" value="$PARAM[width]" /> + </include> + <include name="PlaylistWindowButton"> + <param name="control_id" value="26" /> + <param name="onclick" value="" /> + <param name="label" value="" /> + <param name="icon" value="osd/fullscreen/buttons/repeat-all.png" /> + <param name="width" value="$PARAM[width]" /> + </include> + <include name="PlaylistWindowButton"> + <param name="control_id" value="21" /> + <param name="onclick" value="" /> + <param name="label" value="$LOCALIZE[190]" /> + <param name="icon" value="icons/playlist/save.png" /> + <param name="width" value="$PARAM[width]" /> + </include> + <include name="PlaylistWindowButton"> + <param name="control_id" value="22" /> + <param name="onclick" value="" /> + <param name="label" value="$LOCALIZE[192]" /> + <param name="icon" value="DefaultIconError.png" /> + <param name="width" value="$PARAM[width]" /> + </include> + </control> + </control> + </definition> + </include> + <include name="BottomMainMenuItem"> + <param name="height">110</param> + <definition> + <control type="radiobutton" id="$PARAM[control_id]"> + <width>118</width> + <height>$PARAM[height]</height> + <align>center</align> + <aligny>center</aligny> + <onclick>$PARAM[onclick]</onclick> + <font>-</font> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <radioposx>38</radioposx> + <radioposy>0</radioposy> + <radiowidth>40</radiowidth> + <radioheight>40</radioheight> + <textureradioonfocus>$PARAM[icon]</textureradioonfocus> + <textureradioonnofocus>$PARAM[icon]</textureradioonnofocus> + <textureradioofffocus>$PARAM[icon]</textureradioofffocus> + <textureradiooffnofocus>$PARAM[icon]</textureradiooffnofocus> + </control> + </definition> + </include> + <include name="VideoInfoButtonsCommon"> + <param name="width">262</param> + <definition> + <width>$PARAM[width]</width> + <height>142</height> + <align>center</align> + <aligny>top</aligny> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <textoffsetx>35</textoffsetx> + <textoffsety>78</textoffsety> + <radioposx>108</radioposx> + <radioposy>13</radioposy> + <radiowidth>48</radiowidth> + <font>font12</font> + <textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus> + <textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus> + <textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus> + <textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus> + <textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled> + <textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled> + </definition> + </include> + <include name="InfoDialogButton"> + <param name="width">262</param> + <definition> + <control type="radiobutton" id="$PARAM[id]"> + <width>$PARAM[width]</width> + <height>142</height> + <align>center</align> + <aligny>top</aligny> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <textoffsetx>35</textoffsetx> + <textoffsety>78</textoffsety> + <radioposx>108</radioposx> + <radioposy>13</radioposy> + <radiowidth>48</radiowidth> + <font>font12</font> + <textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus> + <textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus> + <textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus> + <textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus> + <textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled> + <textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled> + <label>$PARAM[label]</label> + <onclick>$PARAM[onclick_1]</onclick> + <onclick>$PARAM[onclick_2]</onclick> + <visible>$PARAM[visible]</visible> + </control> + </definition> + </include> + <include name="InfoDialogToggleButton"> + <param name="width">262</param> + <definition> + <control type="radiobutton" id="$PARAM[id]"> + <width>$PARAM[width]</width> + <height>142</height> + <align>center</align> + <aligny>top</aligny> + <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <textoffsetx>35</textoffsetx> + <textoffsety>78</textoffsety> + <radioposx>108</radioposx> + <radioposy>13</radioposy> + <radiowidth>48</radiowidth> + <font>font12</font> + <textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon_on]</textureradioonfocus> + <textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon_on]</textureradioonnofocus> + <textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon_off]</textureradioofffocus> + <textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon_off]</textureradiooffnofocus> + <textureradiooffdisabled colordiffuse="disabled">$PARAM[icon_off]</textureradiooffdisabled> + <textureradioondisabled colordiffuse="disabled">$PARAM[icon_on]</textureradioondisabled> + <selected>$PARAM[selected]</selected> + <label>$PARAM[label]</label> + <onclick>$PARAM[onclick_1]</onclick> + <onclick>$PARAM[onclick_2]</onclick> + <visible>$PARAM[visible]</visible> + </control> + </definition> + </include> </includes> diff --git a/addons/skin.estuary/1080i/Includes_Home.xml b/addons/skin.estuary/1080i/Includes_Home.xml index 583744a7dd..6d1b432aa2 100644 --- a/addons/skin.estuary/1080i/Includes_Home.xml +++ b/addons/skin.estuary/1080i/Includes_Home.xml @@ -37,81 +37,6 @@ <shadowcolor>black</shadowcolor> </control> </include> - <include name="BottomMainMenuItem"> - <param name="height">110</param> - <definition> - <control type="radiobutton" id="$PARAM[control_id]"> - <width>118</width> - <height>$PARAM[height]</height> - <align>center</align> - <aligny>center</aligny> - <onclick>$PARAM[onclick]</onclick> - <font>-</font> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <radioposx>38</radioposx> - <radioposy>0</radioposy> - <radiowidth>40</radiowidth> - <radioheight>40</radioheight> - <textureradioonfocus>$PARAM[icon]</textureradioonfocus> - <textureradioonnofocus>$PARAM[icon]</textureradioonnofocus> - <textureradioofffocus>$PARAM[icon]</textureradioofffocus> - <textureradiooffnofocus>$PARAM[icon]</textureradiooffnofocus> - </control> - </definition> - </include> - <include name="VideoInfoButtonsCommon"> - <param name="width">262</param> - <definition> - <width>$PARAM[width]</width> - <height>142</height> - <align>center</align> - <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <textoffsetx>35</textoffsetx> - <textoffsety>78</textoffsety> - <radioposx>108</radioposx> - <radioposy>13</radioposy> - <radiowidth>48</radiowidth> - <font>font12</font> - <textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus> - <textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus> - <textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus> - <textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus> - <textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled> - <textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled> - </definition> - </include> - <include name="InfoDialogButton"> - <param name="width">262</param> - <definition> - <control type="radiobutton" id="$PARAM[id]"> - <width>$PARAM[width]</width> - <height>142</height> - <align>center</align> - <aligny>top</aligny> - <texturefocus border="40">buttons/button-theme-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <textoffsetx>35</textoffsetx> - <textoffsety>78</textoffsety> - <radioposx>108</radioposx> - <radioposy>13</radioposy> - <radiowidth>48</radiowidth> - <font>font12</font> - <textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus> - <textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus> - <textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus> - <textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus> - <textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled> - <textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled> - <label>$PARAM[label]</label> - <onclick>$PARAM[onclick_1]</onclick> - <onclick>$PARAM[onclick_2]</onclick> - <visible>$PARAM[visible]</visible> - </control> - </definition> - </include> <include name="SubMenu"> <control type="group"> <height>110</height> diff --git a/addons/skin.estuary/1080i/Includes_MediaMenu.xml b/addons/skin.estuary/1080i/Includes_MediaMenu.xml index dd37f55f07..b6b2b7ddef 100644 --- a/addons/skin.estuary/1080i/Includes_MediaMenu.xml +++ b/addons/skin.estuary/1080i/Includes_MediaMenu.xml @@ -314,7 +314,6 @@ </control> </include> <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis">true</param> <definition> <left>0</left> <top>100</top> @@ -333,7 +332,7 @@ <include>MediaMenuItemsCommon</include> <label>$LOCALIZE[31023]</label> <label2>[B]$INFO[Container.Viewmode][/B]</label2> - <enable>$PARAM[viewtype_button_vis]</enable> + <enable>IntegerGreaterThan(Container.ViewCount,1)</enable> <onclick>Container.NextViewMode</onclick> </control> <control type="button" id="6053"> diff --git a/addons/skin.estuary/1080i/MyMusicNav.xml b/addons/skin.estuary/1080i/MyMusicNav.xml index 9b141a7c1d..c1f49091fb 100644 --- a/addons/skin.estuary/1080i/MyMusicNav.xml +++ b/addons/skin.estuary/1080i/MyMusicNav.xml @@ -69,18 +69,19 @@ <include>MediaMenuCommon</include> <control type="grouplist" id="9000"> <top>90</top> - <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis" value="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons)" /> - </include> + <include>MediaMenuListCommon</include> <control type="label" id="203"> <description>Actions</description> <include>MediaMenuLabelCommon</include> <label>$LOCALIZE[31020]</label> </control> - <control type="button" id="619"> + <control type="togglebutton" id="619"> <include>MediaMenuItemsCommon</include> - <label>$VAR[LibraryScanLabelVar]</label> + <label>$LOCALIZE[653]</label> <onclick>UpdateLibrary(music)</onclick> + <visible>!Container.Content(addons)</visible> + <altlabel>$LOCALIZE[13353]</altlabel> + <usealttexture>library.isscanningmusic</usealttexture> </control> <control type="radiobutton" id="16"> <label>$LOCALIZE[589]</label> @@ -98,6 +99,12 @@ <onclick>ActivateWindow(addonbrowser,addons://more/audio/,return)</onclick> <visible>Container.Content(addons)</visible> </control> + <control type="button" id="624"> + <include>MediaMenuItemsCommon</include> + <label>$LOCALIZE[10140]</label> + <onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick> + <visible>!IsEmpty(Container.PluginName)</visible> + </control> <control type="button" id="622"> <include>MediaMenuItemsCommon</include> <label>$LOCALIZE[31117]</label> @@ -112,6 +119,8 @@ <param name="breadcrumbs_label" value="$LOCALIZE[2]" /> <param name="breadcrumbs_icon" value="icons/settings/music.png" /> </include> - <include>BottomBar</include> + <include name="BottomBar"> + <param name="info_visible" value="true" /> + </include> </controls> </window> diff --git a/addons/skin.estuary/1080i/MyPics.xml b/addons/skin.estuary/1080i/MyPics.xml index ef8f96e099..f132f694f8 100644 --- a/addons/skin.estuary/1080i/MyPics.xml +++ b/addons/skin.estuary/1080i/MyPics.xml @@ -202,9 +202,7 @@ <include>MediaMenuCommon</include> <control type="grouplist" id="9000"> <top>90</top> - <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis" value="Container.Content(images) | Container.Content(addons)" /> - </include> + <include>MediaMenuListCommon</include> <control type="label" id="203"> <description>Actions</description> <include>MediaMenuLabelCommon</include> @@ -229,6 +227,12 @@ <onclick condition="!System.HasAddon(script.maps.browser)">InstallAddon(script.maps.browser)</onclick> <visible>Container.Content(images) + IsEmpty(Container.PluginName)</visible> </control> + <control type="button" id="624"> + <include>MediaMenuItemsCommon</include> + <label>$LOCALIZE[10140]</label> + <onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick> + <visible>!IsEmpty(Container.PluginName)</visible> + </control> <control type="button" id="621"> <description>Get more</description> <include>MediaMenuItemsCommon</include> @@ -243,6 +247,8 @@ <param name="breadcrumbs_label" value="$LOCALIZE[1213]" /> <param name="breadcrumbs_icon" value="icons/settings/pictures.png" /> </include> - <include>BottomBar</include> + <include name="BottomBar"> + <param name="info_visible" value="true" /> + </include> </controls> </window> diff --git a/addons/skin.estuary/1080i/MyPlaylist.xml b/addons/skin.estuary/1080i/MyPlaylist.xml index 0954763023..5c7f6071d9 100644 --- a/addons/skin.estuary/1080i/MyPlaylist.xml +++ b/addons/skin.estuary/1080i/MyPlaylist.xml @@ -6,24 +6,34 @@ <controls> <include>DefaultBackground</include> <include name="PlaylistWindowButtons"> - <param name="width" value="220" /> + <param name="width" value="400" /> </include> <control type="group"> + <include>OpenClose_Left</include> + <control type="image"> + <left>100</left> + <top>550</top> + <width>400</width> + <height>358</height> + <texture border="22">dialogs/dialog-bg.png</texture> + </control> + </control> + <control type="group"> <include>OpenClose_Right</include> - <left>320</left> + <left>510</left> <top>182</top> <control type="image"> <description>background image</description> <left>-20</left> <top>-20</top> - <width>1040</width> + <width>843</width> <height>746</height> <texture border="22">dialogs/dialog-bg.png</texture> </control> <control type="panel" id="50"> <left>2</left> <top>3</top> - <width>1000</width> + <width>800</width> <height>700</height> <scrolltime tween="cubic" easing="out">500</scrolltime> <orientation>vertical</orientation> @@ -34,28 +44,29 @@ <pagecontrol>60</pagecontrol> <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> - <focusedlayout height="70" width="1000"> + <focusedlayout height="63" width="800"> <control type="image"> <left>0</left> <top>0</top> - <width>996</width> - <height>70</height> + <width>800</width> + <height>63</height> <texture>lists/focus.png</texture> </control> <control type="label"> <left>30</left> <top>0</top> - <height>70</height> - <width>880</width> + <height>63</height> + <width>680</width> <aligny>center</aligny> + <font>font12</font> <label>$INFO[ListItem.Artist,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Title]</label> <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> <left>90</left> <top>0</top> - <height>70</height> - <width>880</width> + <height>63</height> + <width>680</width> <align>right</align> <aligny>center</aligny> <font>font12</font> @@ -64,28 +75,29 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="70" width="1000"> + <itemlayout height="63" width="800"> <control type="image"> <left>0</left> <top>0</top> - <width>996</width> - <height>71</height> + <width>800</width> + <height>63</height> <texture border="90,3,90,3">lists/separator.png</texture> </control> <control type="label"> <left>30</left> <top>0</top> - <height>70</height> - <width>880</width> + <height>63</height> + <width>680</width> <aligny>center</aligny> + <font>font12</font> <label>$INFO[ListItem.Artist,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Title]</label> <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> <left>90</left> <top>0</top> - <height>70</height> - <width>880</width> + <height>63</height> + <width>680</width> <align>right</align> <aligny>center</aligny> <font>font12</font> diff --git a/addons/skin.estuary/1080i/MyPrograms.xml b/addons/skin.estuary/1080i/MyPrograms.xml index f6192b6230..30b54c6cf9 100644 --- a/addons/skin.estuary/1080i/MyPrograms.xml +++ b/addons/skin.estuary/1080i/MyPrograms.xml @@ -25,15 +25,19 @@ <include>MediaMenuCommon</include> <control type="grouplist" id="9000"> <top>90</top> - <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis" value="Container.Content(addons)" /> - </include> + <include>MediaMenuListCommon</include> <control type="label" id="203"> <description>Actions</description> <include>MediaMenuLabelCommon</include> <label>$LOCALIZE[31020]</label> <visible>Control.IsVisible(621)</visible> </control> + <control type="button" id="624"> + <include>MediaMenuItemsCommon</include> + <label>$LOCALIZE[10140]</label> + <onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick> + <visible>!IsEmpty(Container.PluginName)</visible> + </control> <control type="button" id="621"> <description>Get more</description> <include>MediaMenuItemsCommon</include> @@ -48,6 +52,8 @@ <param name="breadcrumbs_label" value="$LOCALIZE[10001]" /> <param name="breadcrumbs_icon" value="icons/settings/addons.png" /> </include> - <include>BottomBar</include> + <include name="BottomBar"> + <param name="info_visible" value="true" /> + </include> </controls> </window> diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml index 0e8827b2a1..91be618120 100644 --- a/addons/skin.estuary/1080i/MyVideoNav.xml +++ b/addons/skin.estuary/1080i/MyVideoNav.xml @@ -194,9 +194,7 @@ <include>MediaMenuCommon</include> <control type="grouplist" id="9000"> <top>90</top> - <include name="MediaMenuListCommon"> - <param name="viewtype_button_vis" value="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(musicvideos) | Container.Content(addons)" /> - </include> + <include>MediaMenuListCommon</include> <control type="button" id="10"> <description>Watched Toggle</description> <include>MediaMenuItemsCommon</include> @@ -227,6 +225,7 @@ <include>MediaMenuItemsCommon</include> <label>$LOCALIZE[653]</label> <onclick>UpdateLibrary(video)</onclick> + <visible>!Container.Content(addons)</visible> <altlabel>$LOCALIZE[13353]</altlabel> <usealttexture>library.isscanningvideo</usealttexture> </control> @@ -244,6 +243,12 @@ <onclick>ActivateWindow(addonbrowser,addons://more/video/,return)</onclick> <visible>Container.Content(addons)</visible> </control> + <control type="button" id="624"> + <include>MediaMenuItemsCommon</include> + <label>$LOCALIZE[10140]</label> + <onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick> + <visible>!IsEmpty(Container.PluginName)</visible> + </control> <control type="button" id="622"> <include>MediaMenuItemsCommon</include> <label>$LOCALIZE[31117]</label> @@ -264,6 +269,8 @@ <param name="breadcrumbs_label" value="$VAR[BreadcrumbsVideoVar]" /> <param name="breadcrumbs_icon" value="icons/settings/video.png" /> </include> - <include>BottomBar</include> + <include name="BottomBar"> + <param name="info_visible" value="true" /> + </include> </controls> </window> diff --git a/addons/skin.estuary/1080i/SkinSettings.xml b/addons/skin.estuary/1080i/SkinSettings.xml index e7beae6542..1d3bb677df 100644 --- a/addons/skin.estuary/1080i/SkinSettings.xml +++ b/addons/skin.estuary/1080i/SkinSettings.xml @@ -113,6 +113,15 @@ <onclick>Skin.ToggleSetting(no_fanart)</onclick> <selected>!Skin.HasSetting(no_fanart)</selected> </control> + <control type="button" id="608"> + <label>$LOCALIZE[31131]</label> + <label2>$INFO[Skin.String(HomeFanart.name)]</label2> + <width>1256</width> + <include>DefaultSettingButton</include> + <onclick condition="System.HasAddon(script.image.resource.select)">RunScript(script.image.resource.select,property=HomeFanart&type=resource.images.skinbackgrounds)</onclick> + <onclick condition="!System.HasAddon(script.image.resource.select)">InstallAddon(script.image.resource.select)</onclick> + <enable>!Skin.HasSetting(no_fanart)</enable> + </control> <control type="radiobutton" id="606"> <label>$LOCALIZE[31108]</label> <width>1256</width> @@ -198,7 +207,7 @@ <font>font12</font> <align>justify</align> <textcolor>button_focus</textcolor> - <label>Some help text. Some help text. Some help text. Some help text.</label> + <label>$VAR[SkinSettingsHelpTextVar]</label> <autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll> </control> </control> diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml index 5c8262ee57..ddfa5b4bcd 100644 --- a/addons/skin.estuary/1080i/Variables.xml +++ b/addons/skin.estuary/1080i/Variables.xml @@ -26,6 +26,19 @@ <value condition="Window.IsActive(musicplaylist)">$INFO[ListItem.Duration]</value> <value>$INFO[ListItem.Duration,, $LOCALIZE[12391]]</value> </variable> + <variable name="AddonCountLabel"> + <value condition="IntegerGreaterThan(Container(8000).NumItems,10)">>9</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,9)">9</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,8)">8</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,7)">7</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,6)">6</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,5)">5</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,4)">4</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,3)">3</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,2)">2</value> + <value condition="IntegerGreaterThan(Container(8000).NumItems,1)">1</value> + <value>[COLOR grey]0[/COLOR]</value> + </variable> <variable name="MusicInfoTextboxVar"> <value condition="Container.Content(songs)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value> <value condition="Container.Content(albums)">$INFO[ListItem.Property(Album_Description),[B]$LOCALIZE[183][/B][CR][COLOR=white],[/COLOR]]</value> @@ -134,9 +147,9 @@ <!-- <value condition="!IsEmpty(ListItem.AddonBroken)">icons/infodialogs/update.png</value> <value condition="!IsEmpty(ListItem.Property(addon.orphaned))">icons/infodialogs/update.png</value> --> <value condition="ListItem.IsParentFolder">-</value> - <value condition="ListItem.Property(addon.downloading)">icons/infodialogs/install.png</value> - <value condition="ListItem.Property(addon.isinstalled) + !ListItem.Property(addon.isenabled) + Window.IsActive(addonbrowser)">icons/infodialogs/disable.png</value> - <value condition="ListItem.Property(addon.hasupdate)">icons/infodialogs/update.png</value> + <value condition="ListItem.Property(addon.downloading)">icons/addonstatus/install.png</value> + <value condition="ListItem.Property(addon.isinstalled) + !ListItem.Property(addon.isenabled) + Window.IsActive(addonbrowser)">icons/addonstatus/disable.png</value> + <value condition="ListItem.Property(addon.hasupdate)">icons/addonstatus/update.png</value> <value condition="ListItem.Property(addon.isinstalled)">OverlayWatched.png</value> <value>OverlayUnwatched.png</value> </variable> @@ -212,6 +225,10 @@ <value condition="Control.HasFocus(703)">$LOCALIZE[24013]</value> <value condition="Control.HasFocus(5000)">$LOCALIZE[10004]</value> </variable> + <variable name="SkinSettingsHelpTextVar"> + <value condition="Container(9000).HasFocus(1)">$LOCALIZE[31129]</value> + <value condition="Container(9000).HasFocus(2)">$LOCALIZE[31130]</value> + </variable> <variable name="DSPManagerHelpTextVar"> <value condition="Control.HasFocus(20)">$INFO[Container(20).ListItem.Property(Description)]</value> <value condition="Control.HasFocus(21)">$INFO[Container(21).ListItem.Property(Description)]</value> @@ -240,6 +257,17 @@ <value condition="VideoPlayer.Content(episodes)">$INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.TVShowTitle]</value> <value>$INFO[VideoPlayer.Genre]</value> </variable> + <variable name="AddonsFanartVar"> + <value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value> + <value condition="!IsEmpty(Container(500).ListItem.Art(fanart)) + Control.HasFocus(500)">$INFO[Container(500).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Container(501).ListItem.Art(fanart)) + Control.HasFocus(501)">$INFO[Container(501).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Container(502).ListItem.Art(fanart)) + Control.HasFocus(502)">$INFO[Container(502).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Container(503).ListItem.Art(fanart)) + Control.HasFocus(503)">$INFO[Container(503).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Container(504).ListItem.Art(fanart)) + Control.HasFocus(504)">$INFO[Container(504).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Container(505).ListItem.Art(fanart)) + Control.HasFocus(505)">$INFO[Container(505).ListItem.Art(fanart)]</value> + <value condition="!IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value> + <value>-</value> + </variable> <variable name="HomeFanartVar"> <value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value> <value condition="!IsEmpty(Container(5100).ListItem.Art(fanart)) + Control.HasFocus(5100)">$INFO[Container(5100).ListItem.Art(fanart)]</value> @@ -261,6 +289,7 @@ <value condition="!IsEmpty(Container(8500).ListItem.Art(fanart)) + Control.HasFocus(8500)">$INFO[Container(8500).ListItem.Art(fanart)]</value> <value condition="!IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15100).ListItem.Property(FanartCode)]</value> <value condition="!IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15200).ListItem.Property(FanartCode)]</value> + <value condition="!IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value> <value>-</value> </variable> <variable name="MediaFanartVar"> @@ -315,11 +344,6 @@ <value condition="Control.HasFocus(60) | Control.HasFocus(5199) | Control.HasFocus(531) | Control.HasFocus(533)">[COLOR button_focus]$INFO[Container.CurrentPage,, / ]$INFO[Container.NumPages][/COLOR]</value> <value>$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems]</value> </variable> - <variable name="LibraryScanLabelVar"> - <value condition="Window.IsActive(videos) + library.IsScanningVideo">$LOCALIZE[13353]</value> - <value condition="Window.IsActive(musiclibrary) + library.IsScanningMusic">$LOCALIZE[13353]</value> - <value>$LOCALIZE[653]</value> - </variable> <variable name="PVRChannelMgrHeader"> <value condition="!IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value> <value>$LOCALIZE[19199] - $LOCALIZE[19023]</value> diff --git a/addons/skin.estuary/1080i/View_501_Banner.xml b/addons/skin.estuary/1080i/View_501_Banner.xml index 36310c3af9..1c58fae736 100644 --- a/addons/skin.estuary/1080i/View_501_Banner.xml +++ b/addons/skin.estuary/1080i/View_501_Banner.xml @@ -103,7 +103,7 @@ <width>22</width> <height>22</height> <texture>lists/played-total.png</texture> - <visible>Stringcompare(Listitem.dbtype,tvshow)</visible> + <visible>Stringcompare(Listitem.dbtype,tvshow) + !IsEmpty(ListItem.Property(TotalEpisodes))</visible> </control> <control type="label"> <right>123</right> diff --git a/addons/skin.estuary/1080i/View_502_FanArt.xml b/addons/skin.estuary/1080i/View_502_FanArt.xml index 3e3dd174a5..76696e426c 100644 --- a/addons/skin.estuary/1080i/View_502_FanArt.xml +++ b/addons/skin.estuary/1080i/View_502_FanArt.xml @@ -34,7 +34,7 @@ <ondown>9000</ondown> <viewtype label="20445">bigicon</viewtype> <preloaditems>2</preloaditems> - <pagecontrol>5021</pagecontrol> + <pagecontrol>5199</pagecontrol> <scrolltime tween="cubic">800</scrolltime> <orientation>horizontal</orientation> <visible>Container.Content(movies) | Container.Content(tvshows)</visible> @@ -205,33 +205,33 @@ <animation type="Visible"> <effect type="fade" start="0" end="100" delay="800" time="300" /> </animation> - <control type="grouplist"> - <top>660</top> - <left>40</left> - <orientation>horizontal</orientation> - <width>380</width> - <align>center</align> - <include name="InfoFlag"> - <param name="visible" value="!IsEmpty(ListItem.duration)" /> - <param name="icon" value="frame/clock.png" /> - <param name="label" value="$INFO[ListItem.Duration,, min]" /> - </include> - <include name="InfoFlag"> - <param name="visible" value="!IsEmpty(ListItem.Property(TotalEpisodes))" /> - <param name="icon" value="lists/played-total.png" /> - <param name="label" value="$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]" /> - </include> - <include name="InfoFlag"> - <param name="visible" value="!IsEmpty(ListItem.Year) + IsEmpty(ListItem.Premiered)" /> - <param name="icon" value="lists/year.png" /> - <param name="label" value="$INFO[ListItem.Year]" /> - </include> - <include name="InfoFlag"> - <param name="visible" value="!IsEmpty(ListItem.Premiered)" /> - <param name="icon" value="lists/year.png" /> - <param name="label" value="$INFO[ListItem.Premiered]" /> - </include> - </control> + <control type="grouplist"> + <top>660</top> + <left>40</left> + <orientation>horizontal</orientation> + <width>380</width> + <align>center</align> + <include name="InfoFlag"> + <param name="visible" value="!IsEmpty(ListItem.duration)" /> + <param name="icon" value="frame/clock.png" /> + <param name="label" value="$INFO[ListItem.Duration,, min]" /> + </include> + <include name="InfoFlag"> + <param name="visible" value="!IsEmpty(ListItem.Property(TotalEpisodes))" /> + <param name="icon" value="lists/played-total.png" /> + <param name="label" value="$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]" /> + </include> + <include name="InfoFlag"> + <param name="visible" value="!IsEmpty(ListItem.Year) + IsEmpty(ListItem.Premiered)" /> + <param name="icon" value="lists/year.png" /> + <param name="label" value="$INFO[ListItem.Year]" /> + </include> + <include name="InfoFlag"> + <param name="visible" value="!IsEmpty(ListItem.Premiered)" /> + <param name="icon" value="lists/year.png" /> + <param name="label" value="$INFO[ListItem.Premiered]" /> + </include> + </control> <control type="textbox"> <left>30</left> <top>35</top> diff --git a/addons/skin.estuary/addon.xml b/addons/skin.estuary/addon.xml index 86245ca4e5..4dcf6bea2b 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.6.2" name="Estuary" provider-name="phil65, Piers"> +<addon id="skin.estuary" version="0.7.0" name="Estuary" provider-name="phil65, Piers"> <requires> <import addon="xbmc.gui" version="5.11.0"/> </requires> diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po index 29a71af653..02abfff6ba 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -98,12 +98,7 @@ msgstr "" #: /1080i/Home.xml:374 msgctxt "#31016" -msgid "Favourite channels" -msgstr "" - -#: /1080i/Home.xml:435 -msgctxt "#31017" -msgid "Recent channels" +msgid "Recently played channels" msgstr "" #: /1080i/Home.xml:443 @@ -541,7 +536,7 @@ msgstr "" #: /1080i/Home.xml:134 /1080i/Home.xml:228 msgctxt "#31104" -msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. " +msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library." msgstr "" #: /1080i/Home.xml:468 @@ -663,3 +658,18 @@ msgstr "" msgctxt "#31128" msgid "Contributors" msgstr "" + +#: /1080i/Variables.xml:229 +msgctxt "#31129" +msgid "General settings applying to all areas of the skin." +msgstr "" + +#: /1080i/Variables.xml:230 +msgctxt "#31130" +msgid "Main menu-related settings: Configure the home screen to your likings." +msgstr "" + +#: /1080i/SkinSettings.xml:117 +msgctxt "#31131" +msgid "Choose home fanart pack" +msgstr "" diff --git a/addons/skin.estuary/media/icons/addonstatus/disable.png b/addons/skin.estuary/media/icons/addonstatus/disable.png Binary files differnew file mode 100644 index 0000000000..b264b21b3c --- /dev/null +++ b/addons/skin.estuary/media/icons/addonstatus/disable.png diff --git a/addons/skin.estuary/media/icons/addonstatus/install.png b/addons/skin.estuary/media/icons/addonstatus/install.png Binary files differnew file mode 100644 index 0000000000..003a735a04 --- /dev/null +++ b/addons/skin.estuary/media/icons/addonstatus/install.png diff --git a/addons/skin.estuary/media/icons/addonstatus/update.png b/addons/skin.estuary/media/icons/addonstatus/update.png Binary files differnew file mode 100644 index 0000000000..6917338495 --- /dev/null +++ b/addons/skin.estuary/media/icons/addonstatus/update.png diff --git a/addons/skin.estuary/media/icons/infodialogs/enabled.png b/addons/skin.estuary/media/icons/infodialogs/enabled.png Binary files differnew file mode 100644 index 0000000000..1b65550631 --- /dev/null +++ b/addons/skin.estuary/media/icons/infodialogs/enabled.png diff --git a/addons/skin.estuary/media/icons/infodialogs/play.png b/addons/skin.estuary/media/icons/infodialogs/play.png Binary files differnew file mode 100644 index 0000000000..73045a9283 --- /dev/null +++ b/addons/skin.estuary/media/icons/infodialogs/play.png diff --git a/addons/skin.estuary/playlists/unwatched_tvshows.xsp b/addons/skin.estuary/playlists/unwatched_tvshows.xsp index a5d54af5a5..f8fae6ec67 100644 --- a/addons/skin.estuary/playlists/unwatched_tvshows.xsp +++ b/addons/skin.estuary/playlists/unwatched_tvshows.xsp @@ -5,6 +5,9 @@ <rule field="numwatched" operator="is"> <value>0</value> </rule> + <rule field="numepisodes" operator="greaterthan"> + <value>0</value> + </rule> <limit>10</limit> <order direction="ascending">random</order> </smartplaylist> |
