X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FWizard.py;h=0f8f1998f98c9ec1b37980453f3a1b4a5606416a;hp=07c5f9afce98a18dc3c209bc3a340f2fea57c5bd;hb=5efc1ec21ed5ba97164aad2ba9b8aefb90df96f6;hpb=fe798a5d31319171dbb76c6d9fec268e691d3f77

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 07c5f9a..0f8f199 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -1,5 +1,7 @@
 from Screen import Screen
 
+import string
+
 from Screens.HelpMenu import HelpableScreen
 from Components.Label import Label
 from Components.Slider import Slider
@@ -14,19 +16,7 @@ from xml.sax.handler import ContentHandler
 
 config.misc.firstrun = configElementBoolean("config.misc.firstrun", 1);
 
-class WelcomeWizard(Screen, HelpableScreen):
-
-	skin = """
-		<screen position="0,0" size="720,560" title="Welcome..." flags="wfNoBorder" >
-			<widget name="text" position="50,100" size="440,200" font="Arial;23" />
-			<widget name="list" position="50,300" zPosition="1" size="440,200" />
-			<widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" />			
-			<widget name="step" position="50,50" size="440,25" font="Arial;23" />
-			<widget name="stepslider" position="50,500" zPosition="1" size="440,20" backgroundColor="dark" />
-			<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
-			<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-			<widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-		</screen>"""
+class Wizard(Screen, HelpableScreen):
 
 	class parseWizard(ContentHandler):
 		def __init__(self, wizard):
@@ -41,7 +31,7 @@ class WelcomeWizard(Screen, HelpableScreen):
 				self.lastStep = int(attrs.get('number'))
 				self.wizard[self.lastStep] = {"text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": ""}
 			elif (name == "text"):
-				self.wizard[self.lastStep]["text"] = str(attrs.get('value'))
+				self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
 			elif (name == "listentry"):
 				self.wizard[self.lastStep]["list"].append((str(attrs.get('caption')), str(attrs.get('step'))))
 			elif (name == "config"):
@@ -61,25 +51,20 @@ class WelcomeWizard(Screen, HelpableScreen):
 				 self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
 				
 	def __init__(self, session):
-		self.skin = WelcomeWizard.skin
-
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
 
 		self.wizard = {}
 		parser = make_parser()
-		print "Reading startwizard.xml"
+		print "Reading " + self.xmlfile
 		wizardHandler = self.parseWizard(self.wizard)
 		parser.setContentHandler(wizardHandler)
-		parser.parse('/usr/share/enigma2/startwizard.xml')
+		parser.parse('/usr/share/enigma2/' + self.xmlfile)
 		
 		self.numSteps = len(self.wizard)
 		self.currStep = 1
 
 		self["text"] = Label()
-		self["rc"] = MovingPixmap()
-		self["arrowdown"] = MovingPixmap()
-		self["arrowup"] = MovingPixmap()
 
 		self["config"] = ConfigList([])
 
@@ -95,7 +80,7 @@ class WelcomeWizard(Screen, HelpableScreen):
 		self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
 		{
 			"ok": self.ok,
-			#"cancel": self.keyCancel,
+			"back": self.back,
 			"left": self.left,
 			"right": self.right,
 			"up": self.up,
@@ -117,6 +102,12 @@ class WelcomeWizard(Screen, HelpableScreen):
 				#"ok": (self.ok, _("Close this Screen...")),
 			#})
 
+	def back(self):
+		self.currStep -= 1
+		if self.currStep < 1:
+			self.currStep = 1
+		self.updateValues()
+		
 	def ok(self):
 		print "OK"
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
@@ -162,14 +153,14 @@ class WelcomeWizard(Screen, HelpableScreen):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].instance.moveSelection(self["config"].instance.moveUp)
 		elif (len(self.wizard[self.currStep]["list"]) > 0):
-			self["list"].instance.moveSelection(self["config"].instance.moveUp)
+			self["list"].instance.moveSelection(self["list"].instance.moveUp)
 		print "up"
 		
 	def down(self):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].instance.moveSelection(self["config"].instance.moveDown)
 		elif (len(self.wizard[self.currStep]["list"]) > 0):
-			self["list"].instance.moveSelection(self["config"].instance.moveDown)
+			self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		print "down"
 		
 	def updateValues(self):
@@ -177,7 +168,8 @@ class WelcomeWizard(Screen, HelpableScreen):
 		self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps))
 		self["stepslider"].setValue(self.currStep)
 
-		self["text"].setText(self.wizard[self.currStep]["text"])
+		print _(self.wizard[self.currStep]["text"])
+		self["text"].setText(_(self.wizard[self.currStep]["text"]))
 
 		if self.wizard[self.currStep]["code"] != "":
 			print self.wizard[self.currStep]["code"]
@@ -188,7 +180,7 @@ class WelcomeWizard(Screen, HelpableScreen):
 		if (len(self.wizard[self.currStep]["list"]) > 0):
 			self["list"].instance.setZPosition(2)
 			for x in self.wizard[self.currStep]["list"]:
-				self.list.append((x[0], None))
+				self.list.append((_(x[0]), None))
 		self["list"].l.setList(self.list)
 
 		self["config"].instance.setZPosition(1)
@@ -208,12 +200,17 @@ class WelcomeWizard(Screen, HelpableScreen):
 		else:
 			self["config"].l.setList([])
 
-
-
-def listActiveWizards():
-	wizards = [ ]
-
-	if config.misc.firstrun.value:
-		wizards.append(WelcomeWizard)
+class WizardManager:
+	def __init__(self):
+		self.wizards = []
+	
+	def registerWizard(self, wizard):
+		self.wizards.append(wizard)
 	
-	return wizards
+	def getWizards(self):
+		if config.misc.firstrun.value:
+			return self.wizards
+		else:
+			return []
+
+wizardManager = WizardManager()