Cleanup: removal of mer, making things cleaner, etc

[quicknote] / src / kopfzeile.py

diff --git a/src/kopfzeile.py b/src/kopfzeile.py
index a1d00c4..9e0626e 100644 (file)
--- a/src/kopfzeile.py
+++ b/src/kopfzeile.py
@@ -24,12 +24,12 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("kopfzeile")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class Kopfzeile(gtk.HBox):
        """
 
 
 class Kopfzeile(gtk.HBox):
        """

-       Category/Search box
+       Category box

        """
 
        __gsignals__ = {
        """
 
        __gsignals__ = {

@@ -40,50 +40,47 @@ class Kopfzeile(gtk.HBox):
        UNDEFINED_CATEGORY = "undefined"
 
        def __init__(self, db):
        UNDEFINED_CATEGORY = "undefined"
 
        def __init__(self, db):

-               self._lastCategory = ""

                self._db = db
                self._db = db

+               self._lastCategory = 1

 
                _moduleLogger.info("libkopfzeile, init")
                gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
 
 
                _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)
-
-               label = gtk.Label(_("Category:  "))
-               categoryHBox.pack_start(label, 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)
                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.categoryCombo = gtk.combo_box_entry_new_text()
-               categoryHBox.pack_start(self.categoryCombo, expand = True, fill = True, padding = 0)

                self.load_categories()
                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)

 
 

-               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_name(self):
+               category = self._categorySelectorButton.get_label()
+               assert category != ""
+               return category

 
 

-       def get_category(self):
-               entry = self.categoryCombo.get_child()
-               category = entry.get_text()
+       def get_queryable_category(self):
+               category = self.get_category_name()

                if category == self.ALL_CATEGORIES:
                        category = "%"
                if category == self.ALL_CATEGORIES:
                        category = "%"

-               if category == "":
-                       category = self.UNDEFINED_CATEGORY
-                       self._categorySelectorButton.set_label(category)
-                       self.categoryCombo.set_active(1)
-                       self.categoryCombo.show()
+               assert category != ""

                return category
 
                return category
 

+       def get_categories(self):
+               return iter(self._categories)
+
+       def _get_this_category_index(self):
+               categoryName = self.get_category_name()
+               try:
+                       return self._categories.index(categoryName)
+               except ValueError:
+                       return -1
+
+       def _get_category_index(self, categoryName):
+               try:
+                       return self._categories.index(categoryName)
+               except ValueError:
+                       return -1
+

        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_category_selector(self, *args):
                window = gtk_toolbox.find_parent_window(self)
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_category_selector(self, *args):
                window = gtk_toolbox.find_parent_window(self)

@@ -91,66 +88,40 @@ class Kopfzeile(gtk.HBox):
                        window,
                        "Categories",
                        self._categories,
                        window,
                        "Categories",
                        self._categories,

-                       self._categorySelectorButton.get_label(),
+                       self.get_category_name(),

                )
                )

-               if userSelection == self._categorySelectorButton.get_label():
-                       return
-
-               sql = "UPDATE categories SET liste = ? WHERE id = 1"
-               self._db.speichereSQL(sql, (self.categoryCombo.get_active(), ))
-
-               self.emit("category_changed")
-
-       def category_combo_changed(self, widget = None, data = None):
-               _moduleLogger.debug("comboCategoryChanged")
-               if self._lastCategory != self.categoryCombo.get_active():
-                       sql = "UPDATE categories SET liste = ? WHERE id = 1"
-                       self._db.speichereSQL(sql, (self.categoryCombo.get_active(), ))
-
-               self.emit("category_changed")
-
-       def search_entry_changed(self, widget = None, data = None):
-               _moduleLogger.debug("search_entry_changed")
+               self.set_category(userSelection)
+
+       def set_category(self, categoryName = None):
+               if categoryName is not None:
+                       if not categoryName:
+                               categoryName = self.UNDEFINED_CATEGORY
+                       if categoryName != self.get_category_name():
+                               self.add_category(categoryName)
+                               self._categorySelectorButton.set_label(categoryName)
+                               sql = "UPDATE categories SET liste = ? WHERE id = 1"
+                               self._db.speichereSQL(sql, (self._get_this_category_index(), ))

                self.emit("category_changed")
 
                self.emit("category_changed")
 

-       def define_this_category(self):
-               category = self.get_category()
-
-               model = self.categoryCombo.get_model()
-               n = len(self.categoryCombo.get_model())
-               i = 0
-               active = -1
-               cats = []
-               for i, row in enumerate(model):
-                       if row[0] == category:
-                               active = i
-                       if row[0] != "%":
-                               cats.append(row[0])
-
-               if active == -1 and category != "%":
-                       self.categoryCombo.append_text(category)
-                       self._categories.append(category)
-                       sql = "INSERT INTO categories  (id, liste) VALUES (0, ?)"
-                       self._db.speichereSQL(sql, (category, ))
-                       self.categoryCombo.set_active(i)
-                       self._categorySelectorButton.set_label(category)
+       def add_category(self, categoryName):
+               if categoryName in self._categories:
+                       return
+               assert "%" not in categoryName, "Not sure, but maybe %s can't be in names"
+               self._categories.append(categoryName)
+               sql = "INSERT INTO categories  (id, liste) VALUES (0, ?)"
+               self._db.speichereSQL(sql, (categoryName, ))

 
        def delete_this_category(self):
 
        def delete_this_category(self):

-               category = self.get_category()
+               category = self.get_category_name()
+               assert category not in (self.ALL_CATEGORIES, self.UNDEFINED_CATEGORY)

 
                sql = "UPDATE notes SET category = ? WHERE category = ?"
                self._db.speichereSQL(sql, (self.UNDEFINED_CATEGORY, category))
                sql = "DELETE FROM categories WHERE liste = ?"
                self._db.speichereSQL(sql, (category, ))
 
                sql = "UPDATE notes SET category = ? WHERE category = ?"
                self._db.speichereSQL(sql, (self.UNDEFINED_CATEGORY, category))
                sql = "DELETE FROM categories WHERE liste = ?"
                self._db.speichereSQL(sql, (category, ))

-               model = self.categoryCombo.get_model()
-               pos = self.categoryCombo.get_active()
-               if 1 < pos:
-                       self.categoryCombo.remove_text(pos)
-                       self.categoryCombo.set_active(0)
-                       self._categorySelectorButton.set_label(self.ALL_CATEGORIES)

 
 

-       def get_search_pattern(self):
-               return self._searchEntry.get_text()
+               self._categories.remove(category)
+               self.set_category(self.ALL_CATEGORIES)

 
        def load_categories(self):
                sql = "CREATE TABLE categories (id TEXT , liste TEXT)"
 
        def load_categories(self):
                sql = "CREATE TABLE categories (id TEXT , liste TEXT)"

@@ -169,27 +140,18 @@ class Kopfzeile(gtk.HBox):
                        sql = "INSERT INTO categories (id, liste) VALUES (1, 1)"
                        self._db.speichereSQL(sql)
 
                        sql = "INSERT INTO categories (id, liste) VALUES (1, 1)"
                        self._db.speichereSQL(sql)
 

-               #self.categoryCombo.clear()
-               while 0 < len(self.categoryCombo.get_model()):
-                       self.categoryCombo.remove_text(0)
-               del self._categories[2:]
-
-               self.categoryCombo.append_text(self.ALL_CATEGORIES)
-               self.categoryCombo.append_text(self.UNDEFINED_CATEGORY)
+               del self._categories[2:] # Leave ALL_CATEGORIES and UNDEFINED_CATEGORY in

 
                if cats is not None:
                        for cat in cats:
 
                if cats is not None:
                        for cat in cats:

-                               self.categoryCombo.append_text(cat)

                                self._categories.append(cat)
 
                sql = "SELECT * FROM categories WHERE id = 1"
                rows = self._db.ladeSQL(sql)
                if rows is not None and 0 < len(rows):
                        index = int(rows[0][1])
                                self._categories.append(cat)
 
                sql = "SELECT * FROM categories WHERE id = 1"
                rows = self._db.ladeSQL(sql)
                if rows is not None and 0 < len(rows):
                        index = int(rows[0][1])

-                       self.categoryCombo.set_active(index)

                        self._categorySelectorButton.set_label(self._categories[index])
                else:
                        self._categorySelectorButton.set_label(self._categories[index])
                else:

-                       self.categoryCombo.set_active(1)

                        self._categorySelectorButton.set_label(self.UNDEFINED_CATEGORY)
 
                        self._categorySelectorButton.set_label(self.UNDEFINED_CATEGORY)
 

-               self._lastCategory = self.categoryCombo.get_active()
+               self._lastCategory = self._get_this_category_index()