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 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()

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 9e692e63bb7bad1f0ce7bb20a4bbf842c7674789..3930aaa321bd9ecdf91f253b54b4694879f78c05 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
                {
                        "ok": self.okbuttonClick ,
                        "cancel": self.close

-               }, -1)
+               }, -2)

 
        def okbuttonClick(self):
                selection = self["nimlist"].getCurrent()
 
        def okbuttonClick(self):
                selection = self["nimlist"].getCurrent()

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 7aaca3829d349da21b4ac779c068c1f9c14790de..6237b50d2060eb853713aad3e4bf9428d9d5cb30 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,
                {
                        "ok": self.keyGo,
                        "cancel": self.keyCancel,

-               }, -1)
+               }, -2)

 
                self.statusTimer = eTimer()
                self.statusTimer.timeout.get().append(self.updateStatus)
 
                self.statusTimer = eTimer()
                self.statusTimer.timeout.get().append(self.updateStatus)


@@ -565,7 +565,7 @@ class ScanSimple(ConfigListScreen, Screen):
                {
                        "ok": self.keyGo,
                        "cancel": self.keyCancel,
                {
                        "ok": self.keyGo,
                        "cancel": self.keyCancel,

-               }, -1)
+               }, -2)

 
                self.list = []
                tlist = []
 
                self.list = []
                tlist = []

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index b36a6b4541480b4503c1f5e62a76d6bf590f262b..09984bd8e518e810db5c73a4f5b638745f570ddc 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,
                        {
                                "cancel": self.keyCancel,
                                "save": self.keySave,

-                       }, -1)
+                       }, -2)

 
                ConfigListScreen.__init__(self, list, session = session)
 
 
                ConfigListScreen.__init__(self, list, session = session)
 

diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index c7a66641fdd8d1c0cdc674e985b57078318236be..d8e1f8a16971009f75173108cb59c8b21d8297da 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,
                        "ok": self.keySelect,
                        "save": self.keyGo,
                        "cancel": self.keyCancel,

-               }, -1)
+               }, -2)

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

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index fa75b5c0963c6b7d8bf62e06aa87e2933d55eb11..c548e1532c04ead5c4cfa9c3b81753f0f73d7755 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,
                        "ok": self.keySelect,
                        "save": self.keyGo,
                        "cancel": self.keyCancel,

-               }, -1)
+               }, -2)

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