From 3eaff4bc18c6c39433f2e24b637d37fc2677a896 Mon Sep 17 00:00:00 2001 From: epage Date: Tue, 27 Oct 2009 00:04:27 +0000 Subject: [PATCH] Cleanup and instrumenting for profiling git-svn-id: file:///svnroot/ejpi/trunk@59 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d --- src/ejpi.py | 2 +- src/ejpi_glade.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ejpi.py b/src/ejpi.py index 83b3f47..56d53ce 100755 --- a/src/ejpi.py +++ b/src/ejpi.py @@ -3,7 +3,7 @@ import sys -sys.path.insert(0,"/usr/lib/ejpi/") +sys.path.append("/usr/lib/ejpi/") import ejpi_glade diff --git a/src/ejpi_glade.py b/src/ejpi_glade.py index df40327..2d78d29 100755 --- a/src/ejpi_glade.py +++ b/src/ejpi_glade.py @@ -49,6 +49,8 @@ PLUGIN_SEARCH_PATHS = [ os.path.join(os.path.dirname(__file__), "plugins/"), ] +PROFILE_STARTUP = False + class ValueEntry(object): @@ -185,6 +187,7 @@ class Calculator(object): ) self.__load_history() + # Basic keyboard stuff self.__sliceStyle = gtkpie.generate_pie_style(gtk.Button()) self.__handler = gtkpieboard.KeyboardHandler(self._on_entry_direct) self.__handler.register_command_handler("push", self._on_push) @@ -192,6 +195,7 @@ class Calculator(object): self.__handler.register_command_handler("backspace", self._on_entry_backspace) self.__handler.register_command_handler("clear", self._on_entry_clear) + # Main keyboard builtinKeyboardId = self.__keyboardPlugins.lookup_plugin("Builtin") self.__keyboardPlugins.enable_plugin(builtinKeyboardId) self.__builtinPlugin = self.__keyboardPlugins.keyboards["Builtin"].construct_keyboard() @@ -200,10 +204,13 @@ class Calculator(object): for child in self.__builtinKeyboard.get_children(): child.set_size_request(self.MIN_BUTTON_SIZE, self.MIN_BUTTON_SIZE) + # Plugins self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Trigonometry")) self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Computer")) self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Alphabet")) + self._set_plugin_kb(0) + # Callbacks callbackMapping = { "on_calculator_quit": self._on_close, "on_paste": self._on_paste, @@ -218,8 +225,6 @@ class Calculator(object): self._widgetTree.get_widget("entryView").connect("activate", self._on_push) self.__pluginButton.connect("clicked", self._on_kb_plugin_selection_button) - self._set_plugin_kb(0) - hildonize.set_application_title(self._window, "%s" % constants.__pretty_app_name__) self._window.connect("destroy", self._on_close) self._window.show_all() @@ -458,7 +463,8 @@ def run_calculator(): gtkpie.IMAGES.add_path(os.path.join(os.path.dirname(__file__), "libraries/images"), ) handle = Calculator() - gtk.main() + if not PROFILE_STARTUP: + gtk.main() class DummyOptions(object): -- 1.7.9.5