Merge remote-tracking branch 'upstream/Developer' into python3

.github/workflows/enigma2.yml

@@ -17,8 +17,8 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        gcc: [11]
-        python: ['3.11']
+        gcc: [13]
+        python: ['3.12']
     steps:
     - name: install dev packages
       run: |
@@ -31,7 +31,7 @@ jobs:
         sudo apt-get install build-essential
         sudo apt-get install automake
         sudo apt-get install libtool
-        sudo apt-get install python${{ matrix.python }}-dev
+        sudo apt-get install python3-dev
         sudo apt-get install zlib1g-dev
         sudo apt-get install gettext
         sudo apt-get install swig

ChangeLog

@@ -1228,3 +1228,18 @@ openvix: developer 6.4.011.007
 openvix: developer 6.4.011.008
 openvix: developer 6.4.011.009
 openvix: developer 6.4.011.010
+openvix: developer 6.4.011.011
+openvix: developer 6.4.011.012
+openvix: developer 6.4.012.001
+openvix: developer 6.4.012.002
+openvix: developer 6.4.012.003
+openvix: developer 6.4.012.004
+openvix: developer 6.5.001.001
+openvix: developer 6.5.001.002
+openvix: developer 6.5.001.003
+openvix: developer 6.5.001.004
+openvix: developer 6.5.001.005
+openvix: developer 6.5.001.006
+openvix: developer 6.5.001.007
+openvix: developer 6.5.001.008
+openvix: developer 6.5.001.009

README.md

@@ -13,7 +13,7 @@
 
 ## OpenViX python3 is built using oe-alliance build-environment and several git repositories: ##
 
-> [https://github.com/oe-alliance/oe-alliance-core/tree/5.3](https://github.com/oe-alliance/oe-alliance-core/tree/5.3 "OE-Alliance")
+> [https://github.com/oe-alliance/oe-alliance-core/tree/5.4](https://github.com/oe-alliance/oe-alliance-core/tree/5.4 "OE-Alliance")
 >
 > [https://github.com/OpenViX/enigma2/tree/Release](https://github.com/OpenViX/enigma2/tree/Release "openViX E2")
 
@@ -76,7 +76,7 @@
 ----------
 10 - Clone oe-alliance git
 
-    git clone https://github.com/oe-alliance/build-enviroment.git -b 5.3
+    git clone https://github.com/oe-alliance/build-enviroment.git -b 5.4
 
 ----------
 11 - Switch to folder build-enviroment

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([enigma2],[6.4],[http://www.world-of-satellite.com])
+AC_INIT([enigma2],[6.5],[http://www.world-of-satellite.com])
 AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability])
 AC_CONFIG_HEADERS([enigma2_config.h])
 

data/display480/skin_display.xml

@@ -564,10 +564,17 @@
 		<widget name="Service" position="20,100" size="440,100" font="FdLcD;35" transparent="1" />
 	</screen>
 
-	<!-- NUMBERZAP -->
+<!-- NUMBERZAP -->
 	<screen name="NumberZap_summary" position="0,0" size="480,320">
 		<widget source="parent.servicename_summary" render="Label" position="0,5" size="480,70" font="FdLcD;55" halign="center" valign="center" foregroundColor="yellow" />
 		<widget source="parent.number_summary" render="Label" position="10,100" size="480,80" foregroundColor="white" font="FdLcD;75" halign="center" valign="center" />
 	</screen>
 
+<!-- Package manager -->
+	<screen name="PackageManagerSummary" position="fill">
+		<widget source="Title" render="Label" position="top" size="*,100" font="FdLcD;40" halign="center" valign="center" foregroundColor="yellow"/>
+		<widget source="parent.list" render="Label" position="fill" font="FdLcD;35" halign="center" valign="center">
+			<convert type="StringListSelection" />
+		</widget>
+	</screen>
 </skin>

data/display800/skin_display_templates.xml

@@ -437,5 +437,12 @@
 		<widget source="parent.summarytext" render="Label" position="40,0" size="720,100" foregroundColor="white" font="FdLcD;85" halign="center" valign="center" zPosition="2" />
 		<widget source="parent.summarylangname" render="Label" position="40,200" size="720,160" foregroundColor="white" font="FdLcDLight;65" halign="center" valign="top" zPosition="2" />
 	</screen>
+
+	<screen name="PackageManagerSummary" position="fill">
+		<widget source="Title" render="Label" position="top" size="*,180" font="FdLcD;60" halign="center" valign="center"/>
+		<widget source="parent.list" render="Label" position="fill" font="FdLcD;50" halign="center" valign="center">
+			<convert type="StringListSelection" />
+		</widget>
+	</screen>
 
 </skin>

data/setup.xml

@@ -108,6 +108,7 @@
 		<item level="1" text="Channel list cursor behavior" description="Configure the cursor behavior in the channel selection list. When opening the channel selection list you can remain on the current service or already select up/down and you are able to revert the B+/B- buttons.">config.usage.servicelist_cursor_behavior</item>
 		<item level="1" text="Enable multiple bouquets" description="Services may be grouped in bouquets. When enabled, you can use more than one bouquet.">config.usage.multibouquet</item>
 		<item level="1" text="Enable panic button" description="When enabled, pressing '0' will zap you to the first channel in your first bouquet and delete your zap-history.">config.usage.panicbutton</item>
+		<item level="1" text="Show available subservices" description="if set will display subservices else timers.">config.vixsettings.Subservice</item>
 		<item level="1" text="Hide number markers" description="When enabled, number markers will be hidden.">config.usage.hide_number_markers</item>
 		<item level="1" text="Jump first press in channel selection" description="This option allows you to choose what the first button press jumps to in channel list screen, (so pressing '2' jumps to 'A' or '2' first), when 'Quick Actions' preset actions are perfomed. ">config.usage.show_channel_jump_in_servicelist</item>
 		<item level="2" text="Show two lines per entry" description="Show the service information on two lines in the channel selection screen.">config.usage.servicelist_twolines</item>

data/videowizard.xml

@@ -1,5 +1,6 @@
 <!--suppress XmlUnboundNsPrefix -->
 <wizard>
+from Components.AVSwitch import iAVSwitch as avSwitch
 	<step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
 		<condition>
 self.condition = len(self.listInputChannels()) > 1
@@ -42,7 +43,8 @@ self.selectKey("DOWN")
 	</step>
 	<step id="end">
 		<code>
-self.hw.saveMode(self.port, self.mode, self.rate)
+from Components.AVSwitch import iAVSwitch as avSwitch		
+avSwitch.saveMode(self.port, self.mode, self.rate)
 from Components.config import configfile
 configfile.save()
 self.markDone()

doc/AUTOMATICBUTTONS

@@ -24,13 +24,15 @@ in the screens correctly as if we had added them manually to every single screen
   alignment="left"
   zPosition="2"
   spacing="10"
-  spacingPixmapText="10" />
+  spacingPixmapText="10"
+  buttonCornerRadius="6" />
 
 Attributes:
   connection: comma separated list of the buttons this widget will control.
   pixmaps: comma separated list that contains "key_name" then a ":" then the path to the graphic to be used.
   spacing: is the spacing between the text and the next button.
   spacingPixmapText: is the spacing between the graphic and the text.
+  buttonCornerRadius (optional): add rounding to corners.
 
 By default the foreground text color will be the same as the default listbox text color. But this can be altered for each
 button with the "textColors" attribute.
@@ -52,7 +54,8 @@ Example widget with colored text:
   alignment="left"
   zPosition="2"
   spacing="10"
-  spacingPixmapText="10" />
+  spacingPixmapText="10"
+  buttonCornerRadius="6" />
 
 It is also possible to have colored text and no graphics:
 
@@ -67,7 +70,41 @@ It is also possible to have colored text and no graphics:
   transparent="1"
   alignment="left"
   zPosition="2"
-  spacing="10" />
+  spacing="10"
+  buttonCornerRadius="6" />
+
+Superimpose text over the graphic rather that have the graphic to the side of the text.
+
+<widget 
+  addon="ColorButtonsSequence"
+  connection="key_red,key_green,key_yellow,key_blue" 
+  pixmaps="key_red:buttons/key_red.png,key_green:buttons/key_green.png,key_yellow:buttons/key_yellow.png,key_blue:buttons/key_blue.png" 
+  position="0,0"
+  size="e,36" 
+  font="Regular;26" 
+  backgroundColor="background5" 
+  alignment="left" 
+  zPosition="10" 
+  spacing="40" 
+  spacingPixmapText="10" 
+  buttonCornerRadius="6" 
+  renderType="ImageTextOver" />
+
+Superimpose texted over a coloured background (no graphic).
+
+<widget addon="ColorButtonsSequence" 
+  connection="key_red,key_green,key_yellow,key_blue" 
+  textColors="key_red:red,key_green:green,key_yellow:yellow,key_blue:blue" 
+  position="0,0" 
+  size="e,36" 
+  font="Regular;26" 
+  backgroundColor="background5" 
+  alignment="left" 
+  zPosition="10" 
+  spacing="40" 
+  spacingPixmapText="10" 
+  buttonCornerRadius="6" 
+  renderType="ColorTextOver" />
 
 =========================================================================================================================================================================