The mess of things to get this to work for Fremantle
[quicknote] / src / quicknote_gtk.py
index c89f704..4b71552 100644 (file)
@@ -25,10 +25,8 @@ import gtk
 
 try:
        import hildon
-       IS_HILDON = True
 except ImportError:
        import fakehildon as hildon
-       IS_HILDON = False
 
 try:
        import osso
@@ -36,6 +34,8 @@ except ImportError:
        osso = None
 
 import constants
+import hildonize
+import gtk_toolbox
 
 import speichern
 import kopfzeile
@@ -49,124 +49,97 @@ except NameError:
        _ = lambda x: x
 
 
-_moduleLogger = logging.getLogger("quick")
+_moduleLogger = logging.getLogger("quicknote_gtk")
 
 
-class QuicknoteProgram(hildon.Program):
+class QuicknoteProgram(hildonize.get_app_class()):
 
        _user_data = os.path.join(os.path.expanduser("~"), ".%s" % constants.__app_name__)
        _user_settings = "%s/settings.ini" % _user_data
 
        def __init__(self):
                super(QuicknoteProgram, self).__init__()
-               if IS_HILDON:
-                       gtk.set_application_name(constants.__pretty_app_name__)
 
                dblog = os.path.join(self._user_data, "quicknote.log")
 
                _moduleLogger.info('Starting quicknote')
+               self._wordWrapEnabled = False
 
-               if osso is not None:
-                       self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
-                       self._deviceState = osso.DeviceState(self._osso_c)
-                       self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
-               else:
-                       self._osso_c = None
-                       self._deviceState = None
-
-               #Get the Main Window, and connect the "destroy" event
-               self._window = hildon.Window()
-               self.add_window(self._window)
-
-               if not IS_HILDON:
-                       self._window.set_title(constants.__pretty_app_name__)
-               self._window.connect("delete_event", self._on_delete_event)
-               self._window.connect("destroy", self._on_destroy)
-               self._window.connect("key-press-event", self._on_key_press)
-               self._window.connect("window-state-event", self._on_window_state_change)
                self._window_in_fullscreen = False #The window isn't in full screen mode initially.
                self._isZoomEnabled = False
 
                self._db = speichern.Speichern()
                self._syncDialog = None
-               self._prepare_sync_dialog()
 
                #Create GUI main vbox
                vbox = gtk.VBox(homogeneous = False, spacing = 0)
 
-               #Create Menu and apply it for hildon
-               filemenu = gtk.Menu()
+               if hildonize.GTK_MENU_USED:
+                       #Create Menu and apply it for hildon
+                       filemenu = gtk.Menu()
 
-               menu_items = gtk.MenuItem(_("Set DB file"))
-               filemenu.append(menu_items)
-               menu_items.connect("activate", self.set_db_file, None)
+                       menu_items = gtk.MenuItem(_("Set DB file"))
+                       filemenu.append(menu_items)
+                       menu_items.connect("activate", self.set_db_file, None)
 
-               menu_items = gtk.MenuItem(_("SQL History"))
-               filemenu.append(menu_items)
-               menu_items.connect("activate", self._on_view_sql_history, None)
+                       menu_items = gtk.MenuItem(_("SQL History"))
+                       filemenu.append(menu_items)
+                       menu_items.connect("activate", self._on_view_sql_history, None)
 
-               menu_items = gtk.MenuItem(_("Sync notes"))
-               filemenu.append(menu_items)
-               menu_items.connect("activate", self._on_sync_notes, None)
+                       menu_items = gtk.MenuItem(_("Sync notes"))
+                       filemenu.append(menu_items)
+                       menu_items.connect("activate", self._on_sync_notes, None)
 
-               menu_items = gtk.MenuItem(_("Quit"))
-               filemenu.append(menu_items)
-               menu_items.connect("activate", self._on_destroy, None)
+                       menu_items = gtk.MenuItem(_("Quit"))
+                       filemenu.append(menu_items)
+                       menu_items.connect("activate", self._on_destroy, None)
 
-               file_menu = gtk.MenuItem(_("File"))
-               file_menu.show()
-               file_menu.set_submenu(filemenu)
+                       file_menu = gtk.MenuItem(_("File"))
+                       file_menu.show()
+                       file_menu.set_submenu(filemenu)
 
-               categorymenu = gtk.Menu()
+                       categorymenu = gtk.Menu()
 
-               menu_items = gtk.MenuItem(_("Delete"))
-               categorymenu.append(menu_items)
-               menu_items.connect("activate", self._on_delete_category, None)
+                       menu_items = gtk.MenuItem(_("Delete"))
+                       categorymenu.append(menu_items)
+                       menu_items.connect("activate", self._on_delete_category, None)
 
-               menu_items = gtk.MenuItem(_("Move To Category"))
-               categorymenu.append(menu_items)
-               menu_items.connect("activate", self._on_move_category, None)
+                       menu_items = gtk.MenuItem(_("Move To Category"))
+                       categorymenu.append(menu_items)
+                       menu_items.connect("activate", self._on_move_category, None)
 
-               category_menu = gtk.MenuItem(_("Category"))
-               category_menu.show()
-               category_menu.set_submenu(categorymenu)
+                       category_menu = gtk.MenuItem(_("Category"))
+                       category_menu.show()
+                       category_menu.set_submenu(categorymenu)
 
-               viewmenu = gtk.Menu()
+                       viewmenu = gtk.Menu()
 
-               menu_items = gtk.MenuItem(_("Word Wrap"))
-               viewmenu.append(menu_items)
-               menu_items.connect("activate", self._on_toggle_word_wrap, None)
-               self._wordWrapEnabled = False
+                       menu_items = gtk.MenuItem(_("Word Wrap"))
+                       viewmenu.append(menu_items)
+                       menu_items.connect("activate", self._on_toggle_word_wrap, None)
 
-               view_menu = gtk.MenuItem(_("View"))
-               view_menu.show()
-               view_menu.set_submenu(viewmenu)
-
-               helpmenu = gtk.Menu()
-
-               menu_items = gtk.MenuItem(_("About"))
-               helpmenu.append(menu_items)
-               menu_items.connect("activate", self._on_show_about, None)
-
-               help_menu = gtk.MenuItem(_("Help"))
-               help_menu.show()
-               help_menu.set_submenu(helpmenu)
-
-               menu_bar = gtk.MenuBar()
-               menu_bar.show()
-               menu_bar.append (file_menu)
-               menu_bar.append (category_menu)
-               menu_bar.append (view_menu)
-               menu_bar.append (help_menu)
-
-               menu_bar.show()
-               if IS_HILDON:
-                       menu = gtk.Menu()
-                       for child in menu_bar.get_children():
-                               child.reparent(menu)
-                       self._window.set_menu(menu)
-                       menu_bar.destroy()
-               else:
+                       view_menu = gtk.MenuItem(_("View"))
+                       view_menu.show()
+                       view_menu.set_submenu(viewmenu)
+
+                       helpmenu = gtk.Menu()
+
+                       menu_items = gtk.MenuItem(_("About"))
+                       helpmenu.append(menu_items)
+                       menu_items.connect("activate", self._on_show_about, None)
+
+                       help_menu = gtk.MenuItem(_("Help"))
+                       help_menu.show()
+                       help_menu.set_submenu(helpmenu)
+
+                       menu_bar = gtk.MenuBar()
+                       menu_bar.show()
+                       menu_bar.append (file_menu)
+                       menu_bar.append (category_menu)
+                       menu_bar.append (view_menu)
+                       menu_bar.append (help_menu)
+
+                       menu_bar.show()
                        vbox.pack_start(menu_bar, False, False, 0)
 
                #Create GUI elements
@@ -175,15 +148,48 @@ class QuicknoteProgram(hildon.Program):
 
                self._notizen = notizen.Notizen(self._db, self._topBox)
                vbox.pack_start(self._notizen, True, True, 0)
+
+               #Get the Main Window, and connect the "destroy" event
+               self._window = gtk.Window()
                self._window.add(vbox)
 
                self._on_toggle_word_wrap()
+               self.enable_zoom(True)
 
                try:
                        os.makedirs(self._user_data)
                except OSError, e:
                        if e.errno != 17:
                                raise
+
+               self._window = hildonize.hildonize_window(self, self._window)
+               hildonize.set_application_title(self._window, "%s" % constants.__pretty_app_name__)
+               if hildonize.GTK_MENU_USED:
+                       menu_bar = hildonize.hildonize_menu(
+                               self._window,
+                               menu_bar,
+                               []
+                       )
+
+               if not hildonize.IS_HILDON_SUPPORTED:
+                       _moduleLogger.info("No hildonization support")
+
+               if osso is not None:
+                       self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
+                       self._deviceState = osso.DeviceState(self._osso_c)
+                       self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
+               else:
+                       _moduleLogger.info("No osso support")
+                       self._osso_c = None
+                       self._deviceState = None
+
+               self._prepare_sync_dialog()
+
+               self._window.connect("delete-event", self._on_delete_event)
+               self._window.connect("destroy", self._on_destroy)
+               self._window.connect("key-press-event", self._on_key_press)
+               self._window.connect("window-state-event", self._on_window_state_change)
+
                self._window.show_all()
                self._load_settings()
 
@@ -265,6 +271,7 @@ class QuicknoteProgram(hildon.Program):
                        self._topBox.show()
                        self._notizen.show_history_area(True)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData):
                """
                For system_inactivity, we have no background tasks to pause
@@ -277,26 +284,40 @@ class QuicknoteProgram(hildon.Program):
                if save_unsaved_data or shutdown:
                        self._save_settings()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_window_state_change(self, widget, event, *args):
                if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
                        self._window_in_fullscreen = True
                else:
                        self._window_in_fullscreen = False
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_key_press(self, widget, event, *args):
-               if event.keyval == gtk.keysyms.F6:
+               RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter)
+               isCtrl = bool(event.get_state() & gtk.gdk.CONTROL_MASK)
+               if (
+                       event.keyval == gtk.keysyms.F6 or
+                       event.keyval in RETURN_TYPES and isCtrl
+               ):
                        # The "Full screen" hardware key has been pressed 
                        if self._window_in_fullscreen:
                                self._window.unfullscreen ()
                        else:
                                self._window.fullscreen ()
-               elif event.keyval == gtk.keysyms.F7:
+               elif (
+                       event.keyval == gtk.keysyms.F7 or
+                       event.keyval == gtk.keysyms.i and isCtrl
+               ):
                        # Zoom In
                        self.enable_zoom(True)
-               elif event.keyval == gtk.keysyms.F8:
+               elif (
+                       event.keyval == gtk.keysyms.F8 or
+                       event.keyval == gtk.keysyms.o and isCtrl
+               ):
                        # Zoom Out
                        self.enable_zoom(False)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_view_sql_history(self, widget = None, data = None, data2 = None):
                import sqldialog
                sqldiag = sqldialog.SqlDialog(self._db)
@@ -315,6 +336,7 @@ class QuicknoteProgram(hildon.Program):
 
                sqldiag.destroy()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_move_category(self, widget = None, data = None):
                dialog = gtk.Dialog(_("Choose category"), self._window, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
@@ -353,6 +375,7 @@ class QuicknoteProgram(hildon.Program):
 
                dialog.destroy()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_delete_category(self, widget = None, data = None):
                if self._topBox.get_category() == "%" or self._topBox.get_category() == "undefined":
                        mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted"))
@@ -376,21 +399,26 @@ class QuicknoteProgram(hildon.Program):
                                self._topBox.categoryCombo.remove_text(pos)
                                self._topBox.categoryCombo.set_active(0)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_sync_finished(self, data = None, data2 = None):
                self._topBox.load_categories()
                self._notizen.load_notes()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_sync_notes(self, widget = None, data = None):
                self._syncDialog.run()
                self._syncDialog.hide()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_toggle_word_wrap(self, *args):
                self._wordWrapEnabled = not self._wordWrapEnabled
                self._notizen.set_wordwrap(self._wordWrapEnabled)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_delete_event(self, widget, event, data = None):
                return False
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_destroy(self, widget = None, data = None):
                try:
                        self._save_settings()
@@ -400,6 +428,7 @@ class QuicknoteProgram(hildon.Program):
                finally:
                        gtk.main_quit()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_show_about(self, widget = None, data = None):
                dialog = gtk.AboutDialog()
                dialog.set_position(gtk.WIN_POS_CENTER)