X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FWizard.py;h=eaa1d0916760ae291967c41922783398305b6e9a;hp=98959429a136c2efb2a26b6cf78f0baef558ec47;hb=HEAD;hpb=fb766db909330b55b7c650a49017a9d53a2747b4

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 9895942..eaa1d09 100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -10,14 +10,11 @@ from Components.ActionMap import NumberActionMap
 from Components.MenuList import MenuList
 from Components.ConfigList import ConfigList
 from Components.Sources.List import List
-from enigma import eTimer
+from enigma import eTimer, eEnv
 
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
-#	ikseong
-from Plugins.SystemPlugins.FactoryTest.plugin import FactoryTest
-
 class WizardSummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
@@ -181,7 +178,7 @@ class Wizard(Screen):
 		parser.setContentHandler(wizardHandler)
 		for xmlfile in self.xmlfile:
 			if xmlfile[0] != '/':
-				parser.parse('/usr/share/enigma2/' + xmlfile)
+				parser.parse(eEnv.resolve('${datadir}/enigma2/') + xmlfile)
 			else:
 				parser.parse(xmlfile)
 
@@ -196,10 +193,6 @@ class Wizard(Screen):
 		self.timeoutTimer = eTimer()
 		self.timeoutTimer.callback.append(self.timeoutCounterFired)
 
-		#	ikseong - for memory test
-		self.memorytestmode = 0
-		self.testkey = 0
-
 		self["text"] = Label()
 
 		if showConfig:
@@ -251,8 +244,6 @@ class Wizard(Screen):
 			"8": self.keyNumberGlobal,
 			"9": self.keyNumberGlobal,
 			"0": self.keyNumberGlobal,
-#	ikseong
-			"test":self.testmode
 		}, -1)
 
 		self["VirtualKB"] = NumberActionMap(["VirtualKeyboardActions"],
@@ -393,29 +384,17 @@ class Wizard(Screen):
 					self.configInstance.run()
 		self.finished()
 
-#	ikseong
-	def testmode(self):
-		print "testmode ",self.memorytestmode
-		if self.memorytestmode == 0:
-			self.memorytestmode = 1
-		else:
-			self.memorytestmode = 0
-
 	def keyNumberGlobal(self, number):
-		if self.memorytestmode == 1:
-			self.testkey = self.testkey * 10 + number
-			if self.testkey > 10000:
-				self.testkey = self.testkey%10000
-			if self.testkey == 4599:
-				self.session.open(FactoryTest)
-			print "testkey", self.testkey
-			return
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self.configInstance.keyNumberGlobal(number)
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_0 + number)
 
 	def keyGotAscii(self):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].handleKey(KEY_ASCII)
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_ASCII)
 		
 	def left(self):
 		self.resetCounter()
@@ -623,6 +602,7 @@ class Wizard(Screen):
 							self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"])
 						else:
 							self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"]))
+						self.configInstance.setAnimationMode(0)
 						self["config"].l.setList(self.configInstance["config"].list)
 						callbacks = self.configInstance["config"].onSelectionChanged
 						self.configInstance["config"].destroy()