|
172 | 172 | if find_library("usb-0.1") is not None or find_library("usb-1.0") is not None: |
173 | 173 | print("[LCD4linux] libusb found :-)", getEnigmaVersionString()) |
174 | 174 | USBok = True |
175 | | -Version = "V5.0-r27" |
| 175 | +Version = "V5.0-r28" |
176 | 176 | L4LElist = L4Lelement() |
177 | 177 | L4LdoThread = True |
178 | 178 | LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/ |
|
374 | 374 | LCD4linux.SwitchToFB2 = ConfigYesNo(default=True) |
375 | 375 | LCD4linux.ScreenActive = ConfigSelection(choices=ScreenSet, default="1") |
376 | 376 | LCD4linux.ScreenSwitch = ConfigSelection(choices=ScreenSet, default="2") |
| 377 | +LCD4linux.ScreenDefault = ConfigSelection(choices=[("0", _("last Screen"))] + ScreenSet, default="1") |
377 | 378 | LCD4linux.ScreenSwitchLCD = ConfigSelection(choices=LCDSwitchSelect, default="0") |
378 | 379 | LCD4linux.ScreenMax = ConfigSelection(choices=ScreenUse, default="1") |
379 | 380 | 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") |
388 | 389 | LCD4linux.BilderTime = ConfigSelection(choices=[("0", _("off"))] + TimeSelect, default="0") |
389 | 390 | LCD4linux.BilderSort = ConfigSelection(choices=[("0", _("off")), ("1", _("alphabetic")), ("2", _("random"))], default="1") |
390 | 391 | 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): |
5737 | 5738 | # self.list1.append(getConfigListEntry(_("Internal TFT Active"), LCD4linux.LCDTFT)) |
5738 | 5739 | self.list1.append(getConfigListEntry(_("Active Screen"), LCD4linux.ScreenActive)) |
5739 | 5740 | self.list1.append(getConfigListEntry(_("Screen Switch Select - Screen"), LCD4linux.ScreenSwitch)) |
| 5741 | + self.list1.append(getConfigListEntry(_("Screen Default after mode change - Screen"), LCD4linux.ScreenDefault)) |
5740 | 5742 | self.list1.append(getConfigListEntry(_("Screen Switch Select - LCD"), LCD4linux.ScreenSwitchLCD)) |
5741 | 5743 | self.list1.append(getConfigListEntry(_("Screens used for Changing"), LCD4linux.ScreenMax)) |
5742 | 5744 | self.list1.append(getConfigListEntry(_("Screen 1 Changing Time"), LCD4linux.ScreenTime)) |
@@ -14552,8 +14554,9 @@ def Lput4(LCD, SCR, FUNC, PARA): |
14552 | 14554 | if self.ref != sref or (self.SaveisMediaPlayer != isMediaPlayer and not ConfigMode): |
14553 | 14555 | L4log("Service changed") |
14554 | 14556 | 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 |
14557 | 14560 | LCD4linux.ScreenActive.value = ScreenActive[0] |
14558 | 14561 | ScreenTime = 0 |
14559 | 14562 | self.SaveisMediaPlayer = isMediaPlayer |
|
0 commit comments