Skin corrections

- Correct "RemainingToText" argument from invalid value of "InMinutes" to the value "Default". - Move the SubService based screend from "skin_tv_radio.xml" to "skin_infobars.xml". - Remove duplicated screen image from "HistoryZapSelector" screen.
IanSav · Feb 1, 2024 · 09556a3 · 09556a3
1 parent ac049d1
commit 09556a3
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 39 deletions.
diff --git a/usr/share/enigma2/OverlayHD/skin.xml b/usr/share/enigma2/OverlayHD/skin.xml
@@ -508,6 +508,7 @@
 		<screen key="DeviceInformation" image="menus/backup.png" />
 		<screen key="DistributionInformation" image="menus/information.png" />
 		<screen key="GeolocationInformation" image="menus/information.png" />
+		<screen key="HistoryZapSelector" image="menus/tv_zap_history.png" />
 		<screen key="MemoryInformation" image="menus/browser.png" />
 		<screen key="MultiBootInformation" image="menus/information.png" />
 		<screen key="NetworkInformation" image="menus/radio.png" />

diff --git a/usr/share/enigma2/OverlayHD/skin_epgs.xml b/usr/share/enigma2/OverlayHD/skin_epgs.xml
@@ -58,7 +58,7 @@
 		</widget>
 		<widget source="Event" render="Label" position="200,30" size="180,25" backgroundColor="InfoBackground" font="InfoTimeFont;20" foregroundColor="InfoDurationNow" halign="right" noWrap="1" transparent="1">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<widget source="Event" render="Pixmap" position="400,30" size="40,20" alphatest="blend">
 			<convert type="EventName">RatingIcon</convert>
@@ -101,7 +101,7 @@
 		</widget>
 		<widget source="Event" render="Label" position="200,30" size="180,25" backgroundColor="EPGBackground" font="InfoTimeFont;20" foregroundColor="InfoDurationNow" halign="right" noWrap="1" transparent="1">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<widget source="Event" render="Pixmap" position="400,30" size="40,20" alphatest="blend">
 			<convert type="EventName">RatingIcon</convert>
@@ -402,7 +402,7 @@
 	<screen name="RecordTimerQuestion" title="Timer" position="center,center" size="240,80" flags="wfNoBorder" zPosition="+4">
 		<widget source="Title" render="Label" position="0,0" size="0,0" font="TitleFont;25" foregroundColor="BannerTitle" transparent="1" />
 		<widget name="text" position="0,0" size="0,0" font="Regular;25" foregroundColor="BannerTitle" transparent="1" />
-		<widget name="list" position="5,5" size="230,70" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" transparent="0" />
+		<widget name="list" position="5,5" size="230,75" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" transparent="0" />
 	</screen>
 
 	<screen name="RecordTimerQuestion1" title="Timer" position="center,center" size="240,115" flags="wfNoBorder" zPosition="+4">

diff --git a/usr/share/enigma2/OverlayHD/skin_infobars.xml b/usr/share/enigma2/OverlayHD/skin_infobars.xml
@@ -192,7 +192,7 @@
 		</widget>
 		<widget source="session.Event_Now" render="Label" position="925,615" size="160,25" backgroundColor="InfoBackground" font="InfoTimeFont;20" foregroundColor="InfoDurationNow" halign="right" noWrap="1" transparent="1" valign="bottom">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<!-- Now Event Progress Bar Area -->
 		<widget source="session.Event_Now" render="Progress" position="370,643" size="715,6" backgroundColor="InfoProgressBackground" borderColor="InfoProgressBorder" borderWidth="1" foregroundColor="InfoProgressColor">
@@ -284,7 +284,7 @@
 		</widget>
 		<widget source="session.Event_Now" render="Label" position="370,35" size="200,25" backgroundColor="InfoBackground" font="InfoTimeFont;18" foregroundColor="InfoDurationNow" halign="right" noWrap="1" transparent="1">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<!-- Event Extended Description Area -->
 		<widget source="session.Event_Now" render="Label" position="25,70" size="530,260" backgroundColor="InfoBackground" font="InfoDescriptionFont;18" foregroundColor="InfoDetailsNow" halign="block" transparent="1">
@@ -320,7 +320,7 @@
 		</widget>
 		<widget source="session.Event_Next" render="Label" position="370,35" size="200,25" backgroundColor="InfoBackground" font="InfoTimeFont;18" foregroundColor="InfoDurationNext" halign="right" noWrap="1" transparent="1">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<!-- Event Extended Description Area -->
 		<widget source="session.Event_Next" render="Label" position="25,70" size="530,260" backgroundColor="InfoBackground" font="InfoDescriptionFont;18" foregroundColor="InfoDetailsNext" halign="block" transparent="1">
@@ -508,6 +508,35 @@
 		</widget>
 	</screen>
 
+<!-- Sub-Service -->
+
+	<!-- Sub-Service Selection -->
+
+	<!--
+	<screen name="SubServiceSelection" title="Sub-Service Selection" position="fill" flags="wfNoBorder">
+		<panel name="ChoiceBox" />
+	</screen>
+	-->
+
+	<!-- SubService QuickZap -->
+
+	<!-- This looks more like the standard InfoBar screen!
+	<screen name="SubServicesQuickZap" title="Sub-Services QuickZap" position="0,90" size="1280,720" backgroundColor="transparent" flags="wfNoBorder">
+		<ePixmap pixmap="images/infobar.png" position="0,0" size="1280,720" zPosition="-1" />
+		<widget source="global.CurrentTime" render="Label" position="75,485" size="95,35" backgroundColor="#41000000" font="Regular;30" halign="center" transparent="1" valign="bottom">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+		<ePixmap pixmap="icons/picon_default.png" position="70,532" size="70,60" zPosition="2" />
+		<widget name="CurrentSubserviceNumber" position="185,485" size="50,34" backgroundColor="#33294a6b" font="Regular;30" halign="left" shadowColor="Black" shadowOffset="-1,-1" transparent="1" valign="bottom" zPosition="2" />
+		<widget source="session.CurrentService" render="Label" position="235,485" size="600,34" backgroundColor="#33294a6b" font="Regular;30" halign="left" shadowColor="Black" shadowOffset="-1,-1" transparent="1" valign="bottom" zPosition="2">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.RecordState" render="Pixmap" pixmap="icons/icon_rec.png" position="1150,556" size="48,48" zPosition="1">
+			<convert type="ConditionalShowHide">Blink</convert>
+		</widget>
+	</screen>
+	-->
+
 <!-- InfoBar Recording Timers Plugin -->
 
 	<!-- Template fields:

diff --git a/usr/share/enigma2/OverlayHD/skin_tv_radio.xml b/usr/share/enigma2/OverlayHD/skin_tv_radio.xml
@@ -35,7 +35,6 @@
 
 	<screen name="HistoryZapSelector" title="History Zap" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<ePixmap pixmap="menus/tv_zap_history.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<widget source="menu" render="Listbox" position="400,80" size="830,525" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" transparent="0">
 			<convert type="TemplatedMultiContent">
 				{
@@ -110,7 +109,7 @@
 		</widget>
 		<widget source="ServiceEvent" render="Label" position="980,175" size="250,25" backgroundColor="InfoBackground" font="InfoTimeFont;20" foregroundColor="InfoDurationNow" halign="right" noWrap="1" transparent="1">
 			<convert type="EventTime">Remaining</convert>
-			<convert type="RemainingToText">InMinutes</convert>
+			<convert type="RemainingToText">Default</convert>
 		</widget>
 		<widget source="ServiceEvent" render="Label" position="730,205" size="500,215" backgroundColor="InfoBackground" font="InfoDescriptionFont;20" foregroundColor="InfoDetailsNow" halign="block" transparent="1"><!-- size="526,270" -->
 			<convert type="EventName">FullDescription,Trimmed,NotSeparated</convert>
@@ -229,37 +228,6 @@
 		<widget name="list" position="400,80" size="830,550" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" />
 	</screen>
 
-<!-- Subservice -->
-
-	<!-- Subservice Selection -->
-
-	<!--
-	<screen name="SubserviceSelection" title="Subservices" position="fill" flags="wfNoBorder">
-		<eLabel text="Subservices" position="675,140" size="485,35" font="Regular;28" transparent="1" zPosition="2" />
-		<eLabel position="665,180" size="450,2" backgroundColor="White" zPosition="2" />
-		<widget name="subservices" position="650,195" size="510,400" transparent="1" zPosition="2" />
-	</screen>
-	-->
-
-	<!-- Subservice Quickzap -->
-
-	<!--
-	<screen name="SubservicesQuickzap" title="Subservices" position="0,90" size="1280,720" backgroundColor="transparent" flags="wfNoBorder">
-		<ePixmap pixmap="images/infobar.png" position="0,0" size="1280,720" zPosition="-1" />
-		<widget source="global.CurrentTime" render="Label" position="75,485" size="95,35" backgroundColor="#41000000" font="Regular;30" halign="center" transparent="1" valign="bottom">
-			<convert type="ClockToText">Default</convert>
-		</widget>
-		<ePixmap pixmap="icons/picon_default.png" position="70,532" size="70,60" zPosition="2" />
-		<widget name="CurrentSubserviceNumber" position="185,485" size="50,34" backgroundColor="#33294a6b" font="Regular;30" halign="left" shadowColor="Black" shadowOffset="-1,-1" transparent="1" valign="bottom" zPosition="2" />
-		<widget source="session.CurrentService" render="Label" position="235,485" size="600,34" backgroundColor="#33294a6b" font="Regular;30" halign="left" shadowColor="Black" shadowOffset="-1,-1" transparent="1" valign="bottom" zPosition="2">
-			<convert type="ServiceName">Name</convert>
-		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="icons/icon_rec.png" position="1150,556" size="48,48" zPosition="1">
-			<convert type="ConditionalShowHide">Blink</convert>
-		</widget>
-	</screen>
-	-->
-
 <!-- HbbTV -->
 
 	<screen name="HbbTVWindow" title="HbbTV Plugin" position="fill" backgroundColor="ScreenTransparent" flags="wfNoBorder" />