minimally improved LCD support

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index a53bb97e37616ea4b208fc8925ac0f06ce53b8f6..6b18121ff81f725e29a9d252a82b6ffc0545582e 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -12,19 +12,22 @@ class LanguageSelection(Screen):
                Screen.__init__(self, session)
                
                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"] = LanguageList(self.list)
-               
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self.updateList()
+               self.onLayoutFinish.append(self.selectActiveLanguage)
+                               
+               self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
                {
                        "ok": self.save,
-                       "cancel": self.close
-               })
+                       "cancel": self.close,
+                       "up": self.up,
+                       "down": self.down,
+                       "left": self.left,
+                       "right": self.right
+               }, -1)
+               
+       def selectActiveLanguage(self):
+               self["list"].instance.moveSelectionTo(language.activeLanguage)
                
        def save(self):
                self.run()
@@ -34,3 +37,34 @@ class LanguageSelection(Screen):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
                config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
                config.osd.language.save()
+               self.setTitle(_("Language selection"))
+
+       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[3].lower(), _(x[0])))
+               
+               self["list"].l.setList(self.list)
+
+       def up(self):
+               self["list"].instance.moveSelection(self["list"].instance.moveUp)
+               self.run()
+               self.updateList()
+               
+       def down(self):
+               self["list"].instance.moveSelection(self["list"].instance.moveDown)
+               self.run()
+               self.updateList()
+
+       def left(self):
+               self["list"].instance.moveSelection(self["list"].instance.pageUp)
+               self.run()
+               self.updateList()
+               
+       def right(self):
+               self["list"].instance.moveSelection(self["list"].instance.pageDown)
+               self.run()
+               self.updateList()
\ No newline at end of file