Merge branch 'master' of /home/tmbinc/enigma2-git

4 files changed, 14 insertions, 9 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index 8e2a9f3a..6a8ffc6f 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -511,7 +511,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		
 	def askLeavePlayer(self):
 		choices = [(_("Exit"), "exit"), (_("Continue playing"), "play")]
-		if not self.physicalDVD:
+		if True or not self.physicalDVD:
 			choices.insert(1,(_("Return to file browser"), "browser"))
 		self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices)
 
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 1d7ce7b5..095e94c0 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -13,8 +13,8 @@ config.misc.showtestcard = ConfigBoolean(default = False)
 class VideoWizardSummary(WizardSummary):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" />
-		<widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16">
+		<widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" />
+		<widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14">
 			<convert type="StringListSelection" />
 		</widget>
 		<!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index 2a592aae..29ac4297 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -1,7 +1,7 @@
 <wizard>
-	<step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
+	<step id="inputselection" nextstep="modeselection" timeout="20" timeoutaction="selectnext">
 		<text value="Video input selection\n\nPlease press OK if you can see this page on your TV (or select a different input port).\n\nThe next input port will be automatically probed in 10 seconds." />
-		<displaytext value="Select video input" />
+		<displaytext value="Select video input with up/down buttons" />
 		<list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
 		<code>
 self["portpic"].show()
@@ -9,7 +9,7 @@ self.clearSelectedKeys()
 self.selectKey("OK")
 		</code>
 	</step>
-	<step id="modeselection" nextstep="rateselection" timeout="10" timeoutaction="selectnext">
+	<step id="modeselection" nextstep="rateselection" timeout="20" timeoutaction="selectnext">
 		<text value="Video mode selection." />
 		<displaytext value="Select video mode" />
 		<list type="dynamic" source="listModes" evaluation="modeSelectionMade" onselect="modeSelectionMoved" />
@@ -20,7 +20,7 @@ self.selectKey("DOWN")
 self["portpic"].hide()
 		</code>
 	</step>
-	<step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext">
+	<step id="rateselection" nextstep="dvirateintroduction" timeout="20" timeoutaction="selectnext">
 		<condition>
 self.condition = (self.port != "DVI" or self.mode == "PC")
 		</condition>		
@@ -46,7 +46,7 @@ self.selectKey("DOWN")
 self.rateSelect("60Hz")
 		</code>
 	</step>
-	<step id="dvirateselection" timeout="10" timeoutaction="changestep" timeoutstep="notworking50Hz">
+	<step id="dvirateselection" timeout="20" timeoutaction="changestep" timeoutstep="notworking50Hz">
 		<condition>
 self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
@@ -77,7 +77,7 @@ self.selectKey("UP")
 self.selectKey("DOWN")
 		</code>
 	</step>
-	<step id="working50Hz" nextstep="end" timeout="10" timeoutaction="nextstep">
+	<step id="working50Hz" nextstep="end" timeout="20" timeoutaction="nextstep">
 		<condition>
 self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 2326b915..7d454f43 100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -475,6 +475,11 @@ class Wizard(Screen):
 			self.currStep += 1
 			self.updateValues()
 		else:
+			if self.wizard[self.currStep].has_key("displaytext"):
+				displaytext = self.wizard[self.currStep]["displaytext"]
+				print "set LCD text"
+				for x in self.lcdCallbacks:
+					x(displaytext)
 			if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
 				self.stepHistory.append(self.currStep)
 			print "wizard step:", self.wizard[self.currStep]