infoscreen details wip

realcopacetic · Mar 19, 2024 · 6f81e66 · 6f81e66
1 parent 343c358
commit 6f81e66
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 56 deletions.
diff --git a/16x9/Components_Infoscreens.xml b/16x9/Components_Infoscreens.xml
@@ -383,15 +383,15 @@
 				<itemgap>60</itemgap>
 				<control type="label">
 					<height>100%</height>
-					<width>420</width>
+					<width>480</width>
 					<label>$PARAM[label]</label>
 					<textcolor>$VAR[Light_Color]</textcolor>
 					<font>Plot_Fullscreen</font>
 					<align>right</align>
 				</control>
 				<control type="label">
 					<height>100%</height>
-					<width>1280</width>
+					<width>1140</width>
 					<label>$PARAM[label2]</label>
 					<textcolor>$VAR[Light_Color]</textcolor>
 					<font>Keyboard_Button_-2</font>
@@ -404,48 +404,132 @@
 		</definition>
 	</include>
 
-	<include name="Infoscreen_Details">
+	<include name="Infoscreen_Details_2x_Layout">
+		<param name="visible" default="true" />
 		<definition>
 			<control type="grouplist">
 				<visible>$PARAM[visible]</visible>
-				<include content="Visible_Fade_Delayed_Animation" />
-				<width>1680</width>
-				<centerleft>50%</centerleft>
-				<height>600</height>
-				<centertop>50%</centertop>
-				<scrolltime tween="sine" easing="inout">360</scrolltime>
-				<orientation>vertical</orientation>
+				<width>100%</width>
+				<height>60</height>
+				<orientation>horizontal</orientation>
 				<align>center</align>
-				<usecontrolcoords>false</usecontrolcoords>
-				<itemgap>0</itemgap>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Filename" />
-					<param name="label2" value="$INFO[ListItem.FileNameAndPath]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Size" />
-					<param name="label2" value="$INFO[Window(home).Property(ListItem_Size)]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Date added" />
-					<param name="label2" value="$INFO[ListItem.DateAdded]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Resolution" />
-					<param name="label2" value="$INFO[ListItem.VideoResolution]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Codec" />
-					<param name="label2" value="$INFO[ListItem.VideoCodec]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="label" value="Aspect" />
-					<param name="label2" value="$INFO[ListItem.VideoAspect]" />
-				</include>
-				<include content="Infoscreen_Details_Layout">
-					<param name="visible" value="!String.IsEmpty(ListItem.Set)" />
-					<param name="label" value="Set" />
-					<param name="label2" value="$INFO[ListItem.Set]" />
+				<itemgap>60</itemgap>
+				<control type="label">
+					<height>100%</height>
+					<width>375</width>
+					<label>$PARAM[label]</label>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<font>Plot_Fullscreen</font>
+					<align>right</align>
+				</control>
+				<control type="label">
+					<height>100%</height>
+					<width>375</width>
+					<label>$PARAM[label2]</label>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<font>Keyboard_Button_-2</font>
+					<align>left</align>
+					<scroll>true</scroll>
+					<scrollspeed>50</scrollspeed>
+					<scrollsuffix> / </scrollsuffix>
+				</control>
+				<control type="label">
+					<height>100%</height>
+					<width>375</width>
+					<label>$PARAM[label3]</label>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<font>Plot_Fullscreen</font>
+					<align>right</align>
+				</control>
+				<control type="label">
+					<height>100%</height>
+					<width>375</width>
+					<label>$PARAM[label4]</label>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<font>Keyboard_Button_-2</font>
+					<align>left</align>
+					<scroll>true</scroll>
+					<scrollspeed>50</scrollspeed>
+					<scrollsuffix> / </scrollsuffix>
+				</control>
+			</control>
+		</definition>
+	</include>
+
+	<include name="Infoscreen_Details">
+		<definition>
+			<control type="group">
+				<visible>$PARAM[visible]</visible>
+				<include content="Visible_Fade_Delayed_Animation" />
+				<control type="grouplist">
+					<width>1680</width>
+					<centerleft>50%</centerleft>
+					<height>100%</height>
+					<centertop>50%</centertop>
+					<scrolltime tween="sine" easing="inout">360</scrolltime>
+					<orientation>vertical</orientation>
+					<align>center</align>
+					<usecontrolcoords>false</usecontrolcoords>
+					<itemgap>0</itemgap>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Tagline)" />
+						<param name="label" value="Tagline" />
+						<param name="label2" value="$INFO[ListItem.Tagline]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="label" value="Runtime" />
+						<param name="label2" value="$INFO[ListItem.Duration]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Genre)" />
+						<param name="label" value="Genre" />
+						<param name="label2" value="$INFO[ListItem.Genre]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Director)" />
+						<param name="label" value="Director" />
+						<param name="label2" value="$INFO[ListItem.Director]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Writer)" />
+						<param name="label" value="Writer" />
+						<param name="label2" value="$INFO[ListItem.Writer]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Set)" />
+						<param name="label" value="Set" />
+						<param name="label2" value="$INFO[ListItem.Set]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.Studio)" />
+						<param name="label" value="Studio" />
+						<param name="label2" value="$INFO[ListItem.Studio]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.VideoResolution)" />
+						<param name="label" value="Video" />
+						<param name="label2" value="$VAR[Resolution_Label]$INFO[ListItem.VideoCodec, (,)]$INFO[ListItem.VideoAspect,$COMMA , AR]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.AudioLanguage)" />
+						<param name="label" value="Audio" />
+						<param name="label2" value="$VAR[AudioChannels_Label] $INFO[ListItem.AudioCodec]$INFO[ListItem.AudioLanguage,$COMMA ]" />
+					</include>
+					<include content="Infoscreen_Details_Layout">
+						<param name="visible" value="!String.IsEmpty(ListItem.SubtitleLanguage)" />
+						<param name="label" value="Subtitles" />
+						<param name="label2" value="$INFO[ListItem.Property(SubtitleLanguage.1)]$INFO[ListItem.Property(SubtitleLanguage.2), / ]$INFO[ListItem.Property(SubtitleLanguage.3), / ]$INFO[ListItem.Property(SubtitleLanguage.4), / ]$INFO[ListItem.Property(SubtitleLanguage.5), / ]$INFO[ListItem.Property(SubtitleLanguage.6), / ]" />
+					</include>
+				</control>
+				<include content="Description_Label">
+					<param name="label" value="$INFO[ListItem.FilenameAndPath][CR]File added $INFO[ListItem.DateAdded]" />
+					<param name="left" value="120" />
+					<param name="right" value="120" />
+					<param name="textcolor" value="$VAR[Light_Color]" />
+					<param name="haspath" value="true" />
+					<scroll>true</scroll>
+					<scrollspeed>50</scrollspeed>
+					<scrollsuffix> / </scrollsuffix>
 				</include>
 			</control>
 		</definition>

diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
@@ -64,8 +64,6 @@
 				<!-- Settings transition from addonbrowser -->
 				<onfocus condition="Window.Is(addonbrowser) + $EXP[Container_Addons_NonRepo]">SetProperty(Container_Addons_NonRepo,true,home)</onfocus>
 				<onfocus condition="Window.Is(addonbrowser) + !$EXP[Container_Addons_NonRepo]">ClearProperty(Container_Addons_NonRepo,home)</onfocus>
-				<!-- Information to pass to Infoscreen -->
-				<onfocus>SetProperty(ListItem_Size,$INFO[ListItem.Size],home)</onfocus>
 			</control>
 		</definition>
 	</include>

diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml
@@ -20,16 +20,26 @@
 	</variable>
 
 	<variable name="AudioChannels_Label">
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,10)">9.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,8)">7.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,7)">6.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,6)">5.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,5)">4.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,4)">4</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,3)">2.1</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,2)">2</value>
-		<value condition="Integer.IsEqual(VideoPlayer.AudioChannels,1)">1</value>
-		<value>$INFO[VideoPlayer.AudioChannels]</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,10)">9.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,8)">7.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,7)">6.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,6)">5.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,5)">4.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,4)">4</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,3)">2.1</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,2)">2</value>
+		<value condition="VideoPlayer.IsFullscreen + Integer.IsEqual(VideoPlayer.AudioChannels,1)">1</value>
+		<value condition="VideoPlayer.IsFullscreen">$INFO[VideoPlayer.AudioChannels]</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,10)">9.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,8)">7.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,7)">6.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,6)">5.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,5)">4.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,4)">4</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,3)">2.1</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,2)">2</value>
+		<value condition="Integer.IsEqual(ListItem.AudioChannels,1)">1</value>
+		<value>$INFO[ListItem.AudioChannels]</value>
 	</variable>
 
 	<variable name="AudioChannels_Label2">

diff --git a/README.md b/README.md
@@ -16,6 +16,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
+**1.1.20**
+- x
+
 **1.1.18-19**
 - Fixed rogue mask that was visible during Auto trailer playback https://github.com/realcopacetic/skin.copacetic/issues/105
 - Container Content change transition added when navigating files view seasons > episodes
@@ -29,9 +32,7 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - Simplified container transition expressions and extended transitions to addons so there is a transition between list levels (e.g. add-on browser > my add-ons > look and feel, etc)
 
 Still to do:
-- autoscroll on widgets? start on widgets? showcase 1st - spotlight (random, unwatched)
 - login background
-- Crop screensaver logo
 - Make consistent overlay on embedded videoplayer for live tv and fade it out when screensaver kicks in
 - error with pulling remote artist fanarts for background art service
 - Use art service for artist backgrounds on home screen to avoid black screens on missing artworks?
@@ -50,7 +51,7 @@ Still to do:
 - Fixed typo breaking fix for previous issue https://github.com/realcopacetic/skin.copacetic/issues/60
 - Fixed colour of volume indicator on home screen widgets when light theme selected
 - Added disabled indicator to addonbrowser for disabled addons in List and Grid views, plus installed indicator for installed addons when browsing repos
-- Redesigned script-upnext widget and added options to skinsettings to enable/disable addon and choose art type.
+- Redesigned script-upnext widget and added options to skinsettings to enable/disable addon and choose art type. https://github.com/realcopacetic/skin.copacetic/issues/102
 
 **1.1.16**
 - Bug fix: removed unmatched parenthesis causing log errors

diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.copacetic" version="1.1.19" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="1.1.20" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.16.0" />
 		<import addon="script.copacetic.helper" version="1.0.9" />