X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dcc4a84bbe28965292b92a0242d9c68e6e0dbba8..5b374e685f27bd083343c943ea715e02679ac028:/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 b9c85ec9..7a2127ac 100644 --- 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) - self["title"] = Label(_("Video-Setup")) + 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() @@ -53,17 +50,61 @@ 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)) self["config"].list = self.list self["config"].l.setList(self.list) @@ -78,6 +119,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 +136,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 +155,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 +215,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)) + if config.misc.videowizardenabled.value: + list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard))) return list