Skip to content

Commit 7d2a47f

Browse files
WanWizardWanWizard
authored
Merge pull request #20 from Hains/python3
Update LCD4Linux
2 parents 143bb96 + 0a5b1b7 commit 7d2a47f

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

‎lcd4linux/src/configOptions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@
10271027
['self.list3', '- Split Screen', ' LCD4linux.MPMuteSplit', 10],
10281028
['self.list3', 'Clock', ' LCD4linux.MPClock', 11],
10291029
['self.list3', '- which LCD', ' LCD4linux.MPClockLCD', 11],
1030-
['self.list3', '- Type', ' LCD4linux.MPClockType', 11],
1030+
['self.list3', '- Type', ' LCD4linux.MPClockType', 11],
10311031
['self.list3', '- Analog Clock', ' LCD4linux.MPClockAnalog', 11],
10321032
['self.list3', '- Spacing', ' LCD4linux.MPClockSpacing', 11],
10331033
['self.list3', '- Size', ' LCD4linux.MPClockSize', 11],
@@ -1039,7 +1039,7 @@
10391039
['self.list3', '- Font', ' LCD4linux.MPClockFont', 11],
10401040
['self.list3', 'Clock 2', ' LCD4linux.MPClock2', 12],
10411041
['self.list3', '- which LCD', ' LCD4linux.MPClock2LCD', 12],
1042-
['self.list3', '- Type', ' LCD4linux.MPClock2Type', 12],
1042+
['self.list3', '- Type', ' LCD4linux.MPClock2Type', 12],
10431043
['self.list3', '- Analog Clock', ' LCD4linux.MPClock2Analog', 12],
10441044
['self.list3', '- Spacing', ' LCD4linux.MPClock2Spacing', 12],
10451045
['self.list3', '- Size', ' LCD4linux.MPClock2Size', 12],
@@ -1507,7 +1507,7 @@
15071507
['self.list4', '- Screen 9 Changing Time', ' LCD4linux.StandbyScreenTime9', 3],
15081508
['self.list4', 'Clock', ' LCD4linux.StandbyClock', 4],
15091509
['self.list4', '- which LCD', ' LCD4linux.StandbyClockLCD', 4],
1510-
['self.list4', '- Type', ' LCD4linux.StandbyClockType', 4],
1510+
['self.list4', '- Type', ' LCD4linux.StandbyClockType', 4],
15111511
['self.list4', '- Analog Clock', ' LCD4linux.StandbyClockAnalog', 4],
15121512
['self.list4', '- Spacing', ' LCD4linux.StandbyClockSpacing', 4],
15131513
['self.list4', '- Size', ' LCD4linux.StandbyClockSize', 4],
@@ -1519,7 +1519,7 @@
15191519
['self.list4', '- Font', ' LCD4linux.StandbyClockFont', 4],
15201520
['self.list4', 'Clock 2', ' LCD4linux.StandbyClock2', 5],
15211521
['self.list4', '- which LCD', ' LCD4linux.StandbyClock2LCD', 5],
1522-
['self.list4', '- Type', ' LCD4linux.StandbyClock2Type', 5],
1522+
['self.list4', '- Type', ' LCD4linux.StandbyClock2Type', 5],
15231523
['self.list4', '- Analog Clock', ' LCD4linux.StandbyClock2Analog', 5],
15241524
['self.list4', '- Spacing', ' LCD4linux.StandbyClock2Spacing', 5],
15251525
['self.list4', '- Size', ' LCD4linux.StandbyClock2Size', 5],

‎lcd4linux/src/plugin.py‎

Lines changed: 17 additions & 12 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-r32"
175+
Version = "V5.0-r33"
176176
L4LElist = L4Lelement()
177177
L4LdoThread = True
178178
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
@@ -5571,7 +5571,6 @@ def layoutFinished(self):
55715571
self.mode = _("Idle")
55725572
self.LastSelect = "5"
55735573
self.Page()
5574-
self.selectionChanged()
55755574

55765575
def NextScreenKey(self):
55775576
NextScreen(True)
@@ -5728,7 +5727,6 @@ def SetList(self):
57285727
self.list1.append(getConfigListEntry(_("Box-Skin-LCD Enable Media-Mode"), LCD4linux.xmlType02))
57295728
self.list1.append(getConfigListEntry(_("Box-Skin-LCD Enable Idle-Mode"), LCD4linux.xmlType03))
57305729
self.list1.append(getConfigListEntry(_("OSD [display time]"), LCD4linux.OSD))
5731-
57325730
if LCD4linux.OSD.value != "0":
57335731
self.list1.append(getConfigListEntry(_("- which LCD"), LCD4linux.OSDLCD))
57345732
self.list1.append(getConfigListEntry(_("- Show in Mode"), LCD4linux.OSDshow))
@@ -5938,6 +5936,7 @@ def SetList(self):
59385936
self.list1.append(getConfigListEntry(_("Config Restore All Settings"), LCD4linux.ConfigWriteAll))
59395937
self.list1.append(getConfigListEntry(_("Debug-Logging > /tmp/L4log.txt"), LCD4linux.EnableEventLog))
59405938
self["config"].setList(self.list1)
5939+
59415940
elif self.mode == _("On"):
59425941
self.list2 = []
59435942
self.list2.append(getConfigListEntry(_("- Backlight Off [disable set Off=On]"), LCD4linux.LCDoff))
@@ -6687,6 +6686,7 @@ def SetList(self):
66876686
self.list2.append(getConfigListEntry(_("- which LCD"), LCD4linux.TVLCD))
66886687
self.list2.append(getConfigListEntry(_("- Type"), LCD4linux.TVType))
66896688
self["config"].setList(self.list2)
6689+
66906690
elif self.mode == _("Media"):
66916691
self.list3 = []
66926692
self.list3.append(getConfigListEntry(_("- LCD 1 Background Color"), LCD4linux.MPLCDColor1))
@@ -6820,7 +6820,7 @@ def SetList(self):
68206820
self.list3.append(getConfigListEntry(_("Clock"), LCD4linux.MPClock))
68216821
if LCD4linux.MPClock.value != "0":
68226822
self.list3.append(getConfigListEntry(_("- which LCD"), LCD4linux.MPClockLCD))
6823-
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClockType))
6823+
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClockType))
68246824
if LCD4linux.MPClockType.value[0] == "5":
68256825
self.list3.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.MPClockAnalog))
68266826
elif LCD4linux.MPClockType.value[0] == "1":
@@ -6835,7 +6835,7 @@ def SetList(self):
68356835
self.list3.append(getConfigListEntry(_("Clock 2"), LCD4linux.MPClock2))
68366836
if LCD4linux.MPClock2.value != "0":
68376837
self.list3.append(getConfigListEntry(_("- which LCD"), LCD4linux.MPClock2LCD))
6838-
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClock2Type))
6838+
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClock2Type))
68396839
if LCD4linux.MPClock2Type.value[0] == "5":
68406840
self.list3.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.MPClock2Analog))
68416841
elif LCD4linux.MPClock2Type.value[0] == "1":
@@ -7310,6 +7310,7 @@ def SetList(self):
73107310
self.list3.append(getConfigListEntry(_("- Alignment"), LCD4linux.MPRecordingAlign))
73117311
self.list3.append(getConfigListEntry(_("- Split Screen"), LCD4linux.MPRecordingSplit))
73127312
self["config"].setList(self.list3)
7313+
73137314
elif self.mode == _("Idle"):
73147315
self.list4 = []
73157316
self.list4.append(getConfigListEntry(_("LCD Display"), LCD4linux.Standby))
@@ -7349,7 +7350,7 @@ def SetList(self):
73497350
self.list4.append(getConfigListEntry(_("Clock"), LCD4linux.StandbyClock))
73507351
if LCD4linux.StandbyClock.value != "0":
73517352
self.list4.append(getConfigListEntry(_("- which LCD"), LCD4linux.StandbyClockLCD))
7352-
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClockType))
7353+
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClockType))
73537354
if LCD4linux.StandbyClockType.value[0] == "5":
73547355
self.list4.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.StandbyClockAnalog))
73557356
elif LCD4linux.StandbyClockType.value[0] == "1":
@@ -7364,7 +7365,7 @@ def SetList(self):
73647365
self.list4.append(getConfigListEntry(_("Clock 2"), LCD4linux.StandbyClock2))
73657366
if LCD4linux.StandbyClock2.value != "0":
73667367
self.list4.append(getConfigListEntry(_("- which LCD"), LCD4linux.StandbyClock2LCD))
7367-
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClock2Type))
7368+
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClock2Type))
73687369
if LCD4linux.StandbyClock2Type.value[0] == "5":
73697370
self.list4.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.StandbyClock2Analog))
73707371
elif LCD4linux.StandbyClock2Type.value[0] == "1":
@@ -7888,22 +7889,20 @@ def Page(self):
78887889
self.mode = _("On")
78897890
self.setTitle(_("LCD4linux Display-Mode On"))
78907891
self["key_blue"].setText(_("Set Media >>"))
7891-
self.SetList()
78927892
elif self.mode == _("On"):
78937893
self.mode = _("Media")
78947894
self.setTitle(_("LCD4linux Display-Mode MediaPlayer"))
78957895
self["key_blue"].setText(_("Set Idle >>"))
7896-
self.SetList()
78977896
elif self.mode == _("Media"):
78987897
self.mode = _("Idle")
78997898
self.setTitle(_("LCD4linux Display-Mode Idle"))
79007899
self["key_blue"].setText(_("Set Global >>"))
7901-
self.SetList()
79027900
elif self.mode == _("Idle"):
79037901
self.mode = _("Global")
79047902
self.setTitle(_("LCD4linux Settings"))
79057903
self["key_blue"].setText(_("Set On >>"))
7906-
self.SetList()
7904+
self.SetList()
7905+
self.selectionChanged()
79077906
getBilder()
79087907
self.toggle = time()
79097908

@@ -7916,7 +7915,7 @@ def keyOK(self):
79167915
if sel in [LCD4linux.PiconPath, LCD4linux.Picon2Path, LCD4linux.PiconCache, LCD4linux.Picon2Cache, LCD4linux.PiconPathAlt, LCD4linux.Picon2PathAlt, LCD4linux.ConfigPath, LCD4linux.WetterPath, LCD4linux.MPCoverPath1, LCD4linux.MPCoverPath2, LCD4linux.FritzPath, LCD4linux.CalPath, LCD4linux.SatPath, LCD4linux.ProvPath, LCD4linux.MoonPath]:
79177916
L4log("select Dir 1")
79187917
self.session.openWithCallback(self.dirSelected, LCDdisplayFile, text=_("Choose dir"), FileName=self["config"].getCurrent()[1].value, showFiles=False)
7919-
elif sel in [LCD4linux.LCDBild1, LCD4linux.LCDBild2, LCD4linux.MPLCDBild1, LCD4linux.MPLCDBild2, LCD4linux.StandbyLCDBild1, LCD4linux.StandbyLCDBild2, LCD4linux.FritzFrame]:
7918+
elif sel in [LCD4linux.LCDBild1, LCD4linux.LCDBild2, LCD4linux.LCDBild3, LCD4linux.MPLCDBild1, LCD4linux.MPLCDBild2, LCD4linux.MPLCDBild3, LCD4linux.StandbyLCDBild1, LCD4linux.StandbyLCDBild2, LCD4linux.StandbyLCDBild3, LCD4linux.FritzFrame]:
79207919
L4log("select File 1")
79217920
self.session.openWithCallback(self.fileSelected, LCDdisplayFile, text=_("Choose file"), FileName=self["config"].getCurrent()[1].value, showFiles=True)
79227921
elif sel in [LCD4linux.OSCAMFile, LCD4linux.TextFile, LCD4linux.Text2File, LCD4linux.Text3File, LCD4linux.MPTextFile, LCD4linux.MPCoverFile, LCD4linux.MPCoverFile2, LCD4linux.BildFile, LCD4linux.Bild2File, LCD4linux.Bild3File, LCD4linux.Bild4File, LCD4linux.Bild5File, LCD4linux.Bild6File, LCD4linux.RecordingPath]:
@@ -7982,14 +7981,20 @@ def fileSelected(self, dir, dir1):
79827981
LCD4linux.LCDBild1.value = dirdir
79837982
elif sel == LCD4linux.LCDBild2:
79847983
LCD4linux.LCDBild2.value = dirdir
7984+
elif sel == LCD4linux.LCDBild3:
7985+
LCD4linux.LCDBild3.value = dirdir
79857986
elif sel == LCD4linux.MPLCDBild1:
79867987
LCD4linux.MPLCDBild1.value = dirdir
79877988
elif sel == LCD4linux.MPLCDBild2:
79887989
LCD4linux.MPLCDBild2.value = dirdir
7990+
elif sel == LCD4linux.MPLCDBild3:
7991+
LCD4linux.MPLCDBild3.value = dirdir
79897992
elif sel == LCD4linux.StandbyLCDBild1:
79907993
LCD4linux.StandbyLCDBild1.value = dirdir
79917994
elif sel == LCD4linux.StandbyLCDBild2:
79927995
LCD4linux.StandbyLCDBild2.value = dirdir
7996+
elif sel == LCD4linux.StandbyLCDBild3:
7997+
LCD4linux.StandbyLCDBild3.value = dirdir
79937998
elif sel == LCD4linux.OSCAMFile:
79947999
LCD4linux.OSCAMFile.value = dirdir
79958000
elif sel == LCD4linux.TextFile:

0 commit comments

Comments
 (0)