fixing Mantis 1042

8 files changed, 211 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 61eb838e..b524a628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 28 20:16:46 MST 2007
+        Added ability to copy URIs of search results and
+        uploads to clipboard.
+        
 Fri Dec 22 19:21:07 MST 2006
         Releasing gnunet-gtk 0.7.1.
 
diff --git a/configure.ac b/configure.ac
index f09f7da1..2748fffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+# (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -20,8 +20,8 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.57)
-AC_INIT([gnunet-gtk],[0.7.1],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.1])
+AC_INIT([gnunet-gtk],[0.7.1b],[bug-gnunet@gnu.org])
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.1b])
 AM_CONFIG_HEADER(config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 322716df..b17509de 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -87,7 +87,7 @@
                           <child>
                             <widget class="GtkLabel" id="titleLabel">
                               <property name="visible">True</property>
-                              <property name="label" translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 0.7.1pre2&lt;/span&gt;</property>
+                              <property name="label" translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 0.7.1b&lt;/span&gt;</property>
                               <property name="use_underline">False</property>
                               <property name="use_markup">True</property>
                               <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/po/Makefile.in b/po/Makefile.in
index 5d50a430..c7659930 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.13
 
 PACKAGE = gnunet-gtk
-VERSION = 0.7.1
+VERSION = 0.7.1b
 
 SHELL = /bin/sh
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 58ddc34a..1bf8877f 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -51,6 +51,17 @@ GtkTreeStore * download_summary;
 
 GtkTreeStore * upload_summary;
 
+/**
+ * Last right-click event coordinates in summary.
+ */
+static unsigned int last_x;
+
+/**
+ * Last right-click event coordinates in summary.
+ */
+static unsigned int last_y;
+
+
 static void *
 saveEventProcessor(void * cls) {
   const FSUI_Event * event = cls;
@@ -178,7 +189,7 @@ saveEventProcessor(void * cls) {
     ret = fs_upload_started(event->data.UploadResumed.uc.pos,
                             event->data.UploadResumed.uc.pcctx,
                             event->data.UploadResumed.filename,
-                            NULL, /* FIXME: maybe completed!? */
+                            event->data.UploadResumed.uri,
                             event->data.UploadResumed.total,
                             event->data.UploadResumed.completed,
                             event->data.UploadResumed.state);
@@ -271,6 +282,85 @@ static void on_search_summary_selection_changed(gpointer signal,
                            gtk_tree_selection_count_selected_rows(selection) > 0);
 }
 
+static int 
+on_upload_copy_uri_activate(void * cls,
+                            GtkWidget * searchEntry) {
+  GtkTreeView * uploadList = cls;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+  struct ECRS_URI * uri;
+  char * str;
+  GtkClipboard * clip;
+
+  path = NULL;
+  if (FALSE == gtk_tree_view_get_path_at_pos(uploadList,
+                                             last_x,
+                                             last_y,
+                                             &path,
+                                             NULL,
+                                             NULL,
+                                             NULL)) {
+    GE_BREAK(NULL, 0);
+    return FALSE;
+  }
+  if (FALSE == gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                                       &iter,
+                                       path)) {
+    GE_BREAK(NULL, 0);
+    gtk_tree_path_free(path);
+    return FALSE;
+  }
+  gtk_tree_path_free(path);
+  uri = NULL;
+  gtk_tree_model_get(GTK_TREE_MODEL(upload_summary),
+                     &iter,
+                     UPLOAD_URISTRING, &str,
+                     -1);
+  clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+  gtk_clipboard_set_text(clip,
+                         str,
+                         strlen(str));
+  FREE(str);
+  return FALSE;
+} 
+
+static gint
+upload_click_handler(void * cls, 
+                     GdkEvent *event) {
+  GtkTreeView * uploadList = cls;
+  GtkMenu * menu;
+  GtkWidget * entry;
+  GdkEventButton * event_button;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+  if (event->type != GDK_BUTTON_PRESS) 
+    return FALSE;
+  event_button = (GdkEventButton *) event;
+  if (event_button->button != 3) 
+    return FALSE;  
+  last_x = event_button->x;
+  last_y = event_button->y;
+  entry = gtk_menu_item_new_with_label(_("_Copy URI to Clipboard"));
+  g_signal_connect_swapped (entry,
+                            "activate",
+                            G_CALLBACK(on_upload_copy_uri_activate), 
+                            uploadList);
+  gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(entry))),
+                              TRUE);
+  gtk_widget_show(entry);
+  menu = GTK_MENU(gtk_menu_new());
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu),
+                        entry);
+  gtk_menu_popup (menu,
+                  NULL,
+                  NULL,
+                  NULL,
+                  NULL, 
+                  event_button->button,
+                  event_button->time);
+  return TRUE;
+}
+
 /**
  * Setup the summary views (in particular the models
  * and the renderers).
@@ -421,6 +511,10 @@ static void fs_summary_start() {
   /* upload summary setup */
   uploadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
                                                   "activeUploadsList"));
+  g_signal_connect_swapped (uploadList,
+                            "button-press-event",
+                            G_CALLBACK(upload_click_handler), 
+                            uploadList);
   upload_summary =
     gtk_tree_store_new(UPLOAD_NUM,
                        G_TYPE_STRING, /* filename */
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 95ec2cbd..acd24776 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -194,14 +194,25 @@ typedef struct SL {
   char * searchString;
 
   /**
+   * FSUI search handle.
+   */
+  struct FSUI_SearchList * fsui_list;
+
+  /**
    * Number of results received so far.
    */
   unsigned int resultsReceived;
 
   /**
-   * FSUI search handle.
+   * X-coordinate of the last right-click in the search list.
    */
-  struct FSUI_SearchList * fsui_list;
+  unsigned int last_x;
+
+  /**
+   * Y-coordinate of the last right-click in the search list.
+   */ 
+  unsigned int last_y;
+
 } SearchList;
 
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 86c117bd..d1e5676a 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -160,6 +160,87 @@ void fs_search_result_received(SearchList * searchContext,
   updateSearchSummary(searchContext);
 }
 
+static int 
+on_search_copy_uri_activate(void * cls,
+                            GtkWidget * searchEntry) {
+  SearchList * list = cls;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+  struct ECRS_URI * uri;
+  char * str;
+  GtkClipboard * clip;
+
+  path = NULL;
+  if (FALSE == gtk_tree_view_get_path_at_pos(list->treeview,
+                                             list->last_x,
+                                             list->last_y,
+                                             &path,
+                                             NULL,
+                                             NULL,
+                                             NULL)) {
+    GE_BREAK(NULL, 0);
+    return FALSE;
+  }
+  if (FALSE == gtk_tree_model_get_iter(GTK_TREE_MODEL(list->tree),
+                                       &iter,
+                                       path)) {
+    GE_BREAK(NULL, 0);
+    gtk_tree_path_free(path);
+    return FALSE;
+  }
+  gtk_tree_path_free(path);
+  uri = NULL;
+  gtk_tree_model_get(GTK_TREE_MODEL(list->tree),
+                     &iter,
+                     SEARCH_URI, &uri,
+                     -1);
+  str = ECRS_uriToString(uri);
+  clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+  gtk_clipboard_set_text(clip,
+                         str,
+                         strlen(str));
+  FREE(str);
+  return FALSE;
+} 
+
+static gint
+search_click_handler(void * cls, 
+                     GdkEvent *event) {
+  SearchList * list = cls;
+  GtkMenu * menu;
+  GtkWidget * entry;
+  GdkEventButton * event_button;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  if (event->type != GDK_BUTTON_PRESS) 
+    return FALSE;
+  event_button = (GdkEventButton *) event;
+  if (event_button->button != 3) 
+    return FALSE;  
+  list->last_x = event_button->x;
+  list->last_y = event_button->y;
+  entry = gtk_menu_item_new_with_label(_("_Copy URI to Clipboard"));
+  g_signal_connect_swapped (entry,
+                            "activate",
+                            G_CALLBACK(on_search_copy_uri_activate), 
+                            list);
+  gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(entry))),
+                              TRUE);
+  gtk_widget_show(entry);
+  menu = GTK_MENU(gtk_menu_new());
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu),
+                        entry);
+  gtk_menu_popup (menu,
+                  NULL,
+                  NULL,
+                  NULL,
+                  NULL, 
+                  event_button->button,
+                  event_button->time);
+  return TRUE;
+}
+
 /**
  * FSUI event: a search was started; create the
  * tab and add an entry to the summary.
@@ -224,7 +305,10 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
   /* setup tree view and renderers */
   list->treeview = GTK_TREE_VIEW(glade_xml_get_widget(list->searchXML,
                                                       "searchResults"));
-
+  g_signal_connect_swapped (list->treeview, 
+                            "button-press-event",
+                            G_CALLBACK(search_click_handler), 
+                            list);
   list->tree =
     gtk_tree_store_new(SEARCH_NUM,
                        G_TYPE_STRING, /* name */
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 2e80c165..e8d91b2e 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -315,7 +315,7 @@ void on_fileInformationKeywordEntry_changed_fs(gpointer dummy2,
 }
 
 typedef struct {
-  const char * filename;
+  char * filename;
   unsigned int anonymity;
   unsigned int priority;
   int index;
@@ -349,6 +349,7 @@ static void * start_upload_helper(void * cls) {
 void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
                                         GtkWidget * uploadButton) {
   FSUC fsuc;
+  const char * filename;
   const char * filenamerest;
   GtkWidget * dialog;
   EXTRACTOR_ExtractorList * extractors;
@@ -367,8 +368,8 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
     extractors = EXTRACTOR_loadConfigLibraries(extractors,
                                                config);
   FREE(config); 
-  fsuc.filename = getEntryLineValue(getMainXML(),
-                                    "uploadFilenameComboBoxEntry");
+  filename = getEntryLineValue(getMainXML(),
+                               "uploadFilenameComboBoxEntry");
   metaXML
     = glade_xml_new(getGladeFileName(),
                     "metaDataDialog",
@@ -379,11 +380,11 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
   meta = ECRS_createMetaData();
   ECRS_extractMetaData(ectx,
                        meta,
-                       fsuc.filename,
+                       filename,
                        extractors);
   EXTRACTOR_removeAll(extractors);
-  filenamerest = &fsuc.filename[strlen(fsuc.filename)-1];
-  while ( (filenamerest > fsuc.filename) &&
+  filenamerest = &filename[strlen(filename)-1];
+  while ( (filenamerest > filename) &&
           (filenamerest[-1] != DIR_SEPARATOR) )
     filenamerest--;
   ECRS_addToMetaData(meta,
@@ -437,8 +438,10 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
     fsuc.gkeywordURI = ECRS_stringToUri(ectx,
                                    ECRS_URI_PREFIX
                                    ECRS_SEARCH_INFIX);
+    fsuc.filename = STRDUP(filename);
     run_with_save_calls(&start_upload_helper,
                         &fsuc);
+    FREE(fsuc.filename);
     ECRS_freeMetaData(fsuc.meta);
     ECRS_freeUri(fsuc.gkeywordURI);
     ECRS_freeUri(fsuc.keywordURI);
@@ -529,8 +532,6 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
   free(filename);
 }
 
-/* FIXME: handlers for clear and stop! */
-
 struct FCBC {
   int (*method)(struct FSUI_Context * ctx,
                 struct FSUI_UploadList * list);