Fixing a bug with launching from a fresh system
[quicknote] / src / quicknote_gtk.py
old mode 100644 (file)
new mode 100755 (executable)
index ec9ea5c..ae30067
@@ -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)
@@ -105,10 +103,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        categorymenu.append(menu_items)
                        menu_items.connect("activate", self._on_toggle_search)
 
-                       menu_items = gtk.MenuItem(_("Move To Category"))
-                       categorymenu.append(menu_items)
-                       menu_items.connect("activate", self._on_move_category)
-
                        menu_items = gtk.MenuItem(_("Delete"))
                        categorymenu.append(menu_items)
                        menu_items.connect("activate", self._on_delete_category)
@@ -119,14 +113,18 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
                        viewmenu = gtk.Menu()
 
-                       menu_items = gtk.MenuItem(_("Word Wrap"))
+                       menu_items = gtk.MenuItem(_("Move To Category"))
                        viewmenu.append(menu_items)
-                       menu_items.connect("activate", self._on_toggle_word_wrap)
+                       menu_items.connect("activate", self._on_move_category)
 
                        menu_items = gtk.MenuItem(_("History"))
                        viewmenu.append(menu_items)
                        menu_items.connect("activate", self._on_show_history)
 
+                       menu_items = gtk.MenuItem(_("Word Wrap"))
+                       viewmenu.append(menu_items)
+                       menu_items.connect("activate", self._on_toggle_word_wrap)
+
                        view_menu = gtk.MenuItem(_("Note"))
                        view_menu.show()
                        view_menu.set_submenu(viewmenu)
@@ -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()
 
@@ -368,47 +354,40 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_move_category(self, *args):
-               comboCategory = gtk.combo_box_new_text()
-               comboCategory.append_text('undefined')
+               if self._notizen.noteId == -1:
+                       mbox = gtk.MessageDialog(self._window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No note selected."))
+                       try:
+                               response = mbox.run()
+                       finally:
+                               mbox.hide()
+                               mbox.destroy()
+                       return
+
                sql = "SELECT id, liste FROM categories WHERE id = 0 ORDER BY liste"
                rows = self._db.ladeSQL(sql)
-               for row in rows:
-                       comboCategory.append_text(row[1])
-
-               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))
-               try:
-                       dialog.set_position(gtk.WIN_POS_CENTER)
 
-                       dialog.vbox.pack_start(comboCategory, True, True, 0)
-                       dialog.vbox.show_all()
+               selectableCategories = list(self._category.get_categories())
+               selectableCategories.remove(self._category.ALL_CATEGORIES)
+               currentCategory = self._category.get_category_name()
+               if currentCategory == self._category.ALL_CATEGORIES:
+                       currentCategory = selectableCategories[0]
 
-                       userResponse = dialog.run()
-               finally:
-                       dialog.destroy()
-
-               if userResponse != gtk.RESPONSE_ACCEPT:
-                       return
+               newCategory = hildonize.touch_selector_entry(
+                       self._window, "Move to", selectableCategories, currentCategory
+               )
 
-               n = comboCategory.get_active()
-               if -1 < n and self._notizen.noteId != -1:
-                       model = comboCategory.get_model()
-                       active = comboCategory.get_active()
-                       if active < 0:
-                               return None
-                       cat_id = model[active][0]
-
-                       noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId)
-                       self._db.saveNote(noteid, note, cat_id, pcdatum = None)
-                       self._category.set_category() # force it to update
-               else:
-                       mbox = gtk.MessageDialog(self._window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No note selected."))
-                       response = mbox.run()
-                       mbox.hide()
-                       mbox.destroy()
+               self._category.add_category(newCategory)
+               noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId)
+               self._db.saveNote(noteid, note, newCategory, pcdatum = None)
+               self._category.set_category() # HACK force it to update
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_delete_category(self, *args):
-               if self._category.get_category() == "%" or self._category.get_category() == "undefined":
+               if (
+                       self._category.get_category_name() in (
+                               self._category.ALL_CATEGORIES, self._category.UNDEFINED_CATEGORY
+                       )
+               ):
                        mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted"))
                        try:
                                response = mbox.run()
@@ -433,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):
@@ -469,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)"])
@@ -481,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__":