-LRN: Add download+recursive/abort context menu items

2 files changed, 42 insertions, 4 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index 05a5ae95..45dee718 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -175,6 +175,8 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
                    (builder, "GNUNET_GTK_save_as_recursive_check_button"));
   if (GNUNET_FS_meta_data_test_for_directory (dc->meta))
     gtk_widget_set_sensitive (cb, TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), dc->is_recursive);
+    
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_save_as_dialog"));
   if (dc->filename != NULL)
diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 83bfcb50..b20fb8a2 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -617,7 +617,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
  */
 static void
 start_download (GtkTreeView * tree_view, GtkTreePath * path,
-                GtkTreeViewColumn * column, gpointer user_data)
+                GtkTreeViewColumn * column, gboolean recursive, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
   GtkTreeModel *tm;
@@ -697,6 +697,7 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
   dlc->anonymity = -1;
+  dlc->is_recursive = recursive;
   GNUNET_FS_GTK_open_download_as_dialog (dlc);
   g_free (mime);
 }
@@ -714,7 +715,7 @@ static GtkTreeRowReference *current_context_row_reference;
 static struct SearchTab *current_context_search_tab;
 
 /**
- * Download was selected in the current search context menu.
+ * "Download" was selected in the current search context menu.
  */
 static void
 start_download_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
@@ -733,7 +734,32 @@ start_download_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (current_context_search_tab->builder,
                        "_search_result_frame"));
-  start_download (tv, path, NULL, current_context_search_tab);
+  start_download (tv, path, NULL, FALSE, current_context_search_tab);
+  gtk_tree_path_free (path);
+  current_context_search_tab = NULL;
+}
+
+/**
+ * "Download recursively" was selected in the current search context menu.
+ */
+static void
+start_download_recursively_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
+{
+  GtkTreePath *path;
+  GtkTreeView *tv;
+
+  if (current_context_row_reference == NULL)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  path = gtk_tree_row_reference_get_path (current_context_row_reference);
+  gtk_tree_row_reference_free (current_context_row_reference);
+  current_context_row_reference = NULL;
+  tv = GTK_TREE_VIEW (gtk_builder_get_object
+                      (current_context_search_tab->builder,
+                       "_search_result_frame"));
+  start_download (tv, path, NULL, TRUE, current_context_search_tab);
   gtk_tree_path_free (path);
   current_context_search_tab = NULL;
 }
@@ -869,6 +895,16 @@ search_list_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
                                      (gtk_bin_get_child (GTK_BIN (child))),
                                      TRUE);
         gtk_widget_show (child);
+        gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
+
+        child = gtk_menu_item_new_with_label (_("Download _recursively"));
+        g_signal_connect (child, "activate",
+                          G_CALLBACK (start_download_recursively_ctx_menu), NULL);
+        gtk_label_set_use_underline (GTK_LABEL
+                                     (gtk_bin_get_child (GTK_BIN (child))),
+                                     TRUE);
+        gtk_widget_show (child);
+        gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
       }
       else
       {
@@ -879,7 +915,7 @@ search_list_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
                                      (gtk_bin_get_child (GTK_BIN (child))),
                                      TRUE);
         gtk_widget_show (child);
-
+        gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
       }
 
       child = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));