1 files changed, 168 insertions, 8 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 654d8c82..edd2e045 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -25,19 +25,26 @@
  */
 
 #include "platform.h"
-#include "gnunetgtk_common.h"
 #include "fs.h"
+#include "download.h"
 #include "search.h"
 #include "upload.h"
 #include "collection.h"
 #include "namespace.h"
-#include <GNUnet/gnunet_fsui_lib.h>
 
 struct FSUI_Context * ctx;
 
-static struct GE_Context * ectx;
+struct GE_Context * ectx;
 
-static struct GC_Configuration * cfg;
+struct GC_Configuration * cfg;
+
+SearchList * search_head;
+
+DownloadList * download_head;
+
+GtkListStore * search_summary;
+
+GtkTreeStore * download_summary;
 
 typedef struct {
   const FSUI_Event * event;
@@ -112,7 +119,7 @@ static void saveEventProcessor(void * arg) {
     break;
  case FSUI_download_started:
     cls->ret = fs_download_started(event->data.DownloadStarted.dc.pos,
-                                   event->data.DownloadStarted.dc.pctx,
+                                   event->data.DownloadStarted.dc.pcctx,
                                    event->data.DownloadStarted.dc.sctx,
                                    event->data.DownloadStarted.total,
                                    event->data.DownloadStarted.anonymityLevel,
@@ -123,7 +130,7 @@ static void saveEventProcessor(void * arg) {
     break;
   case FSUI_download_resumed:
     cls->ret = fs_download_started(event->data.DownloadResumed.dc.pos,
-                                   event->data.DownloadStarted.dc.pctx,
+                                   event->data.DownloadStarted.dc.pcctx,
                                    event->data.DownloadStarted.dc.sctx,
                                    event->data.DownloadResumed.total,
                                    event->data.DownloadResumed.anonymityLevel,
@@ -185,6 +192,159 @@ static void * eventProcessor(void * unused,
   return cls.ret;
 }
 
+
+
+/**
+ * Setup the summary views (in particular the models
+ * and the renderers).  
+ */
+static void fs_summary_start() {
+  GtkComboBoxEntry * searchCB;
+  GtkTreeView * searchList;
+  GtkTreeView * downloadList;
+  GtkListStore * model;
+  GtkCellRenderer * renderer;
+  GtkTreeViewColumn * column;
+  int col;
+  
+  searchCB
+    = GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
+                                               "fssearchKeywordComboBoxEntry"));
+  
+  model = gtk_list_store_new(NS_SEARCH_NUM,
+                             G_TYPE_STRING, /* what we show */
+                             G_TYPE_STRING, /* EncName of namespace */
+                             G_TYPE_POINTER, /* ECRS MetaData */
+                             G_TYPE_POINTER, /* FSUI search list */
+                             G_TYPE_INT);  /* Meta-data about namespace */
+  gtk_combo_box_set_model(GTK_COMBO_BOX(searchCB),
+                          GTK_TREE_MODEL(model));
+  gtk_combo_box_entry_set_text_column(searchCB,
+                                      NS_SEARCH_DESCRIPTION);
+  searchList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
+                                                  "activeSearchesSummary"));
+  search_summary =
+    gtk_list_store_new(SEARCH_SUMMARY_NUM,
+                       G_TYPE_STRING, /* name */
+                       G_TYPE_INT,    /* # results */
+                       G_TYPE_POINTER);  /* internal: search list */
+  gtk_tree_view_set_model(searchList,
+                          GTK_TREE_MODEL(search_summary));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(searchList),
+                              GTK_SELECTION_MULTIPLE);
+
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(searchList,
+                                                    -1,
+                                                    _("Query"),
+                                                    renderer,
+                                                    "text", SEARCH_SUMMARY_NAME,
+                                              NULL);
+  column = gtk_tree_view_get_column(searchList,
+                                    col - 1);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  gtk_tree_view_column_set_clickable(column, TRUE);
+  gtk_tree_view_column_set_reorderable(column, TRUE);
+  gtk_tree_view_column_set_sort_column_id(column, SEARCH_SUMMARY_NAME);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(searchList,
+                                                    -1,
+                                                    _("Results"),
+                                                    renderer,
+                                                    "text", SEARCH_SUMMARY_RESULT_COUNT,
+                                                    NULL);
+  column = gtk_tree_view_get_column(searchList,
+                                    col - 1);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  gtk_tree_view_column_set_clickable(column, TRUE);
+  gtk_tree_view_column_set_reorderable(column, TRUE);
+  gtk_tree_view_column_set_sort_column_id(column, SEARCH_SUMMARY_RESULT_COUNT);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+
+
+  downloadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
+                                                    "activeDownloadsList"));
+  download_summary =
+    gtk_tree_store_new(DOWNLOAD_NUM,
+                       G_TYPE_STRING, /* name (full-path file name) */
+                       G_TYPE_STRING, /* name (user-friendly name) */
+                       G_TYPE_UINT64,  /* size */
+                       G_TYPE_STRING, /* human readable size */
+                       G_TYPE_INT,  /* progress */
+                       G_TYPE_STRING, /* uri as string */
+                       G_TYPE_POINTER); /* internal download list ptr */
+  gtk_tree_view_set_model(downloadList,
+                          GTK_TREE_MODEL(download_summary));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(downloadList),
+                              GTK_SELECTION_MULTIPLE);
+  renderer = gtk_cell_renderer_progress_new();
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("Name"),
+                                                    renderer,
+                                                    "value", DOWNLOAD_PROGRESS,
+                                                    "text", DOWNLOAD_SHORTNAME,
+                                                    NULL);
+  column = gtk_tree_view_get_column(downloadList,
+                                    col - 1);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  gtk_tree_view_column_set_clickable(column, TRUE);
+  gtk_tree_view_column_set_reorderable(column, TRUE);
+  gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_PROGRESS);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  renderer = gtk_cell_renderer_text_new();
+  g_object_set (renderer, "xalign", 1.00, NULL);
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("Size"),
+                                                    renderer,
+                                                    "text", DOWNLOAD_HSIZE,
+                                                    NULL);
+  
+  column = gtk_tree_view_get_column(downloadList,
+                                    col - 1);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  gtk_tree_view_column_set_clickable(column, TRUE);
+  gtk_tree_view_column_set_reorderable(column, TRUE);
+  gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_SIZE);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("URI"),
+                                                    renderer,
+                                                    "text", DOWNLOAD_URISTRING,
+                                                    NULL);
+  column = gtk_tree_view_get_column(downloadList,
+                                    col - 1);
+  gtk_tree_view_column_set_resizable(column, TRUE);
+  gtk_tree_view_column_set_reorderable(column, TRUE);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
+  gtk_tree_view_column_set_resizable(column, TRUE);
+}
+
+/**
+ * Shutdown.
+ */
+static void fs_summary_stop() {
+  GtkComboBox * searchCB;
+  GtkListStore * model;
+
+  searchCB
+    = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
+                                         "fssearchKeywordComboBoxEntry"));
+  model = GTK_LIST_STORE(gtk_combo_box_get_model(searchCB));
+  /* FIXME: iterate over model entries
+     and free URIs and MetaData! */
+}
+
+
+
+
+
 void init_fs(struct GE_Context * e,
              struct GC_Configuration * c) {
   GtkWidget * tab;
@@ -211,7 +371,7 @@ void init_fs(struct GE_Context * e,
                    &eventProcessor,
                    NULL);
   fs_collection_start(ectx, cfg);
-  fs_search_start(ectx, cfg);
+  fs_summary_start();
   fs_upload_start(ectx, cfg);
   fs_namespace_start(ectx, cfg);
 }
@@ -223,7 +383,7 @@ void done_fs() {
     = glade_xml_get_widget(getMainXML(),
                            "fsnotebook");
   gtk_widget_hide(tab);
-  fs_search_stop();
+  fs_summary_stop();
   fs_collection_stop();
   fs_namespace_stop();
   fs_upload_stop();