diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:55:09 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:55:09 +0200 |
| commit | 37152843c915fd0a9352256d804ced4ff54c23c4 (patch) | |
| tree | fbc7a5b7e428997e9feed5eac23b9960273545dd /lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py | |
| parent | 03dba41f691f1ae6a315d0a13c5af66fdf93fbfd (diff) | |
| parent | 27305d845d1bb4ca86a7e3e03b4c08cf3f3433fc (diff) | |
| download | enigma2-37152843c915fd0a9352256d804ced4ff54c23c4.tar.gz enigma2-37152843c915fd0a9352256d804ced4ff54c23c4.zip | |
Merge remote branch 'origin/bug_530_add_dm800se_support'
Diffstat (limited to 'lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py index 15f4d516..9b9044ee 100644..100755 --- 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)) @@ -100,7 +108,7 @@ class VideoWizard(WizardLanguage, Rc): self.inputSelect(self.selection) if self["portpic"].instance is not None: picname = self.selection - if picname == "DVI" and HardwareInfo().get_device_name() == "dm500hd": + if picname == "DVI" and HardwareInfo().get_device_name() in ("dm500hd", "dm800se"): picname = "HDMI" self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png")) |