select active language in language selection screen

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 1a82a313c2002815ad231263e0eb965616ec65e5..f59c7987697f1f26c32fa4291b6dc5f226cd0f05 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -14,14 +14,20 @@ class LanguageSelection(Screen):
                self.list = []
                self["list"] = LanguageList(self.list)
                self.updateList()
-               
-               self["actions"] = ActionMap(["ListboxActions", "OkCancelActions"], 
+               self.onLayoutFinish.append(self.selectActiveLanguage)
+                               
+               self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
                {
                        "ok": self.save,
                        "cancel": self.close,
-                       "moveUp": self.up,
-                       "moveDown": self.down
-               })
+                       "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()
@@ -31,6 +37,7 @@ class LanguageSelection(Screen):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
                config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
                config.osd.language.save()
+               self.session.currentDialog.instance.setTitle(_("Language selection"))
 
        def updateList(self):
                self.list = []
@@ -38,12 +45,26 @@ class LanguageSelection(Screen):
                        self.list.append(LanguageEntryComponent("en", _("English")))
                else:
                        for x in language.lang:
-                               self.list.append(LanguageEntryComponent(x[2], _(x[0])))
+                               self.list.append(LanguageEntryComponent(x[3].lower(), _(x[0])))
                
                self["list"].l.setList(self.list)
-               
+
        def up(self):
-               print "up"
+               self["list"].instance.moveSelection(self["list"].instance.moveUp)
+               self.run()
+               self.updateList()
                
        def down(self):
-               print "down"
\ No newline at end of file
+               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