add missing dm800se color oled screens. refs #530

[enigma2.git] / 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 (file)
new mode 100755 (executable)
index 095e94c..9b9044e
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -7,18 +7,27 @@ from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from Components.config import config, ConfigBoolean, configfile
 
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+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)
@@ -75,11 +84,16 @@ class VideoWizard(WizardLanguage, Rc):
                configfile.save()
        
        def listInputChannels(self):
+               hw_type = HardwareInfo().get_device_name()
                list = []
 
                for port in self.hw.getPortList():
                        if self.hw.isPortUsed(port):
-                               list.append((port,port))
+                               descr = port
+                               if descr == 'DVI' and hw_type in ('dm500hd', 'dm800se'):
+                                       descr = 'HDMI'
+                               if port != "DVI-PC":
+                                       list.append((descr,port))
                list.sort(key = lambda x: x[0])
                print "listInputChannels:", list
                return list
@@ -93,15 +107,19 @@ 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
                modeList = self.hw.getModeList(self.selection)
                print "modeList:", modeList
                self.port = port
-               ratesList = self.listRates(modeList[0][0])
-               self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
+               if (len(modeList) > 0):
+                       ratesList = self.listRates(modeList[0][0])
+                       self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
                
        def listModes(self):
                list = []
@@ -124,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
@@ -165,7 +187,7 @@ class VideoWizard(WizardLanguage, Rc):
                        config.misc.showtestcard.value = False
 
        def keyNumberGlobal(self, number):
-               if number in [1,2,3]:
+               if number in (1,2,3):
                        if number == 1:
                                self.hw.saveMode("DVI", "720p", "multi")
                        elif number == 2: