aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.estuary/xml/AddonBrowser.xml2
-rw-r--r--addons/skin.estuary/xml/Constants_1920.xml2
-rw-r--r--addons/skin.estuary/xml/Constants_2560.xml2
-rw-r--r--addons/skin.estuary/xml/DialogMusicInfo.xml2
-rw-r--r--addons/skin.estuary/xml/Includes.xml3
-rw-r--r--addons/skin.estuary/xml/Includes_MediaMenu.xml81
-rw-r--r--addons/skin.estuary/xml/MyPlaylist.xml13
-rw-r--r--addons/skin.estuary/xml/MyVideoNav.xml2
-rw-r--r--addons/skin.estuary/xml/Variables.xml6
-rw-r--r--addons/skin.estuary/xml/View_51_Poster.xml1
-rw-r--r--addons/skin.estuary/xml/View_55_WideList.xml8
11 files changed, 68 insertions, 54 deletions
diff --git a/addons/skin.estuary/xml/AddonBrowser.xml b/addons/skin.estuary/xml/AddonBrowser.xml
index f3ee214b28..dd211bcc78 100644
--- a/addons/skin.estuary/xml/AddonBrowser.xml
+++ b/addons/skin.estuary/xml/AddonBrowser.xml
@@ -63,7 +63,7 @@
<control type="group">
<height>78</height>
<bottom>0</bottom>
- <visible>$EXP[sidebar_focused]</visible>
+ <visible>$EXP[sidebar_visible]</visible>
<animation effect="fade" time="300">VisibleChange</animation>
<include content="LeftAlignedInfo">
<param name="main_label" value="$INFO[Window(AddonBrowser).Property(Updated)]" />
diff --git a/addons/skin.estuary/xml/Constants_1920.xml b/addons/skin.estuary/xml/Constants_1920.xml
index d85f2d53d2..f9b714beff 100644
--- a/addons/skin.estuary/xml/Constants_1920.xml
+++ b/addons/skin.estuary/xml/Constants_1920.xml
@@ -7,5 +7,5 @@
<constant name="tvrecordings_width">1060</constant>
<constant name="eventloglist_width">1430</constant>
<constant name="playlisteditorlist_width">770</constant>
- <constant name="playlistlist_width">904</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
index fea8fc5886..ba83217abd 100644
--- a/addons/skin.estuary/xml/Constants_2560.xml
+++ b/addons/skin.estuary/xml/Constants_2560.xml
@@ -7,5 +7,5 @@
<constant name="tvrecordings_width">1700</constant>
<constant name="eventloglist_width">2070</constant>
<constant name="playlisteditorlist_width">1410</constant>
- <constant name="playlistlist_width">1544</constant>
+ <constant name="playlistlist_width">1536</constant>
</includes>
diff --git a/addons/skin.estuary/xml/DialogMusicInfo.xml b/addons/skin.estuary/xml/DialogMusicInfo.xml
index 4f895ab4e2..08940cc059 100644
--- a/addons/skin.estuary/xml/DialogMusicInfo.xml
+++ b/addons/skin.estuary/xml/DialogMusicInfo.xml
@@ -31,7 +31,7 @@
<height>567</height>
<aspectratio aligny="top">scale</aspectratio>
<fadetime>300</fadetime>
- <texture background="true" fallback="DefaultAudio.png">$INFO[ListItem.Art(thumb)]</texture>
+ <texture background="true">$VAR[MusicInfoThumbVar]</texture>
</control>
</control>
<control type="group">
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index b3f7993305..205e0ea551 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -34,7 +34,7 @@
<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>
+ <expression name="sidebar_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Window.IsActive(MyPlaylist.xml)</expression>
<include name="CommonScrollbars">
<control type="group">
<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
@@ -320,6 +320,7 @@
<font>$PARAM[font]</font>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
+ <scroll>true</scroll>
</control>
</focusedlayout>
</definition>
diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml
index 89cb087b65..9a3c103748 100644
--- a/addons/skin.estuary/xml/Includes_MediaMenu.xml
+++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml
@@ -198,7 +198,7 @@
<onleft>14100</onleft>
<onup>8</onup>
<ondown>6056</ondown>
- <visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible>
+ <visible>Player.HasMedia + [$EXP[sidebar_visible]]</visible>
<visible>!System.HasActiveModalDialog</visible>
<include content="BottomMainMenuToggleItem">
<param name="control_id" value="14101" />
@@ -241,7 +241,7 @@
<include>OpenClose_Left</include>
<depth>DepthSideBlade</depth>
<left>-520</left>
- <animation type="Conditional" condition="$EXP[sidebar_focused]" reversible="true">
+ <animation type="Conditional" condition="$EXP[sidebar_visible]" reversible="true">
<effect type="slide" start="0" end="520" time="400" tween="cubic" easing="out" />
</animation>
<control type="image">
@@ -249,7 +249,7 @@
<height>100%</height>
<aspectratio>scale</aspectratio>
<texture colordiffuse="80FFFFFF">colors/black.png</texture>
- <visible>$EXP[sidebar_focused] + !System.HasActiveModalDialog</visible>
+ <visible>$EXP[sidebar_visible] + !System.HasActiveModalDialog</visible>
<animation effect="fade" time="200">VisibleChange</animation>
</control>
<control type="image">
@@ -269,41 +269,45 @@
</control>
</include>
<include name="MediaMenuNowPlaying">
- <control type="grouplist" id="14100">
- <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
- <animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
- <animation effect="fade" time="300">VisibleChange</animation>
- <orientation>horizontal</orientation>
- <itemgap>-17</itemgap>
- <left>5</left>
- <onleft>14100</onleft>
- <width>450</width>
- <visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible>
- <visible>!System.HasActiveModalDialog</visible>
- <include content="BottomMainMenuToggleItem">
- <param name="control_id" value="14101" />
- <param name="onclick" value="PlayerControl(Play)" />
- <param name="icon_on" value="icons/now-playing/play.png" />
- <param name="icon_off" value="icons/now-playing/pause.png" />
- <param name="selected" value="Player.Paused" />
- </include>
- <include content="IconButton">
- <param name="control_id" value="14102" />
- <param name="onclick" value="Stop" />
- <param name="onclick_2" value="SetFocus(50)" />
- <param name="icon" value="icons/now-playing/stop.png" />
- </include>
- <include content="IconButton">
- <param name="control_id" value="14104" />
- <param name="onclick" value="PlayerControl(Next)" />
- <param name="icon" value="icons/now-playing/next.png" />
- </include>
- <include content="IconButton">
- <param name="control_id" value="14105" />
- <param name="onclick" value="Fullscreen" />
- <param name="icon" value="icons/now-playing/fullscreen.png" />
- </include>
- </control>
+ <param name="left">5</param>
+ <definition>
+ <control type="grouplist" id="14100">
+ <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+ <animation effect="fade" time="300">VisibleChange</animation>
+ <animation effect="slide" end="-10,0" time="0" condition ="Window.IsActive(MyPlaylist.xml)">Conditional</animation>
+ <orientation>horizontal</orientation>
+ <itemgap>-17</itemgap>
+ <left>$PARAM[left]</left>
+ <onleft>14100</onleft>
+ <width>450</width>
+ <visible>Player.HasMedia + [$EXP[sidebar_visible]]</visible>
+ <visible>!System.HasActiveModalDialog</visible>
+ <include content="BottomMainMenuToggleItem">
+ <param name="control_id" value="14101" />
+ <param name="onclick" value="PlayerControl(Play)" />
+ <param name="icon_on" value="icons/now-playing/play.png" />
+ <param name="icon_off" value="icons/now-playing/pause.png" />
+ <param name="selected" value="Player.Paused" />
+ </include>
+ <include content="IconButton">
+ <param name="control_id" value="14102" />
+ <param name="onclick" value="Stop" />
+ <param name="onclick_2" value="SetFocus(50)" />
+ <param name="icon" value="icons/now-playing/stop.png" />
+ </include>
+ <include content="IconButton">
+ <param name="control_id" value="14104" />
+ <param name="onclick" value="PlayerControl(Next)" />
+ <param name="icon" value="icons/now-playing/next.png" />
+ </include>
+ <include content="IconButton">
+ <param name="control_id" value="14105" />
+ <param name="onclick" value="Fullscreen" />
+ <param name="icon" value="icons/now-playing/fullscreen.png" />
+ </include>
+ </control>
+ </definition>
</include>
<include name="MediaMenuListCommon">
<definition>
@@ -343,7 +347,6 @@
</control>
<control type="button" id="19">
<visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
- <visible>!Container.Content()</visible>
<include>MediaMenuItemsCommon</include>
<label>$LOCALIZE[137]</label>
</control>
diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml
index 51361f04c8..f66dc10734 100644
--- a/addons/skin.estuary/xml/MyPlaylist.xml
+++ b/addons/skin.estuary/xml/MyPlaylist.xml
@@ -10,9 +10,9 @@
<control type="group">
<include>OpenClose_Left</include>
<control type="fixedlist" id="50">
- <left>402</left>
+ <left>410</left>
<top>list_y_offset</top>
- <right>594</right>
+ <right>586</right>
<bottom>list_y_offset</bottom>
<scrolltime tween="cubic" easing="out">500</scrolltime>
<orientation>vertical</orientation>
@@ -79,7 +79,7 @@
<control type="group">
<depth>DepthContentPanel</depth>
<include content="ContentPanel">
- <param name="width" value="462" />
+ <param name="width" value="470" />
</include>
<control type="grouplist" id="700">
<orientation>vertical</orientation>
@@ -90,9 +90,9 @@
<ondown>700</ondown>
<onleft>50</onleft>
<onright>50</onright>
- <width>402</width>
+ <width>410</width>
<control type="radiobutton" id="20">
- <width>402</width>
+ <width>410</width>
<height>110</height>
<align>left</align>
<aligny>top</aligny>
@@ -115,6 +115,9 @@
<param name="control_id" value="22" />
<param name="label" value="$LOCALIZE[192]" />
</include>
+ <include content="MediaMenuNowPlaying">
+ <param name="left" value="-5" />
+ </include>
</control>
</control>
</control>
diff --git a/addons/skin.estuary/xml/MyVideoNav.xml b/addons/skin.estuary/xml/MyVideoNav.xml
index 8b2b8f8da3..ea67f8e956 100644
--- a/addons/skin.estuary/xml/MyVideoNav.xml
+++ b/addons/skin.estuary/xml/MyVideoNav.xml
@@ -138,7 +138,7 @@
<include>MediaMenuItemsCommon</include>
<label>$LOCALIZE[31056]</label>
<onclick>ActivateWindow(videoplaylist)</onclick>
- <visible>IntegerGreaterThan(Playlist.Length(video),0)</visible>
+ <visible>Integer.IsGreater(Playlist.Length(video),0)</visible>
</control>
<control type="button" id="621">
<description>Get more</description>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 35407add0b..007ed12300 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -65,6 +65,12 @@
<value condition="ListItem.IsFolder + String.IsEmpty(ListItem.Thumb)">DefaultFolderSquare.png</value>
<value>$INFO[ListItem.Thumb]</value>
</variable>
+ <variable name="MusicInfoThumbVar">
+ <value condition="!String.IsEmpty(Listitem.Art(thumb))">$INFO[Listitem.Art(thumb)]</value>
+ <value condition="String.IsEqual(listitem.dbtype,artist)">DefaultArtist.png</value>
+ <value condition="String.IsEqual(listitem.dbtype,album)">DefaultAlbumCover.png</value>
+ <value>DefaultAudio.png</value>
+ </variable>
<variable name="InfoWallThumbVar">
<value condition="!String.IsEmpty(Listitem.Art(poster))">$INFO[Listitem.Art(poster)]</value>
<value>$INFO[ListItem.Icon]</value>
diff --git a/addons/skin.estuary/xml/View_51_Poster.xml b/addons/skin.estuary/xml/View_51_Poster.xml
index 2d3b96de61..ff91cb130d 100644
--- a/addons/skin.estuary/xml/View_51_Poster.xml
+++ b/addons/skin.estuary/xml/View_51_Poster.xml
@@ -190,6 +190,7 @@
<autoscroll time="3000" delay="7000" repeat="5000">!System.HasActiveModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
<label>$INFO[ListItem.Plot]</label>
<shadowcolor>text_shadow</shadowcolor>
+ <visible>!ListItem.IsCollection</visible>
</control>
</control>
</control>
diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml
index 6652a00893..7ce10ede2e 100644
--- a/addons/skin.estuary/xml/View_55_WideList.xml
+++ b/addons/skin.estuary/xml/View_55_WideList.xml
@@ -37,7 +37,7 @@
<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>
+ <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(videos)</visible>
</control>
<control type="image">
<left>35</left>
@@ -45,7 +45,7 @@
<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>
+ <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>
@@ -78,7 +78,7 @@
<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>
+ <visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(videos)</visible>
</control>
<control type="image">
<left>35</left>
@@ -86,7 +86,7 @@
<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>
+ <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>
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-20 05:32:01 +0000