PVR update WIP

pvr wip pvr wip pvr wip pvr wip pvr wip pvr wip pvr wip wip pvr_wip wip pvr
realcopacetic · Aug 15, 2024 · 4321c84 · 4321c84
1 parent 46d321e
commit 4321c84
Show file tree

Hide file tree

Showing 70 changed files with 1,577 additions and 826 deletions.
diff --git a/16x9/Colors.xml b/16x9/Colors.xml
@@ -190,20 +190,27 @@
 		<value>$VAR[Brightness_0]</value>
 	</variable>
 	<!-- Alpha overlay masks -->
-	<variable name="Panel_Mask">
-		<value condition="Window.IsVisible(pictureinfo)">$VAR[Alpha_90]$VAR[Dark_Grey_Hex]</value>
-		<value condition="Window.Is(addonbrowser) + Window.Is(filebrowser)">$VAR[Alpha_75]$VAR[Dark_Grey_Hex]</value>
-		<value condition="Window.IsVisible(visualisation) + $EXP[visualisation_Background_IsEmpty]">$VAR[Dark_Grey_Color]</value>
-		<value>$VAR[ListView_Panel_Mask]</value>
+	<variable name="Grid_Mask">
+		<value>$VAR[Alpha_66]$VAR[Dark_Hex]</value>
+	</variable>
+	<variable name="Infoscreen_Panel_Mask">
+		<value condition="Window.Is(pvrguideinfo) | Window.Is(pvrrecordinginfo)">$VAR[PVR_Panel_Mask]</value>
+		<value>$VAR[Dark_Grey_Color]</value>
 	</variable>
 	<variable name="ListView_Panel_Mask">
-		<value condition="!$EXP[Background_IsVisible] + !VideoPlayer.IsFullscreen">$VAR[Dark_Grey_Color]</value>
+		<value condition="[Window.IsVisible(addonbrowser) | Window.IsVisible(music) | Window.IsVisible(videos)] + $EXP[ListView_IsVisible] + !$EXP[Background_IsVisible]">$VAR[Dark_Grey_Color]</value>
 		<value condition="Skin.String(Background_Opacity,100)">$VAR[Dark_Grey_Color]</value>
 		<value condition="Skin.String(Background_Opacity,85)">$VAR[Alpha_85]$VAR[Dark_Grey_Hex]</value>
 		<value condition="Skin.String(Background_Opacity,66)">$VAR[Alpha_66]$VAR[Dark_Grey_Hex]</value>
 		<value condition="Skin.String(Background_Opacity,50)">$VAR[Alpha_50]$VAR[Dark_Grey_Hex]</value>
 		<value>$VAR[Alpha_75]$VAR[Dark_Grey_Hex]</value>
 	</variable>
+	<variable name="Panel_Mask">
+		<value condition="Window.IsVisible(pictureinfo)">$VAR[Alpha_90]$VAR[Dark_Grey_Hex]</value>
+		<value condition="Window.Is(addonbrowser) + Window.Is(filebrowser)">$VAR[Alpha_75]$VAR[Dark_Grey_Hex]</value>
+		<value condition="Window.IsVisible(visualisation) + $EXP[visualisation_Background_IsEmpty]">$VAR[Dark_Grey_Color]</value>
+		<value>$VAR[ListView_Panel_Mask]</value>
+	</variable>
 	<variable name="PVR_Panel_Mask">
 		<value condition="Skin.String(Background_Opacity,100)">$VAR[Dark_Grey_Color]</value>
 		<value condition="Skin.String(Background_Opacity,85)">$VAR[Alpha_85]$VAR[Dark_Grey_Hex]</value>
@@ -233,6 +240,7 @@
 		<value condition="$EXP[Background_IsVisible]">$VAR[Light_Color]</value>
 		<value condition="VideoPlayer.IsFullscreen">$VAR[Light_Color]</value>
 		<value condition="Window.IsMedia + $EXP[TransparentDialog_IsVisible]">$VAR[Light_Color]</value>
+		<value condition="Window.Is(pvrguideinfo) | Window.Is(pvrrecordinginfo)">$VAR[Light_Color]</value>
 		<value>$VAR[Primary_Color]</value>
 	</variable>
 	<variable name="Notification_Widget_Background_Color">
@@ -952,12 +960,23 @@
 	</variable>
 
 	<!-- PVR -->
-	<variable name="epggrid_Focused_Color">
+	<variable name="tvguide_Focused_Color">
 		<value condition="Control.HasFocus(10)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
 	</variable>
-	<variable name="PVR_Channel_Progress_Color">
+	<variable name="tvguide_Icon_Focused_Color">
+		<value condition="ListItem.IsRecording">$VAR[Alpha_100]$VAR[Accent_Hex]</value>
+		<value>$VAR[Light_Color]</value>
+	</variable>
+	<variable name="tvguide_Icon_Unfocused_Color">
+		<value condition="ListItem.IsRecording">$VAR[Alpha_100]$VAR[Accent_Hex]</value>
+		<value>$VAR[Unfocused_Color]</value>
+	</variable>
+	<variable name="tvchannels_Icon_Color">
+		<value condition="ListItem.IsRecording">$VAR[Alpha_100]$VAR[Accent_Hex]</value>
+		<value>$VAR[Light_Color]</value>
+	</variable>
+	<variable name="tvchannels_Progress_Color">
 		<value>$VAR[Alpha_50]$VAR[Dark_Hex]</value>
 	</variable>
-
 </includes>
diff --git a/16x9/Components_Buttons.xml b/16x9/Components_Buttons.xml
@@ -913,6 +913,8 @@
 		</definition>
 	</include>
 
+
+	<!-- Texture buttons -->
 	<include name="Texture_Button_Template">
 		<param name="visible" default="true" />
 		<param name="width" />
@@ -921,8 +923,6 @@
 		<definition>
 			<control type="group">
 				<visible>$PARAM[visible]</visible>
-				<width>100%</width>
-				<height>100%</height>
 				<nested />
 				<control type="image">
 					<centertop>50%</centertop>
@@ -931,7 +931,6 @@
 					<height>$PARAM[width]</height>
 					<texture colordiffuse="$PARAM[color]">$PARAM[texture]</texture>
 					<aspectratio>scale</aspectratio>
-					<nested />
 				</control>
 			</control>
 		</definition>
@@ -1057,36 +1056,6 @@
 		</definition>
 	</include>
 
-	<include name="Library_unfocused">
-		<param name="visible" default="true" />
-		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
-		<param name="width" default="60" />
-		<definition>
-			<include content="Texture_Button_Template">
-				<param name="visible" value="$PARAM[visible]" />
-				<param name="texture" value="icons/icon_library_unfocused_$PARAM[width].png" />
-				<param name="width" value="$PARAM[width]" />
-				<param name="color" value="$PARAM[color]" />
-				<nested />
-			</include>
-		</definition>
-	</include>
-
-	<include name="Library_focused">
-		<param name="visible" default="true" />
-		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
-		<param name="width" default="60" />
-		<definition>
-			<include content="Texture_Button_Template">
-				<param name="visible" value="$PARAM[visible]" />
-				<param name="texture" value="icons/icon_library_focused_$PARAM[width].png" />
-				<param name="width" value="$PARAM[width]" />
-				<param name="color" value="$PARAM[color]" />
-				<nested />
-			</include>
-		</definition>
-	</include>
-
 	<include name="List_unfocused">
 		<param name="visible" default="true" />
 		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
@@ -1328,6 +1297,21 @@
 		</definition>
 	</include>
 
+	<include name="Timer_unfocused">
+		<param name="visible" default="true" />
+		<param name="color" default="white" />
+		<param name="width" default="60" />
+		<definition>
+			<include content="Texture_Button_Template">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="texture" value="icons/icon_timer_unfocused_$PARAM[width].png" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="color" value="$PARAM[color]" />
+				<nested />
+			</include>
+		</definition>
+	</include>
+
 	<include name="Visible_unfocused">
 		<param name="visible" default="true" />
 		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />

diff --git a/16x9/Components_Infoscreens.xml b/16x9/Components_Infoscreens.xml
@@ -46,7 +46,7 @@
 
 	<include name="Infoscreen_Flags_Layout">
 		<control type="grouplist">
-			<visible>![String.IsEqual(Control.GetLabel(6303),flags/blank.png) + String.IsEqual(Control.GetLabel(6304),flags/blank.png)]</visible>
+			<visible>![String.IsEqual(Control.GetLabel(6303),flags/blank.png) + String.IsEqual(Control.GetLabel(6304),flags/blank.png) + String.IsEqual(Control.GetLabel(6305),flags/blank.png) + String.IsEqual(Control.GetLabel(6306),flags/blank.png) + String.IsEqual(Control.GetLabel(6307),flags/blank.png)]</visible>
 			<nested />
 			<width>100%</width>
 			<height>180</height>