Pulling in skeleton changes

[quicknote] / src / quicknote_gtk.py

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
old mode 100644 (file)
new mode 100755 (executable)
index 299d178..3b660fb
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -50,7 +50,8 @@ except NameError:
        _ = lambda x: x
 
 
-_moduleLogger = logging.getLogger("quicknote_gtk")
+_moduleLogger = logging.getLogger(__name__)
+PROFILE_STARTUP = False
 
 
 class QuicknoteProgram(hildonize.get_app_class()):
@@ -62,15 +63,12 @@ class QuicknoteProgram(hildonize.get_app_class()):
                super(QuicknoteProgram, self).__init__()
                self._clipboard = gtk.clipboard_get()
 
-               dblog = os.path.join(self._user_data, "quicknote.log")
-
                _moduleLogger.info('Starting quicknote')
                self._wordWrapEnabled = False
 
                self._window_in_fullscreen = False #The window isn't in full screen mode initially.
 
                self._db = speichern.Speichern()
-               self._syncDialog = None
 
                #Create GUI main vbox
                vbox = gtk.VBox(homogeneous = False, spacing = 0)
@@ -186,7 +184,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        moveToCategoryButton.connect("clicked", self._on_move_category)
                        menuBar.append(moveToCategoryButton)
 
-                       historyButton= gtk.Button(_("Note History"))
+                       historyButton = gtk.Button(_("Note History"))
                        historyButton.connect("clicked", self._on_show_history)
                        menuBar.append(historyButton)
 
@@ -212,8 +210,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        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)
@@ -244,12 +240,11 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        self._wordWrapEnabled = config.getboolean(constants.__pretty_app_name__, "wordwrap")
                        self._window_in_fullscreen = config.getboolean(constants.__pretty_app_name__, "fullscreen")
                except ConfigParser.NoSectionError, e:
-                       warnings.warn(
+                       _moduleLogger.info(
                                "Settings file %s is missing section %s" % (
                                        self._user_settings,
                                        e.section,
-                               ),
-                               stacklevel=2
+                               )
                        )
 
                self._notizen.set_wordwrap(self._wordWrapEnabled)
@@ -275,16 +270,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        self._notizen.load_notes()
                dlg.destroy()
 
-       def _prepare_sync_dialog(self):
-               self._syncDialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-
-               self._syncDialog.set_position(gtk.WIN_POS_CENTER)
-               syncer = sync.Sync(self._db, self._window, 50504)
-               self._syncDialog.vbox.pack_start(syncer, True, True, 0)
-               self._syncDialog.set_size_request(500, 350)
-               self._syncDialog.vbox.show_all()
-               syncer.connect("syncFinished", self._on_sync_finished)
-
        def _toggle_search(self):
                if self._search.get_property("visible"):
                        self._search.hide()
@@ -340,6 +325,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                                self._clipboard.set_text(str(log))
                        return True
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_toggle_search(self, *args):
                self._toggle_search()
 
@@ -426,8 +412,17 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_sync_notes(self, widget = None, data = None):
-               self._syncDialog.run()
-               self._syncDialog.hide()
+               syncer = sync.Sync(self._db, self._window, 50504)
+               syncer.connect("syncFinished", self._on_sync_finished)
+
+               syncDialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+
+               syncDialog.set_position(gtk.WIN_POS_CENTER)
+               syncDialog.vbox.pack_start(syncer, True, True, 0)
+               syncDialog.set_size_request(500, 350)
+               syncDialog.vbox.show_all()
+               syncDialog.run()
+               syncDialog.hide()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_toggle_word_wrap(self, *args):
@@ -462,7 +457,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                dialog.set_name(constants.__pretty_app_name__)
                dialog.set_version(constants.__version__)
                dialog.set_copyright("")
-               dialog.set_website("http://axique.de/index.php?f=Quicknote")
+               dialog.set_website("http://quicknote.garage.maemo.org")
                comments = _("%s is a note taking program; it is optimised for quick save and search of notes") % constants.__pretty_app_name__
                dialog.set_comments(comments)
                dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
@@ -474,7 +469,8 @@ def run_quicknote():
        if hildonize.IS_HILDON_SUPPORTED:
                gtk.set_application_name(constants.__pretty_app_name__)
        app = QuicknoteProgram()
-       gtk.main()
+       if not PROFILE_STARTUP:
+               gtk.main()
 
 
 if __name__ == "__main__":