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 a51c067af46764a569f95111d7b9d7e7bfc846ed..1a82a313c2002815ad231263e0eb965616ec65e5 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -12,17 +12,15 @@ class LanguageSelection(Screen):
                Screen.__init__(self, session)
                
                self.list = []
                Screen.__init__(self, session)
                
                self.list = []

-               list = language.getLanguageList()
-               for x in language.lang:
-                       print x
-                       self.list.append(LanguageEntryComponent(x[2], x[0]))
-

                self["list"] = LanguageList(self.list)
                self["list"] = LanguageList(self.list)

+               self.updateList()

                
                

-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["ListboxActions", "OkCancelActions"], 

                {
                        "ok": self.save,
                {
                        "ok": self.save,

-                       "cancel": self.close
+                       "cancel": self.close,
+                       "moveUp": self.up,
+                       "moveDown": self.down

                })
                
        def save(self):
                })
                
        def save(self):


@@ -33,3 +31,19 @@ class LanguageSelection(Screen):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
                config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
                config.osd.language.save()
                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