Marking protected some items in Kopfzeile

git-svn-id: file:///svnroot/quicknote/trunk@37 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2

diff --git a/src/libkopfzeile.py b/src/libkopfzeile.py
index 90d297d..0b77f6f 100644 (file)
--- a/src/libkopfzeile.py
+++ b/src/libkopfzeile.py
@@ -29,8 +29,8 @@ class Kopfzeile(gtk.HBox):
        }
 
        def __init__(self, db):
-               self.lastCategory = ""
-               self.db = db
+               self._lastCategory = ""
+               self._db = db
 
                gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
                logging.info("libkopfzeile, init")
@@ -41,10 +41,10 @@ class Kopfzeile(gtk.HBox):
                label = gtk.Label(_("Category:  "))
                categoryHBox.pack_start(label, expand = False, fill = True, padding = 0)
 
-               self.comboCategory = gtk.combo_box_entry_new_text()
-               categoryHBox.pack_start(self.comboCategory, expand = True, fill = True, padding = 0)
-               self.loadCategories()
-               self.comboCategory.connect("changed", self.comboCategoryChanged, None)
+               self.categoryCombo = gtk.combo_box_entry_new_text()
+               categoryHBox.pack_start(self.categoryCombo, expand = True, fill = True, padding = 0)
+               self.load_categories()
+               self.categoryCombo.connect("changed", self.category_combo_changed, None)
 
                searchHBox = gtk.HBox()
                self.pack_start(searchHBox, expand = True, fill = True, padding = 0)
@@ -52,91 +52,91 @@ class Kopfzeile(gtk.HBox):
                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.searchEntryChanged, None)
+               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 comboCategoryChanged(self, widget = None, data = None):
+       def category_combo_changed(self, widget = None, data = None):
                logging.debug("comboCategoryChanged")
-               if self.lastCategory != self.comboCategory.get_active():
+               if self._lastCategory != self.categoryCombo.get_active():
                        sql = "UPDATE categories SET liste = ? WHERE id = 1"
-                       self.db.speichereSQL(sql, (self.comboCategory.get_active(), ))
+                       self._db.speichereSQL(sql, (self.categoryCombo.get_active(), ))
 
                self.emit("reload_notes")
 
-       def searchEntryChanged(self, widget = None, data = None):
-               logging.debug("searchEntryChanged")
+       def search_entry_changed(self, widget = None, data = None):
+               logging.debug("search_entry_changed")
                self.emit("reload_notes")
 
-       def getCategory(self):
-               entry = self.comboCategory.get_child()
+       def get_category(self):
+               entry = self.categoryCombo.get_child()
                category = entry.get_text()
                if category == _("all"):
                        category = "%"
                if category == "":
                        category = "undefined"
-                       self.comboCategory.set_active(1)
-                       self.comboCategory.show()
+                       self.categoryCombo.set_active(1)
+                       self.categoryCombo.show()
                return category
 
-       def defineThisCategory(self):
-               category = self.getCategory()
+       def define_this_category(self):
+               category = self.get_category()
 
-               model = self.comboCategory.get_model()
-               n = len(self.comboCategory.get_model())
+               model = self.categoryCombo.get_model()
+               n = len(self.categoryCombo.get_model())
                i = 0
                active = -1
                cats = []
                while i < n:
                        if (model[i][0] == category):
-                               #self.comboCategory.set_active(i)
+                               #self.categoryCombo.set_active(i)
                                active = i
                        if (model[i][0]!= "%"):
                                cats.append(model[i][0])
                        i += 1
 
                if (active == -1) and (category!= "%"):
-                       self.comboCategory.append_text(category)
+                       self.categoryCombo.append_text(category)
                        sql = "INSERT INTO categories  (id, liste) VALUES (0, ?)"
-                       self.db.speichereSQL(sql, (category, ))
-                       self.comboCategory.set_active(i)
+                       self._db.speichereSQL(sql, (category, ))
+                       self.categoryCombo.set_active(i)
 
-       def getSearchPattern(self):
-               return self.searchEntry.get_text()
+       def get_search_pattern(self):
+               return self._searchEntry.get_text()
 
-       def loadCategories(self):
+       def load_categories(self):
                sql = "CREATE TABLE categories (id TEXT , liste TEXT)"
-               self.db.speichereSQL(sql)
+               self._db.speichereSQL(sql)
 
                sql = "SELECT id, liste FROM categories WHERE id = 0 ORDER BY liste"
-               rows = self.db.ladeSQL(sql)
+               rows = self._db.ladeSQL(sql)
                cats = []
                if rows is not None and 0 < len(rows):
                        for row in rows:
                                cats.append(row[1])
 
                sql = "SELECT * FROM categories WHERE id = 1"
-               rows = self.db.ladeSQL(sql)
+               rows = self._db.ladeSQL(sql)
                if rows is None or len(rows) == 0:
                        sql = "INSERT INTO categories (id, liste) VALUES (1, 1)"
-                       self.db.speichereSQL(sql)
+                       self._db.speichereSQL(sql)
 
-               #self.comboCategory.clear()
-               while 0 < len(self.comboCategory.get_model()):
-                       self.comboCategory.remove_text(0)
+               #self.categoryCombo.clear()
+               while 0 < len(self.categoryCombo.get_model()):
+                       self.categoryCombo.remove_text(0)
 
-               self.comboCategory.append_text(_('all'))
-               self.comboCategory.append_text('undefined')
+               self.categoryCombo.append_text(_('all'))
+               self.categoryCombo.append_text('undefined')
 
                if cats is not None and 0 < len(cats):
                        for cat in cats:
-                               self.comboCategory.append_text(cat)
+                               self.categoryCombo.append_text(cat)
 
                sql = "SELECT * FROM categories WHERE id = 1"
-               rows = self.db.ladeSQL(sql)
+               rows = self._db.ladeSQL(sql)
                if rows is not None and 0 < len(rows):
-                       self.comboCategory.set_active(int(rows[0][1]))
+                       self.categoryCombo.set_active(int(rows[0][1]))
                else:
-                       self.comboCategory.set_active(1)
+                       self.categoryCombo.set_active(1)
 
-               self.lastCategory = self.comboCategory.get_active()
+               self._lastCategory = self.categoryCombo.get_active()

diff --git a/src/libnotizen.py b/src/libnotizen.py
index 9b5c23c..52ddf7f 100644 (file)
--- a/src/libnotizen.py
+++ b/src/libnotizen.py
@@ -145,7 +145,7 @@ class Notizen(gtk.HBox):
                else:
                        self.db.saveNote(self.noteid, buf, self.category)
 
-               self.topBox.defineThisCategory()
+               self.topBox.define_this_category()
 
        def setFocus(self):
                self.textviewNote.grab_focus()
@@ -203,8 +203,8 @@ class Notizen(gtk.HBox):
                self.noteslist.clear_items()
                self.noteslist.append_item(_("new Note"), "new")
 
-               self.category = self.topBox.getCategory()
-               search = self.topBox.getSearchPattern()
+               self.category = self.topBox.get_category()
+               search = self.topBox.get_search_pattern()
                notes = self.db.searchNotes(search, self.category)
 
                if notes is not None:

diff --git a/src/libquicknote.py b/src/libquicknote.py
index 9a4f5c8..e49bece 100644 (file)
--- a/src/libquicknote.py
+++ b/src/libquicknote.py
@@ -191,7 +191,7 @@ class quicknoteclass(hildon.Program):
                        self.db.speichereDirekt('datenbank', fileName)
 
                        self.db.openDB()
-                       self.topBox.loadCategories()
+                       self.topBox.load_categories()
                        self.notizen.loadNotes()
                        dlg.destroy()
 
@@ -228,7 +228,7 @@ class quicknoteclass(hildon.Program):
                sqldiag.destroy()
 
        def delete_Category(self, widget = None, data = None):
-               if (self.topBox.getCategory() == "%") or (self.topBox.getCategory() == "undefined"):
+               if self.topBox.get_category() == "%" or self.topBox.get_category() == "undefined":
                        mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted"))
                        response = mbox.run()
                        mbox.hide()
@@ -241,14 +241,14 @@ class quicknoteclass(hildon.Program):
                mbox.destroy()
                if response == gtk.RESPONSE_YES:
                        sql = "UPDATE notes SET category = ? WHERE category = ?"
-                       self.db.speichereSQL(sql, ("undefined", self.topBox.getCategory()))
+                       self.db.speichereSQL(sql, ("undefined", self.topBox.get_category()))
                        sql = "DELETE FROM categories WHERE liste = ?"
-                       self.db.speichereSQL(sql, (self.topBox.getCategory(), ))
-                       model = self.topBox.comboCategory.get_model()
-                       pos = self.topBox.comboCategory.get_active()
+                       self.db.speichereSQL(sql, (self.topBox.get_category(), ))
+                       model = self.topBox.categoryCombo.get_model()
+                       pos = self.topBox.categoryCombo.get_active()
                        if (pos>1):
-                               self.topBox.comboCategory.remove_text(pos)
-                               self.topBox.comboCategory.set_active(0)
+                               self.topBox.categoryCombo.remove_text(pos)
+                               self.topBox.categoryCombo.set_active(0)
 
        def move_Category(self, widget = None, data = None):
                dialog = gtk.Dialog(_("Choose category"), self.window, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
@@ -279,7 +279,7 @@ class quicknoteclass(hildon.Program):
                                noteid, category, note = self.db.loadNote(self.notizen.noteid)
                                #print noteid, category, cat_id
                                self.db.saveNote(noteid, note, cat_id, pcdatum = None)
-                               self.topBox.comboCategoryChanged()
+                               self.topBox.category_combo_changed()
                        else:
                                mbox = gtk.MessageDialog(self.window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No note selected."))
                                response = mbox.run()
@@ -289,7 +289,7 @@ class quicknoteclass(hildon.Program):
                dialog.destroy()
 
        def sync_finished(self, data = None, data2 = None):
-               self.topBox.loadCategories()
+               self.topBox.load_categories()
                self.notizen.loadNotes()
 
        def prepare_sync_dialog(self):