Merge branch 'bug_262_no_more_ask_50hz' into experimental

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index cd1529aabad25d0582791c326110eb3f09bf3218..49b5d53dcd932bd07743efe43e826efb2356f275 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -131,8 +131,11 @@ class VideoWizard(WizardLanguage, Rc):
        def modeSelect(self, mode):
                ratesList = self.listRates(mode)
                print "ratesList:", ratesList
-               self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
-               
+               if self.port == "DVI" and mode in ("720p", "1080i"):
+                       self.hw.setMode(port = self.port, mode = mode, rate = "multi")
+               else:
+                       self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
+       
        def listRates(self, querymode = None):
                if querymode is None:
                        querymode = self.mode

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index 29ac4297513163bbb3556b6f89c3ff911e5bf97a..5dea661d675be86e1478648d4066be7b8b79e1d0 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -20,7 +20,7 @@ self.selectKey("DOWN")
 self["portpic"].hide()
                </code>
        </step>
-       <step id="rateselection" nextstep="dvirateintroduction" timeout="20" timeoutaction="selectnext">
+       <step id="rateselection" nextstep="end" timeout="20" timeoutaction="selectnext">
                <condition>
 self.condition = (self.port != "DVI" or self.mode == "PC")
                </condition>            
@@ -33,7 +33,7 @@ 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 in ["720p", "1080i"])
                </condition>
@@ -89,7 +89,7 @@ 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)