update Videomode plugin.

[vuplus_dvbapp] / 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 bd714ce..84b1e62 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -1,90 +1,47 @@
 <wizard>
-       <step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
-               <text value="Video input selction\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" />
-               <list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
+       <step id="portselection" 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 20 seconds" />
+               <displaytext value="Select video port" />
+               <list type="dynamic" source="portList" evaluation="portSelectionMade" onselect="portSelectionMoved" />
                <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("OK")
                </code>
        </step>
-       <step id="modeselection" nextstep="rateselection" timeout="10" timeoutaction="selectnext">
-               <text value="Video mode selection." />
+       <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" />
+               <list type="dynamic" source="modeList" 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")
                </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")
-               </condition>            
-               <text value="Refresh rate selection." />
-               <displaytext value="Select video mode 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()
-               </code>
-       </step>
-       <step id="dvirateintroduction" nextstep="dvirateselection">
-               <condition>
-self.condition = (self.port == "DVI")
                </condition>
-               <text value="In the next step, the refresh rates are probed. Your screen can go black while probing.\nPlease press OK to begin." />
-               <displaytext value="Please follow the instructions on the TV" />
+               <text value="Refresh rate selection" />
+               <displaytext value="Select refresh rate" />
+               <list type="dynamic" source="rateList" evaluation="rateSelectionMade" onselect="rateSelectionMoved" />
                <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="dvirateselection" nextstep="end" timeout="10" timeoutaction="selectnext">
-               <condition>
-self.condition = (self.port == "DVI")
-               </condition>
-               <text value="The refresh rates are probed right now. If you can see this screen with 50 Hz selected, you should use this as the preferred option for best picture quality." />
-               <displaytext value="Select video mode rate" />
-               <list evaluation="rateSelectionMade" onselect="rateSelectionMoved">
-                       <listentry caption="50 Hz" step="50 Hz" />
-                       <listentry caption="60 Hz" step="60 Hz" />
-               </list>
+       <step id="end">
                <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.video_cfg.saveVideomode(self.port, self.mode, self.rate)
+from Components.config import configfile
+configfile.save()
                </code>
-       </step>
-       <step id="end">
-               <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?" />
-               <displaytext value="No picture on TV? Press EXIT and retry." />
-               <list evaluation="rateSelectionMade" onselect="rateSelectionMoved">
+               <text value="The input port should be configured now.\nYou can now configure the screen by displaying some test picture. Do you want to do that now?" />
+               <displaytext value="video tune" />
+               <list evaluation="showVideoTune" onselect="showVideoTune">
                        <listentry caption="Yes" step="yes" />
                        <listentry caption="No" step="no" />
                </list>
-               </step>
+       </step>
 </wizard>