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 1002f2ea31d3df29634e4d1f56ee83e1abd447fb..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 = [ ]
                
                if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):

-                       self.list.append(getConfigListEntry(_("Configuration Mode"), 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
                        
                        if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup

-                               self.list.append(getConfigListEntry(_("DiSEqC Mode"), 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)
                        
                                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):    
                self["config"].l.setList(self.list)
                
        def newConfig(self):    

-               if self["config"].getCurrent()[0] == _("DiSEqC Mode"):
+               if self["config"].getCurrent() == self.diseqcModeEntry:

                        self.createSetup()
                        self.createSetup()

-               if self["config"].getCurrent()[0] == _("Configuration Mode"):
+               if self["config"].getCurrent() == self.configMode:

                        self.createSetup()
                
        def keyLeft(self):
                        self.createSetup()
                
        def keyLeft(self):

-               if self["config"].getCurrent()[0] == _("Configuration Mode"):
+               if self["config"].getCurrent() == self.configMode:

                        if self.nim.slotid == 0:
                                return
                self["config"].handleKey(config.key["prevElement"])
                        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?
                #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] == _("Configuration Mode"):
+               if self["config"].getCurrent() == self.configMode:

                        if self.nim.slotid == 0:
                                return
 
                        if self.nim.slotid == 0:
                                return