[recipes] window: Add an undo button to the shopping done notification

[Matthias Clasen <matthiasc src gnome org>]

commit 7269113f5e3dc6215eec8516661a2ef6f3251465
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 13 23:28:15 2017 -0400

    window: Add an undo button to the shopping done notification
    
    The undo button brings you back to the shopping list.
    Use the new store APIs to preserve not just the recipes,
    but also the servings and the excluded ingredients.

 src/gr-window.c  |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/gr-window.ui |    9 ++++++
 2 files changed, 85 insertions(+), 3 deletions(-)
---
diff --git a/src/gr-window.c b/src/gr-window.c
index 332a5eb..2583cba 100644
--- a/src/gr-window.c
+++ b/src/gr-window.c
@@ -74,18 +74,24 @@ struct _GrWindow
         GtkWidget *cuisine_page;
         GtkWidget *image_page;
         GtkWidget *cooking_page;
+
         GtkWidget *undo_revealer;
         GtkWidget *undo_label;
         GrRecipe  *undo_recipe;
         guint undo_timeout_id;
+
         GtkWidget *remind_revealer;
         GtkWidget *remind_label;
         GrRecipe  *remind_recipe;
         guint remind_timeout_id;
+
         GtkWidget *shopping_added_revealer;
         guint shopping_timeout_id;
+
         GtkWidget *shopping_done_revealer;
         guint shopping_done_timeout_id;
+        GList *shopping_done_list;
+        char **removed_ingredients;
 
         GObject *file_chooser;
         GrRecipeImporter *importer;
@@ -544,6 +550,20 @@ gr_window_new (GrApp *app)
         return g_object_new (GR_TYPE_WINDOW, "application", app, NULL);
 }
 
+typedef struct {
+        GrRecipe *recipe;
+        int serves;
+} ShoppingListEntry;
+
+static void
+shopping_list_entry_free (gpointer data)
+{
+        ShoppingListEntry *entry = data;
+
+        g_object_unref (entry->recipe);
+        g_free (entry);
+}
+
 static void
 gr_window_finalize (GObject *object)
 {
@@ -569,6 +589,14 @@ gr_window_finalize (GObject *object)
                 self->shopping_timeout_id = 0;
         }
 
+        g_list_free_full (self->shopping_done_list, shopping_list_entry_free);
+        g_strfreev (self->removed_ingredients);
+
+        if (self->shopping_done_timeout_id) {
+                g_source_remove (self->shopping_done_timeout_id);
+                self->shopping_done_timeout_id = 0;
+        }
+
         g_list_free (self->dialogs);
 
         G_OBJECT_CLASS (gr_window_parent_class)->finalize (object);
@@ -735,6 +763,11 @@ close_shopping_done (GrWindow *window)
                 window->shopping_done_timeout_id = 0;
         }
 
+        g_list_free_full (window->shopping_done_list, shopping_list_entry_free);
+        window->shopping_done_list = NULL;
+        g_strfreev (window->removed_ingredients);
+        window->removed_ingredients = NULL;
+
         gtk_revealer_set_reveal_child (GTK_REVEALER (window->shopping_done_revealer), FALSE);
 }
 
@@ -749,6 +782,27 @@ shopping_done_timeout (gpointer data)
 }
 
 static void
+back_to_shopping (GrWindow *window)
+{
+        GrRecipeStore *store;
+        GList *l;
+        int i;
+
+        store = gr_recipe_store_get ();
+
+        for (l = window->shopping_done_list; l; l = l->next) {
+                ShoppingListEntry *entry = l->data;
+                gr_recipe_store_add_to_shopping (store, entry->recipe, entry->serves);
+        }
+        for (i = 0; window->removed_ingredients && window->removed_ingredients[i]; i++) {
+                gr_recipe_store_remove_shopping_ingredient (store, window->removed_ingredients[i]);
+        }
+
+        close_shopping_done (window);
+        gr_window_show_shopping (window);
+}
+
+static void
 gr_window_offer_cooking (GrWindow *window)
 {
         gtk_revealer_set_reveal_child (GTK_REVEALER (window->shopping_done_revealer), TRUE);
@@ -762,10 +816,14 @@ static void gr_window_show_transient_list (GrWindow   *window,
 static void
 done_shopping (GrWindow *window)
 {
-        GList *recipes;
+        GList *recipes, *l;
         GrRecipeStore *store;
+        const char **removed_ingredients;
 
-        recipes = gr_shopping_page_get_recipes (GR_SHOPPING_PAGE (window->shopping_page));
+        store = gr_recipe_store_get ();
+
+        recipes = gr_recipe_store_get_shopping_list (store);
+        removed_ingredients = gr_recipe_store_get_removed_shopping_ingredients (store);
 
         if (recipes->next == NULL)
                 gr_window_show_recipe (window, recipes->data);
@@ -774,9 +832,23 @@ done_shopping (GrWindow *window)
 
         gr_window_offer_cooking (window);
 
+        g_list_free_full (window->shopping_done_list, shopping_list_entry_free);
+        window->shopping_done_list = NULL;
+
+        for (l = recipes; l; l = l->next) {
+                GrRecipe *recipe = l->data;
+                ShoppingListEntry *entry;
+
+                entry = g_new (ShoppingListEntry, 1);
+                entry->recipe = g_object_ref (recipe);
+                entry->serves = gr_recipe_store_get_shopping_serves (store, recipe);
+                window->shopping_done_list = g_list_append (window->shopping_done_list, entry);
+        }
         g_list_free_full (recipes, g_object_unref);
 
-        store = gr_recipe_store_get ();
+        g_strfreev (window->removed_ingredients);
+        window->removed_ingredients = g_strdupv ((char **)removed_ingredients);
+
         gr_recipe_store_clear_shopping_list (store);
 }
 
@@ -855,6 +927,7 @@ gr_window_class_init (GrWindowClass *klass)
         gtk_widget_class_bind_template_callback (widget_class, shopping_title_changed);
         gtk_widget_class_bind_template_callback (widget_class, done_shopping);
         gtk_widget_class_bind_template_callback (widget_class, close_shopping_done);
+        gtk_widget_class_bind_template_callback (widget_class, back_to_shopping);
         gtk_widget_class_bind_template_callback (widget_class, make_save_sensitive);
 }
 
diff --git a/src/gr-window.ui b/src/gr-window.ui
index 46b07be..d88c627 100644
--- a/src/gr-window.ui
+++ b/src/gr-window.ui
@@ -213,6 +213,15 @@
                           <object class="GtkButton">
                             <property name="visible">1</property>
                             <property name="focus-on-click">0</property>
+                            <property name="label" translatable="yes">_Undo</property>
+                            <property name="use-underline">1</property>
+                            <signal name="clicked" handler="back_to_shopping" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton">
+                            <property name="visible">1</property>
+                            <property name="focus-on-click">0</property>
                             <property name="relief">none</property>
                             <signal name="clicked" handler="close_shopping_done" swapped="yes"/>
                             <style>