aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.estuary
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2022-10-07 14:13:45 +0200
committerKai Sommerfeld <kai.sommerfeld@gmx.com>2022-10-12 19:33:06 +0200
commit100f85f5054a78995a0bb9c135179fa25f7b5318 (patch)
tree93a20932dc3e97a4e60690994f2b7d5d392a95db /addons/skin.estuary
parent59b98c8dcb4477dd7d59b9951c34a6b3fb1022fa (diff)
[favourites][estuary] Add Favourites window.
Diffstat (limited to 'addons/skin.estuary')
-rw-r--r--addons/skin.estuary/xml/Home.xml2
-rw-r--r--addons/skin.estuary/xml/MyFavourites.xml41
-rw-r--r--addons/skin.estuary/xml/Variables.xml3
-rw-r--r--addons/skin.estuary/xml/View_500_Wall.xml26
-rw-r--r--addons/skin.estuary/xml/View_52_IconWall.xml2
-rw-r--r--addons/skin.estuary/xml/View_53_Shift.xml2
-rw-r--r--addons/skin.estuary/xml/View_55_WideList.xml8
7 files changed, 74 insertions, 10 deletions
diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml
index 9db8d89902..17e6567d01 100644
--- a/addons/skin.estuary/xml/Home.xml
+++ b/addons/skin.estuary/xml/Home.xml
@@ -998,7 +998,7 @@
</item>
<item>
<label>$LOCALIZE[10134]</label>
- <onclick>ActivateWindow(favourites)</onclick>
+ <onclick>ActivateWindow(favouritesbrowser)</onclick>
<property name="menu_id">$NUMBER[14000]</property>
<thumb>icons/sidemenu/favourites.png</thumb>
<property name="id">favorites</property>
diff --git a/addons/skin.estuary/xml/MyFavourites.xml b/addons/skin.estuary/xml/MyFavourites.xml
new file mode 100644
index 0000000000..968d23c9e0
--- /dev/null
+++ b/addons/skin.estuary/xml/MyFavourites.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+ <defaultcontrol always="true">500</defaultcontrol>
+ <backgroundcolor>background</backgroundcolor>
+ <views>50,52,53,55,500</views>
+ <menucontrol>9000</menucontrol>
+ <controls>
+ <include>DefaultBackground</include>
+ <control type="group">
+ <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+ <include>View_50_List</include>
+ <include>View_52_IconWall</include>
+ <include>View_53_Shift</include>
+ <include>View_55_WideList</include>
+ <include>View_500_Wall</include>
+ <control type="group">
+ <depth>DepthContentPanel</depth>
+ <include>OpenClose_Left</include>
+ <include>Visible_Left</include>
+ <visible>Control.IsVisible(55)</visible>
+ <include>ListThumbInfoPanel</include>
+ </control>
+ <include content="TopBar">
+ <param name="breadcrumbs_label" value="$LOCALIZE[1036]" />
+ </include>
+ <include content="BottomBar">
+ <param name="info_visible" value="true" />
+ </include>
+ <include>CommonScrollbars</include>
+ <include>MediaMenuMouseOverlay</include>
+ <control type="group">
+ <include>MediaMenuCommon</include>
+ <control type="grouplist" id="9000">
+ <top>50</top>
+ <include>MediaMenuListCommon</include>
+ <include>MediaMenuNowPlaying</include>
+ </control>
+ </control>
+ </control>
+ </controls>
+</window>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 94200b646d..73a29b64c0 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -51,6 +51,7 @@
<value condition="String.IsEqual(ListItem.DbType,episode) + System.Setting(hideunwatchedepisodethumbs) + Integer.IsEqual(ListItem.Playcount,0) + !String.IsEmpty(Listitem.Art(fanart))">$INFO[Listitem.Art(fanart)]</value>
<value condition="String.IsEqual(ListItem.DbType,episode) + System.Setting(hideunwatchedepisodethumbs) + Integer.IsEqual(ListItem.Playcount,0) + String.IsEmpty(Listitem.Art(fanart))">OverlaySpoiler.png</value>
<value condition="String.IsEqual(ListItem.DbType,episode) + [ !System.Setting(hideunwatchedepisodethumbs) | Integer.IsGreater(ListItem.Playcount,0) ]">$INFO[Listitem.Art(thumb)]</value>
+ <value condition="Container.Content(favourites) + String.IsEmpty(Listitem.Art(thumb))">DefaultFavourites.png</value>
<value>$INFO[ListItem.Art(thumb)]</value>
</variable>
<variable name="MusicInfoThumbVar">
@@ -100,6 +101,7 @@
<value condition="String.IsEqual(listitem.dbtype,artist)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_YearsActive),[COLOR button_focus]$LOCALIZE[21898]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_Style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]]</value>
<value condition="String.IsEqual(listitem.dbtype,album)">$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(album_label),[COLOR button_focus]$LOCALIZE[21899]: [/COLOR],[CR]]$INFO[ListItem.Property(album_style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]]</value>
<value condition="String.IsEqual(Listitem.DBType,season) | String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]]</value>
+ <value condition="Container.Content(favourites)">$INFO[ListItem.Property(favourite.action),[COLOR button_focus]$LOCALIZE[15217]: [/COLOR],[CR]]$INFO[ListItem.Property(favourite.provider),[COLOR button_focus]$LOCALIZE[15225]: [/COLOR],[CR]]</value>
<value>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]]</value>
</variable>
<variable name="ShiftRightTextBoxVar">
@@ -137,6 +139,7 @@
<value condition="!String.IsEmpty(ListItem.Plot)">$INFO[ListItem.Plot]</value>
<value condition="String.IsEqual(ListItem.DBType,song) + !Window.IsActive(musicplaylist)">$VAR[MusicTrackInfo,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[InfoDiscVar,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR button_focus]$LOCALIZE[567]: [/COLOR],[CR]]$INFO[ListItem.LastPlayed,[COLOR button_focus]$LOCALIZE[568]: [/COLOR],]</value>
<value condition="String.IsEqual(ListItem.DBType,song) + Window.IsActive(musicplaylist)">[COLOR button_focus][B]$LOCALIZE[31037]: [/COLOR]$INFO[Container.CurrentItem,,/]$INFO[Container.NumItems][/B][CR]$VAR[MusicTrackInfo,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[InfoDiscVar,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR button_focus]$LOCALIZE[567]: [/COLOR]]</value>
+ <value condition="Container.Content(favourites)">$INFO[ListItem.Property(favourite.action),[COLOR button_focus]$LOCALIZE[15217]: [/COLOR],[CR]]$INFO[ListItem.Property(favourite.provider),[COLOR button_focus]$LOCALIZE[15225]: [/COLOR],[CR]]</value>
<value>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]</value>
</variable>
<variable name="NowPlayingInfoVar">
diff --git a/addons/skin.estuary/xml/View_500_Wall.xml b/addons/skin.estuary/xml/View_500_Wall.xml
index 31a49dd2ee..ee2ba50a08 100644
--- a/addons/skin.estuary/xml/View_500_Wall.xml
+++ b/addons/skin.estuary/xml/View_500_Wall.xml
@@ -21,7 +21,7 @@
<preloaditems>2</preloaditems>
<pagecontrol>531</pagecontrol>
<scrolltime tween="cubic" easing="out">500</scrolltime>
- <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons) | Container.Content(images) | Container.Content(videos) | Container.Content(games)</visible>
+ <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons) | Container.Content(images) | Container.Content(videos) | Container.Content(games) | Container.Content(favourites)</visible>
<itemlayout height="445" width="300" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | [Container.Content(musicvideos) + Skin.HasSetting(show_musicvideoposter)]">
<control type="group">
<top>120</top>
@@ -111,14 +111,34 @@
<control type="group">
<depth>DepthContentPopout</depth>
<top>150</top>
- <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="150,350">Focus</animation>
- <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="150,350">UnFocus</animation>
+ <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="160,350">Focus</animation>
+ <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="160,350">UnFocus</animation>
<include content="InfoWallMusicLayout">
<param name="fallback_image" value="DefaultAddon.png" />
<param name="focused" value="true" />
</include>
</control>
</focusedlayout>
+ <itemlayout height="401" width="300" condition="Container.Content(favourites)">
+ <control type="group">
+ <top>150</top>
+ <include content="InfoWallMusicLayout">
+ <param name="fallback_image" value="DefaultFavourites.png" />
+ </include>
+ </control>
+ </itemlayout>
+ <focusedlayout height="401" width="300" condition="Container.Content(favourites)">
+ <control type="group">
+ <depth>DepthContentPopout</depth>
+ <top>150</top>
+ <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="160,350">Focus</animation>
+ <animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="160,350">UnFocus</animation>
+ <include content="InfoWallMusicLayout">
+ <param name="fallback_image" value="DefaultFavourites.png" />
+ <param name="focused" value="true" />
+ </include>
+ </control>
+ </focusedlayout>
</control>
</control>
</include>
diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml
index bdfc95b804..cf06cfde87 100644
--- a/addons/skin.estuary/xml/View_52_IconWall.xml
+++ b/addons/skin.estuary/xml/View_52_IconWall.xml
@@ -17,7 +17,7 @@
<onup>52</onup>
<ondown>52</ondown>
<scrolltime tween="cubic" easing="out">500</scrolltime>
- <visible>Container.Content() | Container.Content(files) | Container.Content(tags) | Container.Content(years) | Container.Content(roles) | Container.Content(sources) | Container.Content(genres) | Container.Content(countries) | Container.Content(studios) | Container.Content(playlists) | Container.Content(unknown)</visible>
+ <visible>Container.Content() | Container.Content(files) | Container.Content(tags) | Container.Content(years) | Container.Content(roles) | Container.Content(sources) | Container.Content(genres) | Container.Content(countries) | Container.Content(studios) | Container.Content(playlists) | Container.Content(favourites) | Container.Content(unknown)</visible>
<viewtype label="31099">icon</viewtype>
<itemlayout height="280" width="440" condition="Container.Content() | Container.Content(files) | Container.Content(tags) | Container.Content(playlists) | [Container.Content(studios) + System.AddonIsEnabled(resource.images.studios.white)]">
<control type="group">
diff --git a/addons/skin.estuary/xml/View_53_Shift.xml b/addons/skin.estuary/xml/View_53_Shift.xml
index d554158349..b9bf6e0007 100644
--- a/addons/skin.estuary/xml/View_53_Shift.xml
+++ b/addons/skin.estuary/xml/View_53_Shift.xml
@@ -54,7 +54,7 @@
<pagecontrol>5199</pagecontrol>
<scrolltime tween="cubic" easing="out">500</scrolltime>
<orientation>horizontal</orientation>
- <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos) | Container.Content(games)</visible>
+ <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos) | Container.Content(games) | Container.Content(favourites)</visible>
<onleft>53</onleft>
<onup>9000</onup>
<ondown>5199</ondown>
diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml
index ff28da0995..eadc18a8a3 100644
--- a/addons/skin.estuary/xml/View_55_WideList.xml
+++ b/addons/skin.estuary/xml/View_55_WideList.xml
@@ -86,7 +86,7 @@
<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)">
+ <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)+ !Container.Content(favourites)">
<control type="image">
<left>0</left>
<right>0</right>
@@ -122,7 +122,7 @@
<shadowcolor>text_shadow</shadowcolor>
</control>
</focusedlayout>
- <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)">
+ <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) + !Container.Content(favourites)">
<control type="image">
<left>35</left>
<centertop>50%</centertop>
@@ -150,7 +150,7 @@
<shadowcolor>text_shadow</shadowcolor>
</control>
</itemlayout>
- <focusedlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content()">
+ <focusedlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content(favourites) | Container.Content()">
<control type="image">
<left>0</left>
<right>0</right>
@@ -177,7 +177,7 @@
<shadowcolor>text_shadow</shadowcolor>
</control>
</focusedlayout>
- <itemlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content()">
+ <itemlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content(favourites) | Container.Content()">
<control type="image">
<left>20</left>
<top>10</top>