2010-02-09 Thomas M. Hinkle <tom@grenville>

	* src/lib/GourmetRecipeManager.py (RecGui): Make
	delete-key-deletes-recipe behavior a callback on keypresses only
	in treeview. This prevents users using the delete key in the
	search box from accidentally deleting recipes. Also, let backspace
	delete recipes as well for convenience.

	* src/lib/backends/db.py (RecData.get_criteria): Make sure search
	strings are proper unicode objects. Fixes bug #2948135.

Author: thinkle

ChangeLog

@@ -1,3 +1,14 @@
+2010-02-09  Thomas M. Hinkle  <tom@grenville>
+
+	* src/lib/GourmetRecipeManager.py (RecGui): Make
+	delete-key-deletes-recipe behavior a callback on keypresses only
+	in treeview. This prevents users using the delete key in the
+	search box from accidentally deleting recipes. Also, let backspace
+	delete recipes as well for convenience. 
+
+	* src/lib/backends/db.py (RecData.get_criteria): Make sure search
+	strings are proper unicode objects. Fixes bug #2948135.
+
 2010-01-16  Thomas M. Hinkle  <tom@grenville>
 
 	* src/lib/version.py Version->0.15.4

src/lib/GourmetRecipeManager.py

@@ -574,6 +574,7 @@ def setup_main_window (self):
                                                                    {'size':(600,800)}),
                                                     show=False))
         self.window.connect('response',self.response_cb)
+        # So we can let delete key delete recipe when treeview is focused
 
     def response_cb (self, dialog, response):
         if response==self.RESPONSE_DELETE_PERMANENTLY:
@@ -1019,7 +1020,12 @@ def popcb (tv, event):
             if event.button==3:
                 self.rectree_popup(tv,event)
                 return True
+        # Set up popup menu in treeview
         self.rectree.connect('button-press-event',popcb)
+        # Set up delete key in recipe treeview
+        self.rectree.connect('key-press-event',self.rec_tree_keypress_cb)
+
+        
         self.main.show()
 
     def rectree_popup (self, tv, event, *args):
@@ -1035,8 +1041,11 @@ def setup_actions (self):
         self.onSelectedActionGroup.add_actions([
             ('OpenRec','recipe-box',_('Open recipe'),
              '<Control>O',_('Open selected recipe'),self.rec_tree_select_rec),
+            # We no longer bind "Delete" here -- instead, we'll do it
+            # at the TreeView level to prevent the delete key
+            # elsewhere (e.g. in search box) from muddling up users.
             ('DeleteRec',gtk.STOCK_DELETE,_('Delete recipe'),
-             'Delete',_('Delete selected recipes'),self.rec_tree_delete_rec_cb),
+             None,_('Delete selected recipes'),self.rec_tree_delete_rec_cb),
             ('ExportSelected',None,_('E_xport selected recipes'),
              None,_('Export selected recipes to file'),
              lambda *args: self.do_export(export_all=False)),
@@ -1166,14 +1175,21 @@ def show_deleted_recs (self, *args):
         else:
             self.recTrash.show()
 
+    def rec_tree_keypress_cb (self, widget, event):
+        print 'Keypress callback!'
+        keyname = gtk.gdk.keyval_name(event.keyval)
+        print 'User pressed ',keyname
+        if keyname == 'Delete' or keyname == 'BackSpace':
+            self.rec_tree_delete_rec_cb()
+            return True
 
-    def rec_tree_delete_rec_cb (self, *args):
+    def rec_tree_delete_rec_cb (self, *args,**kwargs):
         """Make a watch show up (this can be slow
         if lots of recs are selected!"""
         self.rec_tree_delete_recs(
             self.get_selected_recs_from_rec_tree()
             )
-
+        
     def delete_open_card_carefully (self, rec):
         """Delete any open card windows, confirming if the card is edited.
 

src/lib/backends/db.py

@@ -749,6 +749,10 @@ def get_criteria (self,crit):
             else:
                 subtable = None
                 col = getattr(self.recipe_table.c,crit['column'])
+            # Make sure we're using unicode!
+            if (type(crit.get('search',u'')) != unicode
+                and type(crit.get('search',u'')) in types.StringTypes):
+                crit['search'] = unicode(crit['search'])
             if crit.get('operator','LIKE')=='LIKE':
                 retval = (col.like(crit['search']))
             elif crit['operator']=='REGEXP':
@@ -759,6 +763,7 @@ def get_criteria (self,crit):
                 retval = self.recipe_table.c.id.in_(
                     sqlalchemy.select([subtable.c.recipe_id],retval)
                     )
+            
             return retval
 
     def search_recipes (self, searches, sort_by=[]):
@@ -773,6 +778,7 @@ def search_recipes (self, searches, sort_by=[]):
             d = (sort_by[i][1]==1 and -1 or 1)
             sort_by[i] = ('rating',d)
         criteria = self.get_criteria((searches,'and'))
+        debug('backends.db.search_recipes - search criteria are %s'%searches,2)
         if 'category' in [s[0] for s in sort_by]:
             return sqlalchemy.select([c for c in self.recipe_table.c],# + [self.categories_table.c.category],
                                      criteria,distinct=True,
@@ -785,13 +791,6 @@ def search_recipes (self, searches, sort_by=[]):
                                      order_by=make_order_by(sort_by,self.recipe_table,),
                                      ).execute().fetchall()
 
-    def filter (self, table, func):
-        """Return a table representing filtered with func.
-
-        func is called with each row of the table.
-        """
-        raise NotImplementedError
-
     def get_unique_values (self, colname,table=None,**criteria):
         """Get list of unique values for column in table."""
         if not table: table=self.recipe_table