add ability to remove list and config from a wizard

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 8748438af344d7a10b821ef8a9c36b6137f298e6..6c5608b5c15cc4b35c9787d90201e7f626e12bc4 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -34,20 +34,22 @@ 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)
                                if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
                                        self.createPositionerSetup(self.nim, self.list)
-                       elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
+                       elif config.Nims[self.nim.slotid].configMode.value == 1: # nothing
                                #self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
                                pass
-                       elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
-                               print "FIXME: implement advanced mode"
+                       elif config.Nims[self.nim.slotid].configMode.value == 2: # linked
+                               pass
                
                elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]):
                        self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable))
@@ -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):
@@ -142,4 +147,4 @@ class NimSelection(Screen):
                selection = self["nimlist"].getCurrent()
                if selection[1].nimType != -1:  #unknown/empty
                        self.session.open(NimSetup, selection[1].slotid)
-       
\ No newline at end of file
+