X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=bd466bb74daa51c4ffc71257878981213eab6d5b;hp=b03209e52aec9844ef3f03900505dc3d8472a96f;hb=c221af5010a40a6b10c50062d3df88c21d519492;hpb=f97d39a5ced73421ef7685836bbef0c1e0c6d9e3 diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index b03209e..bd466bb 100644 --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -35,6 +35,7 @@ except ImportError: import constants import hildonize +import gtk_toolbox import speichern import kopfzeile @@ -48,7 +49,7 @@ except NameError: _ = lambda x: x -_moduleLogger = logging.getLogger("quick") +_moduleLogger = logging.getLogger("quicknote_gtk") class QuicknoteProgram(hildonize.get_app_class()): @@ -58,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") @@ -152,12 +154,8 @@ class QuicknoteProgram(hildonize.get_app_class()): self._window = gtk.Window() self._window.add(vbox) - 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._on_toggle_word_wrap() + self.enable_zoom(True) try: os.makedirs(self._user_data) @@ -188,6 +186,11 @@ class QuicknoteProgram(hildonize.get_app_class()): 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() @@ -269,6 +272,7 @@ class QuicknoteProgram(hildonize.get_app_class()): 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 @@ -281,30 +285,45 @@ class QuicknoteProgram(hildonize.get_app_class()): 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): 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 event.get_state() & gtk.gdk.CONTROL_MASK + 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) + 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): import sqldialog sqldiag = sqldialog.SqlDialog(self._db) @@ -323,44 +342,47 @@ class QuicknoteProgram(hildonize.get_app_class()): 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)) - - 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): 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")) @@ -384,30 +406,43 @@ class QuicknoteProgram(hildonize.get_app_class()): 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() 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() + @gtk_toolbox.log_exception(_moduleLogger) def _on_show_about(self, widget = None, data = None): dialog = gtk.AboutDialog() dialog.set_position(gtk.WIN_POS_CENTER) @@ -417,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 ", "Ed Page (Blame him for the most recent bugs)"]) + dialog.set_authors(["Christoph Wurstle ", "Ed Page (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()