multiart visibility delay and experimental landscape support

realcopacetic · Jun 3, 2024 · 9125d53 · 9125d53
1 parent ed4d5f9
commit 9125d53
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 4 deletions.
diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
@@ -34,6 +34,10 @@
 				<visible>$PARAM[onnext_trigger]</visible>
 				<animation effect="slide" end="0,0" time="360" reversible="false">Hidden</animation>
 			</control>
+			<control type="group" id="5006">
+				<visible>$EXP[Container_Switching]</visible>
+				<animation effect="slide" end="0,0" time="720" reversible="false">Hidden</animation>
+			</control>
 		</definition>
 	</include>
 

diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml
@@ -877,12 +877,19 @@
 			<selected>Skin.HasSetting(Experiment_Unwatched_Info)</selected>
 		</control>
 		<control type="radiobutton" id="1418">
-			<description>Enable fanart display for Grid view in Pictures window</description>
+			<description>Enable 'Fanart' display layout for Grid view in Pictures window</description>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 			<label>$LOCALIZE[31471]</label>
 			<onclick>Skin.ToggleSetting(Experiment_GridView_Fanart_Pictures)</onclick>
 			<selected>Skin.HasSetting(Experiment_GridView_Fanart_Pictures)</selected>
 		</control>
+		<control type="radiobutton" id="1422">
+			<description>Prefer landscape art to fanart for backgrounds in List and Billboard views</description>
+			<visible>ControlGroup(9).HasFocus(14)</visible>
+			<label>Enable landscape art for List and Billboard view backgrounds</label>
+			<onclick>Skin.ToggleSetting(Experiment_ListView_Prefer_Landscape)</onclick>
+			<selected>Skin.HasSetting(Experiment_ListView_Prefer_Landscape)</selected>
+		</control>
 		<control type="radiobutton" id="1419">
 			<description>Move to parent directory automatically if episode container is empty</description>
 			<visible>ControlGroup(9).HasFocus(14)</visible>

diff --git a/16x9/Templates_Artwork.xml b/16x9/Templates_Artwork.xml
@@ -128,7 +128,7 @@
 	</include>
 
 	<include name="Icon_Component_Multiart_Static">
-		<param name="visible" default="!String.IsEqual(Control.GetLabel(6400),flags/blank.png) + !$EXP[Content_Switching] + !String.IsEmpty(Window(home).Property(Multiart_Fadeout)) + !String.IsEqual(Container.FolderName,ListItem.Title)" />
+		<param name="visible" default="!String.IsEqual(Control.GetLabel(6400),flags/blank.png) + !Control.IsVisible(5006) + !$EXP[Content_Switching] + !String.IsEmpty(Window(home).Property(Multiart_Fadeout)) + !String.IsEqual(Container.FolderName,ListItem.Title)" />
 		<param name="fadetime" default="1000" />
 		<definition>
 			<include content="Icon_Art">

diff --git a/16x9/Variables_Textures_Artwork_Media.xml b/16x9/Variables_Textures_Artwork_Media.xml
@@ -369,15 +369,19 @@
 	<variable name="Default(0)Content">
 		<value condition="!String.IsEmpty(ListItem(0).Art(thumb)) + [String.IsEqual(ListItem(0).DBType,episode) | [String.IsEqual(ListItem(0).DBType,artist) + $EXP[ListView_Display_IsThumbnails_Artists]] | [String.IsEqual(ListItem(0).DBType,album) + !$EXP[ListView_Display_IsBackground_Albums]] | [String.IsEqual(ListItem(0).DBType,song) + !$EXP[ListView_Display_IsBackground_Songs]] | [Container.Content(songs) + !String.IsEmpty(Container.PluginName)] | [Container.Content(addons) + $EXP[ListView_IsVisible]] | Container.Content(videos)]">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(album.fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(album.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(landscape)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.landscape)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(tvshow.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(tvshow.fanart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(artist.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(artist.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(keyart)) + $EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List]">$INFO[ListItem(0).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(poster)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(poster)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(boxfront)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(boxfront)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.keyart)) + $EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List]">$INFO[ListItem(0).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.poster)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(tvshow.poster)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(artist.thumb))">$INFO[ListItem(0).Art(artist.thumb)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(landscape)) + !Container.Content(files) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(fanart)) + !Container.Content(files)">$INFO[ListItem(0).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Icon)">$INFO[ListItem(0).Icon]</value>
 	</variable>
@@ -441,7 +445,8 @@
 		<value condition="$EXP[ListView_Display_IsThumbnails] + String.IsEqual(ListItem.DBType,artist) + !String.IsEmpty(ListItem.Art(thumb1))">thumb</value>
 		<value condition="$EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ListView_Display_IsThumbnails] + [!$EXP[Prefer_Keyart_List] | String.IsEmpty(ListItem.Art(keyart))] + !String.IsEmpty(ListItem.Art(poster1))">poster</value>
-		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(fanart1))">fanart</value>
+		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(landscape1)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">landscape</value>
+		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(fanart1)) + !Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">fanart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[ShowcaseView_Details_Overlay_IsVisible] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[ShowcaseView_Logo_On] + !String.IsEmpty(ListItem.Art(clearlogo)) + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[Prefer_Keyart] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>

diff --git a/16x9/_IDs b/16x9/_IDs
@@ -60,6 +60,7 @@ ANIMATION DELAYS
 5003          Secondary list user scroll previous delay
 5004          Secondary list user scroll next delay
 5005          Options menu settings change
+5006          Container Switching delay (to hide multiart following container transition)
 
 CHECKERS
 6001/6001X    Container update bounce test

diff --git a/README.md b/README.md
@@ -23,6 +23,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 **2.4.2**
 - Bumping version number by 1 to differentiate between Nexus and Omega versions. 
 - Increased version number of script.copacetic.helper dependency to 1.1.0
+- Added visibility delay to multiartwhen switching containers to prevent seeing it fade out immediately after moving from Movies to Sets, etc.
+- Added experimental feature to enable landscape artwork to be displayed instead of fanart for background artwork in List and Billboard view (enable under Settings > Copacetic > Customisations > Experiments) 
+
 Still to do:
 -- check tmdb helper click actions for all infoscreen widgets (including episode ones etc)
 -- tmdb helper for play button on infoscreen?

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -1007,6 +1007,12 @@ msgctxt "#31811"
 msgid "Enter the three-letter code for your preferred language, e.g. 'eng' for English. If subtitles in this language are available for the currently playing video, the quick subtitle switcher will toggle on/off the first subtitle stream in this language. If the language is not available, the switcher will continue toggling between all languages."
 msgstr ""
 
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31712"
+msgid "Prefer landscape art to fanart for backgrounds in List and Billboard views"
+msgstr ""
+
 
 
 
@@ -1389,7 +1395,7 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31471"
-msgid "Enable fanart display for Grid view in pictures window"
+msgid "Enable 'Fanart' display layout for Grid view in Pictures window"
 msgstr ""
 
 #/16x9/Content_Settings.xml