Revert "Revert "disable m2ts support for release 2.6""

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
old mode 100644 (file)
new mode 100755 (executable)
index a53bb97..fce10ac
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -1,36 +1,123 @@
 from Screen import Screen
 
 from Screen import Screen
 

-from Components.MenuList import MenuList

 from Components.ActionMap import ActionMap
 from Components.Language import language
 from Components.ActionMap import ActionMap
 from Components.Language import language

-from Components.LanguageList import *

 from Components.config import config
 from Components.config import config

+from Components.Sources.List import List
+from Components.Label import Label
+from Components.Pixmap import Pixmap
+from Components.language_cache import LANG_TEXT

 
 

+def _cached(x):
+       return LANG_TEXT.get(config.osd.language.value, {}).get(x, "")
+
+from Screens.Rc import Rc
+
+from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
+
+from Tools.LoadPixmap import LoadPixmap
+
+def LanguageEntryComponent(file, name, index):
+       png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + file + ".png"))
+       if png == None:
+               png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/missing.png"))
+       res = (index, name, png)
+       return res

 
 class LanguageSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
 class LanguageSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)

-               
+
+               self.oldActiveLanguage = language.getActiveLanguage()
+

                self.list = []
                self.list = []

-               if len(language.lang) == 0: # no language available => display only english
-                       self.list.append(LanguageEntryComponent("en", _("English")))
-               else:
-                       for x in language.lang:
-                               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,
                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 save(self):
                self.run()
                self.close()

-       
-       def run(self):
-               language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
-               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+
+       def cancel(self):
+               language.activateLanguage(self.oldActiveLanguage)
+               self.close()
+
+       def run(self, justlocal = False):
+               print "updating language..."
+               lang = self["languages"].getCurrent()[0]
+               config.osd.language.value = lang

                config.osd.language.save()
                config.osd.language.save()

+               self.setTitle(_cached("T2"))
+               
+               if justlocal:
+                       return
+
+               language.activateLanguage(lang)
+               config.misc.languageselected.value = 0
+               config.misc.languageselected.save()
+               print "ok"
+
+       def updateList(self):
+               first_time = not self.list
+
+               languageList = language.getLanguageList()
+               if not languageList: # no language available => display only english
+                       list = [ LanguageEntryComponent("en", _cached("en_EN"), "en_EN") ]
+               else:
+                       list = [ LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]) for x in languageList]
+               self.list = list
+
+               #list.sort(key=lambda x: x[1][7])
+
+               print "updateList"
+               if first_time:
+                       self["languages"].list = list
+               else:
+                       self["languages"].updateList(list)
+               print "done"
+
+       def changed(self):
+               self.run(justlocal = True)
+               self.updateList()
+
+class LanguageWizard(LanguageSelection, Rc):
+       def __init__(self, session):
+               LanguageSelection.__init__(self, session)
+               Rc.__init__(self)
+               self.onLayoutFinish.append(self.selectKeys)
+                               
+               self["wizard"] = Pixmap()
+               self["text"] = Label()
+               self.setText()
+               
+       def selectKeys(self):
+               self.clearSelectedKeys()
+               self.selectKey("UP")
+               self.selectKey("DOWN")
+               
+       def changed(self):
+               self.run(justlocal = True)
+               self.updateList()
+               self.setText()
+               
+       def setText(self):
+               
+               self["text"].setText(_cached("T1"))