Cleanup: removal of mer, making things cleaner, etc

[quicknote] / src / notizen.py

diff --git a/src/notizen.py b/src/notizen.py
index 46b3729..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
@@ -230,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