X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FLanguageSelection.py;h=082daa5562ebf463dc54c571c03ae540549b2937;hp=87fbc1108510fe0529627ae4dcb7c5407ebf3a4f;hb=574f425cc1ebece0aa5f09fb77a8cb7ad0310a1f;hpb=2b6021b22bea4aacfec94140138c3f42262bf5fb

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 87fbc11..082daa5 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -1,11 +1,28 @@
 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 Components.Label import Label
+from Components.Pixmap import Pixmap
+from Components.language_cache import LANG_TEXT
 
+def _cached(x):
+	return LANG_TEXT.get(config.osd.language.value, {}).get(x, "")
+
+from Screens.Rc import Rc
+
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+
+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):
@@ -14,18 +31,16 @@ class LanguageSelection(Screen):
 		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.cancel,
-			"up": self.up,
-			"down": self.down,
-			"left": self.left,
-			"right": self.right
 		}, -1)
 
 	def selectActiveLanguage(self):
@@ -33,7 +48,7 @@ class LanguageSelection(Screen):
 		pos = 0
 		for x in self.list:
 			if x[0] == activeLanguage:
-				self["list"].instance.moveSelectionTo(pos)
+				self["languages"].index = pos
 				break
 			pos += 1
 
@@ -45,40 +60,64 @@ class LanguageSelection(Screen):
 		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]
+	def run(self, justlocal = False):
+		print "updating language..."
+		lang = self["languages"].getCurrent()[0]
+		config.osd.language.value = lang
 		config.osd.language.save()
+		self.setTitle(_cached("T2"))
+		
+		if justlocal:
+			return
+
+		language.activateLanguage(lang)
 		config.misc.languageselected.value = 0
 		config.misc.languageselected.save()
-		self.setTitle(_("Language selection"))
+		print "ok"
 
 	def updateList(self):
-		self.list = []
-		if len(language.getLanguageList()) == 0: # no language available => display only english
-			self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
+		first_time = not self.list
+
+		languageList = language.getLanguageList()
+		if not languageList: # no language available => display only english
+			list = [ LanguageEntryComponent("en", _cached("en_EN"), "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)
+			list = [ LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]) for x in languageList]
+		self.list = list
 
-	def up(self):
-		self["list"].instance.moveSelection(self["list"].instance.moveUp)
-		self.run()
-		self.updateList()
+		#list.sort(key=lambda x: x[1][7])
 
-	def down(self):
-		self["list"].instance.moveSelection(self["list"].instance.moveDown)
-		self.run()
-		self.updateList()
+		print "updateList"
+		if first_time:
+			self["languages"].list = list
+		else:
+			self["languages"].updateList(list)
+		print "done"
 
-	def left(self):
-		self["list"].instance.moveSelection(self["list"].instance.pageUp)
-		self.run()
+	def changed(self):
+		self.run(justlocal = True)
 		self.updateList()
 
-	def right(self):
-		self["list"].instance.moveSelection(self["list"].instance.pageDown)
-		self.run()
+class LanguageWizard(LanguageSelection, Rc):
+	def __init__(self, session):
+		LanguageSelection.__init__(self, session)
+		Rc.__init__(self)
+		self.onLayoutFinish.append(self.selectKeys)
+				
+		self["wizard"] = Pixmap()
+		self["text"] = Label()
+		self.setText()
+		
+	def selectKeys(self):
+		self.clearSelectedKeys()
+		self.selectKey("UP")
+		self.selectKey("DOWN")
+		
+	def changed(self):
+		self.run(justlocal = True)
 		self.updateList()
+		self.setText()
+		
+	def setText(self):
+		
+		self["text"].setText(_cached("T1"))