- increase video wizard timeout from 10 to 20 seconds

[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / VideoWizard.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 2f8e8e78d01c16f4e337ab38f19b4fd4bfd1b86e..095e94c0c2acdd20c6cbf4535671cbabc0fb883b 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -1,22 +1,20 @@
-from Screens.Wizard import wizardManager, WizardSummary
+from Screens.Wizard import WizardSummary
 from Screens.WizardLanguage import WizardLanguage
-import sys
+from Screens.Rc import Rc
 from VideoHardware import video_hw
 
-from Components.Pixmap import Pixmap, MovingPixmap
+from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from Components.config import config, ConfigBoolean, configfile
 
-from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
-from Tools.LoadPixmap import LoadPixmap
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
 config.misc.showtestcard = ConfigBoolean(default = False)
 
 class VideoWizardSummary(WizardSummary):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" />
-               <widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16">
+               <widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" />
+               <widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14">
                        <convert type="StringListSelection" />
                </widget>
                <!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
@@ -32,7 +30,7 @@ class VideoWizardSummary(WizardSummary):
        def setLCDPic(self, file):
                self["pic"].instance.setPixmapFromFile(file)
 
-class VideoWizard(WizardLanguage):
+class VideoWizard(WizardLanguage, Rc):
        skin = """
                <screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
                        <widget name="text" position="153,50" size="340,270" font="Regular;23" />
@@ -44,8 +42,9 @@ class VideoWizard(WizardLanguage):
                        <ePixmap pixmap="skin_default/buttons/button_red.png" position="40,225" zPosition="0" size="15,16" transparent="1" alphatest="on" />
                        <widget name="languagetext" position="55,225" size="95,30" font="Regular;18" />
                        <widget name="portpic" pixmap="%s" position="50,300" zPosition="10" size="150,150" transparent="1" alphatest="on"/>
-                       <widget name="rc" pixmap="skin_default/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
+                       <widget name="rc" pixmaps="skin_default/rc.png,skin_default/rcold.png" position="500,50" zPosition="10" size="154,500" transparent="1" alphatest="on"/>
                        <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowdown2" pixmap="skin_default/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                        <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                        <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                </screen>""" % (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/Scart.png"))
@@ -56,12 +55,9 @@ class VideoWizard(WizardLanguage):
                self.hw = video_hw
                
                WizardLanguage.__init__(self, session, showSteps = False, showStepSlider = False)
+               Rc.__init__(self)
                self["wizard"] = Pixmap()
-               self["rc"] = MovingPixmap()
                self["portpic"] = Pixmap()
-               self["arrowdown"] = MovingPixmap()
-               self["arrowup"] = MovingPixmap()
-               self["arrowup2"] = MovingPixmap()
                
                self.port = None
                self.mode = None
@@ -74,7 +70,9 @@ class VideoWizard(WizardLanguage):
                return VideoWizardSummary
                
        def markDone(self):
-               pass
+               config.misc.videowizardenabled.value = 0
+               config.misc.videowizardenabled.save()
+               configfile.save()
        
        def listInputChannels(self):
                list = []
@@ -101,13 +99,15 @@ class VideoWizard(WizardLanguage):
                print "inputSelect:", port
                modeList = self.hw.getModeList(self.selection)
                print "modeList:", modeList
-               self.hw.setMode(port = port, mode = modeList[0][0], rate = modeList[0][1][0])
+               self.port = port
+               ratesList = self.listRates(modeList[0][0])
+               self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
                
        def listModes(self):
                list = []
                print "modes for port", self.port
                for mode in self.hw.getModeList(self.port):
-                       if mode[0] != "PC":
+                       #if mode[0] != "PC":
                                list.append((mode[0], mode[0]))
                print "modeslist:", list
                return list
@@ -135,6 +135,11 @@ class VideoWizard(WizardLanguage):
                        print mode
                        if mode[0] == querymode:
                                for rate in mode[1]:
+                                       if self.port == "DVI-PC":
+                                               print "rate:", rate
+                                               if rate == "640x480":
+                                                       list.insert(0, (rate, rate))
+                                                       continue
                                        list.append((rate, rate))
                return list