Skip to content

Commit f086ac3

Browse files
MrServoHains
authored andcommitted
[LCD4linux] V5.0-r28 Extended switching of the screens
- expanded setting **LCD4linux.ScreenTime2...9**: new option "timer off" - new setting **LCD4linux.ScreenDefault**: new option 'last Screen' (which screen should be used after a mode change? (e.g. 'on, 'media', 'standby')) - all translations modified accordingly HINT: **LCD4linux** is still working under Python2 and Python3
1 parent 8cf68d6 commit f086ac3

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

lcd4linux/src/plugin.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
if find_library("usb-0.1") is not None or find_library("usb-1.0") is not None:
173173
print("[LCD4linux] libusb found :-)", getEnigmaVersionString())
174174
USBok = True
175-
Version = "V5.0-r27"
175+
Version = "V5.0-r28"
176176
L4LElist = L4Lelement()
177177
L4LdoThread = True
178178
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
@@ -374,17 +374,18 @@
374374
LCD4linux.SwitchToFB2 = ConfigYesNo(default=True)
375375
LCD4linux.ScreenActive = ConfigSelection(choices=ScreenSet, default="1")
376376
LCD4linux.ScreenSwitch = ConfigSelection(choices=ScreenSet, default="2")
377+
LCD4linux.ScreenDefault = ConfigSelection(choices=[("0", _("last Screen"))] + ScreenSet, default="1")
377378
LCD4linux.ScreenSwitchLCD = ConfigSelection(choices=LCDSwitchSelect, default="0")
378379
LCD4linux.ScreenMax = ConfigSelection(choices=ScreenUse, default="1")
379380
LCD4linux.ScreenTime = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="0")
380-
LCD4linux.ScreenTime2 = ConfigSelection(choices=TimeSelect, default="1")
381-
LCD4linux.ScreenTime3 = ConfigSelection(choices=TimeSelect, default="1")
382-
LCD4linux.ScreenTime4 = ConfigSelection(choices=TimeSelect, default="1")
383-
LCD4linux.ScreenTime5 = ConfigSelection(choices=TimeSelect, default="1")
384-
LCD4linux.ScreenTime6 = ConfigSelection(choices=TimeSelect, default="1")
385-
LCD4linux.ScreenTime7 = ConfigSelection(choices=TimeSelect, default="1")
386-
LCD4linux.ScreenTime8 = ConfigSelection(choices=TimeSelect, default="1")
387-
LCD4linux.ScreenTime9 = ConfigSelection(choices=TimeSelect, default="1")
381+
LCD4linux.ScreenTime2 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
382+
LCD4linux.ScreenTime3 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
383+
LCD4linux.ScreenTime4 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
384+
LCD4linux.ScreenTime5 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
385+
LCD4linux.ScreenTime6 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
386+
LCD4linux.ScreenTime7 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
387+
LCD4linux.ScreenTime8 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
388+
LCD4linux.ScreenTime9 = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="1")
388389
LCD4linux.BilderTime = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="0")
389390
LCD4linux.BilderSort = ConfigSelection(choices=[("0", _("off")), ("1", _("alphabetic")), ("2", _("random"))], default="1")
390391
LCD4linux.BilderQuality = ConfigSelection(choices=[("0", _("low/fast (all)")), ("1", _("low/fast (Picture only)")), ("2", _("better/slow"))], default="1")
@@ -5737,6 +5738,7 @@ def SetList(self):
57375738
# self.list1.append(getConfigListEntry(_("Internal TFT Active"), LCD4linux.LCDTFT))
57385739
self.list1.append(getConfigListEntry(_("Active Screen"), LCD4linux.ScreenActive))
57395740
self.list1.append(getConfigListEntry(_("Screen Switch Select - Screen"), LCD4linux.ScreenSwitch))
5741+
self.list1.append(getConfigListEntry(_("Screen Default after mode change - Screen"), LCD4linux.ScreenDefault))
57405742
self.list1.append(getConfigListEntry(_("Screen Switch Select - LCD"), LCD4linux.ScreenSwitchLCD))
57415743
self.list1.append(getConfigListEntry(_("Screens used for Changing"), LCD4linux.ScreenMax))
57425744
self.list1.append(getConfigListEntry(_("Screen 1 Changing Time"), LCD4linux.ScreenTime))
@@ -14552,8 +14554,9 @@ def Lput4(LCD, SCR, FUNC, PARA):
1455214554
if self.ref != sref or (self.SaveisMediaPlayer != isMediaPlayer and not ConfigMode):
1455314555
L4log("Service changed")
1455414556
self.ref = sref
14555-
if SaveEventListChanged == False:
14556-
ScreenActive[0] = "1"
14557+
if SaveEventListChanged is False:
14558+
if LCD4linux.ScreenDefault.value != "0":
14559+
ScreenActive[0] = LCD4linux.ScreenDefault.value
1455714560
LCD4linux.ScreenActive.value = ScreenActive[0]
1455814561
ScreenTime = 0
1455914562
self.SaveisMediaPlayer = isMediaPlayer

0 commit comments

Comments
 (0)