Skip to content

Commit 9ecc2cc

Browse files
technltechnl
authored
Merge pull request #21 from Hains/python3
[LCD4linux] V5.0-r34 tiny improvements
2 parents 7d2a47f + 70b1d3a commit 9ecc2cc

File tree

2 files changed

+30
-24
lines changed

2 files changed

+30
-24
lines changed

‎lcd4linux/src/myFileList.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@
2222
from os import path as os_path, listdir, stat as os_stat
2323
from Components.MenuList import MenuList
2424
from Components.Harddisk import harddiskmanager
25-
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eServiceReference, eServiceCenter, gFont, iServiceInformation
25+
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eServiceReference, eServiceCenter, gFont, iServiceInformation, getDesktop
2626
from Tools.LoadPixmap import LoadPixmap
2727
from Tools.Directories import SCOPE_PLUGINS, resolveFilename
2828

2929

3030
def FileEntryComponent(name, absolute=None, isDir=False):
3131
res = [(absolute, isDir)]
32-
res.append((eListboxPythonMultiContent.TYPE_TEXT, 40, 2, 1000, 22, 0, RT_HALIGN_LEFT, name))
32+
(x, y, w, h, y2) = (44, 2, 1000, 35, 8) if getDesktop(0).size().height() > 720 else (40, 2, 1000, 26, 3)
33+
res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, name))
3334
png = LoadPixmap(resolveFilename(SCOPE_PLUGINS, "Extensions/LCD4linux/data/dir.png")) if isDir else None
3435
if png is not None:
35-
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 12, 3, 20, 20, png))
36+
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 12, y2, 22, 22, png))
3637
return res
3738

3839

@@ -59,8 +60,9 @@ def __init__(self, directory, showDirectories=True, showFiles=True, showMountpoi
5960
se = os_path.basename(directory)
6061
direct = "%s/" % directory
6162
self.changeDir(direct, se)
62-
self.l.setFont(0, gFont("Regular", 18))
63-
self.l.setItemHeight(26)
63+
(s, h) = (27, 35) if getDesktop(0).size().height() > 720 else (18, 26)
64+
self.l.setFont(0, gFont("Regular", s))
65+
self.l.setItemHeight(h)
6466
self.serviceHandler = eServiceCenter.getInstance()
6567

6668
def refreshMountpoints(self):

‎lcd4linux/src/plugin.py‎

Lines changed: 23 additions & 19 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-r33"
175+
Version = "V5.0-r34"
176176
L4LElist = L4Lelement()
177177
L4LdoThread = True
178178
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
@@ -5516,7 +5516,7 @@ def __init__(self, session, args=0):
55165516
self.PicTimer = eTimer()
55175517
self.PicTimer.callback.append(self.showpic)
55185518
self["introduction"] = StaticText()
5519-
self["Version"] = StaticText((Version if L4LElist.getVersion() == True else Version + "") + " (" + _("Mode") + ": Py" + ("3" if PY3 else "2") + ")")
5519+
self["Version"] = StaticText(Version if L4LElist.getVersion() is True else Version + " (" + _("Mode") + ": Py" + ("3" if PY3 else "2") + ")")
55205520
self["LibUSB"] = StaticText()
55215521
self["About"] = StaticText()
55225522
self["LCD1"] = Pixmap()
@@ -6693,14 +6693,16 @@ def SetList(self):
66936693
self.list3.append(getConfigListEntry(_("- LCD 1 Background-Picture [ok]>"), LCD4linux.MPLCDBild1))
66946694
self.list3.append(getConfigListEntry(_("- LCD 1 Brightness"), LCD4linux.MPHelligkeit))
66956695
self.list3.append(getConfigListEntry(_("- LCD 1 Night Reduction"), LCD4linux.MPNight))
6696-
self.list3.append(getConfigListEntry(_("- LCD 2 Background Color"), LCD4linux.MPLCDColor2))
6697-
self.list3.append(getConfigListEntry(_("- LCD 2 Background-Picture [ok]>"), LCD4linux.MPLCDBild2))
6698-
self.list3.append(getConfigListEntry(_("- LCD 2 Brightness"), LCD4linux.MPHelligkeit2))
6699-
self.list3.append(getConfigListEntry(_("- LCD 2 Night Reduction"), LCD4linux.MPNight2))
6700-
self.list3.append(getConfigListEntry(_("- LCD 3 Background Color"), LCD4linux.MPLCDColor3))
6701-
self.list3.append(getConfigListEntry(_("- LCD 3 Background-Picture [ok]>"), LCD4linux.MPLCDBild3))
6702-
self.list3.append(getConfigListEntry(_("- LCD 3 Brightness"), LCD4linux.MPHelligkeit3))
6703-
self.list3.append(getConfigListEntry(_("- LCD 3 Night Reduction"), LCD4linux.MPNight3))
6696+
if LCD4linux.LCDType2.value != "00":
6697+
self.list3.append(getConfigListEntry(_("- LCD 2 Background Color"), LCD4linux.MPLCDColor2))
6698+
self.list3.append(getConfigListEntry(_("- LCD 2 Background-Picture [ok]>"), LCD4linux.MPLCDBild2))
6699+
self.list3.append(getConfigListEntry(_("- LCD 2 Brightness"), LCD4linux.MPHelligkeit2))
6700+
self.list3.append(getConfigListEntry(_("- LCD 2 Night Reduction"), LCD4linux.MPNight2))
6701+
if LCD4linux.LCDType3.value != "00":
6702+
self.list3.append(getConfigListEntry(_("- LCD 3 Background Color"), LCD4linux.MPLCDColor3))
6703+
self.list3.append(getConfigListEntry(_("- LCD 3 Background-Picture [ok]>"), LCD4linux.MPLCDBild3))
6704+
self.list3.append(getConfigListEntry(_("- LCD 3 Brightness"), LCD4linux.MPHelligkeit3))
6705+
self.list3.append(getConfigListEntry(_("- LCD 3 Night Reduction"), LCD4linux.MPNight3))
67046706
self.list3.append(getConfigListEntry(_("- LCD Auto-OFF"), LCD4linux.MPAutoOFF))
67056707
self.list3.append(getConfigListEntry(_("- Screens used for Changing"), LCD4linux.MPScreenMax))
67066708
self.list3.append(getConfigListEntry(_("Background"), LCD4linux.MPBackground1))
@@ -7323,14 +7325,16 @@ def SetList(self):
73237325
self.list4.append(getConfigListEntry(_("- LCD 1 Background-Picture [ok]>"), LCD4linux.StandbyLCDBild1))
73247326
self.list4.append(getConfigListEntry(_("- LCD 1 Brightness"), LCD4linux.StandbyHelligkeit))
73257327
self.list4.append(getConfigListEntry(_("- LCD 1 Night Reduction"), LCD4linux.StandbyNight))
7326-
self.list4.append(getConfigListEntry(_("- LCD 2 Background Color"), LCD4linux.StandbyLCDColor2))
7327-
self.list4.append(getConfigListEntry(_("- LCD 2 Background-Picture [ok]>"), LCD4linux.StandbyLCDBild2))
7328-
self.list4.append(getConfigListEntry(_("- LCD 2 Brightness"), LCD4linux.StandbyHelligkeit2))
7329-
self.list4.append(getConfigListEntry(_("- LCD 2 Night Reduction"), LCD4linux.StandbyNight2))
7330-
self.list4.append(getConfigListEntry(_("- LCD 3 Background Color"), LCD4linux.StandbyLCDColor3))
7331-
self.list4.append(getConfigListEntry(_("- LCD 3 Background-Picture [ok]>"), LCD4linux.StandbyLCDBild3))
7332-
self.list4.append(getConfigListEntry(_("- LCD 3 Brightness"), LCD4linux.StandbyHelligkeit3))
7333-
self.list4.append(getConfigListEntry(_("- LCD 3 Night Reduction"), LCD4linux.StandbyNight3))
7328+
if LCD4linux.LCDType2.value != "00":
7329+
self.list4.append(getConfigListEntry(_("- LCD 2 Background Color"), LCD4linux.StandbyLCDColor2))
7330+
self.list4.append(getConfigListEntry(_("- LCD 2 Background-Picture [ok]>"), LCD4linux.StandbyLCDBild2))
7331+
self.list4.append(getConfigListEntry(_("- LCD 2 Brightness"), LCD4linux.StandbyHelligkeit2))
7332+
self.list4.append(getConfigListEntry(_("- LCD 2 Night Reduction"), LCD4linux.StandbyNight2))
7333+
if LCD4linux.LCDType3.value != "00":
7334+
self.list4.append(getConfigListEntry(_("- LCD 3 Background Color"), LCD4linux.StandbyLCDColor3))
7335+
self.list4.append(getConfigListEntry(_("- LCD 3 Background-Picture [ok]>"), LCD4linux.StandbyLCDBild3))
7336+
self.list4.append(getConfigListEntry(_("- LCD 3 Brightness"), LCD4linux.StandbyHelligkeit3))
7337+
self.list4.append(getConfigListEntry(_("- LCD 3 Night Reduction"), LCD4linux.StandbyNight3))
73347338
self.list4.append(getConfigListEntry(_("- Screens used for Changing"), LCD4linux.StandbyScreenMax))
73357339
self.list4.append(getConfigListEntry(_("Background"), LCD4linux.StandbyBackground1))
73367340
if LCD4linux.StandbyBackground1.value != "0":
@@ -9829,7 +9833,7 @@ def downloadWetter(self, ort, wetter):
98299833
feedurl = "http://api.weatherunlocked.com/api/current/%s,%s" % (self.Long[wetter], self.Lat[wetter])
98309834
L4logE("WU-getcurrentweather%s: %s" % (wetter, feedurl))
98319835
callInThread(boundFunction(getPage, feedurl, params=params), boundFunction(self.downloadWUcallback, wetter), self.downloadListError)
9832-
if "." in ort: # e.g. 'de.ZIPcode'
9836+
if "." in ort: # e.g. 'de.ZIPcode'
98339837
feedurl = "http://api.weatherunlocked.com/api/forecast/%s" % city
98349838
else:
98359839
feedurl = "http://api.weatherunlocked.com/api/forecast/%s,%s" % (self.Long[wetter], self.Lat[wetter])

0 commit comments

Comments
 (0)