use TemplatedMultiContent for language selection

[enigma2.git] / lib / python / Screens / LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index a51c067af46764a569f95111d7b9d7e7bfc846ed..7d5596fd2e331e3db843df30a492c3bca9d8f26f 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -1,35 +1,87 @@
 from Screen import Screen
 
-from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Language import language
-from Components.LanguageList import *
 from Components.config import config
+from Components.Sources.List import List
 
+from Tools.Directories import *
+
+from Tools.LoadPixmap import LoadPixmap
+
+def LanguageEntryComponent(file, name, index):
+       png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/" + file + ".png"))
+       if png == None:
+               png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
+       res = (index, name, png)
+       return res
 
 class LanguageSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
-               
+
+               self.oldActiveLanguage = language.getActiveLanguage()
+
                self.list = []
-               list = language.getLanguageList()
-               for x in language.lang:
-                       print x
-                       self.list.append(LanguageEntryComponent(x[2], x[0]))
+               self["languages"] = List(self.list)
+               self["languages"].onSelectionChanged.append(self.changed)
+
+               self.updateList()
+               self.onLayoutFinish.append(self.selectActiveLanguage)
 
-               self["list"] = LanguageList(self.list)
-               
                self["actions"] = ActionMap(["OkCancelActions"], 
                {
                        "ok": self.save,
-                       "cancel": self.close
-               })
-               
+                       "cancel": self.cancel,
+               }, -1)
+
+       def selectActiveLanguage(self):
+               activeLanguage = language.getActiveLanguage()
+               pos = 0
+               for x in self.list:
+                       if x[0] == activeLanguage:
+                               self["languages"].index = pos
+                               break
+                       pos += 1
+
        def save(self):
                self.run()
                self.close()
-       
+
+       def cancel(self):
+               language.activateLanguage(self.oldActiveLanguage)
+               self.close()
+
        def run(self):
-               language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
-               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+               print "updating language..."
+               lang = self["languages"].getCurrent()[0]
+               language.activateLanguage(lang)
+               config.osd.language.value = lang
                config.osd.language.save()
+               config.misc.languageselected.value = 0
+               config.misc.languageselected.save()
+               self.setTitle(_("Language selection"))
+               print "ok"
+
+       def updateList(self):
+               print "update list"
+               first_time = len(self.list) == 0
+
+               self.list = []
+               if len(language.getLanguageList()) == 0: # no language available => display only english
+                       self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
+               else:
+                       for x in language.getLanguageList():
+                               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])
+
+               print "updateList"
+               if first_time:
+                       self["languages"].list = self.list
+               else:
+                       self["languages"].updateList(self.list)
+               print "done"
+
+       def changed(self):
+               self.run()
+               self.updateList()