don't use the configElement description for element recognition

[enigma2.git] / lib / python / Screens / Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index e6033ebc15885a1b4f154bc9470205ff090b3c24..969d4d0c9b0028d7ea87306c9e9cdcc7d3fb0575 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -34,10 +34,12 @@ class NimSetup(Screen):
                self.list = [ ]
                
                if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):
-                       self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+                       self.configMode = getConfigListEntry(_("Configuration Mode"), config.Nims[self.nim.slotid].configMode)
+                       self.list.append(self.configMode)
                        
                        if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
-                               self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
+                               self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), config.Nims[self.nim.slotid].diseqcMode)
+                               self.list.append(self.diseqcModeEntry)
                        
                                if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
                                        self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)
@@ -59,13 +61,13 @@ class NimSetup(Screen):
                self["config"].l.setList(self.list)
                
        def newConfig(self):    
-               if self["config"].getCurrent()[0] == _("Diseqcmode"):
+               if self["config"].getCurrent() == self.diseqcModeEntry:
                        self.createSetup()
-               if self["config"].getCurrent()[0] == _("Configmode"):
+               if self["config"].getCurrent() == self.configMode:
                        self.createSetup()
                
        def keyLeft(self):
-               if self["config"].getCurrent()[0] == _("Configmode"):
+               if self["config"].getCurrent() == self.configMode:
                        if self.nim.slotid == 0:
                                return
                self["config"].handleKey(config.key["prevElement"])
@@ -75,7 +77,7 @@ class NimSetup(Screen):
                #forbid to enable advanced mode until its ready
                #perhaps its better to use an own element here
                #this suckz .. how enable advanced config?
-               if self["config"].getCurrent()[0] == _("Configmode"):
+               if self["config"].getCurrent() == self.configMode:
                        if self.nim.slotid == 0:
                                return
 
@@ -87,10 +89,13 @@ class NimSetup(Screen):
                if (self["config"].getCurrent()[1].parent.enabled == True):
                        self["config"].handleKey(config.key[str(number)])
 
-       def keySave(self):
+       def run(self):
                for x in self["config"].list:
                        x[1].save()
                nimmanager.sec.update() 
+
+       def keySave(self):
+               self.run()
                self.close()
 
        def keyCancel(self):
@@ -98,13 +103,10 @@ class NimSetup(Screen):
                        x[1].cancel()
                self.close()
 
-       def __init__(self, session, nim = None):
+       def __init__(self, session, slotid):
                Screen.__init__(self, session)
                
-               if nim == None:
-                       self.nim = nimmanager.nimList()[0][1]
-               else:
-                       self.nim = nim
+               self.nim = nimmanager.nimList()[slotid][1]
                
                self["actions"] = NumberActionMap(["SetupActions"],
                {
@@ -144,5 +146,5 @@ class NimSelection(Screen):
        def okbuttonClick(self):
                selection = self["nimlist"].getCurrent()
                if selection[1].nimType != -1:  #unknown/empty
-                       self.session.open(NimSetup, selection[1])
-       
\ No newline at end of file
+                       self.session.open(NimSetup, selection[1].slotid)
+