Fixed bug with Move To Category

[quicknote] / src / quicknote_gtk.py

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 4b71552..bd466bb 100644 (file)
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -59,6 +59,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
        def __init__(self):
                super(QuicknoteProgram, self).__init__()
+               self._clipboard = gtk.clipboard_get()
 
                dblog = os.path.join(self._user_data, "quicknote.log")
 
@@ -316,6 +317,11 @@ class QuicknoteProgram(hildonize.get_app_class()):
                ):
                        # Zoom Out
                        self.enable_zoom(False)
+               elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       with open(constants._user_logpath_, "r") as f:
+                               logLines = f.xreadlines()
+                               log = "".join(logLines)
+                               self._clipboard.set_text(str(log))
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_view_sql_history(self, widget = None, data = None, data2 = None):
@@ -338,42 +344,43 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
        @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))
-
-               dialog.set_position(gtk.WIN_POS_CENTER)
                comboCategory = gtk.combo_box_new_text()
-
                comboCategory.append_text('undefined')
                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.vbox.pack_start(comboCategory, True, True, 0)
+               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.show_all()
-               #dialog.set_size_request(400, 300)
+                       dialog.vbox.pack_start(comboCategory, True, True, 0)
+                       dialog.vbox.show_all()
 
-               if dialog.run() == gtk.RESPONSE_ACCEPT:
-                       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]
+                       userResponse = dialog.run()
+               finally:
+                       dialog.destroy()
 
-                               noteid, category, note = self._db.loadNote(self._notizen.noteId)
-                               #print noteid, category, cat_id
-                               self._db.saveNote(noteid, note, cat_id, pcdatum = None)
-                               self._topBox.category_combo_changed()
-                       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()
+               if userResponse != gtk.RESPONSE_ACCEPT:
+                       return
 
-               dialog.destroy()
+               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._topBox.category_combo_changed()
+               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()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_delete_category(self, widget = None, data = None):
@@ -421,10 +428,17 @@ class QuicknoteProgram(hildonize.get_app_class()):
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_destroy(self, widget = None, data = None):
                try:
-                       self._save_settings()
                        self._db.close()
-                       if self._osso_c:
+                       self._save_settings()
+
+                       try:
+                               self._deviceState.close()
+                       except AttributeError:
+                               pass # Either None or close was removed (in Fremantle)
+                       try:
                                self._osso_c.close()
+                       except AttributeError:
+                               pass # Either None or close was removed (in Fremantle)
                finally:
                        gtk.main_quit()
 
@@ -438,12 +452,18 @@ class QuicknoteProgram(hildonize.get_app_class()):
                dialog.set_website("http://axique.de/index.php?f=Quicknote")
                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 <edpage@byu.net> (Blame him for the most recent bugs)"])
+               dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
                dialog.run()
                dialog.destroy()
 
 
-if __name__ == "__main__":
-       logging.basicConfig(level=logging.DEBUG)
+def run_quicknote():
+       if hildonize.IS_HILDON_SUPPORTED:
+               gtk.set_application_name(constants.__pretty_app_name__)
        app = QuicknoteProgram()
        app.main()
+
+
+if __name__ == "__main__":
+       logging.basicConfig(level=logging.DEBUG)
+       run_quicknote()