Select next item in the list after starting the download

3 files changed, 55 insertions, 1 deletions

diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index 19b9f30e..36b1c897 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -545,5 +545,34 @@ GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter)
   return result;
 }
 
+gboolean
+GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model, GtkTreeIter *iter, gboolean allow_children, GtkTreeIter *next_iter)
+{
+  GtkTreeIter current_iter = *iter;
+  while (TRUE)
+  {
+    GtkTreeIter tmp_iter;
+
+    tmp_iter = current_iter;
+    if (gtk_tree_model_iter_next (model, &tmp_iter))
+    {
+      *next_iter = tmp_iter;
+      return TRUE;
+    }
+    if (allow_children)
+    {
+      if (gtk_tree_model_iter_children (model, &tmp_iter, &current_iter))
+      {
+        *next_iter = tmp_iter;
+        return TRUE;
+      }
+    }
+    allow_children = FALSE;
+    if (!gtk_tree_model_iter_parent (model, &tmp_iter, &current_iter))
+      return FALSE;
+    current_iter = tmp_iter;
+  }
+  return FALSE;
+}
 
 /* end of gnunet-fs-gtk-common.c */
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 1bf4c258..0a13e59d 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -194,5 +194,26 @@ GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, GtkTreeIter *iter);
 GtkTreeRowReference *
 GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter);
 
+/**
+ * Fills "next_iter" with iterator for an item that comes next in the tree
+ * after "iter".
+ * Next item is, in order of precedence:
+ * 1) First child of "iter", if "iter" has children and "allow_children"
+ *   is enabled.
+ * 2) Next sibling of "iter", unless "iter" is the last sibling.
+ * If none of those are present, function recursively checks parents of
+ *   "iter" until it finds next item or runs out of parents.
+ *
+ * @param model a model to reference
+ * @param iter an iter that points to current row in the model
+ * @param allow_children whether child of "iter" is considered to be next.
+ * @param next_iter will be filled with the next row in the model on success
+ * @return TRUE if next_iter is set to a valid iter,
+ *         FALSE if ran out of parents
+ */
+gboolean
+GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model,
+    GtkTreeIter *iter, gboolean allow_children, GtkTreeIter *next_iter);
+
 #endif
 /* end of gnunet-fs-gtk-common.h */
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 96d88698..56bbbcb4 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -964,8 +964,8 @@ start_download2 ()
   gchar *downloaddir;
   struct DownloadEntry *de;
   guint anonymity;
-  
   gboolean recursive;
+  GtkTreeIter next_item;
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object (st->builder, "_search_result_frame"));
   sel = gtk_tree_view_get_selection (tv);
@@ -1017,6 +1017,10 @@ start_download2 ()
 
   gtk_tree_path_free (path);
   g_free (downloaddir);
+
+  if (GNUNET_GTK_tree_model_get_next_flat_iter (model, &iter, !recursive, &next_item))
+    gtk_tree_selection_select_iter (sel, &next_item);
+  GNUNET_FS_GTK_search_treeview_cursor_changed (tv, st);
 }
 
 /**