set permissions to 644 for data files

[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 115e81f77a38f887611b0391857fef18aa8ce8b3..7a2127ac97cc54be8aeb3c25c29193560cef2ba5 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -52,14 +52,18 @@ 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:
                        # add mode- and rate-selection:
                        self.list.append(getConfigListEntry(_("Mode"), config.av.videomode[config.av.videoport.value]))
-                       self.list.append(getConfigListEntry(_("Refresh 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:
@@ -73,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))
 
@@ -91,6 +98,13 @@ 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))
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -105,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()
@@ -122,7 +139,7 @@ class VideoSetup(Screen, ConfigListScreen):
                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)
+                       self.session.openWithCallback(self.confirm, MessageBox, _("Is this videomode ok?"), MessageBox.TYPE_YESNO, timeout = 20, default = False)
                else:
                        self.keySave()