Merge pull request thinkle#276 from eginhard/fix-shopping

Fix shopping list buttons and dialogs
Apteryks · Oct 28, 2020 · 30e1b21 · 30e1b21
2 parents 472b6f3 + ac985d0
commit 30e1b21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/gourmet/GourmetRecipeManager.py b/gourmet/GourmetRecipeManager.py
@@ -746,7 +746,8 @@ def shop_recs (self, *args):
                                     parent=self.app.get_toplevel(),
                                     digits=2)
                 if not mult:
-                    mult = float(1)
+                    debug('getNumber cancelled', 2)
+                    return
             d=self.sl.getOptionalIngDic(self.rd.get_ings(r),mult,self.prefs)
             self.sl.addRec(r,mult,d)
             self.sl.show()
@@ -1029,7 +1030,8 @@ def setup_actions (self):
             #None,None,self.email_recs),
             ('BatchEdit',None,_('Batch _edit recipes'),
              '<Control><Shift>E',None,self.batch_edit_recs),
-            ('ShopRec','add-to-shopping-list',None,None,None,self.shop_recs)
+            ('ShopRec', 'add-to-shopping-list', _('Add to Shopping List'),
+             '<Control>B', None, self.shop_recs)
             ])
 
         self.mainActionGroup = Gtk.ActionGroup(name='MainActions')

diff --git a/gourmet/reccard.py b/gourmet/reccard.py
@@ -246,7 +246,8 @@ def setup_actions (self):
             # None,None,self.email_cb),
             ('Print',Gtk.STOCK_PRINT,_('Print recipe'),
              '<Control>P',None,self.print_cb),
-            ('ShopRec','add-to-shopping-list',None,None,None,self.shop_for_recipe_cb),
+            ('ShopRec', 'add-to-shopping-list', _('Add to Shopping List'),
+             '<Control>B', None, self.shop_for_recipe_cb),
             ('ForgetRememberedOptionals',None,_('Forget remembered optional ingredients'),
              None,_('Before adding to shopping list, ask about all optional ingredients, even ones you previously wanted remembered'),self.forget_remembered_optional_ingredients),
             ])
@@ -3122,4 +3123,3 @@ def getYieldSelection (rec, parent=None):
         return yd.run()
     except:
         return 1
-
diff --git a/gourmet/shopgui.py b/gourmet/shopgui.py
@@ -838,7 +838,8 @@ def clear_recipes (self, *args):
                 self.recs.__delitem__(t.id)
                 debug("clear removed %s"%t,3)
             self.reset()
-        elif de.getBoolean(label=_("No recipes selected. Do you want to clear the entire list?")):
+        elif de.getBoolean(label=_("No recipes selected. Do you want to clear the entire list?"),
+                           cancel=False):
             self.recs = {}
             self.extras = []
             self.reset()