From ae0b112946f553ab84f8ae4b94d04de52cf1d697 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Jun 2008 22:08:54 +0000 Subject: duplicate menu --- gnunet-gtk.glade | 911 ++++++++++++++++++++++----------------------- src/plugins/fs/namespace.c | 14 +- 2 files changed, 449 insertions(+), 476 deletions(-) diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade index 86604556..d004360c 100644 --- a/gnunet-gtk.glade +++ b/gnunet-gtk.glade @@ -575,115 +575,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - True - True - - - - - 1 - 2 - - - - - True - 0 - 1 - 5 - 5 - <b>Search Overview</b> - True - - - 2 - GTK_FILL - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - True - True - - - - - 3 - 4 - - - - + True True - - True - False - True - Cancel the selected download (and all sub-downloads) and delete incomplete downloads - gtk-delete - True - 0 - - - - False - - - - + True False True - Stop the selected download (and all sub-downloads) and remove them from the list. This will NOT cause the deletion of files from incomplete downloads. + Cancel the selected upload (and all sub-uploads) and remove them from the list gtk-stop True 0 - + + False False - 1 - + True True - Clear completed downloads from the list + Clear completed uploads from the list 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True 2 - + True gtk-clear @@ -693,7 +621,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True _Clean True @@ -710,21 +638,106 @@ This release adds context-menus (right-click) which allow copying the URI of sea - False False - 2 + 1 1 2 - 3 - 4 + 6 + 7 GTK_FILL 5 + + + True + False + True + Cancel the selected search and remove it from the list + 4 + gtk-stop + True + 0 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 5 + + + True + 0 + 5 + 5 + <b>Publications</b> + True + + + + + 2 + 5 + 6 + GTK_FILL + + + + + True + 5 + + + True + 0 + 5 + 5 + <b>Downloads</b> + True + + + + + 2 + 2 + 3 + GTK_FILL + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + True + + + + + 6 + 7 + + True @@ -840,129 +853,58 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + True - + True + False True - True - True + Cancel the selected download (and all sub-downloads) and delete incomplete downloads + gtk-delete + True + 0 + + + False + - - - 6 - 7 - - - - - True - 5 - + True - 0 - 5 - 5 - <b>Downloads</b> - True + False + True + Stop the selected download (and all sub-downloads) and remove them from the list. This will NOT cause the deletion of files from incomplete downloads. + gtk-stop + True + 0 + + + False + 1 + - - - 2 - 2 - 3 - GTK_FILL - - - - - True - 5 - - True - 0 - 5 - 5 - <b>Publications</b> - True - - - - - 2 - 5 - 6 - GTK_FILL - - - - - True - False - True - Cancel the selected search and remove it from the list - 4 - gtk-stop - True - 0 - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - True - - - True - False - True - Cancel the selected upload (and all sub-uploads) and remove them from the list - gtk-stop - True - 0 - - - - False - False - - - - + True True - Clear completed uploads from the list + Clear completed downloads from the list 0 - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True 2 - + True gtk-clear @@ -972,7 +914,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True _Clean True @@ -989,20 +931,78 @@ This release adds context-menus (right-click) which allow copying the URI of sea + False False - 1 + 2 1 2 - 6 - 7 + 3 + 4 GTK_FILL 5 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + True + + + + + 3 + 4 + + + + + True + 0 + 1 + 5 + 5 + <b>Search Overview</b> + True + + + 2 + GTK_FILL + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + True + + + + + 1 + 2 + + @@ -1289,80 +1289,52 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 5 - Method: - True - indexbutton - - - GTK_FILL - - - - - - True - True - Indexing will avoid copying the file into the GNUnet database. Instead, GNUnet will try to add a symbolic link to the specified file. If that fails, a copy of the file will be created. Indexing should be used if the local machine is unlikely to ever be compromised by an adversary and if the uploaded file will not be modified or moved in the future. Indexing is more efficient than insertion. - Inde_x - True - 0 - True - True + 0 + + + 94 + True + True + How important is the file (used to prioritize data in the local datastore). + 950 0 100000000 50 500 500 + 500 + True + + 1 2 + 3 + 4 GTK_FILL - - True - True - Inserting a file means that an encrypted copy will be added to the GNUnet database. Without the proper key (which is not stored in plaintext anywhere) the file cannot be decrypted. Use this option for small files, files that will be modified soon, files that maybe moved or if you are afraid that an adversary may detect the file in plaintext on your machine (after compromising your machine). - I_nsert - True - 0 - True - indexbutton - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 5 - Scope: - True - scopeFileOnlyButton - - - 1 - 2 - GTK_FILL - - - - - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 5 - _Anonymity: - True + 0 + + + True + True + What level of sender-anonymity is desired when sharing this particular file? 0 allows direct connections (no anonymity). Higher levels require increasing amounts of cover traffic per shared block, increasing your privacy at the expense of efficiency. + 1 0 10000 1 10 10 + 1 + True + + + 1 + 2 2 3 GTK_FILL @@ -1370,43 +1342,24 @@ This release adds context-menus (right-click) which allow copying the URI of sea - - True - True - Recursively publish an entire directory tree - _Recursive (for entire directories) - True - 0 - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - + True True - Should it be possible to directly find files in the directory? If unchecked, it will only be possible for the directory itself to be found with a normal keyword search. This option only really makes a difference for uploads of directories. + Controls if GNUnet should (automatically) extract metadata for files. If unchecked, the default metadata for the upload will only contain the filename. If checked, GNU libextractor will be used to provide additional metadata (such as thumbnails). The option only applies when a directory is uploaded. For individual files, GNU libextractor is always used (you will have a chance to edit the extracted metadata in a dialog). 0 True True - + True 0 0 - + True 2 - + True gtk-index @@ -1416,9 +1369,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - Add keywords for files in directories + Use libextractor for files in directories True @@ -1435,28 +1388,48 @@ This release adds context-menus (right-click) which allow copying the URI of sea 2 3 - 2 - 3 + 3 + 4 GTK_FILL - + True - False True - Share the specified file with the selected options (you will then be prompted to enter meta-data and keywords) + Only publish a single file + File onl_y + True 0 - + True + True + scopeRecursiveButton + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + True + Browse local computer for files (or directories) to publish + 0 + - + True 2 - + True - gtk-go-up + gtk-open False @@ -1464,9 +1437,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - Pub_lish + _Browse True @@ -1481,26 +1454,32 @@ This release adds context-menus (right-click) which allow copying the URI of sea 2 3 - 5 - 6 + 4 + 5 GTK_FILL - + True - 0 - 5 - _Filename: - True - GTK_JUSTIFY_CENTER - uploadFilenameComboBoxEntry + + + True + True + + + + + + + + 1 + 2 4 5 - GTK_FILL @@ -1520,43 +1499,38 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - - - True - True - - - - - - - + 0 + 5 + _Filename: + True + GTK_JUSTIFY_CENTER + uploadFilenameComboBoxEntry - 1 - 2 4 5 + GTK_FILL - + True + False True - Browse local computer for files (or directories) to publish + Share the specified file with the selected options (you will then be prompted to enter meta-data and keywords) 0 - + - + True 2 - + True - gtk-open + gtk-go-up False @@ -1564,69 +1538,48 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - _Browse - True - - - False - False - 1 - - - - - - - 2 - 3 - 4 - 5 - GTK_FILL - - - - - - True - True - Only publish a single file - File onl_y - True - 0 - True - True - scopeRecursiveButton + Pub_lish + True + + + False + False + 1 + + + + - 1 - 2 - 1 - 2 + 2 + 3 + 5 + 6 GTK_FILL - + True True - Controls if GNUnet should (automatically) extract metadata for files. If unchecked, the default metadata for the upload will only contain the filename. If checked, GNU libextractor will be used to provide additional metadata (such as thumbnails). The option only applies when a directory is uploaded. For individual files, GNU libextractor is always used (you will have a chance to edit the extracted metadata in a dialog). + Should it be possible to directly find files in the directory? If unchecked, it will only be possible for the directory itself to be found with a normal keyword search. This option only really makes a difference for uploads of directories. 0 True True - + True 0 0 - + True 2 - + True gtk-index @@ -1636,9 +1589,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - Use libextractor for files in directories + Add keywords for files in directories True @@ -1655,32 +1608,40 @@ This release adds context-menus (right-click) which allow copying the URI of sea 2 3 - 3 - 4 + 2 + 3 GTK_FILL - + + True + True + Recursively publish an entire directory tree + _Recursive (for entire directories) + True + 0 + True + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 0 - - - True - True - What level of sender-anonymity is desired when sharing this particular file? 0 allows direct connections (no anonymity). Higher levels require increasing amounts of cover traffic per shared block, increasing your privacy at the expense of efficiency. - 1 0 10000 1 10 10 - 1 - True - - + 5 + _Anonymity: + True - 1 - 2 2 3 GTK_FILL @@ -1688,28 +1649,67 @@ This release adds context-menus (right-click) which allow copying the URI of sea - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 0 - - - 94 - True - True - How important is the file (used to prioritize data in the local datastore). - 950 0 100000000 50 500 500 - 500 - True - - + 5 + Scope: + True + scopeFileOnlyButton + + + 1 + 2 + GTK_FILL + + + + + + True + True + Inserting a file means that an encrypted copy will be added to the GNUnet database. Without the proper key (which is not stored in plaintext anywhere) the file cannot be decrypted. Use this option for small files, files that will be modified soon, files that maybe moved or if you are afraid that an adversary may detect the file in plaintext on your machine (after compromising your machine). + I_nsert + True + 0 + True + indexbutton + + + 2 + 3 + GTK_FILL + + + + + + True + True + Indexing will avoid copying the file into the GNUnet database. Instead, GNUnet will try to add a symbolic link to the specified file. If that fails, a copy of the file will be created. Indexing should be used if the local machine is unlikely to ever be compromised by an adversary and if the uploaded file will not be modified or moved in the future. Indexing is more efficient than insertion. + Inde_x + True + 0 + True + True 1 2 - 3 - 4 + GTK_FILL + + + + + + True + 0 + 5 + Method: + True + indexbutton + + GTK_FILL @@ -1757,33 +1757,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea True - - - True - gtk-open - True - True - - - - - True - _Directory - True - - - - True - gtk-open - 1 - - - - - - - - True @@ -2106,6 +2079,51 @@ This release adds context-menus (right-click) which allow copying the URI of sea + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Room Name + True + chatRoomNameEntry + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Moniker + True + + + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 1 + 2 + + True @@ -2153,51 +2171,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Moniker - True - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Room Name - True - chatRoomNameEntry - - False @@ -2924,8 +2897,8 @@ Press ENTER to add the data. -5 - + diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 3e7108f1..603a4269 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c @@ -217,7 +217,7 @@ makeNamespaceFrame (NamespaceList * entry) renderer = gtk_cell_renderer_text_new (); col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList), - -1, _("Last ID"), renderer, + -1, _("Identifier"), renderer, "text", IN_NAMESPACE_LAST_STRING, NULL); @@ -230,7 +230,7 @@ makeNamespaceFrame (NamespaceList * entry) renderer = gtk_cell_renderer_text_new (); col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList), - -1, _("Next ID"), renderer, + -1, _("Next Identifier"), renderer, "text", IN_NAMESPACE_NEXT_STRING, NULL); @@ -325,8 +325,8 @@ addNamespaceContentToModel (void *cls, IN_NAMESPACE_HSIZE, size_h, IN_NAMESPACE_DESCRIPTION, desc, IN_NAMESPACE_MIMETYPE, mime, - IN_NAMESPACE_LAST_STRING, &lastId, - IN_NAMESPACE_NEXT_STRING, &nextId, + IN_NAMESPACE_LAST_STRING, lastId, + IN_NAMESPACE_NEXT_STRING, nextId, IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri), IN_NAMESPACE_META, GNUNET_meta_data_duplicate (fi->meta), -1); @@ -655,7 +655,6 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) GtkTreeIter iter; GtkTreeSelection *selection; IUC cls; - char *last; char *next; GtkWidget *nextEntryLine; GtkWidget *identifierLabel; @@ -692,7 +691,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) } gtk_tree_model_get (list->model, &iter, IN_NAMESPACE_NEXT_STRING, &next, -1); - if ((last == NULL) || (next == NULL)) + if (next == NULL) { GNUNET_GE_BREAK (NULL, 0); return; @@ -715,6 +714,8 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) /* get data from update dialog */ cls.nextId = gtk_entry_get_text (GTK_ENTRY (nextEntryLine)); + if (cls.nextId == NULL) + cls.nextId = ""; cls.anonymityLevel = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton"); @@ -725,7 +726,6 @@ CLEANUP: gtk_widget_destroy (dialog); UNREF (metaXML); metaXML = NULL; - free (last); free (next); GNUNET_GTK_DEBUG_END (); } -- cgit v1.2.3