From: epage Date: Sat, 9 Jan 2010 03:11:31 +0000 (+0000) Subject: Separated Category and Search in the code/ui cleaning up the UI quite a bit X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=commitdiff_plain;h=47f27cc4fd54f17f5844c85588b8e79a8eb900d0 Separated Category and Search in the code/ui cleaning up the UI quite a bit git-svn-id: file:///svnroot/quicknote/trunk@102 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2 --- diff --git a/src/kopfzeile.py b/src/kopfzeile.py index 7eb7c35..94b69da 100644 --- a/src/kopfzeile.py +++ b/src/kopfzeile.py @@ -29,7 +29,7 @@ _moduleLogger = logging.getLogger("kopfzeile") class Kopfzeile(gtk.HBox): """ - Category/Search box + Category box """ __gsignals__ = { @@ -46,26 +46,13 @@ class Kopfzeile(gtk.HBox): _moduleLogger.info("libkopfzeile, init") gtk.HBox.__init__(self, homogeneous = False, spacing = 3) - categoryHBox = gtk.HBox() - self.pack_start(categoryHBox, expand = False, fill = True, padding = 0) - self._categories = [self.ALL_CATEGORIES, self.UNDEFINED_CATEGORY] self._categorySelectorButton = gtk.Button(self.UNDEFINED_CATEGORY) self._categorySelectorButton.connect("clicked", self._on_category_selector) - categoryHBox.pack_start(self._categorySelectorButton) + self.pack_start(self._categorySelectorButton, expand = True, fill = True) self.load_categories() - searchHBox = gtk.HBox() - self.pack_start(searchHBox, expand = True, fill = True, padding = 0) - - label = gtk.Label(_("Search: ")) - searchHBox.pack_start(label, expand = False, fill = True, padding = 0) - - self._searchEntry = gtk.Entry() - searchHBox.pack_start(self._searchEntry, expand = True, fill = True, padding = 0) - self._searchEntry.connect("changed", self.search_entry_changed, None) - def get_category(self): category = self._categorySelectorButton.get_label() if category == self.ALL_CATEGORIES: @@ -100,10 +87,6 @@ class Kopfzeile(gtk.HBox): self._db.speichereSQL(sql, (self._get_category_index(), )) self.emit("category_changed") - def search_entry_changed(self, widget = None, data = None): - _moduleLogger.debug("search_entry_changed") - self.emit("category_changed") - def define_this_category(self): category = self.get_category() catIndex = self._get_category_index() @@ -128,9 +111,6 @@ class Kopfzeile(gtk.HBox): del self._categories[pos] self._categorySelectorButton.set_label(self.ALL_CATEGORIES) - def get_search_pattern(self): - return self._searchEntry.get_text() - def load_categories(self): sql = "CREATE TABLE categories (id TEXT , liste TEXT)" self._db.speichereSQL(sql) diff --git a/src/notizen.py b/src/notizen.py index 95ed016..be85c49 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) @@ -92,7 +94,8 @@ class Notizen(gtk.HBox): self.pack_start(noteVbox, expand = True, fill = True, padding = 3) self.load_notes() - self._topBox.connect("category_changed", 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: @@ -106,8 +109,8 @@ class Notizen(gtk.HBox): _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_category() + search = self._search.get_search_pattern() notes = self._db.searchNotes(search, self._categoryName) if notes is not None: @@ -141,7 +144,7 @@ class Notizen(gtk.HBox): else: self._db.saveNote(self.noteId, buf, self._categoryName) - self._topBox.define_this_category() + self._category.define_this_category() def show_history(self, *args): if self.noteId == -1: diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index e8aa54c..ec9ea5c 100644 --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -40,6 +40,7 @@ import gtk_toolbox import speichern import kopfzeile import notizen +import search import sync @@ -67,7 +68,6 @@ class QuicknoteProgram(hildonize.get_app_class()): self._wordWrapEnabled = False self._window_in_fullscreen = False #The window isn't in full screen mode initially. - self._isZoomEnabled = False self._db = speichern.Speichern() self._syncDialog = None @@ -101,14 +101,18 @@ class QuicknoteProgram(hildonize.get_app_class()): categorymenu = gtk.Menu() - menu_items = gtk.MenuItem(_("Delete")) + menu_items = gtk.MenuItem(_("Search")) categorymenu.append(menu_items) - menu_items.connect("activate", self._on_delete_category) + 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) + category_menu = gtk.MenuItem(_("Category")) category_menu.show() category_menu.set_submenu(categorymenu) @@ -151,18 +155,19 @@ class QuicknoteProgram(hildonize.get_app_class()): vbox.pack_start(menuBar, False, False, 0) #Create GUI elements - self._topBox = kopfzeile.Kopfzeile(self._db) - vbox.pack_start(self._topBox, False, False, 0) + self._category = kopfzeile.Kopfzeile(self._db) + self._search = search.Search() + self._notizen = notizen.Notizen(self._db, self._category, self._search) - self._notizen = notizen.Notizen(self._db, self._topBox) - vbox.pack_start(self._notizen, True, True, 0) + # notizen packs in the category + vbox.pack_start(self._notizen, expand = True, fill = True) + vbox.pack_start(self._search, expand = False, fill = True) #Get the Main Window, and connect the "destroy" event self._window = gtk.Window() self._window.add(vbox) self._on_toggle_word_wrap() - self.enable_zoom(True) try: os.makedirs(self._user_data) @@ -177,18 +182,22 @@ class QuicknoteProgram(hildonize.get_app_class()): menuBar, ) if hildonize.IS_FREMANTLE_SUPPORTED: - moveToCategoryButton = gtk.Button(_("Move To Category")) + moveToCategoryButton = gtk.Button(_("Move Note")) moveToCategoryButton.connect("clicked", self._on_move_category) menuBar.append(moveToCategoryButton) - deleteCategoryButton = gtk.Button(_("Delete Category")) - 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) + searchButton= gtk.Button(_("Search Category")) + searchButton.connect("clicked", self._on_toggle_search) + menuBar.append(searchButton) + + deleteCategoryButton = gtk.Button(_("Delete Category")) + deleteCategoryButton.connect("clicked", self._on_delete_category) + menuBar.append(deleteCategoryButton) + menuBar.show_all() if not hildonize.IS_HILDON_SUPPORTED: @@ -211,11 +220,9 @@ class QuicknoteProgram(hildonize.get_app_class()): self._window.connect("window-state-event", self._on_window_state_change) self._window.show_all() + self._search.hide() self._load_settings() - def main(self): - gtk.main() - def _save_settings(self): config = ConfigParser.SafeConfigParser() self.save_settings(config) @@ -225,7 +232,6 @@ class QuicknoteProgram(hildonize.get_app_class()): def save_settings(self, config): config.add_section(constants.__pretty_app_name__) config.set(constants.__pretty_app_name__, "wordwrap", str(self._wordWrapEnabled)) - config.set(constants.__pretty_app_name__, "zoom", str(self._isZoomEnabled)) config.set(constants.__pretty_app_name__, "fullscreen", str(self._window_in_fullscreen)) def _load_settings(self): @@ -236,7 +242,6 @@ class QuicknoteProgram(hildonize.get_app_class()): def load_settings(self, config): try: self._wordWrapEnabled = config.getboolean(constants.__pretty_app_name__, "wordwrap") - self._isZoomEnabled = config.getboolean(constants.__pretty_app_name__, "zoom") self._window_in_fullscreen = config.getboolean(constants.__pretty_app_name__, "fullscreen") except ConfigParser.NoSectionError, e: warnings.warn( @@ -249,8 +254,6 @@ class QuicknoteProgram(hildonize.get_app_class()): self._notizen.set_wordwrap(self._wordWrapEnabled) - self.enable_zoom(self._isZoomEnabled) - if self._window_in_fullscreen: self._window.fullscreen() else: @@ -268,7 +271,7 @@ class QuicknoteProgram(hildonize.get_app_class()): self._db.speichereDirekt('datenbank', fileName) self._db.openDB() - self._topBox.load_categories() + self._category.load_categories() self._notizen.load_notes() dlg.destroy() @@ -282,12 +285,11 @@ class QuicknoteProgram(hildonize.get_app_class()): self._syncDialog.vbox.show_all() syncer.connect("syncFinished", self._on_sync_finished) - def enable_zoom(self, zoomEnabled): - self._isZoomEnabled = zoomEnabled - if zoomEnabled: - self._topBox.hide() + def _toggle_search(self): + if self._search.get_property("visible"): + self._search.hide() else: - self._topBox.show() + self._search.show() @gtk_toolbox.log_exception(_moduleLogger) def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData): @@ -323,19 +325,8 @@ class QuicknoteProgram(hildonize.get_app_class()): else: self._window.fullscreen () return True - elif ( - event.keyval == gtk.keysyms.F7 or - event.keyval == gtk.keysyms.i and isCtrl - ): - # Zoom In - self.enable_zoom(True) - return True - elif ( - event.keyval == gtk.keysyms.F8 or - event.keyval == gtk.keysyms.o and isCtrl - ): - # Zoom Out - self.enable_zoom(False) + elif event.keyval == gtk.keysyms.f and isCtrl: + self._toggle_search() return True elif ( event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and @@ -349,6 +340,9 @@ class QuicknoteProgram(hildonize.get_app_class()): self._clipboard.set_text(str(log)) return True + def _on_toggle_search(self, *args): + self._toggle_search() + @gtk_toolbox.log_exception(_moduleLogger) def _on_show_history(self, *args): self._notizen.show_history() @@ -405,7 +399,7 @@ class QuicknoteProgram(hildonize.get_app_class()): noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId) self._db.saveNote(noteid, note, cat_id, pcdatum = None) - self._topBox.set_category() # force it to update + 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() @@ -414,7 +408,7 @@ class QuicknoteProgram(hildonize.get_app_class()): @gtk_toolbox.log_exception(_moduleLogger) def _on_delete_category(self, *args): - if self._topBox.get_category() == "%" or self._topBox.get_category() == "undefined": + if self._category.get_category() == "%" or self._category.get_category() == "undefined": mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted")) try: response = mbox.run() @@ -430,11 +424,11 @@ class QuicknoteProgram(hildonize.get_app_class()): mbox.hide() mbox.destroy() if response == gtk.RESPONSE_YES: - self._topBox.delete_this_category() + self._category.delete_this_category() @gtk_toolbox.log_exception(_moduleLogger) def _on_sync_finished(self, data = None, data2 = None): - self._topBox.load_categories() + self._category.load_categories() self._notizen.load_notes() @gtk_toolbox.log_exception(_moduleLogger) @@ -487,7 +481,7 @@ def run_quicknote(): if hildonize.IS_HILDON_SUPPORTED: gtk.set_application_name(constants.__pretty_app_name__) app = QuicknoteProgram() - app.main() + gtk.main() if __name__ == "__main__": diff --git a/src/search.py b/src/search.py new file mode 100644 index 0000000..37c90d2 --- /dev/null +++ b/src/search.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python2.5 +# -*- coding: utf-8 -*- + + +import logging + +import gobject +import gtk + +import gtk_toolbox +import hildonize + +try: + _ +except NameError: + _ = lambda x: x + + +_moduleLogger = logging.getLogger("search") + + +class Search(gtk.HBox): + + __gsignals__ = { + 'search_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), + } + + def __init__(self): + _moduleLogger.info("search, init") + gtk.HBox.__init__(self, homogeneous = False, spacing = 3) + + label = gtk.Label(_("Search: ")) + + self._searchEntry = gtk.Entry() + self._searchEntry.connect("changed", self._on_search_entry_changed, None) + + searchHBox = gtk.HBox() + searchHBox.pack_start(label, expand = False, fill = False) + searchHBox.pack_start(self._searchEntry, expand = True, fill = True) + self.pack_start(searchHBox, expand = True, fill = True) + + def get_search_pattern(self): + return self._searchEntry.get_text() + + def _on_search_entry_changed(self, widget = None, data = None): + self.emit("search_changed") diff --git a/support/builddeb.py b/support/builddeb.py index 6a89a89..3933880 100755 --- a/support/builddeb.py +++ b/support/builddeb.py @@ -22,7 +22,8 @@ __version__ = constants.__version__ __build__ = constants.__build__ __changelog__ = """ 0.7.10 - * Moved history to the menu/appmenu + * Moved history to the (app)menu + * Moved search to Ctrl+f and (app)menu * Switched category selection over to a touch selector entry, making it prettier and easier * Ctrl+w/q to quit