Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lcd4linux/src/configOptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@
['self.list3', '- Split Screen', ' LCD4linux.MPMuteSplit', 10],
['self.list3', 'Clock', ' LCD4linux.MPClock', 11],
['self.list3', '- which LCD', ' LCD4linux.MPClockLCD', 11],
['self.list3', '- Type', ' LCD4linux.MPClockType', 11],
['self.list3', '- Type', ' LCD4linux.MPClockType', 11],
['self.list3', '- Analog Clock', ' LCD4linux.MPClockAnalog', 11],
['self.list3', '- Spacing', ' LCD4linux.MPClockSpacing', 11],
['self.list3', '- Size', ' LCD4linux.MPClockSize', 11],
Expand All @@ -1039,7 +1039,7 @@
['self.list3', '- Font', ' LCD4linux.MPClockFont', 11],
['self.list3', 'Clock 2', ' LCD4linux.MPClock2', 12],
['self.list3', '- which LCD', ' LCD4linux.MPClock2LCD', 12],
['self.list3', '- Type', ' LCD4linux.MPClock2Type', 12],
['self.list3', '- Type', ' LCD4linux.MPClock2Type', 12],
['self.list3', '- Analog Clock', ' LCD4linux.MPClock2Analog', 12],
['self.list3', '- Spacing', ' LCD4linux.MPClock2Spacing', 12],
['self.list3', '- Size', ' LCD4linux.MPClock2Size', 12],
Expand Down Expand Up @@ -1507,7 +1507,7 @@
['self.list4', '- Screen 9 Changing Time', ' LCD4linux.StandbyScreenTime9', 3],
['self.list4', 'Clock', ' LCD4linux.StandbyClock', 4],
['self.list4', '- which LCD', ' LCD4linux.StandbyClockLCD', 4],
['self.list4', '- Type', ' LCD4linux.StandbyClockType', 4],
['self.list4', '- Type', ' LCD4linux.StandbyClockType', 4],
['self.list4', '- Analog Clock', ' LCD4linux.StandbyClockAnalog', 4],
['self.list4', '- Spacing', ' LCD4linux.StandbyClockSpacing', 4],
['self.list4', '- Size', ' LCD4linux.StandbyClockSize', 4],
Expand All @@ -1519,7 +1519,7 @@
['self.list4', '- Font', ' LCD4linux.StandbyClockFont', 4],
['self.list4', 'Clock 2', ' LCD4linux.StandbyClock2', 5],
['self.list4', '- which LCD', ' LCD4linux.StandbyClock2LCD', 5],
['self.list4', '- Type', ' LCD4linux.StandbyClock2Type', 5],
['self.list4', '- Type', ' LCD4linux.StandbyClock2Type', 5],
['self.list4', '- Analog Clock', ' LCD4linux.StandbyClock2Analog', 5],
['self.list4', '- Spacing', ' LCD4linux.StandbyClock2Spacing', 5],
['self.list4', '- Size', ' LCD4linux.StandbyClock2Size', 5],
Expand Down
29 changes: 17 additions & 12 deletions lcd4linux/src/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
if find_library("usb-0.1") is not None or find_library("usb-1.0") is not None:
print("[LCD4linux] libusb found :-)", getEnigmaVersionString())
USBok = True
Version = "V5.0-r32"
Version = "V5.0-r33"
L4LElist = L4Lelement()
L4LdoThread = True
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
Expand Down Expand Up @@ -5571,7 +5571,6 @@ def layoutFinished(self):
self.mode = _("Idle")
self.LastSelect = "5"
self.Page()
self.selectionChanged()

def NextScreenKey(self):
NextScreen(True)
Expand Down Expand Up @@ -5728,7 +5727,6 @@ def SetList(self):
self.list1.append(getConfigListEntry(_("Box-Skin-LCD Enable Media-Mode"), LCD4linux.xmlType02))
self.list1.append(getConfigListEntry(_("Box-Skin-LCD Enable Idle-Mode"), LCD4linux.xmlType03))
self.list1.append(getConfigListEntry(_("OSD [display time]"), LCD4linux.OSD))

if LCD4linux.OSD.value != "0":
self.list1.append(getConfigListEntry(_("- which LCD"), LCD4linux.OSDLCD))
self.list1.append(getConfigListEntry(_("- Show in Mode"), LCD4linux.OSDshow))
Expand Down Expand Up @@ -5938,6 +5936,7 @@ def SetList(self):
self.list1.append(getConfigListEntry(_("Config Restore All Settings"), LCD4linux.ConfigWriteAll))
self.list1.append(getConfigListEntry(_("Debug-Logging > /tmp/L4log.txt"), LCD4linux.EnableEventLog))
self["config"].setList(self.list1)

elif self.mode == _("On"):
self.list2 = []
self.list2.append(getConfigListEntry(_("- Backlight Off [disable set Off=On]"), LCD4linux.LCDoff))
Expand Down Expand Up @@ -6687,6 +6686,7 @@ def SetList(self):
self.list2.append(getConfigListEntry(_("- which LCD"), LCD4linux.TVLCD))
self.list2.append(getConfigListEntry(_("- Type"), LCD4linux.TVType))
self["config"].setList(self.list2)

elif self.mode == _("Media"):
self.list3 = []
self.list3.append(getConfigListEntry(_("- LCD 1 Background Color"), LCD4linux.MPLCDColor1))
Expand Down Expand Up @@ -6820,7 +6820,7 @@ def SetList(self):
self.list3.append(getConfigListEntry(_("Clock"), LCD4linux.MPClock))
if LCD4linux.MPClock.value != "0":
self.list3.append(getConfigListEntry(_("- which LCD"), LCD4linux.MPClockLCD))
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClockType))
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClockType))
if LCD4linux.MPClockType.value[0] == "5":
self.list3.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.MPClockAnalog))
elif LCD4linux.MPClockType.value[0] == "1":
Expand All @@ -6835,7 +6835,7 @@ def SetList(self):
self.list3.append(getConfigListEntry(_("Clock 2"), LCD4linux.MPClock2))
if LCD4linux.MPClock2.value != "0":
self.list3.append(getConfigListEntry(_("- which LCD"), LCD4linux.MPClock2LCD))
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClock2Type))
self.list3.append(getConfigListEntry(_("- Type"), LCD4linux.MPClock2Type))
if LCD4linux.MPClock2Type.value[0] == "5":
self.list3.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.MPClock2Analog))
elif LCD4linux.MPClock2Type.value[0] == "1":
Expand Down Expand Up @@ -7310,6 +7310,7 @@ def SetList(self):
self.list3.append(getConfigListEntry(_("- Alignment"), LCD4linux.MPRecordingAlign))
self.list3.append(getConfigListEntry(_("- Split Screen"), LCD4linux.MPRecordingSplit))
self["config"].setList(self.list3)

elif self.mode == _("Idle"):
self.list4 = []
self.list4.append(getConfigListEntry(_("LCD Display"), LCD4linux.Standby))
Expand Down Expand Up @@ -7349,7 +7350,7 @@ def SetList(self):
self.list4.append(getConfigListEntry(_("Clock"), LCD4linux.StandbyClock))
if LCD4linux.StandbyClock.value != "0":
self.list4.append(getConfigListEntry(_("- which LCD"), LCD4linux.StandbyClockLCD))
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClockType))
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClockType))
if LCD4linux.StandbyClockType.value[0] == "5":
self.list4.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.StandbyClockAnalog))
elif LCD4linux.StandbyClockType.value[0] == "1":
Expand All @@ -7364,7 +7365,7 @@ def SetList(self):
self.list4.append(getConfigListEntry(_("Clock 2"), LCD4linux.StandbyClock2))
if LCD4linux.StandbyClock2.value != "0":
self.list4.append(getConfigListEntry(_("- which LCD"), LCD4linux.StandbyClock2LCD))
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClock2Type))
self.list4.append(getConfigListEntry(_("- Type"), LCD4linux.StandbyClock2Type))
if LCD4linux.StandbyClock2Type.value[0] == "5":
self.list4.append(getConfigListEntry(_("- Analog Clock"), LCD4linux.StandbyClock2Analog))
elif LCD4linux.StandbyClock2Type.value[0] == "1":
Expand Down Expand Up @@ -7888,22 +7889,20 @@ def Page(self):
self.mode = _("On")
self.setTitle(_("LCD4linux Display-Mode On"))
self["key_blue"].setText(_("Set Media >>"))
self.SetList()
elif self.mode == _("On"):
self.mode = _("Media")
self.setTitle(_("LCD4linux Display-Mode MediaPlayer"))
self["key_blue"].setText(_("Set Idle >>"))
self.SetList()
elif self.mode == _("Media"):
self.mode = _("Idle")
self.setTitle(_("LCD4linux Display-Mode Idle"))
self["key_blue"].setText(_("Set Global >>"))
self.SetList()
elif self.mode == _("Idle"):
self.mode = _("Global")
self.setTitle(_("LCD4linux Settings"))
self["key_blue"].setText(_("Set On >>"))
self.SetList()
self.SetList()
self.selectionChanged()
getBilder()
self.toggle = time()

Expand All @@ -7916,7 +7915,7 @@ def keyOK(self):
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]:
L4log("select Dir 1")
self.session.openWithCallback(self.dirSelected, LCDdisplayFile, text=_("Choose dir"), FileName=self["config"].getCurrent()[1].value, showFiles=False)
elif sel in [LCD4linux.LCDBild1, LCD4linux.LCDBild2, LCD4linux.MPLCDBild1, LCD4linux.MPLCDBild2, LCD4linux.StandbyLCDBild1, LCD4linux.StandbyLCDBild2, LCD4linux.FritzFrame]:
elif sel in [LCD4linux.LCDBild1, LCD4linux.LCDBild2, LCD4linux.LCDBild3, LCD4linux.MPLCDBild1, LCD4linux.MPLCDBild2, LCD4linux.MPLCDBild3, LCD4linux.StandbyLCDBild1, LCD4linux.StandbyLCDBild2, LCD4linux.StandbyLCDBild3, LCD4linux.FritzFrame]:
L4log("select File 1")
self.session.openWithCallback(self.fileSelected, LCDdisplayFile, text=_("Choose file"), FileName=self["config"].getCurrent()[1].value, showFiles=True)
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]:
Expand Down Expand Up @@ -7982,14 +7981,20 @@ def fileSelected(self, dir, dir1):
LCD4linux.LCDBild1.value = dirdir
elif sel == LCD4linux.LCDBild2:
LCD4linux.LCDBild2.value = dirdir
elif sel == LCD4linux.LCDBild3:
LCD4linux.LCDBild3.value = dirdir
elif sel == LCD4linux.MPLCDBild1:
LCD4linux.MPLCDBild1.value = dirdir
elif sel == LCD4linux.MPLCDBild2:
LCD4linux.MPLCDBild2.value = dirdir
elif sel == LCD4linux.MPLCDBild3:
LCD4linux.MPLCDBild3.value = dirdir
elif sel == LCD4linux.StandbyLCDBild1:
LCD4linux.StandbyLCDBild1.value = dirdir
elif sel == LCD4linux.StandbyLCDBild2:
LCD4linux.StandbyLCDBild2.value = dirdir
elif sel == LCD4linux.StandbyLCDBild3:
LCD4linux.StandbyLCDBild3.value = dirdir
elif sel == LCD4linux.OSCAMFile:
LCD4linux.OSCAMFile.value = dirdir
elif sel == LCD4linux.TextFile:
Expand Down
Loading