X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fnotizen.py;h=46b37291e9b71165fa7d356b565aab4cc990f528;hp=2a9ccff001e1ef714f79146b3d36a785b5346556;hb=67091fc14ae79b74498c85ee75d2ecf1003e775a;hpb=7548c1e4bba5998dfe6698d36d578746341e3f41 diff --git a/src/notizen.py b/src/notizen.py index 2a9ccff..46b3729 100644 --- a/src/notizen.py +++ b/src/notizen.py @@ -39,9 +39,10 @@ _moduleLogger = logging.getLogger("notizen") class Notizen(gtk.HBox): - def __init__(self, db, topBox): + def __init__(self, db, category, search): self._db = db - self._topBox = topBox + self._category = category + self._search = search self.noteId = -1 self._pos = -1 self._noteBody = None #Last notetext @@ -66,6 +67,7 @@ class Notizen(gtk.HBox): buttonHBox.pack_start(button, expand = True, fill = True, padding = 3) listVbox = gtk.VBox(homogeneous = False, spacing = 0) + listVbox.pack_start(self._category, expand = False, fill = True, padding = 3) listVbox.pack_start(self._noteslist.widget, expand = True, fill = True, padding = 3) listVbox.pack_start(buttonHBox, expand = False, fill = True, padding = 3) self.pack_start(listVbox, expand = False, fill = True, padding = 3) @@ -86,25 +88,14 @@ 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() - self._topBox.connect("reload_notes", self.load_notes) + self._category.connect("category_changed", self.load_notes) + self._search.connect("search_changed", self.load_notes) def set_wordwrap(self, enableWordWrap): if enableWordWrap: @@ -114,18 +105,12 @@ 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() - self._categoryName = self._topBox.get_category() - search = self._topBox.get_search_pattern() + self._categoryName = self._category.get_queryable_category() + search = self._search.get_search_pattern() notes = self._db.searchNotes(search, self._categoryName) if notes is not None: @@ -159,7 +144,42 @@ class Notizen(gtk.HBox): else: self._db.saveNote(self.noteId, buf, self._categoryName) - 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.HistorySelectionDialog() + + 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) + + try: + userResponse = dialog.run() + + if userResponse == gtk.RESPONSE_ACCEPT: + 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() + + finally: + dialog.destroy() def _get_title(self, buf): """ @@ -204,7 +224,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) @@ -229,50 +248,25 @@ class Notizen(gtk.HBox): @gtk_toolbox.log_exception(_moduleLogger) def _on_delete_note(self, widget = None, data = None): - if (self.noteId == -1): + if self.noteId == -1: return - mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_YES_NO, _("Really delete?")) - response = mbox.run() - mbox.hide() - mbox.destroy() - if response == gtk.RESPONSE_YES: + + doDeletion = False + if self._noteBodyView.get_buffer().get_char_count() == 0: + doDeletion = True + else: + mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_YES_NO, _("Really delete?")) + try: + response = mbox.run() + finally: + mbox.hide() + mbox.destroy() + + doDeletion = response == gtk.RESPONSE_YES + + if doDeletion: self._db.delNote(self.noteId) self.noteId = -1 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()