use different messagebox actions and restore old OKCancelActions

diff --git a/data/keymap.xml b/data/keymap.xml
index 1275e2a5ad41cae2f6fe9bbf6670f03c276de30a..ee935387a626af384133d16dc062f88f3a268a5c 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -157,9 +157,7 @@
                <key id="\x1b" mapto="cancel" flags="m" />
 
                <!-- use this on rcu, ok? -->
                <key id="\x1b" mapto="cancel" flags="m" />
 
                <!-- use this on rcu, ok? -->

-               <key id="KEY_GREEN" mapto="ok" flags="m" />

                <key id="KEY_OK" mapto="ok" flags="m" />                
                <key id="KEY_OK" mapto="ok" flags="m" />                

-               <key id="KEY_RED" mapto="cancel" flags="m" />

                <key id="KEY_EXIT" mapto="cancel" flags="m" />
 
 
                <key id="KEY_EXIT" mapto="cancel" flags="m" />
 
 


@@ -167,6 +165,13 @@
                <key id="KEY_ESC" mapto="cancel" flags="m" />
        </map>
 
                <key id="KEY_ESC" mapto="cancel" flags="m" />
        </map>
 

+       <map context="MsgBoxActions">
+               <key id="KEY_GREEN" mapto="ok" flags="m" />
+               <key id="KEY_OK" mapto="ok" flags="m" />                
+               <key id="KEY_RED" mapto="cancel" flags="m" />
+               <key id="KEY_EXIT" mapto="cancel" flags="m" />
+       </map>
+

        <map context="WindowActions">
                
        </map>
        <map context="WindowActions">
                
        </map>

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index 872996571c4e68d3a88778efff2530247139d59f..87da7f9c33ea1d72de9f9d632362002d24437f55 100644 (file)
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -13,7 +13,7 @@ class MessageBox(Screen):
                self["key_green"] = Button("OK")
                self["key_red"] = Button("Exit")
 
                self["key_green"] = Button("OK")
                self["key_red"] = Button("Exit")
 

-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["MsgBoxActions"], 

                        {
                                "cancel": self.cancel,
                                "ok": self.ok
                        {
                                "cancel": self.cancel,
                                "ok": self.ok