X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8ad3d72d92a830d66a874ea56128c4a4e7b06ae0..96ac5ba0afb7fb1ea96aee24fc497e76dc2c652b:/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 fb8f4016..bceb6bc7 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -1,22 +1,21 @@ -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 +from Tools.HardwareInfo import HardwareInfo config.misc.showtestcard = ConfigBoolean(default = False) class VideoWizardSummary(WizardSummary): skin = """ - - + + @@ -32,22 +31,23 @@ class VideoWizardSummary(WizardSummary): def setLCDPic(self, file): self["pic"].instance.setPixmapFromFile(file) -class VideoWizard(WizardLanguage): +class VideoWizard(WizardLanguage, Rc): skin = """ - - - + + + - - - - + + + + + """ % (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/Scart.png")) def __init__(self, session): @@ -56,12 +56,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,14 +71,20 @@ class VideoWizard(WizardLanguage): return VideoWizardSummary def markDone(self): - pass + config.misc.videowizardenabled.value = 0 + config.misc.videowizardenabled.save() + configfile.save() def listInputChannels(self): + hw_type = HardwareInfo().get_device_name() list = [] for port in self.hw.getPortList(): if self.hw.isPortUsed(port): - list.append((port,port)) + descr = port + if descr == 'DVI' and hw_type == 'dm500hd': + descr = 'HDMI' + list.append((descr,port)) list.sort(key = lambda x: x[0]) print "listInputChannels:", list return list @@ -101,13 +104,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 +140,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 @@ -160,7 +170,7 @@ class VideoWizard(WizardLanguage): config.misc.showtestcard.value = False def keyNumberGlobal(self, number): - if number in [1,2,3]: + if number in (1,2,3): if number == 1: self.hw.saveMode("DVI", "720p", "multi") elif number == 2: