From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Thu, 1 May 2008 16:58:12 +0000 (+0000)
Subject: reenable PC mode video selection for dvi ports in the video wizard
X-Git-Tag: 2.6.0~1268
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/327ae996e0a3a685dff1663f600493e103adb098

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

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index f7763893..f46b11c2 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -109,7 +109,7 @@ class VideoWizard(WizardLanguage):
 		list = []
 		print "modes for port", self.port
 		for mode in self.hw.getModeList(self.port):
-			if mode[0] != "PC":
+			#if mode[0] != "PC":
 				list.append((mode[0], mode[0]))
 		print "modeslist:", list
 		return list
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index c3cbabe4..8426f249 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -31,7 +31,7 @@ self["portpic"].hide()
 	</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" />
@@ -49,7 +49,7 @@ self["rc"].startMoving()
 	</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" />
@@ -65,7 +65,7 @@ self.rateSelect("60Hz")
 	</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="" />
@@ -87,7 +87,7 @@ self.rateSelect("60Hz")
 	</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="" />
@@ -102,7 +102,7 @@ self["rc"].startMoving()
 	</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="" />