do some late imports

[vuplus_dvbapp] / 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 274045f..3536ca6 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -1,16 +1,8 @@
 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.ConfigList import ConfigListScreen
 from Components.config import getConfigListEntry, config
-from VideoWizard import VideoWizard
 from Components.config import config
 
 from VideoHardware import video_hw
@@ -30,16 +22,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,7 +58,7 @@ 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]))
 
 #              if config.av.videoport.value == "DVI":
 #                      self.list.append(getConfigListEntry(_("Allow Unsupported Modes"), config.av.edid_override))
@@ -104,6 +100,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 +117,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 +179,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))
+               list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard)))
        return list