diff options
107 files changed, 2097 insertions, 2417 deletions
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 3182e971d5..da1756d8e6 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -56,11 +56,6 @@ msgctxt "#31007" msgid "Unwatched movies" msgstr "" -#: /1080i/DialogAddonInfo.xml -msgctxt "#31008" -msgid "No disclaimer" -msgstr "" - #: /1080i/MyVideoNav.xml msgctxt "#31009" msgid "Download icons" @@ -139,26 +134,11 @@ msgctxt "#31023" msgid "Viewtype" msgstr "" -#: /1080i/MusicVisualisation.xml -msgctxt "#31024" -msgid "Next tracks" -msgstr "" - #: /1080i/DialogFavourites.xml msgctxt "#31025" msgid "No favourites found. You can add any item from media views to this list by using the context menu." msgstr "" -#: /1080i/DialogAlbumInfo.xml -msgctxt "#31026" -msgid "Go to albums" -msgstr "" - -#: /1080i/DialogAlbumInfo.xml -msgctxt "#31027" -msgid "Go to songs" -msgstr "" - #: /1080i/DialogAlbumInfo.xml /1080i/DialogVideoInfo.xml msgctxt "#31028" msgid "Show fanart" @@ -205,11 +185,6 @@ msgid "items" msgstr "" #: /1080i/Variables.xml -msgctxt "#31037" -msgid "Tracklist" -msgstr "" - -#: /1080i/Variables.xml msgctxt "#31038" msgid "Rewind" msgstr "" @@ -219,11 +194,6 @@ msgctxt "#31039" msgid "Fast forward" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31040" -msgid "Cancel update" -msgstr "" - #: /1080i/Variables.xml /1080i/MyPics.xml msgctxt "#31041" msgid "Camera manufacturer" @@ -254,22 +224,12 @@ msgctxt "#31046" msgid "Delete group" msgstr "" -#: /1080i/View_50_List.xml -msgctxt "#31047" -msgid "Read more..." -msgstr "" - #: /1080i/DialogVideoInfo.xml msgctxt "#31048" msgid "Available" msgstr "" #: /1080i/Variables.xml -msgctxt "#31049" -msgid "Press [B]Up[/B] to rewind or fast-forward" -msgstr "" - -#: /1080i/Variables.xml msgctxt "#31050" msgid "Press [B]OK[/B] to stop" msgstr "" @@ -294,11 +254,6 @@ msgctxt "#31054" msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31055" -msgid "Subtitle download" -msgstr "" - #: /1080i/MyMusicNav.xml /1080i/MyVideoNav.xml msgctxt "#31056" msgid "Go to playlist" @@ -314,16 +269,6 @@ msgctxt "#31058" msgid "Automatic Login on startup" msgstr "" -#: /1080i/Includes.xml -msgctxt "#31059" -msgid "Updates available" -msgstr "" - -#: /1080i/Variables.xml /1080i/DialogVideoInfo.xml -msgctxt "#31060" -msgid "minutes" -msgstr "" - #: /1080i/SkinSettings.xml msgctxt "#31061" msgid "Main menu items" @@ -339,11 +284,6 @@ msgctxt "#31063" msgid "Sections" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31064" -msgid "unwatched" -msgstr "" - #: /1080i/MyVideoPlaylist.xml msgctxt "#31065" msgid "Video playlist" @@ -369,11 +309,6 @@ msgctxt "#31069" msgid "Last Updated" msgstr "" -#: /1080i/Custom_1103_SourcesDialog.xml -msgctxt "#31070" -msgid "Add media sources" -msgstr "" - #: /1080i/DialogAddonInfo.xml msgctxt "#31071" msgid "by" @@ -385,35 +320,10 @@ msgid "Power Options" msgstr "" #: /1080i/Home.xml -msgctxt "#31073" -msgid "Titles" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31074" -msgid "Library root" -msgstr "" - -#: /1080i/Home.xml msgctxt "#31075" msgid "Movie sets" msgstr "" -#: /1080i/Home.xml -msgctxt "#31076" -msgid "Play optical disc" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31077" -msgid "Previous location" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31078" -msgid "Next location" -msgstr "" - #: /1080i/DialogVideoInfo.xml msgctxt "#31079" msgid "Cast not available" @@ -424,11 +334,6 @@ msgctxt "#31080" msgid "Ends at" msgstr "" -#: /1080i/DialogSongInfo.xml -msgctxt "#31081" -msgid "Album info" -msgstr "" - #: /1080i/Custom_1105_MusicOSDSettings.xml msgctxt "#31082" msgid "Lyrics add-on" @@ -444,26 +349,6 @@ msgctxt "#31084" msgid "Visualisation settings" msgstr "" -#: /1080i/DialogFullScreenInfo.xml -msgctxt "#31085" -msgid "Channel Group" -msgstr "" - -#: /1080i/DialogFullScreenInfo.xml -msgctxt "#31086" -msgid "Metadata" -msgstr "" - -#: /1080i/DialogContentSettings.xml -msgctxt "#31087" -msgid "Provider settings" -msgstr "" - -#: /1080i/DialogContentSettings.xml -msgctxt "#31088" -msgid "Content scanning options" -msgstr "" - #: /1080i/DialogPVRGroupManager.xml msgctxt "#31089" msgid "Available groups" @@ -474,11 +359,6 @@ msgctxt "#31090" msgid "Search trailer" msgstr "" -#: /1080i/VideoOSD.xml -msgctxt "#31091" -msgid "Download subtitles" -msgstr "" - #: /1080i/VideoOSD.xml /1080i/Variables.xml msgctxt "#31092" msgid "Video menu" @@ -490,11 +370,6 @@ msgid "Show weather info in top bar" msgstr "" #: /1080i/SkinSettings.xml -msgctxt "#31094" -msgid "Show media flags for movies / episodes / music videos" -msgstr "" - -#: /1080i/SkinSettings.xml msgctxt "#31095" msgid "Use slide animations" msgstr "" @@ -559,16 +434,6 @@ msgctxt "#31107" msgid "WideList" msgstr "" -#: /1080i/SkinSettings.xml -msgctxt "#31108" -msgid "Use custom global background" -msgstr "" - -#: /1080i/SkinSettings.xml -msgctxt "#31109" -msgid "Choose image path" -msgstr "" - #: /1080i/Home.xml msgctxt "#31110" msgid "Enter files section" @@ -684,22 +549,12 @@ msgctxt "#31132" msgid "min" msgstr "" -#: /1080i/DialogKeyboard.xml -msgctxt "#31133" -msgid "Hide" -msgstr "" - #: /1080i/DialogSeekBar.xml msgctxt "#31134" msgid "Remaining" msgstr "" #: /1080i/DialogAddonInfo.xml -msgctxt "#31135" -msgid "Installed from" -msgstr "" - -#: /1080i/DialogAddonInfo.xml msgctxt "#31136" msgid "Click here to see latest changes..." msgstr "" @@ -750,16 +605,6 @@ msgid "Search add-ons" msgstr "" #: /1080i/Home.xml -msgctxt "#31146" -msgid "Manage add-ons" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31147" -msgid "Download add-ons" -msgstr "" - -#: /1080i/Home.xml msgctxt "#31148" msgid "Categories" msgstr "" @@ -823,3 +668,8 @@ msgstr "" msgctxt "#31160" msgid "Show media flags" msgstr "" + +#: /xml/DialogNumeric.xml +msgctxt "#31161" +msgid "Numeric pad" +msgstr "" diff --git a/addons/skin.estuary/media/dialogs/dialog-bg-solid.png b/addons/skin.estuary/media/dialogs/dialog-bg-solid.png Binary files differdeleted file mode 100644 index c080a0fbd6..0000000000 --- a/addons/skin.estuary/media/dialogs/dialog-bg-solid.png +++ /dev/null diff --git a/addons/skin.estuary/media/dialogs/separator.png b/addons/skin.estuary/media/dialogs/separator.png Binary files differdeleted file mode 100644 index 1583fc7dd1..0000000000 --- a/addons/skin.estuary/media/dialogs/separator.png +++ /dev/null diff --git a/addons/skin.estuary/media/frame/menu-fo.png b/addons/skin.estuary/media/frame/menu-fo.png Binary files differdeleted file mode 100644 index e7048b03ec..0000000000 --- a/addons/skin.estuary/media/frame/menu-fo.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/infodialogs/changelog.png b/addons/skin.estuary/media/icons/infodialogs/changelog.png Binary files differdeleted file mode 100644 index acb2aef84e..0000000000 --- a/addons/skin.estuary/media/icons/infodialogs/changelog.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/infodialogs/list.png b/addons/skin.estuary/media/icons/infodialogs/list.png Binary files differdeleted file mode 100644 index 703e7e2354..0000000000 --- a/addons/skin.estuary/media/icons/infodialogs/list.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/settings/addons.png b/addons/skin.estuary/media/icons/settings/addons.png Binary files differindex 59c01f7d12..585d9dc92c 100644 --- a/addons/skin.estuary/media/icons/settings/addons.png +++ b/addons/skin.estuary/media/icons/settings/addons.png diff --git a/addons/skin.estuary/media/icons/settings/android.png b/addons/skin.estuary/media/icons/settings/android.png Binary files differdeleted file mode 100644 index 6fe042d643..0000000000 --- a/addons/skin.estuary/media/icons/settings/android.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/settings/appearance.png b/addons/skin.estuary/media/icons/settings/appearance.png Binary files differdeleted file mode 100644 index 30eda07400..0000000000 --- a/addons/skin.estuary/media/icons/settings/appearance.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/settings/eventlog.png b/addons/skin.estuary/media/icons/settings/eventlog.png Binary files differindex f4d113022a..24c098f05c 100644 --- a/addons/skin.estuary/media/icons/settings/eventlog.png +++ b/addons/skin.estuary/media/icons/settings/eventlog.png diff --git a/addons/skin.estuary/media/icons/settings/filemanager.png b/addons/skin.estuary/media/icons/settings/filemanager.png Binary files differindex 20762adb70..edfd6c2b4c 100644 --- a/addons/skin.estuary/media/icons/settings/filemanager.png +++ b/addons/skin.estuary/media/icons/settings/filemanager.png diff --git a/addons/skin.estuary/media/icons/settings/interface.png b/addons/skin.estuary/media/icons/settings/interface.png Binary files differnew file mode 100644 index 0000000000..7a1d50903d --- /dev/null +++ b/addons/skin.estuary/media/icons/settings/interface.png diff --git a/addons/skin.estuary/media/icons/settings/library.png b/addons/skin.estuary/media/icons/settings/library.png Binary files differdeleted file mode 100644 index df293c67fb..0000000000 --- a/addons/skin.estuary/media/icons/settings/library.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/settings/libreelec.png b/addons/skin.estuary/media/icons/settings/libreelec.png Binary files differnew file mode 100644 index 0000000000..b442f2a36d --- /dev/null +++ b/addons/skin.estuary/media/icons/settings/libreelec.png diff --git a/addons/skin.estuary/media/icons/settings/livetv.png b/addons/skin.estuary/media/icons/settings/livetv.png Binary files differindex 8408ea6f2a..236094b2d0 100644 --- a/addons/skin.estuary/media/icons/settings/livetv.png +++ b/addons/skin.estuary/media/icons/settings/livetv.png diff --git a/addons/skin.estuary/media/icons/settings/media.png b/addons/skin.estuary/media/icons/settings/media.png Binary files differindex 5ed85493da..0894295d86 100644 --- a/addons/skin.estuary/media/icons/settings/media.png +++ b/addons/skin.estuary/media/icons/settings/media.png diff --git a/addons/skin.estuary/media/icons/settings/network.png b/addons/skin.estuary/media/icons/settings/network.png Binary files differindex a22e80fdd7..e64f3455cd 100644 --- a/addons/skin.estuary/media/icons/settings/network.png +++ b/addons/skin.estuary/media/icons/settings/network.png diff --git a/addons/skin.estuary/media/icons/settings/pictures.png b/addons/skin.estuary/media/icons/settings/pictures.png Binary files differdeleted file mode 100644 index 91f516a5cc..0000000000 --- a/addons/skin.estuary/media/icons/settings/pictures.png +++ /dev/null diff --git a/addons/skin.estuary/media/icons/settings/player.png b/addons/skin.estuary/media/icons/settings/player.png Binary files differnew file mode 100644 index 0000000000..1546e39d23 --- /dev/null +++ b/addons/skin.estuary/media/icons/settings/player.png diff --git a/addons/skin.estuary/media/icons/settings/profiles.png b/addons/skin.estuary/media/icons/settings/profiles.png Binary files differindex 065441038c..c13a26664d 100644 --- a/addons/skin.estuary/media/icons/settings/profiles.png +++ b/addons/skin.estuary/media/icons/settings/profiles.png diff --git a/addons/skin.estuary/media/icons/settings/skin.png b/addons/skin.estuary/media/icons/settings/skin.png Binary files differindex 862bbc1043..2a959aa497 100644 --- a/addons/skin.estuary/media/icons/settings/skin.png +++ b/addons/skin.estuary/media/icons/settings/skin.png diff --git a/addons/skin.estuary/media/icons/settings/sysinfo.png b/addons/skin.estuary/media/icons/settings/sysinfo.png Binary files differindex 992f4a0f7a..9e5bbf679b 100644 --- a/addons/skin.estuary/media/icons/settings/sysinfo.png +++ b/addons/skin.estuary/media/icons/settings/sysinfo.png diff --git a/addons/skin.estuary/media/icons/settings/system.png b/addons/skin.estuary/media/icons/settings/system.png Binary files differindex 8097e78f2b..756bf19027 100644 --- a/addons/skin.estuary/media/icons/settings/system.png +++ b/addons/skin.estuary/media/icons/settings/system.png diff --git a/addons/skin.estuary/media/icons/settings/video.png b/addons/skin.estuary/media/icons/settings/video.png Binary files differdeleted file mode 100644 index 4e0fb1d192..0000000000 --- a/addons/skin.estuary/media/icons/settings/video.png +++ /dev/null diff --git a/addons/skin.estuary/media/lists/totaltv.png b/addons/skin.estuary/media/lists/totaltv.png Binary files differdeleted file mode 100644 index f529c8ed1b..0000000000 --- a/addons/skin.estuary/media/lists/totaltv.png +++ /dev/null diff --git a/addons/skin.estuary/media/submneu/add-ons.png b/addons/skin.estuary/media/submneu/add-ons.png Binary files differdeleted file mode 100644 index 95fe52bb57..0000000000 --- a/addons/skin.estuary/media/submneu/add-ons.png +++ /dev/null diff --git a/addons/skin.estuary/media/submneu/videos.png b/addons/skin.estuary/media/submneu/videos.png Binary files differdeleted file mode 100644 index 54653dfb29..0000000000 --- a/addons/skin.estuary/media/submneu/videos.png +++ /dev/null diff --git a/addons/skin.estuary/playlists/inprogress_musicvideos.xsp b/addons/skin.estuary/playlists/inprogress_musicvideos.xsp deleted file mode 100644 index dd9a16e02b..0000000000 --- a/addons/skin.estuary/playlists/inprogress_musicvideos.xsp +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<smartplaylist type="musicvideos"> - <name>In-progress music videos</name> - <match>all</match> - <rule field="inprogress" operator="true" /> - <limit>15</limit> - <order direction="descending">lastplayed</order> -</smartplaylist> diff --git a/addons/skin.estuary/resources/fanart.jpg b/addons/skin.estuary/resources/fanart.jpg Binary files differindex 85cac3a0f4..45952a1745 100644 --- a/addons/skin.estuary/resources/fanart.jpg +++ b/addons/skin.estuary/resources/fanart.jpg diff --git a/addons/skin.estuary/resources/icon.png b/addons/skin.estuary/resources/icon.png Binary files differindex dc320fec76..c438524a91 100644 --- a/addons/skin.estuary/resources/icon.png +++ b/addons/skin.estuary/resources/icon.png diff --git a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml index 6fa14554d1..2d1c7918e9 100644 --- a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml +++ b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml @@ -94,7 +94,7 @@ <width>462</width> <height>95</height> <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">Conditional</animation> + <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation> </control> <control type="image"> <left>-3</left> @@ -109,7 +109,7 @@ <width>95</width> <height>95</height> <texture colordiffuse="51FFFFFF">colors/black.png</texture> - <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus">Conditional</animation> + <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation> </control> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml index 8a830ac0f4..c767bb4e6b 100644 --- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml +++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml @@ -11,10 +11,10 @@ <visible>!Window.IsActive(DialogSettings.xml) + !Window.IsActive(DialogSlider.xml)</visible> <animation effect="fade" time="200">VisibleChange</animation> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="700" /> - <param name="DialogBackgroundHeight" value="80" /> - <param name="DialogHeaderLabel" value="$INFO[Window(home).Property(settingslist_Header)]" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="700" /> + <param name="height" value="80" /> + <param name="header_label" value="$INFO[Window(home).Property(settingslist_Header)]" /> + <param name="header_id" value="1" /> </include> <control type="group" id="11000"> <left>0</left> diff --git a/addons/skin.estuary/xml/Custom_1102_TextViewer.xml b/addons/skin.estuary/xml/Custom_1102_TextViewer.xml index def58819ad..164919b75d 100644 --- a/addons/skin.estuary/xml/Custom_1102_TextViewer.xml +++ b/addons/skin.estuary/xml/Custom_1102_TextViewer.xml @@ -8,10 +8,10 @@ <centertop>50%</centertop> <height>770</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="84%" /> - <param name="DialogBackgroundHeight" value="770" /> - <param name="DialogHeaderLabel" value="$INFO[Window(home).Property(TextViewer_Header)]" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="84%" /> + <param name="height" value="770" /> + <param name="header_label" value="$INFO[Window(home).Property(TextViewer_Header)]" /> + <param name="header_id" value="1" /> </include> <control type="textbox" id="2000"> <left>1%</left> diff --git a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml new file mode 100644 index 0000000000..72aece4efa --- /dev/null +++ b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<window type="dialog" id="1103"> + <defaultcontrol>11</defaultcontrol> + <include>Animation_DialogPopupOpenClose</include> + <depth>DepthOSD+</depth> + <controls> + <control type="button"> + <description>background close area</description> + <left>0</left> + <top>0</top> + <width>100%</width> + <bottom>0</bottom> + <texturefocus /> + <texturenofocus /> + <onclick>Action(close)</onclick> + </control> + <control type="group"> + <bottom>0</bottom> + <height>250</height> + <left>30</left> + <width>840</width> + <control type="image"> + <left>-20</left> + <top>0</top> + <width>525</width> + <height>152</height> + <texture border="21">dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="progress"> + <left>40</left> + <top>20</top> + <width>400</width> + <height>112</height> + <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg> + <midtexture colordiffuse="button_focus">colors/white.png</midtexture> + <info>Player.Volume</info> + </control> + <control type="slider"> + <description>Slider</description> + <left>40</left> + <top>55</top> + <width>400</width> + <height>40</height> + <texturesliderbar></texturesliderbar> + <textureslidernib></textureslidernib> + <textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus> + <info>Player.Volume</info> + <action>Volume</action> + </control> + <control type="image"> + <left>0</left> + <top>65</top> + <width>28</width> + <height>28</height> + <texture flipx="true" colordiffuse="button_focus">overlays/arrowright.png</texture> + <animation effect="zoom" start="0,100" end="100,100" delay="500" center="auto" time="200">WindowOpen</animation> + <animation effect="zoom" start="100,100" end="0,100" center="auto" time="200">WindowClose</animation> + </control> + <control type="image"> + <left>455</left> + <top>65</top> + <width>28</width> + <height>28</height> + <texture colordiffuse="button_focus">overlays/arrowright.png</texture> + <animation effect="zoom" start="0,100" end="100,100" delay="500" center="auto" time="200">WindowOpen</animation> + <animation effect="zoom" start="100,100" end="0,100" center="auto" time="200">WindowClose</animation> + </control> + </control> + </controls> +</window> diff --git a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml index 0ce3c31133..9956e2865f 100644 --- a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml +++ b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml @@ -4,29 +4,18 @@ <include>Animation_DialogPopupOpenClose</include> <controls> <control type="group"> - <top>220</top> <centerleft>50%</centerleft> <width>600</width> + <centertop>50%</centertop> + <height>700</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="600" /> - <param name="DialogBackgroundHeight" value="550" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[5]" /> - <param name="DialogHeaderId" value="" /> + <param name="width" value="600" /> + <param name="height" value="80" /> + <param name="header_label" value="$LOCALIZE[5]" /> + <param name="header_id" value="" /> </include> - <control type="list" id="5000"> - <left>2</left> - <top>107</top> - <width>596</width> - <height>660</height> - <onup>5000</onup> - <ondown>5000</ondown> - <onleft>99</onleft> - <onright>61</onright> - <include content="DefaultSimpleListLayout"> - <param name="width" value="600" /> - <param name="list_id" value="5000" /> - <param name="align" value="center" /> - </include> + <control type="panel" id="5000"> + <include>ButtonMenuList</include> <content> <item> <label>$LOCALIZE[15047]</label> diff --git a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml index 8594a01077..71f705cbb5 100644 --- a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml +++ b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml @@ -9,10 +9,10 @@ <centertop>60%</centertop> <height>700</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="600" /> - <param name="DialogBackgroundHeight" value="80" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[137]" /> - <param name="DialogHeaderId" value="" /> + <param name="width" value="600" /> + <param name="height" value="80" /> + <param name="header_label" value="$LOCALIZE[137]" /> + <param name="header_id" value="" /> </include> <control type="panel" id="9000"> <include>ButtonMenuList</include> diff --git a/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml b/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml deleted file mode 100644 index 89f11700b0..0000000000 --- a/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<window type="dialog" id="1108"> - <visible>Player.ShowInfo + !System.HasModalDialog + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible> - <defaultcontrol></defaultcontrol> - <animation effect="fade" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> - <depth>DepthOSD</depth> - <controls> - <control type="group"> - <bottom>0</bottom> - <height>250</height> - <control type="image"> - <left>0</left> - <width>100%</width> - <height>240</height> - <texture>dialogs/dialog-bg-nobo.png</texture> - </control> - <control type="image"> - <left>30</left> - <top>20</top> - <width>200</width> - <height>200</height> - <aspectratio aligny="center">keep</aspectratio> - <texture>$INFO[Player.Art(thumb)]</texture> - </control> - <control type="label"> - <left>260</left> - <top>40</top> - <right>100</right> - <height>25</height> - <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.EpisodeName, (,)]</label> - <aligny>center</aligny> - <font>font45</font> - </control> - <control type="progress"> - <animation effect="fade" end="0" time="200">WindowClose</animation> - <left>260</left> - <top>92</top> - <right>0</right> - <height>15</height> - <info>Player.ProgressCache</info> - <texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg> - <midtexture colordiffuse="button_focus">colors/white50.png</midtexture> - <animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation> - <visible>!Player.ChannelPreviewActive</visible> - </control> - <control type="progress" id="23"> - <animation effect="fade" end="0" time="200">WindowClose</animation> - <left>260</left> - <top>92</top> - <right>0</right> - <height>15</height> - <info>Player.Progress</info> - <texturebg border="3" colordiffuse="80FFFFFF">colors/white50.png</texturebg> - <midtexture colordiffuse="button_focus">colors/white50.png</midtexture> - <visible>!Player.ChannelPreviewActive | VideoPlayer.HasEpg</visible> - </control> - <control type="label"> - <left>260</left> - <top>125</top> - <right>20</right> - <height>25</height> - <label>[COLOR button_focus]$INFO[VideoPlayer.NextStartTime]$INFO[VideoPlayer.NextEndTime, - ,: ][/COLOR]$INFO[VideoPlayer.NextTitle]</label> - <aligny>center</aligny> - <visible>VideoPlayer.HasEpg</visible> - </control> - <control type="grouplist"> - <left>1260</left> - <top>160</top> - <width>600</width> - <height>100</height> - <align>right</align> - <orientation>horizontal</orientation> - <itemgap>10</itemgap> - <visible>!Player.ChannelPreviewActive</visible> - <include content="MediaFlag"> - <param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" /> - </include> - <include content="MediaFlag"> - <param name="texture" value="$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]" /> - </include> - <include content="MediaFlag"> - <param name="texture" value="$INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png]" /> - </include> - <include content="MediaFlag"> - <param name="texture" value="$INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png]" /> - </include> - </control> - </control> - </controls> -</window> diff --git a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml index 0bdb5af660..d8612c4893 100644 --- a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml +++ b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <window type="dialog" id="1109"> <visible>Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)</visible> - <visible>Window.IsActive(seekbar) | [Player.ShowInfo + !System.HasModalDialog + VideoPlayer.Content(LiveTV)] | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrosdguide)</visible> + <visible>Window.IsActive(seekbar) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrosdguide)</visible> <depth>DepthOSD</depth> <include>Animation_TopSlide</include> <zorder>0</zorder> @@ -52,16 +52,33 @@ <align>right</align> <label>$INFO[System.Time]</label> </control> - <control type="label"> - <top>80</top> - <label>$INFO[Player.FinishTime,$LOCALIZE[31080]: ]</label> - <right>22</right> - <shadowcolor>text_shadow</shadowcolor> + <control type="grouplist"> + <right>24</right> + <top>74</top> + <width>800</width> <height>100</height> - <width>500</width> <align>right</align> - <visible>!String.isempty(Player.Duration)</visible> - <visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg</visible> + <itemgap>5</itemgap> + <orientation>horizontal</orientation> + <usecontrolcoords>true</usecontrolcoords> + <control type="label"> + <label>$INFO[Player.FinishTime,$LOCALIZE[31080]: ]</label> + <shadowcolor>text_shadow</shadowcolor> + <height>100</height> + <width>auto</width> + <visible>!String.isempty(Player.Duration)</visible> + <visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg</visible> + </control> + <control type="image"> + <top>2</top> + <left>0</left> + <width>60</width> + <height>40</height> + <fadetime>300</fadetime> + <aspectratio aligny="center" align="right">keep</aspectratio> + <texture>dialogs/volume/mute.png</texture> + <visible>Player.Muted</visible> + </control> </control> </control> </control> diff --git a/addons/skin.estuary/xml/DialogAddonInfo.xml b/addons/skin.estuary/xml/DialogAddonInfo.xml index ffd9261a99..f46f8f4000 100644 --- a/addons/skin.estuary/xml/DialogAddonInfo.xml +++ b/addons/skin.estuary/xml/DialogAddonInfo.xml @@ -243,14 +243,12 @@ <width>470</width> <height>40</height> <label>$INFO[ListItem.AddonSize,[COLOR button_focus]$LOCALIZE[22031]:[/COLOR] ,[CR]]</label> - <textcolor>white</textcolor> <visible>!String.IsEmpty(ListItem.AddonSize)</visible> </control> <control type="label"> <width>470</width> <height>40</height> <label>$INFO[ListItem.AddonOrigin,[COLOR button_focus]$LOCALIZE[31150]:[/COLOR] ]</label> - <textcolor>white</textcolor> <visible>!String.IsEmpty(ListItem.AddonOrigin)</visible> </control> </control> diff --git a/addons/skin.estuary/xml/DialogAddonSettings.xml b/addons/skin.estuary/xml/DialogAddonSettings.xml index 874f9da0bd..9147c8a5f6 100644 --- a/addons/skin.estuary/xml/DialogAddonSettings.xml +++ b/addons/skin.estuary/xml/DialogAddonSettings.xml @@ -7,18 +7,18 @@ <centertop>50%</centertop> <height>800</height> <centerleft>50%</centerleft> - <width>1720</width> + <width>1820</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1720" /> - <param name="DialogBackgroundHeight" value="800" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="20" /> + <param name="width" value="1820" /> + <param name="height" value="800" /> + <param name="header_label" value="" /> + <param name="header_id" value="20" /> </include> <control type="grouplist" id="9"> <description>button area</description> <left>20</left> <top>70</top> - <width>330</width> + <width>400</width> <height>700</height> <itemgap>-25</itemgap> <orientation>vertical</orientation> @@ -34,7 +34,7 @@ <param name="down_posy" value="814" /> </include> <control type="image"> - <left>330</left> + <left>400</left> <top>70</top> <width>1100</width> <height>722</height> @@ -42,7 +42,7 @@ </control> <control type="grouplist" id="2"> <description>control area</description> - <left>350</left> + <left>420</left> <top>90</top> <width>1060</width> <height>680</height> @@ -52,12 +52,12 @@ <onright>9001</onright> </control> <control type="grouplist" id="9001"> - <left>1410</left> - <top>-160</top> + <right>20</right> + <top>70</top> <width>300</width> <height>700</height> - <itemgap>-15</itemgap> - <align>center</align> + <itemgap>dialogbuttons_itemgap</itemgap> + <align>left</align> <orientation>vertical</orientation> <onup>9001</onup> <ondown>9001</ondown> @@ -79,7 +79,8 @@ <control type="button" id="13"> <description>Default Category Button</description> <height>120</height> - <width>320</width> + <width>390</width> + <textoffsetx>20</textoffsetx> <align>center</align> <aligny>center</aligny> <font>font25_title</font> diff --git a/addons/skin.estuary/xml/DialogAudioDSPManager.xml b/addons/skin.estuary/xml/DialogAudioDSPManager.xml index 0eb74f636d..eaeeeaf2c1 100644 --- a/addons/skin.estuary/xml/DialogAudioDSPManager.xml +++ b/addons/skin.estuary/xml/DialogAudioDSPManager.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1780</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1780" /> - <param name="DialogBackgroundHeight" value="700" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[15020]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1780" /> + <param name="height" value="700" /> + <param name="header_label" value="$LOCALIZE[15020]" /> + <param name="header_id" value="2" /> </include> <control type="list" id="9000"> <description>processing mode selection list</description> @@ -72,7 +72,7 @@ <top>90</top> <control type="group"> <left>320</left> - <description>available modes group</description> + <description>available modes</description> <include content="AudioDSPModeList"> <param name="sublabel" value="$LOCALIZE[15050]: $INFO[Container(20).NumItems]" /> <param name="scrollbar_id" value="60" /> @@ -82,7 +82,7 @@ </include> </control> <control type="group"> - <description>active modes group</description> + <description>active modes</description> <left>810</left> <top>0</top> <include content="AudioDSPModeList"> @@ -96,8 +96,9 @@ </control> <control type="grouplist" id="9001"> <left>1300</left> + <width>470</width> <top>105</top> - <itemgap>-20</itemgap> + <itemgap>dialogbuttons_itemgap</itemgap> <onleft>61</onleft> <onright>9000</onright> <control type="radiobutton" id="22"> diff --git a/addons/skin.estuary/xml/DialogButtonMenu.xml b/addons/skin.estuary/xml/DialogButtonMenu.xml index 6728f77c0b..9d29e01a5c 100644 --- a/addons/skin.estuary/xml/DialogButtonMenu.xml +++ b/addons/skin.estuary/xml/DialogButtonMenu.xml @@ -9,10 +9,10 @@ <centertop>50%</centertop> <height>700</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="600" /> - <param name="DialogBackgroundHeight" value="80" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[31072]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="600" /> + <param name="height" value="80" /> + <param name="header_label" value="$LOCALIZE[31072]" /> + <param name="header_id" value="2" /> </include> <control type="panel" id="9000"> <include>ButtonMenuList</include> diff --git a/addons/skin.estuary/xml/DialogConfirm.xml b/addons/skin.estuary/xml/DialogConfirm.xml index c4be80a45c..cff7192ad5 100644 --- a/addons/skin.estuary/xml/DialogConfirm.xml +++ b/addons/skin.estuary/xml/DialogConfirm.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>915</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="915" /> - <param name="DialogBackgroundHeight" value="380" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="915" /> + <param name="height" value="380" /> + <param name="header_label" value="" /> + <param name="header_id" value="1" /> </include> <control type="textbox" id="9"> <left>30</left> diff --git a/addons/skin.estuary/xml/DialogContextMenu.xml b/addons/skin.estuary/xml/DialogContextMenu.xml index a170746c7a..5db627ddec 100644 --- a/addons/skin.estuary/xml/DialogContextMenu.xml +++ b/addons/skin.estuary/xml/DialogContextMenu.xml @@ -22,41 +22,41 @@ <top>-1080</top> <width>5760</width> <height>3240</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="image" id="999"> <description>background image</description> <left>0</left> - <top>10</top> + <top>0</top> <width>450</width> - <height>820</height> + <height>780</height> <texture colordiffuse="dialog_tint">colors/white.png</texture> </control> <control type="grouplist" id="996"> <description>grouplist for context buttons</description> <left>0</left> - <top>30</top> + <top>0</top> <width>450</width> <height max="780">auto</height> <usecontrolcoords>true</usecontrolcoords> </control> <control type="button" id="1000"> <description>button template</description> - <left>2</left> + <left>0</left> <top></top> - <width>446</width> + <width>450</width> <height>65</height> <align>center</align> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> </control> <include content="UpDownArrows"> <param name="container_id" value="996" /> <param name="posx" value="201" /> - <param name="up_posy" value="-30" /> - <param name="down_posy" value="850" /> + <param name="up_posy" value="-40" /> + <param name="down_posy" value="798" /> </include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogFavourites.xml b/addons/skin.estuary/xml/DialogFavourites.xml index b01e2829fd..73b6309421 100644 --- a/addons/skin.estuary/xml/DialogFavourites.xml +++ b/addons/skin.estuary/xml/DialogFavourites.xml @@ -7,12 +7,12 @@ <centertop>50%</centertop> <centerleft>50%</centerleft> <width>1540</width> - <height>838</height> + <height>858</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1540" /> - <param name="DialogBackgroundHeight" value="858" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[1036]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1540" /> + <param name="height" value="858" /> + <param name="header_label" value="$LOCALIZE[1036]" /> + <param name="header_id" value="2" /> </include> <include content="UpDownArrows"> <param name="container_id" value="450" /> @@ -24,7 +24,7 @@ <right>0</right> <top>70</top> <width>12</width> - <height>788</height> + <bottom>0</bottom> <onleft>450</onleft> <onright>450</onright> <orientation>vertical</orientation> @@ -33,7 +33,7 @@ <left>10</left> <top>70</top> <width>1600</width> - <height>788</height> + <bottom>0</bottom> <onleft>60</onleft> <onright>60</onright> <onup>450</onup> @@ -62,9 +62,9 @@ </control> <control type="textbox"> <left>300</left> - <top>200</top> + <top>90</top> <width>900</width> - <height>300</height> + <bottom>0</bottom> <aligny>center</aligny> <align>center</align> <label>$LOCALIZE[31025]</label> diff --git a/addons/skin.estuary/xml/DialogFullScreenInfo.xml b/addons/skin.estuary/xml/DialogFullScreenInfo.xml index c5fee6b896..429e3b07ee 100644 --- a/addons/skin.estuary/xml/DialogFullScreenInfo.xml +++ b/addons/skin.estuary/xml/DialogFullScreenInfo.xml @@ -9,8 +9,8 @@ <top>0</top> <width>100%</width> <bottom>280</bottom> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="group"> diff --git a/addons/skin.estuary/xml/DialogGameControllers.xml b/addons/skin.estuary/xml/DialogGameControllers.xml index 75dc5b924a..18cb7892b9 100644 --- a/addons/skin.estuary/xml/DialogGameControllers.xml +++ b/addons/skin.estuary/xml/DialogGameControllers.xml @@ -6,13 +6,13 @@ <control type="group"> <centertop>50%</centertop> <centerleft>50%</centerleft> - <width>1720</width> + <width>1820</width> <height>690</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1720" /> - <param name="DialogBackgroundHeight" value="690" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[35058]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1820" /> + <param name="height" value="690" /> + <param name="header_label" value="$LOCALIZE[35058]" /> + <param name="header_id" value="2" /> </include> <control type="label"> <description>Controller profiles grouplist heading</description> @@ -24,8 +24,7 @@ <label>$LOCALIZE[35050]</label> <align>center</align> <aligny>center</aligny> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> + <textcolor>button_focus</textcolor> </control> <control type="image"> <left>-5</left> @@ -53,75 +52,80 @@ <aligny>center</aligny> <font>font25_title</font> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> </control> <control type="gamecontroller" id="31"> - <left>390</left> + <left>400</left> <top>210</top> <width>547</width> <height>343</height> </control> - <control type="label"> - <description>Feature list heading</description> + <control type="group"> + <left>1000</left> + <width>410</width> <top>90</top> - <left>995</left> - <width>330</width> - <height>25</height> - <font>font12</font> - <label>$LOCALIZE[35059]</label> - <align>center</align> - <aligny>center</aligny> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="image"> - <left>975</left> - <top>110</top> - <width>370</width> - <height>582</height> - <texture border="40">buttons/dialogbutton-nofo.png</texture> - </control> - <control type="grouplist" id="5"> - <description>Features grouplist</description> - <left>995</left> - <top>130</top> - <width>330</width> - <height>540</height> - <onleft>3</onleft> - <onright>61</onright> - <onup>5</onup> - <ondown>5</ondown> - <pagecontrol>61</pagecontrol> - </control> - <control type="scrollbar" id="61"> - <left>1330</left> - <top>130</top> - <width>12</width> - <height>540</height> - <onleft>5</onleft> - <onright>9001</onright> - <orientation>vertical</orientation> - </control> - <control type="button" id="7"> - <description>Default feature button</description> - <height>60</height> - <width>330</width> - <align>center</align> - <aligny>center</aligny> - <font>font27</font> - <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> - </control> - <control type="label" id="8"> - <description>Feature group title</description> - <width>330</width> - <align>center</align> - <top>0</top> - <height>40</height> - <aligny>center</aligny> - <font>font20_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + <height>602</height> + <control type="label"> + <description>Feature list heading</description> + <left>20</left> + <right>20</right> + <height>25</height> + <font>font12</font> + <label>$LOCALIZE[35059]</label> + <align>center</align> + <aligny>center</aligny> + <textcolor>button_focus</textcolor> + </control> + <control type="image"> + <top>20</top> + <bottom>0</bottom> + <right>0</right> + <texture border="40">buttons/dialogbutton-nofo.png</texture> + </control> + <control type="grouplist" id="5"> + <description>Features grouplist</description> + <left>20</left> + <right>20</right> + <top>40</top> + <bottom>20</bottom> + <onleft>3</onleft> + <onright>61</onright> + <onup>5</onup> + <ondown>5</ondown> + <pagecontrol>61</pagecontrol> + </control> + <control type="scrollbar" id="61"> + <right>0</right> + <top>40</top> + <width>12</width> + <bottom>20</bottom> + <onleft>5</onleft> + <onright>9001</onright> + <orientation>vertical</orientation> + </control> + <control type="button" id="7"> + <description>Default feature button</description> + <height>60</height> + <left>20</left> + <right>20</right> + <align>center</align> + <aligny>center</aligny> + <font>font27</font> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> + <texturenofocus /> + </control> + <control type="label" id="8"> + <description>Feature group title</description> + <left>20</left> + <right>20</right> + <align>center</align> + <top>0</top> + <height>40</height> + <aligny>center</aligny> + <font>font20_title</font> + <textcolor>grey</textcolor> + <shadowcolor>black</shadowcolor> + </control> </control> <control type="image" id="9"> <description>Feature separator image</description> @@ -129,11 +133,12 @@ <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture> </control> <control type="grouplist" id="9001"> - <left>1360</left> + <right>20</right> <top>110</top> <onleft>5</onleft> <onright>3</onright> - <itemgap>-20</itemgap> + <width>350</width> + <itemgap>dialogbuttons_itemgap</itemgap> <include content="DefaultDialogButton"> <param name="width" value="350" /> <param name="id" value="18" /> diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml index ddceb2df9f..2d3a7f7183 100644 --- a/addons/skin.estuary/xml/DialogKeyboard.xml +++ b/addons/skin.estuary/xml/DialogKeyboard.xml @@ -32,7 +32,7 @@ <width>1542</width> <height>100</height> <font>font45</font> - <label>$PARAM[DialogHeaderLabel]</label> + <label>$PARAM[header_label]</label> <align>center</align> <aligny>center</aligny> <shadowcolor>black</shadowcolor> @@ -62,9 +62,8 @@ <font>font37</font> <align>center</align> <aligny>center</aligny> - <textcolor>button_focus</textcolor> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> </control> <control type="group" id="78500"> <centerleft>59%</centerleft> @@ -418,7 +417,7 @@ <onup>160</onup> <ondown>100</ondown> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/letters.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/letters.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/symbols.png</textureradioofffocus> @@ -434,7 +433,7 @@ <onup>161</onup> <ondown>101</ondown> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/capslock.png</textureradioonfocus> <textureradioonnofocus colordiffuse="button_focus">icons/keyboard/capslock.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/capslock.png</textureradioofffocus> @@ -451,7 +450,7 @@ <onup>162</onup> <ondown>102</ondown> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/shift.png</textureradioonfocus> <textureradioonnofocus colordiffuse="button_focus">icons/keyboard/shift.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/shift.png</textureradioofffocus> @@ -466,8 +465,8 @@ <height>120</height> <onup>164</onup> <ondown>104</ondown> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <textureradioonfocus colordiffuse="button_focus">icons/keyboard/spacebar.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/spacebar.png</textureradioonnofocus> <textureradioofffocus colordiffuse="button_focus">icons/keyboard/spacebar.png</textureradioofffocus> @@ -483,7 +482,7 @@ <ondown>107</ondown> <onup>167</onup> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioofffocus> @@ -499,7 +498,7 @@ <ondown>108</ondown> <onup>168</onup> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioofffocus> @@ -515,7 +514,7 @@ <onup>169</onup> <ondown>109</ondown> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/backspace.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/backspace.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/backspace.png</textureradioofffocus> @@ -528,9 +527,9 @@ </control> <control type="grouplist" id="95200"> <bottom>0</bottom> - <height>450</height> + <height>460</height> <centerleft>86%</centerleft> - <itemgap>-10</itemgap> + <itemgap>dialogbuttons_itemgap</itemgap> <onup>95200</onup> <ondown>95200</ondown> <onleft>78500</onleft> @@ -579,9 +578,9 @@ <texture colordiffuse="dialog_tint">colors/white.png</texture> </control> <control type="label"> - <left>30</left> + <textoffsetx>30</textoffsetx> <top>0</top> - <width>480</width> + <width>500</width> <height>50</height> <label>$INFO[ListItem.Label]</label> <font>font12</font> @@ -606,9 +605,9 @@ <include>Animation_FocusTextureFade</include> </control> <control type="label"> - <left>30</left> + <textoffsetx>30</textoffsetx> <top>0</top> - <width>480</width> + <width>500</width> <height>50</height> <label>$INFO[ListItem.Label]</label> <font>font12</font> diff --git a/addons/skin.estuary/xml/DialogMediaSource.xml b/addons/skin.estuary/xml/DialogMediaSource.xml index 99dd8c6534..50ab3fc473 100644 --- a/addons/skin.estuary/xml/DialogMediaSource.xml +++ b/addons/skin.estuary/xml/DialogMediaSource.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1200</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1200" /> - <param name="DialogBackgroundHeight" value="750" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[13406]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1200" /> + <param name="height" value="750" /> + <param name="header_label" value="$LOCALIZE[13406]" /> + <param name="header_id" value="2" /> </include> <control type="label"> <description>path label</description> @@ -24,8 +24,6 @@ <aligny>center</aligny> <font>font12</font> <label>$LOCALIZE[1021]</label> - <textcolor>button_focus</textcolor> - <shadowcolor>black</shadowcolor> </control> <control type="image"> <left>25</left> @@ -38,7 +36,7 @@ <left>45</left> <top>165</top> <width>820</width> - <height>225</height> + <height>245</height> <onup>9001</onup> <onleft>9000</onleft> <onright>60</onright> @@ -77,9 +75,9 @@ </control> <control type="scrollbar" id="60"> <left>870</left> - <top>165</top> + <top>166</top> <width>12</width> - <height>240</height> + <height>243</height> <onleft>10</onleft> <onright>9000</onright> <orientation>vertical</orientation> @@ -91,7 +89,7 @@ <onleft>10</onleft> <onright>10</onright> <ondown>12</ondown> - <itemgap>7</itemgap> + <itemgap>-7</itemgap> <include content="DefaultDialogButton"> <param name="id" value="11" /> <param name="label" value="$LOCALIZE[1024]" /> @@ -115,8 +113,6 @@ <aligny>center</aligny> <font>font12</font> <label>$LOCALIZE[1022]</label> - <textcolor>button_focus</textcolor> - <shadowcolor>black</shadowcolor> </control> <control type="edit" id="12"> <description>Name Button</description> @@ -132,7 +128,8 @@ </control> <control type="grouplist" id="9001"> <left>0</left> - <top>600</top> + <bottom>40</bottom> + <height>100</height> <width>1200</width> <align>center</align> <orientation>horizontal</orientation> diff --git a/addons/skin.estuary/xml/DialogNotification.xml b/addons/skin.estuary/xml/DialogNotification.xml index 280ffc852f..fb0211dd1a 100644 --- a/addons/skin.estuary/xml/DialogNotification.xml +++ b/addons/skin.estuary/xml/DialogNotification.xml @@ -45,8 +45,6 @@ <height>60</height> <font>font27_narrow</font> <aligny>center</aligny> - <scrollout>false</scrollout> - <pauseatend>2000</pauseatend> </control> </control> </controls> diff --git a/addons/skin.estuary/xml/DialogNumeric.xml b/addons/skin.estuary/xml/DialogNumeric.xml index b9416349f8..6ccffa7360 100644 --- a/addons/skin.estuary/xml/DialogNumeric.xml +++ b/addons/skin.estuary/xml/DialogNumeric.xml @@ -10,10 +10,10 @@ <centerleft>50%</centerleft> <width>545</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="545" /> - <param name="DialogBackgroundHeight" value="660" /> - <param name="DialogHeaderLabel" value="Numeric pad" /> - <param name="DialogHeaderId" value="" /> + <param name="width" value="545" /> + <param name="height" value="660" /> + <param name="header_label" value="$LOCALIZE[31161]" /> + <param name="header_id" value="" /> </include> <control type="image"> <left>44</left> @@ -170,7 +170,7 @@ <width>125</width> <height>125</height> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/arrowleft.png</textureradioofffocus> @@ -193,7 +193,7 @@ <width>125</width> <height>125</height> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textureradioonfocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioonfocus> <textureradioonnofocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioonnofocus> <textureradioofffocus colordiffuse="FFFFFFFF">icons/keyboard/arrowright.png</textureradioofffocus> diff --git a/addons/skin.estuary/xml/DialogPVRChannelManager.xml b/addons/skin.estuary/xml/DialogPVRChannelManager.xml index 1cb9293b0f..c0aa0ff456 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelManager.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1720</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1720" /> - <param name="DialogBackgroundHeight" value="830" /> - <param name="DialogHeaderLabel" value="$VAR[PVRChannelMgrHeader]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1720" /> + <param name="height" value="830" /> + <param name="header_label" value="$VAR[PVRChannelMgrHeader]" /> + <param name="header_id" value="2" /> </include> <control type="group"> <left>10</left> @@ -236,7 +236,7 @@ <top>90</top> <onleft>9002</onleft> <onright>20</onright> - <itemgap>-20</itemgap> + <itemgap>dialogbuttons_itemgap</itemgap> <include content="DefaultDialogButton"> <param name="width" value="350" /> <param name="id" value="4" /> @@ -262,7 +262,7 @@ <textcolor>grey</textcolor> <align>right</align> <aligny>center</aligny> - <label>[COLOR=button_focus]$INFO[Container(20).NumItems][/COLOR] $LOCALIZE[19019] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR]</label> + <label>[COLOR=button_focus]$INFO[Container(20).NumItems][/COLOR] $LOCALIZE[19019] - [COLOR=button_focus]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR]</label> <wrapmultiline>true</wrapmultiline> </control> </control> diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml index 0ecefa5c5b..ee338ad485 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml @@ -78,7 +78,7 @@ <control type="label"> <left>12</left> <height>90</height> - <width>70</width> + <width>75</width> <align>center</align> <aligny>center</aligny> <font>font32_title</font> @@ -131,12 +131,12 @@ <font>font12</font> <label>$INFO[ListItem.Title]</label> <shadowcolor>text_shadow</shadowcolor> - <textcolor>button_focus</textcolor> + <textcolor>grey</textcolor> </control> <control type="label"> <left>12</left> <height>90</height> - <width>70</width> + <width>75</width> <align>center</align> <aligny>center</aligny> <font>font32_title</font> @@ -151,7 +151,7 @@ <width>12</width> <height>100%</height> <onleft>11</onleft> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <onright>NextChannelGroup</onright> <ondown>61</ondown> <onup>61</onup> diff --git a/addons/skin.estuary/xml/DialogPVRGroupManager.xml b/addons/skin.estuary/xml/DialogPVRGroupManager.xml index 2f02363076..53ae5a1429 100644 --- a/addons/skin.estuary/xml/DialogPVRGroupManager.xml +++ b/addons/skin.estuary/xml/DialogPVRGroupManager.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1720</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1720" /> - <param name="DialogBackgroundHeight" value="880" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[19143]" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="1720" /> + <param name="height" value="880" /> + <param name="header_label" value="$LOCALIZE[19143]" /> + <param name="header_id" value="1" /> </include> <control type="grouplist" id="9000"> <left>0</left> diff --git a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml index c023c2ec5d..68cfb2bdae 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml @@ -103,7 +103,7 @@ <width>12</width> <height>100%</height> <onleft>11</onleft> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <onright>NextChannelGroup</onright> <ondown>61</ondown> <onup>61</onup> diff --git a/addons/skin.estuary/xml/DialogPVRGuideSearch.xml b/addons/skin.estuary/xml/DialogPVRGuideSearch.xml index f6e006d9fe..b41af78361 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideSearch.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideSearch.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1780</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1780" /> - <param name="DialogBackgroundHeight" value="820" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[19142]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1780" /> + <param name="height" value="820" /> + <param name="header_label" value="$LOCALIZE[19142]" /> + <param name="header_id" value="2" /> </include> <control type="edit" id="9"> <left>10</left> diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml index b26280c4ba..147cbc84c7 100644 --- a/addons/skin.estuary/xml/DialogPVRInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRInfo.xml @@ -23,19 +23,7 @@ <width>461</width> <height>461</height> <aspectratio>keep</aspectratio> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <include>OpenClose_Left</include> - <left>114</left> - <top>236</top> - <width>461</width> - <height>461</height> - <aspectratio>keep</aspectratio> - <texture border="20" fallback="DefaultTVShows.png">$INFO[ListItem.Icon]</texture> - <bordersize>20</bordersize> + <texture fallback="DefaultTVShows.png">$INFO[ListItem.Icon]</texture> </control> <control type="group"> <top>230</top> diff --git a/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml b/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml index 70fac45f96..ad26ae49c5 100644 --- a/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml @@ -9,10 +9,10 @@ <centertop>50%</centertop> <height>920</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1300" /> - <param name="DialogBackgroundHeight" value="920" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1300" /> + <param name="height" value="920" /> + <param name="header_label" value="" /> + <param name="header_id" value="2" /> </include> <control type="group"> <description>Normal song info group</description> diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index d1b4bef3af..f134404896 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <visible>[[Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Window.IsActive(fullscreeninfo) | Window.IsActive(videoosd) | Window.IsActive(playerprocessinfo)] + Window.IsActive(fullscreenvideo)] | Window.IsActive(visualisation) | !IsEmpty(Player.SeekNumeric)</visible> - <visible>![Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)]</visible> + <visible>[[Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(fullscreeninfo) | Window.IsActive(videoosd) | Window.IsActive(playerprocessinfo)] + Window.IsActive(fullscreenvideo)] | Window.IsActive(visualisation) | !IsEmpty(Player.SeekNumeric)</visible> + <visible>!Window.IsActive(sliderdialog)</visible> <include>Animation_BottomSlide</include> <depth>DepthOSD</depth> <zorder>0</zorder> @@ -71,6 +71,8 @@ <label>$VAR[SeekTimeLabelVar]</label> <font>font45</font> <shadowcolor>black</shadowcolor> + <visible>!Player.ChannelPreviewActive</visible> + <animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation> </control> <control type="label" id="40000"> <centerleft>50%</centerleft> @@ -108,6 +110,94 @@ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar> <textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib> <textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus> + <visible>!VideoPlayer.Content(livetv)</visible> + </control> + </control> + <control type="group"> + <visible>Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) + !Window.IsActive(fullscreeninfo)</visible> + <animation effect="fade" time="400">VisibleChange</animation> + <bottom>0</bottom> + <height>380</height> + <control type="image"> + <left>0</left> + <width>100%</width> + <height>240</height> + <texture>dialogs/dialog-bg-nobo.png</texture> + </control> + <control type="image"> + <left>30</left> + <top>20</top> + <width>200</width> + <height>200</height> + <aspectratio aligny="center">keep</aspectratio> + <texture>$INFO[Player.Art(thumb)]</texture> + </control> + <control type="label"> + <left>20</left> + <width>220</width> + <top>-80</top> + <height>25</height> + <label>$INFO[VideoPlayer.ChannelNumberLabel]</label> + <shadowcolor>black</shadowcolor> + <align>center</align> + <font>WeatherTemp</font> + <aligny>center</aligny> + </control> + <control type="label"> + <right>20</right> + <width>800</width> + <top>190</top> + <height>25</height> + <label>$INFO[VideoPlayer.NextTitle,[COLOR grey]$LOCALIZE[19031]: [/COLOR], - ][COLOR button_focus]$INFO[VideoPlayer.NextStartTime]$INFO[VideoPlayer.NextEndTime: ][/COLOR]</label> + <align>right</align> + <aligny>center</aligny> + <visible>VideoPlayer.HasEpg</visible> + </control> + <control type="label"> + <left>260</left> + <right>50</right> + <top>20</top> + <height>25</height> + <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.EpisodeName, (,)]</label> + <align>left</align> + <font>font36_title</font> + <aligny>center</aligny> + </control> + <control type="textbox"> + <left>260</left> + <top>55</top> + <right>50</right> + <height>120</height> + <label fallback="416">$INFO[VideoPlayer.Plot]</label> + <align>justify</align> + <autoscroll delay="5000" repeat="7500" time="5000"></autoscroll> + </control> + <control type="grouplist"> + <left>260</left> + <top>175</top> + <width>600</width> + <height>100</height> + <align>left</align> + <orientation>horizontal</orientation> + <itemgap>10</itemgap> + <visible>!Player.ChannelPreviewActive</visible> + <animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation> + <include content="MediaFlag"> + <param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" /> + <param name="visible" value="!String.IsEmpty(VideoPlayer.AudioChannels)" /> + </include> + <include content="MediaFlag"> + <param name="texture" value="$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]" /> + <param name="visible" value="!String.IsEmpty(VideoPlayer.AudioCodec)" /> + </include> + <include content="MediaFlag"> + <param name="texture" value="$INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png]" /> + <param name="visible" value="!String.IsEmpty(VideoPlayer.VideoAspect)" /> + </include> + <include content="MediaFlag"> + <param name="texture" value="$INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png]" /> + <param name="visible" value="!String.IsEmpty(VideoPlayer.VideoCodec)" /> + </include> </control> </control> </controls> diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml index ff5a09bb78..326f4f74b2 100644 --- a/addons/skin.estuary/xml/DialogSelect.xml +++ b/addons/skin.estuary/xml/DialogSelect.xml @@ -10,10 +10,10 @@ <height>742</height> <width>1220</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1220" /> - <param name="DialogBackgroundHeight" value="742" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="1220" /> + <param name="height" value="742" /> + <param name="header_label" value="" /> + <param name="header_id" value="1" /> </include> <control type="image"> <left>0</left> @@ -140,7 +140,7 @@ <left>920</left> <top>80</top> <onleft>61</onleft> - <itemgap>-20</itemgap> + <itemgap>dialogbuttons_itemgap</itemgap> <onright>3</onright> <include content="DefaultDialogButton"> <param name="id" value="5" /> diff --git a/addons/skin.estuary/xml/DialogSettings.xml b/addons/skin.estuary/xml/DialogSettings.xml index c035adc3f8..5aa2972e18 100644 --- a/addons/skin.estuary/xml/DialogSettings.xml +++ b/addons/skin.estuary/xml/DialogSettings.xml @@ -11,10 +11,10 @@ <visible>!Window.IsVisible(sliderdialog)</visible> <visible>![Window.IsActive(osdaudiodspsettings) + Window.Is(osdaudiosettings)]</visible> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1520" /> - <param name="DialogBackgroundHeight" value="870" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1520" /> + <param name="height" value="870" /> + <param name="header_label" value="" /> + <param name="header_id" value="2" /> </include> <control type="image"> <left>10</left> diff --git a/addons/skin.estuary/xml/DialogSubtitles.xml b/addons/skin.estuary/xml/DialogSubtitles.xml index a329f38f3e..ba9a12e458 100644 --- a/addons/skin.estuary/xml/DialogSubtitles.xml +++ b/addons/skin.estuary/xml/DialogSubtitles.xml @@ -9,10 +9,10 @@ <width>1720</width> <control type="group" id="250"> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1720" /> - <param name="DialogBackgroundHeight" value="750" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[24012]" /> - <param name="DialogHeaderId" value="100" /> + <param name="width" value="1720" /> + <param name="height" value="750" /> + <param name="header_label" value="$LOCALIZE[24012]" /> + <param name="header_id" value="100" /> </include> <control type="group"> <left>1320</left> diff --git a/addons/skin.estuary/xml/DialogTextViewer.xml b/addons/skin.estuary/xml/DialogTextViewer.xml index 20aa38e10f..c16f959ff2 100644 --- a/addons/skin.estuary/xml/DialogTextViewer.xml +++ b/addons/skin.estuary/xml/DialogTextViewer.xml @@ -8,10 +8,10 @@ <centertop>50%</centertop> <height>770</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="84%" /> - <param name="DialogBackgroundHeight" value="770" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[13406]" /> - <param name="DialogHeaderId" value="1" /> + <param name="width" value="84%" /> + <param name="height" value="770" /> + <param name="header_label" value="$LOCALIZE[13406]" /> + <param name="header_id" value="1" /> </include> <control type="textbox" id="5"> <left>1%</left> diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml index bcf2852e8f..467df2b99c 100644 --- a/addons/skin.estuary/xml/DialogVideoInfo.xml +++ b/addons/skin.estuary/xml/DialogVideoInfo.xml @@ -417,7 +417,7 @@ <param name="icon" value="" /> </include> <label>$LOCALIZE[31033]</label> - <onleft>440</onleft> + <onleft>441</onleft> <onright>101</onright> <onup>140</onup> <enable>String.IsEmpty(Container.PluginName)</enable> diff --git a/addons/skin.estuary/xml/DialogVolumeBar.xml b/addons/skin.estuary/xml/DialogVolumeBar.xml index 077377e1b8..749ee3d340 100644 --- a/addons/skin.estuary/xml/DialogVolumeBar.xml +++ b/addons/skin.estuary/xml/DialogVolumeBar.xml @@ -2,18 +2,19 @@ <window> <zorder>4</zorder> <controls> - <control type="progress" id="20"> - <include>HiddenObject</include> - <info>Player.Volume</info> - </control> <control type="group"> <visible>!Window.IsActive(startup)</visible> <centerleft>50%</centerleft> <width>112</width> <top>0</top> + <animation effect="fade" start="100" end="0" time="200" delay="1000" condition="Player.Muted">Conditional</animation> <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" id="1"> + <control type="progress" id="29999"> + <include>HiddenObject</include> + <info>Player.Volume</info> + </control> + <control type="image"> <left>12</left> <top>5</top> <width>88</width> @@ -34,7 +35,7 @@ <top>-11</top> <width>120</width> <height>120</height> - <texture>$INFO[Control.GetLabel(20),dialogs/volume/progress/p,.png]</texture> + <texture>$INFO[Control.GetLabel(29999),dialogs/volume/progress/p,.png]</texture> <animation effect="fade" start="100" end="0" delay="300" time="500" tween="sine" condition="Player.Muted">Conditional</animation> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml index a686904b6b..ee2a127f12 100644 --- a/addons/skin.estuary/xml/EventLog.xml +++ b/addons/skin.estuary/xml/EventLog.xml @@ -12,9 +12,9 @@ <include>OpenClose_Right</include> <control type="fixedlist" id="50"> <left>490</left> - <top>0</top> + <top>list_y_offset</top> <right>0</right> - <height>100%</height> + <bottom>list_y_offset</bottom> <onleft>9000</onleft> <onright>60</onright> <onup>50</onup> @@ -25,97 +25,87 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="141" width="eventloglist_width"> - <control type="group"> - <width>eventloglist_width</width> - <control type="image"> - <left>10</left> - <top>10</top> - <width>120</width> - <height>120</height> - <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> - <aspectratio>scale</aspectratio> - <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> - <bordersize>4</bordersize> - </control> - <control type="label"> - <left>160</left> - <right>400</right> - <top>10</top> - <height>35</height> - <aligny>center</aligny> - <font>font37</font> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="textbox"> - <left>160</left> - <top>45</top> - <right>20</right> - <height>60</height> - <textcolor>white</textcolor> - <aligny>top</aligny> - <label>[I]$INFO[ListItem.Property(Event.Description)][/I]</label> - </control> - <control type="label"> - <left>0</left> - <right>30</right> - <top>10</top> - <height>35</height> - <textcolor>white</textcolor> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - </control> + <control type="image"> + <left>10</left> + <top>10</top> + <width>120</width> + <height>120</height> + <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> + <aspectratio>scale</aspectratio> + <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> + <bordersize>4</bordersize> + </control> + <control type="label"> + <left>160</left> + <right>400</right> + <top>10</top> + <height>35</height> + <aligny>center</aligny> + <font>font37</font> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="textbox"> + <left>160</left> + <top>45</top> + <right>20</right> + <height>60</height> + <aligny>top</aligny> + <label>[COLOR grey]$INFO[ListItem.Property(Event.Description)][/COLOR]</label> + </control> + <control type="label"> + <left>0</left> + <right>30</right> + <top>10</top> + <height>35</height> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> </control> </itemlayout> <focusedlayout height="141" width="eventloglist_width"> - <control type="group"> - <width>eventloglist_width</width> - <control type="image"> - <left>0</left> - <top>0</top> - <width>eventloglist_width</width> - <height>141</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus(50)</visible> - </control> - <control type="image"> - <left>10</left> - <top>10</top> - <width>120</width> - <height>120</height> - <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> - <aspectratio>scale</aspectratio> - <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> - <bordersize>4</bordersize> - </control> - <control type="label"> - <left>160</left> - <right>400</right> - <top>10</top> - <height>35</height> - <aligny>center</aligny> - <font>font37</font> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="textbox"> - <left>160</left> - <top>45</top> - <right>20</right> - <height>60</height> - <textcolor>white</textcolor> - <aligny>top</aligny> - <label>[I]$INFO[ListItem.Property(Event.Description)][/I]</label> - </control> - <control type="label"> - <left>0</left> - <right>30</right> - <top>10</top> - <height>35</height> - <textcolor>white</textcolor> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - </control> + <control type="image"> + <left>0</left> + <top>0</top> + <right>0</right> + <height>141</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus(50)</visible> + </control> + <control type="image"> + <left>10</left> + <top>10</top> + <width>120</width> + <height>120</height> + <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> + <aspectratio>scale</aspectratio> + <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> + <bordersize>4</bordersize> + </control> + <control type="label"> + <left>160</left> + <right>400</right> + <top>10</top> + <height>35</height> + <aligny>center</aligny> + <font>font37</font> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="textbox"> + <left>160</left> + <top>45</top> + <right>20</right> + <height>60</height> + <aligny>top</aligny> + <label>[COLOR grey]$INFO[ListItem.Property(Event.Description)][/COLOR]</label> + </control> + <control type="label"> + <left>0</left> + <right>30</right> + <top>10</top> + <height>35</height> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> </control> </focusedlayout> </control> @@ -136,12 +126,13 @@ <onleft>50</onleft> <onright>50</onright> <usecontrolcoords>true</usecontrolcoords> + <width>487</width> <control type="togglebutton" id="4"> <width>487</width> <height>110</height> <aligny>top</aligny> <textoffsetx>40</textoffsetx> - <texturenofocus></texturenofocus> + <texturenofocus /> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <alttexturenofocus></alttexturenofocus> <alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus> @@ -159,11 +150,10 @@ <width>487</width> <height>110</height> <aligny>top</aligny> - <texturenofocus></texturenofocus> + <texturenofocus /> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <textoffsetx>40</textoffsetx> <textoffsety>35</textoffsety> - <textwidth>300</textwidth> </control> <include content="PlaylistWindowButton"> <param name="control_id" value="20" /> diff --git a/addons/skin.estuary/xml/FileBrowser.xml b/addons/skin.estuary/xml/FileBrowser.xml index 91cf41f9fc..0d378b111b 100644 --- a/addons/skin.estuary/xml/FileBrowser.xml +++ b/addons/skin.estuary/xml/FileBrowser.xml @@ -7,19 +7,19 @@ <centerleft>50%</centerleft> <centertop>50%</centertop> <width>1300</width> - <height>880</height> + <height>850</height> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1300" /> - <param name="DialogBackgroundHeight" value="850" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="411" /> + <param name="width" value="1300" /> + <param name="height" value="850" /> + <param name="header_label" value="" /> + <param name="header_id" value="411" /> </include> <control type="grouplist" id="9000"> <left>990</left> <top>85</top> <width>400</width> <height>400</height> - <itemgap>-15</itemgap> + <itemgap>dialogbuttons_itemgap</itemgap> <orientation>vertical</orientation> <onleft>450</onleft> <onright>450</onright> @@ -189,27 +189,24 @@ <control type="label" id="412"> <description>Path label</description> <left>25</left> - <top>810</top> + <bottom>10</bottom> <width>595</width> <height>30</height> <haspath>true</haspath> <font>font12</font> - <aligny>center</aligny> - <textcolor>button_focus</textcolor> - <shadowcolor>black</shadowcolor> + <aligny>bottom</aligny> + <textcolor>grey</textcolor> </control> <control type="label"> <left>0</left> - <top>810</top> + <bottom>10</bottom> <width>1270</width> <height>30</height> <align>right</align> - <aligny>center</aligny> + <aligny>bottom</aligny> <textcolor>grey</textcolor> <font>font12</font> <label>$VAR[FileBrowserSelectLabel]</label> - <wrapmultiline>true</wrapmultiline> - <visible>!Control.IsVisible(451)</visible> </control> </control> <include content="UpDownArrows"> diff --git a/addons/skin.estuary/xml/FileManager.xml b/addons/skin.estuary/xml/FileManager.xml index 181a70e73c..f9bfc54cc9 100644 --- a/addons/skin.estuary/xml/FileManager.xml +++ b/addons/skin.estuary/xml/FileManager.xml @@ -36,7 +36,7 @@ <onright>20</onright> <orientation>vertical</orientation> <animation effect="zoom" end="50,100" time="300" tween="sine" center="0,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> </control> </control> <control type="group"> @@ -66,7 +66,7 @@ <onleft>21</onleft> <onright>21</onright> <animation effect="zoom" end="50,100" time="300" tween="sine" center="812,0" easing="inout" condition="!Control.HasFocus(61)">conditional</animation> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <orientation>vertical</orientation> </control> </control> diff --git a/addons/skin.estuary/xml/Font.xml b/addons/skin.estuary/xml/Font.xml index 594e17a399..4b18591ba6 100644 --- a/addons/skin.estuary/xml/Font.xml +++ b/addons/skin.estuary/xml/Font.xml @@ -5,7 +5,7 @@ <font> <name>font10</name> <filename>NotoSans-Regular.ttf</filename> - <size>24</size> + <size>23</size> <style>lighten</style> </font> <font> @@ -27,6 +27,13 @@ <style>lighten</style> </font> <font> + <name>font25_narrow</name> + <filename>NotoSans-Regular.ttf</filename> + <size>25</size> + <style>lighten</style> + <linespacing>0.8</linespacing> + </font> + <font> <name>font27</name> <filename>NotoSans-Regular.ttf</filename> <size>27</size> @@ -110,6 +117,7 @@ </font> <font> <name>WeatherTemp</name> + <aspect>0.85</aspect> <filename>NotoSans-Bold.ttf</filename> <size>120</size> </font> @@ -142,6 +150,12 @@ <size>30</size> </font> <font> + <name>font25_narrow</name> + <filename>arial.ttf</filename> + <size>25</size> + <linespacing>0.8</linespacing> + </font> + <font> <name>font27</name> <filename>arial.ttf</filename> <size>27</size> diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml index 611a91bfae..30757bcfb4 100644 --- a/addons/skin.estuary/xml/Home.xml +++ b/addons/skin.estuary/xml/Home.xml @@ -37,6 +37,7 @@ <control type="group"> <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation> <control type="group" id="2000"> + <left>462</left> <animation type="Conditional" condition="Control.IsVisible(20000)" reversible="false"> <effect type="slide" end="0,20" time="60" tween="sine" /> <effect type="slide" end="0,-20" time="180" tween="sine" delay="80" /> @@ -45,8 +46,6 @@ <effect type="slide" end="0,-20" time="60" tween="sine" /> <effect type="slide" end="0,20" time="180" tween="sine" delay="80" /> </animation> - <top>0</top> - <left>20</left> <include>OpenClose_Right</include> <control type="group" id="5000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),movies)</visible> @@ -62,25 +61,25 @@ <param name="list_id" value="5900"/> <param name="visible" value="Library.HasContent(movies)"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="special://skin/playlists/inprogress_movies.xsp"/> <param name="widget_header" value="$LOCALIZE[31010]"/> <param name="widget_target" value="videos"/> <param name="list_id" value="5100"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="special://skin/playlists/recent_unwatched_movies.xsp"/> <param name="widget_header" value="$LOCALIZE[20386]"/> <param name="widget_target" value="videos"/> <param name="list_id" value="5200"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="special://skin/playlists/unwatched_movies.xsp"/> <param name="widget_header" value="$LOCALIZE[31007]"/> <param name="widget_target" value="videos"/> <param name="list_id" value="5300"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="special://skin/playlists/random_movies.xsp"/> <param name="widget_header" value="$LOCALIZE[31006]"/> <param name="widget_target" value="videos"/> @@ -92,15 +91,13 @@ <param name="widget_target" value="videos"/> <param name="list_id" value="5500"/> <param name="icon" value="$VAR[WidgetGenreIconVar]"/> - <param name="icon_height" value="90"/> + <param name="icon_height" value="70"/> <param name="visible" value="Library.HasContent(movies)"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="videodb://movies/sets/"/> <param name="widget_header" value="$LOCALIZE[31075]"/> <param name="widget_target" value="videos"/> - <param name="right_icon" value="" /> - <param name="fallback_image" value="DefaultSets.png" /> <param name="sortby" value="random"/> <param name="list_id" value="5600"/> </include> @@ -129,35 +126,24 @@ <param name="list_id" value="6900"/> <param name="visible" value="Library.HasContent(tvshows)"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="videodb://inprogresstvshows"/> <param name="sortby" value="lastplayed"/> <param name="sortorder" value="descending"/> <param name="widget_header" value="$LOCALIZE[626]"/> <param name="widget_target" value="videos"/> - <param name="left_icon" value="lists/played-total.png" /> - <param name="right_icon" value="lists/rating.png" /> - <param name="first_label" value="$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]" /> - <param name="second_label" value="$INFO[ListItem.Rating]" /> - <param name="fallback_image" value="DefaultTVShows.png" /> <param name="list_id" value="6100"/> </include> <include content="WidgetListEpisodes"> <param name="content_path" value="special://skin/playlists/recent_unwatched_episodes.xsp"/> <param name="widget_header" value="$LOCALIZE[20387]"/> <param name="widget_target" value="videos"/> - <param name="second_label" value="[B]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode][/B] $INFO[ListItem.Title]" /> <param name="list_id" value="6200"/> </include> - <include content="WidgetListMovies"> + <include content="WidgetListPoster"> <param name="content_path" value="special://skin/playlists/unwatched_tvshows.xsp"/> <param name="widget_header" value="$LOCALIZE[31122]"/> <param name="widget_target" value="videos"/> - <param name="left_icon" value="lists/totaltv.png" /> - <param name="right_icon" value="lists/rating.png" /> - <param name="first_label" value="$INFO[ListItem.Property(TotalEpisodes)]" /> - <param name="second_label" value="$INFO[ListItem.Rating]" /> - <param name="fallback_image" value="DefaultTVShows.png" /> <param name="list_id" value="6300"/> </include> <include content="WidgetListCategories"> @@ -166,7 +152,7 @@ <param name="widget_target" value="videos"/> <param name="list_id" value="6400"/> <param name="icon" value="$VAR[WidgetGenreIconVar]"/> - <param name="icon_height" value="90"/> + <param name="icon_height" value="70"/> <param name="visible" value="Library.HasContent(tvshows)"/> </include> <include content="WidgetListCategories"> @@ -175,19 +161,19 @@ <param name="widget_target" value="videos"/> <param name="list_id" value="6500"/> <param name="icon" value="$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]"/> - <param name="icon_height" value="90"/> + <param name="icon_height" value="70"/> <param name="visible" value="Library.HasContent(tvshows)"/> </include> - <include content="ImageWidget"> - <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> - <param name="text_label" value="$LOCALIZE[31104]" /> - <param name="button_label" value="$LOCALIZE[31110]" /> - <param name="button_onclick" value="ActivateWindow(videos,files,return)"/> - <param name="button_id" value="6400"/> - <param name="visible" value="!Library.HasContent(tvshows)"/> - <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVShowButton)"/> - </include> </control> + <include content="ImageWidget"> + <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> + <param name="text_label" value="$LOCALIZE[31104]" /> + <param name="button_label" value="$LOCALIZE[31110]" /> + <param name="button_onclick" value="ActivateWindow(videos,files,return)"/> + <param name="button_id" value="6400"/> + <param name="visible" value="!Library.HasContent(tvshows)"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVShowButton)"/> + </include> </control> <control type="group" id="7000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),music)</visible> @@ -209,7 +195,6 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7100"/> <param name="fallback_icon" value="DefaultMusicAlbums.png"/> - <param name="main_label" value="$INFO[ListItem.Year,[B],[/B] - ]$INFO[ListItem.Artist]"/> </include> <include content="WidgetListSquare"> <param name="content_path" value="musicdb://recentlyaddedalbums/"/> @@ -217,7 +202,6 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7200"/> <param name="fallback_icon" value="DefaultMusicAlbums.png"/> - <param name="main_label" value="$INFO[ListItem.Year,[B],[/B] - ]$INFO[ListItem.Artist]"/> </include> <include content="WidgetListSquare"> <param name="content_path" value="special://skin/playlists/random_albums.xsp"/> @@ -225,7 +209,6 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7300"/> <param name="fallback_icon" value="DefaultMusicAlbums.png"/> - <param name="main_label" value="$INFO[ListItem.Year,[B],[/B] - ]$INFO[ListItem.Artist]"/> </include> <include content="WidgetListSquare"> <param name="content_path" value="special://skin/playlists/random_artists.xsp"/> @@ -233,9 +216,6 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7400"/> <param name="fallback_icon" value="DefaultMusicArtists.png"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> </include> <include content="WidgetListSquare"> <param name="content_path" value="special://skin/playlists/unplayed_albums.xsp"/> @@ -243,7 +223,6 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7500"/> <param name="fallback_icon" value="DefaultMusicAlbums.png"/> - <param name="main_label" value="$INFO[ListItem.Year,[B],[/B] - ]$INFO[ListItem.Artist]"/> </include> <include content="WidgetListSquare"> <param name="content_path" value="special://skin/playlists/mostplayed_albums.xsp"/> @@ -251,20 +230,19 @@ <param name="widget_target" value="music"/> <param name="list_id" value="7600"/> <param name="fallback_icon" value="DefaultMusicAlbums.png"/> - <param name="main_label" value="$INFO[ListItem.Year,[B],[/B] - ]$INFO[ListItem.Artist]"/> <param name="sortby" value="playcount"/> <param name="sortorder" value="descending"/> </include> - <include content="ImageWidget"> - <param name="image_path" value="special://skin/extras/home-images/music.jpg"/> - <param name="text_label" value="$LOCALIZE[31104]" /> - <param name="button_label" value="$LOCALIZE[31110]" /> - <param name="button_onclick" value="ActivateWindow(music,files)"/> - <param name="button_id" value="7600"/> - <param name="visible" value="!Library.HasContent(music)"/> - <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicButton)"/> - </include> </control> + <include content="ImageWidget"> + <param name="image_path" value="special://skin/extras/home-images/music.jpg"/> + <param name="text_label" value="$LOCALIZE[31104]" /> + <param name="button_label" value="$LOCALIZE[31110]" /> + <param name="button_onclick" value="ActivateWindow(music,files)"/> + <param name="button_id" value="7600"/> + <param name="visible" value="!Library.HasContent(music)"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicButton)"/> + </include> </control> <control type="group" id="8000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),addons)</visible> @@ -288,9 +266,6 @@ <param name="sortorder" value="descending"/> <param name="list_id" value="8100"/> <param name="fallback_icon" value="DefaultAddon.png"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> </include> <include content="WidgetListSquare"> <param name="content_path" value="addons://sources/audio/"/> @@ -300,9 +275,6 @@ <param name="sortorder" value="descending"/> <param name="list_id" value="8200"/> <param name="fallback_icon" value="DefaultAddon.png"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> </include> <include content="WidgetListSquare"> <param name="content_path" value="addons://sources/executable/"/> @@ -312,9 +284,6 @@ <param name="sortorder" value="descending"/> <param name="list_id" value="8300"/> <param name="fallback_icon" value="DefaultAddon.png"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> </include> <include content="WidgetListSquare" condition="System.Platform.Android"> <param name="content_path" value="androidapp://sources/apps/"/> @@ -324,9 +293,6 @@ <param name="sortorder" value="descending"/> <param name="list_id" value="8400"/> <param name="fallback_icon" value="DefaultAddon.png"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> </include> <include content="WidgetListSquare"> <param name="content_path" value="addons://sources/image/"/> @@ -335,20 +301,17 @@ <param name="sortby" value="lastused"/> <param name="sortorder" value="descending"/> <param name="list_id" value="8500"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> - </include> - <include content="ImageWidget"> - <param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/> - <param name="text_label" value="$LOCALIZE[31119]" /> - <param name="button_label" value="$LOCALIZE[31118]" /> - <param name="button_onclick" value="ActivateWindow(addonbrowser)"/> - <param name="button_id" value="8600"/> - <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> </control> + <include content="ImageWidget"> + <param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/> + <param name="text_label" value="$LOCALIZE[31119]" /> + <param name="button_label" value="$LOCALIZE[31118]" /> + <param name="button_onclick" value="ActivateWindow(addonbrowser)"/> + <param name="button_id" value="8600"/> + <param name="visible" value="!Integer.IsGreater(Container(8001).NumItems,0)"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/> + </include> </control> <control type="group" id="11000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),video)</visible> @@ -376,16 +339,16 @@ <param name="list_id" value="11200"/> <param name="icon" value="DefaultPlaylist.png"/> </include> - <include content="ImageWidget"> - <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> - <param name="text_label" value="$LOCALIZE[31105]" /> - <param name="button_label" value="$LOCALIZE[31110]" /> - <param name="button_onclick" value="ActivateWindow(videos,root)"/> - <param name="button_id" value="11300"/> - <param name="visible" value="!Control.IsVisible(11100) + !Control.IsVisible(11200) + !Control.IsVisible(11900)"/> - <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/> - </include> </control> + <include content="ImageWidget"> + <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> + <param name="text_label" value="$LOCALIZE[31105]" /> + <param name="button_label" value="$LOCALIZE[31110]" /> + <param name="button_onclick" value="ActivateWindow(videos,root)"/> + <param name="button_id" value="11300"/> + <param name="visible" value="!Integer.IsGreater(Container(11001).NumItems,0)"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/> + </include> </control> <control type="group" id="12000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),livetv)</visible> @@ -396,14 +359,14 @@ <include>WidgetGroupListCommon</include> <control type="grouplist" id="12855"> <height>390</height> - <left>465</left> + <left>25</left> <top>36</top> <orientation>horizontal</orientation> <visible>PVR.IsRecordingTV | PVR.HasNonRecordingTVTimer</visible> <align>right</align> - <width>1360</width> + <width>1280</width> <control type="group"> - <width>660</width> + <width>620</width> <visible>PVR.IsRecordingTV</visible> <include content="PVRWidget"> <param name="icon" value="$INFO[PVR.TVNowRecordingChannelIcon]" /> @@ -414,7 +377,7 @@ </control> <control type="group"> <visible>PVR.HasNonRecordingTVTimer</visible> - <width>670</width> + <width>620</width> <include content="PVRWidget"> <param name="icon" value="$INFO[PVR.TVNextRecordingChannelIcon]" /> <param name="header" value="$LOCALIZE[19157]" /> @@ -423,12 +386,11 @@ </include> </control> </control> - <include content="WidgetListCategories"> + <include content="WidgetListCategories" condition="System.HasPVRAddon"> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="list_id" value="12900"/> <param name="pvr_submenu" value="true"/> <param name="pvr_type" value="TV"/> - <param name="visible" value="System.HasPVRAddon"/> </include> <include content="WidgetListChannels" condition="System.HasPVRAddon"> <param name="content_path" value="pvr://channels/tv/*?view=lastplayed"/> @@ -449,13 +411,12 @@ <param name="label2" value="$INFO[ListItem.Title]$INFO[ListItem.EpisodeName, (,)]"/> </include> </control> - <include content="ImageWidget"> + <include content="ImageWidget" condition="!System.HasPVRAddon"> <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> <param name="text_label" value="$LOCALIZE[31143]" /> <param name="button_label" value="$LOCALIZE[31144]" /> <param name="button_onclick" value="ActivateWindow(addonbrowser,addons://user/xbmc.pvrclient,return)"/> <param name="button_id" value="12400"/> - <param name="visible" value="!System.HasPVRAddon"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVButton)"/> </include> </control> @@ -468,7 +429,7 @@ <include>WidgetGroupListCommon</include> <control type="grouplist" id="13855"> <height>390</height> - <left>538</left> + <left>25</left> <top>36</top> <orientation>horizontal</orientation> <align>right</align> @@ -495,12 +456,11 @@ </include> </control> </control> - <include content="WidgetListCategories"> + <include content="WidgetListCategories" condition="System.HasPVRAddon"> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="list_id" value="13900"/> <param name="pvr_submenu" value="true"/> <param name="pvr_type" value="Radio"/> - <param name="visible" value="System.HasPVRAddon"/> </include> <include content="WidgetListChannels" condition="System.HasPVRAddon"> <param name="content_path" value="pvr://channels/radio/*?view=lastplayed"/> @@ -521,13 +481,12 @@ <param name="label2" value="$INFO[ListItem.Title]$INFO[ListItem.EpisodeName, (,)]"/> </include> </control> - <include content="ImageWidget"> + <include content="ImageWidget" condition="!System.HasPVRAddon"> <param name="image_path" value="special://skin/extras/home-images/tv.jpg"/> <param name="text_label" value="$LOCALIZE[31143]" /> <param name="button_label" value="$LOCALIZE[31144]" /> <param name="button_onclick" value="ActivateWindow(addonbrowser,addons://user/xbmc.pvrclient,return)"/> <param name="button_id" value="13400"/> - <param name="visible" value="!System.HasPVRAddon"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoRadioButton)"/> </include> </control> @@ -536,60 +495,53 @@ <include content="Visible_Right_Delayed"> <param name="id" value="favorites"/> </include> - <control type="group" id="14001"> + <control type="panel" id="14100"> + <left>65</left> <top>0</top> + <right>0</right> <bottom>0</bottom> - <control type="group"> - <visible>Integer.IsGreater(Container(14100).NumItems,0) | Container(14100).IsUpdating</visible> - <height>100%</height> - <control type="panel" id="14100"> - <left>520</left> - <top>0</top> - <width>80%</width> - <bottom>0</bottom> - <onleft>9000</onleft> - <onright>9000</onright> - <onup>14100</onup> - <ondown>14100</ondown> - <onclick>$INFO[ListItem.FileNameAndPath]</onclick> - <preloaditems>2</preloaditems> - <scrolltime tween="sine">200</scrolltime> - <orientation>vertical</orientation> - <itemlayout width="330" height="396"> - <control type="group"> - <top>130</top> - <include content="InfoWallMusicLayout"> - <param name="fallback_image" value="DefaultFavourites.png" /> - <param name="focused" value="false" /> - </include> - </control> - </itemlayout> - <focusedlayout width="330" height="396"> - <control type="group"> - <depth>DepthContentPopout</depth> - <top>130</top> - <animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="170,320">Focus</animation> - <animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="170,320">UnFocus</animation> - <include content="InfoWallMusicLayout"> - <param name="fallback_image" value="DefaultFavourites.png" /> - <param name="focused" value="true" /> - </include> - </control> - </focusedlayout> - <content>favourites://</content> + <onleft>9000</onleft> + <onright>9000</onright> + <onup>14100</onup> + <ondown>14100</ondown> + <onclick>$INFO[ListItem.FileNameAndPath]</onclick> + <preloaditems>2</preloaditems> + <scrolltime tween="cubic" easing="out">500</scrolltime> + <orientation>vertical</orientation> + <visible>Integer.IsGreater(Container(14100).NumItems,0) | Container(14100).IsUpdating</visible> + <itemlayout width="330" height="396"> + <control type="group"> + <top>130</top> + <include content="InfoWallMusicLayout"> + <param name="fallback_image" value="DefaultFavourites.png" /> + <param name="focused" value="false" /> + </include> </control> - </control> - <include content="ImageWidget"> - <param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/> - <param name="text_label" value="$LOCALIZE[31025]" /> - <param name="button_label" value="$LOCALIZE[31116]" /> - <param name="button_onclick" value=""/> - <param name="button_id" value="5500"/> - <param name="visible" value="!Integer.IsGreater(Container(14100).NumItems,0) + !Container(14100).IsUpdating"/> - <param name="visible_1" value="false"/> - <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoFavButton)"/> - </include> + </itemlayout> + <focusedlayout width="330" height="396"> + <control type="group"> + <depth>DepthContentPopout</depth> + <top>130</top> + <animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="170,320">Focus</animation> + <animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="170,320">UnFocus</animation> + <include content="InfoWallMusicLayout"> + <param name="fallback_image" value="DefaultFavourites.png" /> + <param name="focused" value="true" /> + </include> + </control> + </focusedlayout> + <content>favourites://</content> </control> + <include content="ImageWidget"> + <param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/> + <param name="text_label" value="$LOCALIZE[31025]" /> + <param name="button_label" value="$LOCALIZE[31116]" /> + <param name="button_onclick" value=""/> + <param name="button_id" value="5500"/> + <param name="visible" value="!Integer.IsGreater(Container(14100).NumItems,0) + !Container(14100).IsUpdating"/> + <param name="visible_1" value="false"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoFavButton)"/> + </include> </control> <control type="group" id="15000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),weather)</visible> @@ -600,49 +552,43 @@ <include>WidgetGroupListCommon</include> <control type="group" id="16678"> <description>Weather info</description> - <height>560</height> + <left>68</left> + <right>70</right> + <top>102</top> + <height>300</height> <visible>!String.IsEmpty(Weather.plugin)</visible> <control type="image"> - <top>102</top> - <left>510</left> - <right>50</right> - <height>380</height> + <bottom>90</bottom> + <width>100%</width> <texture border="22">dialogs/dialog-bg.png</texture> </control> - <control type="image"> - <top>120</top> - <left>560</left> - <width>150</width> - <height>150</height> - <texture>$INFO[Weather.conditions]</texture> - </control> <control type="label"> - <left>1020</left> - <top>210</top> + <left>300</left> + <top>60</top> <aligny>center</aligny> <height>24</height> - <right>100</right> + <right>60</right> <align>right</align> - <font>font14</font> - <label>$INFO[Weather.Conditions,, ∙ ]$INFO[Weather.Temperature]</label> + <font>font30_title</font> + <label>$INFO[Weather.Location]</label> </control> <control type="label"> - <left>1020</left> - <top>150</top> + <left>300</left> + <top>120</top> <aligny>center</aligny> <height>24</height> - <right>100</right> + <right>60</right> <align>right</align> - <font>font52_title</font> - <label>$INFO[Weather.Location]</label> + <font>font14</font> + <label>$INFO[Weather.Conditions,, ∙ ]$INFO[Weather.Temperature]</label> </control> <control type="grouplist"> - <top>315</top> - <left>570</left> + <top>50</top> + <left>50</left> <right>20</right> <orientation>horizontal</orientation> - <align>justify</align> - <itemgap>-50</itemgap> + <align>left</align> + <itemgap>-110</itemgap> <include content="WeatherIcon"> <param name="label" value="Window(weather).Property(Current.Wind)" /> <param name="texture" value="icons/weather/wind.png" /> @@ -701,61 +647,53 @@ <control type="grouplist" id="16001"> <include>WidgetGroupListCommon</include> <include content="WidgetListCategories"> - <param name="content_path" value="library://video/musicvideos/"/> + <param name="content_path" value="library://music/musicvideos/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="videos"/> <param name="list_id" value="16900"/> <param name="visible" value="Library.HasContent(musicvideos)"/> </include> <include content="WidgetListEpisodes"> - <param name="content_path" value="special://skin/playlists/inprogress_musicvideos.xsp"/> - <param name="widget_header" value="$LOCALIZE[575]"/> - <param name="widget_target" value="videos"/> - <param name="first_label" value="$INFO[ListItem.Title]" /> - <param name="second_label" value="$INFO[ListItem.Artist]" /> - <param name="list_id" value="16100"/> - </include> - <include content="WidgetListSquare"> - <param name="content_path" value="special://skin/playlists/random_musicvideo_artists.xsp"/> - <param name="widget_header" value="$LOCALIZE[31013]"/> - <param name="widget_target" value="music"/> - <param name="list_id" value="16200"/> - <param name="single_label" value="$INFO[ListItem.Label]"/> - <param name="main_label" value=""/> - <param name="sub_label" value=""/> - <param name="widget_limit" value="10"/> - </include> - <include content="WidgetListEpisodes"> <param name="content_path" value="videodb://recentlyaddedmusicvideos/"/> <param name="widget_header" value="$LOCALIZE[20390]"/> <param name="widget_target" value="videos"/> - <param name="first_label" value="$INFO[ListItem.Title]" /> - <param name="second_label" value="$INFO[ListItem.Artist]" /> + <param name="main_label" value="$INFO[ListItem.Label]" /> + <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16300"/> </include> <include content="WidgetListEpisodes"> <param name="content_path" value="special://skin/playlists/unwatched_musicvideos.xsp"/> <param name="widget_header" value="$LOCALIZE[31151]"/> <param name="widget_target" value="videos"/> - <param name="first_label" value="$INFO[ListItem.Title]" /> - <param name="second_label" value="$INFO[ListItem.Artist]" /> + <param name="main_label" value="$INFO[ListItem.Label]" /> + <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16400"/> </include> + <include content="WidgetListSquare"> + <param name="content_path" value="special://skin/playlists/random_musicvideo_artists.xsp"/> + <param name="widget_header" value="$LOCALIZE[31013]"/> + <param name="widget_target" value="music"/> + <param name="list_id" value="16200"/> + <param name="widget_limit" value="10"/> + </include> <include content="WidgetListEpisodes"> <param name="content_path" value="special://skin/playlists/random_musicvideos.xsp"/> <param name="widget_header" value="$LOCALIZE[31152]"/> <param name="widget_target" value="videos"/> - <param name="first_label" value="$INFO[ListItem.Title]" /> - <param name="second_label" value="$INFO[ListItem.Artist]" /> + <param name="main_label" value="$INFO[ListItem.Label]" /> + <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16500"/> </include> <include content="WidgetListCategories"> <param name="content_path" value="videodb://musicvideos/studios/"/> <param name="widget_header" value="$LOCALIZE[20388]"/> - <param name="widget_target" value="videos"/> + <param name="widget_target" value="music"/> <param name="list_id" value="16600"/> <param name="icon" value="$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]"/> - <param name="icon_height" value="90"/> + <param name="icon_height" value="70"/> <param name="visible" value="Library.HasContent(musicvideos)"/> </include> </control> @@ -801,7 +739,7 @@ <onfocus>ClearProperty(listposition,home)</onfocus> <onright>SetFocus($INFO[Container(9000).ListItem.Property(menu_id)])</onright> <onup>700</onup> - <ondown>noop</ondown> + <ondown>700</ondown> <scrolltime tween="cubic" easing="out">500</scrolltime> <focusedlayout height="95"> <control type="group"> @@ -812,7 +750,7 @@ <width>462</width> <height>95</height> <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] | System.HasModalDialog">Conditional</animation> + <animation effect="fade" start="100" end="0" time="0" condition="[!Control.HasFocus(9000) + !ControlGroup(700).HasFocus] | System.HasModalDialog">Conditional</animation> </control> <control type="image"> <left>-3</left> @@ -828,7 +766,7 @@ <width>95</width> <height>95</height> <texture colordiffuse="51FFFFFF">colors/black.png</texture> - <animation effect="fade" start="100" end="0" time="0" condition="[!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus] | System.HasModalDialog">Conditional</animation> + <animation effect="fade" start="100" end="0" time="0" condition="[!Control.HasFocus(9000) + !ControlGroup(700).HasFocus] | System.HasModalDialog">Conditional</animation> </control> </control> <control type="image"> @@ -969,8 +907,12 @@ <width>480</width> <height>110</height> <top>100</top> - <onup>noop</onup> - <ondown>9000</ondown> + <onup>SetFocus(9000)</onup> + <onup>PageDown</onup> + <onup>PageDown</onup> + <ondown>SetFocus(9000)</ondown> + <ondown>PageUp</ondown> + <ondown>PageUp</ondown> <onright>2000</onright> <align>justify</align> <include content="IconButton"> @@ -1041,7 +983,6 @@ <titlecolor>button_focus</titlecolor> <shadowcolor>text_shadow</shadowcolor> <headlinecolor>FFC0C0C0</headlinecolor> - <textcolor>white</textcolor> <visible>!Player.hasMedia</visible> </control> </control> diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index 0d48332070..29ba0b9686 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -30,6 +30,9 @@ <constant name="DepthBackground">-0.80</constant> <constant name="DepthSideBlade">0.10</constant> <constant name="bg_alpha">79</constant> + <constant name="dialogbuttons_itemgap">-20</constant> + <constant name="list_y_offset">0</constant> + <constant name="list_item_height">80</constant> <expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)</expression> <expression name="sidebar_focused">ControlGroup(9000).HasFocus | Control.HasFocus(6130)</expression> <include name="CommonScrollbars"> @@ -45,7 +48,7 @@ <onleft>50</onleft> <onright>50</onright> <orientation>vertical</orientation> - <texturesliderbackground></texturesliderbackground> + <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="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(531)">conditional</animation> @@ -56,7 +59,7 @@ <bottom>0</bottom> <width>100%</width> <height>12</height> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <onup>50</onup> <ondown>50</ondown> <orientation>horizontal</orientation> @@ -73,8 +76,8 @@ <top>-3000</top> <width>1</width> <height>1</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <label></label> <font></font> </include> @@ -100,7 +103,6 @@ <width>44</width> <height>44</height> <font>font20_title</font> - <textcolor>white</textcolor> <label>$INFO[ListItem.UserRating]</label> </control> </control> @@ -336,8 +338,9 @@ <control type="label"> <left>50</left> <width>180</width> - <height>32</height> + <height>35</height> <aligny>center</aligny> + <font>font12</font> <label>$PARAM[label]</label> </control> </control> @@ -369,14 +372,9 @@ <usecontrolcoords>true</usecontrolcoords> <control type="group"> <top>10</top> - <width>160</width> - <include content="InfoFlag"> - <param name="visible" value="!String.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> + <width>200</width> <include content="InfoFlag"> - <param name="visible" value="String.IsEqual(ListItem.DBtype,tvshow) + !String.IsEmpty(ListItem.Premiered) + String.IsEmpty(ListItem.Property(TotalEpisodes))" /> + <param name="visible" value="String.IsEqual(ListItem.DBtype,tvshow) + !String.IsEmpty(ListItem.Premiered)" /> <param name="icon" value="lists/year.png" /> <param name="label" value="$INFO[ListItem.Premiered]" /> </include> @@ -399,7 +397,6 @@ <aligny>center</aligny> <label>$INFO[ListItem.Duration,, $LOCALIZE[31132]]</label> <font>font_flag</font> - <textcolor>white</textcolor> </control> <include content="MediaFlag"> <param name="texture" value="flags/flag.png" /> @@ -414,8 +411,8 @@ <param name="visible" value="!String.IsEmpty(ListItem.AudioCodec)" /> </include> <!-- <include content="MediaFlag"> - <param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" /> - </include> --> + <param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" /> + </include> --> <include content="MediaFlag"> <param name="texture" value="$VAR[ResolutionFlagVar]" /> <param name="visible" value="!String.IsEmpty(ListItem.VideoResolution)" /> @@ -447,9 +444,9 @@ <definition> <control type="fixedlist" id="$PARAM[list_id]"> <left>0</left> - <top>0</top> + <top>list_y_offset</top> + <bottom>list_y_offset</bottom> <width>$PARAM[width]</width> - <height>100%</height> <focusposition>4</focusposition> <movement>3</movement> <onleft>$PARAM[onleft_id]</onleft> @@ -458,12 +455,12 @@ <ondown>$PARAM[list_id]</ondown> <pagecontrol>$PARAM[scrollbar_id]</pagecontrol> <scrolltime>200</scrolltime> - <focusedlayout height="75"> + <focusedlayout height="list_item_height" width="$PARAM[width]"> <control type="image"> <left>0</left> <top>0</top> - <width>$PARAM[width]</width> - <height>75</height> + <right>0</right> + <bottom>0</bottom> <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> @@ -471,8 +468,8 @@ <left>20</left> <textoffsetx>15</textoffsetx> <top>0</top> - <height>75</height> - <width>$PARAM[width]</width> + <bottom>0</bottom> + <right>0</right> <aligny>center</aligny> <scroll>true</scroll> <label>$INFO[ListItem.Label]</label> @@ -482,21 +479,21 @@ <left>0</left> <textoffsetx>30</textoffsetx> <top>0</top> - <height>75</height> - <width>$PARAM[width]</width> + <bottom>0</bottom> + <right>0</right> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="75"> + <itemlayout height="list_item_height" width="$PARAM[width]"> <control type="label"> <left>20</left> <textoffsetx>15</textoffsetx> <top>0</top> - <height>75</height> - <width>$PARAM[width]</width> + <bottom>0</bottom> + <right>0</right> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> @@ -505,8 +502,8 @@ <left>0</left> <textoffsetx>30</textoffsetx> <top>0</top> - <height>75</height> - <width>$PARAM[width]</width> + <bottom>0</bottom> + <right>0</right> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> @@ -566,15 +563,14 @@ <width>12</width> <height>920</height> <orientation>vertical</orientation> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus($PARAM[group_id]30)">conditional</animation> <onleft>$PARAM[group_id]50</onleft> <onright>noop</onright> - <texturesliderbackground colordiffuse="22FFFFFF">colors/white.png</texturesliderbackground> </control> </control> <control type="group"> - <left>20</left> + <left>462</left> <include content="ImageWidget"> <param name="image_path" value="$PARAM[imagewidget_image]"/> <param name="text_label" value="$LOCALIZE[31153]" /> @@ -728,8 +724,8 @@ <top>$PARAM[posy]</top> <width>28</width> <height>28</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Control.Move($PARAM[list_id],-1)</onclick> <visible allowhiddenfocus="true">Container($PARAM[list_id]).HasPrevious + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]500)]</visible> </control> @@ -738,8 +734,8 @@ <top>$PARAM[posy]</top> <width>28</width> <height>28</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Control.Move($PARAM[list_id],1)</onclick> <visible allowhiddenfocus="true">Container($PARAM[list_id]).HasNext + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]501)]</visible> </control> @@ -762,17 +758,17 @@ <top>-2000</top> <width>6000</width> <height>6000</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="group"> - <width>$PARAM[DialogBackgroundWidth]</width> + <width>$PARAM[width]</width> <control type="image"> <left>0</left> <top>0</top> <right>0</right> - <height>$PARAM[DialogBackgroundHeight]</height> + <height>$PARAM[height]</height> <texture colordiffuse="dialog_tint">colors/white.png</texture> </control> <control type="image"> @@ -782,13 +778,13 @@ <height>70</height> <texture colordiffuse="button_focus" border="2">colors/white70.png</texture> </control> - <control type="label" id="$PARAM[DialogHeaderId]"> + <control type="label" id="$PARAM[header_id]"> <left>40</left> <top>0</top> <right>100</right> <height>70</height> <font>font32_title</font> - <label>$PARAM[DialogHeaderLabel]</label> + <label>$PARAM[header_label]</label> <aligny>center</aligny> <shadowcolor>black</shadowcolor> </control> @@ -797,9 +793,9 @@ <left>0</left> <top>0</top> <right>0</right> - <height>$PARAM[DialogBackgroundHeight]</height> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <height>$PARAM[height]</height> + <texturefocus /> + <texturenofocus /> <onclick>noop</onclick> </control> <control type="radiobutton"> @@ -809,8 +805,8 @@ <height>48</height> <radiowidth>48</radiowidth> <radioheight>48</radioheight> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <label></label> <textureradioofffocus colordiffuse="EEFFFFFF">dialogs/close.png</textureradioofffocus> <textureradiooffnofocus colordiffuse="EEFFFFFF">icons/logo.png</textureradiooffnofocus> @@ -872,6 +868,7 @@ <visible>!String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos)</visible> </control> <control type="label"> + <left>10</left> <label>($LOCALIZE[31052])</label> <include>BreadcrumbsLabel</include> <visible>Container.Filtered</visible> @@ -879,12 +876,12 @@ </control> <control type="button"> <top>0</top> - <width>500</width> + <width>200</width> <height>100</height> <label></label> <onclick>Action(Back)</onclick> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> </control> <control type="label" id="18900"> <top>50</top> @@ -920,9 +917,9 @@ <itemgap>5</itemgap> <usecontrolcoords>true</usecontrolcoords> <control type="image"> - <top>8</top> - <width>28</width> - <height>26</height> + <top>4</top> + <width>32</width> + <height>32</height> <aspectratio>keep</aspectratio> <texture colordiffuse="button_focus">$VAR[NowPlayingIconVar]</texture> </control> @@ -955,15 +952,58 @@ <label>$INFO[System.Time]</label> </control> </control> - <control type="label"> - <top>77</top> - <label>$INFO[System.AlarmPos,$LOCALIZE[13005]: ]</label> - <right>22</right> - <shadowcolor>text_shadow</shadowcolor> + <control type="grouplist"> + <right>10</right> + <top>70</top> + <width>800</width> <height>100</height> - <width>500</width> <align>right</align> - <visible>System.HasAlarm(shutdowntimer)</visible> + <itemgap>5</itemgap> + <orientation>horizontal</orientation> + <usecontrolcoords>true</usecontrolcoords> + <control type="label"> + <height>50</height> + <width>auto</width> + <aligny>center</aligny> + <textoffsetx>-8</textoffsetx> + <label>$INFO[System.AlarmPos]</label> + <visible>System.HasAlarm(shutdowntimer)</visible> + </control> + <control type="image"> + <top>16</top> + <width>40</width> + <height>22</height> + <fadetime>300</fadetime> + <aspectratio aligny="center" align="left">keep</aspectratio> + <texture>icons/power.png</texture> + <visible>System.HasAlarm(shutdowntimer)</visible> + </control> + <control type="label"> + <height>50</height> + <width>auto</width> + <aligny>center</aligny> + <label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label> + <visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)]</visible> + </control> + <control type="image"> + <top>1</top> + <width>50</width> + <height>50</height> + <fadetime>300</fadetime> + <aspectratio aligny="center" align="left">keep</aspectratio> + <texture>$INFO[Weather.FanartCode,weather/small/,.png]</texture> + <visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)]</visible> + </control> + <control type="image"> + <top>8</top> + <left>-20</left> + <width>74</width> + <height>40</height> + <fadetime>300</fadetime> + <aspectratio aligny="center" align="center">keep</aspectratio> + <texture>dialogs/volume/mute.png</texture> + <visible>Player.Muted</visible> + </control> </control> <control type="label" id="23000"> <top>0</top> @@ -973,7 +1013,6 @@ <width>100%</width> <height>80</height> <align>center</align> - <textcolor>white</textcolor> <visible>!System.HasModalDialog</visible> <visible>Container.Scrolling</visible> <visible>!Container.Content(seasons)</visible> @@ -1110,44 +1149,11 @@ <shadowcolor>text_shadow</shadowcolor> <label>$LOCALIZE[33063]</label> <onclick>SetFocus(9000)</onclick> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> </control> </control> - <control type="grouplist" id="700"> - <orientation>horizontal</orientation> - <visible>Skin.HasSetting(touchmode)</visible> - <visible>!Window.IsActive(home)</visible> - <animation effect="fade" start="0" end="100" time="400" condition="Window.Previous(home)">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(home)">WindowClose</animation> - <itemgap>0</itemgap> - <left>-8</left> - <width>480</width> - <height>110</height> - <bottom>0</bottom> - <onup>noop</onup> - <ondown>9000</ondown> - <onright>2000</onright> - <align>justify</align> - <include content="IconButton"> - <param name="control_id" value="804" /> - <param name="onclick" value="SetFocus(9000)" /> - <param name="icon" value="icons/settings.png" /> - <param name="label" value="$LOCALIZE[10004]" /> - </include> - <include content="IconButton"> - <param name="control_id" value="802" /> - <param name="onclick" value="ActivateWindow(favourites)" /> - <param name="icon" value="icons/favourites.png" /> - <param name="label" value="$LOCALIZE[10134]" /> - </include> - <include content="IconButton"> - <param name="control_id" value="803" /> - <param name="onclick" value="ActivateWindow(shutdownmenu)" /> - <param name="icon" value="icons/power.png" /> - <param name="label" value="$LOCALIZE[33060]" /> - </include> - </control> + <include>TouchButtons</include> </control> </definition> </include> @@ -1287,4 +1293,62 @@ </control> </definition> </include> + <include name="TouchButtons"> + <control type="grouplist" id="700"> + <orientation>horizontal</orientation> + <visible>Skin.HasSetting(touchmode)</visible> + <visible>!Window.IsActive(home) + !Window.IsActive(filemanager)</visible> + <animation effect="fade" start="0" end="100" time="400" condition="Window.Previous(home)">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(home)">WindowClose</animation> + <itemgap>0</itemgap> + <left>-8</left> + <width>480</width> + <height>110</height> + <bottom>0</bottom> + <onup>noop</onup> + <ondown>9000</ondown> + <onright>2000</onright> + <align>justify</align> + <usecontrolcoords>true</usecontrolcoords> + <control type="group"> + <width>120</width> + <control type="button"> + <top>0</top> + <width>120</width> + <height>120</height> + <label></label> + <onclick>ActivateWindow(1103)</onclick> + <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> + <texturenofocus /> + </control> + <control type="image"> + <left>34</left> + <top>34</top> + <width>52</width> + <height>52</height> + <texture colordiffuse="grey">$VAR[VolumeIconVar]</texture> + </control> + </control> + <include content="IconButton"> + <param name="control_id" value="" /> + <param name="onclick" value="ActivateWindow(favourites)" /> + <param name="icon" value="icons/favourites.png" /> + <param name="label" value="$LOCALIZE[10134]" /> + </include> + <include content="IconButton"> + <param name="control_id" value="" /> + <param name="onclick" value="SetFocus(9000)" /> + <param name="icon" value="icons/settings.png" /> + <param name="label" value="$LOCALIZE[10004]" /> + <param name="visible" value="Window.IsMedia" /> + </include> + <include content="IconButton"> + <param name="control_id" value="" /> + <param name="onclick" value="ActivateWindow(shutdownmenu)" /> + <param name="icon" value="icons/power.png" /> + <param name="label" value="$LOCALIZE[33060]" /> + <param name="visible" value="!Window.IsMedia" /> + </include> + </control> + </include> </includes> diff --git a/addons/skin.estuary/xml/Includes_Animations.xml b/addons/skin.estuary/xml/Includes_Animations.xml index 033498dba4..ebdad5d516 100644 --- a/addons/skin.estuary/xml/Includes_Animations.xml +++ b/addons/skin.estuary/xml/Includes_Animations.xml @@ -41,8 +41,8 @@ </include> <include name="Vis_FadeSlide_Right_Delayed"> <animation type="Conditional" condition="String.IsEqual(Container(9000).ListItem.Property(id),$PARAM[id])"> - <effect type="fade" start="0" end="100" time="300" tween="sine" delay="300" easing="out" reversible="False"/> - <effect type="slide" start="320" end="0" time="400" delay="300" tween="cubic" easing="out" reversible="False"/> + <effect type="fade" start="0" end="100" time="300" tween="sine" delay="300" easing="out" /> + <effect type="slide" start="320" end="0" time="400" delay="300" tween="cubic" easing="out" /> </animation> <animation type="Hidden"> <effect type="fade" start="100" end="0" time="300" tween="sine" easing="out" /> diff --git a/addons/skin.estuary/xml/Includes_Buttons.xml b/addons/skin.estuary/xml/Includes_Buttons.xml index 38df530869..05945ad3e2 100644 --- a/addons/skin.estuary/xml/Includes_Buttons.xml +++ b/addons/skin.estuary/xml/Includes_Buttons.xml @@ -14,7 +14,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> </include> @@ -25,8 +25,8 @@ <textoffsetx>40</textoffsetx> <aligny>center</aligny> <font>font12</font> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>noop</onclick> <label>$PARAM[label]</label> <visible>$PARAM[visible]</visible> @@ -40,11 +40,10 @@ <top>0</top> <height>$PARAM[height]</height> <aligny>center</aligny> - <textcolor>white</textcolor> <invalidcolor>invalid</invalidcolor> <selectedcolor>selected</selectedcolor> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> </definition> </include> <include name="DialogSettingButton"> @@ -55,7 +54,6 @@ <top>0</top> <height>$PARAM[height]</height> <aligny>center</aligny> - <textcolor>white</textcolor> <invalidcolor>invalid</invalidcolor> <selectedcolor>selected</selectedcolor> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> @@ -71,7 +69,6 @@ <aligny>center</aligny> <font>font25_title</font> <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> </include> <include name="SettingsItemCommon"> <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> @@ -88,11 +85,10 @@ <textoffsetx>30</textoffsetx> <textoffsety>10</textoffsety> <textcolor>button_focus</textcolor> - <shadowcolor>black</shadowcolor> </include> <include name="DefaultDialogButton"> <param name="width">300</param> - <param name="height">90</param> + <param name="height">100</param> <param name="wrapmultiline">false</param> <param name="font">font25_title</param> <param name="onclick"></param> @@ -103,7 +99,6 @@ <height>$PARAM[height]</height> <label>$PARAM[label]</label> <font>$PARAM[font]</font> - <textcolor>white</textcolor> <textoffsetx>20</textoffsetx> <onclick>$PARAM[onclick]</onclick> <wrapmultiline>$PARAM[wrapmultiline]</wrapmultiline> @@ -119,7 +114,7 @@ <height>120</height> <textoffsety>27</textoffsety> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <align>center</align> <aligny>top</aligny> <font>font45</font> @@ -133,7 +128,7 @@ <align>left</align> <aligny>top</aligny> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <textoffsetx>40</textoffsetx> <textwidth>300</textwidth> <textoffsety>35</textoffsety> @@ -156,7 +151,7 @@ <font></font> <label>$PARAM[label]</label> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>40</radioposx> <radioposy>0</radioposy> <radiowidth>40</radiowidth> @@ -181,7 +176,7 @@ <font></font> <label>$PARAM[label]</label> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>40</radioposx> <radioposy>0</radioposy> <radiowidth>40</radiowidth> diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml index 826e3a1079..d367203c82 100644 --- a/addons/skin.estuary/xml/Includes_Home.xml +++ b/addons/skin.estuary/xml/Includes_Home.xml @@ -10,17 +10,14 @@ <usecontrolcoords>true</usecontrolcoords> </include> <include name="CategoryLabel"> - <param name="left">442</param> <param name="visible">true</param> <definition> <control type="label" id="$PARAM[list_id]666"> - <left>$PARAM[left]</left> - <textoffsetx>58</textoffsetx> + <left>55</left> <top>80</top> <width>900</width> <height>90</height> <label>$PARAM[label]</label> - <textcolor>white</textcolor> <shadowcolor>text_shadow</shadowcolor> <visible>$PARAM[visible]</visible> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> @@ -63,218 +60,44 @@ <shadowcolor>black</shadowcolor> </control> </include> - <include name="WidgetListMovies"> - <param name="left_icon">lists/rating.png</param> - <param name="right_icon">lists/duration.png</param> - <param name="first_label">$INFO[ListItem.Rating]</param> - <param name="second_label">$INFO[ListItem.Duration,, $LOCALIZE[31132]]</param> - <param name="fallback_image">DefaultMovies.png</param> + <include name="WidgetListPoster"> <definition> <include content="CategoryLabel"> <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> - <control type="list" id="$PARAM[list_id]"> - <left>442</left> + <control type="panel" id="$PARAM[list_id]"> + <left>0</left> <top>120</top> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> <right>0</right> - <height>560</height> + <height>500</height> <include content="WidgetListCommon"> <param name="list_id" value="$PARAM[list_id]"/> </include> - <itemlayout width="330" height="500"> + <itemlayout width="310" height="486"> <control type="group"> <left>70</left> - <control type="group"> - <visible>String.IsEmpty(ListItem.Art(poster))</visible> - <control type="image"> - <left>10</left> - <top>0</top> - <width>312</width> - <height>448</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>40</left> - <top>30</top> - <width>252</width> - <height>250</height> - <aspectratio>keep</aspectratio> - <texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Art(poster)]</texture> - </control> - <control type="textbox"> - <left>46</left> - <top>272</top> - <width>240</width> - <height>120</height> - <label>$INFO[ListItem.Label]</label> - <font>font27</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - <aligny>center</aligny> - <visible>String.IsEmpty(ListItem.Art(poster))</visible> - </control> - </control> - <control type="image"> - <left>10</left> - <top>0</top> - <width>312</width> - <height>448</height> - <aspectratio>scale</aspectratio> - <texture background="true">$INFO[ListItem.Art(poster)]</texture> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> + <top>10</top> + <include content="InfoWallMovieLayout"> + <param name="focused" value="false" /> + </include> </control> </itemlayout> - <focusedlayout width="330" height="500"> + <focusedlayout width="310" height="486"> <control type="group"> <depth>DepthContentPopout</depth> <left>70</left> + <top>10</top> <animation type="Focus"> - <effect type="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="236,130" /> + <effect type="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="230,130" /> </animation> <animation type="Unfocus"> - <effect type="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="236,130" /> + <effect type="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="230,130" /> </animation> - <control type="group"> - <visible>String.IsEmpty(ListItem.Art(poster))</visible> - <control type="image"> - <left>10</left> - <top>0</top> - <width>312</width> - <height>448</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>10</left> - <top>0</top> - <width>312</width> - <height>448</height> - <texture border="21" colordiffuse="button_focus">colors/grey.png</texture> - <bordersize>20</bordersize> - <include>Animation_FocusTextureFade</include> - <visible>Control.HasFocus($PARAM[list_id])</visible> - </control> - <control type="image"> - <left>40</left> - <top>30</top> - <width>252</width> - <height>250</height> - <aspectratio>keep</aspectratio> - <texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Art(poster)]</texture> - </control> - <control type="textbox"> - <left>46</left> - <top>272</top> - <width>240</width> - <height>120</height> - <label>$INFO[ListItem.Label]</label> - <font>font27</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - <aligny>center</aligny> - <visible>String.IsEmpty(ListItem.Art(poster))</visible> - </control> - </control> - <control type="image"> - <left>10</left> - <top>0</top> - <width>312</width> - <height>448</height> - <aspectratio>scale</aspectratio> - <texture background="true">$INFO[ListItem.Art(poster)]</texture> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="group"> - <left>30</left> - <top>20</top> - <animation effect="fade" start="0" end="100" time="200">Focus</animation> - <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> - <visible>Control.HasFocus($PARAM[list_id])</visible> - <control type="image"> - <left>0</left> - <top>0</top> - <width>80</width> - <height>80</height> - <texture flipy="true">overlays/overlay-bg.png</texture> - <visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> - </control> - <control type="image"> - <left>4</left> - <top>4</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> - </control> - <control type="image"> - <left>0</left> - <bottom>72</bottom> - <width>272</width> - <height>80</height> - <texture>overlays/overlayfade.png</texture> - <animation effect="fade" start="0" end="70" time="50">Focus</animation> - </control> - <control type="label"> - <left>38</left> - <top>370</top> - <width>200</width> - <label>$PARAM[first_label]</label> - <font>font10</font> - <textcolor>white</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <right>-4</right> - <top>370</top> - <width>200</width> - <label>$PARAM[second_label]</label> - <font>font10</font> - <textcolor>white</textcolor> - <shadowcolor>text_shadow</shadowcolor> - <align>right</align> - </control> - <control type="image"> - <left>8</left> - <top>376</top> - <width>24</width> - <height>24</height> - <texture>$PARAM[left_icon]</texture> - </control> - <control type="image"> - <left>240</left> - <top>376</top> - <width>24</width> - <height>24</height> - <texture>$PARAM[right_icon]</texture> - </control> - <control type="progress"> - <left>0</left> - <top>390</top> - <width>272</width> - <height>1</height> - <texturebg></texturebg> - <midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture> - <info>ListItem.PercentPlayed</info> - <visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible> - </control> - <control type="image"> - <left>0</left> - <top>0</top> - <width>272</width> - <height>408</height> - <texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture> - <visible>!String.IsEmpty(ListItem.Art(poster))</visible> - </control> - </control> + <include content="InfoWallMovieLayout"> + <param name="focused" value="true" /> + </include> </control> </focusedlayout> <content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[widget_target]" limit="15">$PARAM[content_path]</content> @@ -282,6 +105,7 @@ </definition> </include> <include name="ImageWidget"> + <param name="visible">true</param> <param name="visible_1">true</param> <param name="visible_2">true</param> <param name="button2_onclick">true</param> @@ -290,7 +114,7 @@ <visible>$PARAM[visible]</visible> <control type="multiimage"> <top>0</top> - <left>442</left> + <left>0</left> <right>0</right> <height>100%</height> <aspectratio>scale</aspectratio> @@ -299,9 +123,10 @@ </control> <control type="grouplist" id="$PARAM[button_id]577"> <orientation>vertical</orientation> - <top>420</top> - <left>700</left> - <width>1000</width> + <top>0</top> + <bottom>0</bottom> + <left>50</left> + <right>50</right> <align>center</align> <control type="textbox"> <width>100%</width> @@ -346,134 +171,57 @@ </definition> </include> <include name="WidgetListEpisodes"> + <param name="main_label">$INFO[ListItem.Title]</param> + <param name="sub_label">$INFO[ListItem.TVShowTitle]</param> <param name="sortby"></param> + <param name="visible">True</param> <param name="sortorder">ascending</param> - <param name="first_label">$INFO[ListItem.TVShowTitle]</param> - <param name="item_image">$INFO[ListItem.Art(thumb)]</param> + <param name="widget_limit">15</param> <definition> <include content="CategoryLabel"> <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> <control type="panel" id="$PARAM[list_id]"> - <left>442</left> + <left>0</left> <top>120</top> <right>0</right> - <height>450</height> + <height>410</height> <include content="WidgetListCommon"> <param name="list_id" value="$PARAM[list_id]"/> </include> + <visible>$PARAM[visible]</visible> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> - <itemlayout width="330" height="400"> + <itemlayout width="310" height="500"> <control type="group"> <left>70</left> - <control type="image"> - <left>0</left> - <top>0</top> - <width>344</width> - <height>340</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>20</left> - <top>20</top> - <width>304</width> - <height>228</height> - <aspectratio>scale</aspectratio> - <texture fallback="DefaultTVShows.png" background="true">$PARAM[item_image]</texture> - </control> - <control type="label"> - <left>30</left> - <top>250</top> - <width>288</width> - <label>$PARAM[first_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>30</left> - <top>282</top> - <width>288</width> - <label>$PARAM[second_label]</label> - <font>font10</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> + <top>5</top> + <include content="InfoWallEpisodeLayout"> + <param name="main_label" value="$PARAM[main_label]" /> + <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="focused" value="false" /> + </include> </control> </itemlayout> - <focusedlayout width="330" height="400"> + <focusedlayout width="310" height="500"> <control type="group"> - <left>70</left> <depth>DepthContentPopout</depth> + <left>70</left> + <top>5</top> <animation type="Focus"> - <effect type="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="233,120" /> + <effect type="zoom" start="100" end="112" time="200" tween="sine" easing="inout" center="230,120" /> </animation> <animation type="Unfocus"> - <effect type="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="233,120" /> + <effect type="zoom" start="112" end="100" time="200" tween="sine" easing="inout" center="230,120" /> </animation> - <control type="image"> - <left>0</left> - <top>0</top> - <width>344</width> - <height>340</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="group"> - <include>Animation_FocusTextureFade</include> - <control type="image"> - <left>-4</left> - <top>-4</top> - <width>352</width> - <height>348</height> - <texture border="21" colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="progress"> - <left>20</left> - <top>302</top> - <width>306</width> - <height>1</height> - <texturebg></texturebg> - <midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture> - <info>ListItem.PercentPlayed</info> - <visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible> - </control> - </control> - <control type="image"> - <left>20</left> - <top>20</top> - <width>304</width> - <height>228</height> - <aspectratio>scale</aspectratio> - <texture fallback="DefaultTVShows.png" background="true">$PARAM[item_image]</texture> - </control> - <control type="label"> - <left>30</left> - <top>250</top> - <width>288</width> - <label>$PARAM[first_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>30</left> - <top>282</top> - <width>288</width> - <label>$PARAM[second_label]</label> - <font>font10</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> + <include content="InfoWallEpisodeLayout"> + <param name="main_label" value="$PARAM[main_label]" /> + <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="focused" value="true" /> + </include> </control> </focusedlayout> - <content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[widget_target]" limit="15">$PARAM[content_path]</content> + <content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[widget_target]" limit="$PARAM[widget_limit]">$PARAM[content_path]</content> </control> </definition> </include> @@ -484,14 +232,13 @@ <param name="sortorder">ascending</param> <param name="widget_limit">15</param> <param name="fallback_icon">DefaultAudio.png</param> - <param name="main_label">$INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Artist]</param> <definition> <include content="CategoryLabel"> <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> <control type="panel" id="$PARAM[list_id]"> - <left>442</left> + <left>0</left> <top>120</top> <right>0</right> <height>500</height> @@ -500,59 +247,18 @@ </include> <visible>$PARAM[visible]</visible> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> - <itemlayout width="330" height="500"> + <itemlayout width="310" height="500"> <control type="group"> <left>70</left> - <control type="image"> - <left>0</left> - <top>0</top> - <width>340</width> - <height>400</height> - <aspectratio>scale</aspectratio> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>20</left> - <top>20</top> - <width>300</width> - <height>300</height> - <aspectratio>scale</aspectratio> - <texture fallback="$PARAM[fallback_icon]" background="true">$INFO[ListItem.Art(thumb)]</texture> - </control> - <control type="label"> - <left>40</left> - <top>318</top> - <width>260</width> - <label>$PARAM[sub_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>40</left> - <top>346</top> - <width>260</width> - <label>$PARAM[main_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>30</left> - <top>318</top> - <width>280</width> - <height>60</height> - <aligny>center</aligny> - <label>$PARAM[single_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> + <include content="InfoWallMusicLayout"> + <param name="main_label" value="$PARAM[main_label]" /> + <param name="single_label" value="$PARAM[single_label]" /> + <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="focused" value="false" /> + </include> </control> </itemlayout> - <focusedlayout width="330" height="500"> + <focusedlayout width="310" height="500"> <control type="group"> <depth>DepthContentPopout</depth> <left>70</left> @@ -562,70 +268,12 @@ <animation type="Unfocus"> <effect type="zoom" start="112" end="100" time="200" tween="sine" easing="inout" center="240,120" /> </animation> - <control type="image"> - <left>0</left> - <top>0</top> - <width>340</width> - <height>400</height> - <aspectratio>scale</aspectratio> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>-4</left> - <top>-4</top> - <width>348</width> - <height>408</height> - <aspectratio>scale</aspectratio> - <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - <include>Animation_FocusTextureFade</include> - </control> - <control type="image"> - <left>20</left> - <top>20</top> - <width>300</width> - <height>300</height> - <aspectratio>scale</aspectratio> - <texture fallback="$PARAM[fallback_icon]" background="true">$INFO[ListItem.Art(thumb)]</texture> - </control> - <control type="group"> - <left>20</left> - <top>20</top> - <control type="label"> - <left>10</left> - <top>298</top> - <width>280</width> - <label>$PARAM[sub_label]</label> - <font>font12</font> - <scroll>true</scroll> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>10</left> - <top>326</top> - <width>280</width> - <font>font12</font> - <scroll>true</scroll> - <label>$PARAM[main_label]</label> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - <control type="label"> - <left>10</left> - <top>298</top> - <width>280</width> - <height>60</height> - <aligny>center</aligny> - <label>$PARAM[single_label]</label> - <font>font12</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - </control> - </control> + <include content="InfoWallMusicLayout"> + <param name="main_label" value="$PARAM[main_label]" /> + <param name="single_label" value="$PARAM[single_label]" /> + <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="focused" value="true" /> + </include> </control> </focusedlayout> <content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[widget_target]" limit="$PARAM[widget_limit]">$PARAM[content_path]</content> @@ -635,7 +283,7 @@ <include name="WidgetListCategories"> <param name="item_limit">20</param> <param name="icon">$INFO[ListItem.Icon]</param> - <param name="icon_height">130</param> + <param name="icon_height">120</param> <param name="pvr_submenu">false</param> <param name="pvr_type">TV</param> <param name="visible">true</param> @@ -646,47 +294,47 @@ <param name="visible" value="$PARAM[visible]"/> </include> <control type="panel" id="$PARAM[list_id]"> - <left>442</left> + <left>0</left> <top>120</top> <right>0</right> - <height>300</height> + <height>290</height> <include content="WidgetListCommon"> <param name="list_id" value="$PARAM[list_id]"/> </include> <visible>$PARAM[visible]</visible> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> - <itemlayout width="330" height="340"> + <itemlayout width="310" height="340"> <control type="group"> <left>70</left> <control type="image"> - <width>336</width> - <height>210</height> + <width>316</width> + <height>200</height> <texture>dialogs/dialog-bg-nobo.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> - <centertop>83</centertop> + <centertop>74</centertop> <left>62</left> - <width>220</width> + <width>200</width> <height>$PARAM[icon_height]</height> <texture fallback="DefaultFolder.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> </control> - <control type="label"> + <control type="textbox"> <left>42</left> - <top>125</top> - <width>260</width> + <top>106</top> + <width>240</width> <height>70</height> <label>$INFO[ListItem.Label]</label> - <font>font12</font> + <font>font25_narrow</font> <shadowcolor>text_shadow</shadowcolor> <align>center</align> <aligny>center</aligny> </control> </control> </itemlayout> - <focusedlayout width="330" height="340"> + <focusedlayout width="310" height="340"> <control type="group"> <depth>DepthContentPopout</depth> <left>70</left> @@ -697,38 +345,37 @@ <effect type="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="240,70" /> </animation> <control type="image"> - <width>336</width> - <height>210</height> + <width>316</width> + <height>200</height> <texture>dialogs/dialog-bg-nobo.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> - <width>336</width> - <height>210</height> + <width>316</width> + <height>200</height> <texture colordiffuse="button_focus">colors/grey.png</texture> <bordersize>20</bordersize> <include>Animation_FocusTextureFade</include> </control> <control type="image"> - <centertop>83</centertop> + <centertop>74</centertop> <left>62</left> - <width>220</width> + <width>200</width> <height>$PARAM[icon_height]</height> <texture fallback="DefaultFolder.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> </control> - <control type="label"> + <control type="textbox"> <left>42</left> - <top>125</top> - <width>260</width> + <top>106</top> + <width>240</width> <height>70</height> <label>$INFO[ListItem.Label]</label> - <font>font12</font> + <font>font25_narrow</font> <shadowcolor>text_shadow</shadowcolor> <align>center</align> <aligny>center</aligny> - <scroll>true</scroll> </control> </control> </focusedlayout> @@ -791,7 +438,7 @@ <param name="list_id" value="$PARAM[list_id]"/> </include> <control type="panel" id="$PARAM[list_id]"> - <left>442</left> + <left>0</left> <top>120</top> <right>0</right> <height>430</height> @@ -799,11 +446,11 @@ <param name="list_id" value="$PARAM[list_id]"/> </include> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> - <itemlayout width="325" height="500"> + <itemlayout width="310" height="500"> <control type="group"> <left>70</left> <control type="image"> - <width>334</width> + <width>319</width> <height>340</height> <texture>dialogs/dialog-bg-nobo.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> @@ -812,7 +459,7 @@ <control type="image"> <top>43</top> <left>38</left> - <width>260</width> + <width>245</width> <height>200</height> <texture fallback="DefaultTVShows.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> @@ -820,7 +467,7 @@ <control type="label"> <left>42</left> <top>247</top> - <width>260</width> + <width>245</width> <height>70</height> <label>$PARAM[label]</label> <font>font12</font> @@ -831,7 +478,7 @@ <control type="label"> <left>42</left> <top>277</top> - <width>260</width> + <width>245</width> <height>65</height> <label>$PARAM[label2]</label> <font>font12</font> @@ -848,7 +495,7 @@ </control> </control> </itemlayout> - <focusedlayout width="325" height="500"> + <focusedlayout width="310" height="500"> <control type="group"> <depth>DepthContentPopout</depth> <left>70</left> @@ -859,14 +506,14 @@ <effect type="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="240,100" /> </animation> <control type="image"> - <width>334</width> + <width>319</width> <height>340</height> <texture>dialogs/dialog-bg-nobo.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> - <width>334</width> + <width>319</width> <height>340</height> <texture colordiffuse="button_focus">colors/grey.png</texture> <bordersize>20</bordersize> @@ -875,7 +522,7 @@ <control type="image"> <top>43</top> <left>38</left> - <width>260</width> + <width>245</width> <height>200</height> <texture fallback="DefaultTVShows.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> @@ -883,7 +530,7 @@ <control type="label"> <left>42</left> <top>247</top> - <width>260</width> + <width>245</width> <height>70</height> <label>$PARAM[label]</label> <font>font12</font> @@ -895,7 +542,7 @@ <control type="label"> <left>42</left> <top>277</top> - <width>260</width> + <width>245</width> <height>65</height> <label>$PARAM[label2]</label> <font>font12</font> @@ -918,16 +565,15 @@ </definition> </include> <include name="WeatherWidget"> - <param name="left">442</param> + <param name="width">266</param> <definition> <include content="CategoryLabel"> <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> - <param name="left" value="$PARAM[left]"/> <param name="visible" value="$PARAM[visible]"/> </include> <control type="panel" id="$PARAM[list_id]"> - <left>$PARAM[left]</left> + <left>0</left> <top>100</top> <right>0</right> <height>480</height> @@ -935,7 +581,7 @@ <param name="list_id" value="$PARAM[list_id]"/> </include> <visible>$PARAM[visible]</visible> - <itemlayout width="263" height="400"> + <itemlayout width="$PARAM[width]" height="400"> <control type="group"> <left>70</left> <control type="image"> @@ -979,7 +625,7 @@ </control> </control> </itemlayout> - <focusedlayout width="263" height="400"> + <focusedlayout width="$PARAM[width]" height="400"> <control type="group"> <left>70</left> <depth>DepthContentPopout</depth> diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml index 6109b33448..c17b2353c9 100644 --- a/addons/skin.estuary/xml/Includes_MediaMenu.xml +++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml @@ -8,10 +8,9 @@ <radioposx>370</radioposx> <textwidth>320</textwidth> <aligny>center</aligny> - <textcolor>white</textcolor> <invalidcolor>invalid</invalidcolor> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus> <alttexturenofocus></alttexturenofocus> </include> @@ -25,7 +24,7 @@ <aligny>center</aligny> <font></font> <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>26</radioposx> <radioposy>0</radioposy> <radiowidth>40</radiowidth> @@ -373,8 +372,8 @@ <width>50</width> <left>-50</left> <top>0</top> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> </control> </include> </includes> diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml index 8efbbd2432..ecaacd6633 100644 --- a/addons/skin.estuary/xml/Includes_PVR.xml +++ b/addons/skin.estuary/xml/Includes_PVR.xml @@ -106,7 +106,6 @@ <top>120</top> <width>540</width> <height>262</height> - <textcolor>white</textcolor> <font>font45</font> <label>$INFO[ListItem.ChannelName]</label> </control> diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml index 9bb3e67a58..73dee702a8 100644 --- a/addons/skin.estuary/xml/MusicOSD.xml +++ b/addons/skin.estuary/xml/MusicOSD.xml @@ -9,8 +9,8 @@ <top>0</top> <width>100%</width> <bottom>180</bottom> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="group" id="200"> @@ -56,7 +56,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> <selected>Player.Paused</selected> @@ -107,7 +107,7 @@ <label></label> <font></font> <texturefocus colordiffuse="button_focus">osd/fullscreen/buttons/button-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <onleft>620</onleft> <onright>607</onright> <onup>87</onup> @@ -137,7 +137,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> <selected>Playlist.IsRandom</selected> diff --git a/addons/skin.estuary/xml/MusicVisualisation.xml b/addons/skin.estuary/xml/MusicVisualisation.xml index cadfacfbab..942a3e4826 100644 --- a/addons/skin.estuary/xml/MusicVisualisation.xml +++ b/addons/skin.estuary/xml/MusicVisualisation.xml @@ -54,7 +54,6 @@ <label>$INFO[MusicPlayer.Artist]</label> <font>font60</font> <shadowcolor>black</shadowcolor> - <textcolor>white</textcolor> <scroll>true</scroll> </control> <control type="label"> @@ -64,7 +63,6 @@ <label>$INFO[MusicPlayer.Album]$INFO[MusicPlayer.Year,[COLOR button_focus] [,][/COLOR]]</label> <font>font37</font> <shadowcolor>black</shadowcolor> - <textcolor>white</textcolor> <scroll>true</scroll> </control> <control type="label"> diff --git a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml index 365a87feb4..c7c6bcf6df 100644 --- a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml @@ -76,7 +76,7 @@ <bottom>80</bottom> <onleft>50</onleft> <onright>100</onright> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <animation effect="zoom" end="50,100" time="300" tween="sine" center="0,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> <orientation>vertical</orientation> </control> diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml index 0bea213b8a..f14beca053 100644 --- a/addons/skin.estuary/xml/MyPVRChannels.xml +++ b/addons/skin.estuary/xml/MyPVRChannels.xml @@ -27,135 +27,129 @@ <preloaditems>1</preloaditems> <pagecontrol>60</pagecontrol> <focusedlayout height="90" width="tvchannelslist_width"> - <control type="group"> - <width>tvchannelslist_width</width> - <control type="image"> - <left>0</left> - <top>0</top> - <right>0</right> - <height>90</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.hasFocus(50)</visible> - </control> - <control type="image"> - <right>20</right> - <top>10</top> - <width>80</width> - <height>70</height> - <aspectratio align="right">keep</aspectratio> - <texture>$INFO[listitem.icon]</texture> - </control> - <control type="progress"> - <left>105</left> - <top>58</top> - <width>50</width> - <height>12</height> - <midtexture border="3">progress/texturebg_white.png</midtexture> - <visible>ListItem.HasEpg</visible> - <info>ListItem.Progress</info> - </control> - <control type="image"> - <right>110</right> - <top>25</top> - <width>40</width> - <height>40</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> - <control type="label"> - <left>105</left> - <top>8</top> - <height>90</height> - <right>120</right> - <aligny>top</aligny> - <font>font14</font> - <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>165</left> - <top>46</top> - <height>90</height> - <right>120</right> - <aligny>top</aligny> - <font>font12</font> - <label>$INFO[ListItem.Title]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>12</left> - <top>0</top> - <height>90</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font32_title</font> - <label>$INFO[ListItem.ChannelNumberLabel]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> + <control type="image"> + <left>0</left> + <top>0</top> + <right>0</right> + <height>90</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.hasFocus(50)</visible> + </control> + <control type="image"> + <right>20</right> + <top>10</top> + <width>80</width> + <height>70</height> + <aspectratio align="right">keep</aspectratio> + <texture>$INFO[listitem.icon]</texture> + </control> + <control type="progress"> + <left>105</left> + <top>58</top> + <width>50</width> + <height>12</height> + <midtexture border="3">progress/texturebg_white.png</midtexture> + <visible>ListItem.HasEpg</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <right>110</right> + <top>25</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>8</top> + <height>90</height> + <right>120</right> + <aligny>top</aligny> + <font>font14</font> + <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>165</left> + <top>46</top> + <height>90</height> + <right>120</right> + <aligny>top</aligny> + <font>font12</font> + <label>$INFO[ListItem.Title]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>90</height> + <width>75</width> + <align>center</align> + <aligny>center</aligny> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> <itemlayout height="90" width="tvchannelslist_width"> - <control type="group"> - <width>tvchannelslist_width</width> - <control type="image"> - <right>20</right> - <top>10</top> - <width>80</width> - <height>70</height> - <aspectratio align="right">keep</aspectratio> - <texture>$INFO[listitem.icon]</texture> - </control> - <control type="progress"> - <left>105</left> - <top>58</top> - <width>50</width> - <height>12</height> - <colordiffuse>88FFFFFF</colordiffuse> - <visible>ListItem.HasEpg</visible> - <info>ListItem.Progress</info> - </control> - <control type="image"> - <right>110</right> - <top>25</top> - <width>40</width> - <height>40</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> - <control type="label"> - <left>105</left> - <top>8</top> - <height>90</height> - <right>120</right> - <aligny>top</aligny> - <font>font14</font> - <label>$INFO[ListItem.Label]</label> - <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>165</left> - <top>46</top> - <height>90</height> - <right>120</right> - <aligny>top</aligny> - <font>font12</font> - <label>$INFO[ListItem.Title]</label> - <shadowcolor>text_shadow</shadowcolor> - <textcolor>grey</textcolor> - </control> - <control type="label"> - <left>12</left> - <top>0</top> - <height>90</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font32_title</font> - <label>$INFO[ListItem.ChannelNumberLabel]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <control type="image"> + <right>20</right> + <top>10</top> + <width>80</width> + <height>70</height> + <aspectratio align="right">keep</aspectratio> + <texture>$INFO[listitem.icon]</texture> + </control> + <control type="progress"> + <left>105</left> + <top>58</top> + <width>50</width> + <height>12</height> + <colordiffuse>88FFFFFF</colordiffuse> + <visible>ListItem.HasEpg</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <right>110</right> + <top>25</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>8</top> + <height>90</height> + <right>120</right> + <aligny>top</aligny> + <font>font14</font> + <label>$INFO[ListItem.Label]</label> + <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>165</left> + <top>46</top> + <height>90</height> + <right>120</right> + <aligny>top</aligny> + <font>font12</font> + <label>$INFO[ListItem.Title]</label> + <shadowcolor>text_shadow</shadowcolor> + <textcolor>grey</textcolor> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>90</height> + <width>75</width> + <align>center</align> + <aligny>center</aligny> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> </control> @@ -176,114 +170,108 @@ <preloaditems>1</preloaditems> <pagecontrol>60</pagecontrol> <focusedlayout height="70" width="tvchannelslist_width"> - <control type="group"> - <width>tvchannelslist_width</width> - <control type="image"> - <left>0</left> - <top>0</top> - <right>0</right> - <height>70</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.hasFocus(51)</visible> - </control> - <control type="progress"> - <right>10</right> - <top>25</top> - <width>50</width> - <height>12</height> - <colordiffuse>88FFFFFF</colordiffuse> - <midtexture border="3">progress/texturebg_white.png</midtexture> - <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> - <info>ListItem.Progress</info> - </control> - <control type="image"> - <right>15</right> - <top>9</top> - <width>40</width> - <height>40</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> - <control type="label"> - <left>105</left> - <top>0</top> - <height>70</height> - <right>90</right> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="label"> - <left>320</left> - <top>0</top> - <height>70</height> - <right>90</right> - <aligny>center</aligny> - <align>right</align> - <label>$INFO[ListItem.Title]</label> - </control> - <control type="label"> - <left>12</left> - <top>0</top> - <height>70</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font32_title</font> - <label>$INFO[ListItem.ChannelNumberLabel]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> + <control type="image"> + <left>0</left> + <top>0</top> + <right>0</right> + <height>70</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.hasFocus(51)</visible> + </control> + <control type="progress"> + <right>10</right> + <top>25</top> + <width>50</width> + <height>12</height> + <colordiffuse>88FFFFFF</colordiffuse> + <midtexture border="3">progress/texturebg_white.png</midtexture> + <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <right>15</right> + <top>9</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <height>70</height> + <right>90</right> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="label"> + <left>320</left> + <top>0</top> + <height>70</height> + <right>90</right> + <aligny>center</aligny> + <align>right</align> + <label>$INFO[ListItem.Title]</label> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>70</height> + <width>75</width> + <align>center</align> + <aligny>center</aligny> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> <itemlayout height="70" width="tvchannelslist_width"> - <control type="group"> - <width>tvchannelslist_width</width> - <control type="progress"> - <right>10</right> - <top>25</top> - <width>50</width> - <height>12</height> - <colordiffuse>88FFFFFF</colordiffuse> - <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> - <info>ListItem.Progress</info> - </control> - <control type="image"> - <right>15</right> - <top>9</top> - <width>40</width> - <height>40</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> - <control type="label"> - <left>105</left> - <top>0</top> - <height>70</height> - <right>90</right> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>320</left> - <top>0</top> - <height>70</height> - <right>90</right> - <aligny>center</aligny> - <align>right</align> - <label>$INFO[ListItem.Title]</label> - <shadowcolor>text_shadow</shadowcolor> - <textcolor>grey</textcolor> - </control> - <control type="label"> - <left>12</left> - <top>0</top> - <height>70</height> - <width>70</width> - <align>center</align> - <aligny>center</aligny> - <font>font32_title</font> - <label>$INFO[ListItem.ChannelNumberLabel]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <control type="progress"> + <right>10</right> + <top>25</top> + <width>50</width> + <height>12</height> + <colordiffuse>88FFFFFF</colordiffuse> + <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <right>15</right> + <top>9</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <height>70</height> + <right>90</right> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>320</left> + <top>0</top> + <height>70</height> + <right>90</right> + <aligny>center</aligny> + <align>right</align> + <label>$INFO[ListItem.Title]</label> + <shadowcolor>text_shadow</shadowcolor> + <textcolor>grey</textcolor> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>70</height> + <width>75</width> + <align>center</align> + <aligny>center</aligny> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> </control> @@ -339,7 +327,6 @@ <top>-80</top> <width>540</width> <height>262</height> - <textcolor>white</textcolor> <font>font45</font> <label>$INFO[ListItem.ChannelName]</label> </control> diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml index 1034ac295e..174f9a5231 100644 --- a/addons/skin.estuary/xml/MyPVRGuide.xml +++ b/addons/skin.estuary/xml/MyPVRGuide.xml @@ -52,15 +52,15 @@ <control type="label"> <left>2</left> <top>-2</top> - <width>70</width> + <width>75</width> <height>60</height> - <font>font36_title</font> - <label>$INFO[ListItem.ChannelNumber]</label> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> <align>center</align> <aligny>center</aligny> </control> <control type="label" id="1"> - <left>65</left> + <left>68</left> <top>-2</top> <width>350</width> <height>60</height> @@ -74,16 +74,16 @@ <control type="label"> <left>2</left> <top>-2</top> - <width>70</width> + <width>75</width> <height>60</height> - <font>font36_title</font> - <label>$INFO[ListItem.ChannelNumber]</label> + <font>font32_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> <textcolor>button_focus</textcolor> <align>center</align> <aligny>center</aligny> </control> <control type="label" id="1"> - <left>65</left> + <left>68</left> <top>-2</top> <width>350</width> <height>60</height> @@ -208,6 +208,7 @@ </control> <include content="TopBar"> <param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRGuideVar]" /> + <param name="sublabel" value="" /> </include> <include content="BottomBar"> <param name="info_visible" value="true" /> diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml index 5ad74f039c..0fb40f6560 100644 --- a/addons/skin.estuary/xml/MyPVRRecordings.xml +++ b/addons/skin.estuary/xml/MyPVRRecordings.xml @@ -23,9 +23,7 @@ <focusposition>5</focusposition> <pagecontrol>73</pagecontrol> <scrolltime>200</scrolltime> - <focusedlayout height="80"> - <control type="group"> - <width>tvrecordings_width</width> + <focusedlayout height="80" width="tvrecordings_width"> <control type="image"> <left>0</left> <top>0</top> @@ -59,13 +57,9 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> - <textcolor>white</textcolor> </control> - </control> </focusedlayout> - <itemlayout height="80"> - <control type="group"> - <width>tvrecordings_width</width> + <itemlayout height="80" width="tvrecordings_width"> <control type="image"> <left>21</left> <top>30</top> @@ -92,7 +86,6 @@ <textcolor>grey</textcolor> <shadowcolor>text_shadow</shadowcolor> </control> - </control> </itemlayout> </control> </control> @@ -108,14 +101,14 @@ <param name="flipx" value="true" /> </include> <control type="scrollbar" id="73"> - <left>-30</left> + <left>-40</left> <top>0</top> <width>12</width> <height>100%</height> <onleft>50</onleft> <onright>50</onright> <orientation>vertical</orientation> - <animation effect="zoom" start="100,100" end="50,100" center="-50,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation> + <animation effect="zoom" start="100,100" end="50,100" center="-40,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation> </control> <control type="group"> <visible>!ListItem.IsFolder</visible> diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml index 6849d7a88c..cdd3563479 100644 --- a/addons/skin.estuary/xml/MyPVRSearch.xml +++ b/addons/skin.estuary/xml/MyPVRSearch.xml @@ -25,113 +25,107 @@ <focusposition>3</focusposition> <pagecontrol>77</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="100"> + <itemlayout height="100" width="tvchannelslist_width"> + <control type="label"> + <visible>String.IsEmpty(ListItem.Date)</visible> + <left>120</left> + <top>0</top> + <right>30</right> + <height>100</height> + <font>font36_title</font> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + </control> <control type="group"> - <width>tvchannelslist_width</width> + <visible>!String.IsEmpty(ListItem.Date)</visible> + <control type="image"> + <left>25</left> + <top>10</top> + <width>80</width> + <height>80</height> + <texture fallback="DefaultTVShows.png">$INFO[Listitem.ActualIcon]</texture> + <aspectratio>keep</aspectratio> + <visible>!String.IsEmpty(ListItem.ActualIcon)</visible> + </control> <control type="label"> - <visible>String.IsEmpty(ListItem.Date)</visible> <left>120</left> - <top>0</top> + <top>10</top> <right>30</right> <height>100</height> - <font>font36_title</font> + <aligny>top</aligny> + <label>$INFO[ListItem.ChannelName][COLOR grey]$INFO[ListItem.Label, - ][/COLOR]</label> + </control> + <control type="label"> + <left>120</left> + <top>20</top> + <width>350</width> + <height>100</height> + <font>font12</font> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>$INFO[ListItem.Date]</label> </control> - <control type="group"> - <visible>!String.IsEmpty(ListItem.Date)</visible> - <control type="image"> - <left>25</left> - <top>10</top> - <width>80</width> - <height>80</height> - <texture fallback="DefaultTVShows.png">$INFO[Listitem.ActualIcon]</texture> - <aspectratio>keep</aspectratio> - <visible>!String.IsEmpty(ListItem.ActualIcon)</visible> - </control> - <control type="label"> - <left>120</left> - <top>10</top> - <right>30</right> - <height>100</height> - <aligny>top</aligny> - <label>$INFO[ListItem.ChannelName][COLOR grey]$INFO[ListItem.Label, - ][/COLOR]</label> - </control> - <control type="label"> - <left>120</left> - <top>20</top> - <width>350</width> - <height>100</height> - <font>font12</font> - <aligny>center</aligny> - <label>$INFO[ListItem.Date]</label> - </control> - <control type="image"> - <left>980</left> - <top>50</top> - <width>50</width> - <height>50</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> + <control type="image"> + <left>980</left> + <top>50</top> + <width>50</width> + <height>50</height> + <texture>$VAR[PVRStatusImageVar]</texture> </control> </control> </itemlayout> - <focusedlayout height="100"> + <focusedlayout height="100" width="tvchannelslist_width"> + <control type="image"> + <left>0</left> + <top>0</top> + <right>0</right> + <height>101</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus(50)</visible> + </control> + <control type="label"> + <visible>String.IsEmpty(ListItem.Date)</visible> + <left>120</left> + <top>0</top> + <right>30</right> + <height>100</height> + <font>font36_title</font> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + </control> <control type="group"> - <width>tvchannelslist_width</width> + <visible>!String.IsEmpty(ListItem.Date)</visible> <control type="image"> - <left>0</left> - <top>0</top> - <right>0</right> - <height>101</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus(50)</visible> + <left>25</left> + <top>10</top> + <width>80</width> + <height>80</height> + <texture fallback="DefaultTVShows.png">$INFO[Listitem.ActualIcon]</texture> + <aspectratio>keep</aspectratio> + <visible>!String.IsEmpty(ListItem.ActualIcon)</visible> + </control> + <control type="label"> + <left>120</left> + <top>10</top> + <right>30</right> + <height>100</height> + <aligny>top</aligny> + <label>$INFO[ListItem.ChannelName]$INFO[ListItem.Label, - ]</label> </control> <control type="label"> - <visible>String.IsEmpty(ListItem.Date)</visible> <left>120</left> - <top>0</top> - <right>30</right> + <top>20</top> + <width>350</width> <height>100</height> - <font>font36_title</font> + <font>font12</font> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>$INFO[ListItem.Date]</label> </control> - <control type="group"> - <visible>!String.IsEmpty(ListItem.Date)</visible> - <control type="image"> - <left>25</left> - <top>10</top> - <width>80</width> - <height>80</height> - <texture fallback="DefaultTVShows.png">$INFO[Listitem.ActualIcon]</texture> - <aspectratio>keep</aspectratio> - <visible>!String.IsEmpty(ListItem.ActualIcon)</visible> - </control> - <control type="label"> - <left>120</left> - <top>10</top> - <right>30</right> - <height>100</height> - <aligny>top</aligny> - <label>$INFO[ListItem.ChannelName]$INFO[ListItem.Label, - ]</label> - </control> - <control type="label"> - <left>120</left> - <top>20</top> - <width>350</width> - <height>100</height> - <font>font12</font> - <aligny>center</aligny> - <label>$INFO[ListItem.Date]</label> - </control> - <control type="image"> - <left>980</left> - <top>50</top> - <width>50</width> - <height>50</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> + <control type="image"> + <left>980</left> + <top>50</top> + <width>50</width> + <height>50</height> + <texture>$VAR[PVRStatusImageVar]</texture> </control> </control> </focusedlayout> diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml index f6785a27b2..a76f35f8ea 100644 --- a/addons/skin.estuary/xml/MyPVRTimers.xml +++ b/addons/skin.estuary/xml/MyPVRTimers.xml @@ -18,125 +18,119 @@ <ondown>50</ondown> <onleft>9000</onleft> <onright>73</onright> - <movement>4</movement> - <focusposition>5</focusposition> + <movement>3</movement> + <focusposition>4</focusposition> <pagecontrol>73</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="100"> + <itemlayout height="100" width="tvrecordings_width"> + <control type="label"> + <left>30</left> + <top>0</top> + <width>500</width> + <height>100</height> + <font>font36_title</font> + <aligny>center</aligny> + <visible>String.IsEmpty(ListItem.Date)</visible> + <label>$INFO[ListItem.Label]</label> + </control> <control type="group"> - <width>tvrecordings_width</width> + <visible>!String.IsEmpty(ListItem.Date)</visible> <control type="label"> <left>30</left> - <top>0</top> - <width>500</width> - <height>100</height> - <font>font36_title</font> - <aligny>center</aligny> - <visible>String.IsEmpty(ListItem.Date)</visible> - <label>$INFO[ListItem.Label]</label> + <top>10</top> + <right>30</right> + <height>30</height> + <aligny>top</aligny> + <label>$INFO[ListItem.ChannelName][COLOR grey]$INFO[ListItem.Label, - ][/COLOR]</label> + </control> + <control type="label"> + <left>30</left> + <top>53</top> + <width>680</width> + <height>30</height> + <font>font12</font> + <aligny>top</aligny> + <label>$VAR[TimersSubLabel]</label> + </control> + <control type="label"> + <right>20</right> + <top>13</top> + <width>900</width> + <height>70</height> + <font>font12</font> + <align>right</align> + <aligny>top</aligny> + <label>$INFO[ListItem.Comment]</label> </control> - <control type="group"> - <visible>!String.IsEmpty(ListItem.Date)</visible> - <control type="label"> - <left>30</left> - <top>10</top> - <right>30</right> - <height>30</height> - <aligny>top</aligny> - <label>$INFO[ListItem.ChannelName][COLOR grey]$INFO[ListItem.Label, - ][/COLOR]</label> - </control> - <control type="label"> - <left>30</left> - <top>53</top> - <width>680</width> - <height>30</height> - <font>font12</font> - <aligny>top</aligny> - <label>$INFO[ListItem.Timertype]</label> - </control> - <control type="label"> - <right>20</right> - <top>13</top> - <width>900</width> - <height>70</height> - <font>font12</font> - <align>right</align> - <aligny>top</aligny> - <label>$INFO[ListItem.Comment]</label> - </control> - <control type="label"> - <right>20</right> - <top>53</top> - <width>900</width> - <height>75</height> - <font>font12</font> - <align>right</align> - <aligny>top</aligny> - <label>$INFO[ListItem.Date]</label> - </control> + <control type="label"> + <right>20</right> + <top>53</top> + <width>900</width> + <height>75</height> + <font>font12</font> + <align>right</align> + <aligny>top</aligny> + <label>$INFO[ListItem.Date]</label> </control> </control> </itemlayout> - <focusedlayout height="100"> + <focusedlayout height="100" width="tvrecordings_width"> + <control type="image"> + <left>0</left> + <top>0</top> + <right>0</right> + <height>101</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus(50)</visible> + </control> + <control type="label"> + <left>30</left> + <top>0</top> + <width>250</width> + <height>100</height> + <font>font36_title</font> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <visible>String.IsEmpty(ListItem.Date)</visible> + </control> <control type="group"> - <width>tvrecordings_width</width> - <control type="image"> - <left>0</left> - <top>0</top> - <right>0</right> - <height>101</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus(50)</visible> + <visible>!String.IsEmpty(ListItem.Date)</visible> + <control type="label"> + <left>30</left> + <top>10</top> + <right>30</right> + <height>100</height> + <aligny>top</aligny> + <label>$INFO[ListItem.ChannelName]$INFO[ListItem.Label, - ]</label> </control> <control type="label"> <left>30</left> - <top>0</top> - <width>250</width> + <top>53</top> + <width>680</width> <height>100</height> - <font>font36_title</font> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - <visible>String.IsEmpty(ListItem.Date)</visible> + <font>font12</font> + <aligny>top</aligny> + <label>$VAR[TimersSubLabel]</label> + </control> + <control type="label"> + <right>20</right> + <top>13</top> + <width>900</width> + <height>70</height> + <font>font12</font> + <align>right</align> + <aligny>top</aligny> + <label>$INFO[ListItem.Comment]</label> </control> - <control type="group"> - <visible>!String.IsEmpty(ListItem.Date)</visible> - <control type="label"> - <left>30</left> - <top>10</top> - <right>30</right> - <height>100</height> - <aligny>top</aligny> - <label>$INFO[ListItem.ChannelName]$INFO[ListItem.Label, - ]</label> - </control> - <control type="label"> - <left>30</left> - <top>53</top> - <width>680</width> - <height>100</height> - <font>font12</font> - <aligny>top</aligny> - <label>$INFO[ListItem.Timertype]</label> - </control> - <control type="label"> - <right>20</right> - <top>13</top> - <width>900</width> - <height>70</height> - <font>font12</font> - <align>right</align> - <aligny>top</aligny> - <label>$INFO[ListItem.Comment]</label> - </control> - <control type="label"> - <right>20</right> - <top>53</top> - <width>900</width> - <height>75</height> - <font>font12</font> - <align>right</align> - <aligny>top</aligny> - <label>$INFO[ListItem.Date]</label> - </control> + <control type="label"> + <right>20</right> + <top>53</top> + <width>900</width> + <height>75</height> + <font>font12</font> + <align>right</align> + <aligny>top</aligny> + <label>$INFO[ListItem.Date]</label> </control> </control> </focusedlayout> diff --git a/addons/skin.estuary/xml/MyPics.xml b/addons/skin.estuary/xml/MyPics.xml index 00bacbd9b0..f5edb426d6 100644 --- a/addons/skin.estuary/xml/MyPics.xml +++ b/addons/skin.estuary/xml/MyPics.xml @@ -21,15 +21,15 @@ <control type="group"> <include>OpenClose_Left</include> <visible>Control.Isvisible(54)</visible> - <include>Visible_Right</include> + <include>Visible_Left</include> <visible>Container.Content(images)</visible> <include content="ContentPanel"> - <param name="width" value="590" /> + <param name="width" value="656" /> </include> <control type="textbox"> <left>40</left> <top>360</top> - <width>429</width> + <width>529</width> <height>413</height> <align>center</align> <aligny>center</aligny> @@ -41,7 +41,7 @@ <control type="grouplist"> <left>20</left> <top>152</top> - <width>480</width> + <width>570</width> <height>760</height> <orientation>vertical</orientation> <include content="PicsInfoLine"> diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml index f78d9b7d23..fd8b3ac1f6 100644 --- a/addons/skin.estuary/xml/MyPlaylist.xml +++ b/addons/skin.estuary/xml/MyPlaylist.xml @@ -25,61 +25,54 @@ <pagecontrol>60</pagecontrol> <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> - <focusedlayout height="80" width="924"> - <control type="group"> - <width>playlistlist_width</width> - <control type="image"> - <left>0</left> - <right>0</right> - <height>80</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus(50)</visible> - </control> - <control type="label"> - <left>30</left> - <height>80</height> - <right>30</right> - <aligny>center</aligny> - <font>font12</font> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>30</left> - <height>80</height> - <right>30</right> - <align>right</align> - <aligny>center</aligny> - <font>font12</font> - <label>$VAR[PlaylistLabel2Var]</label> - <textcolor>white</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <focusedlayout height="80" width="playlistlist_width"> + <control type="image"> + <left>0</left> + <right>0</right> + <height>80</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus(50)</visible> + </control> + <control type="label"> + <left>30</left> + <height>80</height> + <right>30</right> + <aligny>center</aligny> + <font>font12</font> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>30</left> + <height>80</height> + <right>30</right> + <align>right</align> + <aligny>center</aligny> + <font>font12</font> + <label>$VAR[PlaylistLabel2Var]</label> + <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="80" width="924"> - <control type="group"> - <width>playlistlist_width</width> - <control type="label"> - <left>30</left> - <height>80</height> - <right>30</right> - <aligny>center</aligny> - <font>font12</font> - <label>$INFO[ListItem.TVShowtitle,,: ]$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>30</left> - <height>80</height> - <right>30</right> - <align>right</align> - <aligny>center</aligny> - <font>font12</font> - <label>$VAR[PlaylistLabel2Var]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <itemlayout height="80" width="playlistlist_width"> + <control type="label"> + <left>30</left> + <height>80</height> + <right>30</right> + <aligny>center</aligny> + <font>font12</font> + <label>$INFO[ListItem.TVShowtitle,,: ]$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>30</left> + <height>80</height> + <right>30</right> + <align>right</align> + <aligny>center</aligny> + <font>font12</font> + <label>$VAR[PlaylistLabel2Var]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> </control> @@ -97,11 +90,19 @@ <ondown>700</ondown> <onleft>50</onleft> <onright>50</onright> - <include content="PlaylistWindowButton"> - <param name="control_id" value="20" /> - <param name="label" value="$LOCALIZE[191]$INFO[Playlist.Random, : ]" /> - <param name="width" value="400" /> - </include> + <width>400</width> + <control type="radiobutton" id="20"> + <width>467</width> + <height>110</height> + <align>left</align> + <aligny>top</aligny> + <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> + <texturenofocus /> + <radioposx>300</radioposx> + <textoffsetx>40</textoffsetx> + <textoffsety>35</textoffsety> + <label>$LOCALIZE[191]</label> + </control> <include content="PlaylistWindowButton"> <param name="control_id" value="26" /> <param name="label" value="" /> @@ -134,7 +135,7 @@ <width>12</width> <bottom>80</bottom> <onleft>50</onleft> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <onright>700</onright> <animation effect="zoom" end="50,100" time="300" tween="sine" center="0,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> <orientation>vertical</orientation> diff --git a/addons/skin.estuary/xml/MyWeather.xml b/addons/skin.estuary/xml/MyWeather.xml index f5683cdc6c..3abdb7e774 100644 --- a/addons/skin.estuary/xml/MyWeather.xml +++ b/addons/skin.estuary/xml/MyWeather.xml @@ -67,30 +67,29 @@ </animation> <scrolltime tween="cubic" easing="out">500</scrolltime> <include>OpenClose_Right</include> - <itemgap>-130</itemgap> + <itemgap>-160</itemgap> <control type="group" id="567"> <description>Weather info</description> - <height>380</height> + <height>410</height> + <left>22</left> <control type="image"> <left>2.5%</left> <top>100</top> <width>95%</width> <height>220</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> + <texture border="21">dialogs/dialog-bg.png</texture> + </control> + <control type="label"> + <top>310</top> + <left>10%</left> + <width>80%</width> + <align>center</align> + <height>44</height> + <shadowcolor>text_shadow</shadowcolor> + <label>$LOCALIZE[31154]</label> + <visible>Control.HasFocus(20)</visible> + <animation effect="fade" time="400">VisibleChange</animation> </control> - <control type="label"> - <top>310</top> - <left>10%</left> - <width>80%</width> - <align>center</align> - <height>44</height> - <shadowcolor>text_shadow</shadowcolor> - <label>$LOCALIZE[31154]</label> - <visible>Control.HasFocus(20)</visible> - <animation effect="fade" time="400">VisibleChange</animation> - </control> <control type="button" id="20"> <left>2.5%</left> <top>100</top> @@ -101,7 +100,7 @@ <textoffsetx>40</textoffsetx> <textoffsety>0</textoffsety> <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <onup>20000</onup> <ondown>15100</ondown> <font>font12</font> @@ -110,7 +109,7 @@ </control> <control type="label"> <right>100</right> - <top>190</top> + <top>194</top> <aligny>center</aligny> <height>24</height> <width>500</width> @@ -120,14 +119,14 @@ </control> <control type="label"> <right>400</right> - <top>160</top> + <top>164</top> <align>right</align> <label>[I]$LOCALIZE[402]: $INFO[Window(weather).Property(Current.FeelsLike)]$INFO[System.TemperatureUnits][/I][CR]$INFO[Weather.Conditions]</label> <font>font14</font> <width>630</width> </control> <control type="grouplist"> - <top>150</top> + <top>154</top> <left>90</left> <right>800</right> <align>justify</align> @@ -160,18 +159,18 @@ </control> </control> <include content="WeatherWidget"> - <param name="left" value="-20" /> <param name="content_include" value="DailyItems" /> <param name="list_id" value="15100" /> <param name="widget_header" value="$LOCALIZE[31019]"/> <param name="visible" value="!String.IsEmpty(Window(weather).Property(Daily.IsFetched))" /> + <param name="width" value="258" /> </include> <include content="WeatherWidget"> - <param name="left" value="-20" /> <param name="content_include" value="HourlyItems" /> <param name="list_id" value="15200" /> <param name="widget_header" value="$LOCALIZE[33036]"/> <param name="visible" value="!String.IsEmpty(Window(weather).Property(Hourly.IsFetched))" /> + <param name="width" value="258" /> </include> <include content="WeatherMapItem"> <param name="item_id" value="1" /> diff --git a/addons/skin.estuary/xml/PlayerControls.xml b/addons/skin.estuary/xml/PlayerControls.xml index aa3da46905..674cca84a2 100644 --- a/addons/skin.estuary/xml/PlayerControls.xml +++ b/addons/skin.estuary/xml/PlayerControls.xml @@ -9,10 +9,10 @@ <centerleft>50%</centerleft> <width>1115</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1115" /> - <param name="DialogBackgroundHeight" value="380" /> - <param name="DialogHeaderLabel" value="16003" /> - <param name="DialogHeaderId" value="" /> + <param name="width" value="1115" /> + <param name="height" value="380" /> + <param name="header_label" value="16003" /> + <param name="header_id" value="" /> </include> <control type="group"> <left>20</left> @@ -94,7 +94,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> <selected>Player.Paused</selected> @@ -125,8 +125,8 @@ <height>74</height> <label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label> <font></font> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onleft>605</onleft> <onright>607</onright> <onup>1000</onup> @@ -149,13 +149,13 @@ <textureradiooffnofocus>osd/fullscreen/buttons/random-off.png</textureradiooffnofocus> <textureradioondisabled colordiffuse="disabled">osd/fullscreen/buttons/random-on.png</textureradioondisabled> <textureradiooffdisabled colordiffuse="disabled">osd/fullscreen/buttons/random-off.png</textureradiooffdisabled> - <texturefocus></texturefocus> + <texturefocus /> <width>125</width> <height>123</height> <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>0</radioposx> <radioposy>0</radioposy> <label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label> diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml index e7f74cf64c..675f1a8aaf 100644 --- a/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml @@ -41,12 +41,13 @@ <texture colordiffuse="border_alpha">colors/black.png</texture> </control> <control type="image"> - <left>95</left> - <top>10</top> + <centerleft>50%</centerleft> + <top>20</top> <width>240</width> - <height>240</height> + <height>160</height> <texture>$INFO[ListItem.Icon]</texture> <align>center</align> + <aspectratio>scale</aspectratio> </control> <control type="label"> <left>30</left> @@ -88,12 +89,13 @@ <texture colordiffuse="border_alpha">colors/black.png</texture> </control> <control type="image"> - <left>95</left> - <top>10</top> + <centerleft>50%</centerleft> + <top>20</top> <width>240</width> - <height>240</height> + <height>160</height> <texture>$INFO[ListItem.Icon]</texture> <align>center</align> + <aspectratio>scale</aspectratio> </control> <control type="label"> <left>30</left> @@ -109,7 +111,7 @@ <item> <label>$LOCALIZE[14201]</label> <onclick>ActivateWindow(PlayerSettings)</onclick> - <icon>icons/settings/video.png</icon> + <icon>icons/settings/player.png</icon> </item> <item> <label>$LOCALIZE[14212]</label> @@ -129,7 +131,7 @@ <item> <label>$LOCALIZE[14207]</label> <onclick>ActivateWindow(InterfaceSettings)</onclick> - <icon>icons/settings/appearance.png</icon> + <icon>icons/settings/interface.png</icon> </item> <item> <label>$LOCALIZE[20077]</label> @@ -147,6 +149,12 @@ <icon>icons/settings/system.png</icon> </item> <item> + <label>LibreELEC</label> + <onclick>RunAddon(service.libreelec.settings)</onclick> + <icon>icons/settings/libreelec.png</icon> + <visible>System.HasAddon(service.libreelec.settings)</visible> + </item> + <item> <label>$LOCALIZE[138]</label> <onclick>ActivateWindow(systeminfo)</onclick> <icon>icons/settings/sysinfo.png</icon> @@ -161,11 +169,11 @@ <onclick>ActivateWindow(filemanager)</onclick> <icon>icons/settings/filemanager.png</icon> </item> - <!-- <item> - <label>$LOCALIZE[24001]</label> - <onclick>ActivateWindow(addonbrowser)</onclick> - <icon>icons/settings/addons.png</icon> - </item> --> + <!-- <item> + <label>$LOCALIZE[24001]</label> + <onclick>ActivateWindow(addonbrowser)</onclick> + <icon>icons/settings/addons.png</icon> + </item> --> </content> </control> <include content="TopBar"> diff --git a/addons/skin.estuary/xml/SettingsCategory.xml b/addons/skin.estuary/xml/SettingsCategory.xml index eecf0ba1d1..a2af3a5798 100644 --- a/addons/skin.estuary/xml/SettingsCategory.xml +++ b/addons/skin.estuary/xml/SettingsCategory.xml @@ -106,9 +106,8 @@ <textoffsetx>40</textoffsetx> <aligny>center</aligny> <font>font37</font> - <textcolor>white</textcolor> <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> </control> <control type="radiobutton" id="20"> <width>400</width> @@ -120,7 +119,7 @@ <textoffsetx>100</textoffsetx> <textoffsety>0</textoffsety> <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>40</radioposx> <radioposy>0</radioposy> <radiowidth>40</radiowidth> @@ -141,11 +140,10 @@ <width>12</width> <bottom>137</bottom> <orientation>vertical</orientation> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> <onleft>5</onleft> <onright>5</onright> - <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> diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml index 9dd9551c0e..1d038082e0 100644 --- a/addons/skin.estuary/xml/SettingsProfile.xml +++ b/addons/skin.estuary/xml/SettingsProfile.xml @@ -200,7 +200,6 @@ <label>$INFO[ListItem.Label]</label> <font>font37</font> <aligny>center</aligny> - <textcolor>white</textcolor> </control> </itemlayout> <focusedlayout height="90" width="470"> diff --git a/addons/skin.estuary/xml/SettingsSystemInfo.xml b/addons/skin.estuary/xml/SettingsSystemInfo.xml index 778ffa8e68..6ace4b98f5 100644 --- a/addons/skin.estuary/xml/SettingsSystemInfo.xml +++ b/addons/skin.estuary/xml/SettingsSystemInfo.xml @@ -94,12 +94,11 @@ <width>12</width> <bottom>312</bottom> <orientation>vertical</orientation> - <texturesliderbackground></texturesliderbackground> + <texturesliderbackground /> <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> <onleft>9000</onleft> <onright>9000</onright> <visible>Control.IsVisible(30)</visible> - <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> diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml index 7d76a57cb6..e79bf8430c 100644 --- a/addons/skin.estuary/xml/SkinSettings.xml +++ b/addons/skin.estuary/xml/SkinSettings.xml @@ -49,6 +49,12 @@ <selected>Skin.HasSetting(touchmode)</selected> </control> <control type="radiobutton" id="704"> + <label>$LOCALIZE[31093]</label> + <include>DefaultSettingButton</include> + <onclick>Skin.ToggleSetting(show_weatherinfo)</onclick> + <selected>Skin.HasSetting(show_weatherinfo)</selected> + </control> + <control type="radiobutton" id="705"> <label>$LOCALIZE[31160]</label> <include>DefaultSettingButton</include> <onclick>Skin.ToggleSetting(hide_mediaflags)</onclick> @@ -247,7 +253,6 @@ <label>$INFO[ListItem.Label]</label> <font>font37</font> <aligny>center</aligny> - <textcolor>white</textcolor> </control> </itemlayout> <focusedlayout height="90" width="470"> diff --git a/addons/skin.estuary/xml/SmartPlaylistEditor.xml b/addons/skin.estuary/xml/SmartPlaylistEditor.xml index 4ec1e75cfe..2be5a43200 100644 --- a/addons/skin.estuary/xml/SmartPlaylistEditor.xml +++ b/addons/skin.estuary/xml/SmartPlaylistEditor.xml @@ -8,10 +8,10 @@ <centerleft>50%</centerleft> <width>1700</width> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="1700" /> - <param name="DialogBackgroundHeight" value="790" /> - <param name="DialogHeaderLabel" value="" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="1700" /> + <param name="height" value="790" /> + <param name="header_label" value="" /> + <param name="header_id" value="2" /> </include> <control type="grouplist" id="500"> <orientation>vertical</orientation> @@ -104,6 +104,7 @@ <orientation>vertical</orientation> <left>1380</left> <width>1300</width> + <itemgap>dialogbuttons_itemgap</itemgap> <top>100</top> <onleft>10</onleft> <onright>500</onright> diff --git a/addons/skin.estuary/xml/SmartPlaylistRule.xml b/addons/skin.estuary/xml/SmartPlaylistRule.xml index 284abcc428..e5acd008a2 100644 --- a/addons/skin.estuary/xml/SmartPlaylistRule.xml +++ b/addons/skin.estuary/xml/SmartPlaylistRule.xml @@ -8,10 +8,10 @@ <width>960</width> <top>330</top> <include content="DialogBackgroundCommons"> - <param name="DialogBackgroundWidth" value="960" /> - <param name="DialogBackgroundHeight" value="500" /> - <param name="DialogHeaderLabel" value="$LOCALIZE[21421]" /> - <param name="DialogHeaderId" value="2" /> + <param name="width" value="960" /> + <param name="height" value="500" /> + <param name="header_label" value="$LOCALIZE[21421]" /> + <param name="header_id" value="2" /> </include> <control type="label"> <description>Rule match label</description> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index e6b460ce29..600fef7f78 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -26,10 +26,6 @@ <value condition="Integer.IsGreater(Container(8000).NumItems,0)">1</value> <value>[COLOR grey]0[/COLOR]</value> </variable> - <variable name="ActorLabel2"> - <value condition="!String.isempty(ListItem.Appearances)">$LOCALIZE[38026]: $INFO[ListItem.Appearances]</value> - <value>$INFO[ListItem.Label2]</value> - </variable> <variable name="MusicInfoTextboxVar"> <value condition="String.IsEqual(ListItem.DbType,song)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value> <value condition="String.IsEqual(ListItem.DbType,album)">$INFO[ListItem.Property(Album_Description),[COLOR=white],[/COLOR]]</value> @@ -72,7 +68,9 @@ <value>$INFO[ListItem.Icon]</value> </variable> <variable name="ListLabel2Var"> + <value condition="String.IsEmpty(Container.PluginName) + Container.Content(tvshows) + String.IsEqual(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> <value condition="String.IsEqual(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Year]</value> + <value condition="!String.isempty(ListItem.Appearances)">$LOCALIZE[38026]: $INFO[ListItem.Appearances]</value> <value>$INFO[ListItem.Label2]</value> </variable> <variable name="ShiftLeftTextBoxVar"> @@ -89,12 +87,12 @@ <value>$INFO[ListItem.Plot]</value> </variable> <variable name="SelectLabel"> - <value condition="Control.IsVisible(3)">[COLOR=button_focus]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR]</value> - <value>[COLOR=button_focus]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR]</value> + <value condition="Control.IsVisible(3)">[COLOR=button_focus]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR]</value> + <value>[COLOR=button_focus]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR]</value> </variable> <variable name="FileBrowserSelectLabel"> - <value condition="Control.IsVisible(450)">[COLOR=button_focus]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR]</value> - <value>[COLOR=button_focus]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR]</value> + <value condition="Control.IsVisible(450)">[COLOR=button_focus]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR]</value> + <value>[COLOR=button_focus]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR]</value> </variable> <variable name="BannerArtVar"> <value condition="ListItem.IsParentFolder">DefaultBackBanner.png</value> @@ -219,8 +217,8 @@ </variable> <variable name="VolumeIconVar"> <value condition="Player.Muted">dialogs/volume/mute.png</value> - <value condition="Integer.IsGreater(Control.GetLabel(20),66)">dialogs/volume/volume.png</value> - <value condition="Integer.IsGreater(Control.GetLabel(20),33)">dialogs/volume/volume2.png</value> + <value condition="Integer.IsGreater(Player.Volume,66)">dialogs/volume/volume.png</value> + <value condition="Integer.IsGreater(Player.Volume,33)">dialogs/volume/volume2.png</value> <value condition="player.passthrough">dialogs/volume/volume.png</value> <value>dialogs/volume/volume1.png</value> </variable> @@ -238,6 +236,7 @@ <value>$INFO[ListItem.Genre]</value> </variable> <variable name="NowPlayingBreadcrumbsVar"> + <value condition="VideoPlayer.Content(livetv)">$INFO[VideoPlayer.Title]</value> <value condition="Window.IsActive(fullscreenvideo)">$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year, ([COLOR button_focus],[/COLOR])]</value> <value condition="MusicPartyMode.Enabled">$LOCALIZE[589]</value> <value>$LOCALIZE[31000]...</value> @@ -246,7 +245,7 @@ <value condition="Window.IsActive(visualisation)">$LOCALIZE[554] $INFO[Playlist.Position] / $INFO[Playlist.Length]</value> <value condition="VideoPlayer.Content(musicvideos)">$INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ]</value> <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 condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName]$INFO[VideoPlayer.EpisodeName, (,)]</value> + <value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName]</value> <value>$INFO[VideoPlayer.Genre]</value> </variable> <variable name="AddonsFanartVar"> @@ -256,8 +255,6 @@ <value condition="!String.IsEmpty(Container(50150).ListItem.Art(fanart)) + Control.HasFocus(50150)">$INFO[Container(50150).ListItem.Art(fanart)]</value> <value condition="!String.IsEmpty(Container(50250).ListItem.Art(fanart)) + Control.HasFocus(50250)">$INFO[Container(50250).ListItem.Art(fanart)]</value> <value condition="!String.IsEmpty(Container(50350).ListItem.Art(fanart)) + Control.HasFocus(50350)">$INFO[Container(50350).ListItem.Art(fanart)]</value> - <value condition="!String.IsEmpty(Container(50450).ListItem.Art(fanart)) + Control.HasFocus(50450)">$INFO[Container(50450).ListItem.Art(fanart)]</value> - <value condition="!String.IsEmpty(Container(50550).ListItem.Art(fanart)) + Control.HasFocus(50550)">$INFO[Container(50550).ListItem.Art(fanart)]</value> <value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value> </variable> <variable name="HomeFanartVar"> @@ -286,8 +283,7 @@ <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(804)">$INFO[Skin.String(HomeFanart.path)]power$INFO[Skin.String(HomeFanart.ext)]</value> <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(802)">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</value> <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(803)">$INFO[Skin.String(HomeFanart.path)]favorites$INFO[Skin.String(HomeFanart.ext)]</value> - <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(801)">$INFO[Skin.String(HomeFanart.path)]filemanager$INFO[Skin.String(HomeFanart.ext)]</value> - <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(900)">$INFO[Skin.String(HomeFanart.path)]search$INFO[Skin.String(HomeFanart.ext)]</value> + <value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(801)">$INFO[Skin.String(HomeFanart.path)]search$INFO[Skin.String(HomeFanart.ext)]</value> <value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value> </variable> <variable name="MediaFanartVar"> @@ -405,4 +401,8 @@ <variable name="AddonNewsVar"> <value condition="!String.IsEmpty(ListItem.AddonNews)">$LOCALIZE[31136]</value> </variable> + <variable name="TimersSubLabel"> + <value condition="[Window.IsActive(tvtimerrules) | Window.IsActive(radiotimerrules)] + !ListItem.HasTimerSchedule">$INFO[ListItem.Timertype]</value> + <value>$INFO[ListItem.EpisodeName]</value> + </variable> </includes> diff --git a/addons/skin.estuary/xml/VideoFullScreen.xml b/addons/skin.estuary/xml/VideoFullScreen.xml index e47bbc8a72..cc5b4edd56 100644 --- a/addons/skin.estuary/xml/VideoFullScreen.xml +++ b/addons/skin.estuary/xml/VideoFullScreen.xml @@ -71,7 +71,6 @@ <aligny>center</aligny> <align>center</align> <font>font11</font> - <textcolor>white</textcolor> </control> </control> </controls> diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index e0ca8fc3c8..4cd9052067 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -12,8 +12,8 @@ <top>0</top> <width>100%</width> <bottom>280</bottom> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="group"> @@ -33,6 +33,7 @@ <width>1000</width> <height>60</height> <label>$VAR[VideoOSDHelpTextVar]</label> + <visible>!Player.ShowInfo</visible> </control> <control type="group" id="200"> <control type="grouplist" id="201"> @@ -66,7 +67,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> <selected>Player.Paused</selected> @@ -105,7 +106,7 @@ <radiowidth>74</radiowidth> <radioheight>74</radioheight> <font></font> - <texturenofocus></texturenofocus> + <texturenofocus /> <radioposx>1</radioposx> <radioposy>0</radioposy> <selected>!Player.Recording</selected> diff --git a/addons/skin.estuary/xml/VideoOSDBookmarks.xml b/addons/skin.estuary/xml/VideoOSDBookmarks.xml index 607d20ad4b..57996e7ac4 100644 --- a/addons/skin.estuary/xml/VideoOSDBookmarks.xml +++ b/addons/skin.estuary/xml/VideoOSDBookmarks.xml @@ -9,13 +9,13 @@ <top>0</top> <width>100%</width> <bottom>546</bottom> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> + <texturefocus /> + <texturenofocus /> <onclick>Action(close)</onclick> </control> <control type="group"> <bottom>0</bottom> - <height>546</height> + <height>550</height> <control type="image"> <left>0</left> <width>100%</width> @@ -38,7 +38,7 @@ <control type="grouplist" id="9001"> <orientation>horizontal</orientation> <left>0</left> - <top>-4</top> + <top>-10</top> <width>100%</width> <align>center</align> <height>100</height> diff --git a/addons/skin.estuary/xml/View_500_Wall.xml b/addons/skin.estuary/xml/View_500_Wall.xml index 36bbcc2335..ba72632e05 100644 --- a/addons/skin.estuary/xml/View_500_Wall.xml +++ b/addons/skin.estuary/xml/View_500_Wall.xml @@ -27,11 +27,6 @@ <top>120</top> <include>InfoWallMovieLayout</include> </control> - <control type="group"> - <left>135</left> - <top>108</top> - <include>UserRatingCircle</include> - </control> </itemlayout> <focusedlayout height="445" width="300" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="group"> @@ -42,46 +37,26 @@ <include content="InfoWallMovieLayout"> <param name="focused" value="true" /> </include> - <control type="group"> - <left>135</left> - <top>-12</top> - <include>UserRatingCircle</include> - </control> </control> </focusedlayout> - <itemlayout height="400" width="300" condition="Container.Content(episodes)"> - <control type="image"> - <left>144</left> - <top>516</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> - </control> + <itemlayout height="300" width="300" condition="Container.Content(episodes)"> <control type="group"> - <top>150</top> - <include content="InfoWallMusicLayout"> + <top>110</top> + <include content="InfoWallEpisodeLayout"> <param name="label" value="$INFO[ListItem.Label]" /> + <param name="thumb_label" value="$INFO[ListItem.Label2]" /> </include> </control> </itemlayout> - <focusedlayout height="400" width="300" condition="Container.Content(episodes)"> - <control type="image"> - <left>144</left> - <top>516</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> - <animation effect="slide" end="0,16" time="200" tween="sine" easing="inout">Focus</animation> - <animation effect="slide" start="0,16" end="0,0" time="200" tween="sine" easing="inout">UnFocus</animation> - </control> + <focusedlayout height="300" width="300" condition="Container.Content(episodes)"> <control type="group"> <depth>DepthContentPopout</depth> - <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="160,380">Focus</animation> - <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="160,380">UnFocus</animation> - <top>150</top> - <include content="InfoWallMusicLayout"> - <param name="label" value="$INFO[ListItem.Label]" /> + <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="160,280">Focus</animation> + <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="160,280">UnFocus</animation> + <top>110</top> + <include content="InfoWallEpisodeLayout"> <param name="focused" value="true" /> + <param name="thumb_label" value="$INFO[ListItem.Label2]" /> </include> </control> </focusedlayout> diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml index 15007e119b..2931610a0b 100644 --- a/addons/skin.estuary/xml/View_501_Banner.xml +++ b/addons/skin.estuary/xml/View_501_Banner.xml @@ -131,7 +131,6 @@ <width>800</width> <height>20</height> <font>font12</font> - <textcolor>button_focus</textcolor> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Rating]</label> @@ -151,7 +150,6 @@ <width>800</width> <height>20</height> <font>font12</font> - <textcolor>button_focus</textcolor> <align>right</align> <aligny>center</aligny> <label>$VAR[BannerLabel2Var]</label> diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml index 6f3e4071ed..ecbc503645 100644 --- a/addons/skin.estuary/xml/View_502_FanArt.xml +++ b/addons/skin.estuary/xml/View_502_FanArt.xml @@ -28,8 +28,8 @@ <control type="image"> <left>38</left> <right>36</right> - <top>104</top> - <height>650</height> + <top>115</top> + <height>644</height> <fadetime>300</fadetime> <texture border="2" fallback="special://skin/extras/home-images/movie.jpg" background="true">$VAR[FanartImageVar]</texture> <aspectratio align="center" aligny="bottom">scale</aspectratio> diff --git a/addons/skin.estuary/xml/View_50_List.xml b/addons/skin.estuary/xml/View_50_List.xml index 80b450a4f0..b3c064972f 100644 --- a/addons/skin.estuary/xml/View_50_List.xml +++ b/addons/skin.estuary/xml/View_50_List.xml @@ -56,9 +56,10 @@ <control type="fixedlist" id="$PARAM[list_id]"> <left>0</left> <width>list_width</width> - <height>100%</height> + <top>list_y_offset</top> + <bottom>list_y_offset</bottom> <movement>5</movement> - <focusposition>7</focusposition> + <focusposition>6</focusposition> <scrolltime tween="cubic" easing="out">500</scrolltime> <orientation>vertical</orientation> <pagecontrol>$PARAM[list_id]600</pagecontrol> @@ -68,92 +69,86 @@ <ondown>$PARAM[list_id]</ondown> <viewtype label="$PARAM[viewtype_label]">list</viewtype> <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Window.IsActive(MyPlaylist.xml)</visible> - <focusedlayout height="70"> - <control type="group"> - <width>list_width</width> - <control type="image"> - <left>0</left> - <right>0</right> - <top>0</top> - <height>69</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus($PARAM[list_id])</visible> - </control> - <control type="label"> - <left>70</left> - <right>70</right> - <top>0</top> - <height>70</height> - <aligny>center</aligny> - <scroll>true</scroll> - <font>font27</font> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>100</left> - <top>0</top> - <height>70</height> - <right>20</right> - <align>right</align> - <aligny>center</aligny> - <font>font12</font> - <label>$VAR[ListLabel2Var]</label> - <animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="image"> - <left>21</left> - <top>20</top> - <width>32</width> - <height>32</height> - <texture>$VAR[ListWatchedIconVar]</texture> - <animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation> - </control> - <control type="image"> - <left>21</left> - <top>20</top> - <width>32</width> - <height>32</height> - <texture colordiffuse="button_focus">$VAR[ListWatchedIconVar]</texture> - <animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation> - <animation effect="fade" time="150">VisibleChange</animation> - <visible>!Control.HasFocus($PARAM[list_id])</visible> - </control> + <focusedlayout height="list_item_height" width="list_width"> + <control type="image"> + <left>0</left> + <right>0</right> + <top>0</top> + <bottom>0</bottom> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus($PARAM[list_id])</visible> + </control> + <control type="label"> + <left>70</left> + <right>70</right> + <top>0</top> + <bottom>0</bottom> + <aligny>center</aligny> + <scroll>true</scroll> + <font>font27</font> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <top>0</top> + <bottom>0</bottom> + <left>100</left> + <right>20</right> + <align>right</align> + <aligny>center</aligny> + <font>font12</font> + <label>$VAR[ListLabel2Var]</label> + <animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="image"> + <left>21</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture>$VAR[ListWatchedIconVar]</texture> + <animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation> + </control> + <control type="image"> + <left>21</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture colordiffuse="button_focus">$VAR[ListWatchedIconVar]</texture> + <animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation> + <animation effect="fade" time="150">VisibleChange</animation> + <visible>!Control.HasFocus($PARAM[list_id])</visible> </control> </focusedlayout> - <itemlayout height="70"> - <control type="group"> - <width>list_width</width> - <control type="label"> - <left>70</left> - <right>70</right> - <top>0</top> - <height>70</height> - <aligny>center</aligny> - <font>font27</font> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>20</left> - <right>20</right> - <top>0</top> - <height>70</height> - <align>right</align> - <aligny>center</aligny> - <font>font12</font> - <label>$VAR[ListLabel2Var]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="image"> - <left>21</left> - <top>20</top> - <width>32</width> - <height>32</height> - <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> - </control> + <itemlayout height="list_item_height" width="list_width"> + <control type="label"> + <left>70</left> + <right>70</right> + <top>0</top> + <bottom>0</bottom> + <aligny>center</aligny> + <font>font27</font> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>20</left> + <right>20</right> + <top>0</top> + <bottom>0</bottom> + <align>right</align> + <aligny>center</aligny> + <font>font12</font> + <label>$VAR[ListLabel2Var]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="image"> + <left>21</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> </control> </itemlayout> </control> @@ -176,6 +171,11 @@ <fadetime>300</fadetime> <texture background="true">$VAR[IconWallThumbVar]</texture> </control> + <control type="group"> + <left>273</left> + <top>590</top> + <include>UserRatingCircle</include> + </control> <control type="textbox" id="15500"> <left>30</left> <top>640</top> diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml index 0367ecb25f..0f38a2990e 100644 --- a/addons/skin.estuary/xml/View_52_IconWall.xml +++ b/addons/skin.estuary/xml/View_52_IconWall.xml @@ -145,7 +145,6 @@ <label>$INFO[ListItem.Label]</label> <align>center</align> <aligny>center</aligny> - <textcolor>white</textcolor> </control> </control> </itemlayout> diff --git a/addons/skin.estuary/xml/View_53_Shift.xml b/addons/skin.estuary/xml/View_53_Shift.xml index 7b18cfbb27..954ffbe4f2 100644 --- a/addons/skin.estuary/xml/View_53_Shift.xml +++ b/addons/skin.estuary/xml/View_53_Shift.xml @@ -54,7 +54,7 @@ <pagecontrol>5199</pagecontrol> <scrolltime tween="cubic" easing="out">500</scrolltime> <orientation>horizontal</orientation> - <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos)</visible> + <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos)</visible> <onleft>53</onleft> <onup>9000</onup> <ondown>5199</ondown> @@ -91,36 +91,33 @@ </control> </itemlayout> <focusedlayout width="370"> - <control type="group"> + <control type="image"> + <depth>DepthContentPopout</depth> <left>0</left> - <control type="image"> - <depth>DepthContentPopout</depth> - <left>0</left> - <top>90</top> - <width>370</width> - <height>480</height> - <aspectratio aligny="center">keep</aspectratio> - <texture fallback="DefaultVideo.png">$VAR[ShiftThumbVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="textbox"> - <left>20</left> - <top>603</top> - <width>330</width> - <height>105</height> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - <autoscroll time="3000" delay="3000" repeat="3000">True</autoscroll> - </control> - <control type="image"> - <left>169</left> - <top>560</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> - </control> + <top>90</top> + <width>370</width> + <height>480</height> + <aspectratio aligny="center">keep</aspectratio> + <texture fallback="DefaultVideo.png">$VAR[ShiftThumbVar]</texture> + <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="textbox"> + <left>20</left> + <top>603</top> + <width>330</width> + <height>105</height> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <autoscroll time="3000" delay="3000" repeat="3000">True</autoscroll> + </control> + <control type="image"> + <left>169</left> + <top>560</top> + <width>32</width> + <height>32</height> + <texture>$VAR[WallWatchedIconVar]</texture> </control> </focusedlayout> </control> diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index cc4f0cd3d2..ae6272f3e1 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -5,7 +5,7 @@ <definition> <control type="image"> <top>-10</top> - <width>396</width> + <width>376</width> <height>380</height> <texture border="21">dialogs/dialog-bg-nobo.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> @@ -14,18 +14,18 @@ <control type="image"> <top>-14</top> <left>-4</left> - <width>404</width> + <width>384</width> <height>388</height> <texture colordiffuse="button_focus">colors/grey.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> - <include>Animation_FocusTextureFade</include> + <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> </control> <control type="image"> <left>20</left> <top>10</top> - <width>356</width> + <width>336</width> <height>300</height> <texture border="2" background="true">$VAR[InfoWallThumbVar]</texture> <aspectratio>keep</aspectratio> @@ -33,18 +33,21 @@ <control type="label"> <left>20</left> <top>318</top> - <width>358</width> + <width>338</width> <textoffsetx>20</textoffsetx> <height>20</height> <align>center</align> <aligny>center</aligny> + <font>font12</font> <label>$INFO[ListItem.Label]</label> </control> </definition> </include> <include name="InfoWallMusicLayout"> <param name="fallback_image">DefaultFolder.png</param> - <param name="label">$INFO[ListItem.Year,[B], - [/B]]$INFO[ListItem.Label]</param> + <param name="main_label">$INFO[ListItem.Artist]</param> + <param name="sub_label">$INFO[ListItem.Year,[B],[/B]]</param> + <param name="single_label">$INFO[ListItem.Label]</param> <param name="focused">false</param> <definition> <control type="image"> @@ -64,7 +67,7 @@ <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> - <include>Animation_FocusTextureFade</include> + <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> </control> <control type="image"> <left>0</left> @@ -83,12 +86,150 @@ <font>font12</font> <align>center</align> <aligny>center</aligny> - <label>$PARAM[label]</label> + <label>$PARAM[single_label]</label> + <visible>!String.IsEqual(ListItem.DBType,album)</visible> + </control> + <control type="group"> + <visible>String.IsEqual(ListItem.DBType,album)</visible> + <control type="label"> + <left>29</left> + <top>300</top> + <width>260</width> + <label>$PARAM[sub_label]</label> + <font>font10</font> + <shadowcolor>text_shadow</shadowcolor> + <scroll>$PARAM[focused]</scroll> + <align>center</align> + </control> + <control type="label"> + <left>29</left> + <top>328</top> + <width>260</width> + <label>$PARAM[main_label]</label> + <font>font12</font> + <shadowcolor>text_shadow</shadowcolor> + <scroll>$PARAM[focused]</scroll> + <align>center</align> + </control> + </control> + <control type="group"> + <left>145</left> + <top>2</top> + <include>UserRatingCircle</include> + </control> + </definition> + </include> + <include name="InfoWallEpisodeLayout"> + <param name="main_label">$INFO[ListItem.Title]</param> + <param name="sub_label">$INFO[ListItem.TVShowTitle]</param> + <param name="thumb_label">$INFO[ListItem.Season,,x]$INFO[ListItem.Episode]</param> + <param name="fallback_image">DefaultTVShows.png</param> + <param name="focused">false</param> + <definition> + <control type="image"> + <top>10</top> + <width>316</width> + <height>288</height> + <texture border="21">dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="image"> + <top>6</top> + <left>-4</left> + <width>324</width> + <height>296</height> + <texture colordiffuse="button_focus">colors/grey.png</texture> + <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + <visible>$PARAM[focused]</visible> + <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> + </control> + <control type="image"> + <left>0</left> + <top>10</top> + <width>316</width> + <height>218</height> + <texture border="2" fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture> + <aspectratio>scale</aspectratio> + <bordersize>20</bordersize> + </control> + <control type="image"> + <left>136</left> + <top>138</top> + <width>160</width> + <height>70</height> + <texture flipx="true">overlays/overlay-bg.png</texture> + <visible>String.IsEqual(ListItem.DBtype,episode)</visible> + </control> + <control type="label"> + <left>31</left> + <top>178</top> + <width>260</width> + <label>$PARAM[thumb_label]</label> + <font>font20_title</font> + <shadowcolor>text_shadow</shadowcolor> + <align>right</align> + </control> + <control type="image"> + <left>20</left> + <top>175</top> + <width>32</width> + <height>32</height> + <texture>$VAR[WallWatchedIconVar]</texture> + </control> + <control type="textbox"> + <left>28</left> + <top>202</top> + <width>262</width> + <height>80</height> + <font>font12</font> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <visible>Window.IsActive(videos)</visible> + </control> + <control type="group"> + <visible>!Window.IsActive(videos)</visible> + <control type="label"> + <left>29</left> + <top>210</top> + <width>260</width> + <label>$PARAM[sub_label]</label> + <font>font12</font> + <shadowcolor>text_shadow</shadowcolor> + <scroll>$PARAM[focused]</scroll> + <align>center</align> + </control> + <control type="label"> + <left>29</left> + <top>240</top> + <width>260</width> + <label>$PARAM[main_label]</label> + <font>font10</font> + <shadowcolor>text_shadow</shadowcolor> + <scroll>$PARAM[focused]</scroll> + <align>center</align> + </control> + </control> + <control type="progress"> + <left>20</left> + <top>258</top> + <width>276</width> + <height>1</height> + <texturebg></texturebg> + <midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture> + <info>ListItem.PercentPlayed</info> + <visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible> + </control> + <control type="group"> + <left>134</left> + <top>8</top> + <include>UserRatingCircle</include> </control> </definition> </include> <include name="InfoWallMovieLayout"> - <param name="fallback_image">DefaultVideo.png</param> <param name="focused">false</param> <definition> <control type="group"> @@ -110,20 +251,20 @@ <texture colordiffuse="button_focus">colors/grey.png</texture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> - <include>Animation_FocusTextureFade</include> + <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> </control> <control type="image"> <left>26</left> <top>0</top> <width>270</width> <height>290</height> - <texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Icon]</texture> + <texture fallback="DefaultMovies.png" background="true">$INFO[ListItem.Icon]</texture> <aspectratio>keep</aspectratio> <bordersize>20</bordersize> </control> <control type="textbox"> <left>40</left> - <top>270</top> + <top>240</top> <width>242</width> <height>90</height> <font>font27</font> @@ -142,14 +283,14 @@ <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused] + !String.IsEmpty(ListItem.Art(poster))</visible> - <include>Animation_FocusTextureFade</include> + <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> </control> <control type="image"> <left>15</left> <top>-10</top> <width>290</width> <height>400</height> - <texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Art(poster)]</texture> + <texture background="true">$INFO[ListItem.Art(poster)]</texture> <aspectratio>scale</aspectratio> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> @@ -163,6 +304,33 @@ <texture>overlays/overlay-bg.png</texture> <visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> </control> + <control type="group"> + <visible>String.IsEqual(ListItem.DBtype,tvshow)</visible> + <top>320</top> + <control type="image"> + <left>35</left> + <top>0</top> + <width>250</width> + <height>50</height> + <texture>overlays/overlayfade.png</texture> + </control> + <control type="label"> + <left>0</left> + <top>20</top> + <width>244</width> + <label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label> + <font>font20_title</font> + <shadowcolor>text_shadow</shadowcolor> + <align>right</align> + </control> + <control type="image"> + <left>254</left> + <top>23</top> + <width>24</width> + <height>24</height> + <texture>lists/played-total.png</texture> + </control> + </control> <control type="image"> <left>35</left> <top>338</top> @@ -170,6 +338,21 @@ <height>32</height> <texture>$VAR[WallWatchedIconVar]</texture> </control> + <control type="group"> + <left>135</left> + <top>-8</top> + <include>UserRatingCircle</include> + </control> + <control type="progress"> + <left>35</left> + <top>350</top> + <width>250</width> + <height>1</height> + <texturebg></texturebg> + <midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture> + <info>ListItem.PercentPlayed</info> + <visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible> + </control> </definition> </include> <include name="View_54_InfoWall"> @@ -180,9 +363,9 @@ <visible>Control.IsVisible(54)</visible> <include>Visible_Right</include> <control type="panel" id="54"> - <left>440</left> + <left>490</left> <top>0</top> - <width>80%</width> + <right>15</right> <height>100%</height> <onleft>9000</onleft> <onright>531</onright> @@ -193,40 +376,53 @@ <preloaditems>2</preloaditems> <pagecontrol>531</pagecontrol> <scrolltime tween="cubic" easing="out">500</scrolltime> - <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(images)</visible> + <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images)</visible> <itemlayout height="445" width="320" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="group"> - <left>80</left> + <left>30</left> <top>120</top> <include>InfoWallMovieLayout</include> </control> - <control type="group"> - <left>215</left> - <top>108</top> - <include>UserRatingCircle</include> - </control> </itemlayout> <focusedlayout height="445" width="320" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="group"> <depth>DepthContentPopout</depth> - <left>80</left> - <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="240,300">Focus</animation> - <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="240,300">UnFocus</animation> + <left>30</left> + <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="190,300">Focus</animation> + <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="190,300">UnFocus</animation> <top>120</top> <include content="InfoWallMovieLayout"> <param name="focused" value="true" /> </include> - <control type="group"> - <left>135</left> - <top>-12</top> - <include>UserRatingCircle</include> - </control> + </control> + </focusedlayout> + <itemlayout height="300" width="300" condition="Container.Content(episodes)"> + <control type="group"> + <left>40</left> + <top>110</top> + <include content="InfoWallEpisodeLayout"> + <param name="focused" value="false" /> + <param name="thumb_label" value="$INFO[ListItem.Label2]" /> + </include> + </control> + </itemlayout> + <focusedlayout height="300" width="300" condition="Container.Content(episodes)"> + <control type="group"> + <depth>DepthContentPopout</depth> + <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="200,250">Focus</animation> + <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="200,250">UnFocus</animation> + <left>40</left> + <top>110</top> + <include content="InfoWallEpisodeLayout"> + <param name="focused" value="true" /> + <param name="thumb_label" value="$INFO[ListItem.Label2]" /> + </include> </control> </focusedlayout> <itemlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> <control type="group"> <top>150</top> - <left>90</left> + <left>40</left> <include>InfoWallMusicLayout</include> <control type="group"> <left>133</left> @@ -238,10 +434,10 @@ <focusedlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> <control type="group"> <depth>DepthContentPopout</depth> - <animation effect="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="250,350">Focus</animation> - <animation effect="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="250,350">UnFocus</animation> + <animation effect="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="200,350">Focus</animation> + <animation effect="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="200,350">UnFocus</animation> <top>150</top> - <left>90</left> + <left>40</left> <include content="InfoWallMusicLayout"> <param name="focused" value="true" /> </include> @@ -252,20 +448,20 @@ </control> </control> </focusedlayout> - <itemlayout height="400" width="401" condition="Container.Content(images)"> + <itemlayout height="400" width="378" condition="Container.Content(images)"> <control type="group"> - <left>30</left> + <left>0</left> <top>150</top> <include>InfoWallPictureLayout</include> </control> </itemlayout> - <focusedlayout height="400" width="401" condition="Container.Content(images)"> + <focusedlayout height="400" width="378" condition="Container.Content(images)"> <control type="group"> <depth>DepthContentPopout</depth> - <left>30</left> + <left>0</left> <top>150</top> - <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="220,330">Focus</animation> - <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="220,330">UnFocus</animation> + <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="180,330">Focus</animation> + <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="180,330">UnFocus</animation> <include content="InfoWallPictureLayout"> <param name="focused" value="true" /> </include> diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml index 89427f0aaa..6652a00893 100644 --- a/addons/skin.estuary/xml/View_55_WideList.xml +++ b/addons/skin.estuary/xml/View_55_WideList.xml @@ -7,115 +7,113 @@ <include>Visible_Right</include> <control type="fixedlist" id="55"> <left>594</left> - <top>3</top> + <top>list_y_offset</top> + <bottom>list_y_offset</bottom> <right>0</right> - <height>100%</height> <scrolltime tween="cubic" easing="out">500</scrolltime> <orientation>vertical</orientation> <pagecontrol>531</pagecontrol> - <movement>3</movement> - <focusposition>5</focusposition> + <movement>5</movement> + <focusposition>6</focusposition> <onleft>9000</onleft> <onright>531</onright> <onup>55</onup> <ondown>55</ondown> <viewtype label="$LOCALIZE[31107]">list</viewtype> <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content() | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons)</visible> - <focusedlayout height="80" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(videos) | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons)"> - <control type="group"> - <width>widelist_width</width> - <control type="image"> - <left>0</left> - <right>0</right> - <height>80</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.HasFocus(55)</visible> - </control> - <control type="label"> - <left>18</left> - <top>2</top> - <height>80</height> - <width>80</width> - <aligny>center</aligny> - <label>$INFO[ListItem.Year]</label> - <shadowcolor>text_shadow</shadowcolor> - <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies)</visible> - </control> - <control type="image"> - <left>35</left> - <top>25</top> - <width>32</width> - <height>32</height> - <texture>$VAR[ListWatchedIconVar]</texture> - <visible>Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year)</visible> - </control> - <control type="label"> - <left>105</left> - <height>80</height> - <right>100</right> - <aligny>center</aligny> - <scroll>true</scroll> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <label>$VAR[ActorLabel2]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> + <focusedlayout height="list_item_height" width="widelist_width" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(videos) | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons)"> + <control type="image"> + <left>0</left> + <right>0</right> + <bottom>0</bottom> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.HasFocus(55)</visible> + </control> + <control type="label"> + <left>18</left> + <top>0</top> + <bottom>0</bottom> + <width>80</width> + <aligny>center</aligny> + <label>$INFO[ListItem.Year]</label> + <shadowcolor>text_shadow</shadowcolor> + <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies)</visible> + </control> + <control type="image"> + <left>35</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture>$VAR[ListWatchedIconVar]</texture> + <visible>Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year)</visible> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <bottom>0</bottom> + <right>100</right> + <aligny>center</aligny> + <scroll>true</scroll> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>40</left> + <top>0</top> + <bottom>0</bottom> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <label>$VAR[ListLabel2Var]</label> + <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="80" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(videos) | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons)"> - <control type="group"> - <width>widelist_width</width> - <control type="label"> - <left>18</left> - <top>2</top> - <height>80</height> - <width>80</width> - <aligny>center</aligny> - <label>$INFO[ListItem.Year]</label> - <textcolor>button_focus</textcolor> - <shadowcolor>text_shadow</shadowcolor> - <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies)</visible> - </control> - <control type="image"> - <left>35</left> - <top>25</top> - <width>32</width> - <height>32</height> - <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> - <visible>Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year)</visible> - </control> - <control type="label"> - <left>105</left> - <height>80</height> - <right>100</right> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <label>$VAR[ActorLabel2]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="image"> - <left>35</left> - <top>25</top> - <visible>String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion)</visible> - <width>32</width> - <height>32</height> - <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> - </control> + <itemlayout height="list_item_height" width="widelist_width" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(videos) | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons)"> + <control type="label"> + <left>18</left> + <top>0</top> + <bottom>0</bottom> + <width>80</width> + <aligny>center</aligny> + <label>$INFO[ListItem.Year]</label> + <textcolor>button_focus</textcolor> + <shadowcolor>text_shadow</shadowcolor> + <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies)</visible> + </control> + <control type="image"> + <left>35</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> + <visible>Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year)</visible> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <bottom>0</bottom> + <right>100</right> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>40</left> + <top>0</top> + <bottom>0</bottom> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <label>$VAR[ListLabel2Var]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="image"> + <left>35</left> + <centertop>50%</centertop> + <visible>String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion)</visible> + <width>32</width> + <height>32</height> + <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> </control> </itemlayout> <include condition="Window.IsActive(music)">SongsListLayout</include> @@ -124,126 +122,114 @@ </control> </include> <include name="SongsListLayout"> - <focusedlayout height="80" condition="Container.Content(songs)"> - <control type="group"> - <width>widelist_width</width> - <control type="image"> - <left>0</left> - <right>0</right> - <height>80</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.hasFocus(55)</visible> - </control> - <control type="label"> - <left>35</left> - <height>80</height> - <right>90</right> - <aligny>center</aligny> - <scroll>true</scroll> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> + <focusedlayout height="80" width="widelist_width" condition="Container.Content(songs)"> + <control type="image"> + <left>0</left> + <right>0</right> + <height>80</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.hasFocus(55)</visible> + </control> + <control type="label"> + <left>35</left> + <height>80</height> + <right>90</right> + <aligny>center</aligny> + <scroll>true</scroll> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>40</left> + <height>80</height> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> + <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="80" condition="Container.Content(songs)"> - <control type="group"> - <width>widelist_width</width> - <control type="label"> - <left>35</left> - <height>80</height> - <right>90</right> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - <shadowcolor>text_shadow</shadowcolor> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <itemlayout height="80" width="widelist_width" condition="Container.Content(songs)"> + <control type="label"> + <left>35</left> + <height>80</height> + <right>90</right> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>40</left> + <height>80</height> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> </include> <include name="AddonsListLayout"> - <focusedlayout height="80" condition="Container.Content(addons)"> - <control type="group"> - <width>widelist_width</width> - <control type="image"> - <left>0</left> - <right>0</right> - <height>80</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <visible>Control.hasFocus(55)</visible> - </control> - <control type="image"> - <left>20</left> - <top>25</top> - <width>32</width> - <height>32</height> - <texture>$VAR[AddonsListIconVar]</texture> - </control> - <control type="label"> - <left>75</left> - <height>80</height> - <right>100</right> - <aligny>center</aligny> - <scroll>true</scroll> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <font>font27</font> - <label>$VAR[AddonsLabel2Var]</label> - </control> + <focusedlayout height="80" width="widelist_width" condition="Container.Content(addons)"> + <control type="image"> + <left>0</left> + <right>0</right> + <height>80</height> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <visible>Control.hasFocus(55)</visible> + </control> + <control type="image"> + <left>20</left> + <top>25</top> + <width>32</width> + <height>32</height> + <texture>$VAR[AddonsListIconVar]</texture> + </control> + <control type="label"> + <left>75</left> + <height>80</height> + <right>100</right> + <aligny>center</aligny> + <scroll>true</scroll> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="label"> + <left>40</left> + <height>80</height> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <font>font27</font> + <label>$VAR[AddonsLabel2Var]</label> </control> </focusedlayout> - <itemlayout height="80" condition="Container.Content(addons)"> - <control type="group"> - <width>widelist_width</width> - <control type="image"> - <left>20</left> - <top>25</top> - <width>32</width> - <height>32</height> - <texture>$VAR[AddonsListIconVar]</texture> - </control> - <control type="label"> - <left>75</left> - <height>80</height> - <right>100</right> - <aligny>center</aligny> - <scroll>true</scroll> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="label"> - <left>40</left> - <height>80</height> - <right>40</right> - <align>right</align> - <aligny>center</aligny> - <font>font27</font> - <label>$VAR[AddonsLabel2Var]</label> - <textcolor>grey</textcolor> - <shadowcolor>text_shadow</shadowcolor> - </control> + <itemlayout height="80" width="widelist_width" condition="Container.Content(addons)"> + <control type="image"> + <left>20</left> + <top>25</top> + <width>32</width> + <height>32</height> + <texture>$VAR[AddonsListIconVar]</texture> + </control> + <control type="label"> + <left>75</left> + <height>80</height> + <right>100</right> + <aligny>center</aligny> + <scroll>true</scroll> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="label"> + <left>40</left> + <height>80</height> + <right>40</right> + <align>right</align> + <aligny>center</aligny> + <font>font27</font> + <label>$VAR[AddonsLabel2Var]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> </include> |
