[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12497 - gnunet gnunet-gtk/contrib gnunet-gtk/src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12497 - gnunet gnunet-gtk/contrib gnunet-gtk/src |
Date: |
Sat, 7 Aug 2010 23:51:50 +0200 |
Author: grothoff
Date: 2010-08-07 23:51:50 +0200 (Sat, 07 Aug 2010)
New Revision: 12497
Modified:
gnunet-gtk/contrib/search_dialog.glade
gnunet-gtk/src/main_window_file_search.c
gnunet/TODO
Log:
done
Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-08-07 21:46:01 UTC (rev 12496)
+++ gnunet/TODO 2010-08-07 21:51:50 UTC (rev 12497)
@@ -18,9 +18,6 @@
* PWNAT: [Nate/MW/Nils]
- W32 port
* GNUNET-GTK: [CG]
- - namespaces:
- + namespace search
- / double-clicking on NS list in search dialog should move 'root' to
keyword line
- bugs:
+ handle 'lost parent' case for recursive downloads (need to move
children!)
+ clean up TreeStores in main_window_file_publish on dialog close
Modified: gnunet-gtk/contrib/search_dialog.glade
===================================================================
--- gnunet-gtk/contrib/search_dialog.glade 2010-08-07 21:46:01 UTC (rev
12496)
+++ gnunet-gtk/contrib/search_dialog.glade 2010-08-07 21:51:50 UTC (rev
12497)
@@ -2,17 +2,11 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
- <columns>
- <!-- column-name unique_name -->
- <column type="gchararray"/>
- <!-- column-name namespace_root -->
- <column type="gchararray"/>
- <!-- column-name nsid -->
- <column type="gpointer"/>
- <!-- column-name namespace_description -->
- <column type="gchararray"/>
- </columns>
+ <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
+ <property name="upper">100000</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="GNUNET_GTK_search_dialog">
<property name="width_request">500</property>
@@ -106,6 +100,7 @@
<property name="model">GNUNET_GTK_namespace_list_store</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
+ <signal name="row-activated"
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb"
swapped="no"/>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_search_dialog_namespace_name_column">
<property name="resizable">True</property>
@@ -207,10 +202,16 @@
<action-widget
response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
- <property name="upper">100000</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
+ <columns>
+ <!-- column-name unique_name -->
+ <column type="gchararray"/>
+ <!-- column-name namespace_root -->
+ <column type="gchararray"/>
+ <!-- column-name nsid -->
+ <column type="gpointer"/>
+ <!-- column-name namespace_description -->
+ <column type="gchararray"/>
+ </columns>
</object>
</interface>
Modified: gnunet-gtk/src/main_window_file_search.c
===================================================================
--- gnunet-gtk/src/main_window_file_search.c 2010-08-07 21:46:01 UTC (rev
12496)
+++ gnunet-gtk/src/main_window_file_search.c 2010-08-07 21:51:50 UTC (rev
12497)
@@ -30,6 +30,40 @@
static GtkBuilder *builder;
+/**
+ * User double-clicked on namespace or pressed enter;
+ * move namespace root to the 'keywords' line.
+ */
+void
+GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb (GtkTreeView
*tree_view,
+ GtkTreePath
*path,
+
GtkTreeViewColumn *column,
+ gpointer
user_data)
+{
+ GtkTreeModel *ls;
+ GtkTreeSelection *sel;
+ GtkEntry *query;
+ GtkTreeIter iter;
+ char *root;
+
+ query = GTK_ENTRY (gtk_builder_get_object (builder,
+
"GNUNET_GTK_search_dialog_keyword_entry"));
+ sel = gtk_tree_view_get_selection (tree_view);
+ if (TRUE ==
+ gtk_tree_selection_get_selected (sel,
+ &ls,
+ &iter))
+ {
+ gtk_tree_model_get (ls, &iter,
+ 1, &root,
+ -1);
+ gtk_entry_set_text (query,
+ root);
+ GNUNET_free (root);
+ }
+}
+
+
void
GNUNET_GTK_search_dialog_search_button_clicked_cb (GtkWidget * dummy,
gpointer data)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12497 - gnunet gnunet-gtk/contrib gnunet-gtk/src,
gnunet <=