Swapping keyboards

[ejpi] / src / ejpi_glade.py

diff --git a/src/ejpi_glade.py b/src/ejpi_glade.py
index afbf7ef..afb2175 100755 (executable)
--- a/src/ejpi_glade.py
+++ b/src/ejpi_glade.py
@@ -99,7 +99,7 @@ class Calculator(object):
 
        __pretty_app_name__ = "e**(j pi) + 1 = 0"
        __app_name__ = "ejpi"
-       __version__ = "0.9.3"
+       __version__ = "0.9.4"
        __app_magic__ = 0xdeadbeef
 
        _glade_files = [
@@ -161,8 +161,9 @@ class Calculator(object):
                self._isFullScreen = False
                if hildon is not None:
                        self._app = hildon.Program()
+                       oldWindow = self._window
                        self.__window = hildon.Window()
-                       self._widgetTree.get_widget("mainLayout").reparent(self.__window)
+                       oldWindow.get_child().reparent(self.__window)
                        self._app.add_window(self.__window)
                        hildon.hildon_helper_set_thumb_scrollbar(self._widgetTree.get_widget('scrollingHistory'), True)
 
@@ -202,7 +203,6 @@ class Calculator(object):
                self.__builtinPlugin = self.__keyboardPlugins.keyboards["Builtin"].construct_keyboard()
                self.__builtinKeyboard = self.__builtinPlugin.setup(self.__history, self.__sliceStyle, self.__handler)
                self._widgetTree.get_widget("functionLayout").pack_start(self.__builtinKeyboard)
-               self._widgetTree.get_widget("functionLayout").reorder_child(self.__builtinKeyboard, 0)
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Trigonometry"))
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Computer"))
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Alphabet"))