X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FVideomode%2FVideoWizard.py;h=bceb6bc7e42dd2d4259a3736bf96428bc7a71153;hp=4043f60287c610d8d26124a17abed73071b9a5a0;hb=96ac5ba0afb7fb1ea96aee24fc497e76dc2c652b;hpb=2e3af63fd26317787d16f2fd7401bba1e36db574

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 4043f60..bceb6bc 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 = """
 	<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 +31,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 +43,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 +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
@@ -79,11 +76,15 @@ class VideoWizard(WizardLanguage):
 		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
@@ -169,11 +170,11 @@ 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-TV", "720p", "multi")
+				self.hw.saveMode("DVI", "720p", "multi")
 			elif number == 2:
-				self.hw.saveMode("DVI-TV", "1080i", "multi")
+				self.hw.saveMode("DVI", "1080i", "multi")
 			elif number == 3:
 				self.hw.saveMode("Scart", "Multi", "multi")
 			self.hw.setConfiguredMode()