aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-08 11:47:43 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-08 11:47:43 +0000
commitf13bf3ba1b5a4ffec8ad0aee33d6837398571a62 (patch)
tree38fbe98bbf09794c61d90c4814b7ce7afbd249be
parent270c6d4acd6de1cb9806b5da2e3d3f46f2a11947 (diff)
downloadgnunet-gtk-f13bf3ba1b5a4ffec8ad0aee33d6837398571a62.tar.gz
gnunet-gtk-f13bf3ba1b5a4ffec8ad0aee33d6837398571a62.zip
initial work on identity dialogs, based on former FS dialogs
-rw-r--r--contrib/Makefile.am1
-rw-r--r--contrib/gnunet_identity_gtk_create_ego_dialog.glade119
-rw-r--r--contrib/gnunet_identity_gtk_namespace_manager.glade674
-rw-r--r--contrib/gnunet_identity_gtk_organize_ego_dialog.glade261
4 files changed, 286 insertions, 769 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ce1c8034..ca9b1f01 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -41,7 +41,6 @@ pkgdata_DATA = \
41 gnunet_fs_gtk_unindex.glade \ 41 gnunet_fs_gtk_unindex.glade \
42 gnunet_fs_gtk_progress_dialog.glade \ 42 gnunet_fs_gtk_progress_dialog.glade \
43 gnunet_gtk_status_bar_menu.glade \ 43 gnunet_gtk_status_bar_menu.glade \
44 gnunet_identity_gtk_create_ego_dialog.glade \
45 gnunet_identity_gtk_organize_ego_dialog.glade \ 44 gnunet_identity_gtk_organize_ego_dialog.glade \
46 gnunet_identity_gtk_namespace_manager.glade \ 45 gnunet_identity_gtk_namespace_manager.glade \
47 gnunet_peerinfo_gtk_about_window.glade \ 46 gnunet_peerinfo_gtk_about_window.glade \
diff --git a/contrib/gnunet_identity_gtk_create_ego_dialog.glade b/contrib/gnunet_identity_gtk_create_ego_dialog.glade
deleted file mode 100644
index 812411c6..00000000
--- a/contrib/gnunet_identity_gtk_create_ego_dialog.glade
+++ /dev/null
@@ -1,119 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<interface>
3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkDialog" id="GNUNET_GTK_create_namespace_dialog">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8 <property name="can_default">True</property>
9 <property name="border_width">5</property>
10 <property name="title" translatable="yes">Create namespace</property>
11 <property name="resizable">False</property>
12 <property name="modal">True</property>
13 <property name="window_position">center</property>
14 <property name="icon_name">folder-new</property>
15 <property name="type_hint">dialog</property>
16 <property name="skip_taskbar_hint">True</property>
17 <signal name="response" handler="GNUNET_GTK_create_namespace_dialog_response_cb" swapped="no"/>
18 <child internal-child="vbox">
19 <object class="GtkVBox" id="GNUNET_GTK_create_namespace_vbox">
20 <property name="visible">True</property>
21 <property name="can_focus">False</property>
22 <property name="spacing">2</property>
23 <child>
24 <object class="GtkHBox" id="GNUNET_GTK_create_namespace_value_hbox">
25 <property name="visible">True</property>
26 <property name="can_focus">False</property>
27 <child>
28 <object class="GtkLabel" id="GNUNET_GTK_create_namespace_name_label">
29 <property name="visible">True</property>
30 <property name="can_focus">False</property>
31 <property name="label" translatable="yes">_Name:</property>
32 <property name="use_underline">True</property>
33 </object>
34 <packing>
35 <property name="expand">False</property>
36 <property name="fill">False</property>
37 <property name="padding">4</property>
38 <property name="position">0</property>
39 </packing>
40 </child>
41 <child>
42 <object class="GtkEntry" id="GNUNET_GTK_create_namespace_name_entry">
43 <property name="visible">True</property>
44 <property name="can_focus">True</property>
45 <property name="invisible_char">●</property>
46 <property name="activates_default">True</property>
47 <property name="primary_icon_activatable">False</property>
48 <property name="secondary_icon_activatable">False</property>
49 <property name="primary_icon_sensitive">True</property>
50 <property name="secondary_icon_sensitive">True</property>
51 <signal name="insert-text" handler="GNUNET_FS_GTK_create_namespace_insert_text_cb" swapped="no"/>
52 </object>
53 <packing>
54 <property name="expand">True</property>
55 <property name="fill">True</property>
56 <property name="position">1</property>
57 </packing>
58 </child>
59 </object>
60 <packing>
61 <property name="expand">False</property>
62 <property name="fill">False</property>
63 <property name="padding">5</property>
64 <property name="position">0</property>
65 </packing>
66 </child>
67 <child internal-child="action_area">
68 <object class="GtkHButtonBox" id="GNUNET_GTK_create_namespace_dialog-action_area">
69 <property name="visible">True</property>
70 <property name="can_focus">False</property>
71 <property name="layout_style">end</property>
72 <child>
73 <object class="GtkButton" id="GNUNET_GTK_create_namespace_cancel_button">
74 <property name="label">gtk-cancel</property>
75 <property name="use_action_appearance">False</property>
76 <property name="visible">True</property>
77 <property name="can_focus">True</property>
78 <property name="receives_default">True</property>
79 <property name="use_stock">True</property>
80 </object>
81 <packing>
82 <property name="expand">False</property>
83 <property name="fill">False</property>
84 <property name="position">0</property>
85 </packing>
86 </child>
87 <child>
88 <object class="GtkButton" id="GNUNET_GTK_create_namespace_ok_button">
89 <property name="label">gtk-ok</property>
90 <property name="use_action_appearance">False</property>
91 <property name="visible">True</property>
92 <property name="can_focus">True</property>
93 <property name="can_default">True</property>
94 <property name="has_default">True</property>
95 <property name="receives_default">True</property>
96 <property name="use_stock">True</property>
97 </object>
98 <packing>
99 <property name="expand">False</property>
100 <property name="fill">False</property>
101 <property name="position">1</property>
102 </packing>
103 </child>
104 </object>
105 <packing>
106 <property name="expand">False</property>
107 <property name="fill">True</property>
108 <property name="pack_type">end</property>
109 <property name="position">1</property>
110 </packing>
111 </child>
112 </object>
113 </child>
114 <action-widgets>
115 <action-widget response="-6">GNUNET_GTK_create_namespace_cancel_button</action-widget>
116 <action-widget response="-5">GNUNET_GTK_create_namespace_ok_button</action-widget>
117 </action-widgets>
118 </object>
119</interface>
diff --git a/contrib/gnunet_identity_gtk_namespace_manager.glade b/contrib/gnunet_identity_gtk_namespace_manager.glade
index df805f1b..c15398f4 100644
--- a/contrib/gnunet_identity_gtk_namespace_manager.glade
+++ b/contrib/gnunet_identity_gtk_namespace_manager.glade
@@ -2,360 +2,200 @@
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkListStore" id="GNUNET_GTK_namespace_manager_known_liststore"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_hadj">
6 <property name="upper">100</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property>
9 </object>
10 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_metadata_liststore">
6 <columns> 11 <columns>
7 <!-- column-name IsMine --> 12 <!-- column-name TypeBin -->
8 <column type="gboolean"/>
9 <!-- column-name Rank -->
10 <column type="gint"/> 13 <column type="gint"/>
11 <!-- column-name NamespaceName --> 14 <!-- column-name Type -->
12 <column type="gchararray"/>
13 <!-- column-name NamespaceKey -->
14 <column type="gchararray"/> 15 <column type="gchararray"/>
15 <!-- column-name NamespaceKeyBinary --> 16 <!-- column-name Value -->
16 <column type="gpointer"/>
17 <!-- column-name OrderListRowReference -->
18 <column type="gpointer"/>
19 <!-- column-name MetaData -->
20 <column type="gpointer"/>
21 <!-- column-name NonUniqueName -->
22 <column type="gchararray"/> 17 <column type="gchararray"/>
23 </columns> 18 </columns>
24 </object> 19 </object>
25 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_known_namespaces_hadj"> 20 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_vadj">
26 <property name="upper">100</property>
27 <property name="step_increment">1</property>
28 <property name="page_increment">10</property>
29 </object>
30 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_known_namespaces_vadj">
31 <property name="upper">100</property> 21 <property name="upper">100</property>
32 <property name="step_increment">1</property> 22 <property name="step_increment">1</property>
33 <property name="page_increment">10</property> 23 <property name="page_increment">10</property>
34 </object> 24 </object>
35 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_namespace_details_hadj"> 25 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj">
36 <property name="upper">100</property> 26 <property name="upper">100</property>
37 <property name="step_increment">1</property> 27 <property name="step_increment">1</property>
38 <property name="page_increment">10</property> 28 <property name="page_increment">10</property>
39 </object> 29 </object>
40 <object class="GtkDialog" id="GNUNET_GTK_namespace_manager_dialog"> 30 <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
41 <property name="can_focus">False</property> 31 <property name="can_focus">False</property>
42 <property name="border_width">5</property> 32 <property name="border_width">5</property>
43 <property name="destroy_with_parent">True</property> 33 <property name="destroy_with_parent">True</property>
44 <property name="type_hint">dialog</property> 34 <property name="type_hint">dialog</property>
45 <signal name="response" handler="GNUNET_GTK_namespace_manager_dialog_response_cb" swapped="no"/> 35 <signal name="response" handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/>
46 <child internal-child="vbox"> 36 <child internal-child="vbox">
47 <object class="GtkVBox" id="GNUNET_GTK_namespace_manager_vbox"> 37 <object class="GtkVBox" id="GNUNET_GTK_identity_advertise_vbox">
48 <property name="visible">True</property> 38 <property name="visible">True</property>
49 <property name="can_focus">False</property> 39 <property name="can_focus">False</property>
50 <property name="spacing">2</property> 40 <property name="spacing">2</property>
51 <child internal-child="action_area">
52 <object class="GtkHButtonBox" id="GNUNET_GTK_namespace_manager_action_area">
53 <property name="visible">True</property>
54 <property name="can_focus">False</property>
55 <property name="layout_style">end</property>
56 <child>
57 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_apply_button">
58 <property name="label">gtk-apply</property>
59 <property name="use_action_appearance">False</property>
60 <property name="visible">True</property>
61 <property name="can_focus">True</property>
62 <property name="receives_default">True</property>
63 <property name="tooltip_text" translatable="yes">Saves all changes made in this dialog to disk without closing the dialog.</property>
64 <property name="use_stock">True</property>
65 </object>
66 <packing>
67 <property name="expand">False</property>
68 <property name="fill">False</property>
69 <property name="position">0</property>
70 </packing>
71 </child>
72 <child>
73 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_ok_button">
74 <property name="label">gtk-ok</property>
75 <property name="use_action_appearance">False</property>
76 <property name="visible">True</property>
77 <property name="can_focus">True</property>
78 <property name="receives_default">True</property>
79 <property name="tooltip_text" translatable="yes">Saves all changes made in this dialog to disk and closes the dialog.</property>
80 <property name="use_stock">True</property>
81 </object>
82 <packing>
83 <property name="expand">False</property>
84 <property name="fill">False</property>
85 <property name="position">1</property>
86 </packing>
87 </child>
88 <child>
89 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_cancel_button">
90 <property name="label">gtk-cancel</property>
91 <property name="use_action_appearance">False</property>
92 <property name="visible">True</property>
93 <property name="can_focus">True</property>
94 <property name="receives_default">True</property>
95 <property name="tooltip_text" translatable="yes">Closes the dialog. Changes made in this dialog will not be preserved.</property>
96 <property name="use_stock">True</property>
97 </object>
98 <packing>
99 <property name="expand">False</property>
100 <property name="fill">False</property>
101 <property name="position">2</property>
102 </packing>
103 </child>
104 </object>
105 <packing>
106 <property name="expand">False</property>
107 <property name="fill">True</property>
108 <property name="pack_type">end</property>
109 <property name="position">0</property>
110 </packing>
111 </child>
112 <child> 41 <child>
113 <object class="GtkVPaned" id="GNUNET_GTK_namespace_manager_main_vpaned"> 42 <object class="GtkFrame" id="GNUNET_GTK_identity_advertise_metadata_frame">
114 <property name="visible">True</property> 43 <property name="visible">True</property>
115 <property name="can_focus">True</property> 44 <property name="can_focus">False</property>
45 <property name="label_xalign">0</property>
46 <property name="shadow_type">none</property>
116 <child> 47 <child>
117 <object class="GtkHPaned" id="GNUNET_GTK_namespace_manager_top_hpaned"> 48 <object class="GtkAlignment" id="GNUNET_GTK_identity_advertise_metadata_alignment">
118 <property name="visible">True</property> 49 <property name="visible">True</property>
119 <property name="can_focus">True</property> 50 <property name="can_focus">False</property>
51 <property name="left_padding">12</property>
120 <child> 52 <child>
121 <object class="GtkVBox" id="GNUNET_GTK_namespace_manager_known_namespaces_vbox"> 53 <object class="GtkVBox" id="GNUNET_GTK_identity_advertise_metadata_details_vbox">
122 <property name="visible">True</property> 54 <property name="visible">True</property>
123 <property name="can_focus">False</property> 55 <property name="can_focus">False</property>
124 <child> 56 <child>
125 <object class="GtkLabel" id="GNUNET_GTK_namespace_manager_known_namespaces_label"> 57 <object class="GtkHBox" id="hbox1">
126 <property name="visible">True</property> 58 <property name="visible">True</property>
127 <property name="can_focus">False</property> 59 <property name="can_focus">False</property>
128 <property name="label" translatable="yes">Known namespaces:
129Select a namespace to see its complete metadata. Click "Delete" to delete (forget) namespace.
130Namespace names are editable.</property>
131 </object>
132 <packing>
133 <property name="expand">False</property>
134 <property name="fill">False</property>
135 <property name="position">0</property>
136 </packing>
137 </child>
138 <child>
139 <object class="GtkScrolledWindow" id="GNUNET_GTK_namespace_manager_known_namespaces_scrolledwindow">
140 <property name="visible">True</property>
141 <property name="can_focus">True</property>
142 <property name="hadjustment">GNUNET_GTK_namespace_manager_known_namespaces_hadj</property>
143 <property name="vadjustment">GNUNET_GTK_namespace_manager_known_namespaces_vadj</property>
144 <property name="hscrollbar_policy">automatic</property>
145 <property name="vscrollbar_policy">automatic</property>
146 <property name="shadow_type">in</property>
147 <child> 60 <child>
148 <object class="GtkTreeView" id="GNUNET_GTK_namespace_manager_known_treeview"> 61 <object class="GtkLabel" id="GNUNET_GTK_identity_advertise_metadata_type_label">
149 <property name="visible">True</property> 62 <property name="visible">True</property>
150 <property name="can_focus">True</property> 63 <property name="can_focus">False</property>
151 <property name="model">GNUNET_GTK_namespace_manager_known_liststore</property> 64 <property name="label" translatable="yes">Type:</property>
152 <property name="hadjustment">GNUNET_GTK_namespace_manager_known_namespaces_hadj</property>
153 <property name="vadjustment">GNUNET_GTK_namespace_manager_known_namespaces_vadj</property>
154 <property name="rules_hint">True</property>
155 <property name="search_column">2</property>
156 <property name="show_expanders">False</property>
157 <child>
158 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_is_mine_column">
159 <property name="title" translatable="yes">Is mine</property>
160 <property name="clickable">True</property>
161 <property name="sort_indicator">True</property>
162 <property name="sort_column_id">0</property>
163 <child>
164 <object class="GtkCellRendererToggle" id="GNUNET_GTK_namespace_manager_is_mine_toggle">
165 <property name="activatable">False</property>
166 </object>
167 <attributes>
168 <attribute name="active">0</attribute>
169 </attributes>
170 </child>
171 </object>
172 </child>
173 <child>
174 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_rank_column">
175 <property name="title" translatable="yes">Rank</property>
176 <property name="clickable">True</property>
177 <property name="sort_indicator">True</property>
178 <property name="sort_column_id">1</property>
179 <child>
180 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_rank_text"/>
181 <attributes>
182 <attribute name="text">1</attribute>
183 </attributes>
184 </child>
185 </object>
186 </child>
187 <child>
188 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_namespace_name_column">
189 <property name="title" translatable="yes">Name</property>
190 <property name="clickable">True</property>
191 <property name="sort_indicator">True</property>
192 <property name="sort_column_id">2</property>
193 <child>
194 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_name_text">
195 <property name="editable">True</property>
196 <signal name="editing-started" handler="GNUNET_GTK_namespace_manager_name_text_editing_started_cb" swapped="no"/>
197 <signal name="edited" handler="GNUNET_GTK_namespace_manager_name_text_edited_cb" swapped="no"/>
198 </object>
199 <attributes>
200 <attribute name="text">2</attribute>
201 </attributes>
202 </child>
203 </object>
204 </child>
205 <child>
206 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_namespace_id_column">
207 <property name="title" translatable="yes">Identifier</property>
208 <property name="clickable">True</property>
209 <property name="sort_indicator">True</property>
210 <property name="sort_column_id">3</property>
211 <child>
212 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_id_text"/>
213 <attributes>
214 <attribute name="text">3</attribute>
215 </attributes>
216 </child>
217 </object>
218 </child>
219 </object> 65 </object>
66 <packing>
67 <property name="expand">False</property>
68 <property name="fill">False</property>
69 <property name="padding">5</property>
70 <property name="position">0</property>
71 </packing>
220 </child> 72 </child>
221 </object>
222 <packing>
223 <property name="expand">True</property>
224 <property name="fill">True</property>
225 <property name="position">1</property>
226 </packing>
227 </child>
228 <child>
229 <object class="GtkHButtonBox" id="GNUNET_GTK_namespace_manager_known_namespaces_buttonbox">
230 <property name="visible">True</property>
231 <property name="can_focus">False</property>
232 <property name="border_width">5</property>
233 <property name="spacing">5</property>
234 <property name="layout_style">end</property>
235 <child> 73 <child>
236 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_known_namespaces_delete_button"> 74 <object class="GtkComboBox" id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
237 <property name="label">gtk-delete</property>
238 <property name="use_action_appearance">False</property>
239 <property name="visible">True</property> 75 <property name="visible">True</property>
240 <property name="can_focus">True</property> 76 <property name="can_focus">False</property>
241 <property name="receives_default">True</property> 77 </object>
242 <property name="tooltip_text" translatable="yes">Makes GNUnet "forget" about selected known namespace. 78 <packing>
243However, GNUnet will be able to learn about this namespace, if it ever discovers it again.</property> 79 <property name="expand">True</property>
244 <property name="use_stock">True</property> 80 <property name="fill">True</property>
245 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb" swapped="no"/> 81 <property name="position">1</property>
82 </packing>
83 </child>
84 <child>
85 <object class="GtkLabel" id="GNUNET_GTK_identity_advertise_metadata_value_label">
86 <property name="visible">True</property>
87 <property name="can_focus">False</property>
88 <property name="label" translatable="yes">Value:</property>
246 </object> 89 </object>
247 <packing> 90 <packing>
248 <property name="expand">False</property> 91 <property name="expand">False</property>
249 <property name="fill">False</property> 92 <property name="fill">False</property>
250 <property name="position">0</property> 93 <property name="padding">5</property>
94 <property name="position">2</property>
251 </packing> 95 </packing>
252 </child> 96 </child>
253 <child> 97 <child>
254 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button"> 98 <object class="GtkEntry" id="GNUNET_GTK_identity_advertise_metadata_value_entry">
255 <property name="label" translatable="yes">Swap _Rank</property>
256 <property name="use_action_appearance">False</property>
257 <property name="visible">True</property> 99 <property name="visible">True</property>
258 <property name="can_focus">True</property> 100 <property name="can_focus">True</property>
259 <property name="receives_default">True</property> 101 <property name="invisible_char">●</property>
260 <property name="tooltip_text" translatable="yes">Changes the rank value of the selected namespace in "Known namespaces" list. 102 <property name="invisible_char_set">True</property>
261If it had rank 0, it's given rank -1, otherwise the sign of its rank is flipped. 103 <property name="primary_icon_activatable">False</property>
262Only namespaces with positive ranks are displayed in "Namespace order" list.</property> 104 <property name="secondary_icon_activatable">False</property>
263 <property name="use_underline">True</property> 105 <property name="primary_icon_sensitive">True</property>
264 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb" swapped="no"/> 106 <property name="secondary_icon_sensitive">True</property>
107 </object>
108 <packing>
109 <property name="expand">True</property>
110 <property name="fill">True</property>
111 <property name="position">3</property>
112 </packing>
113 </child>
114 <child>
115 <object class="GtkHButtonBox" id="GNUNET_GTK_identity_advertise_metadata_buttonbox">
116 <property name="visible">True</property>
117 <property name="can_focus">False</property>
118 <property name="border_width">5</property>
119 <property name="spacing">5</property>
120 <property name="layout_style">end</property>
121 <child>
122 <object class="GtkButton" id="GNUNET_GTK_identity_advertise_metadata_add_button">
123 <property name="label">gtk-add</property>
124 <property name="visible">True</property>
125 <property name="sensitive">False</property>
126 <property name="can_focus">True</property>
127 <property name="receives_default">True</property>
128 <property name="use_stock">True</property>
129 <signal name="clicked" handler="GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb" swapped="no"/>
130 </object>
131 <packing>
132 <property name="expand">False</property>
133 <property name="fill">False</property>
134 <property name="position">0</property>
135 </packing>
136 </child>
265 </object> 137 </object>
266 <packing> 138 <packing>
267 <property name="expand">False</property> 139 <property name="expand">False</property>
268 <property name="fill">False</property> 140 <property name="fill">False</property>
269 <property name="position">1</property> 141 <property name="position">4</property>
270 </packing> 142 </packing>
271 </child> 143 </child>
272 </object> 144 </object>
273 <packing> 145 <packing>
274 <property name="expand">False</property> 146 <property name="expand">False</property>
275 <property name="fill">False</property> 147 <property name="fill">False</property>
276 <property name="position">2</property> 148 <property name="padding">5</property>
277 </packing>
278 </child>
279 </object>
280 <packing>
281 <property name="resize">True</property>
282 <property name="shrink">False</property>
283 </packing>
284 </child>
285 <child>
286 <object class="GtkVBox" id="GNUNET_GTK_namespace_manager_namespace_order_vbox_vbox">
287 <property name="visible">True</property>
288 <property name="can_focus">False</property>
289 <child>
290 <object class="GtkLabel" id="GNUNET_GTK_namespace_manager_namespace_order_label">
291 <property name="visible">True</property>
292 <property name="can_focus">False</property>
293 <property name="label" translatable="yes">Namespace order:
294Drag rows to change namespace order, click "Apply" to save it.</property>
295 </object>
296 <packing>
297 <property name="expand">False</property>
298 <property name="fill">False</property>
299 <property name="position">0</property> 149 <property name="position">0</property>
300 </packing> 150 </packing>
301 </child> 151 </child>
302 <child> 152 <child>
303 <object class="GtkScrolledWindow" id="GNUNET_GTK_namespace_manager_namespace_order_scrolledwindow"> 153 <object class="GtkScrolledWindow" id="GNUNET_GTK_identity_advertise_metadata_scrolledwindow">
304 <property name="visible">True</property> 154 <property name="visible">True</property>
305 <property name="can_focus">True</property> 155 <property name="can_focus">True</property>
306 <property name="hadjustment">GNUNET_GTK_namespace_manager_namespace_order_hadj</property> 156 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
307 <property name="vadjustment">GNUNET_GTK_namespace_manager_namespace_order_vadj</property> 157 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
308 <property name="hscrollbar_policy">automatic</property> 158 <property name="hscrollbar_policy">automatic</property>
309 <property name="vscrollbar_policy">automatic</property> 159 <property name="vscrollbar_policy">automatic</property>
310 <property name="shadow_type">in</property> 160 <property name="shadow_type">in</property>
311 <child> 161 <child>
312 <object class="GtkTreeView" id="GNUNET_GTK_namespace_manager_namespace_order_treeview"> 162 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_metadata_treeview">
313 <property name="visible">True</property> 163 <property name="visible">True</property>
314 <property name="can_focus">True</property> 164 <property name="can_focus">True</property>
315 <property name="model">GNUNET_GTK_namespace_manager_namespace_order_liststore</property> 165 <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
316 <property name="hadjustment">GNUNET_GTK_namespace_manager_namespace_order_hadj</property> 166 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
317 <property name="vadjustment">GNUNET_GTK_namespace_manager_namespace_order_vadj</property> 167 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
318 <property name="headers_clickable">False</property> 168 <property name="headers_clickable">False</property>
319 <property name="reorderable">True</property>
320 <property name="rules_hint">True</property> 169 <property name="rules_hint">True</property>
321 <property name="search_column">0</property> 170 <property name="search_column">0</property>
322 <property name="show_expanders">False</property> 171 <property name="show_expanders">False</property>
323 <property name="rubber_banding">True</property> 172 <property name="rubber_banding">True</property>
173 <property name="enable_grid_lines">both</property>
174 <signal name="key-press-event" handler="GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb" swapped="no"/>
175 <signal name="delete-event" handler="GNUNET_GTK_identity_advertise_metadata_treeview_delete_event_cb" swapped="no"/>
324 <child> 176 <child>
325 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_namespace_order_rank_column"> 177 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_metadata_type_column">
326 <property name="title" translatable="yes">Rank</property> 178 <property name="title" translatable="yes">Type</property>
327 <property name="clickable">True</property>
328 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" swapped="no"/>
329 <child>
330 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_order_rank_text"/>
331 <attributes>
332 <attribute name="text">0</attribute>
333 </attributes>
334 </child>
335 </object>
336 </child>
337 <child>
338 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_namespace_order_name_column">
339 <property name="title" translatable="yes">Name</property>
340 <property name="clickable">True</property>
341 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" swapped="no"/>
342 <child> 179 <child>
343 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_order_name_text"/> 180 <object class="GtkCellRendererText" id="GNUNET_GTK_identity_advertise_metadata_type_text">
181 <signal name="edited" handler="GNUNET_GTK_identity_advertise_metadata_type_text_edited_cb" swapped="no"/>
182 </object>
344 <attributes> 183 <attributes>
345 <attribute name="text">1</attribute> 184 <attribute name="text">2</attribute>
346 </attributes> 185 </attributes>
347 </child> 186 </child>
348 </object> 187 </object>
349 </child> 188 </child>
350 <child> 189 <child>
351 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_namespace_order_identifier_column"> 190 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_metadata_value_column">
352 <property name="title" translatable="yes">Identifier</property> 191 <property name="title" translatable="yes">Value</property>
353 <property name="clickable">True</property>
354 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb" swapped="no"/>
355 <child> 192 <child>
356 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_order_identifier_text"/> 193 <object class="GtkCellRendererText" id="GNUNET_GTK_identity_advertise_metadata_value_text">
194 <property name="editable">True</property>
195 <signal name="edited" handler="GNUNET_GTK_identity_advertise_metadata_value_text_edited_cb" swapped="no"/>
196 </object>
357 <attributes> 197 <attributes>
358 <attribute name="text">2</attribute> 198 <attribute name="text">5</attribute>
359 </attributes> 199 </attributes>
360 </child> 200 </child>
361 </object> 201 </object>
@@ -369,112 +209,111 @@ Drag rows to change namespace order, click "Apply" to save it.</property>
369 <property name="position">1</property> 209 <property name="position">1</property>
370 </packing> 210 </packing>
371 </child> 211 </child>
372 <child>
373 <object class="GtkHButtonBox" id="GNUNET_GTK_namespace_manager_namespace_order_buttonbox">
374 <property name="visible">True</property>
375 <property name="can_focus">False</property>
376 <property name="border_width">5</property>
377 <property name="layout_style">end</property>
378 <child>
379 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_namespace_order_apply">
380 <property name="label">gtk-apply</property>
381 <property name="use_action_appearance">False</property>
382 <property name="visible">True</property>
383 <property name="can_focus">True</property>
384 <property name="receives_default">True</property>
385 <property name="tooltip_text" translatable="yes">Convert the order in which namespaces are arranged in "Namespace order" list to ranks.
386Top namespace is assigned rank 0, namespace below it - rank 1, and so on.</property>
387 <property name="use_stock">True</property>
388 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb" swapped="no"/>
389 </object>
390 <packing>
391 <property name="expand">False</property>
392 <property name="fill">False</property>
393 <property name="position">0</property>
394 </packing>
395 </child>
396 </object>
397 <packing>
398 <property name="expand">False</property>
399 <property name="fill">False</property>
400 <property name="position">2</property>
401 </packing>
402 </child>
403 </object> 212 </object>
404 <packing>
405 <property name="resize">True</property>
406 <property name="shrink">False</property>
407 </packing>
408 </child> 213 </child>
409 </object> 214 </object>
215 </child>
216 <child type="label">
217 <object class="GtkLabel" id="GNUNET_GTK_identity_advertise_label">
218 <property name="visible">True</property>
219 <property name="can_focus">False</property>
220 <property name="label" translatable="yes">&lt;b&gt;Namespace description to use in advertisement:&lt;/b&gt;</property>
221 <property name="use_markup">True</property>
222 </object>
223 </child>
224 </object>
225 <packing>
226 <property name="expand">True</property>
227 <property name="fill">True</property>
228 <property name="position">0</property>
229 </packing>
230 </child>
231 <child internal-child="action_area">
232 <object class="GtkHButtonBox" id="GNUNET_GTK_identity_advertise_action_area">
233 <property name="visible">True</property>
234 <property name="can_focus">False</property>
235 <property name="layout_style">end</property>
236 <child>
237 <object class="GtkButton" id="GNUNET_GTK_identity_advertise_ok_button">
238 <property name="label">gtk-execute</property>
239 <property name="visible">True</property>
240 <property name="can_focus">True</property>
241 <property name="receives_default">True</property>
242 <property name="tooltip_text" translatable="yes">Execute advertisement.</property>
243 <property name="use_stock">True</property>
244 </object>
410 <packing> 245 <packing>
411 <property name="resize">True</property> 246 <property name="expand">False</property>
412 <property name="shrink">False</property> 247 <property name="fill">False</property>
248 <property name="position">0</property>
413 </packing> 249 </packing>
414 </child> 250 </child>
415 <child> 251 <child>
416 <object class="GtkVBox" id="GNUNET_GTK_namespace_manager_namespace_details_vbox"> 252 <object class="GtkButton" id="GNUNET_GTK_identity_advertise_cancel_button">
253 <property name="label">gtk-cancel</property>
254 <property name="visible">True</property>
255 <property name="can_focus">True</property>
256 <property name="receives_default">True</property>
257 <property name="tooltip_text" translatable="yes">Closes the dialog without advertising the namespace.</property>
258 <property name="use_stock">True</property>
259 </object>
260 <packing>
261 <property name="expand">False</property>
262 <property name="fill">False</property>
263 <property name="position">1</property>
264 </packing>
265 </child>
266 </object>
267 <packing>
268 <property name="expand">False</property>
269 <property name="fill">True</property>
270 <property name="pack_type">end</property>
271 <property name="position">1</property>
272 </packing>
273 </child>
274 <child>
275 <object class="GtkFrame" id="GNUNET_GTK_identity_advertise_keywords_frame">
276 <property name="visible">True</property>
277 <property name="can_focus">False</property>
278 <property name="label_xalign">0</property>
279 <property name="shadow_type">none</property>
280 <child>
281 <object class="GtkAlignment" id="GNUNET_GTK_identity_advertise_keywords_alignment">
417 <property name="visible">True</property> 282 <property name="visible">True</property>
418 <property name="can_focus">False</property> 283 <property name="can_focus">False</property>
284 <property name="left_padding">12</property>
419 <child> 285 <child>
420 <object class="GtkLabel" id="GNUNET_GTK_namespace_manager_namespace_details_label"> 286 <object class="GtkScrolledWindow" id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
421 <property name="visible">True</property>
422 <property name="can_focus">False</property>
423 <property name="label" translatable="yes">Selected namespace details:
424Metadata can be &lt;s&gt;added,&lt;/s&gt; deleted and edited. Click "Apply" to save metadata changes.</property>
425 <property name="use_markup">True</property>
426 </object>
427 <packing>
428 <property name="expand">False</property>
429 <property name="fill">False</property>
430 <property name="position">0</property>
431 </packing>
432 </child>
433 <child>
434 <object class="GtkScrolledWindow" id="GNUNET_GTK_namespace_manager_namespace_details_scrolledwindow">
435 <property name="visible">True</property> 287 <property name="visible">True</property>
436 <property name="can_focus">True</property> 288 <property name="can_focus">True</property>
437 <property name="hadjustment">GNUNET_GTK_namespace_manager_namespace_details_hadj</property> 289 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
438 <property name="vadjustment">GNUNET_GTK_namespace_manager_namespace_details_vadj</property> 290 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
439 <property name="hscrollbar_policy">automatic</property> 291 <property name="hscrollbar_policy">automatic</property>
440 <property name="vscrollbar_policy">automatic</property> 292 <property name="vscrollbar_policy">automatic</property>
441 <property name="shadow_type">in</property>
442 <child> 293 <child>
443 <object class="GtkTreeView" id="GNUNET_GTK_namespace_manager_namespace_details_treeview"> 294 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_keywords_treeview">
444 <property name="visible">True</property> 295 <property name="visible">True</property>
445 <property name="can_focus">True</property> 296 <property name="can_focus">True</property>
446 <property name="model">GNUNET_GTK_namespace_manager_namespace_details_liststore</property> 297 <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
447 <property name="hadjustment">GNUNET_GTK_namespace_manager_namespace_details_hadj</property> 298 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
448 <property name="vadjustment">GNUNET_GTK_namespace_manager_namespace_details_vadj</property> 299 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
449 <property name="headers_clickable">False</property> 300 <property name="reorderable">True</property>
450 <property name="rules_hint">True</property> 301 <property name="enable_search">False</property>
451 <property name="search_column">0</property> 302 <property name="search_column">0</property>
452 <property name="show_expanders">False</property> 303 <property name="show_expanders">False</property>
453 <property name="rubber_banding">True</property> 304 <property name="rubber_banding">True</property>
454 <property name="enable_grid_lines">both</property>
455 <child>
456 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_details_type_column">
457 <property name="title" translatable="yes">Type</property>
458 <child>
459 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_details_type_text">
460 <signal name="edited" handler="GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb" swapped="no"/>
461 </object>
462 <attributes>
463 <attribute name="text">2</attribute>
464 </attributes>
465 </child>
466 </object>
467 </child>
468 <child> 305 <child>
469 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_manager_details_value_column"> 306 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_keywords_name_column">
470 <property name="title" translatable="yes">Value</property> 307 <property name="title" translatable="yes">Name</property>
308 <property name="clickable">True</property>
309 <signal name="clicked" handler="GNUNET_GTK_identity_advertise_keywords_column_clicked_cb" swapped="no"/>
471 <child> 310 <child>
472 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_manager_namespace_details_value_text"> 311 <object class="GtkCellRendererText" id="GNUNET_GTK_identity_advertise_keywords_name_text">
473 <property name="editable">True</property> 312 <property name="editable">True</property>
474 <signal name="edited" handler="GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb" swapped="no"/> 313 <signal name="edited" handler="GNUNET_GTK_identity_advertise_keywords_text_edited_cb" swapped="no"/>
475 </object> 314 </object>
476 <attributes> 315 <attributes>
477 <attribute name="text">5</attribute> 316 <attribute name="text">1</attribute>
478 </attributes> 317 </attributes>
479 </child> 318 </child>
480 </object> 319 </object>
@@ -482,143 +321,38 @@ Metadata can be &lt;s&gt;added,&lt;/s&gt; deleted and edited. Click "Apply" to s
482 </object> 321 </object>
483 </child> 322 </child>
484 </object> 323 </object>
485 <packing>
486 <property name="expand">True</property>
487 <property name="fill">True</property>
488 <property name="position">1</property>
489 </packing>
490 </child>
491 <child>
492 <object class="GtkHButtonBox" id="GNUNET_GTK_namespace_manager_namespace_details_buttonbox">
493 <property name="visible">True</property>
494 <property name="can_focus">False</property>
495 <property name="border_width">5</property>
496 <property name="spacing">5</property>
497 <property name="layout_style">end</property>
498 <child>
499 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_namespace_details_add_button">
500 <property name="label">gtk-add</property>
501 <property name="use_action_appearance">False</property>
502 <property name="visible">True</property>
503 <property name="sensitive">False</property>
504 <property name="can_focus">True</property>
505 <property name="receives_default">True</property>
506 <property name="tooltip_text" translatable="yes">Adds a new metadata Type=Value pair to the list.
507This functionality is not available at the moment.</property>
508 <property name="use_stock">True</property>
509 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb" swapped="no"/>
510 </object>
511 <packing>
512 <property name="expand">False</property>
513 <property name="fill">False</property>
514 <property name="position">0</property>
515 </packing>
516 </child>
517 <child>
518 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_namespace_details_delete_button">
519 <property name="label">gtk-delete</property>
520 <property name="use_action_appearance">False</property>
521 <property name="visible">True</property>
522 <property name="can_focus">True</property>
523 <property name="receives_default">True</property>
524 <property name="tooltip_text" translatable="yes">Removes selected Type=Value pair from metadata list.
525The change will not last unless you click on "Apply" button before closing the window or selecing some other known namespace.</property>
526 <property name="use_stock">True</property>
527 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb" swapped="no"/>
528 </object>
529 <packing>
530 <property name="expand">False</property>
531 <property name="fill">False</property>
532 <property name="position">1</property>
533 </packing>
534 </child>
535 <child>
536 <object class="GtkButton" id="GNUNET_GTK_namespace_manager_namespace_details_apply_button">
537 <property name="label">gtk-apply</property>
538 <property name="use_action_appearance">False</property>
539 <property name="visible">True</property>
540 <property name="sensitive">False</property>
541 <property name="can_focus">True</property>
542 <property name="receives_default">True</property>
543 <property name="tooltip_text" translatable="yes">Applies changes made in metadata list to currently selected known namespace.</property>
544 <property name="use_stock">True</property>
545 <signal name="clicked" handler="GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb" swapped="no"/>
546 </object>
547 <packing>
548 <property name="expand">False</property>
549 <property name="fill">False</property>
550 <property name="position">2</property>
551 </packing>
552 </child>
553 </object>
554 <packing>
555 <property name="expand">False</property>
556 <property name="fill">False</property>
557 <property name="position">2</property>
558 </packing>
559 </child> 324 </child>
560 </object> 325 </object>
561 <packing> 326 </child>
562 <property name="resize">True</property> 327 <child type="label">
563 <property name="shrink">False</property> 328 <object class="GtkLabel" id="GNUNET_GTK_identity_keywords_label">
564 </packing> 329 <property name="visible">True</property>
330 <property name="can_focus">False</property>
331 <property name="label" translatable="yes">&lt;b&gt;Keywords to advertise namespace under:&lt;/b&gt;</property>
332 <property name="use_markup">True</property>
333 </object>
565 </child> 334 </child>
566 </object> 335 </object>
567 <packing> 336 <packing>
568 <property name="expand">True</property> 337 <property name="expand">True</property>
569 <property name="fill">True</property> 338 <property name="fill">True</property>
570 <property name="position">1</property> 339 <property name="position">2</property>
571 </packing> 340 </packing>
572 </child> 341 </child>
573 </object> 342 </object>
574 </child> 343 </child>
575 <action-widgets> 344 <action-widgets>
576 <action-widget response="-10">GNUNET_GTK_namespace_manager_apply_button</action-widget> 345 <action-widget response="-5">GNUNET_GTK_identity_advertise_ok_button</action-widget>
577 <action-widget response="-5">GNUNET_GTK_namespace_manager_ok_button</action-widget> 346 <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
578 <action-widget response="-6">GNUNET_GTK_namespace_manager_cancel_button</action-widget>
579 </action-widgets> 347 </action-widgets>
580 </object> 348 </object>
581 <object class="GtkListStore" id="GNUNET_GTK_namespace_manager_namespace_details_liststore"> 349 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore">
582 <columns> 350 <columns>
583 <!-- column-name PluginName --> 351 <!-- column-name Keyword -->
584 <column type="gchararray"/>
585 <!-- column-name TypeBin -->
586 <column type="gint"/>
587 <!-- column-name Type -->
588 <column type="gchararray"/>
589 <!-- column-name Format -->
590 <column type="gint"/>
591 <!-- column-name DataMime -->
592 <column type="gchararray"/>
593 <!-- column-name Value -->
594 <column type="gchararray"/>
595 </columns>
596 </object>
597 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_namespace_details_vadj">
598 <property name="upper">100</property>
599 <property name="step_increment">1</property>
600 <property name="page_increment">10</property>
601 </object>
602 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_namespace_order_hadj">
603 <property name="upper">100</property>
604 <property name="step_increment">1</property>
605 <property name="page_increment">10</property>
606 </object>
607 <object class="GtkListStore" id="GNUNET_GTK_namespace_manager_namespace_order_liststore">
608 <columns>
609 <!-- column-name Rank -->
610 <column type="gint"/>
611 <!-- column-name Name -->
612 <column type="gchararray"/>
613 <!-- column-name Identifier -->
614 <column type="gchararray"/> 352 <column type="gchararray"/>
615 <!-- column-name IdentifierBin -->
616 <column type="gpointer"/>
617 <!-- column-name KnownListRowReference -->
618 <column type="gpointer"/>
619 </columns> 353 </columns>
620 </object> 354 </object>
621 <object class="GtkAdjustment" id="GNUNET_GTK_namespace_manager_namespace_order_vadj"> 355 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_vadj">
622 <property name="upper">100</property> 356 <property name="upper">100</property>
623 <property name="step_increment">1</property> 357 <property name="step_increment">1</property>
624 <property name="page_increment">10</property> 358 <property name="page_increment">10</property>
diff --git a/contrib/gnunet_identity_gtk_organize_ego_dialog.glade b/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
index 0e4b112c..b4619c8f 100644
--- a/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
+++ b/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
@@ -2,101 +2,112 @@
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkDialog" id="GNUNET_GTK_namespace_organizer_dialog"> 5 <object class="GtkListStore" id="GNUNET_GTK_identity_liststore">
6 <columns>
7 <!-- column-name NamespaceName -->
8 <column type="gchararray"/>
9 <!-- column-name NamespaceKey -->
10 <column type="gchararray"/>
11 <!-- column-name NamespaceKeyBinary -->
12 <column type="gpointer"/>
13 </columns>
14 </object>
15 <object class="GtkWindow" id="GNUNET_GTK_identity_window">
6 <property name="can_focus">False</property> 16 <property name="can_focus">False</property>
7 <property name="border_width">5</property> 17 <property name="icon_name">contact-new</property>
8 <property name="title" translatable="yes">Namespace selection</property> 18 <child>
9 <property name="destroy_with_parent">True</property> 19 <object class="GtkVBox" id="GNUNET_GTK_identityvbox">
10 <property name="type_hint">dialog</property>
11 <property name="has_separator">True</property>
12 <signal name="response" handler="GNUNET_GTK_namespace_organizer_dialog_response_cb" swapped="no"/>
13 <child internal-child="vbox">
14 <object class="GtkVBox" id="GNUNET_GTK_namespace_organizer_vbox">
15 <property name="visible">True</property> 20 <property name="visible">True</property>
16 <property name="can_focus">False</property> 21 <property name="can_focus">False</property>
17 <property name="spacing">2</property> 22 <child>
18 <child internal-child="action_area"> 23 <object class="GtkMenuBar" id="GNUNET_GTK_identity_menubar">
19 <object class="GtkHButtonBox" id="GNUNET_GTK_namespace_organizer_action_area">
20 <property name="visible">True</property> 24 <property name="visible">True</property>
21 <property name="can_focus">False</property> 25 <property name="can_focus">False</property>
22 <property name="layout_style">end</property>
23 <child> 26 <child>
24 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_close_button"> 27 <object class="GtkMenuItem" id="GNUNET_GTK_identity_file_menuitem">
25 <property name="label">gtk-close</property>
26 <property name="visible">True</property> 28 <property name="visible">True</property>
27 <property name="can_focus">True</property> 29 <property name="can_focus">False</property>
28 <property name="receives_default">True</property> 30 <property name="label" translatable="yes">_File</property>
29 <property name="tooltip_text" translatable="yes">Saves all changes made in this dialog to disk and closes the dialog.</property> 31 <property name="use_underline">True</property>
30 <property name="use_stock">True</property> 32 <child type="submenu">
33 <object class="GtkMenu" id="GNUNET_GTK_identity_file_menu">
34 <property name="visible">True</property>
35 <property name="can_focus">False</property>
36 <child>
37 <object class="GtkImageMenuItem" id="GNUNET_GTK_identity_quit_imagemenuitem">
38 <property name="label">gtk-quit</property>
39 <property name="visible">True</property>
40 <property name="can_focus">False</property>
41 <property name="use_underline">True</property>
42 <property name="use_stock">True</property>
43 <signal name="activate" handler="GNUNET_GTK_identity_quit_imagemenuitem_activate_cb" swapped="no"/>
44 </object>
45 </child>
46 </object>
47 </child>
48 </object>
49 </child>
50 <child>
51 <object class="GtkMenuItem" id="GNUNET_GTK_identity_help_menuitem">
52 <property name="visible">True</property>
53 <property name="can_focus">False</property>
54 <property name="label" translatable="yes">_Help</property>
55 <property name="use_underline">True</property>
56 <child type="submenu">
57 <object class="GtkMenu" id="GNUNET_GTK_identity_help_menu">
58 <property name="visible">True</property>
59 <property name="can_focus">False</property>
60 <child>
61 <object class="GtkImageMenuItem" id="GNUNET_GTK_identity_about_imagemenuitem">
62 <property name="label">gtk-about</property>
63 <property name="visible">True</property>
64 <property name="can_focus">False</property>
65 <property name="use_underline">True</property>
66 <property name="use_stock">True</property>
67 <signal name="activate" handler="GNUNET_GTK_identity_about_imagemenuitem_activate_cb" swapped="no"/>
68 </object>
69 </child>
70 </object>
71 </child>
31 </object> 72 </object>
32 <packing>
33 <property name="expand">False</property>
34 <property name="fill">False</property>
35 <property name="position">0</property>
36 </packing>
37 </child> 73 </child>
38 </object> 74 </object>
39 <packing> 75 <packing>
40 <property name="expand">False</property> 76 <property name="expand">False</property>
41 <property name="fill">True</property> 77 <property name="fill">True</property>
42 <property name="pack_type">end</property>
43 <property name="position">0</property> 78 <property name="position">0</property>
44 </packing> 79 </packing>
45 </child> 80 </child>
46 <child> 81 <child>
47 <object class="GtkLabel" id="GNUNET_GTK_namespace_organizer_namespaces_label"> 82 <object class="GtkScrolledWindow" id="GNUNET_GTK_identity_scrolled_window">
48 <property name="visible">True</property>
49 <property name="can_focus">False</property>
50 <property name="xalign">0</property>
51 <property name="yalign">0</property>
52 <property name="label" translatable="yes">List of the namespaces you have private key for.
53You can create new namespaces, delete or rename existing ones.
54Select one of the namespaces that will be (optionally) used for publishing.</property>
55 </object>
56 <packing>
57 <property name="expand">False</property>
58 <property name="fill">True</property>
59 <property name="position">1</property>
60 </packing>
61 </child>
62 <child>
63 <object class="GtkScrolledWindow" id="GNUNET_GTK_namespace_organizer_scrolled">
64 <property name="visible">True</property> 83 <property name="visible">True</property>
65 <property name="can_focus">True</property> 84 <property name="can_focus">True</property>
85 <property name="hadjustment">adjustment1</property>
86 <property name="vadjustment">adjustment2</property>
66 <property name="hscrollbar_policy">automatic</property> 87 <property name="hscrollbar_policy">automatic</property>
67 <property name="vscrollbar_policy">automatic</property> 88 <property name="vscrollbar_policy">automatic</property>
68 <child> 89 <child>
69 <object class="GtkTreeView" id="GNUNET_GTK_namespace_organizer_namespaces_treeview"> 90 <object class="GtkTreeView" id="GNUNET_GTK_identity_treeview">
70 <property name="height_request">300</property> 91 <property name="height_request">300</property>
71 <property name="visible">True</property> 92 <property name="visible">True</property>
72 <property name="can_focus">True</property> 93 <property name="can_focus">True</property>
73 <property name="model">GNUNET_GTK_namespace_organizer_namespaces_liststore</property> 94 <property name="model">GNUNET_GTK_identity_liststore</property>
95 <property name="hadjustment">adjustment1</property>
96 <property name="vadjustment">adjustment2</property>
74 <property name="headers_clickable">False</property> 97 <property name="headers_clickable">False</property>
98 <property name="reorderable">True</property>
75 <property name="rules_hint">True</property> 99 <property name="rules_hint">True</property>
76 <property name="enable_search">False</property> 100 <property name="enable_search">False</property>
101 <property name="search_column">0</property>
77 <property name="show_expanders">False</property> 102 <property name="show_expanders">False</property>
78 <property name="enable_grid_lines">horizontal</property> 103 <property name="enable_grid_lines">horizontal</property>
79 <property name="tooltip_column">5</property> 104 <property name="tooltip_column">5</property>
80 <child> 105 <signal name="button-press-event" handler="GNUNET_GTK_identity_treeview_button_press_event_cb" swapped="no"/>
81 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis"> 106 <signal name="key-press-event" handler="GNUNET_GTK_identity_treeview_key_press_event_cb" swapped="no"/>
82 <property name="sizing">autosize</property>
83 <property name="title" translatable="yes">Use for publications</property>
84 <child>
85 <object class="GtkCellRendererToggle" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis_toggle">
86 <property name="radio">True</property>
87 <signal name="toggled" handler="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis_toggle_toggled_cb" swapped="no"/>
88 </object>
89 <attributes>
90 <attribute name="active">3</attribute>
91 </attributes>
92 </child>
93 </object>
94 </child>
95 <child> 107 <child>
96 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name"> 108 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name">
97 <property name="sizing">autosize</property> 109 <property name="sizing">autosize</property>
98 <property name="title" translatable="yes">Name</property> 110 <property name="title" translatable="yes">Name</property>
99 <property name="expand">True</property>
100 <child> 111 <child>
101 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text"> 112 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text">
102 <property name="editable">True</property> 113 <property name="editable">True</property>
@@ -111,7 +122,7 @@ Select one of the namespaces that will be (optionally) used for publishing.</pro
111 <child> 122 <child>
112 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key"> 123 <object class="GtkTreeViewColumn" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key">
113 <property name="sizing">autosize</property> 124 <property name="sizing">autosize</property>
114 <property name="title" translatable="yes">Hash of the public key</property> 125 <property name="title" translatable="yes">Unique identifier</property>
115 <child> 126 <child>
116 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key_text"/> 127 <object class="GtkCellRendererText" id="GNUNET_GTK_namespace_organizer_namespaces_treeview_column_key_text"/>
117 <attributes> 128 <attributes>
@@ -126,128 +137,20 @@ Select one of the namespaces that will be (optionally) used for publishing.</pro
126 <packing> 137 <packing>
127 <property name="expand">True</property> 138 <property name="expand">True</property>
128 <property name="fill">True</property> 139 <property name="fill">True</property>
129 <property name="position">2</property> 140 <property name="position">1</property>
130 </packing>
131 </child>
132 <child>
133 <object class="GtkHBox" id="GNUNET_GTK_namespace_organizer_namespaces_extra_buttons_hbox">
134 <property name="visible">True</property>
135 <property name="can_focus">False</property>
136 <property name="spacing">5</property>
137 <child>
138 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button">
139 <property name="label" translatable="yes">Create</property>
140 <property name="visible">True</property>
141 <property name="can_focus">True</property>
142 <property name="receives_default">True</property>
143 <property name="tooltip_text" translatable="yes">Generate new namespace.</property>
144 <signal name="clicked" handler="GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button_clicked_cb" swapped="no"/>
145 </object>
146 <packing>
147 <property name="expand">False</property>
148 <property name="fill">True</property>
149 <property name="position">0</property>
150 </packing>
151 </child>
152 <child>
153 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button">
154 <property name="label" translatable="yes">Advertise</property>
155 <property name="visible">True</property>
156 <property name="can_focus">True</property>
157 <property name="receives_default">True</property>
158 <property name="tooltip_text" translatable="yes">Make namespace findable with global file-sharing searches.</property>
159 <signal name="clicked" handler="GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button_clicked_cb" swapped="no"/>
160 </object>
161 <packing>
162 <property name="expand">False</property>
163 <property name="fill">True</property>
164 <property name="position">1</property>
165 </packing>
166 </child>
167 <child>
168 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button">
169 <property name="label" translatable="yes">Delete</property>
170 <property name="visible">True</property>
171 <property name="sensitive">False</property>
172 <property name="can_focus">True</property>
173 <property name="receives_default">True</property>
174 <property name="tooltip_text" translatable="yes">Delete namespace key.</property>
175 <signal name="clicked" handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button_clicked_cb" swapped="no"/>
176 </object>
177 <packing>
178 <property name="expand">False</property>
179 <property name="fill">True</property>
180 <property name="position">2</property>
181 </packing>
182 </child>
183 <child>
184 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button">
185 <property name="label" translatable="yes">Yes, delete it!</property>
186 <property name="can_focus">True</property>
187 <property name="receives_default">True</property>
188 <signal name="clicked" handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button_clicked_cb" swapped="no"/>
189 </object>
190 <packing>
191 <property name="expand">False</property>
192 <property name="fill">True</property>
193 <property name="pack_type">end</property>
194 <property name="position">3</property>
195 </packing>
196 </child>
197 <child>
198 <object class="GtkButton" id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button">
199 <property name="label" translatable="yes">No, keep it.</property>
200 <property name="can_focus">True</property>
201 <property name="receives_default">True</property>
202 <signal name="clicked" handler="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button_clicked_cb" swapped="no"/>
203 </object>
204 <packing>
205 <property name="expand">False</property>
206 <property name="fill">True</property>
207 <property name="pack_type">end</property>
208 <property name="position">4</property>
209 </packing>
210 </child>
211 <child>
212 <object class="GtkLabel" id="GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_label">
213 <property name="can_focus">False</property>
214 <property name="label" translatable="yes">Are you sure? Once you delete the private key of a namespace, it's lost forever!</property>
215 </object>
216 <packing>
217 <property name="expand">False</property>
218 <property name="fill">True</property>
219 <property name="pack_type">end</property>
220 <property name="position">5</property>
221 </packing>
222 </child>
223 </object>
224 <packing>
225 <property name="expand">False</property>
226 <property name="fill">True</property>
227 <property name="padding">5</property>
228 <property name="position">3</property>
229 </packing> 141 </packing>
230 </child> 142 </child>
231 </object> 143 </object>
232 </child> 144 </child>
233 <action-widgets>
234 <action-widget response="-5">GNUNET_GTK_namespace_organizer_close_button</action-widget>
235 </action-widgets>
236 </object> 145 </object>
237 <object class="GtkListStore" id="GNUNET_GTK_namespace_organizer_namespaces_liststore"> 146 <object class="GtkAdjustment" id="adjustment1">
238 <columns> 147 <property name="upper">100</property>
239 <!-- column-name NamespaceName --> 148 <property name="step_increment">1</property>
240 <column type="gchararray"/> 149 <property name="page_increment">10</property>
241 <!-- column-name NamespaceKey --> 150 </object>
242 <column type="gchararray"/> 151 <object class="GtkAdjustment" id="adjustment2">
243 <!-- column-name NamespaceKeyBinary --> 152 <property name="upper">100</property>
244 <column type="gpointer"/> 153 <property name="step_increment">1</property>
245 <!-- column-name UseThis --> 154 <property name="page_increment">10</property>
246 <column type="gboolean"/>
247 <!-- column-name ActualName -->
248 <column type="gchararray"/>
249 <!-- column-name ToolTip -->
250 <column type="gchararray"/>
251 </columns>
252 </object> 155 </object>
253</interface> 156</interface>