X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/327ae996e0a3a685dff1663f600493e103adb098..e03708b0a361c236d7034f35e4585edd4a91bb34:/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index 8426f249..5dea661d 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -1,35 +1,26 @@
 <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()
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+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" />
 		<code>
-self["arrowup2"].moveTo(800, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(557, 200, 1)
-self["arrowup"].moveTo(557, 355, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+self.selectKey("DOWN")
 self["portpic"].hide()
 		</code>
 	</step>
-	<step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext">
+	<step id="rateselection" nextstep="end" timeout="20" timeoutaction="selectnext">
 		<condition>
 self.condition = (self.port != "DVI" or self.mode == "PC")
 		</condition>		
@@ -37,35 +28,27 @@ self.condition = (self.port != "DVI" or self.mode == "PC")
 		<displaytext value="Select refresh rate" />
 		<list type="dynamic" source="listRates" evaluation="rateSelectionMade" onselect="rateSelectionMoved" />
 		<code>
-self["arrowup2"].moveTo(800, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(557, 200, 1)
-self["arrowup"].moveTo(557, 355, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+self.selectKey("DOWN")
 		</code>
 	</step>
-	<step id="dvirateintroduction" nextstep="dvirateselection">
+	<!--step id="dvirateintroduction" nextstep="dvirateselection">
 		<condition>
-self.condition = (self.port == "DVI" and self.mode != "PC")
+self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
 		<text value="We will now test if your TV can also display this resolution at 50hz. If your screen goes black, wait 20 seconds and it will switch back to 60hz.\nPlease press OK to begin." />
 		<displaytext value="Please follow the instructions on the TV" />
 		<code>
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+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 != "PC")
+self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
 		<text value="If you can see this page, please press OK." />
 		<displaytext value="" />
@@ -73,12 +56,9 @@ self.condition = (self.port == "DVI" and self.mode != "PC")
 			<listentry caption="50 Hz" step="working50Hz" />
 		</list>
 		<code>
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+self.selectKey("DOWN")
 self.rateSelect("50Hz")
 		</code>
 		<code pos="after">
@@ -87,38 +67,34 @@ self.rateSelect("60Hz")
 	</step>
 	<step id="notworking50Hz" nextstep="end">
 		<condition>
-self.condition = (self.port == "DVI" and self.mode != "PC")
+self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
 		<text value="No 50 Hz, sorry. :(" />
 		<displaytext value="" />
 		<code>
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+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 != "PC")
+self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
 		<text value="Your TV works with 50 Hz. Good!" />
 		<displaytext value="" />
 		<code>
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+self.selectKey("DOWN")
 self.rateSelect("50Hz")
 		</code>
-	</step>
+	</step-->
 	<step id="end">
 		<code>
 self.hw.saveMode(self.port, self.mode, self.rate)
+from Components.config import configfile
+configfile.save() 
 		</code>
 		<text value="The input port should be configured now.\nYou can now configure the screen by displaying some test pictures. Do you want to do that now?" />
 		<!--text value="You have successfully finished the video setup. If you want to change the settings later, you can do this in the settings menu."/-->