moving the list generation to a seperate method

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index ca7f2198ce8247bf9baf1bb1cf44649b9a194464..1a82a313c2002815ad231263e0eb965616ec65e5 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -2,24 +2,48 @@ 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
+
 
 class LanguageSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                
                self.list = []
-               self.list.append(("English", None))
-               self.list.append(("German", None))
-               self["list"] = MenuList(self.list)
+               self["list"] = LanguageList(self.list)
+               self.updateList()
                
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["ListboxActions", "OkCancelActions"], 
                {
                        "ok": self.save,
-                       "cancel": self.close
+                       "cancel": self.close,
+                       "moveUp": self.up,
+                       "moveDown": self.down
                })
                
        def save(self):
-               pass
+               self.run()
+               self.close()
        
        def run(self):
-               print "select the language here"
\ No newline at end of file
+               language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
+               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+               config.osd.language.save()
+
+       def updateList(self):
+               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["list"].l.setList(self.list)
+               
+       def up(self):
+               print "up"
+               
+       def down(self):
+               print "down"
\ No newline at end of file