git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new network config
[enigma2.git]
/
lib
/
python
/
Screens
/
LanguageSelection.py
diff --git
a/lib/python/Screens/LanguageSelection.py
b/lib/python/Screens/LanguageSelection.py
index dbc6d480e158e60cc7c31c40df5d408a8745fdfa..7d5596fd2e331e3db843df30a492c3bca9d8f26f 100644
(file)
--- a/
lib/python/Screens/LanguageSelection.py
+++ b/
lib/python/Screens/LanguageSelection.py
@@
-7,16
+7,13
@@
from Components.Sources.List import List
from Tools.Directories import *
from Tools.Directories import *
-from
enigma import eListboxPythonMultiContent, loadPNG, eListbox, gFont, RT_HALIGN_LEFT
+from
Tools.LoadPixmap import LoadPixmap
def LanguageEntryComponent(file, name, index):
def LanguageEntryComponent(file, name, index):
- res = [ index ]
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 10, 200, 50, 0, RT_HALIGN_LEFT ,name))
- png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "countries/" + file + ".png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/" + file + ".png"))
if png == None:
if png == None:
- png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
- res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
-
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
+ res = (index, name, png)
return res
class LanguageSelection(Screen):
return res
class LanguageSelection(Screen):
@@
-26,7
+23,7
@@
class LanguageSelection(Screen):
self.oldActiveLanguage = language.getActiveLanguage()
self.list = []
self.oldActiveLanguage = language.getActiveLanguage()
self.list = []
- self["languages"] = List(self.list
, item_height=50, fonts = [gFont("Regular", 20)]
)
+ self["languages"] = List(self.list)
self["languages"].onSelectionChanged.append(self.changed)
self.updateList()
self["languages"].onSelectionChanged.append(self.changed)
self.updateList()
@@
-75,9
+72,9
@@
class LanguageSelection(Screen):
self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
else:
for x in language.getLanguageList():
self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
else:
for x in language.getLanguageList():
- self.list.append(LanguageEntryComponent(file = x[1][
3
].lower(), name = _(x[1][0]), index = x[0]))
+ self.list.append(LanguageEntryComponent(file = x[1][
2
].lower(), name = _(x[1][0]), index = x[0]))
#self.list.sort(key=lambda x: x[1][7])
#self.list.sort(key=lambda x: x[1][7])
-
+
print "updateList"
if first_time:
self["languages"].list = self.list
print "updateList"
if first_time:
self["languages"].list = self.list