[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6958 - in gnunet-gtk: . src/plugins/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6958 - in gnunet-gtk: . src/plugins/fs |
|
Date: |
Sat, 31 May 2008 14:43:34 -0600 (MDT) |
Author: grothoff
Date: 2008-05-31 14:43:32 -0600 (Sat, 31 May 2008)
New Revision: 6958
Modified:
gnunet-gtk/TODO
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/plugins/fs/search.c
Log:
stuff
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2008-05-31 20:42:52 UTC (rev 6957)
+++ gnunet-gtk/TODO 2008-05-31 20:43:32 UTC (rev 6958)
@@ -3,14 +3,18 @@
Annotations:
RC == Release Critical
+0.8.0pre1 (new core features):
+- adapt to new chat API
+- test new pseudonym/namespace APIs
+- show chatroom members
+
0.8.0 (new core features):
-- design and use of short/nice namespace names/search URIs
- => need to incorporate into code!
-- use new search ranking features
- => need to implement function in search.c and update tree views/model
-- better uritracker support
-- pop-up dialogs / context menus (show extra information, in particular full
metadata) [RC]
+- better uritracker support (currently flaky?)
- much more testing!!!
+- chat improvements:
+ * add various options for sending messages
+ * show chatroom member metadata (right-click pop-up)
+ * indicate how a message was received (private, signed, etc.)
0.8.1 (expand basics):
@@ -21,10 +25,6 @@
* for potentially long clists, add option to specify a string
pattern that must be matched for the lines to be displayed
(to further prune search results, for example)
-- chat improvements:
- * add various options for sending messages
- * show chatroom members
- * indicate how a message was received (private, signed, etc.)
- unindexing:
* add option to list all indexed files and delete from them
(ECRS now supports listing of indexed files!
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-05-31 20:42:52 UTC (rev 6957)
+++ gnunet-gtk/gnunet-gtk.glade 2008-05-31 20:43:32 UTC (rev 6958)
@@ -605,52 +605,6 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox22">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkButton" id="cancelSearchButton">
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Cancel
the selected search</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_abortSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="stopSearchButton">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Cancel
the selected search and remove it from the list</property>
- <property name="label">gtk-stop</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
<widget class="GtkScrolledWindow" id="scrolledwindow10">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -902,25 +856,75 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
+ <property name="top_padding">5</property>
<child>
- <widget class="GtkButton" id="cancelUploadButton">
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Cancel
the selected upload (and all sub-uploads)</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_abortUploadButton_clicked_" object="activeUploadsList"/>
+ <widget class="GtkLabel" id="label45">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label"
translatable="yes"><b>Downloads</b></property>
+ <property name="use_markup">True</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment14">
+ <property name="visible">True</property>
+ <property name="top_padding">5</property>
<child>
+ <widget class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label"
translatable="yes"><b>Publications</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="stopSearchButton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Cancel the
selected search and remove it from the list</property>
+ <property name="border_width">4</property>
+ <property name="label">gtk-stop</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked"
handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox21">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
<widget class="GtkButton" id="stopUploadButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -934,7 +938,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
</packing>
</child>
<child>
@@ -982,7 +985,7 @@
</widget>
<packing>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -995,50 +998,6 @@
<property name="x_padding">5</property>
</packing>
</child>
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <child>
- <widget class="GtkLabel" id="label45">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="label"
translatable="yes"><b>Downloads</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment14">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <child>
- <widget class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="label"
translatable="yes"><b>Publications</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
</widget>
</child>
<child>
@@ -2851,8 +2810,12 @@
</widget>
<widget class="GtkDialog" id="metaDisplayDialog">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Metadata for the selected
search result</property>
<property name="title" translatable="yes">File Information</property>
<property name="modal">True</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="default_width">600</property>
+ <property name="default_height">400</property>
<property name="icon">info.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
@@ -3414,7 +3377,12 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">The gnunet-gtk about
dialog</property>
<property name="border_width">5</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="title" translatable="yes">About gnunet-gtk</property>
+ <property name="modal">True</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="program_name">gnunet-gtk</property>
+ <property name="version">0.8.0pre1</property>
<property name="copyright" translatable="yes">(C) 2001-2008 Christian
Grothoff (and other contributing authors)</property>
<property name="comments" translatable="yes">https://gnunet.org/</property>
<property name="website">http://www.gnu.org/software/gnunet/</property>
@@ -4881,7 +4849,7 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="nextIdentifierEntry">
+ <widget class="GtkEntry" id="nextIdentifierEntry1">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
@@ -5059,7 +5027,7 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="searchCloseButton">
+ <widget class="GtkButton" id="searchCloseButton1">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Stop the search and
close the tab</property>
<property name="relief">GTK_RELIEF_NONE</property>
@@ -5089,9 +5057,9 @@
<property name="modal">True</property>
<property name="icon_name">gtk-save-as</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="show_hidden">True</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
<property name="do_overwrite_confirmation">True</property>
+ <property name="show_hidden">True</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-05-31 20:42:52 UTC (rev 6957)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-05-31 20:43:32 UTC (rev 6958)
@@ -352,7 +352,64 @@
}
+
+
static int
+on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
+{
+ SearchList *list = cls;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ struct GNUNET_ECRS_URI *uri;
+ struct GNUNET_ECRS_MetaData * meta;
+ char *str;
+ GladeXML * xml;
+ GtkWidget * dialog;
+
+ path = NULL;
+ if (FALSE == gtk_tree_view_get_path_at_pos (list->treeview,
+ list->last_x,
+ list->last_y,
+ &path, NULL, NULL, NULL))
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ return FALSE;
+ }
+ if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
+ &iter, path))
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ gtk_tree_path_free (path);
+ return FALSE;
+ }
+ gtk_tree_path_free (path);
+ uri = NULL;
+ meta = NULL;
+ gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
+ &iter,
+ SEARCH_URI, &uri,
+ SEARCH_META, &meta,
+ -1);
+ str = GNUNET_ECRS_uri_to_string (uri);
+ xml = glade_xml_new(GNUNET_GTK_get_glade_filename (),
+ "metaDisplayDialog",
+ PACKAGE_NAME);
+ GNUNET_GTK_connect_glade_with_plugins (xml);
+ dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
+ gtk_window_set_title(GTK_WINDOW(dialog), str);
+ createMetaDataListTreeView(xml,
+ "metaDisplayDialogTreeView",
+ NULL,
+ meta);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ GNUNET_free_non_null (str);
+ gtk_widget_destroy (dialog);
+ UNREF (xml);
+ return FALSE;
+}
+
+
+static int
on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
{
SearchList *list = cls;
@@ -510,6 +567,16 @@
list->last_x = event_button->x;
list->last_y = event_button->y;
menu = GTK_MENU (gtk_menu_new ());
+
+ entry = gtk_menu_item_new_with_label (_("_Display metadata"));
+ g_signal_connect_swapped (entry,
+ "activate",
+ G_CALLBACK (on_search_display_metadata_activate),
list);
+ gtk_label_set_use_underline (GTK_LABEL
+ (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
+ gtk_widget_show (entry);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
+
entry = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
g_signal_connect_swapped (entry,
"activate",
@@ -518,6 +585,7 @@
(gtk_bin_get_child (GTK_BIN (entry))), TRUE);
gtk_widget_show (entry);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
+
entry = gtk_menu_item_new_with_label (_("_Save results as directory"));
g_signal_connect_swapped (entry,
"activate",
@@ -526,6 +594,8 @@
(gtk_bin_get_child (GTK_BIN (entry))), TRUE);
gtk_widget_show (entry);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
+
+
gtk_menu_popup (menu,
NULL,
NULL, NULL, NULL, event_button->button, event_button->time);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6958 - in gnunet-gtk: . src/plugins/fs,
gnunet <=