cleanup PC Modes

add 480p and 576p to DVI and YPbPr

3 files changed, 30 insertions, 18 deletions

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 43543bb1..d3389a75 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -22,17 +22,26 @@ class VideoHardware:
 
 	modes = { }  # a list of (high-level) modes for a certain port.
 
-	rates["PAL"] =			{ "50Hz":		{ 50: "pal", 60: "pal"},
-												"60Hz":		{ 50: "pal60", 60: "pal60"},
-												"multi":	{ 50: "pal", 60: "pal60"} }
-	rates["NTSC"] =			{ "60Hz": 	{ 50: "ntsc", 60: "ntsc"} }
-	rates["Multi"] =		{ "multi": 	{ 50: "pal", 60: "ntsc"} }
-	rates["720p"] =			{	"50Hz": 	{ 50: "720p50", 60: "720p50"},
-												"60Hz": 	{ 50: "720p", 60: "720p"},
-												"multi": 	{ 50: "720p50", 60: "720p"} }
-	rates["1080i"] =		{ "50Hz":		{ 50: "1080i50", 60: "1080i50"},
-												"60Hz":		{ 50: "1080i", 60: "1080i"},
-												"multi":	{ 50: "1080i50", 60: "1080i"} }
+	rates["PAL"] =			{ "50Hz":		{ 50: "pal" },
+								"60Hz":		{ 60: "pal60" },
+								"multi":	{ 50: "pal", 60: "pal60" } }
+
+	rates["NTSC"] =			{ "60Hz": 	{ 60: "ntsc" } }
+
+	rates["Multi"] =		{ "multi": 	{ 50: "pal", 60: "ntsc" } }
+
+	rates["480p"] =			{ "60Hz": 	{ 60: "480p" } }
+
+	rates["576p"] =			{ "50Hz": 	{ 50: "576p" } }
+
+	rates["720p"] =			{ "50Hz": 	{ 50: "720p50", 60: "720p50" },
+								"60Hz": 	{ 60: "720p" },
+								"multi": 	{ 50: "720p50" } }
+
+	rates["1080i"] =		{ "50Hz":		{ 50: "1080i50" },
+								"60Hz":		{ 60: "1080i" },
+								"multi":	{ 50: "1080i50", 60: "1080i" } }
+
 	rates["PC"] = { 
 		"1024x768": { 60: "1024x768"}, # not possible on DM7025
 		"800x600" : { 60: "800x600"},  # also not possible
@@ -50,8 +59,8 @@ class VideoHardware:
 	}
 
 	modes["Scart"] = ["PAL", "NTSC", "Multi"]
-	modes["YPbPr"] = ["720p", "1080i"]
-	modes["DVI"] = ["720p", "1080i", "PC"]
+	modes["YPbPr"] = ["720p", "1080i", "576p", "480p"]
+	modes["DVI"] = ["720p", "1080i", "576p", "480p"]
 	modes["DVI-PC"] = ["PC"]
 
 	widescreen_modes = set(["720p", "1080i"])
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 115e81f7..eb58568e 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -59,7 +59,10 @@ class VideoSetup(Screen, ConfigListScreen):
 		if config.av.videoport.value in config.av.videomode:
 			# add mode- and rate-selection:
 			self.list.append(getConfigListEntry(_("Mode"), config.av.videomode[config.av.videoport.value]))
-			self.list.append(getConfigListEntry(_("Refresh Rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
+			if config.av.videomode[config.av.videoport.value].value == 'PC':
+				self.list.append(getConfigListEntry(_("Resolution"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
+			else:
+				self.list.append(getConfigListEntry(_("Refresh Rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
 
 		port = config.av.videoport.value
 		if port not in config.av.videomode:
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index df040868..48a5ad00 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -49,7 +49,7 @@ self["rc"].startMoving()
 	</step>
 	<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" />
@@ -65,7 +65,7 @@ self.rateSelect("60Hz")
 	</step>
 	<step id="dvirateselection" timeout="10" 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="" />
@@ -87,7 +87,7 @@ 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="" />
@@ -102,7 +102,7 @@ self["rc"].startMoving()
 	</step>
 	<step id="working50Hz" nextstep="end" timeout="10" 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="" />