X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..10f042bc5176b25dd067e57006647e769ec171da:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 1d2fd787..7d5596fd 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -1,78 +1,87 @@
 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
+from Components.Sources.List import List
 
+from Tools.Directories import *
+
+from Tools.LoadPixmap import LoadPixmap
+
+def LanguageEntryComponent(file, name, index):
+	png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/" + file + ".png"))
+	if png == None:
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
+	res = (index, name, png)
+	return res
 
 class LanguageSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
-		
+
+		self.oldActiveLanguage = language.getActiveLanguage()
+
 		self.list = []
-		self["list"] = LanguageList(self.list)
+		self["languages"] = List(self.list)
+		self["languages"].onSelectionChanged.append(self.changed)
+
 		self.updateList()
 		self.onLayoutFinish.append(self.selectActiveLanguage)
-				
-		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
+
+		self["actions"] = ActionMap(["OkCancelActions"], 
 		{
 			"ok": self.save,
-			"cancel": self.close,
-			"up": self.up,
-			"down": self.down,
-			"left": self.left,
-			"right": self.right
+			"cancel": self.cancel,
 		}, -1)
-		
+
 	def selectActiveLanguage(self):
 		activeLanguage = language.getActiveLanguage()
 		pos = 0
 		for x in self.list:
 			if x[0] == activeLanguage:
-				self["list"].instance.moveSelectionTo(pos)
+				self["languages"].index = 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.getCurrentSelection()[0])
-		config.osd.language.value = self["list"].l.getCurrentSelection()[0]
+		print "updating language..."
+		lang = self["languages"].getCurrent()[0]
+		language.activateLanguage(lang)
+		config.osd.language.value = lang
 		config.osd.language.save()
 		config.misc.languageselected.value = 0
 		config.misc.languageselected.save()
 		self.setTitle(_("Language selection"))
+		print "ok"
 
 	def updateList(self):
+		print "update list"
+		first_time = len(self.list) == 0
+
 		self.list = []
 		if len(language.getLanguageList()) == 0: # no language available => display only english
 			self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
 		else:
 			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)
+				self.list.append(LanguageEntryComponent(file = x[1][2].lower(), name = _(x[1][0]), index = x[0]))
+		#self.list.sort(key=lambda x: x[1][7])
 
-	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()
+		print "updateList"
+		if first_time:
+			self["languages"].list = self.list
+		else:
+			self["languages"].updateList(self.list)
+		print "done"
 
-	def left(self):
-		self["list"].instance.moveSelection(self["list"].instance.pageUp)
+	def changed(self):
 		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