Cleanup: removal of mer, making things cleaner, etc

[quicknote] / src / notizen.py

diff --git a/src/notizen.py b/src/notizen.py
index c3eb0f6..978ee28 100644 (file)
--- a/src/notizen.py
+++ b/src/notizen.py
@@ -34,7 +34,7 @@ except NameError:
        _ = lambda x: x
 
 
-_moduleLogger = logging.getLogger("notizen")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class Notizen(gtk.HBox):
@@ -43,6 +43,7 @@ class Notizen(gtk.HBox):
                self._db = db
                self._category = category
                self._search = search
+               self._search.connect("hide", self._on_search_close)
                self.noteId = -1
                self._pos = -1
                self._noteBody = None #Last notetext
@@ -109,7 +110,7 @@ class Notizen(gtk.HBox):
                _moduleLogger.info("load_notes params: pos:"+str(self._pos)+" noteid:"+str(self.noteId))
                self._noteslist.clear_items()
 
-               self._categoryName = self._category.get_category()
+               self._categoryName = self._category.get_queryable_category()
                search = self._search.get_search_pattern()
                notes = self._db.searchNotes(search, self._categoryName)
 
@@ -144,8 +145,6 @@ class Notizen(gtk.HBox):
                else:
                        self._db.saveNote(self.noteId, buf, self._categoryName)
 
-               self._category.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."))
@@ -232,6 +231,11 @@ class Notizen(gtk.HBox):
                gobject.timeout_add(200, self._set_focus)
 
        @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_search_close(self, *args):
+               if self.noteId != -1:
+                       self._noteBodyView.grab_focus()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_note_changed(self, widget = None, data = None):
                if self._pos == -1 or self.noteId == -1:
                        return