diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-05 19:42:27 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-05 19:42:27 +0100 |
| commit | 7f092da014b616004d07fc27e567d1d6f096d15b (patch) | |
| tree | 5792a418218e9644af2e730e6404975cd7990550 /lib/python/Plugins/SystemPlugins/Videomode | |
| parent | c9fc2db8f1829ec65482487070722194ddc0fcf4 (diff) | |
| parent | 3238fce693dbe855e0e75b40eb26c883e940403d (diff) | |
| download | enigma2-7f092da014b616004d07fc27e567d1d6f096d15b.tar.gz enigma2-7f092da014b616004d07fc27e567d1d6f096d15b.zip | |
Merge branch 'master' into 3.0
Diffstat (limited to 'lib/python/Plugins/SystemPlugins/Videomode')
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py | 4 | ||||
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py index 59c50476..dc4e8c56 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py @@ -239,9 +239,9 @@ class VideoHardware: portlist = self.getPortList() for port in portlist: descr = port - if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se'): + if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se', 'dm7020hd'): descr = 'HDMI' - elif descr == 'DVI-PC' and hw_type in ('dm500hd', 'dm800se'): + elif descr == 'DVI-PC' and hw_type in ('dm500hd', 'dm800se', 'dm7020hd'): descr = 'HDMI-PC' lst.append((port, descr)) diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py index 9b9044ee..18e81764 100755 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -90,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 in ('dm500hd', 'dm800se'): + if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se', 'dm7020hd'): descr = 'HDMI' if port != "DVI-PC": list.append((descr,port)) @@ -108,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() in ("dm500hd", "dm800se"): + if picname == "DVI" and HardwareInfo().get_device_name() in ("dm500hd", "dm800se", "dm7020hd"): picname = "HDMI" self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png")) |