From 8c59d81188ba9b3904012949b7e01e480ef077b1 Mon Sep 17 00:00:00 2001 From: epage Date: Sat, 9 Jan 2010 01:45:16 +0000 Subject: [PATCH 1/1] Moved history to the (app)menu git-svn-id: file:///svnroot/quicknote/trunk@98 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2 --- src/notizen.py | 88 +++++++++++++++++++------------------------------- src/quicknote_gtk.py | 26 ++++++++++----- support/builddeb.py | 1 + 3 files changed, 53 insertions(+), 62 deletions(-) diff --git a/src/notizen.py b/src/notizen.py index 2a9ccff..ae1cdb7 100644 --- a/src/notizen.py +++ b/src/notizen.py @@ -86,21 +86,9 @@ class Notizen(gtk.HBox): self._noteScrollWindow.add(self._noteBodyView) hildonize.hildonize_scrollwindow_with_viewport(self._noteScrollWindow) - # History - self._historyBox = gtk.HBox(homogeneous = False, spacing = 0) - - self._historyStatusLabel = gtk.Label(_("No History")) - self._historyStatusLabel.set_alignment(0.0, 0.5) - self._historyBox.pack_start(self._historyStatusLabel, expand = True, fill = True, padding = 3) - - button = gtk.Button(_("History")) - button.connect("clicked", self._on_show_history, None) - self._historyBox.pack_start(button, expand = True, fill = True, padding = 3) - # Note and history stuff in same column noteVbox = gtk.VBox(homogeneous = False, spacing = 0) noteVbox.pack_start(self._noteScrollWindow, expand = True, fill = True, padding = 3) - noteVbox.pack_start(self._historyBox, expand = False, fill = True, padding = 3) self.pack_start(noteVbox, expand = True, fill = True, padding = 3) self.load_notes() @@ -114,12 +102,6 @@ class Notizen(gtk.HBox): self._noteScrollWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self._noteBodyView.set_wrap_mode(gtk.WRAP_NONE) - def show_history_area(self, visible): - if visible: - self._historyBox.show() - else: - self._historyBox.hide() - def load_notes(self, data = None): _moduleLogger.info("load_notes params: pos:"+str(self._pos)+" noteid:"+str(self.noteId)) self._noteslist.clear_items() @@ -161,6 +143,40 @@ class Notizen(gtk.HBox): self._topBox.define_this_category() + def show_history(self, *args): + if self.noteId == -1: + mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, _("No note selected.")) + response = mbox.run() + mbox.hide() + mbox.destroy() + return + + rows = self._db.getNoteHistory(self.noteId) + + import history + dialog = history.Dialog() + + lastNoteStr = "" + for row in rows: + daten = row[4][1] + if daten != "" and lastNoteStr != daten: + lastNoteStr = daten + dialog.noteHistory.append([row[0], row[1], row[2], row[3], daten+"\n"]) + + dialog.vbox.show_all() + dialog.set_size_request(600, 380) + + if dialog.run() == gtk.RESPONSE_ACCEPT: + print "saving" + self.save_note() + data = dialog.get_selected_row() + if data is not None: + self._db.speichereSQL(data[2], data[3].split(" <> "), rowid = self.noteId) + _moduleLogger.info("loading History") + self._update_noteslist() + + dialog.destroy() + def _get_title(self, buf): """ @returns the title of the current note @@ -204,7 +220,6 @@ class Notizen(gtk.HBox): else: self._pos = pos self.noteId, pcdatum, self._categoryName, self._noteBody = self._db.loadNote(key) - self._historyStatusLabel.set_text(time.strftime(_("Last change: %d.%m.%y %H:%M"), time.localtime(pcdatum))) buf = self._noteBodyView.get_buffer() buf.set_text(self._noteBody) @@ -241,38 +256,3 @@ class Notizen(gtk.HBox): self._noteslist.remove_item(self._pos) self._pos = -1 self._noteBodyView.get_buffer().set_text("") - - @gtk_toolbox.log_exception(_moduleLogger) - def _on_show_history(self, widget = None, data = None, label = None): - if self.noteId == -1: - mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, _("No note selected.")) - response = mbox.run() - mbox.hide() - mbox.destroy() - return - - rows = self._db.getNoteHistory(self.noteId) - - import history - dialog = history.Dialog() - - lastNoteStr = "" - for row in rows: - daten = row[4][1] - if daten != "" and lastNoteStr != daten: - lastNoteStr = daten - dialog.noteHistory.append([row[0], row[1], row[2], row[3], daten+"\n"]) - - dialog.vbox.show_all() - dialog.set_size_request(600, 380) - - if dialog.run() == gtk.RESPONSE_ACCEPT: - print "saving" - self.save_note() - data = dialog.get_selected_row() - if data is not None: - self._db.speichereSQL(data[2], data[3].split(" <> "), rowid = self.noteId) - _moduleLogger.info("loading History") - self._update_noteslist() - - dialog.destroy() diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index f1e8699..f3daff4 100644 --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -103,11 +103,11 @@ class QuicknoteProgram(hildonize.get_app_class()): menu_items = gtk.MenuItem(_("Delete")) categorymenu.append(menu_items) - menu_items.connect("activate", self._on_delete_category, None) + menu_items.connect("activate", self._on_delete_category) menu_items = gtk.MenuItem(_("Move To Category")) categorymenu.append(menu_items) - menu_items.connect("activate", self._on_move_category, None) + menu_items.connect("activate", self._on_move_category) category_menu = gtk.MenuItem(_("Category")) category_menu.show() @@ -117,9 +117,13 @@ class QuicknoteProgram(hildonize.get_app_class()): menu_items = gtk.MenuItem(_("Word Wrap")) viewmenu.append(menu_items) - menu_items.connect("activate", self._on_toggle_word_wrap, None) + menu_items.connect("activate", self._on_toggle_word_wrap) - view_menu = gtk.MenuItem(_("View")) + menu_items = gtk.MenuItem(_("History")) + viewmenu.append(menu_items) + menu_items.connect("activate", self._on_show_history) + + view_menu = gtk.MenuItem(_("Note")) view_menu.show() view_menu.set_submenu(viewmenu) @@ -174,13 +178,17 @@ class QuicknoteProgram(hildonize.get_app_class()): ) if hildonize.IS_FREMANTLE_SUPPORTED: moveToCategoryButton = gtk.Button(_("Move To Category")) - moveToCategoryButton.connect("clicked", self._on_move_category, None) + moveToCategoryButton.connect("clicked", self._on_move_category) menuBar.append(moveToCategoryButton) deleteCategoryButton = gtk.Button(_("Delete Category")) - deleteCategoryButton.connect("clicked", self._on_delete_category, None) + deleteCategoryButton.connect("clicked", self._on_delete_category) menuBar.append(deleteCategoryButton) + historyButton= gtk.Button(_("Note History")) + historyButton.connect("clicked", self._on_show_history) + menuBar.append(historyButton) + menuBar.show_all() if not hildonize.IS_HILDON_SUPPORTED: @@ -278,10 +286,8 @@ class QuicknoteProgram(hildonize.get_app_class()): self._isZoomEnabled = zoomEnabled if zoomEnabled: self._topBox.hide() - self._notizen.show_history_area(False) else: 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): @@ -344,6 +350,10 @@ class QuicknoteProgram(hildonize.get_app_class()): return True @gtk_toolbox.log_exception(_moduleLogger) + def _on_show_history(self, *args): + self._notizen.show_history() + + @gtk_toolbox.log_exception(_moduleLogger) def _on_view_sql_history(self, widget = None, data = None, data2 = None): import sqldialog sqldiag = sqldialog.SqlDialog(self._db) diff --git a/support/builddeb.py b/support/builddeb.py index 1f117f6..d71587d 100755 --- a/support/builddeb.py +++ b/support/builddeb.py @@ -22,6 +22,7 @@ __version__ = constants.__version__ __build__ = constants.__build__ __changelog__ = """ 0.7.10 + * Moved history to the menu/appmenu * Ctrl+w/q to quit 0.7.9 -- 1.7.9.5