fix commit fb764c8e53e17bc3e1e806e946956f3e70792020 (fixes PiP)

diff --git a/lib/python/Screens/InputBox.py b/lib/python/Screens/InputBox.py
index 1379768..7dd7b12 100644 (file)
--- a/lib/python/Screens/InputBox.py
+++ b/lib/python/Screens/InputBox.py
@@ -43,9 +43,9 @@ class InputBox(Screen):
                }, -1)
 
                if self["input"].type == Input.TEXT:
                }, -1)
 
                if self["input"].type == Input.TEXT:

-                       self.onShow.append(self.setKeyboardModeAscii)
+                       self.onExecBegin.append(self.setKeyboardModeAscii)

                else:
                else:

-                       self.onShow.append(self.setKeyboardModeNone)
+                       self.onExecBegin.append(self.setKeyboardModeNone)

 
        def gotAsciiCode(self):
                self["input"].handleAscii(getPrevAsciiCode())
 
        def gotAsciiCode(self):
                self["input"].handleAscii(getPrevAsciiCode())

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 3210186..4a0accd 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -48,9 +48,6 @@ class Screen(dict, GUISkin):
                # stand alone screens (for example web screens)
                # don't care about having or not having focus.
                self.stand_alone = False
                # stand alone screens (for example web screens)
                # don't care about having or not having focus.
                self.stand_alone = False

-
-               self.onShow.append(self.saveKeyboardMode)
-               self.onHide.append(self.restoreKeyboardMode)

                self.keyboardMode = None
 
        def saveKeyboardMode(self):
                self.keyboardMode = None
 
        def saveKeyboardMode(self):

diff --git a/mytest.py b/mytest.py
index 7a8d7b7..99695e0 100755 (executable)
--- a/mytest.py
+++ b/mytest.py
@@ -214,6 +214,7 @@ class Session:
                        self.summary.show()
                        c.addSummary(self.summary)
 
                        self.summary.show()
                        c.addSummary(self.summary)
 

+               c.saveKeyboardMode()

                c.execBegin()
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                c.execBegin()
 
                # when execBegin opened a new dialog, don't bother showing the old one.


@@ -225,6 +226,7 @@ class Session:
                self.in_exec = False
 
                self.current_dialog.execEnd()
                self.in_exec = False
 
                self.current_dialog.execEnd()

+               self.current_dialog.restoreKeyboardMode()

                self.current_dialog.hide()
 
                if last:
                self.current_dialog.hide()
 
                if last: