Merge remote branch 'origin/bug_288_remove_no_resume_on_minor_start_cutpoints'

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/HDMI.png b/lib/python/Plugins/SystemPlugins/Videomode/HDMI.png
new file mode 100644 (file)
index 0000000..5aa8304
Binary files /dev/null and b/lib/python/Plugins/SystemPlugins/Videomode/HDMI.png differ

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
index 2ec0b33..1ac1d5d 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/Makefile.am
@@ -16,4 +16,6 @@ dist_install_DATA = \
        LICENSE \
        Scart.png \
        videowizard.xml \
-       YPbPr.png
+       YPbPr.png \
+       HDMI.png \
+       lcd_HDMI.png

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 512bcec..15f4d51 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -99,7 +99,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() == "dm500hd":
+                               picname = "HDMI"
+                       self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png"))
                
        def inputSelect(self, port):
                print "inputSelect:", port

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/lcd_HDMI.png b/lib/python/Plugins/SystemPlugins/Videomode/lcd_HDMI.png
new file mode 100644 (file)
index 0000000..425da5c
Binary files /dev/null and b/lib/python/Plugins/SystemPlugins/Videomode/lcd_HDMI.png differ