Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

3 files changed, 17 insertions, 10 deletions

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 6489f28f..5628926f 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -283,6 +283,7 @@ class NimSetup(Screen, ConfigListScreen):
 				self.list.append(getConfigListEntry(_("Threshold"), currLnb.threshold))
 #			self.list.append(getConfigListEntry(_("12V Output"), currLnb.output_12v))
 			self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
+			self.list.append(getConfigListEntry(_("Priority"), currLnb.prio))
 
 	def fillAdvancedList(self):
 		self.list = [ ]
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 608dcb2d..464c701a 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -487,9 +487,9 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 				ttype = frontendData.get("tuner_type", "UNKNOWN")
 				if ttype == "DVB-S":
 					defaultSat["system"] = {"DVB-S": "dvb-s", "DVB-S2": "dvb-s2"}[frontendData.get("system", "DVB-S")]
-					defaultSat["frequency"] = int(frontendData.get("frequency", 0) / 1000)
+					defaultSat["frequency"] = frontendData.get("frequency", 0) / 1000
 					defaultSat["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData.get("inversion", "INVERSION_AUTO")]
-					defaultSat["symbolrate"] = int(frontendData.get("symbol_rate", 0) / 1000)
+					defaultSat["symbolrate"] = frontendData.get("symbol_rate", 0) / 1000
 					defaultSat["polarization"] = {"HORIZONTAL": "horizontal", "VERTICAL": "vertical", "CIRCULAR_LEFT": "circular_left", "CIRCULAR_RIGHT": "circular_right", "UNKNOWN": None}[frontendData.get("polarization", "HORIZONTAL")]
 
 					if frontendData.get("system", "DVB-S") == "DVB-S2":
@@ -504,8 +504,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 					defaultSat["modulation"] = {"QPSK": "qpsk", "8PSK": "8psk"}[frontendData.get("modulation", "QPSK")]
 					defaultSat["orbpos"] = frontendData.get("orbital_position", 0)
 				elif ttype == "DVB-C":
-					defaultCab["frequency"] = int(frontendData.get("frequency", 0) / 1000)
-					defaultCab["symbolrate"] = int(frontendData.get("symbol_rate", 0) / 1000)
+					defaultCab["frequency"] = frontendData.get("frequency", 0) / 1000
+					defaultCab["symbolrate"] = frontendData.get("symbol_rate", 0) / 1000
 					defaultCab["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData.get("inversion", "INVERSION_AUTO")]
 					defaultCab["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData.get("fec_inner", "FEC_AUTO")]
 					defaultCab["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData.get("modulation", "QAM_16")]
@@ -577,7 +577,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 			self.scan_satselection = []
 			for slot in nimmanager.nim_slots:
 				if slot.isCompatible("DVB-S"):
-					self.scan_satselection.append(getConfigSatlist(int(defaultSat["orbpos"]), self.satList[slot.slot]))
+					self.scan_satselection.append(getConfigSatlist(defaultSat["orbpos"], self.satList[slot.slot]))
 				else:
 					self.scan_satselection.append(None)
 
@@ -621,9 +621,9 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		parm.polarisation = polarisation
 		parm.fec = self.fecmap[fec]
 		parm.inversion = inversion
-		parm.orbital_position = int(orbital_position)
-		parm.rolloff = int(rolloff)
-		parm.pilot = int(pilot)
+		parm.orbital_position = orbital_position
+		parm.rolloff = rolloff
+		parm.pilot = pilot
 		tlist.append(parm)
 
 	def addCabTransponder(self, tlist, frequency, symbol_rate, modulation, fec, inversion):
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 23d6253a..feba8ac2 100644..100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -3,7 +3,8 @@ from Screen import Screen
 import string
 
 from Screens.HelpMenu import HelpableScreen
-from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_BACKSPACE
+from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_HOME, KEY_END, KEY_0, KEY_DELETE, KEY_BACKSPACE, KEY_OK, KEY_TOGGLEOW, KEY_ASCII, KEY_TIMEOUT, KEY_NUMBERS
+
 from Components.Label import Label
 from Components.Slider import Slider
 from Components.ActionMap import NumberActionMap
@@ -215,8 +216,9 @@ class Wizard(Screen):
 		
 		self.disableKeys = False
 		
-		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions"],
+		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions", "InputAsciiActions"],
 		{
+			"gotAsciiCode": self.keyGotAscii,
 			"ok": self.ok,
 			"back": self.back,
 			"left": self.left,
@@ -368,6 +370,10 @@ class Wizard(Screen):
 	def keyNumberGlobal(self, number):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self.configInstance.keyNumberGlobal(number)
+
+	def keyGotAscii(self):
+		if (self.wizard[self.currStep]["config"]["screen"] != None):
+			self["config"].handleKey(KEY_ASCII)
 		
 	def left(self):
 		self.resetCounter()