reenable PC mode video selection for dvi ports in the video wizard

[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 274045f9afe3fbe3ccb1271fbb6cca3ab56c61bb..115e81f77a38f887611b0391857fef18aa8ce8b3 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -1,20 +1,13 @@
 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
 
 from VideoHardware import video_hw
 
+config.misc.videowizardenabled = ConfigBoolean(default = True)
+
 class VideoSetup(Screen, ConfigListScreen):
        def __init__(self, session, hw):
                Screen.__init__(self, session)
@@ -30,16 +23,20 @@ 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)
 
+               from Components.Label import Label
                self["title"] = Label(_("A/V Settings"))
 
                self["oktext"] = Label(_("OK"))
                self["canceltext"] = Label(_("Cancel"))
+
+               from Components.Pixmap import Pixmap
                self["ok"] = Pixmap()
                self["cancel"] = Pixmap()
 
@@ -62,18 +59,38 @@ class VideoSetup(Screen, ConfigListScreen):
                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]))
+                       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.append(getConfigListEntry(_("Display 4:3 content as"), config.av.policy_43))
+               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))
-                       self.list.append(getConfigListEntry(_("Aspect Ratio"), config.av.aspectratio))
                        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["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -104,6 +121,7 @@ class VideoSetup(Screen, ConfigListScreen):
                rate = config.av.videorate[mode].value
                if (port, mode, rate) != self.last_good:
                        self.hw.setMode(port, mode, rate)
+                       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()
@@ -120,6 +138,7 @@ class VideoSetup(Screen, ConfigListScreen):
                return str(self["config"].getCurrent()[1].getText())
 
        def createSummary(self):
+               from Screens.Setup import SetupSummary
                return SetupSummary
 
 class VideomodeHotplug:
@@ -181,11 +200,15 @@ def startSetup(menuid):
 
        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))
+       if config.misc.videowizardenabled.value:
+               list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))
        return list