X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..0ab1bf226b217ab6b446834bbc185a33a1d31425:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 783288ec..e968cfe1 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,4 @@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigDummy, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict
 
 from enigma import eDVBSatelliteEquipmentControl, \
 	eDVBSatelliteLNBParameters as lnbParam, \
@@ -212,14 +212,13 @@ class SecConfigure:
 					# Committed Diseqc Command
 					cdc = currLnb.commitedDiseqcCommand.value
 					
-					c = [
-						("none", diseqcParam.SENDNO),
-						("AA", diseqcParam.AA),
-						("AB", diseqcParam.AB),
-						("BA", diseqcParam.BA),
-						("BB", diseqcParam.BB)]
-						
-					if cdc in c:
+					c = { "none": diseqcParam.SENDNO,
+						"AA": diseqcParam.AA,
+						"AB": diseqcParam.AB,
+						"BA": diseqcParam.BA,
+						"BB": diseqcParam.BB }
+
+					if c.has_key(cdc):
 						sec.setCommittedCommand(c[cdc])
 					else:
 						sec.setCommittedCommand(long(cdc))
@@ -609,7 +608,7 @@ class NimManager:
 					lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
 					if lnbnum != 0:
 						lnb = nim.advanced.lnb[lnbnum]
-						if lnb.diseqcMode.value == "diseqc_a_b_c_d":
+						if lnb.diseqcMode.value == "1_2":
 							list.append(x)
 		return list
 
@@ -745,13 +744,13 @@ def InitNimManager(nimmgr):
 			csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
 			for y in range(0, 16):
 				csw.append((str(0xF0|y), "Input " + str(y+1)))
-
+			
 			ucsw = [("0", _("None"))]
 			for y in range(1, 17):
 				ucsw.append((str(y), "Input " + str(y)))
-
+			
 			nim.advanced.lnb = ConfigSubList()
-			nim.advanced.lnb.append(ConfigDummy())
+			nim.advanced.lnb.append(ConfigNothing())
 			for x in range(1, 33):
 				nim.advanced.lnb.append(ConfigSubsection())
 				nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")