diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2017-02-24 06:13:06 +0100 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2017-02-24 06:14:36 +0100 |
| commit | c867eb9b2bfedb74c0ded53379e6ad3f2c106014 (patch) | |
| tree | cd5d5d7896de2861df411295fdad4ff0f7730db3 | |
| parent | cecf179188aa6493d8f5f249538f9fde7d53ac83 (diff) | |
[estuary] sync pt2
27 files changed, 770 insertions, 600 deletions
diff --git a/addons/skin.estuary/media/icons/back.png b/addons/skin.estuary/media/icons/back.png Binary files differnew file mode 100644 index 0000000000..87b7f54bdb --- /dev/null +++ b/addons/skin.estuary/media/icons/back.png diff --git a/addons/skin.estuary/xml/Constants_1920.xml b/addons/skin.estuary/xml/Constants_1920.xml deleted file mode 100644 index f9b714beff..0000000000 --- a/addons/skin.estuary/xml/Constants_1920.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<includes> - <constant name="widelist_width">1325</constant> - <constant name="list_width">730</constant> - <constant name="width_center">960</constant> - <constant name="tvchannelslist_width">1002</constant> - <constant name="tvrecordings_width">1060</constant> - <constant name="eventloglist_width">1430</constant> - <constant name="playlisteditorlist_width">770</constant> - <constant name="playlistlist_width">896</constant> -</includes> diff --git a/addons/skin.estuary/xml/Constants_2560.xml b/addons/skin.estuary/xml/Constants_2560.xml deleted file mode 100644 index ba83217abd..0000000000 --- a/addons/skin.estuary/xml/Constants_2560.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<includes> - <constant name="widelist_width">1965</constant> - <constant name="list_width">1370</constant> - <constant name="width_center">1280</constant> - <constant name="tvchannelslist_width">1642</constant> - <constant name="tvrecordings_width">1700</constant> - <constant name="eventloglist_width">2070</constant> - <constant name="playlisteditorlist_width">1410</constant> - <constant name="playlistlist_width">1536</constant> -</includes> diff --git a/addons/skin.estuary/xml/DialogAddonInfo.xml b/addons/skin.estuary/xml/DialogAddonInfo.xml index 947eba6af2..1720b518db 100644 --- a/addons/skin.estuary/xml/DialogAddonInfo.xml +++ b/addons/skin.estuary/xml/DialogAddonInfo.xml @@ -271,5 +271,6 @@ <param name="sub_label" value="$INFO[ListItem.AddonVersion,[COLOR grey],[/COLOR]]$INFO[ListItem.AddonCreator, $LOCALIZE[31071] ]" /> </include> </control> + <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogFullScreenInfo.xml b/addons/skin.estuary/xml/DialogFullScreenInfo.xml deleted file mode 100644 index f89dc2e1db..0000000000 --- a/addons/skin.estuary/xml/DialogFullScreenInfo.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<window> - <depth>DepthOSD</depth> - <defaultcontrol always="true">5553</defaultcontrol> - <controls> - <control type="button"> - <description>background close area</description> - <left>0</left> - <top>0</top> - <width>100%</width> - <bottom>280</bottom> - <texturefocus /> - <texturenofocus /> - <onclick>Action(close)</onclick> - </control> - <control type="group"> - <bottom>0</bottom> - <height>230</height> - <visible>!Window.IsVisible(playerprocessinfo)</visible> - <animation effect="fade" time="200">VisibleChange</animation> - <control type="image"> - <depth>DepthOSD+</depth> - <left>10</left> - <top>-490</top> - <width>400</width> - <height>600</height> - <aspectratio aligny="bottom">keep</aspectratio> - <texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - <include>OpenClose_Left</include> - </control> - <control type="group"> - <include>OpenClose_Right</include> - <control type="image"> - <left>400</left> - <top>-240</top> - <right>20</right> - <height>350</height> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="textbox"> - <left>443</left> - <top>-207</top> - <right>80</right> - <height>290</height> - <label fallback="416">$VAR[FullScreenInfoTextBoxVar]</label> - <align>justify</align> - <autoscroll delay="5000" repeat="7500" time="5000"></autoscroll> - </control> - <control type="grouplist" id="5550"> - <right>20</right> - <top>-310</top> - <width>1000</width> - <height>100</height> - <align>right</align> - <orientation>horizontal</orientation> - <itemgap>-10</itemgap> - <onup>Close</onup> - <ondown>Close</ondown> - <usecontrolcoords>true</usecontrolcoords> - <control type="button" id="5553"> - <width>auto</width> - <height>100</height> - <textoffsetx>80</textoffsetx> - <label>$LOCALIZE[207]</label> - </control> - <control type="button" id="5554"> - <width>auto</width> - <height>100</height> - <textoffsetx>80</textoffsetx> - <onclick>Close</onclick> - <label>$LOCALIZE[206]</label> - <visible>!String.IsEmpty(VideoPlayer.CastAndRole)</visible> - </control> - <control type="button" id="5555"> - <width>auto</width> - <height>100</height> - <textoffsetx>80</textoffsetx> - <label>$LOCALIZE[19031]</label> - <visible>VideoPlayer.Content(livetv)</visible> - </control> - </control> - </control> - <control type="grouplist"> - <right>20</right> - <top>155</top> - <width>1000</width> - <height>100</height> - <align>right</align> - <include>Animation_BottomSlide</include> - <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/DialogMusicInfo.xml b/addons/skin.estuary/xml/DialogMusicInfo.xml index 08940cc059..e6715a281f 100644 --- a/addons/skin.estuary/xml/DialogMusicInfo.xml +++ b/addons/skin.estuary/xml/DialogMusicInfo.xml @@ -210,7 +210,7 @@ <control type="group"> <left>230</left> <top>28</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </itemlayout> <focusedlayout height="72.5" width="595" condition="Container.Content(albums)"> @@ -233,7 +233,7 @@ <control type="group"> <left>230</left> <top>28</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </control> </focusedlayout> @@ -267,7 +267,7 @@ <control type="group"> <left>230</left> <top>28</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </itemlayout> <focusedlayout height="360" width="236" condition="Container.Content(artists)"> @@ -304,7 +304,7 @@ <control type="group"> <left>230</left> <top>28</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> <control type="image"> <left>16</left> @@ -444,5 +444,6 @@ </include> </control> </control> + <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml index e5560578ba..5fd7d65bb3 100644 --- a/addons/skin.estuary/xml/DialogPVRInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRInfo.xml @@ -110,5 +110,6 @@ <param name="posy" value="40" /> </include> </control> + <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogPictureInfo.xml b/addons/skin.estuary/xml/DialogPictureInfo.xml index 2de0bd6fca..92c2fe0405 100644 --- a/addons/skin.estuary/xml/DialogPictureInfo.xml +++ b/addons/skin.estuary/xml/DialogPictureInfo.xml @@ -122,5 +122,6 @@ <param name="main_label" value="$INFO[ListItem.Label]" /> <param name="sub_label" value="$INFO[ListItem.PictureDateTime]" /> </include> + <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml index d83c2218a1..53c4567c60 100644 --- a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml +++ b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml @@ -8,6 +8,7 @@ <control type="group"> <bottom>0</bottom> <height>250</height> + <animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation> <control type="image"> <left>10</left> <top>-240</top> diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index bad96dac4e..058abcd626 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <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) | !String.IsEmpty(Player.SeekNumeric) | [[Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)] + !Window.IsActive(pvrosdchannels) + !String.IsEmpty(PVR.ChannelNumberInput)]</visible> + <visible>Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput)</visible> <visible>!Window.IsActive(sliderdialog)</visible> + <visible>Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)</visible> <include>Animation_BottomSlide</include> <depth>DepthOSD</depth> <zorder>0</zorder> <controls> - <include>PVRChannelNumberInput</include> <control type="group"> <bottom>0</bottom> <height>190</height> @@ -75,9 +75,9 @@ <aligny>center</aligny> <font>font30</font> <wrapmultiline>true</wrapmultiline> - <visible>!Window.IsActive(fullscreeninfo)</visible> <animation effect="fade" time="200">VisibleChange</animation> <label>$INFO[Player.TimeRemaining,[COLOR button_focus]$LOCALIZE[31134]:[CR][/COLOR]]</label> + <visible>!Player.ShowInfo</visible> </control> </control> <control type="label"> @@ -266,5 +266,72 @@ </include> </control> </control> + <control type="group"> + <bottom>0</bottom> + <height>230</height> + <visible>!Window.IsVisible(playerprocessinfo)</visible> + <visible>Player.ShowInfo + !VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible> + <animation effect="fade" time="200">VisibleChange</animation> + <control type="group"> + <animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation> + <control type="image"> + <depth>DepthOSD+</depth> + <left>10</left> + <top>-490</top> + <width>400</width> + <height>600</height> + <aspectratio aligny="bottom">keep</aspectratio> + <texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + <include>OpenClose_Left</include> + </control> + <control type="group"> + <include>OpenClose_Right</include> + <control type="image"> + <left>400</left> + <top>-240</top> + <right>20</right> + <height>350</height> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="textbox"> + <left>443</left> + <top>-207</top> + <right>80</right> + <height>290</height> + <label fallback="416">$INFO[VideoPlayer.Tagline,[B],[/B][CR]]$INFO[VideoPlayer.Plot]</label> + <align>left</align> + <autoscroll delay="5000" repeat="7500" time="5000"></autoscroll> + </control> + </control> + </control> + <control type="grouplist"> + <right>20</right> + <top>155</top> + <width>1000</width> + <height>100</height> + <align>right</align> + <include>Animation_BottomSlide</include> + <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/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml index 92084b73a1..c3bd88c6d6 100644 --- a/addons/skin.estuary/xml/DialogVideoInfo.xml +++ b/addons/skin.estuary/xml/DialogVideoInfo.xml @@ -565,5 +565,6 @@ </control> </control> </control> + <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> </window> diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml index d20502fa14..c67cb8ab00 100644 --- a/addons/skin.estuary/xml/Home.xml +++ b/addons/skin.estuary/xml/Home.xml @@ -50,6 +50,7 @@ </include> <control type="grouplist" id="5001"> <include>WidgetGroupListCommon</include> + <pagecontrol>5010</pagecontrol> <include content="WidgetListCategories" condition="Library.HasContent(movies) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://video/movies/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> @@ -103,6 +104,9 @@ <param name="button_id" value="5500"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMovieButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="5010"/> + </include> </control> <control type="group" id="6000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),tvshows)</visible> @@ -111,6 +115,7 @@ </include> <control type="grouplist" id="6001"> <include>WidgetGroupListCommon</include> + <pagecontrol>6010</pagecontrol> <include content="WidgetListCategories" condition="Library.HasContent(tvshows) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://video/tvshows/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> @@ -150,7 +155,7 @@ <param name="widget_header" value="$LOCALIZE[20388]"/> <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" value="$VAR[WidgetStudioIconVar]"/> <param name="icon_height" value="70"/> </include> </control> @@ -161,6 +166,9 @@ <param name="button_id" value="6400"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVShowButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="6010"/> + </include> </control> <control type="group" id="7000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),music)</visible> @@ -169,6 +177,7 @@ </include> <control type="grouplist" id="7001"> <include>WidgetGroupListCommon</include> + <pagecontrol>7010</pagecontrol> <include content="WidgetListCategories" condition="Library.HasContent(music) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://music/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> @@ -227,6 +236,9 @@ <param name="button_id" value="7600"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="7010"/> + </include> </control> <control type="group" id="8000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),addons)</visible> @@ -235,12 +247,13 @@ </include> <control type="grouplist" id="8001"> <include>WidgetGroupListCommon</include> + <pagecontrol>8010</pagecontrol> <include content="WidgetListCategories" condition="!Skin.HasSetting(home_no_categories_widget)" > <param name="content_path" value="addons://"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="addonbrowser"/> <param name="list_id" value="8900"/> - <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="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) | Integer.IsGreater(Container(8700).NumItems,0)"/> </include> <include content="WidgetListSquare"> <param name="content_path" value="addons://sources/video/"/> @@ -305,6 +318,9 @@ <param name="visible" value="!Integer.IsGreater(Container(8001).NumItems,0)"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="8010"/> + </include> </control> <control type="group" id="11000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),video)</visible> @@ -313,6 +329,7 @@ </include> <control type="grouplist" id="11001"> <include>WidgetGroupListCommon</include> + <pagecontrol>11010</pagecontrol> <include content="WidgetListCategories"> <param name="content_path" value="library://video/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> @@ -341,6 +358,9 @@ <param name="visible" value="!Integer.IsGreater(Container(11001).NumItems,0)"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="11010"/> + </include> </control> <control type="group" id="12000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),livetv)</visible> @@ -349,6 +369,7 @@ </include> <control type="grouplist" id="12001"> <include>WidgetGroupListCommon</include> + <pagecontrol>12010</pagecontrol> <control type="grouplist" id="12855"> <height>390</height> <left>0</left> @@ -410,6 +431,9 @@ <param name="button_id" value="12400"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="12010"/> + </include> </control> <control type="group" id="13000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),radio)</visible> @@ -418,6 +442,7 @@ </include> <control type="grouplist" id="13001"> <include>WidgetGroupListCommon</include> + <pagecontrol>13010</pagecontrol> <control type="grouplist" id="13855"> <height>390</height> <left>25</left> @@ -479,6 +504,9 @@ <param name="button_id" value="13400"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoRadioButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="13010"/> + </include> </control> <control type="group" id="14000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),favorites)</visible> @@ -498,6 +526,7 @@ <preloaditems>2</preloaditems> <scrolltime tween="cubic" easing="out">500</scrolltime> <orientation>vertical</orientation> + <pagecontrol>14010</pagecontrol> <visible>Integer.IsGreater(Container(14100).NumItems,0) | Container(14100).IsUpdating</visible> <itemlayout width="330" height="396"> <control type="group"> @@ -531,6 +560,9 @@ <param name="visible_1" value="false"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoFavButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="14010"/> + </include> </control> <control type="group" id="15000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),weather)</visible> @@ -539,6 +571,7 @@ </include> <control type="grouplist" id="15001"> <include>WidgetGroupListCommon</include> + <pagecontrol>15010</pagecontrol> <control type="group" id="16678"> <description>Weather info</description> <left>68</left> @@ -552,7 +585,7 @@ <texture border="21">dialogs/dialog-bg.png</texture> </control> <control type="label"> - <left>300</left> + <left>840</left> <top>60</top> <aligny>center</aligny> <height>24</height> @@ -562,7 +595,7 @@ <label>$INFO[Weather.Location]</label> </control> <control type="label"> - <left>300</left> + <left>840</left> <top>120</top> <aligny>center</aligny> <height>24</height> @@ -625,6 +658,9 @@ <param name="button_id" value="15300"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoWeatherButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="15010"/> + </include> </control> <control type="group" id="16000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),musicvideos)</visible> @@ -633,6 +669,7 @@ </include> <control type="grouplist" id="16001"> <include>WidgetGroupListCommon</include> + <pagecontrol>16010</pagecontrol> <include content="WidgetListCategories" condition="Library.HasContent(musicvideos) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://music/musicvideos/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> @@ -681,7 +718,7 @@ <param name="widget_header" value="$LOCALIZE[20388]"/> <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" value="$VAR[WidgetStudioIconVar]"/> <param name="icon_height" value="70"/> </include> </control> @@ -692,6 +729,9 @@ <param name="button_id" value="16800"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicVideoButton)"/> </include> + <include content="WidgetScrollbar" condition="Skin.HasSetting(touchmode)"> + <param name="scrollbar_id" value="16010"/> + </include> </control> <control type="group" id="4000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),pictures)</visible> @@ -721,19 +761,19 @@ <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoGamesButton)"/> </include> <!-- - <control type="grouplist" id="17001"> - <include>WidgetGroupListCommon</include> - <include content="ImageWidget"> + <control type="grouplist" id="17001"> + <include>WidgetGroupListCommon</include> + <include content="ImageWidget"> - <param name="text_label" value="$LOCALIZE[31162]" /> - <param name="button_label" value="$LOCALIZE[31110]" /> - <param name="button_onclick" value="ActivateWindow(games)"/> - <param name="button_id" value="17100"/> - <param name="visible" value="true"/> - <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoGamesButton)"/> - </include> - </control> - --> + <param name="text_label" value="$LOCALIZE[31162]" /> + <param name="button_label" value="$LOCALIZE[31110]" /> + <param name="button_onclick" value="ActivateWindow(games)"/> + <param name="button_id" value="17100"/> + <param name="visible" value="true"/> + <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoGamesButton)"/> + </include> + </control> + --> </control> <control type="group" id="21000"> <visible>String.IsEqual(Container(9000).ListItem.Property(id),disc)</visible> @@ -743,7 +783,7 @@ <include content="ImageWidget"> <param name="text_label" value="$INFO[System.DVDLabel]" /> <param name="button_label" value="$LOCALIZE[341]" /> - <param name="button_onclick" value="PlayDVD"/> + <param name="button_onclick" value="PlayDisc"/> <param name="button_id" value="21100"/> <param name="visible" value="true"/> <param name="button2_label" value="$LOCALIZE[13391]"/> @@ -865,7 +905,7 @@ </item> <item> <label>$LOCALIZE[427]</label> - <onclick>PlayDVD</onclick> + <onclick>PlayDisc</onclick> <property name="menu_id">$NUMBER[21000]</property> <thumb>icons/sidemenu/disc.png</thumb> <property name="id">disc</property> @@ -985,6 +1025,33 @@ </control> </control> <include>BottomBar</include> + <control type="group"> + <depth>DepthBars</depth> + <bottom>0</bottom> + <height>70</height> + <animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <include condition="!Skin.HasSetting(hide_mediaflags)" content="MediaFlags"> + <param name="infolabel_prefix" value="Container." /> + <param name="resolution_var" value="$VAR[ContainerResolutionFlagVar]" /> + </include> + <control type="rss"> + <animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> + <left>0</left> + <bottom>0</bottom> + <height>39</height> + <width>100%</width> + <font>font12</font> + <urlset>1</urlset> + <hitrect x="-100" y="0" w="1" h="1" /> + <titlecolor>button_focus</titlecolor> + <textcolor>button_focus</textcolor> + <shadowcolor>text_shadow</shadowcolor> + <headlinecolor>FFC0C0C0</headlinecolor> + <visible>Skin.HasSetting(hide_mediaflags) | !ControlGroup(2000).HasFocus</visible> + <animation effect="fade" time="300">VisibleChange</animation> + </control> + </control> <include content="TopBar"> <param name="breadcrumbs_label" value="" /> </include> @@ -1010,24 +1077,6 @@ <texture>icons/logo-text.png</texture> </control> </control> - <control type="group"> - <animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> - <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300">WindowClose</animation> - <control type="rss"> - <left>0</left> - <bottom>0</bottom> - <height>39</height> - <width>100%</width> - <font>font12</font> - <urlset>1</urlset> - <hitrect x="-100" y="0" w="1" h="1" /> - <titlecolor>button_focus</titlecolor> - <shadowcolor>text_shadow</shadowcolor> - <headlinecolor>FFC0C0C0</headlinecolor> - <visible>!Player.hasMedia</visible> - </control> - </control> </control> </controls> </window> diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index 205e0ea551..b7d3de2834 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -16,8 +16,6 @@ <include file="View_501_Banner.xml" /> <include file="View_502_FanArt.xml" /> <include file="Variables.xml" /> - <include file="Constants_1920.xml" condition="!String.IsEqual(Skin.AspectRatio,21:9)"/> - <include file="Constants_2560.xml" condition="String.IsEqual(Skin.AspectRatio,21:9)"/> <constant name="DepthDialog">0.50</constant> <constant name="DepthDialog+">0.52</constant> <constant name="DepthDialog-">0.48</constant> @@ -34,40 +32,55 @@ <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_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Window.IsActive(MyPlaylist.xml)</expression> + <expression name="sidebar_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131) | Window.IsActive(MyPlaylist.xml)</expression> <include name="CommonScrollbars"> <control type="group"> <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="System.HasActiveModalDialog">Conditional</animation> <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> - <control type="scrollbar" id="531"> + <control type="group"> <right>0</right> <top>80</top> - <width>13</width> + <width>60</width> <bottom>80</bottom> - <onleft>50</onleft> - <onright>50</onright> - <orientation>vertical</orientation> - <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> - <visible>Control.IsVisible(52) | Control.IsVisible(500) | Control.IsVisible(55) | Control.IsVisible(501) | Control.IsVisible(54)</visible> + <control type="scrollbar" id="531"> + <right>0</right> + <top>0</top> + <bottom>0</bottom> + <width>13</width> + <onleft>50</onleft> + <onright>50</onright> + <orientation>vertical</orientation> + <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> + <visible>Control.IsVisible(52) | Control.IsVisible(500) | Control.IsVisible(55) | Control.IsVisible(501) | Control.IsVisible(54)</visible> + <hitrect x="-20" y="0" w="80" bottom="0r" /> + </control> </control> - <control type="scrollbar" id="5199"> + <control type="group"> <left>0</left> + <right>0</right> <bottom>0</bottom> <width>100%</width> - <height>12</height> - <texturesliderbackground /> - <onup>50</onup> - <ondown>50</ondown> - <orientation>horizontal</orientation> - <visible>Control.IsVisible(51) | Control.IsVisible(53)</visible> - <animation effect="slide" end="0,6" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(5199)">conditional</animation> - <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="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> + <height>60</height> + <control type="scrollbar" id="5199"> + <left>0</left> + <bottom>0</bottom> + <width>100%</width> + <height>12</height> + <texturesliderbackground /> + <onup>50</onup> + <ondown>50</ondown> + <orientation>horizontal</orientation> + <visible>Control.IsVisible(51) | Control.IsVisible(53)</visible> + <animation effect="slide" end="0,6" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(5199)">conditional</animation> + <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="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> + <hitrect x="0" y="20" w="100%" h="40" /> + </control> </control> </control> </include> @@ -81,33 +94,41 @@ <label></label> <font></font> </include> - <include name="UserRatingCircle"> + <include name="RatingCircle"> <param name="animation">False</param> <definition> <control type="group"> - <visible>!String.IsEmpty(ListItem.UserRating)</visible> <animation effect="fade" time="0" condition="$PARAM[animation]">VisibleChange</animation> - <control type="image"> - <left>3</left> - <top>-3</top> - <width>44</width> - <height>44</height> - <aspectratio>keep</aspectratio> - <texture colordiffuse="button_focus">overlays/badge.png</texture> - </control> - <control type="label"> - <left>3</left> - <top>-3</top> - <align>center</align> - <aligny>center</aligny> - <width>44</width> - <height>44</height> - <font>font20_title</font> - <label>$INFO[ListItem.UserRating]</label> - </control> + <include content="UserRatingContent" condition="Skin.HasSetting(circle_userrating)"> + <param name="infolabel" value="ListItem.UserRating" /> + </include> + <include content="UserRatingContent" condition="Skin.HasSetting(circle_rating)"> + <param name="infolabel" value="ListItem.Rating" /> + </include> </control> </definition> </include> + <include name="UserRatingContent"> + <visible>!String.IsEmpty($PARAM[infolabel])</visible> + <control type="image"> + <left>3</left> + <top>-3</top> + <width>44</width> + <height>44</height> + <aspectratio>keep</aspectratio> + <texture colordiffuse="button_focus">overlays/badge.png</texture> + </control> + <control type="label"> + <left>3</left> + <top>-3</top> + <align>center</align> + <aligny>center</aligny> + <width>44</width> + <height>44</height> + <font>font20_title</font> + <label>$INFO[$PARAM[infolabel]]</label> + </control> + </include> <include name="InfoList"> <param name="item_label">$INFO[ListItem.Year,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]</param> <param name="path">$VAR[InfoListPathVar]</param> @@ -362,63 +383,67 @@ </definition> </include> <include name="MediaFlags"> - <control type="grouplist"> - <orientation>horizontal</orientation> - <right>20</right> - <top>0</top> - <height>70</height> - <align>right</align> - <itemgap>28</itemgap> - <width>1900</width> - <usecontrolcoords>true</usecontrolcoords> - <control type="group"> - <width>150</width> - <top>-5</top> - <visible>String.IsEqual(ListItem.DBtype,tvshow)</visible> + <param name="infolabel_prefix"></param> + <param name="resolution_var">$VAR[ResolutionFlagVar]</param> + <definition> + <control type="grouplist"> + <orientation>horizontal</orientation> + <right>20</right> + <top>0</top> + <height>70</height> + <align>right</align> + <itemgap>28</itemgap> + <width>1900</width> + <usecontrolcoords>true</usecontrolcoords> + <control type="group"> + <width>150</width> + <top>-5</top> + <visible>String.IsEqual($PARAM[infolabel_prefix]ListItem.DBtype,tvshow)</visible> + <include content="MediaFlag"> + <param name="texture" value="$INFO[$PARAM[infolabel_prefix]ListItem.Studio,resource://resource.images.studios.white/,.png]" /> + </include> + </control> + <control type="group"> + <top>10</top> + <width>200</width> + <include content="InfoFlag"> + <param name="visible" value="[String.IsEqual($PARAM[infolabel_prefix]ListItem.DBtype,tvshow) | String.IsEqual($PARAM[infolabel_prefix]ListItem.DBtype,episode)] + !String.IsEmpty($PARAM[infolabel_prefix]ListItem.Premiered)" /> + <param name="icon" value="lists/year.png" /> + <param name="label" value="$INFO[$PARAM[infolabel_prefix]ListItem.Premiered]" /> + </include> + </control> + <control type="group"> + <width>115</width> + <visible>!String.IsEmpty($PARAM[infolabel_prefix]ListItem.Duration)</visible> + <control type="label"> + <width>115</width> + <height>60</height> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[$PARAM[infolabel_prefix]ListItem.Duration]</label> + <font>font_flag</font> + </control> + <include content="MediaFlag"> + <param name="texture" value="flags/flag.png" /> + </include> + </control> <include content="MediaFlag"> - <param name="texture" value="$INFO[ListItem.Studio,resource://resource.images.studios.white/,.png]" /> + <param name="texture" value="$INFO[$PARAM[infolabel_prefix]ListItem.AudioChannels,flags/audiochannel/,.png]" /> + <param name="visible" value="!String.IsEmpty($PARAM[infolabel_prefix]ListItem.AudioChannels)" /> </include> - </control> - <control type="group"> - <top>10</top> - <width>200</width> - <include content="InfoFlag"> - <param name="visible" value="[String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,episode)] + !String.IsEmpty(ListItem.Premiered)" /> - <param name="icon" value="lists/year.png" /> - <param name="label" value="$INFO[ListItem.Premiered]" /> + <include content="MediaFlag"> + <param name="texture" value="$INFO[$PARAM[infolabel_prefix]ListItem.AudioCodec,flags/audiocodec/,.png]" /> + <param name="visible" value="!String.IsEmpty($PARAM[infolabel_prefix]ListItem.AudioCodec)" /> </include> - </control> - <control type="group"> - <width>115</width> - <visible>!String.IsEmpty(ListItem.Duration)</visible> - <control type="label"> - <width>115</width> - <height>60</height> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Duration]</label> - <font>font_flag</font> - </control> + <!-- <include content="MediaFlag"> + <param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" /> + </include> --> <include content="MediaFlag"> - <param name="texture" value="flags/flag.png" /> + <param name="texture" value="$PARAM[resolution_var]" /> + <param name="visible" value="!String.IsEmpty($PARAM[infolabel_prefix]ListItem.VideoResolution)" /> </include> </control> - <include content="MediaFlag"> - <param name="texture" value="$INFO[ListItem.AudioChannels,flags/audiochannel/,.png]" /> - <param name="visible" value="!String.IsEmpty(ListItem.AudioChannels)" /> - </include> - <include content="MediaFlag"> - <param name="texture" value="$INFO[ListItem.AudioCodec,flags/audiocodec/,.png]" /> - <param name="visible" value="!String.IsEmpty(ListItem.AudioCodec)" /> - </include> - <!-- <include content="MediaFlag"> - <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)" /> - </include> - </control> + </definition> </include> <include name="WeatherIcon"> <control type="group"> @@ -442,11 +467,14 @@ </control> </include> <include name="FileManagerPanel"> + <param name="width"></param> + <param name="right"></param> <definition> <control type="fixedlist" id="$PARAM[list_id]"> <left>0</left> <top>list_y_offset</top> <bottom>list_y_offset</bottom> + <right>$PARAM[right]</right> <width>$PARAM[width]</width> <focusposition>4</focusposition> <movement>3</movement> @@ -456,7 +484,7 @@ <ondown>$PARAM[list_id]</ondown> <pagecontrol>$PARAM[scrollbar_id]</pagecontrol> <scrolltime>200</scrolltime> - <focusedlayout height="list_item_height" width="$PARAM[width]"> + <focusedlayout height="list_item_height"> <control type="image"> <left>0</left> <top>0</top> @@ -465,12 +493,19 @@ <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus($PARAM[list_id])">Conditional</animation> </control> + <control type="image"> + <left>15</left> + <top>0</top> + <width>32</width> + <bottom>0</bottom> + <aspectratio aligny="center">keep</aspectratio> + <texture>$VAR[ListWatchedIconVar]</texture> + </control> <control type="label"> - <left>20</left> - <textoffsetx>15</textoffsetx> + <left>65</left> <top>0</top> <bottom>0</bottom> - <right>0</right> + <right>20</right> <aligny>center</aligny> <scroll>true</scroll> <label>$INFO[ListItem.Label]</label> @@ -488,13 +523,20 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="list_item_height" width="$PARAM[width]"> + <itemlayout height="list_item_height"> + <control type="image"> + <left>15</left> + <top>0</top> + <width>32</width> + <bottom>0</bottom> + <aspectratio aligny="center">keep</aspectratio> + <texture>$VAR[ListWatchedIconVar]</texture> + </control> <control type="label"> - <left>20</left> - <textoffsetx>15</textoffsetx> + <left>65</left> <top>0</top> <bottom>0</bottom> - <right>0</right> + <right>20</right> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> @@ -622,11 +664,11 @@ <param name="posy">20</param> <definition> <control type="grouplist"> - <left>3%</left> + <left>100</left> + <right>100</right> <top>$PARAM[posy]</top> <animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> - <width>94%</width> <height>150</height> <itemgap>0</itemgap> <orientation>vertical</orientation> @@ -764,11 +806,12 @@ </control> <control type="group"> <width>$PARAM[width]</width> + <height>$PARAM[height]</height> <control type="image"> <left>0</left> <top>0</top> <right>0</right> - <height>$PARAM[height]</height> + <bottom>0</bottom> <texture colordiffuse="dialog_tint">colors/white.png</texture> </control> <control type="image"> @@ -793,13 +836,13 @@ <left>0</left> <top>0</top> <right>0</right> - <height>$PARAM[height]</height> + <bottom>0</bottom> <texturefocus /> <texturenofocus /> <onclick>noop</onclick> </control> <control type="radiobutton"> - <right>32</right> + <right>10</right> <top>11</top> <width>48</width> <height>48</height> @@ -813,6 +856,17 @@ <textureradioonfocus colordiffuse="EEFFFFFF">dialogs/close.png</textureradioonfocus> <textureradioonnofocus colordiffuse="EEFFFFFF">icons/logo.png</textureradioonnofocus> <onclick>Action(close)</onclick> + <visible>!Skin.HasSetting(touchmode)</visible> + </control> + <control type="button"> + <right>10</right> + <top>11</top> + <width>48</width> + <height>48</height> + <texturefocus>dialogs/close.png</texturefocus> + <texturenofocus>dialogs/close.png</texturenofocus> + <onclick>Action(close)</onclick> + <visible>Skin.HasSetting(touchmode)</visible> </control> </control> </include> @@ -841,7 +895,8 @@ <usecontrolcoords>true</usecontrolcoords> <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> - <animation effect="slide" end="0,10" time="200" reversible="true" condition="String.IsEmpty(Control.GetLabel(18900))">Conditional</animation> + <animation effect="slide" end="0,16" time="200" reversible="true" condition="String.IsEmpty(Control.GetLabel(18900))">Conditional</animation> + <animation effect="slide" end="70,0" time="200" reversible="true" condition="Control.IsVisible(701)">Conditional</animation> <control type="label"> <label>$PARAM[breadcrumbs_label]</label> <include>BreadcrumbsLabel</include> @@ -892,6 +947,7 @@ <width>900</width> <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="slide" end="70,0" time="200" reversible="true" condition="Control.IsVisible(701)">Conditional</animation> </control> <control type="grouplist"> <top>0</top> @@ -901,7 +957,7 @@ <orientation>horizontal</orientation> <width>900</width> <itemgap>10</itemgap> - <visible>!Window.IsVisible(extendedprogressdialog)</visible> + <visible>!Window.IsVisible(extendedprogressdialog) + !Window.IsActive(fullscreenvideo)</visible> <animation effect="fade" time="150">VisibleChange</animation> <control type="group"> <width>600</width> @@ -1021,6 +1077,7 @@ <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> </control> </control> + <include condition="Skin.HasSetting(touchmode) + !Window.IsActive(home)">TouchBackButton</include> </definition> </include> <include name="BreadcrumbsLabel"> @@ -1310,6 +1367,20 @@ <onright>2000</onright> <align>justify</align> <usecontrolcoords>true</usecontrolcoords> + <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 type="group"> <width>120</width> <control type="button"> @@ -1335,20 +1406,101 @@ <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> + <include name="TouchBackButton"> + <control type="radiobutton" id="701"> + <left>-10</left> + <top>-10</top> + <width>120</width> + <height>120</height> + <align>center</align> + <aligny>center</aligny> + <onclick>Action(Back)</onclick> + <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> + <texturefocus colordiffuse="button_focus">buttons/roundbutton-fo.png</texturefocus> + <texturenofocus /> + <radioposx>30</radioposx> + <radiowidth>60</radiowidth> + <radioheight>60</radioheight> + <textureradioonfocus>icons/back.png</textureradioonfocus> + <textureradioonnofocus colordiffuse="grey">icons/back.png</textureradioonnofocus> + <textureradioofffocus>icons/back.png</textureradioofffocus> + <textureradiooffnofocus colordiffuse="grey">icons/back.png</textureradiooffnofocus> + </control> + </include> + <include name="SettingsPanel"> + <itemlayout height="260" width="400"> + <control type="image"> + <left>-5</left> + <width>410</width> + <height>270</height> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="image"> + <centerleft>50%</centerleft> + <top>30</top> + <width>240</width> + <height>160</height> + <texture>$INFO[ListItem.Icon]</texture> + <align>center</align> + <aspectratio>scale</aspectratio> + </control> + <control type="label"> + <left>25</left> + <top>190</top> + <width>350</width> + <height>400</height> + <label>$INFO[ListItem.Label]</label> + <align>center</align> + </control> + </itemlayout> + <focusedlayout height="230" width="400"> + <control type="group"> + <depth>DepthContentPopout</depth> + <animation type="Focus" reversible="false"> + <effect type="zoom" center="200,140" start="100" end="110" time="250" tween="sine" /> + </animation> + <animation type="UnFocus" reversible="false"> + <effect type="zoom" center="200,140" start="110" end="100" time="250" tween="sine" /> + </animation> + <control type="image"> + <left>-5</left> + <width>410</width> + <height>270</height> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> + <bordersize>20</bordersize> + </control> + <control type="image"> + <left>-5</left> + <width>410</width> + <height>270</height> + <texture colordiffuse="button_focus">colors/grey.png</texture> + <bordersize>20</bordersize> + <include>Animation_FocusTextureFade</include> + </control> + <control type="image"> + <centerleft>50%</centerleft> + <top>30</top> + <width>240</width> + <height>160</height> + <texture>$INFO[ListItem.Icon]</texture> + <align>center</align> + <aspectratio>scale</aspectratio> + </control> + <control type="label"> + <left>25</left> + <top>190</top> + <width>350</width> + <height>400</height> + <label>$INFO[ListItem.Label]</label> + <align>center</align> + </control> + </control> + </focusedlayout> + </include> </includes> diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml index fff35fbbef..a0e44e01a6 100644 --- a/addons/skin.estuary/xml/Includes_MediaMenu.xml +++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml @@ -266,6 +266,15 @@ <height>100%</height> <texture border="0,0,52,0">lists/panel-mediamenu.png</texture> </control> + <control type="button" id="6131"> + <left>0</left> + <top>0</top> + <width>500</width> + <height>100%</height> + <label></label> + <texturefocus /> + <texturenofocus /> + </control> <control type="button" id="3"> <description>Viewtype Toggle</description> <include>HiddenObject</include> @@ -369,10 +378,10 @@ <include name="MediaMenuMouseOverlay"> <control type="button" id="6130"> <label></label> - <height>100%</height> - <width>50</width> <left>-50</left> - <top>0</top> + <top>200</top> + <bottom>0</bottom> + <width>50</width> <texturefocus /> <texturenofocus /> </control> diff --git a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml index 451060150e..1ee80de6e7 100644 --- a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml @@ -12,7 +12,7 @@ <param name="scrollbar_id" value="60" /> <param name="onleft_id" value="9000" /> <param name="onright_id" value="60" /> - <param name="width" value="playlisteditorlist_width" /> + <param name="right" value="848" /> </include> </control> <control type="group"> @@ -63,7 +63,7 @@ <param name="scrollbar_id" value="61" /> <param name="onleft_id" value="60" /> <param name="onright_id" value="61" /> - <param name="width" value="850" /> + <param name="right" value="-5" /> </include> <control type="scrollbar" id="60"> <left>0</left> diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml index f66dc10734..f0ca236235 100644 --- a/addons/skin.estuary/xml/MyPlaylist.xml +++ b/addons/skin.estuary/xml/MyPlaylist.xml @@ -25,7 +25,7 @@ <pagecontrol>60</pagecontrol> <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> - <focusedlayout height="list_item_height" width="playlistlist_width"> + <focusedlayout height="list_item_height"> <control type="image"> <left>0</left> <right>0</right> @@ -53,7 +53,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="list_item_height" width="playlistlist_width"> + <itemlayout height="list_item_height"> <control type="label"> <left>30</left> <bottom>0</bottom> diff --git a/addons/skin.estuary/xml/SettingsCategory.xml b/addons/skin.estuary/xml/SettingsCategory.xml index a5498a347c..e5d4cd71e4 100644 --- a/addons/skin.estuary/xml/SettingsCategory.xml +++ b/addons/skin.estuary/xml/SettingsCategory.xml @@ -134,20 +134,27 @@ <textureradiooffnofocus>icons/settings.png</textureradiooffnofocus> </control> </control> - <control type="scrollbar" id="60"> + <control type="group"> <right>0</right> <top>163</top> - <width>12</width> <bottom>137</bottom> - <orientation>vertical</orientation> - <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> - <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> - <animation effect="fade" start="100" end="0" time="200">Hidden</animation> - <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> + <width>60</width> + <control type="scrollbar" id="60"> + <right>0</right> + <top>0</top> + <bottom>0</bottom> + <width>12</width> + <orientation>vertical</orientation> + <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> + <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> + <animation effect="fade" start="100" end="0" time="200">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> + <hitrect x="0" y="0" w="60" h="100%" /> + </control> </control> <include content="TopBar"> <param name="breadcrumbs_label" value="$LOCALIZE[5]$INFO[Control.GetLabel(2), / ]" /> diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml index 8ca7df23fa..0f2ed54034 100644 --- a/addons/skin.estuary/xml/SkinSettings.xml +++ b/addons/skin.estuary/xml/SkinSettings.xml @@ -27,8 +27,8 @@ <bottom>140</bottom> <onleft>9000</onleft> <onright>60</onright> - <onup>600</onup> - <ondown>600</ondown> + <onup>700</onup> + <ondown>700</ondown> <visible>Container(9000).HasFocus(1)</visible> <control type="radiobutton" id="701"> <label>$LOCALIZE[31095]</label> @@ -61,6 +61,12 @@ <onclick>Skin.ToggleSetting(hide_mediaflags)</onclick> <selected>!Skin.HasSetting(hide_mediaflags)</selected> </control> + <control type="button" id="706"> + <label>$LOCALIZE[31024]</label> + <include>DefaultSettingButton</include> + <onclick>Skin.SelectBool($LOCALIZE[31024], 38018|circle_userrating, 563|circle_rating, 16018|)</onclick> + <label2>$VAR[RatingSettingLabel2Var]</label2> + </control> </control> <control type="grouplist" id="600"> <top>160</top> @@ -303,21 +309,28 @@ </content> </control> </control> - <control type="scrollbar" id="60"> + <control type="group"> <right>0</right> <top>163</top> - <width>12</width> <bottom>137</bottom> - <orientation>vertical</orientation> - <texturesliderbackground /> - <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> - <onleft>610</onleft> - <onright>610</onright> - <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> - <animation effect="fade" start="100" end="0" time="200">Hidden</animation> - <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> - <visible>Control.IsVisible(610)</visible> + <width>60</width> + <control type="scrollbar" id="60"> + <right>0</right> + <top>0</top> + <bottom>0</bottom> + <width>12</width> + <orientation>vertical</orientation> + <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> + <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> + <animation effect="fade" start="100" end="0" time="200">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> + <hitrect x="0" y="0" w="60" h="100%" /> + <visible>Control.IsVisible(610)</visible> + </control> </control> <include content="TopBar"> <param name="breadcrumbs_label" value="$LOCALIZE[5] / $LOCALIZE[20077]" /> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 007ed12300..055f155843 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -44,11 +44,6 @@ <value condition="VideoPlayer.Content(livetv)">$INFO[VideoPlayer.ChannelName]</value> <value condition="Player.HasAudio">$INFO[MusicPlayer.Artist]</value> </variable> - <variable name="FullScreenInfoTextBoxVar"> - <value condition="Control.HasFocus(5553)">$INFO[VideoPlayer.Tagline,[B],[/B][CR]]$INFO[VideoPlayer.Plot]</value> - <value condition="Control.HasFocus(5555)">$INFO[VideoPlayer.NextTitle,[B],[/B][CR]]$INFO[VideoPlayer.NextPlot]</value> - <value>$INFO[VideoPlayer.CastAndRole]</value> - </variable> <variable name="NowPlayingIconVar"> <value condition="Player.Paused">icons/now-playing/pause.png</value> <value>icons/now-playing/play.png</value> @@ -76,7 +71,8 @@ <value>$INFO[ListItem.Icon]</value> </variable> <variable name="IconWallThumbVar"> - <value condition="String.IsEqual(listitem.dbtype,studio)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value> + <value condition="String.IsEqual(listitem.dbtype,genre) + System.HasAddon(resource.images.moviegenreicons.transparent)">$INFO[ListItem.Label,resource://resource.images.moviegenreicons.transparent/,.png]</value> + <value condition="String.IsEqual(listitem.dbtype,studio) + System.HasAddon(resource.images.studios.white)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value> <value condition="!String.isempty(ListItem.Thumb)">$INFO[ListItem.Thumb]</value> <value>$INFO[ListItem.Icon]</value> </variable> @@ -131,11 +127,20 @@ <value condition="System.HasAddon(resource.images.moviegenreicons.transparent)">$INFO[ListItem.Label,resource://resource.images.moviegenreicons.transparent/,.png]</value> <value>DefaultGenre.png</value> </variable> + <variable name="WidgetStudioIconVar"> + <value condition="System.HasAddon(resource.images.studios.white)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value> + <value>DefaultStudio.png</value> + </variable> <variable name="AddonsLabel2Var"> <value condition="ListItem.Property(addon.downloading)">$INFO[ListItem.Property(addon.status)]</value> <value condition="!String.IsEqual(Container.SortMethod,$LOCALIZE[551])">$INFO[ListItem.Label2]</value> <value>$INFO[ListItem.AddonCreator,, - ]$INFO[ListItem.AddonVersion]</value> </variable> + <variable name="RatingSettingLabel2Var"> + <value condition="Skin.HasSetting(circle_rating)">$LOCALIZE[563]</value> + <value condition="Skin.HasSetting(circle_userrating)">$LOCALIZE[38018]</value> + <value>$LOCALIZE[16018]</value> + </variable> <variable name="AddonsListIconVar"> <value condition="!String.IsEmpty(ListItem.AddonBroken)">icons/addonstatus/disable.png</value> <value condition="ListItem.Property(addon.orphaned)">icons/addonstatus/orphan.png</value> @@ -150,6 +155,11 @@ <value condition="Integer.IsGreater(ListItem.VideoResolution,1080)">flags/videoresolution/4K.png</value> <value>$INFO[ListItem.VideoResolution,flags/videoresolution/,.png]</value> </variable> + <variable name="ContainerResolutionFlagVar"> + <value condition="Container.ListItem.IsStereoscopic">flags/videoresolution/3D.png</value> + <value condition="Integer.IsGreater(Container.ListItem.VideoResolution,1080)">flags/videoresolution/4K.png</value> + <value>$INFO[Container.ListItem.VideoResolution,flags/videoresolution/,.png]</value> + </variable> <variable name="BannerVar"> <value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value> <value>$INFO[ListItem.Art(tvshow.banner)]</value> @@ -168,10 +178,6 @@ <value condition="!String.IsEmpty(ListItem.Art(season.poster))">$INFO[ListItem.Art(season.poster)]</value> <value condition="!String.IsEmpty(ListItem.Art(tvshow.poster))">$INFO[ListItem.Art(tvshow.poster)]</value> </variable> - <variable name="ListPosterVar"> - <value condition="ListItem.IsParentFolder">DefaultFolderBackPoster.png</value> - <value>$INFO[ListItem.Art(poster)]</value> - </variable> <variable name="BannerLabel2Var"> <value condition="String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> <!-- <value>$INFO[ListItem.Year]</value> @@ -255,7 +261,7 @@ <value>$LOCALIZE[31000]...</value> </variable> <variable name="OSDSubLabelVar"> - <value condition="Window.IsActive(visualisation)">$LOCALIZE[554] $INFO[Playlist.Position] / $INFO[Playlist.Length]</value> + <value condition="Window.IsActive(visualisation) + Integer.IsGreater(Playlist.Length,1)">$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]</value> @@ -298,6 +304,7 @@ <value condition="ListItem.IsPlaying">overlays/watched/OverlayPlaying-List.png</value> <value condition="ListItem.IsResumable">overlays/watched/resume.png</value> <value condition="ListItem.IsCollection">overlays/set.png</value> + <value condition="ListItem.IsFolder + String.IsEmpty(Listitem.dbtype) + !String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !ListItem.IsParentFolder">overlays/folder.png</value> <value condition="!String.IsEmpty(ListItem.Overlay)">$INFO[ListItem.Overlay]</value> <value condition="!ListItem.IsParentFolder">OverlayUnwatched.png</value> </variable> diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index abef177b6f..ba9925b450 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <window> - <onload>Dialog.Close(fullscreeninfo)</onload> <onload condition="VideoPlayer.Content(LiveTV) + !Player.PauseEnabled">SetFocus(603)</onload> <depth>DepthOSD</depth> <defaultcontrol always="true">602</defaultcontrol> @@ -19,7 +18,7 @@ <control type="group"> <bottom>0</bottom> <height>180</height> - <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(fullscreeninfo) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> + <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> <animation effect="fade" time="200">VisibleChange</animation> <control type="label"> <right>30</right> @@ -30,7 +29,7 @@ <width>1000</width> <height>60</height> <label>$VAR[VideoOSDHelpTextVar]</label> - <visible>!Player.ShowInfo</visible> + <visible>!Player.ShowInfo + !PVR.IsTimeShift</visible> </control> <control type="group" id="200"> <control type="grouplist" id="201"> @@ -44,7 +43,7 @@ <onup>87</onup> <ondown>noop</ondown> <onleft>70043</onleft> - <onright>70011</onright> + <onright>70040</onright> <control type="radiobutton" id="600"> <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/previous.png"/> @@ -127,14 +126,14 @@ <ondown condition="Control.HasFocus(255)">13103</ondown> <onleft>606</onleft> <onright>600</onright> - <control type="radiobutton" id="70011"> +<!-- <control type="radiobutton" id="70011"> <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/information.png"/> </include> <onclick>Action(Close)</onclick> <onclick>ActivateWindow(fullscreeninfo)</onclick> </control> - <control type="radiobutton" id="70040"> + --> <control type="radiobutton" id="70040"> <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/channels.png"/> </include> diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml index c06722bca1..37b815930e 100644 --- a/addons/skin.estuary/xml/View_501_Banner.xml +++ b/addons/skin.estuary/xml/View_501_Banner.xml @@ -47,7 +47,7 @@ </control> <control type="group"> <left>405</left> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </control> </itemlayout> @@ -157,7 +157,7 @@ </control> <control type="group"> <left>405</left> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </control> </focusedlayout> diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml index 4e0703d9b9..23af072e98 100644 --- a/addons/skin.estuary/xml/View_502_FanArt.xml +++ b/addons/skin.estuary/xml/View_502_FanArt.xml @@ -3,10 +3,11 @@ <include name="View_502_FanArt"> <control type="group"> <include>OpenClose_Left</include> - <left>-5</left> <visible>Control.IsVisible(502)</visible> <include>Visible_Left</include> <include content="ListContainer"> + <param name="left" value="-5" /> + <param name="right" value="1195" /> <param name="list_id" value="502" /> <param name="viewtype_label" value="$LOCALIZE[20445]" /> </include> @@ -37,7 +38,7 @@ <control type="group"> <left>600</left> <top>82</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> <control type="textbox"> <left>50</left> diff --git a/addons/skin.estuary/xml/View_50_List.xml b/addons/skin.estuary/xml/View_50_List.xml index 84097611bf..26a3f15a09 100644 --- a/addons/skin.estuary/xml/View_50_List.xml +++ b/addons/skin.estuary/xml/View_50_List.xml @@ -8,6 +8,7 @@ <include>Visible_Right</include> <include content="ListContainer"> <param name="list_id" value="50" /> + <param name="right" value="594" /> <param name="viewtype_label" value="$LOCALIZE[535]" /> </include> <control type="group"> @@ -30,6 +31,7 @@ <onright>50</onright> <orientation>vertical</orientation> <animation effect="zoom" end="50,100" time="300" tween="sine" center="20,0" easing="inout" condition="!Control.HasFocus(50600)">conditional</animation> + <hitrect x="-30" y="0" w="120" h="100%" /> </control> <control type="image"> <depth>DepthContentPopout</depth> @@ -44,7 +46,7 @@ <control type="group"> <left>310</left> <top>936</top> - <include content="UserRatingCircle"> + <include content="RatingCircle"> <param name="animation" value="True" /> </include> </control> @@ -53,105 +55,109 @@ </control> </include> <include name="ListContainer"> - <control type="fixedlist" id="$PARAM[list_id]"> - <left>0</left> - <width>list_width</width> - <top>list_y_offset</top> - <bottom>list_y_offset</bottom> - <movement>5</movement> - <focusposition>6</focusposition> - <scrolltime tween="cubic" easing="out">500</scrolltime> - <orientation>vertical</orientation> - <pagecontrol>$PARAM[list_id]600</pagecontrol> - <onleft>9000</onleft> - <onright>$PARAM[list_id]600</onright> - <onup>$PARAM[list_id]</onup> - <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) | Container.Content(games) | Window.IsActive(MyPlaylist.xml)</visible> - <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="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> + <param name="left">0</param> + <param name="right">0</param> + <definition> + <control type="fixedlist" id="$PARAM[list_id]"> + <left>$PARAM[left]</left> + <right>$PARAM[right]</right> + <top>list_y_offset</top> + <bottom>list_y_offset</bottom> + <movement>5</movement> + <focusposition>6</focusposition> + <scrolltime tween="cubic" easing="out">500</scrolltime> + <orientation>vertical</orientation> + <pagecontrol>$PARAM[list_id]600</pagecontrol> + <onleft>9000</onleft> + <onright>$PARAM[list_id]600</onright> + <onup>$PARAM[list_id]</onup> + <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) | Container.Content(games) | Window.IsActive(MyPlaylist.xml)</visible> + <focusedlayout height="list_item_height"> + <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="list_item_height"> + <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> + </definition> </include> <include name="ListThumbInfoPanel"> <param name="flip_bg">false</param> @@ -185,7 +191,7 @@ <control type="group"> <left>273</left> <top>590</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> <animation effect="slide" end="0,-140" time="0" condition="String.IsEqual(ListItem.DbType,episode)">conditional</animation> </control> <control type="group"> diff --git a/addons/skin.estuary/xml/View_51_Poster.xml b/addons/skin.estuary/xml/View_51_Poster.xml index ff91cb130d..faf7feb4f1 100644 --- a/addons/skin.estuary/xml/View_51_Poster.xml +++ b/addons/skin.estuary/xml/View_51_Poster.xml @@ -17,7 +17,7 @@ <left>0</left> <top>4</top> <width>100%</width> - <height>400</height> + <height>410</height> <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="300">WindowClose</animation> <animation effect="fade" time="200">VisibleChange</animation> @@ -49,105 +49,27 @@ <itemlayout width="317"> <control type="group"> <left>-220</left> - <control type="image"> - <left>20</left> - <top>8</top> - <width>276</width> - <height>394</height> - <aspectratio>scale</aspectratio> - <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="textbox"> - <left>51</left> - <top>252</top> - <width>214</width> - <height>100</height> - <label>$INFO[ListItem.Label]</label> - <font>font25_title</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - <aligny>center</aligny> - <visible>String.IsEmpty(ListItem.Art(poster)) + !Listitem.IsParentFolder</visible> - </control> - <control type="group"> - <left>133</left> - <top>10</top> - <include>UserRatingCircle</include> - </control> - <control type="image"> - <left>40</left> - <top>302</top> - <width>80</width> - <height>80</height> - <texture>overlays/overlay-bg.png</texture> - <visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> - </control> - <control type="image"> - <left>40</left> - <top>349</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> - </control> + <top>18</top> + <include>InfoWallMovieLayout</include> </control> </itemlayout> <focusedlayout width="490"> <control type="group"> - <left>-220</left> - <control type="image"> - <left>20</left> - <top>8</top> - <width>276</width> - <height>394</height> - <aspectratio>scale</aspectratio> - <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> + <control type="group"> + <left>-220</left> + <top>18</top> <visible>Container.OnScrollPrevious</visible> - <animation effect="fade" time="200" start="100" end="0">Hidden</animation> <visible>Control.IsVisible(20000)</visible> + <animation effect="fade" time="200" start="100" end="0">Hidden</animation> + <include>InfoWallMovieLayout</include> </control> - <control type="image"> - <left>173</left> - <top>8</top> - <width>276</width> - <height>394</height> - <aspectratio>scale</aspectratio> - <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> + <control type="group"> + <left>-40</left> + <top>18</top> <visible>Container.OnScrollNext</visible> - <animation effect="fade" time="200" start="100" end="0">Hidden</animation> <visible>Control.IsVisible(20000)</visible> - </control> - <control type="textbox"> - <left>51</left> - <top>252</top> - <width>214</width> - <height>100</height> - <label>$INFO[ListItem.Label]</label> - <font>font25_title</font> - <shadowcolor>text_shadow</shadowcolor> - <align>center</align> - <aligny>center</aligny> - <visible>String.IsEmpty(ListItem.Art(poster)) + !Listitem.IsParentFolder</visible> - </control> - <control type="image"> - <left>40</left> - <top>328</top> - <width>54</width> - <height>54</height> - <texture>overlays/overlay-bg.png</texture> - <visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> - </control> - <control type="image"> - <left>38</left> - <top>349</top> - <width>32</width> - <height>32</height> - <texture>$VAR[WallWatchedIconVar]</texture> + <animation effect="fade" time="200" start="100" end="0">Hidden</animation> + <include>InfoWallMovieLayout</include> </control> </control> </focusedlayout> @@ -233,7 +155,7 @@ <control type="group"> <left>216</left> <top>-18</top> - <include content="UserRatingCircle"> + <include content="RatingCircle"> <param name="animation" value="True" /> </include> </control> diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml index 3777a6cb5e..83d6f03a66 100644 --- a/addons/skin.estuary/xml/View_52_IconWall.xml +++ b/addons/skin.estuary/xml/View_52_IconWall.xml @@ -19,7 +19,7 @@ <scrolltime tween="cubic" easing="out">500</scrolltime> <visible>Container.Content() | Container.Content(tags) | Container.Content(years) | Container.Content(roles) | Container.Content(genres) | Container.Content(countries) | Container.Content(studios) | Container.Content(playlists) | Container.Content(unknown)</visible> <viewtype label="31099">icon</viewtype> - <itemlayout height="280" width="440" condition="Container.Content() | Container.Content(unknown) | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]"> + <itemlayout height="280" width="440" condition="Container.Content() | Container.Content(tags) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]"> <control type="group"> <top>150</top> <control type="image"> @@ -45,15 +45,6 @@ <height>75</height> <texture colordiffuse="border_alpha">colors/black.png</texture> </control> - <control type="image"> - <left>329</left> - <top>24</top> - <width>50</width> - <height>50</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[ListItem.Overlay]</texture> - <visible>!String.EndsWith(ListItem.Overlay,watched.png)</visible> - </control> <control type="textbox"> <left>25</left> <top>148</top> @@ -66,7 +57,7 @@ </control> </control> </itemlayout> - <focusedlayout height="280" width="440" condition="Container.Content() | Container.Content(unknown) | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]"> + <focusedlayout height="280" width="440" condition="Container.Content() | Container.Content(tags) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]"> <control type="group"> <depth>DepthContentPopout</depth> <animation type="Focus"> @@ -100,15 +91,6 @@ <align>center</align> </control> <control type="image"> - <left>329</left> - <top>24</top> - <width>50</width> - <height>50</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[ListItem.Overlay]</texture> - <visible>!String.EndsWith(ListItem.Overlay,watched.png)</visible> - </control> - <control type="image"> <left>20</left> <top>150</top> <width>356</width> diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index 2f4fa70863..ae74935067 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -115,7 +115,7 @@ <control type="group"> <left>133</left> <top>2</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </definition> </include> @@ -225,7 +225,7 @@ <control type="group"> <left>134</left> <top>8</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> </definition> </include> @@ -304,7 +304,7 @@ <width>80</width> <height>80</height> <texture>overlays/overlay-bg.png</texture> - <visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> + <visible>Listitem.IsCollection | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible> </control> </control> <control type="group"> @@ -345,7 +345,7 @@ <control type="group"> <left>135</left> <top>-8</top> - <include>UserRatingCircle</include> + <include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include> </control> <control type="progress"> <left>35</left> diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml index 7ce10ede2e..a0a6c5e558 100644 --- a/addons/skin.estuary/xml/View_55_WideList.xml +++ b/addons/skin.estuary/xml/View_55_WideList.xml @@ -20,8 +20,7 @@ <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="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)"> + <focusedlayout height="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos)"> <control type="image"> <left>0</left> <right>0</right> @@ -29,23 +28,78 @@ <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(55)</visible> </control> + <control type="image"> + <left>35</left> + <centertop>50%</centertop> + <width>32</width> + <height>32</height> + <texture>$VAR[ListWatchedIconVar]</texture> + </control> <control type="label"> - <left>18</left> + <left>105</left> <top>0</top> <bottom>0</bottom> - <width>80</width> + <right>100</right> <aligny>center</aligny> - <label>$INFO[ListItem.Year]</label> + <scroll>true</scroll> + <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> - <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(videos)</visible> </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="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos)"> <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) | Container.Content(videos) | String.IsEmpty(ListItem.Year)</visible> + <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> + </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> + </itemlayout> + <focusedlayout height="list_item_height" condition="!Container.Content(songs) + !Container.Content(addons) + !Container.Content(playlists) + !Container.Content() + !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(musicvideos) + !Container.Content(videos)"> + <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> </control> <control type="label"> <left>105</left> @@ -68,7 +122,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <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)"> + <itemlayout height="list_item_height" condition="!Container.Content(songs) + !Container.Content(addons) + !Container.Content(playlists) + !Container.Content() + !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(musicvideos) + !Container.Content(videos)"> <control type="label"> <left>18</left> <top>0</top> @@ -78,15 +132,6 @@ <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) + !Container.Content(videos)</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) | Container.Content(videos) | String.IsEmpty(ListItem.Year)</visible> </control> <control type="label"> <left>105</left> @@ -107,13 +152,52 @@ <label>$VAR[ListLabel2Var]</label> <shadowcolor>text_shadow</shadowcolor> </control> + </itemlayout> + + <focusedlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content()"> <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> + <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="image"> + <left>20</left> + <top>10</top> + <width>60</width> + <bottom>10</bottom> + <aspectratio>keep</aspectratio> + <texture>$INFO[ListItem.Icon]</texture> + </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> + </focusedlayout> + <itemlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content()"> + <control type="image"> + <left>20</left> + <top>10</top> + <width>60</width> + <bottom>10</bottom> + <aspectratio>keep</aspectratio> + <texture colordiffuse="grey">$INFO[ListItem.Icon]</texture> + </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> </itemlayout> <include condition="Window.IsActive(music)">SongsListLayout</include> @@ -122,7 +206,7 @@ </control> </include> <include name="SongsListLayout"> - <focusedlayout height="80" width="widelist_width" condition="Container.Content(songs)"> + <focusedlayout height="80" condition="Container.Content(songs)"> <control type="image"> <left>0</left> <right>0</right> @@ -149,7 +233,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="80" width="widelist_width" condition="Container.Content(songs)"> + <itemlayout height="80" condition="Container.Content(songs)"> <control type="label"> <left>35</left> <height>80</height> @@ -171,7 +255,7 @@ </itemlayout> </include> <include name="AddonsListLayout"> - <focusedlayout height="80" width="widelist_width" condition="Container.Content(addons)"> + <focusedlayout height="80" condition="Container.Content(addons)"> <control type="image"> <left>0</left> <right>0</right> @@ -204,7 +288,7 @@ <label>$VAR[AddonsLabel2Var]</label> </control> </focusedlayout> - <itemlayout height="80" width="widelist_width" condition="Container.Content(addons)"> + <itemlayout height="80" condition="Container.Content(addons)"> <control type="image"> <left>20</left> <top>25</top> |
