X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/20c942082eedd5307bd331e4097b9892adaed120..43f543871592eda0489f6dcbf3ad901309aaa9f9:/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
old mode 100644
new mode 100755
index cd1529aa..9b9044ee
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -12,14 +12,22 @@ from Tools.HardwareInfo import HardwareInfo
 config.misc.showtestcard = ConfigBoolean(default = False)
 
 class VideoWizardSummary(WizardSummary):
-	skin = """
-	<screen position="0,0" size="132,64">
+	skin = (
+	"""<screen name="VideoWizardSummary" position="0,0" size="132,64" id="1">
 		<widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" />
 		<widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14">
 			<convert type="StringListSelection" />
 		</widget>
 		<!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
-	</screen>""" #% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png"))
+	</screen>""",
+	"""<screen name="VideoWizardSummary" position="0,0" size="96,64" id="2">
+		<widget name="text" position="0,4" size="96,40" font="Regular;12" transparent="1" />
+		<widget source="parent.list" render="Label" position="0,40" size="96,21" font="Regular;14">
+			<convert type="StringListSelection" />
+		</widget>
+		<!--widget name="pic" pixmap="%s" position="0,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
+	</screen>""")
+	#% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png"))
 	
 	def __init__(self, session, parent):
 		WizardSummary.__init__(self, session, parent)
@@ -82,7 +90,7 @@ class VideoWizard(WizardLanguage, Rc):
 		for port in self.hw.getPortList():
 			if self.hw.isPortUsed(port):
 				descr = port
-				if descr == 'DVI' and hw_type == 'dm500hd':
+				if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se'):
 					descr = 'HDMI'
 				if port != "DVI-PC":
 					list.append((descr,port))
@@ -99,7 +107,10 @@ class VideoWizard(WizardLanguage, Rc):
 		print "input selection moved:", self.selection
 		self.inputSelect(self.selection)
 		if self["portpic"].instance is not None:
-			self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + self.selection + ".png"))
+			picname = self.selection
+			if picname == "DVI" and HardwareInfo().get_device_name() in ("dm500hd", "dm800se"):
+				picname = "HDMI"
+			self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png"))
 		
 	def inputSelect(self, port):
 		print "inputSelect:", port
@@ -131,8 +142,12 @@ 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.rate = "multi"
+			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