X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/359c44f6b67d705044412f527448fda2800d34bf..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 378bf207..bceb6bc7 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -1,57 +1,92 @@
-from Screens.Wizard import Wizard, wizardManager
-import sys
+from Screens.Wizard import WizardSummary
+from Screens.WizardLanguage import WizardLanguage
+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
-class VideoWizard(Wizard):
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+from Tools.HardwareInfo import HardwareInfo
+
+config.misc.showtestcard = ConfigBoolean(default = False)
+
+class VideoWizardSummary(WizardSummary):
+ skin = """
+
+
+
+
+
+
+ """ #% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png"))
+
+ def __init__(self, session, parent):
+ WizardSummary.__init__(self, session, parent)
+ #self["pic"] = Pixmap()
+
+ def setLCDPicCallback(self):
+ self.parent.setLCDTextCallback(self.setText)
+
+ def setLCDPic(self, file):
+ self["pic"].instance.setPixmapFromFile(file)
+
+class VideoWizard(WizardLanguage, Rc):
skin = """
-
+
-
-
-
-
-
-
-
- """
+
+
+
+
+
+
+
+
+
+
+ """ % (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/Scart.png"))
def __init__(self, session):
# FIXME anyone knows how to use relative paths from the plugin's directory?
- self.xmlfile = sys.path[0] + "/Plugins/SystemPlugins/Videomode/videowizard.xml"
+ self.xmlfile = resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/videowizard.xml")
self.hw = video_hw
- Wizard.__init__(self, session, showSteps = False)
+ WizardLanguage.__init__(self, session, showSteps = False, showStepSlider = False)
+ Rc.__init__(self)
self["wizard"] = Pixmap()
- self["rc"] = MovingPixmap()
- self["arrowdown"] = MovingPixmap()
- self["arrowup"] = MovingPixmap()
- self["arrowup2"] = MovingPixmap()
+ self["portpic"] = Pixmap()
self.port = None
self.mode = None
+ self.rate = None
- config.misc.showtestcard = ConfigBoolean(default = False)
def createSummary(self):
print "++++++++++++***++**** VideoWizard-createSummary"
from Screens.Wizard import WizardSummary
- return WizardSummary
+ 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
def inputSelectionMade(self, index):
@@ -62,19 +97,24 @@ class VideoWizard(Wizard):
def inputSelectionMoved(self):
print "input selection moved:", self.selection
self.inputSelect(self.selection)
+ if self["portpic"].instance is not None:
+ self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + self.selection + ".png"))
def inputSelect(self, port):
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
def modeSelectionMade(self, index):
@@ -100,11 +140,17 @@ class VideoWizard(Wizard):
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
def rateSelectionMade(self, index):
print "rateSelectionMade:", index
+ self.rate = index
self.rateSelect(index)
def rateSelectionMoved(self):
@@ -121,4 +167,17 @@ class VideoWizard(Wizard):
if selection == "yes":
config.misc.showtestcard.value = True
else:
- config.misc.showtestcard.value = False
\ No newline at end of file
+ config.misc.showtestcard.value = False
+
+ def keyNumberGlobal(self, number):
+ if number in (1,2,3):
+ if number == 1:
+ self.hw.saveMode("DVI", "720p", "multi")
+ elif number == 2:
+ self.hw.saveMode("DVI", "1080i", "multi")
+ elif number == 3:
+ self.hw.saveMode("Scart", "Multi", "multi")
+ self.hw.setConfiguredMode()
+ self.close()
+
+ WizardLanguage.keyNumberGlobal(self, number)