reenable PC mode video selection for dvi ports in the video wizard

[enigma2.git] / 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 cb7d41edfed447eb7326660eaa636ad61c8d7189..8426f24952ca2d7b13576574e478616b6cf73eec 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -1,6 +1,6 @@
 <wizard>
        <step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
 <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." />
+               <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" />
                <list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
                <code>
                <displaytext value="Select video input" />
                <list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
                <code>


@@ -31,7 +31,7 @@ self["portpic"].hide()
        </step>
        <step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext">
                <condition>
        </step>
        <step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext">
                <condition>

-self.condition = (self.port != "DVI")
+self.condition = (self.port != "DVI" or self.mode == "PC")

                </condition>            
                <text value="Refresh rate selection." />
                <displaytext value="Select refresh rate" />
                </condition>            
                <text value="Refresh rate selection." />
                <displaytext value="Select refresh rate" />


@@ -49,7 +49,7 @@ self["rc"].startMoving()
        </step>
        <step id="dvirateintroduction" nextstep="dvirateselection">
                <condition>
        </step>
        <step id="dvirateintroduction" nextstep="dvirateselection">
                <condition>

-self.condition = (self.port == "DVI")
+self.condition = (self.port == "DVI" and self.mode != "PC")

                </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" />
                </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" />


@@ -65,7 +65,7 @@ self.rateSelect("60Hz")
        </step>
        <step id="dvirateselection" timeout="10" timeoutaction="changestep" timeoutstep="notworking50Hz">
                <condition>
        </step>
        <step id="dvirateselection" timeout="10" timeoutaction="changestep" timeoutstep="notworking50Hz">
                <condition>

-self.condition = (self.port == "DVI")
+self.condition = (self.port == "DVI" and self.mode != "PC")

                </condition>
                <text value="If you can see this page, please press OK." />
                <displaytext value="" />
                </condition>
                <text value="If you can see this page, please press OK." />
                <displaytext value="" />


@@ -87,7 +87,7 @@ self.rateSelect("60Hz")
        </step>
        <step id="notworking50Hz" nextstep="end">
                <condition>
        </step>
        <step id="notworking50Hz" nextstep="end">
                <condition>

-self.condition = (self.port == "DVI")
+self.condition = (self.port == "DVI" and self.mode != "PC")

                </condition>
                <text value="No 50 Hz, sorry. :(" />
                <displaytext value="" />
                </condition>
                <text value="No 50 Hz, sorry. :(" />
                <displaytext value="" />


@@ -102,7 +102,7 @@ self["rc"].startMoving()
        </step>
        <step id="working50Hz" nextstep="end" timeout="10" timeoutaction="nextstep">
                <condition>
        </step>
        <step id="working50Hz" nextstep="end" timeout="10" timeoutaction="nextstep">
                <condition>

-self.condition = (self.port == "DVI")
+self.condition = (self.port == "DVI" and self.mode != "PC")

                </condition>
                <text value="Your TV works with 50 Hz. Good!" />
                <displaytext value="" />
                </condition>
                <text value="Your TV works with 50 Hz. Good!" />
                <displaytext value="" />