Updating from Dialcentral/ejpi

[quicknote] / src / libnotizen.py

diff --git a/src/libnotizen.py b/src/libnotizen.py
index b358160..b18e599 100644 (file)
--- a/src/libnotizen.py
+++ b/src/libnotizen.py
@@ -7,8 +7,6 @@
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
 published by the Free Software Foundation.
-
-@todo Add hiding of the history button on zoom
 """
 
 import time
@@ -17,6 +15,10 @@ import uuid
 
 import gobject
 import gtk
+try:
+       import gtkspell
+except ImportError:
+       gtkspell = None
 
 import simple_list
 
@@ -27,6 +29,9 @@ except NameError:
        _ = lambda x: x
 
 
+_moduleLogger = logging.getLogger("notizen")
+
+
 class Notizen(gtk.HBox):
 
        def __init__(self, db, topBox):
@@ -38,10 +43,10 @@ class Notizen(gtk.HBox):
                self._categoryName = ""
 
                gtk.HBox.__init__(self, homogeneous = False, spacing = 0)
-               logging.info("libnotizen, init")
+               _moduleLogger.info("libnotizen, init")
 
                self._noteslist = simple_list.SimpleList()
-               self._noteslist.set_eventfunction__cursor_changed(self._update_noteslist)
+               self._noteslist.set_eventfunction_cursor_changed(self._update_noteslist)
 
                self._noteslist.set_size_request(250, -1)
 
@@ -69,6 +74,10 @@ class Notizen(gtk.HBox):
                buf = self._noteBodyView.get_buffer()
                buf.set_text("")
                buf.connect("changed", self._on_note_changed, None)
+               if gtkspell is not None:
+                       self._noteBodySpellChecker = gtkspell.Spell(self._noteBodyView)
+               else:
+                       self._noteBodySpellChecker = None
 
                #self.textviewNotiz.set_size_request(-1, 50)
                self._noteScrollWindow = gtk.ScrolledWindow()
@@ -83,7 +92,7 @@ class Notizen(gtk.HBox):
 
                self._historyBox = gtk.HBox(homogeneous = False, spacing = 0)
 
-               self._historyStatusLabel = gtk.Label("Test")
+               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)
 
@@ -113,9 +122,9 @@ class Notizen(gtk.HBox):
                        self._historyBox.hide()
 
        def load_notes(self, data = None):
-               logging.info("load_notes params: pos:"+str(self._pos)+" noteid:"+str(self.noteId))
+               _moduleLogger.info("load_notes params: pos:"+str(self._pos)+" noteid:"+str(self.noteId))
                self._noteslist.clear_items()
-               self._noteslist.append_item(_("new Note"), "new")
+               self._noteslist.append_item(_("New Note..."), "new")
 
                self._categoryName = self._topBox.get_category()
                search = self._topBox.get_search_pattern()
@@ -132,7 +141,7 @@ class Notizen(gtk.HBox):
                self._noteBodyView.get_buffer().set_text("")
 
        def save_note(self, widget = None, data = None, data2 = None):
-               logging.info("save_note params: pos:"+str(self._pos)+" noteid:"+str(self.noteId))
+               _moduleLogger.info("save_note params: pos:"+str(self._pos)+" noteid:"+str(self.noteId))
                #print "params:", data, data2
                buf = self._noteBodyView.get_buffer().get_text(self._noteBodyView.get_buffer().get_start_iter(), self._noteBodyView.get_buffer().get_end_iter())
                if buf is None or len(buf) == 0:
@@ -141,15 +150,15 @@ class Notizen(gtk.HBox):
                if buf == self._noteBody:
                        return
 
-               logging.info("Saving note: "+buf)
+               _moduleLogger.info("Saving note: "+buf)
                if self._pos == -1 or self.noteId == -1:
                        self._pos = -1
                        self.noteId = str(uuid.uuid4())
-                       self._db.save_note(self.noteId, buf, self._categoryName)
+                       self._db.saveNote(self.noteId, buf, self._categoryName)
                        self._noteslist.append_item(self._get_title(buf), self.noteId)
                        self._pos = self._noteslist.select_last_item()
                else:
-                       self._db.save_note(self.noteId, buf, self._categoryName)
+                       self._db.saveNote(self.noteId, buf, self._categoryName)
 
                self._topBox.define_this_category()
 
@@ -183,7 +192,7 @@ class Notizen(gtk.HBox):
                if key == "new" or data == "new":
                        #both methods supported click add note or new note (first one disabled)
                        self.noteId = str(uuid.uuid4())
-                       self._db.save_note(self.noteId, "", self._categoryName)
+                       self._db.saveNote(self.noteId, "", self._categoryName)
                        self._pos = -1
                        self._noteslist.append_item("", self.noteId)
                        self._noteBodyView.get_buffer().set_text("")
@@ -255,7 +264,7 @@ class Notizen(gtk.HBox):
                        data = dialog.get_selected_row()
                        if data is not None:
                                self._db.speichereSQL(data[2], data[3].split(" <<Tren-ner>> "), rowid = self.noteId)
-                               logging.info("loading History")
+                               _moduleLogger.info("loading History")
                                self._update_noteslist()
 
                dialog.destroy()