From: Felix Domke <felix.domke@multimedia-labs.de>
Date: Thu, 3 Sep 2009 20:32:03 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~77
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/94b6db866acd558a025f5eb998ef27f5801a8468?hp=fc513fe2cc938f7e19be16c346fe03cacd8eb8a7

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 8fcf8f41..c004a5e6 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -160,7 +160,10 @@ config.ParentalControl.setuppin.save()
 
 			<text value="After the start wizard is completed, you need to protect single services. Refer to your dreambox's manual on how to do that." />
 		</step>
-		<step id="end">
+		<step id="end" laststep="true">
+			<condition>
+self.condition = self.isLastWizard
+			</condition>
 			<text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using your Dreambox." />
 		</step>
 </wizard>
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 06e8ba0f..a9eef406 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -662,7 +662,8 @@ int eDVBTSTools::findNextPicture(off_t &offset, size_t &len, int &distance, int
 	
 	off_t new_offset = offset;
 	size_t new_len = len;
-	
+	int first = 1;
+
 	while (distance > 0)
 	{
 		int dir = direction;
@@ -676,8 +677,9 @@ int eDVBTSTools::findNextPicture(off_t &offset, size_t &len, int &distance, int
 		
 //		eDebug("we moved %d, %d to go frames (now at %llx)", dir, distance, new_offset);
 
-		if (distance >= 0)
+		if (distance >= 0 || first)
 		{
+			first = 0;
 			offset = new_offset;
 			len = new_len;
 			nr_frames += abs(dir);
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 555110a4..74219eb1 100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -1,6 +1,7 @@
 from Screen import Screen
 
 from Screens.HelpMenu import HelpableScreen
+from Screens.MessageBox import MessageBox
 from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_HOME, KEY_END, KEY_0, KEY_DELETE, KEY_BACKSPACE, KEY_OK, KEY_TOGGLEOW, KEY_ASCII, KEY_TIMEOUT, KEY_NUMBERS
 
 from Components.Label import Label
@@ -84,6 +85,8 @@ class Wizard(Screen):
 				else:
 					timeoutstep = ''
 				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "code_async": "", "codeafter_async": "", "nextstep": nextstep}
+				if attrs.has_key('laststep'):
+					self.wizard[self.lastStep]["laststep"] = str(attrs.get('laststep'))
 			elif (name == "text"):
 				self.wizard[self.lastStep]["text"] = str(attrs.get('value')).replace("\\n", "\n")
 			elif (name == "displaytext"):
@@ -162,6 +165,8 @@ class Wizard(Screen):
 	
 	def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
 		Screen.__init__(self, session)
+		
+		self.isLastWizard = False # can be used to skip a "goodbye"-screen in a wizard
 
 		self.stepHistory = []
 
@@ -284,6 +289,8 @@ class Wizard(Screen):
 		if len(self.stepHistory) > 1:
 			self.currStep = self.stepHistory[-2]
 			self.stepHistory = self.stepHistory[:-2]
+		else:
+			self.session.openWithCallback(self.exitWizardQuestion, MessageBox, (_("Are you sure you want to exit this wizard?") ) )
 		if self.currStep < 1:
 			self.currStep = 1
 		print "currStep:", self.currStep
@@ -291,6 +298,11 @@ class Wizard(Screen):
 		self.updateValues()
 		print "after updateValues stepHistory:", self.stepHistory
 		
+	def exitWizardQuestion(self, ret = False):
+		if (ret):
+			self.markDone()
+			self.close()
+		
 	def markDone(self):
 		pass
 	
@@ -472,8 +484,14 @@ class Wizard(Screen):
 		self.condition = True
 		exec (self.wizard[self.currStep]["condition"])
 		if not self.condition:
-			self.currStep += 1
-			self.updateValues()
+			print "keys*******************:", self.wizard[self.currStep].keys()
+			if self.wizard[self.currStep].has_key("laststep"): # exit wizard, if condition of laststep doesn't hold
+				self.markDone()
+				self.close()
+				return
+			else:
+				self.currStep += 1
+				self.updateValues()
 		else:
 			if self.wizard[self.currStep].has_key("displaytext"):
 				displaytext = self.wizard[self.currStep]["displaytext"]
@@ -605,6 +623,10 @@ class WizardManager:
 	
 	def getWizards(self):
 		# x[1] is precondition
+		for wizard in self.wizards:
+			wizard[0].isLastWizard = False
+		if len(self.wizards) > 0:
+			self.wizards[-1][0].isLastWizard = True
 		return [(x[2], x[0]) for x in self.wizards if x[1] == 1]
 
 wizardManager = WizardManager()