add missing dm800se color oled screens. refs #530
[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / plugin.py
old mode 100644 (file)
new mode 100755 (executable)
index b9c85ec..39c1131
@@ -1,25 +1,21 @@
 from Screens.Screen import Screen
 from Plugins.Plugin import PluginDescriptor
-
-from enigma import eTimer
-
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-from Components.Pixmap import Pixmap
-from Screens.MessageBox import MessageBox
-from Screens.Setup import SetupSummary
+from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config
-from VideoWizard import VideoWizard
-from Components.config import config
+from Components.config import getConfigListEntry, config, ConfigBoolean, ConfigNothing, ConfigSlider
+from Components.Sources.StaticText import StaticText
 
 from VideoHardware import video_hw
 
+config.misc.videowizardenabled = ConfigBoolean(default = True)
+
 class VideoSetup(Screen, ConfigListScreen):
+
        def __init__(self, session, hw):
                Screen.__init__(self, session)
-               self.skinName = "Setup"
-               self.setup_title = "Videomode Setup"
+               # for the skin: first try VideoSetup, then Setup, this allows individual skinning
+               self.skinName = ["VideoSetup", "Setup" ]
+               self.setup_title = _("A/V Settings")
                self.hw = hw
                self.onChangedEntry = [ ]
 
@@ -30,21 +26,22 @@ class VideoSetup(Screen, ConfigListScreen):
                self.list = [ ]
                ConfigListScreen.__init__(self, self.list, session = session, on_change = self.changedEntry)
 
+               from Components.ActionMap import ActionMap
                self["actions"] = ActionMap(["SetupActions"], 
                        {
                                "cancel": self.keyCancel,
                                "save": self.apply,
                        }, -2)
 
-               self["title"] = Label(_("Video-Setup"))
-
-               self["oktext"] = Label(_("OK"))
-               self["canceltext"] = Label(_("Cancel"))
-               self["ok"] = Pixmap()
-               self["cancel"] = Pixmap()
+               self["key_red"] = StaticText(_("Cancel"))
+               self["key_green"] = StaticText(_("OK"))
 
                self.createSetup()
                self.grabLastGoodMode()
+               self.onLayoutFinish.append(self.layoutFinished)
+
+       def layoutFinished(self):
+               self.setTitle(self.setup_title)
 
        def startHotplug(self):
                self.hw.on_hotplug.append(self.createSetup)
@@ -53,17 +50,64 @@ class VideoSetup(Screen, ConfigListScreen):
                self.hw.on_hotplug.remove(self.createSetup)
 
        def createSetup(self):
-               self.list = [ ]
-               self.list.append(getConfigListEntry(_("Output Type"), config.av.videoport))
+               level = config.usage.setup_level.index
+
+               self.list = [
+                       getConfigListEntry(_("Video Output"), config.av.videoport)
+               ]
 
                # if we have modes for this port:
                if config.av.videoport.value in config.av.videomode:
                        # add mode- and rate-selection:
                        self.list.append(getConfigListEntry(_("Mode"), config.av.videomode[config.av.videoport.value]))
-                       self.list.append(getConfigListEntry(_("Rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
+                       if config.av.videomode[config.av.videoport.value].value == 'PC':
+                               self.list.append(getConfigListEntry(_("Resolution"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
+                       else:
+                               self.list.append(getConfigListEntry(_("Refresh Rate"), config.av.videorate[config.av.videomode[config.av.videoport.value].value]))
+
+               port = config.av.videoport.value
+               if port not in config.av.videomode:
+                       mode = None
+               else:
+                       mode = config.av.videomode[port].value
+
+               # some modes (720p, 1080i) are always widescreen. Don't let the user select something here, "auto" is not what he wants.
+               force_wide = self.hw.isWidescreenMode(port, mode)
+
+               if not force_wide:
+                       self.list.append(getConfigListEntry(_("Aspect Ratio"), config.av.aspect))
+
+               if force_wide or config.av.aspect.value in ("16_9", "16_10"):
+                       self.list.extend((
+                               getConfigListEntry(_("Display 4:3 content as"), config.av.policy_43),
+                               getConfigListEntry(_("Display >16:9 content as"), config.av.policy_169)
+                       ))
+               elif config.av.aspect.value == "4_3":
+                       self.list.append(getConfigListEntry(_("Display 16:9 content as"), config.av.policy_169))
 
 #              if config.av.videoport.value == "DVI":
 #                      self.list.append(getConfigListEntry(_("Allow Unsupported Modes"), config.av.edid_override))
+               if config.av.videoport.value == "Scart":
+                       self.list.append(getConfigListEntry(_("Color Format"), config.av.colorformat))
+                       if level >= 1:
+                               self.list.append(getConfigListEntry(_("WSS on 4:3"), config.av.wss))
+                               if SystemInfo["ScartSwitch"]:
+                                       self.list.append(getConfigListEntry(_("Auto scart switching"), config.av.vcrswitch))
+
+               if level >= 1:
+                       self.list.append(getConfigListEntry(_("AC3 default"), config.av.defaultac3))
+                       if SystemInfo["CanDownmixAC3"]:
+                               self.list.append(getConfigListEntry(_("AC3 downmix"), config.av.downmix_ac3))
+                       self.list.extend((
+                               getConfigListEntry(_("General AC3 Delay"), config.av.generalAC3delay),
+                               getConfigListEntry(_("General PCM Delay"), config.av.generalPCMdelay)
+                       ))
+
+               if SystemInfo["CanChangeOsdAlpha"]:
+                       self.list.append(getConfigListEntry(_("OSD visibility"), config.av.osd_alpha))
+
+               if not isinstance(config.av.scaler_sharpness, ConfigNothing):
+                       self.list.append(getConfigListEntry(_("Scaler sharpness"), config.av.scaler_sharpness))
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -78,6 +122,9 @@ class VideoSetup(Screen, ConfigListScreen):
 
        def confirm(self, confirmed):
                if not confirmed:
+                       config.av.videoport.value = self.last_good[0]
+                       config.av.videomode[self.last_good[0]].value = self.last_good[1]
+                       config.av.videorate[self.last_good[1]].value = self.last_good[2]
                        self.hw.setMode(*self.last_good)
                else:
                        self.keySave()
@@ -92,9 +139,10 @@ class VideoSetup(Screen, ConfigListScreen):
                port = config.av.videoport.value
                mode = config.av.videomode[port].value
                rate = config.av.videorate[mode].value
-               if (port, mode, rate) != self.last_good or True:
+               if (port, mode, rate) != self.last_good:
                        self.hw.setMode(port, mode, rate)
-                       self.session.openWithCallback(self.confirm, MessageBox, "Is this videomode ok?", MessageBox.TYPE_YESNO, timeout = 20, default = False)
+                       from Screens.MessageBox import MessageBox
+                       self.session.openWithCallback(self.confirm, MessageBox, _("Is this videomode ok?"), MessageBox.TYPE_YESNO, timeout = 20, default = False)
                else:
                        self.keySave()
 
@@ -110,6 +158,7 @@ class VideoSetup(Screen, ConfigListScreen):
                return str(self["config"].getCurrent()[1].getText())
 
        def createSummary(self):
+               from Screens.Setup import SetupSummary
                return SetupSummary
 
 class VideomodeHotplug:
@@ -169,13 +218,17 @@ def startSetup(menuid):
        if menuid != "system": 
                return [ ]
 
-       return [(_("Video Setup"), videoSetupMain, "video_setup", None)]
+       return [(_("A/V Settings"), videoSetupMain, "av_setup", 40)]
+
+def VideoWizard(*args, **kwargs):
+       from VideoWizard import VideoWizard
+       return VideoWizard(*args, **kwargs)
 
 def Plugins(**kwargs):
        list = [
 #              PluginDescriptor(where = [PluginDescriptor.WHERE_SESSIONSTART, PluginDescriptor.WHERE_AUTOSTART], fnc = autostart),
                PluginDescriptor(name=_("Video Setup"), description=_("Advanced Video Setup"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup) 
        ]
-       if config.misc.firstrun.value:
-               list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=VideoWizard))
-       return list
+       if config.misc.videowizardenabled.value:
+               list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))
+       return list