[pull] develop from OpenPLi:develop

.github/workflows/enigma2.yml

@@ -23,14 +23,15 @@ jobs:
         pip3 install netifaces pyopenssl python-wifi service_identity twisted
     - name: install dev packages
       run: |
+        sudo apt-get -q update
         sudo apt install docbook-xsl gettext libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libfribidi-dev libavahi-client-dev libgif-dev mm-common
     - name: build enigma2 dependencies
       run: |
         echo installing libdvbsi++
         pushd .
         cd /tmp
-        git clone --depth 1 git://git.opendreambox.org/git/obi/libdvbsi++.git
-        cd libdvbsi++
+        git clone --depth 1 https://github.com/jack2015/libdvbsi.git
+        cd libdvbsi
         autoreconf -i
         ./configure
         make

data/display/skin_display_gbquad4k.xml

@@ -42,44 +42,42 @@
 			<convert type="EventTime">Remaining</convert>
 			<convert type="RemainingToText">FOLLOW</convert>
 		</widget>
-		<eLabel text="TUNER:" position="0,185" size="100,55" halign="Left" valign="center" font="LCD_display;25" />
-		<widget source="session.FrontendInfo" render="FixedLabel" position="100,185" size="25,55" text="A" foregroundColor="#04B404" font="LCD_display;25" halign="center" valign="center" >
-			<convert type="FrontendInfo">NUMBER</convert>
-			<convert type="ValueRange">0,0</convert>
-			<convert type="ConditionalShowHide" />
+		<widget source="session.RecordState" render="FixedLabel" text="Recording" position="center,170" size="190,27" font="LCD_display;25" zPosition="2" valign="bottom" halign="center" noWrap="1" foregroundColor="#ff0000" >
+			<convert type="ConditionalShowHide">Blink,5000,2000</convert>
 		</widget>
-		<widget source="session.FrontendInfo" render="FixedLabel" position="100,185" size="25,55" text="B" foregroundColor="#04B404" font="LCD_display;25" halign="center" valign="center" >
-			<convert type="FrontendInfo">NUMBER</convert>
-			<convert type="ValueRange">1,1</convert>
-			<convert type="ConditionalShowHide" />
+		<widget source="session.CurrentService" render="Picon" position="0,0" size="100,60" alphatest="blend" usePicLoad="1" isFrontDisplayPicon="1">
+			<convert type="ServiceName">Reference</convert>
 		</widget>
-		<widget source="session.FrontendInfo" render="FixedLabel" position="100,185" size="25,55" text="C" foregroundColor="#04B404" font="LCD_display;25" halign="center" valign="center" >
-			<convert type="FrontendInfo">NUMBER</convert>
-			<convert type="ValueRange">2,2</convert>
-			<convert type="ConditionalShowHide" />
+		<widget source="session.FrontendInfo" render="Label" position="10,210" size="130,32" halign="left" font="LCD_display;30">
+			<convert type="FrontendInfo">USE_TUNERS_STRING</convert>
 		</widget>
-		<widget source="session.FrontendInfo" render="FixedLabel" position="100,185" size="25,55" text="D" foregroundColor="#04B404" font="LCD_display;25" halign="center" valign="center" >
-			<convert type="FrontendInfo">NUMBER</convert>
-			<convert type="ValueRange">3,3</convert>
-			<convert type="ConditionalShowHide" />
-		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text="Recording" position="128,185" size="130,55" foregroundColor="#ff0000" font="LCD_display;25" halign="center" valign="center" zPosition="1" noWrap="1" >
-			<convert type="ConditionalShowHide">Blink</convert>
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/stream.png" size="60,50" position="180,200" zPosition="1" alphatest="blend" >
+			<convert type="ClientsStreaming"/>
+			<convert type="ConditionalShowHide"/>
 		</widget>
 		<panel name="SummaryClockPanel" />
 	</screen>
-<!--/* COMMON -->
 
 <!-- standby -->
 	<screen name="StandbySummary" position="0,0" size="400,240">
-		<widget source="global.CurrentTime" render="Label" position="0,0" size="400,24" font="LCD_display;22" halign="left" noWrap="1">
+		<widget source="global.CurrentTime" render="Label" position="0,0" size="400,32" font="LCD_display;30" halign="left" noWrap="1">
 			<convert type="ClockToText">Format:%d.%m.%Y</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="center,center" size="225,100" font="LCD_display;85" halign="center" noWrap="1">
-			<convert type="ClockToText">Format:%H:%M</convert>
+		<widget source="global.CurrentTime" render="Label" position="center,center" size="300,110" font="LCD_display;100" halign="center" noWrap="1" foregroundColor="#7fffff">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+		<widget source="global.CurrentTime" render="Label" position="330,80" size="50,55" font="LCD_display;50" halign="left" noWrap="1" foregroundColor="#7fffff">
+			<convert type="ClockToText">Format:%S</convert>
+		</widget>
+		<widget source="session.RecordState" render="FixedLabel" text="Recording" position="center,170" size="190,27" font="LCD_display;25" zPosition="2" valign="bottom" halign="center" noWrap="1" foregroundColor="#ff0000" >
+			<convert type="ConditionalShowHide">Blink,5000,2000</convert>
 		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text="Recording" position="center,150" size="190,22" font="LCD_display;22" zPosition="2" valign="bottom" halign="center" noWrap="1" foregroundColor="#ff0000" >
-			<convert type="ConditionalShowHide">Blink</convert>
+		<widget source="session.FrontendInfo" render="Label" position="10,210" size="130,32" halign="left" font="LCD_display;30">
+			<convert type="FrontendInfo">USE_TUNERS_STRING</convert>
+		</widget>
+			<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/stream.png" size="60,50" position="180,200" zPosition="1" alphatest="blend" >
+			<convert type="ClientsStreaming"/>
+			<convert type="ConditionalShowHide"/>
 		</widget>
 	</screen>
 
@@ -127,6 +125,9 @@
 		<widget source="parent.ServiceEvent" render="Progress" position="0,200" size="400,30" borderWidth="3">
 			<convert type="EventTime">Progress</convert>
 		</widget>
+		<widget source="parent.ServiceEvent" render="Picon" position="0,0" size="100,60" alphatest="blend" usePicLoad="1" isFrontDisplayPicon="1">
+			<convert type="ServiceName">Reference</convert>
+		</widget>
 	</screen>
 
 <!-- menus-->

data/keymap.xml

@@ -41,9 +41,7 @@
 	</map>
 
 	<map context="NavigationActions">
-		<!--
 		<key id="KEY_REWIND" mapto="top" flags="m" />
-		-->
 		<key id="KEY_CHANNELUP" mapto="pageUp" flags="mr" />
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_REWIND" mapto="first" flags="m" />
@@ -52,9 +50,7 @@
 		<key id="KEY_FASTFORWARD" mapto="last" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_CHANNELDOWN" mapto="pageDown" flags="mr" />
-		<!--
 		<key id="KEY_FASTFORWARD" mapto="bottom" flags="m" />
-		-->
 		<!-- Keyboard specific buttons -->
 		<key id="KEY_HOME" mapto="top" flags="m" />
 		<key id="KEY_PAGEUP" mapto="pageUp" flags="mr" />
@@ -589,7 +585,7 @@
 
 	<map context="TvRadioActions">
 		<key id="KEY_TV" mapto="keyTV" flags="b" />
-		<key id="KEY_TV2" mapto="keyTV" flags="b" />
+		<key id="KEY_TV2" mapto="toggleTvRadio" flags="b" />
 		<key id="KEY_RADIO" mapto="keyRadio" flags="b" />
 		<key id="KEY_AUDIO" mapto="audio" flags="b" />
 	</map>
@@ -649,6 +645,7 @@
 		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
 		<key id="KEY_RED" mapto="openSimilarList" flags="m" />
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
+		<key id="KEY_YELLOW" mapto="openPartialList" flags="m" />
 		<key id="KEY_INFO" mapto="contextMenu" flags="m" />
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
 		<key id="KEY_PROGRAM" mapto="timerAdd" flags="m" />