Bump to 0.3.3 and adding basic rotation support
[multilist] / src / libselection.py
index db56c04..b846f68 100644 (file)
@@ -21,11 +21,14 @@ Copyright (C) 2008 Christoph Würstle
 """
 
 
-import gobject
 import logging
 
+import gobject
 import gtk
 
+import gtk_toolbox
+import hildonize
+
 try:
        _
 except NameError:
@@ -38,84 +41,119 @@ _moduleLogger = logging.getLogger(__name__)
 class Selection(gtk.HBox):
 
        __gsignals__ = {
-               'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING)),
-               #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING))
+               'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING)),
+               #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING))
        }
 
-       def load(self):
-               model=self.comboList.get_model()
-               model.clear()
-               #self.comboList.remove(0)
+       def __init__(self, db, isHildon):
+               gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
 
-               sql="SELECT DISTINCT list FROM items ORDER BY list"
-               rows=self.db.ladeSQL(sql)
-               if ((rows!=None)and(len(rows)>0)):
-                       for row in rows:
-                               self.comboList.append_text(row[0])
-               else:
-                       self.comboList.append_text("default")
+               self.db = db
+               self.isHildon = isHildon
+
+               _moduleLogger.info("libSelection, init")
 
-               s=self.db.ladeDirekt("comboListText")
-               if s!="":
-                       self.comboList.get_child().set_text(s)
+               self.__listLabel = gtk.Label(_("List:"))
+               self.pack_start(self.__listLabel, expand = False, fill = True, padding = 0)
+
+               self.__lists = []
+               self.__listButton = gtk.Button("")
+               self.__listButton.connect("clicked", self._on_list_selector)
+               self.pack_start(self.__listButton, expand = True, fill = True, padding = 0)
+
+               self.__catLabel = gtk.Label(_("  Category:"))
+               self.pack_start(self.__catLabel, expand = False, fill = True, padding = 0)
+
+               self.__categories = []
+               self.__categoryButton = gtk.Button("")
+               self.__categoryButton.connect("clicked", self._on_category_selector)
+               self.pack_start(self.__categoryButton, expand = True, fill = True, padding = 0)
+
+       def set_orientation(self, orientation):
+               if orientation == gtk.ORIENTATION_HORIZONTAL:
+                       self.__listLabel.show()
+                       self.__catLabel.show()
+               elif orientation == gtk.ORIENTATION_VERTICAL:
+                       self.__listLabel.hide()
+                       self.__catLabel.hide()
                else:
-                       self.comboList.set_active(0)
+                       raise NotImplementedError(orientation)
 
-       def comboList_changed(self, widget=None, data=None):
-               #self.comboCategory.set_model(None)
-               #print "reload categories"
-               while len(self.comboCategory.get_model())>0:
-                       self.comboCategory.remove_text(0)
+       def load(self):
+               del self.__lists[:]
 
-               sql="SELECT DISTINCT category FROM items WHERE list=? ORDER BY category"
-               rows=self.db.ladeSQL(sql,(self.get_list(),))
+               sql = "SELECT DISTINCT list FROM items ORDER BY list"
+               rows = self.db.ladeSQL(sql)
+               if rows is not None:
+                       for row in rows:
+                               self.__lists.append(row[0])
+               if not self.__lists:
+                       self.__lists.append("default")
 
-               self.comboCategory.append_text(_("all"))
-               if ((rows!=None)and(len(rows)>0)):
+               s = self.db.ladeDirekt("comboListText")
+               if s != "":
+                       self.__listButton.set_label(s)
+               else:
+                       self.__listButton.set_label(self.__lists[0])
+
+               self.update_categories()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_category_selector(self, *args):
+               window = gtk_toolbox.find_parent_window(self)
+               userSelection = hildonize.touch_selector_entry(
+                       window,
+                       "Categories",
+                       self.__categories,
+                       self.__categoryButton.get_label(),
+               )
+               self.set_category(userSelection)
+               self.emit("changed", "category", "")
+               self.db.speichereDirekt("comboCategoryText"+self.__listButton.get_label(), self.__categoryButton.get_label())
+               self.update_categories()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_list_selector(self, *args):
+               window = gtk_toolbox.find_parent_window(self)
+               userSelection = hildonize.touch_selector_entry(
+                       window,
+                       "Lists",
+                       self.__lists,
+                       self.__listButton.get_label(),
+               )
+               self.set_list(userSelection)
+
+               self.update_categories()
+
+               self.emit("changed", "list", "")
+               self.db.speichereDirekt("comboListText", self.__listButton.get_label())
+
+       def update_categories(self):
+               del self.__categories[:]
+
+               sql = "SELECT DISTINCT category FROM items WHERE list = ? ORDER BY category"
+               rows = self.db.ladeSQL(sql, (self.get_list(), ))
+
+               self.__categories.append(_("all"))
+               if rows is not None:
                        for row in rows:
-                               if (row[0]!=_("all")):
-                                       self.comboCategory.append_text(row[0])
+                               if (row[0] != _("all")):
+                                       self.__categories.append(row[0])
 
-               s=self.db.ladeDirekt("comboCategoryText"+self.comboList.get_child().get_text())
+               s = self.db.ladeDirekt("comboCategoryText"+self.__listButton.get_label())
                if len(s)>0:
-                       self.comboCategory.get_child().set_text(s)
+                       self.__categoryButton.set_label(s)
                else:
-                       self.comboCategory.set_active(0)
-
-               self.emit("changed","list","")
-               self.db.speichereDirekt("comboListText",self.comboList.get_child().get_text())
-
-       def comboCategory_changed(self, widget=None, data=None):
-               #_moduleLogger.info("Klasse geaendert zu ")
-               #self.hauptRegister.set_current_page(0)
-               self.emit("changed","category","")
-               if self.comboCategory.get_active()>-1:
-                       self.db.speichereDirekt("comboCategoryText"+self.comboList.get_child().get_text(),self.comboCategory.get_child().get_text())
-
-       def radioActive_changed(self, widget, data=None):
-               self.emit("changed","radio","")
+                       self.__categoryButton.set_label(self.__categories[0])
 
        def comboLists_check_for_update(self):
-               if self.comboCategory.get_active()==-1:
-                       model=self.comboCategory.get_model()
-                       found=False
-                       cat=self.get_category()
-                       for x in model:
-                               if x[0]==cat:
-                                       found=True
-                       if found==False:
-                               self.comboCategory.append_text(self.get_category())
-                               self.comboCategory.set_active(len(self.comboCategory.get_model())-1)
-               if self.comboList.get_active()==-1:
-                       model=self.comboList.get_model()
-                       found=False
-                       list=self.get_list()
-                       for x in model:
-                               if x[0]==list:
-                                       found=True
-                       if found==False:
-                               self.comboList.append_text(self.get_list())
-                               self.comboList.set_active(len(self.comboList.get_model())-1)
+               categoryName = self.__categoryButton.get_label()
+               if categoryName not in self.__categories:
+                       self.__categories.append(categoryName)
+
+               listName = self.__listButton.get_label()
+               if listName not in self.__lists:
+                       self.__lists.append(listName)
 
        def lade(self):
                _moduleLogger.warning("Laden der aktuellen position noch nicht implementiert")
@@ -126,61 +164,23 @@ class Selection(gtk.HBox):
        def getIsHildon(self):
                return self.isHildon
 
-       def get_category(self,select=False):
-               s=self.comboCategory.get_child().get_text()
-               if s==_("all"):
-                       if (select==False):
+       def get_category(self, select = False):
+               s = self.__categoryButton.get_label()
+               if s == _("all"):
+                       if not select:
                                return "undefined"
                        else:
                                return "%"
                else:
                        return s
-       def set_category(self,category):
-               self.comboCategory.get_child().set_text(category)
 
-       def set_list(self,listname):
-               self.comboList.get_child().set_text(listname)
+       def set_category(self, category):
+               # @bug the old code might have relied on this firing a combo change event
+               self.__categoryButton.set_label(category)
 
-       def get_list(self):
-               return self.comboList.get_child().get_text()
-
-       def get_status(self):
-               #return self.comboCategory.get_child().get_text()
-               if self.radio_all.get_active()==True:
-                       return "-1"
-               else:
-                       return "0"
-
-       def __init__(self,db,isHildon):
-               gtk.HBox.__init__(self,homogeneous=False, spacing=3)
-
-               self.db=db
-               self.isHildon=isHildon
-
-               _moduleLogger.info("libSelection, init")
+       def set_list(self, listname):
+               # @bug the old code might have relied on this firing a combo change event
+               self.__listButton.set_label(listname)
 
-               label=gtk.Label(_("List:"))
-               self.pack_start(label, expand=False, fill=True, padding=0)
-
-               self.comboList = gtk.combo_box_entry_new_text()
-               self.comboList.set_size_request(180,-1)
-               self.pack_start(self.comboList, expand=False, fill=True, padding=0)
-
-               label=gtk.Label(_("  Category:"))
-               self.pack_start(label, expand=False, fill=True, padding=0)
-
-               self.comboCategory = gtk.combo_box_entry_new_text()
-               self.comboCategory.set_size_request(180,-1)
-               self.pack_start(self.comboCategory, expand=False, fill=True, padding=0)
-
-               self.comboList.connect("changed", self.comboList_changed, None)
-               self.comboCategory.connect("changed", self.comboCategory_changed, None)
-
-               label=gtk.Label(_("  View:"))
-               self.pack_start(label, expand=False, fill=True, padding=0)
-
-               self.radio_all=gtk.RadioButton(group=None, label=_("All"), use_underline=True)
-               self.pack_start(self.radio_all, expand=False, fill=True, padding=0)
-               self.radio_active=gtk.RadioButton(group=self.radio_all, label=_("Active"), use_underline=True)
-               self.pack_start(self.radio_active, expand=False, fill=True, padding=0)
-               self.radio_all.connect("toggled",self.radioActive_changed, None)
+       def get_list(self):
+               return self.__listButton.get_label()