Remove defunct button definitions

IanSav · May 8, 2024 · 373c6f2 · 373c6f2
1 parent 9c0e00a
commit 373c6f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/usr/share/enigma2/OverlayHD/skin_epgs.xml b/usr/share/enigma2/OverlayHD/skin_epgs.xml
@@ -370,12 +370,8 @@
 
 	<screen name="EPGSelection" title="Single Channel EPG" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<panel name="ScreenTemplateButtonMenu" />
-		<panel name="ScreenTemplateButtonInfo" />
-		<panel name="ScreenTemplateButtonText" />
-		<panel name="ScreenTemplateButtonHelp" />
-		<widget name="list" position="50,80" size="1180,425" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" enableWrapAround="1" font="MenuFont;20" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" itemHeight="25" scrollbarMode="showOnDemand" transparent="0" />
-		<widget name="number" position="50,80" size="1180,425" backgroundColor="TextBackground" font="Regular;50" foregroundColor="FindCharacter" halign="center" transparent="1" valign="center" zPosition="+1" />
+		<widget name="list" position="50,80" size="1180,425" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" conditional="list" font="MenuFont;20" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" itemHeight="25" transparent="0" />
+		<widget name="number" position="50,80" size="1180,425" backgroundColor="TextBackground" conditional="number" font="Regular;50" foregroundColor="FindCharacter" halign="center" transparent="1" valign="center" zPosition="+1" />
 		<eLabel position="50,515" size="1180,2" backgroundColor="Pinstripe" />
 		<panel position="50,525" size="1180,125">
 			<panel name="EPGEventInfoPanel" />

diff --git a/usr/share/enigma2/OverlayHD/skin_tv_radio.xml b/usr/share/enigma2/OverlayHD/skin_tv_radio.xml
@@ -58,17 +58,13 @@
 
 	<screen name="ZapHistoryBrowser" title="Setup" 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 name="list" position="590,170" size="610,415" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" itemHeight="50" transparent="0" />
 	</screen>
 
 <!-- FAV - TV Channel Selection -->
 
 	<screen name="ChannelSelection" title="Channel Selection" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<panel name="ScreenTemplateButtonMenu" />
-		<panel name="ScreenTemplateButtonInfo" />
-		<panel name="ScreenTemplateButtonHelp" />
 		<eLabel position="698,66" size="2,595" backgroundColor="Pinstripe" />
 		<eLabel position="698,558" size="532,2" backgroundColor="Pinstripe" />
 		<widget name="list" position="50,80" size="640,550" backgroundColor="MenuBackground" backgroundColorMarked="FAVMarkedBackground" backgroundColorMarkedSelected="FAVMarked" backgroundColorSelected="MenuSelected"
@@ -179,25 +175,18 @@
 
 	<screen name="ChannelContextMenu" title="Channel Selection Context Menu" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<panel name="ScreenTemplateButtonMenu" />
-		<ePixmap pixmap="menus/tv_live.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<panel name="ScreenTemplateContextMenu0" />
 	</screen>
 
 	<screen name="BouquetSelector" title="Bouquet Selector" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<ePixmap pixmap="menus/tv_live.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<panel name="ScreenTemplateMenu0" />
 	</screen>
 
 <!-- Screen names change for "Simple" mode channel selection -> "SlimChannelSelection", "SimpleChannelSelection", "ChannelSelection" -->
 
 	<screen name="SlimChannelSelection" title="Channel Selection" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
-		<panel name="ScreenTemplateButtonMenu" />
-		<panel name="ScreenTemplateButtonInfo" />
-		<panel name="ScreenTemplateButtonHelp" />
-		<ePixmap pixmap="menus/tv_live.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<widget name="list" position="400,80" size="830,550" backgroundColor="MenuBackground" backgroundColorMarked="FAVMarkedBackground" backgroundColorMarkedSelected="FAVMarked" backgroundColorSelected="MenuSelected"
 			colorEventProgressbar="InfoProgressColor" colorEventProgressbarBorder="InfoProgressBorder" colorEventProgressbarBorderSelected="InfoProgressBorder" colorEventProgressbarSelected="InfoProgressColor"
 			colorFallbackItem="Magenta" colorServiceDescription="FAVService" colorServiceDescriptionFallback="FAVServiceFallback" colorServiceDescriptionSelected="FAVServiceSelected"