X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5efc1ec21ed5ba97164aad2ba9b8aefb90df96f6..2b6021b22bea4aacfec94140138c3f42262bf5fb:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 399e20ec..87fbc110 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -10,45 +10,75 @@ from Components.config import config
 class LanguageSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
-		
+
+		self.oldActiveLanguage = language.getActiveLanguage()
+
 		self.list = []
 		self["list"] = LanguageList(self.list)
 		self.updateList()
-		
-		self["actions"] = ActionMap(["WizardActions"], 
+		self.onLayoutFinish.append(self.selectActiveLanguage)
+
+		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
 		{
 			"ok": self.save,
-			"back": self.close,
+			"cancel": self.cancel,
 			"up": self.up,
-			"down": self.down
+			"down": self.down,
+			"left": self.left,
+			"right": self.right
 		}, -1)
-		
+
+	def selectActiveLanguage(self):
+		activeLanguage = language.getActiveLanguage()
+		pos = 0
+		for x in self.list:
+			if x[0] == activeLanguage:
+				self["list"].instance.moveSelectionTo(pos)
+				break
+			pos += 1
+
 	def save(self):
 		self.run()
 		self.close()
-	
+
+	def cancel(self):
+		language.activateLanguage(self.oldActiveLanguage)
+		self.close()
+
 	def run(self):
-		language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
-		config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+		language.activateLanguage(self["list"].l.getCurrentSelection()[0])
+		config.osd.language.value = self["list"].l.getCurrentSelection()[0]
 		config.osd.language.save()
-		self.session.currentDialog.instance.setTitle(_("Language selection"))
+		config.misc.languageselected.value = 0
+		config.misc.languageselected.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")))
+		if len(language.getLanguageList()) == 0: # no language available => display only english
+			self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
 		else:
-			for x in language.lang:
-				self.list.append(LanguageEntryComponent(x[2], _(x[0])))
-		
+			for x in language.getLanguageList():
+				self.list.append(LanguageEntryComponent(file = x[1][3].lower(), name = _(x[1][0]), index = x[0]))
+		#self.list.sort(key=lambda x: x[1][7])
 		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()