finally fix priorities: ConfigListScreen's action must be -1 to override eListbox...

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

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 3bdfe163150ca1731ed3c2581ab2b10e8bc15c9e..9ffae8462e2b57048a653e5e8f2a7f0f3a49bfea 100644 (file)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -1,5 +1,5 @@
 from Screen import Screen
 from Screen import Screen

-from Components.ActionMap import NumberActionMap
+from Components.ActionMap import ActionMap

 from Components.ConfigList import ConfigList, ConfigListScreen
 from Components.config import config, getConfigListEntry
 from Components.Network import iNetwork
 from Components.ConfigList import ConfigList, ConfigListScreen
 from Components.config import config, getConfigListEntry
 from Components.Network import iNetwork


@@ -9,11 +9,11 @@ class NetworkSetup(Screen, ConfigListScreen):
        def __init__(self, session):
                Screen.__init__(self, session)
         
        def __init__(self, session):
                Screen.__init__(self, session)
         

-               self["actions"] = NumberActionMap(["SetupActions"],
+               self["actions"] = ActionMap(["SetupActions"],

                {
                {

-                       "ok": self.keySave,
-                       "cancel": self.keyCancel,
-               }, -1)
+                       "ok": self.ok,
+                       "cancel": self.cancel,
+               }, -2)

 
                self.list = []
                ConfigListScreen.__init__(self, self.list)
 
                self.list = []
                ConfigListScreen.__init__(self, self.list)


@@ -48,15 +48,14 @@ class NetworkSetup(Screen, ConfigListScreen):
                ConfigListScreen.keyRight(self)
                self.createSetup()
 
                ConfigListScreen.keyRight(self)
                self.createSetup()
 

-       def keySave(self):
+       def ok(self):

                #for x in self["config"].list:
                        #x[1].save()
                #for x in self["config"].list:
                        #x[1].save()

-

                iNetwork.writeNetworkConfig()    
                iNetwork.activateNetworkConfig()
                self.close()
 
                iNetwork.writeNetworkConfig()    
                iNetwork.activateNetworkConfig()
                self.close()
 

-       def keyCancel(self):
+       def cancel(self):

                for x in self["config"].list:
                        x[1].cancel()
                iNetwork.loadNetworkConfig()
                for x in self["config"].list:
                        x[1].cancel()
                iNetwork.loadNetworkConfig()