[GNUnet-SVN] r1199 - in gnunet-gtk: . src

[grothoff]

Author: grothoff
Date: 2005-07-01 15:00:03 -0700 (Fri, 01 Jul 2005)
New Revision: 1199

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/src/download.c
   gnunet-gtk/src/search.c
   gnunet-gtk/src/search.h
Log:
up

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2005-07-01 21:30:07 UTC (rev 1198)
+++ gnunet-gtk/TODO     2005-07-01 22:00:03 UTC (rev 1199)
@@ -1,8 +1,4 @@
 0.7.0pre4:
-* make use of anonymity level specification widgets [ easy, CG ]:
-  - download
-  - upload
-  - namespace creation
 * allow user to cancel downloads (may need FSUI API extensions) [ medium, CG ]
 * allow user to clear completed downloads from summary [ easy, CG ]
 * search:

Modified: gnunet-gtk/src/download.c
===================================================================
--- gnunet-gtk/src/download.c   2005-07-01 21:30:07 UTC (rev 1198)
+++ gnunet-gtk/src/download.c   2005-07-01 22:00:03 UTC (rev 1199)
@@ -111,8 +111,10 @@
   char * fn;
   DownloadList * list;
   GtkTreeIter iiter;
+  GtkWidget * spin;
   char * name;
   struct stat sbuf;
+  unsigned int anon;
 
   uri = NULL;
   meta = NULL;
@@ -200,10 +202,17 @@
                     -1);
   FREE(filename);
   FREE(name);
-
+  spin = getAnonymityButtonFromTM(model);
+  if (spin == NULL) {
+    BREAK();
+    anon = 1;
+  } else {
+    anon = gtk_spin_button_get_value_as_int
+      (GTK_SPIN_BUTTON(spin));
+  }
+  
   FSUI_startDownload(ctx,
-                    getConfigurationInt("GNUNET-GTK",
-                                        "ANONYMITY"), /* FIXME: get value from 
UI! */
+                    anon,
                     uri,
                     pfx);
 }
@@ -213,9 +222,10 @@
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  gtk_tree_selection_selected_foreach(selection,
-                                     (GtkTreeSelectionForeachFunc) 
&initiateDownload,
-                                     NULL);
+  gtk_tree_selection_selected_foreach
+    (selection,
+     (GtkTreeSelectionForeachFunc) &initiateDownload,
+     NULL);
 }
 
 /**

Modified: gnunet-gtk/src/search.c
===================================================================
--- gnunet-gtk/src/search.c     2005-07-01 21:30:07 UTC (rev 1198)
+++ gnunet-gtk/src/search.c     2005-07-01 22:00:03 UTC (rev 1199)
@@ -121,6 +121,8 @@
   struct SL * next;
   GtkWidget * treeview;
   GtkWidget * searchpage;
+  GtkTreeModel * model;
+  GtkWidget * anonymityButton;
   struct ECRS_URI * uri;
 } SearchList;
 
@@ -128,6 +130,18 @@
 
 static GtkListStore * summary;
 
+GtkWidget * getAnonymityButtonFromTM(GtkTreeModel * model) {
+  SearchList * list;
+
+  list = head;
+  while (list != NULL) {
+    if (list->model == model)
+      return list->anonymityButton;
+    list = list->next;
+  }
+  return NULL;
+}
+
 /**
  * Recursively free the (internal) model data fields
  * (uri and meta) from the search tree model.
@@ -345,7 +359,8 @@
   BREAK();
 }
 
-static GtkWidget * makeResultFrame(GtkWidget ** treeview) {
+static GtkWidget * makeResultFrame(GtkWidget ** treeview,
+                                  GtkWidget ** anonSpin) {
   GtkWidget * window;
   GtkWidget * child;
   GtkWidget * resultList;
@@ -362,6 +377,8 @@
                               "searchResultsFrame");
   resultList = glade_xml_get_widget(searchXML,
                                    "searchResults");
+  *anonSpin = glade_xml_get_widget(searchXML,
+                                  "downloadAnonymitySpinButton");
   if (treeview != NULL)
     (*treeview) = GTK_WIDGET(GTK_TREE_VIEW(resultList));
   tree =
@@ -514,11 +531,17 @@
   list
     = MALLOC(sizeof(SearchList));
   list->searchpage
-    = makeResultFrame(&list->treeview);
+    = makeResultFrame(&list->treeview,
+                     &spin);
   list->next 
     = head;
   list->uri
     = uri;
+  list->model
+    = gtk_tree_view_get_model(GTK_TREE_VIEW(list->treeview));
+  list->anonymityButton
+    = spin;
+
   head = list;
 
   gtk_list_store_append(summary,
@@ -626,6 +649,7 @@
   char * description;
   char * dhead;
   GtkWidget * label;
+  GtkWidget * spin;
   GtkWidget * notebook;
   GtkTreeStore * model;
   GtkTreeIter iter;
@@ -662,7 +686,13 @@
   list->uri = ECRS_dupUri(uri);
   list->next = head;
   list->searchpage
-    = makeResultFrame(&list->treeview);
+    = makeResultFrame(&list->treeview,
+                     &spin);
+  list->anonymityButton
+    = spin;
+  model = 
GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list->treeview)));
+  list->model
+    = GTK_TREE_MODEL(model);
   notebook
     = glade_xml_get_widget(mainXML,
                           "downloadNotebook");
@@ -671,7 +701,6 @@
                           label);
   gtk_widget_show(notebook);
   head = list;
-  model = 
GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list->treeview)));
   for (i=0;i<resultCount;i++) {
     addSearchResultToModel(&results[i],
                           list->treeview,

Modified: gnunet-gtk/src/search.h
===================================================================
--- gnunet-gtk/src/search.h     2005-07-01 21:30:07 UTC (rev 1198)
+++ gnunet-gtk/src/search.h     2005-07-01 22:00:03 UTC (rev 1199)
@@ -55,7 +55,12 @@
                         const struct ECRS_URI * uri,
                         GtkTreeRowReference * row);
 
+/**
+ * Helper for download.
+ */
+GtkWidget * getAnonymityButtonFromTM(GtkTreeModel * model);
 
+
 void fs_search_start(void);
 
 void fs_search_stop(void);