-starting to get working animation for publish tab

1 files changed, 76 insertions, 19 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 003a2ea7..81a23ad1 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -191,6 +191,11 @@ struct PublishTab
    * Associated tree store.
    */
   GtkTreeStore *ts;
+
+  /**
+   * Animation handle associated with the tree store.
+   */
+  struct GNUNET_FS_AnimationTreeViewHandle *atv;
 };
 
 
@@ -250,10 +255,33 @@ static struct SearchTab *uri_tab;
  */
 static struct PublishTab *publish_tab;
 
+/**
+ * Animation to display while publishing.
+ */
+static struct GNUNET_FS_AnimationContext *animation_publishing;
+
+
 
 /* ***************** Search event handling ****************** */
 
 
+static struct GNUNET_FS_AnimationContext *
+load_animation (const char *basename)
+{
+  struct GNUNET_FS_AnimationContext *ac;
+  const char *dd;
+  char *fn;
+
+  dd = GNUNET_GTK_get_data_dir ();
+  GNUNET_asprintf (&fn,
+                   "%s%s.gif",
+                   dd, basename);
+  ac = GNUNET_GTK_animation_context_create (fn);
+  GNUNET_free (fn);
+  return ac;
+}
+
+
 /**
  * Clear the metadata list and the preview widget.
  */
@@ -2617,6 +2645,36 @@ handle_publish_error (struct PublishEntry *pe,
 
 
 /**
+ * Remove publish tab from notebook 
+ */
+static void
+delete_publish_tab ()
+{
+  GtkNotebook *notebook;
+  int index;
+  int i;
+ 
+  notebook =
+      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+                    ("GNUNET_GTK_main_window_notebook"));
+  index = -1;
+  for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
+    if (publish_tab->frame == gtk_notebook_get_nth_page (notebook, i))
+      index = i;
+  gtk_notebook_remove_page (notebook, index);
+
+  /* fully destroy tab */
+  g_object_unref (publish_tab->builder);
+  if (NULL != publish_tab->atv)
+    GNUNET_GTK_animation_tree_view_unregister (publish_tab->atv);
+  GNUNET_free (publish_tab);
+  publish_tab = NULL;
+  GNUNET_GTK_animation_context_destroy (animation_publishing);
+  animation_publishing = NULL;
+}
+
+
+/**
  * A publishing operation was stopped (in FS API).  Free an entry in
  * the publish tab and its associated state.
  *
@@ -2644,6 +2702,8 @@ handle_publish_stop (struct PublishEntry *pe)
     GNUNET_FS_uri_destroy (pe->uri);
     pe->uri = NULL;
   }
+  if (! gtk_tree_model_iter_children (GTK_TREE_MODEL (pe->tab->ts), &iter, NULL))
+    delete_publish_tab ();
   GNUNET_free (pe);
 }
 
@@ -2663,9 +2723,6 @@ GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button,
   struct PublishEntry *pe;
   GtkTreeIter iter;
   GtkTreeModel *tm;
-  GtkNotebook *notebook;
-  int index;
-  int i;
 
   GNUNET_assert (tab == publish_tab);
   /* stop all active operations */
@@ -2676,21 +2733,7 @@ GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button,
     GNUNET_FS_publish_stop (pe->pc);
   }
   clear_metadata_display ();
-
-  /* remove tab from notebook */
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
-  index = -1;
-  for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
-    if (publish_tab->frame == gtk_notebook_get_nth_page (notebook, i))
-      index = i;
-  gtk_notebook_remove_page (notebook, index);
-
-  /* fully destroy tab */
-  g_object_unref (publish_tab->builder);
-  GNUNET_free (publish_tab);
-  publish_tab = NULL;
+  delete_publish_tab ();
 }
 
 
@@ -2717,6 +2760,8 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
   GtkWidget *tab_label;
   GtkNotebook *notebook;
   char *size_fancy;
+  GtkTreeView *tv;
+  GtkTreeViewColumn *anim_col;
   
   if (NULL == publish_tab)
   {
@@ -2739,7 +2784,15 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
     g_object_ref (tab_label);
     gtk_container_remove (GTK_CONTAINER (df), tab_label);
     gtk_widget_destroy (GTK_WIDGET (df));
-    
+
+    tv = GTK_TREE_VIEW (gtk_builder_get_object
+                        (publish_tab->builder, "_publish_tree_view"));
+    anim_col = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object
+                        (publish_tab->builder, "_publish_animated_icon"));
+    if ( (NULL != tv) && (NULL != anim_col) )
+      publish_tab->atv = GNUNET_GTK_animation_tree_view_register (tv,
+                                                                  anim_col);
+
     /* make visible */
     notebook =
       GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
@@ -2770,6 +2823,8 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
     }
     pitrptr = &piter;
   }
+  if (NULL == animation_publishing)
+    animation_publishing = load_animation ("publishing");
   
   /* create entry and perform insertion */
   ent = GNUNET_malloc (sizeof (struct PublishEntry));
@@ -2783,6 +2838,8 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
                                      PUBLISH_TAB_MC_BGCOLOUR, "white",
                                      PUBLISH_TAB_MC_PROGRESS, (guint) 0,
                                      PUBLISH_TAB_MC_ENT, ent,
+                                     PUBLISH_TAB_MC_STATUS_ICON,
+                                     GNUNET_GTK_animation_context_get_pixbuf (animation_publishing),
                                      -1);
   GNUNET_free (size_fancy);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (publish_tab->ts), &iter);