Merge branch 'master' of /git/enigma2

[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
old mode 100644 (file)
new mode 100755 (executable)
index 1b820fb..733edd6
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -3,16 +3,19 @@ from Plugins.Plugin import PluginDescriptor
 from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
 from Components.config import getConfigListEntry, config, ConfigBoolean, ConfigNothing, ConfigSlider
 from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
 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):
 
 from VideoHardware import video_hw
 
 config.misc.videowizardenabled = ConfigBoolean(default = True)
 
 class VideoSetup(Screen, ConfigListScreen):

+

        def __init__(self, session, hw):
                Screen.__init__(self, session)
        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 = [ ]
 
                self.hw = hw
                self.onChangedEntry = [ ]
 


@@ -30,18 +33,15 @@ class VideoSetup(Screen, ConfigListScreen):
                                "save": self.apply,
                        }, -2)
 
                                "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.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)
 
        def startHotplug(self):
                self.hw.on_hotplug.append(self.createSetup)


@@ -231,4 +231,4 @@ def Plugins(**kwargs):
        ]
        if config.misc.videowizardenabled.value:
                list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))
        ]
        if config.misc.videowizardenabled.value:
                list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))

-       return list
+       return list