pvr wip

realcopacetic · Nov 8, 2023 · aa39bed · aa39bed
1 parent c05d341
commit aa39bed
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 91 deletions.
diff --git a/16x9/Components_PVR.xml b/16x9/Components_PVR.xml
@@ -29,7 +29,7 @@
 				<control type="label">
 					<height>35</height>
 					<font>Grid_Info</font>
-					<label>[UPPERCASE]$INFO[ListItem.StartTime]$INFO[ListItem.EndTime,-]$VAR[ListItem_Genre_Divider_Bold, ]$INFO[ListItem.Genre, ][/UPPERCASE]</label>
+					<label>[UPPERCASE]$INFO[ListItem.StartTime]$INFO[ListItem.EndTime,-]$VAR[ListItem_EpisodeName_Divider_Bold, ]$INFO[ListItem.EpisodeName, ]$VAR[ListItem_Genre_Divider_Bold, ]$INFO[ListItem.Genre, ][/UPPERCASE]</label>
 					<textcolor>$VAR[Light_Color]</textcolor>
 				</control>
 				<control type="textbox">

diff --git a/16x9/Components_Viewtype_50_List.xml b/16x9/Components_Viewtype_50_List.xml
@@ -58,11 +58,13 @@
 
 	<include name="ListView_Layout_Background">
 		<param name="condition" default="$EXP[ListView_Display_IsBackground]" />
+		<param name="unfocused_maxwidth" default="1080" />
+		<param name="focused_maxwidth" default="1200" />
 		<definition>
 			<itemlayout height="60" width="1920" condition="$PARAM[condition]">
 				<include content="Common_List_Unfocused">
 					<param name="label_left" value="120" />
-					<param name="label_maxwidth" value="1080" />
+					<param name="label_maxwidth" value="$PARAM[unfocused_maxwidth]" />
 					<param name="icon_slide" value="-900" />
 					<param name="music_rating_slide" value="870" />
 					<param name="music_rating_color" value="$VAR[Light_Color]" />
@@ -71,7 +73,7 @@
 			<focusedlayout height="60" width="1920" condition="$PARAM[condition]">
 				<include content="Common_List_Focused">
 					<param name="label_left" value="120" />
-					<param name="label_maxwidth" value="1200" />
+					<param name="label_maxwidth" value="$PARAM[focused_maxwidth]" />
 					<param name="icon_slide" value="-900" />
 					<param name="music_rating_slide" value="870" />
 					<param name="music_rating_color" value="$VAR[Light_Color]" />
@@ -118,9 +120,11 @@
 		</focusedlayout>
 	</include>
 
-	<include name="ListView_Layout_pvrsearch">
+	<include name="ListView_Layout_tvsearch">
 		<include content="ListView_Layout_Background">
 			<param name="condition" value="true" />
+			<param name="focused_maxwidth" value="1200" />
+			<param name="unfocused_maxwidth" value="1200" />
 		</include>
 	</include>
 

diff --git a/16x9/Content_Viewtype_Options.xml b/16x9/Content_Viewtype_Options.xml
@@ -304,6 +304,15 @@
 		</item>
 	</include>
 
+	<include name="tvsearch_Menu_Options">
+		<item>
+			<description>Channel Groups</description>
+			<label>$INFO[Control.GetLabel(28)]</label>
+			<label2>$INFO[Control.GetLabel(28)]</label2>
+			<onclick>SendClick(28)</onclick>
+		</item>
+	</include>
+
 	<include name="tvguide_Menu_Options">
 		<item>
 			<description>Channel Groups</description>

diff --git a/16x9/DialogConfirm.xml b/16x9/DialogConfirm.xml
@@ -43,6 +43,7 @@
 				<param name="button1_id" value="10" />
 				<param name="button2" value="true" />
 				<param name="button2_id" value="11" />
+				<param name="button3" value="false" />
 				<param name="button3_id" value="12" />
 				<param name="color" value="$VAR[Light_Color]" />
 				<param name="unfocused_color" value="$VAR[Light_Color]" />

diff --git a/16x9/DialogPVRInfo.xml b/16x9/DialogPVRInfo.xml
@@ -8,7 +8,7 @@
 			<param name="visible" value="!Window.IsVisible(pvrtimersetting) + !Window.IsVisible(shutdownmenu)" />
 			<include content="Fullscreen_Info">
 				<param name="show_logo" value="false" />
-				<param name="info_label" value="$VAR[Info_Infoscreens_Label]" />
+				<param name="info_label" value="$VAR[Info_PVR_Label]" />
 			</include>
 		</include>
 	</controls>

diff --git a/16x9/MyPVRSearch.xml b/16x9/MyPVRSearch.xml
@@ -7,41 +7,12 @@
 	<views>50</views>
 	<controls>
 		<include content="MyViews_Common_Controls" />
+		<include content="tvguide_Controls" />
 		<include content="Background_Global" />
 		<include content="Embedded_VideoPlayer">
 			<param name="visible" value="VideoPlayer.Content(livetv)" />
 		</include>
-		<include content="MyViews_PVRSearch" />
+		<include content="MyViews_tvsearch" />
 		<include content="MyViews_Menu_and_Scrollbars" />
-
-		<include content="Breadcrumb_Label">
-			<param name="bar" value="true" />
-			<param name="title_label_id" value="29" />
-			<param name="info_label_visible" value="true" />
-			<param name="info_label" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[137]" />
-			<param name="label_color" value="$VAR[Light_Color]" />
-		</include>
-		<include content="Default_Dialog_Panel_Layout">
-			<param name="visible" value="!$EXP[TransparentDialog_IsVisible] + ListItem.HasEPG" />
-			<param name="panel_edge_top" value="120" />
-			<param name="panel_edge_bottom" value="120" />
-			<param name="panel_edge_left" value="1140" />
-			<param name="panel_edge_right" value="60" />
-			<param name="panel_colordiffuse" value="$VAR[Panel_Mask]" />
-			<include content="PVR_Info_Box">
-				<param name="left" value="1200" />
-				<param name="right" value="120" />
-				<param name="bottom" value="120" />
-				<param name="height" value="840" />
-				<param name="plot_height_max" value="750" />
-			</include>
-		</include>
-
-		<control type="grouplist">
-			<control type="button" id="28">
-				<onleft>3000</onleft>
-			</control>
-		</control>
-
 	</controls>
 </window>
diff --git a/16x9/Templates_Dialogs.xml b/16x9/Templates_Dialogs.xml
@@ -102,6 +102,7 @@
 		<param name="color" default="$VAR[Light_Color]" />
 		<param name="show_logo" default="![String.IsEmpty(VideoPlayer.Art(clearlogo-billboard)) + String.IsEmpty(VideoPlayer.Art(clearlogo-aligned)) + String.IsEmpty(VideoPlayer.Art(clearlogo))]" />
 		<param name="info_label" default="$VAR[Info_Label_FullscreenVideo]" />
+		<param name="info_label_max_height" default="70" />
 		<param name="plot_label" default="$VAR[Plot_Label]" />
 		<param name="align" default="center" />
 		<definition>
@@ -139,7 +140,7 @@
 					<param name="scroll" default="false" />
 				</include>
 				<include content="Common_Details_Info">
-					<param name="maxheight" value="70" />
+					<param name="maxheight" value="$PARAM[info_label_max_height]" />
 					<param name="font" value="Billboard_Info" />
 					<param name="color" value="$PARAM[color]" />
 					<param name="label" value="$PARAM[info_label]" />

diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml
@@ -124,11 +124,11 @@
 			<visible allowhiddenfocus="true">false</visible>
 		</control>
 		<control type="label" id="29">
-			<description>View name</description>
+			<description>View name / Search term</description>
 			<visible>false</visible>
 		</control>
 		<control type="label" id="30">
-			<description>Channel groups name</description>
+			<description>Channel groups name / Saved status</description>
 			<visible>false</visible>
 		</control>
 	</include>
@@ -367,28 +367,6 @@
 		</definition>
 	</include>
 
-	<include name="MyViews_PVRSearch">
-		<param name="visible" default="!$EXP[Infoscreen_IsVisible]" />
-		<definition>
-			<control type="group">
-				<include content="WindowOpenClose_Fade_Delayed_Animation" />
-				<visible>$PARAM[visible]</visible>
-				<include content="Visible_Fade_Delayed_Animation" />
-				<include content="Background_Media" condition="$EXP[Library_Has_Content]" />
-				<include content="ListView_Display" />
-			</control>
-			<control type="group">
-				<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
-				<visible>$PARAM[visible]</visible>
-				<include content="Visible_Fade_Delayed_Long_Animation" />
-				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
-				<include content="ListView_Container" />
-				<include content="ListView_Details" />
-			</control>
-		</definition>
-	</include>
-
-
 	<include name="MyViews_tvguide">
 		<param name="visible" default="!$EXP[Infoscreen_IsVisible]" />
 		<definition>
@@ -425,10 +403,9 @@
 						<width>1680</width>
 						<centerleft>50%</centerleft>
 						<scrolltime tween="sine" easing="inout">360</scrolltime>
-						<timeblocks>36</timeblocks>
+						<timeblocks>30</timeblocks>
 						<rulerunit>6</rulerunit>
 						<progresstexture border="0,92,3,0" colordiffuse="$VAR[Accent_Color]">pvr/tvguide_progress_indicator.png</progresstexture>
-						<!-- <progresstexture border="2,92,2,2" colordiffuse="05ffffff">pvr/tvguide_progress.png</progresstexture> -->
 						<orientation>vertical</orientation>
 						<onup>11</onup>
 						<ondown>SetFocus(3000,0,absolute)</ondown>
@@ -437,7 +414,7 @@
 							<control type="label" id="2">
 								<label>$INFO[ListItem.Label]</label>
 								<font>PVR_Time</font>
-								<width>100%</width>
+								<width>1020</width>
 								<centertop>50%</centertop>
 								<height>30</height>
 								<textcolor>$VAR[Light_Color]</textcolor>
@@ -449,45 +426,48 @@
 								<texture colordiffuse="$VAR[Accent_Color]" border="4">pvr/tvguide_focusedlayout_border_left.png</texture>
 							</control>
 						</rulerlayout>
-						<channellayout width="420" height="90">
+						<channellayout width="540" height="90">
 							<control type="image">
-								<height>60</height>
-								<centertop>50%</centertop>
-								<width>60</width>
+								<height>90</height>
+								<width>90</width>
 								<texture>$INFO[ListItem.Art(thumb)]</texture>
+								<aspectratio>keep</aspectratio>
 							</control>
 							<control type="label" id="1">
 								<label>$INFO[ListItem.Label]</label>
-								<left>60</left>
+								<width>450</width>
+								<left>90</left>
 								<textoffsetx>30</textoffsetx>
+								<scroll>false</scroll>
 							</control>
 						</channellayout>
-						<focusedchannellayout width="420" height="90">
+						<focusedchannellayout width="540" height="90">
 							<control type="image" id="1">
 								<bottom>0</bottom>
 								<height>1</height>
 								<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
-								<animation effect="zoom" end="400,1" time="0" condition="true">Conditional</animation>
+								<animation effect="zoom" end="311,1" time="0" condition="true">Conditional</animation>
 							</control>
 							<control type="image">
-								<height>60</height>
-								<centertop>50%</centertop>
-								<width>60</width>
+								<height>90</height>
+								<width>90</width>
 								<texture>$INFO[ListItem.Art(thumb)]</texture>
+								<aspectratio>keep</aspectratio>
 							</control>
 							<control type="label" id="1">
 								<label>$INFO[ListItem.Label]</label>
 								<textcolor>$VAR[epggrid_Focused_Color]</textcolor>
-								<left>60</left>
+								<left>90</left>
+								<width>450</width>
 								<textoffsetx>30</textoffsetx>
-								<scrollsuffix> / </scrollsuffix>
+								<scroll>false</scroll>
 							</control>
 						</focusedchannellayout>
 						<itemlayout width="45" height="90">
 							<control type="label" id="1">
 								<label>$INFO[ListItem.Label]</label>
-								<left>30</left>
-								<right>30</right>
+								<textoffsetx>15</textoffsetx>
+								<scroll>false</scroll>
 							</control>
 						</itemlayout>
 						<focusedlayout width="45" height="90">
@@ -505,41 +485,82 @@
 								<texture colordiffuse="$VAR[Unfocused_Color]" border="2">pvr/tvguide_focusedlayout_border.png</texture>
 							</control>
 							<control type="label" id="1">
-								<label>$INFO[ListItem.Label]</label>
 								<textcolor>$VAR[epggrid_Focused_Color]</textcolor>
-								<textoffsetx>30</textoffsetx>
-								<scrollsuffix> / </scrollsuffix>
+								<label>$INFO[ListItem.Label]</label>
+								<textoffsetx>15</textoffsetx>
+								<scroll>false</scroll>
 							</control>
 						</focusedlayout>
 					</control>
 					<include content="Dialog_Divider_With_Scrollbar">
 						<param name="scrollbarvisible" value="true" />
 						<param name="id" value="60" />
 						<param name="height" value="540" />
-						<param name="left" value="540" />
+						<param name="left" value="660" />
 						<param name="scrollbaralignleft" value="true" />
 					</include>
 					<!-- Details -->
 					<include content="PVR_Info_Box">
-						<param name="left" value="210" />
+						<param name="left" value="470" />
 						<param name="right" value="120" />
-						<param name="bottom" value="0" />
-						<param name="height" value="270" />
+						<param name="bottom" value="30" />
+						<param name="height" value="210" />
 						<param name="plot_height_max" value="100" />
 					</include>
 					<control type="image">
-						<bottom>105</bottom>
-						<height>60</height>
+						<bottom>45</bottom>
+						<height>180</height>
 						<left>120</left>
-						<width>60</width>
+						<width>320</width>
 						<texture>$INFO[ListItem.Icon]</texture>
-						<fadetime>90</fadetime>
+						<aspectratio align="right" aligny="center">scale</aspectratio>
+						<fadetime>360</fadetime>
 					</control>
 				</include>
 			</control>
 		</definition>
 	</include>
 
+	<include name="MyViews_tvsearch">
+		<param name="visible" default="!$EXP[Infoscreen_IsVisible]" />
+		<definition>
+			<control type="group">
+				<include content="WindowOpenClose_Fade_Delayed_Animation" />
+				<visible>$PARAM[visible]</visible>
+				<include content="Visible_Fade_Delayed_Animation" />
+				<include content="ListView_Display" />
+			</control>
+			<control type="group">
+				<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
+				<visible>$PARAM[visible]</visible>
+				<include content="Visible_Fade_Delayed_Long_Animation" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
+				<include content="ListView_Container" />
+				<include content="ListView_Details" />
+				<include content="Breadcrumb_Label">
+					<param name="bar" value="true" />
+					<param name="title_label_id" value="29" />
+					<param name="info_label_visible" value="true" />
+					<param name="info_label" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[137]$INFO[Control.GetLabel(30), ]" />
+					<param name="label_color" value="$VAR[Light_Color]" />
+				</include>
+				<include content="Default_Dialog_Panel_Layout">
+					<param name="visible" value="!$EXP[TransparentDialog_IsVisible] + ListItem.HasEPG" />
+					<param name="panel_edge_left" value="1140" />
+					<param name="panel_edge_right" value="60" />
+					<param name="panel_colordiffuse" value="$VAR[Panel_Mask]" />
+					<include content="PVR_Info_Box">
+						<param name="left" value="1200" />
+						<param name="right" value="120" />
+						<param name="bottom" value="225" />
+						<param name="height" value="630" />
+						<param name="plot_height_max" value="540" />
+					</include>
+				</include>
+			</control>
+		</definition>
+	</include>
+
 	<include name="OptionsMenu_Slides">
 		<animation effect="slide" start="0" end="0,30" time="0" condition="Integer.IsLessOrEqual(Container(3000).NumItems,12)">Conditional</animation>
 		<animation effect="slide" start="0" end="0,30" time="0" condition="Integer.IsLessOrEqual(Container(3000).NumItems,11)">Conditional</animation>
@@ -659,6 +680,7 @@
 					<include content="GridView_Menu_Options" condition="$EXP[GridView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
 					<include content="Trailer_Autoplay_Menu_Options" condition="Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay)" />
 					<include content="tvguide_Menu_Options" condition="Window.Is(tvguide)" />
+					<include content="tvsearch_Menu_Options" condition="Window.Is(tvsearch)" />
 					<include content="Common_Menu_Options">
 						<param name="target_id" value="$PARAM[target_id]" />
 					</include>

diff --git a/16x9/Variables_Labels_Color.xml b/16x9/Variables_Labels_Color.xml
@@ -207,6 +207,9 @@
 	<variable name="ListItem_Endtime_Divider_Bold">
 		<value condition="!String.IsEmpty(ListItem.Endtime)">$VAR[Copacetic_Divider_Bold]</value>
 	</variable>
+	<variable name="ListItem_EpisodeName_Divider_Bold">
+		<value condition="!String.IsEmpty(ListItem.EpisodeName)">$VAR[Copacetic_Divider_Bold]</value>
+	</variable>
 	<variable name="ListItem_Genre_Divider">
 		<value condition="!String.IsEmpty(ListItem.Genre)">$VAR[Copacetic_Divider_Dominant]</value>
 	</variable>
@@ -249,6 +252,9 @@
 	<variable name="ListItem_SortLetter_Divider_Bold">
 		<value condition="!String.IsEmpty(ListItem.SortLetter)">$VAR[Copacetic_Divider_Bold]</value>
 	</variable>
+	<variable name="ListItem_StartTime_Divider_Bold">
+		<value condition="!String.IsEmpty(ListItem.StartTime)">$VAR[Copacetic_Divider_Bold]</value>
+	</variable>
 	<variable name="ListItem_Studio_Divider_Bold">
 		<value condition="!String.IsEmpty(ListItem.Studio)">$VAR[Copacetic_Divider_Bold]</value>
 	</variable>