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

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 3bdfe16..9ffae84 100644 (file)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -1,5 +1,5 @@
 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
@@ -9,11 +9,11 @@ class NetworkSetup(Screen, ConfigListScreen):
        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)
@@ -48,15 +48,14 @@ class NetworkSetup(Screen, ConfigListScreen):
                ConfigListScreen.keyRight(self)
                self.createSetup()
 
-       def keySave(self):
+       def ok(self):
                #for x in self["config"].list:
                        #x[1].save()
-
                iNetwork.writeNetworkConfig()    
                iNetwork.activateNetworkConfig()
                self.close()
 
-       def keyCancel(self):
+       def cancel(self):
                for x in self["config"].list:
                        x[1].cancel()
                iNetwork.loadNetworkConfig()

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 9e692e6..3930aaa 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -193,7 +193,7 @@ class NimSelection(Screen):
                {
                        "ok": self.okbuttonClick ,
                        "cancel": self.close
-               }, -1)
+               }, -2)
 
        def okbuttonClick(self):
                selection = self["nimlist"].getCurrent()

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 7aaca38..6237b50 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -135,7 +135,7 @@ class ScanSetup(ConfigListScreen, Screen):
                {
                        "ok": self.keyGo,
                        "cancel": self.keyCancel,
-               }, -1)
+               }, -2)
 
                self.statusTimer = eTimer()
                self.statusTimer.timeout.get().append(self.updateStatus)
@@ -565,7 +565,7 @@ class ScanSimple(ConfigListScreen, Screen):
                {
                        "ok": self.keyGo,
                        "cancel": self.keyCancel,
-               }, -1)
+               }, -2)
 
                self.list = []
                tlist = []

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index b36a6b4..09984bd 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -89,7 +89,7 @@ class Setup(ConfigListScreen, Screen):
                        {
                                "cancel": self.keyCancel,
                                "save": self.keySave,
-                       }, -1)
+                       }, -2)
 
                ConfigListScreen.__init__(self, list, session = session)
 

diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index c7a6664..d8e1f8a 100644 (file)
--- a/lib/python/Screens/TimeDateInput.py
+++ b/lib/python/Screens/TimeDateInput.py
@@ -24,7 +24,7 @@ class TimeDateInput(Screen, ConfigListScreen):
                        "ok": self.keySelect,
                        "save": self.keyGo,
                        "cancel": self.keyCancel,
-               }, -1)
+               }, -2)
 
                self.list = []
                ConfigListScreen.__init__(self, self.list)

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index fa75b5c..c548e15 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -33,7 +33,7 @@ class TimerEntry(Screen, ConfigListScreen):
                        "ok": self.keySelect,
                        "save": self.keyGo,
                        "cancel": self.keyCancel,
-               }, -1)
+               }, -2)
 
                self.list = []
                ConfigListScreen.__init__(self, self.list, session = session)