billboard widget multiart fix

realcopacetic · Nov 14, 2023 · 9a95f41 · 9a95f41
1 parent 719ff5f
commit 9a95f41
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml
@@ -129,7 +129,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget2_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget2_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget2_Content_Custom) + Skin.String(Widget2_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget2_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -232,7 +232,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget3_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget3_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget3_Content_Custom) + Skin.String(Widget3_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget3_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -335,7 +335,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget4_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget4_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget4_Content_Custom) + Skin.String(Widget4_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget4_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -438,7 +438,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget5_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget5_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget5_Content_Custom) + Skin.String(Widget5_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget5_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -541,7 +541,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget6_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget6_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget6_Content_Custom) + Skin.String(Widget6_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget6_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -644,7 +644,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget7_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget7_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget7_Content_Custom) + Skin.String(Widget7_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget7_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -747,7 +747,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget8_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget8_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget8_Content_Custom) + Skin.String(Widget8_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget8_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(0).Art(square)]</value>
@@ -850,7 +850,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
 	<variable name="Widget9_Thumbnail(0)Content">
-		<value condition="Skin.String(Widget1_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value condition="Skin.String(Widget9_View,Billboard) + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(thumb)) + Skin.HasSetting(Widget9_Content_Custom) + Skin.String(Widget9_Display,Fanart) + [String.IsEqual(Container.ListItemNoWrap(0).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(0).DBType,video)] + Skin.HasSetting(Widget9_Episode_Thumbs)">$INFO[ListItem(0).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(tvshow.square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(0).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(0).Art(square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(0).Art(square)]</value>

diff --git a/README.md b/README.md
@@ -26,8 +26,13 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - When global background slideshow is showing or live tv is playing, removed fade in/out transitions between home, addonbrowser, settings screens, tvguide and tv/radio search for a smoother experience. This required removing Ken Burns effect from these background slideshows.
 - Removed some of the unnecessary transitions between different views when navigating through addonbrowser menus
 - Fixed bug multiart bug breaking artwork for billboard view in programs
+- Fixed typo breaking fix for previous issue https://github.com/realcopacetic/skin.copacetic/issues/60
+
 
 Still to do:
+black screen until first artwork fetched
+choose artwork icon dimmed
+autoscroll on widgets? start on widgets? showcase 1st
 - skinsettings hints
 - MYMUSICPLAYLIST EDITOR
 - Missing artwork on addons list view