X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bfb6b4765a85a65047655ad4282756ca31229c3e..cccb35a4aeef1ba919411b35553902c86f57b856:/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
old mode 100644
new mode 100755
index b51cc08d..733edd6d
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -2,17 +2,20 @@ from Screens.Screen import Screen
 from Plugins.Plugin import PluginDescriptor
 from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config, ConfigBoolean
+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,18 +33,15 @@ class VideoSetup(Screen, ConfigListScreen):
 				"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()
+		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)
@@ -52,8 +52,9 @@ class VideoSetup(Screen, ConfigListScreen):
 	def createSetup(self):
 		level = config.usage.setup_level.index
 
-		self.list = [ ]
-		self.list.append(getConfigListEntry(_("Video Output"), config.av.videoport))
+		self.list = [
+			getConfigListEntry(_("Video Output"), config.av.videoport)
+		]
 
 		# if we have modes for this port:
 		if config.av.videoport.value in config.av.videomode:
@@ -76,8 +77,11 @@ class VideoSetup(Screen, ConfigListScreen):
 		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))
+		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))
 
@@ -94,6 +98,16 @@ class VideoSetup(Screen, ConfigListScreen):
 			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)
@@ -124,14 +138,11 @@ class VideoSetup(Screen, ConfigListScreen):
 	def apply(self):
 		port = config.av.videoport.value
 		mode = config.av.videomode[port].value
-		rate =config.av.videorate[mode].value
+		rate = config.av.videorate[mode].value
 		if (port, mode, rate) != self.last_good:
-			config.av.videoport.value = self.last_good[0]
-			config.av.videomode[port].value = self.last_good[1]
-			config.av.videorate[mode].value = self.last_good[2]
 			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)
+			self.session.openWithCallback(self.confirm, MessageBox, _("Is this videomode ok?"), MessageBox.TYPE_YESNO, timeout = 20, default = False)
 		else:
 			self.keySave()
 
@@ -220,4 +231,4 @@ def Plugins(**kwargs):
 	]
 	if config.misc.videowizardenabled.value:
 		list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))
- 	return list
+	return list