Support new PluginBrowser and a few clean ups

IanSav · Jul 3, 2023 · 6d5a535 · 6d5a535
1 parent 8733fc4
commit 6d5a535
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 12 deletions.
diff --git a/...a2/OverlayHD/icons/plugins_expandable.png → ...ma2/OverlayHD/icons/plugin_expandable.png b/...a2/OverlayHD/icons/plugins_expandable.png → ...ma2/OverlayHD/icons/plugin_expandable.png
diff --git a/...gma2/OverlayHD/icons/plugins_expanded.png → ...igma2/OverlayHD/icons/plugin_expanded.png b/...gma2/OverlayHD/icons/plugins_expanded.png → ...igma2/OverlayHD/icons/plugin_expanded.png
diff --git a/.../OverlayHD/icons/plugins_verticalline.png → ...igma2/OverlayHD/icons/plugin_vertical.png b/.../OverlayHD/icons/plugins_verticalline.png → ...igma2/OverlayHD/icons/plugin_vertical.png
diff --git a/usr/share/enigma2/OverlayHD/skin.xml b/usr/share/enigma2/OverlayHD/skin.xml
@@ -239,6 +239,7 @@
 		<color name="MenuBackground" value="ScreenBackground" />
 		<color name="MenuDisabled" value="Grey" />
 		<color name="MenuSelected" value="DodgerBlue" />
+		<color name="MenuSelectedMove" value="MediumBlue" />
 		<color name="MenuText" value="White" />
 		<color name="MenuTextSelected" value="White" />
 
@@ -467,13 +468,15 @@
 		-->
 		<parameter name="PlayListIcon" value="15,5,16,16" />
 		<parameter name="PlayListName" value="40,0,1000,25" />
+		<!-- No longer required in the new PluginBrowser as it is now skinable!
 		<parameter name="PluginBrowserName" value="120,5,25" />
 		<parameter name="PluginBrowserDescr" value="140,28,25" />
 		<parameter name="PluginBrowserIcon" value="10,5,100,40" />
 		<parameter name="PluginBrowserCategoryName" value="70,9,50" />
 		<parameter name="PluginBrowserDownloadName" value="70,2,25" />
 		<parameter name="PluginBrowserDownloadDescr" value="90,28,25" />
 		<parameter name="PluginBrowserDownloadIcon" value="5,0,60,50" />
+		-->
 		<!--
 		<parameter name="ServiceInfo" value="0,0,450,50" />
 		<parameter name="ServiceInfoLeft" value="0,0,450,45" />
@@ -604,9 +607,9 @@
 		<setup key="ParentalControl" image="menus/parental_control_setup.png" />
 		<setup key="Playback" image="menus/tv_live.png" />
 		<setup key="PluginBrowser" image="menus/plugins.png" />
-		<setup key="PowerTimer" image="menus/timer.png" />
+		<setup key="PowerTimer" image="menus/timer_setup.png" />
 		<setup key="Recording" image="menus/tv_live.png" />
-		<setup key="RecordTimer" image="menus/timer.png" />
+		<setup key="RecordTimer" image="menus/timer_setup.png" />
 		<setup key="RFModulator" image="menus/setup.png" />
 		<setup key="satconfig" image="menus/setup.png" />
 		<setup key="SleepTimer" image="menus/sleeptimer.png" />
@@ -651,7 +654,7 @@
 		<configList entryFont="MenuFont;25" valueFont="MenuFont;25" />
 		<label font="TextFont;20" />
 		<listbox enableWrapAround="1" font="MenuFont;25" scrollbarBorderWidth="1" scrollbarMode="showOnDemand" scrollbarOffset="0" scrollbarScroll="byLine" scrollbarWidth="10" />
-		<scrolllabel scrollbarBorderWidth="1" scrollbarMode="showOnDemand" scrollbarOffset="10" scrollbarScroll="byLine" scrollbarWidth="10" />
+		<scrolllabel scrollbarBorderWidth="1" scrollbarMode="showOnDemand" scrollbarOffset="0" scrollbarScroll="byLine" scrollbarWidth="10" />
 		<slider borderWidth="1" />
 		<stringList textPadding="15,0" />
 		<borderset name="bsWindow">

diff --git a/usr/share/enigma2/OverlayHD/skin_filemanagers.xml b/usr/share/enigma2/OverlayHD/skin_filemanagers.xml
@@ -271,7 +271,7 @@
 			progressColourSeen="0x00ffc71d" progressColourSeenSelected="000xffc71d" progressSize="50,11"
 			spaceLeft="5" spaceRight="10" textSeparator="20"
 			-->
-		<widget name="quickSelect" position="50,80" size="760,525" backgroundColor="TextBackground" font="SMSHelperFont;100" foregroundColor="FindCharacter" halign="center" transparent="1" valign="center" zPosition="+1" />
+		<widget name="quickselect" position="50,80" size="760,525" backgroundColor="TextBackground" font="SMSHelperFont;100" foregroundColor="FindCharacter" halign="center" transparent="1" valign="center" zPosition="+1" />
 		<widget name="waiting" position="50,80" size="760,525" backgroundColor="TextBackground" font="MovieSelectionFont;25" foregroundColor="TextWaiting" halign="center" transparent="1" valign="center" zPosition="+2" />
 		<widget name="numFolders" position="50,605" size="220,25" font="InfoOtherFont;20" foregroundColor="InfoDiskStats" transparent="1" />
 		<widget name="numFiles" position="50,630" size="220,25" font="InfoOtherFont;20" foregroundColor="InfoDiskStats" transparent="1" />

diff --git a/usr/share/enigma2/OverlayHD/skin_setup.xml b/usr/share/enigma2/OverlayHD/skin_setup.xml
@@ -1284,27 +1284,154 @@
 
 <!-- MENU > Setup > Plugins > Plugin Browser -->
 
+	<!--
 	<screen name="PluginBrowser" title="Plugin Browser" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
 		<panel name="ScreenTemplateButtonMenu" />
 		<ePixmap pixmap="menus/plugins.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<widget name="list" position="400,80" size="830,550" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" transparent="0" />
 	</screen>
+	-->
+
+	<screen name="PluginBrowser" title="Plugin Browser" position="fill" flags="wfNoBorder">
+		<panel name="ScreenTemplate" />
+		<ePixmap pixmap="menus/plugins.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
+		<widget source="pluginList" render="Listbox" position="400,80" size="830,500" conditional="pluginList" listOrientation="vertical">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryPixmapAlphaBlend(pos=(10, 5), size=(100, 40), png=3, flags=BT_SCALE),
+					# MultiContentEntryText(pos=(125, 3), size=(865, 24), font=0, flags=RT_HALIGN_LEFT | RT_VALIGN_TOP, text=1),
+					# MultiContentEntryText(pos=(145, 30), size=(845, 19), font=1, flags=RT_HALIGN_LEFT | RT_VALIGN_BOTTOM, text=2)
+					MultiContentEntryText(pos=(125, 0), size=(865, 50), font=0, flags=RT_HALIGN_LEFT | RT_VALIGN_CENTER, text=1)
+					],
+				# "fonts": [parseFont("TextFont;20"), parseFont("TextFont;15")],
+				"fonts": [parseFont("TextFont;25")],
+				"itemHeight": 50
+				}
+			</convert>
+		</widget>
+		<widget source="pluginGrid" render="Listbox" position="400,80" size="830,470" conditional="pluginGrid" itemSpacing="10,10" listOrientation="grid" moveBackgroundColor="MenuSelectedMove" moveFontColor="TextWaiting" scrollbarLength="450" selectionZoom="0">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryText(pos=(0, 0), size=(154, 105), font=0, backcolor=0x37404040),
+					MultiContentEntryPixmapAlphaBlend(pos=(27, 10), size=(100, 40), png=3, flags=BT_SCALE),
+					MultiContentEntryText(pos=(1, 54), size=(152, 45), font=0, flags=RT_VALIGN_CENTER | RT_HALIGN_CENTER | RT_WRAP, text=1)
+					],
+				"fonts": [parseFont("TextFont;18")],
+				"itemWidth": 154,
+				"itemHeight": 105
+				}
+			</convert>
+		</widget>
+		<!--
+		<widget source="pluginGrid" render="Listbox" position="400,80" size="830,448" conditional="pluginGrid" listOrientation="grid" moveBackgroundColor="MenuSelectedMove" moveFontColor="TextWaiting">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryText(pos=(0, 0), size=(162, 112), font=0),
+					MultiContentEntryText(pos=(4, 4), size=(154, 104), font=0, backcolor=0x00404040),  # color, color_sel, backcolor, backcolor_sel.
+					MultiContentEntryPixmapAlphaBlend(pos=(31, 14), size=(100, 40), png=3, flags=BT_SCALE),
+					MultiContentEntryText(pos=(5, 58), size=(152, 45), font=0, flags=RT_VALIGN_CENTER | RT_HALIGN_CENTER | RT_WRAP, text=1)
+					],
+				"fonts": [parseFont("TextFont;18")],
+				"itemWidth": 162,
+				"itemHeight": 112
+				}
+			</convert>
+		</widget>
+		-->
+		<widget name="quickselect" position="400,80" size="830,550" font="TextFont;100" foregroundColor="TextWaiting" halign="center" transparent="1" valign="center" zPosition="+1" />
+		<panel name="ScreenTemplateDescription2" />
+	</screen>
 
 	<!--
-	<screen name="SetupPluginBrowser" title="Package Settings" position="fill" flags="wfNoBorder">
-		<panel name="Setup" />
+	<screen name="PluginBrowserTemplate" title="Plugin Browser" position="fill" flags="wfNoBorder">
+		<panel name="ScreenTemplate" />
+		<ePixmap pixmap="menus/plugins.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
+		<widget name="quickselect" position="400,80" size="830,550" font="TextFont;100" foregroundColor="TextWaiting" halign="center" transparent="1" valign="center" zPosition="+1" />
+		<widget name="description" position="410,570" size="810,75" font="TextFont;20" valign="center" />
+	</screen>
+
+	<screen name="PluginBrowserList" title="Plugin Browser" position="fill" flags="wfNoBorder">
+		<panel name="PluginBrowserTemplate" />
+		<widget source="pluginList" render="Listbox" position="400,80" size="830,500" conditional="pluginList" listOrientation="vertical">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryPixmapAlphaBlend(pos=(10, 5), size=(100, 40), png=3, flags=BT_SCALE),
+					MultiContentEntryText(pos=(125, 3), size=(865, 24), font=0, flags=RT_HALIGN_LEFT | RT_VALIGN_TOP, text=1),
+					MultiContentEntryText(pos=(145, 30), size=(845, 19), font=1, flags=RT_HALIGN_LEFT | RT_VALIGN_BOTTOM, text=2)
+					],
+				"fonts": [parseFont("TextFont;20"), parseFont("TextFont;15")],
+				"itemHeight": 50
+				}
+			</convert>
+		</widget>
+	</screen>
+
+	<screen name="PluginBrowserGrid" title="Plugin Browser" position="fill" flags="wfNoBorder">
+		<panel name="PluginBrowserTemplate" />
+		<widget source="pluginGrid" render="Listbox" position="400,80" size="830,448" conditional="pluginGrid" listOrientation="grid">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryText(pos=(0, 0), size=(195, 110), font=0),
+					MultiContentEntryText(pos=(4, 4), size=(187, 102), font=0, backcolor=0x00404040),
+					MultiContentEntryPixmapAlphaBlend(pos=(45, 14), size=(100, 40), png=3, flags=BT_SCALE),
+					MultiContentEntryText(pos=(5, 58), size=(185, 45), font=0, flags=RT_VALIGN_CENTER | RT_HALIGN_CENTER | RT_WRAP, text=1)
+					],
+				"fonts": [parseFont("Regular;18")],
+				"itemWidth": 195,
+				"itemHeight": 112
+				}
+			</convert>
+		</widget>
 	</screen>
 	-->
 
-<!-- MENU > Setup > Plugins > Download / Remove Plugins -->
+	<screen name="PluginAction" title="Plugin Browser Action" position="fill" flags="wfNoBorder">
+		<panel name="ScreenTemplate" />
+		<ePixmap pixmap="menus/plugin_setup.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
+		<widget source="plugins" render="Listbox" position="400,80" size="830,500">
+			<convert type="TemplatedMultiContent">
+				{
+				"template":
+					[
+					MultiContentEntryPixmapAlphaBlend(pos=(5, 0), size=(60, 50), png=6, flags=BT_SCALE),
+					MultiContentEntryText(pos=(70, 0), size=(740, 50), font=0, flags=RT_VALIGN_CENTER, text=2),
+					MultiContentEntryText(pos=(70, 2), size=(460, 25), font=1, flags=RT_VALIGN_CENTER, text=3),
+					MultiContentEntryText(pos=(540, 2), size=(210, 25), font=1, flags=RT_VALIGN_CENTER, text=5),
+					MultiContentEntryText(pos=(70, 28), size=(680, 20), font=2, flags=RT_VALIGN_CENTER, text=4, color="DarkGrey"),
+					MultiContentEntryPixmapAlphaBlend(pos=(760, 1), size=(48, 48), png=7, flags=BT_SCALE)
+					],
+				"fonts": [parseFont("Regular;25"), parseFont("Regular;20"), parseFont("Regular;16")],
+				"itemHeight": 50
+				}
+			</convert>
+		</widget>
+		<widget name="quickselect" position="400,80" size="830,500" font="TextFont;100" foregroundColor="TextWaiting" halign="center" transparent="1" valign="center" zPosition="+1" />
+		<panel name="ScreenTemplateDescription2" />
+	</screen>
+
+	<!--
+	<screen name="SetupPluginBrowser" title="Package Settings" position="fill" flags="wfNoBorder">
+		<panel name="Setup" />
+	</screen>
 
 	<screen name="PluginDownloadBrowser" title="Downloadable Plugins" position="fill" flags="wfNoBorder">
 		<panel name="ScreenTemplate" />
 		<ePixmap pixmap="menus/plugin_setup.png" position="50,80" size="250,250" alphatest="blend" scaleFlags="scaleLeftTop" transparent="1" />
 		<panel name="ScreenTemplateOverlayText0" />
 		<panel name="ScreenTemplatePlugList0" />
 	</screen>
+	-->
 
 <!-- MENU > Setup > Plugins > Package Installer -->
 

diff --git a/usr/share/enigma2/OverlayHD/skin_wizards.xml b/usr/share/enigma2/OverlayHD/skin_wizards.xml
@@ -57,7 +57,6 @@
 			</convert>
 		</widget>
 		<widget name="config" position="400,350" size="830,280" backgroundColor="MenuBackground" backgroundColorSelected="MenuSelected" conditional="config" font="Regular;25" foregroundColor="MenuText" foregroundColorSelected="MenuTextSelected" itemHeight="35" transparent="0" />
-		<widget name="wizard" position="0,0" size="0,0" conditional="wizard" transparent="1" />
 		<widget name="localetext" position="0,0" size="0,0" conditional="localetext" transparent="1" />
 		<widget name="languagetext" position="0,0" size="0,0" conditional="languagetext" transparent="1" />
 	</screen>
@@ -273,10 +272,6 @@
 		<panel name="WizardTemplate" />
 	</screen>
 
-	<screen name="WizardSummary" title="Welcome" position="fill" flags="wfNoBorder">
-		<widget name="text" position="0,0" size="1280,25" backgroundColor="TextBackground" font="Regular;20" foregroundColor="Orange" transparent="1" valign="center" />
-	</screen>
-
 <!-- Remote IP Tuner Scanner Wizard -->
 
 	<!-- Moved to skin_setup.xml