aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade290
-rw-r--r--contrib/gnunet_fs_gtk_main_window.glade666
-rw-r--r--contrib/gnunet_fs_gtk_open_url_dialog.glade191
-rw-r--r--contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade19
-rw-r--r--src/fs/Makefile.am2
-rw-r--r--src/fs/gnunet-fs-gtk_advertise-pseudonym.c (renamed from src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c)112
6 files changed, 553 insertions, 727 deletions
diff --git a/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade b/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
index bea65816..e77a41d9 100644
--- a/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
+++ b/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
@@ -1,17 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
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 <object class="GtkAdjustment" id="adjustment2">
5 <object class="GtkAdjustment" id="expiration_year_adjustment"> 5 <property name="upper">100</property>
6 <property name="upper">9999</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">5</property>
9 </object>
10 <object class="GtkAdjustment" id="priority_adjustment">
11 <property name="upper">10000000</property>
12 <property name="value">1000</property>
13 <property name="step_increment">1</property> 6 <property name="step_increment">1</property>
14 <property name="page_increment">10</property> 7 <property name="page_increment">10</property>
8 <property name="page_size">10</property>
15 </object> 9 </object>
16 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment"> 10 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
17 <property name="upper">100000</property> 11 <property name="upper">100000</property>
@@ -25,30 +19,127 @@
25 <column type="gchararray"/> 19 <column type="gchararray"/>
26 </columns> 20 </columns>
27 </object> 21 </object>
22 <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
23 <columns>
24 <!-- column-name extractor_meta_type -->
25 <column type="guint"/>
26 <!-- column-name extractor_meta_format -->
27 <column type="guint"/>
28 <!-- column-name extractor_meta_type_string -->
29 <column type="gchararray"/>
30 <!-- column-name extracotr_meta_value -->
31 <column type="gchararray"/>
32 </columns>
33 </object>
34 <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
35 <columns>
36 <!-- column-name description -->
37 <column type="gchararray"/>
38 <!-- column-name guint1 -->
39 <column type="guint"/>
40 <!-- column-name helptext -->
41 <column type="gchararray"/>
42 </columns>
43 </object>
44 <object class="GtkAdjustment" id="adjustment1">
45 <property name="upper">100</property>
46 <property name="step_increment">1</property>
47 <property name="page_increment">10</property>
48 <property name="page_size">10</property>
49 </object>
50 <object class="GtkAdjustment" id="adjustment3">
51 <property name="upper">100</property>
52 <property name="step_increment">1</property>
53 <property name="page_increment">10</property>
54 <property name="page_size">10</property>
55 </object>
56 <object class="GtkAdjustment" id="adjustment4">
57 <property name="upper">100</property>
58 <property name="step_increment">1</property>
59 <property name="page_increment">10</property>
60 <property name="page_size">10</property>
61 </object>
62 <object class="GtkAdjustment" id="expiration_year_adjustment">
63 <property name="upper">9999</property>
64 <property name="step_increment">1</property>
65 <property name="page_increment">5</property>
66 </object>
28 <object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog"> 67 <object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog">
68 <property name="can_focus">False</property>
29 <property name="border_width">5</property> 69 <property name="border_width">5</property>
30 <property name="title" translatable="yes">Advertise namespace</property> 70 <property name="title" translatable="yes">Advertise namespace</property>
31 <property name="destroy_with_parent">True</property> 71 <property name="destroy_with_parent">True</property>
32 <property name="type_hint">dialog</property> 72 <property name="type_hint">dialog</property>
33 <property name="skip_taskbar_hint">True</property> 73 <property name="skip_taskbar_hint">True</property>
34 <property name="has_separator">False</property>
35 <child internal-child="vbox"> 74 <child internal-child="vbox">
36 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox"> 75 <object class="GtkBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox">
37 <property name="visible">True</property> 76 <property name="visible">True</property>
77 <property name="can_focus">False</property>
78 <property name="orientation">vertical</property>
38 <property name="spacing">2</property> 79 <property name="spacing">2</property>
80 <child internal-child="action_area">
81 <object class="GtkButtonBox" id="dialog-action_area13">
82 <property name="visible">True</property>
83 <property name="can_focus">False</property>
84 <property name="layout_style">end</property>
85 <child>
86 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_cancel_button">
87 <property name="label">gtk-cancel</property>
88 <property name="use_action_appearance">False</property>
89 <property name="visible">True</property>
90 <property name="can_focus">True</property>
91 <property name="receives_default">True</property>
92 <property name="use_action_appearance">False</property>
93 <property name="use_stock">True</property>
94 </object>
95 <packing>
96 <property name="expand">False</property>
97 <property name="fill">False</property>
98 <property name="position">0</property>
99 </packing>
100 </child>
101 <child>
102 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_confirm_button">
103 <property name="label">gtk-ok</property>
104 <property name="use_action_appearance">False</property>
105 <property name="visible">True</property>
106 <property name="sensitive">False</property>
107 <property name="can_focus">True</property>
108 <property name="receives_default">True</property>
109 <property name="use_action_appearance">False</property>
110 <property name="use_stock">True</property>
111 </object>
112 <packing>
113 <property name="expand">False</property>
114 <property name="fill">False</property>
115 <property name="position">1</property>
116 </packing>
117 </child>
118 </object>
119 <packing>
120 <property name="expand">False</property>
121 <property name="fill">True</property>
122 <property name="pack_type">end</property>
123 <property name="position">0</property>
124 </packing>
125 </child>
39 <child> 126 <child>
40 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_metadata_hbox"> 127 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_metadata_hbox">
41 <property name="visible">True</property> 128 <property name="visible">True</property>
129 <property name="can_focus">False</property>
42 <child> 130 <child>
43 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_metadata_vbox"> 131 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_metadata_vbox">
44 <property name="visible">True</property> 132 <property name="visible">True</property>
133 <property name="can_focus">False</property>
45 <property name="spacing">5</property> 134 <property name="spacing">5</property>
46 <child> 135 <child>
47 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_metadata_edit_hbox"> 136 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_metadata_edit_hbox">
48 <property name="visible">True</property> 137 <property name="visible">True</property>
138 <property name="can_focus">False</property>
49 <child> 139 <child>
50 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_type_label"> 140 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_type_label">
51 <property name="visible">True</property> 141 <property name="visible">True</property>
142 <property name="can_focus">False</property>
52 <property name="label" translatable="yes">Type:</property> 143 <property name="label" translatable="yes">Type:</property>
53 </object> 144 </object>
54 <packing> 145 <packing>
@@ -63,7 +154,6 @@
63 <property name="visible">True</property> 154 <property name="visible">True</property>
64 <property name="can_focus">True</property> 155 <property name="can_focus">True</property>
65 <property name="hscrollbar_policy">never</property> 156 <property name="hscrollbar_policy">never</property>
66 <property name="vscrollbar_policy">automatic</property>
67 <child> 157 <child>
68 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"> 158 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view">
69 <property name="visible">True</property> 159 <property name="visible">True</property>
@@ -74,6 +164,9 @@
74 <property name="reorderable">True</property> 164 <property name="reorderable">True</property>
75 <property name="enable_search">False</property> 165 <property name="enable_search">False</property>
76 <property name="tooltip_column">2</property> 166 <property name="tooltip_column">2</property>
167 <child internal-child="selection">
168 <object class="GtkTreeSelection" id="treeview-selection1"/>
169 </child>
77 <child> 170 <child>
78 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_column"> 171 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_column">
79 <property name="title" translatable="yes">Value</property> 172 <property name="title" translatable="yes">Value</property>
@@ -90,12 +183,15 @@
90 </child> 183 </child>
91 </object> 184 </object>
92 <packing> 185 <packing>
186 <property name="expand">True</property>
187 <property name="fill">True</property>
93 <property name="position">1</property> 188 <property name="position">1</property>
94 </packing> 189 </packing>
95 </child> 190 </child>
96 <child> 191 <child>
97 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_value_label"> 192 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_value_label">
98 <property name="visible">True</property> 193 <property name="visible">True</property>
194 <property name="can_focus">False</property>
99 <property name="label" translatable="yes">Value:</property> 195 <property name="label" translatable="yes">Value:</property>
100 </object> 196 </object>
101 <packing> 197 <packing>
@@ -113,6 +209,8 @@
113 <signal name="changed" handler="GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb" swapped="no"/> 209 <signal name="changed" handler="GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb" swapped="no"/>
114 </object> 210 </object>
115 <packing> 211 <packing>
212 <property name="expand">True</property>
213 <property name="fill">True</property>
116 <property name="position">3</property> 214 <property name="position">3</property>
117 </packing> 215 </packing>
118 </child> 216 </child>
@@ -131,16 +229,17 @@
131 <property name="can_focus">False</property> 229 <property name="can_focus">False</property>
132 <property name="hadjustment">adjustment1</property> 230 <property name="hadjustment">adjustment1</property>
133 <property name="vadjustment">adjustment2</property> 231 <property name="vadjustment">adjustment2</property>
134 <property name="hscrollbar_policy">automatic</property>
135 <property name="vscrollbar_policy">automatic</property>
136 <child> 232 <child>
137 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view"> 233 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view">
138 <property name="visible">True</property> 234 <property name="visible">True</property>
139 <property name="can_focus">True</property> 235 <property name="can_focus">True</property>
140 <property name="model">GNUNET_GTK_meta_data_list_store</property>
141 <property name="hadjustment">adjustment1</property> 236 <property name="hadjustment">adjustment1</property>
142 <property name="vadjustment">adjustment2</property> 237 <property name="vadjustment">adjustment2</property>
238 <property name="model">GNUNET_GTK_meta_data_list_store</property>
143 <property name="enable_search">False</property> 239 <property name="enable_search">False</property>
240 <child internal-child="selection">
241 <object class="GtkTreeSelection" id="treeview-selection2"/>
242 </child>
144 <child> 243 <child>
145 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column"> 244 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column">
146 <property name="sizing">fixed</property> 245 <property name="sizing">fixed</property>
@@ -174,20 +273,26 @@
174 </child> 273 </child>
175 </object> 274 </object>
176 <packing> 275 <packing>
276 <property name="expand">True</property>
277 <property name="fill">True</property>
177 <property name="position">1</property> 278 <property name="position">1</property>
178 </packing> 279 </packing>
179 </child> 280 </child>
180 </object> 281 </object>
181 <packing> 282 <packing>
283 <property name="expand">True</property>
284 <property name="fill">True</property>
182 <property name="position">0</property> 285 <property name="position">0</property>
183 </packing> 286 </packing>
184 </child> 287 </child>
185 <child> 288 <child>
186 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_metadata_button_vbox"> 289 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_metadata_button_vbox">
187 <property name="visible">True</property> 290 <property name="visible">True</property>
291 <property name="can_focus">False</property>
188 <child> 292 <child>
189 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_metadata_add_button"> 293 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_metadata_add_button">
190 <property name="label">gtk-add</property> 294 <property name="label">gtk-add</property>
295 <property name="use_action_appearance">False</property>
191 <property name="visible">True</property> 296 <property name="visible">True</property>
192 <property name="sensitive">False</property> 297 <property name="sensitive">False</property>
193 <property name="can_focus">True</property> 298 <property name="can_focus">True</property>
@@ -205,6 +310,7 @@
205 <child> 310 <child>
206 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_metadata_delete_button"> 311 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_metadata_delete_button">
207 <property name="label">gtk-delete</property> 312 <property name="label">gtk-delete</property>
313 <property name="use_action_appearance">False</property>
208 <property name="visible">True</property> 314 <property name="visible">True</property>
209 <property name="sensitive">False</property> 315 <property name="sensitive">False</property>
210 <property name="can_focus">True</property> 316 <property name="can_focus">True</property>
@@ -223,6 +329,7 @@
223 <child> 329 <child>
224 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_label"> 330 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_label">
225 <property name="visible">True</property> 331 <property name="visible">True</property>
332 <property name="can_focus">False</property>
226 <property name="label" translatable="yes">Preview:</property> 333 <property name="label" translatable="yes">Preview:</property>
227 </object> 334 </object>
228 <packing> 335 <packing>
@@ -235,14 +342,18 @@
235 <child> 342 <child>
236 <object class="GtkImage" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_image"> 343 <object class="GtkImage" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_image">
237 <property name="sensitive">False</property> 344 <property name="sensitive">False</property>
345 <property name="can_focus">False</property>
238 <property name="stock">gtk-missing-image</property> 346 <property name="stock">gtk-missing-image</property>
239 </object> 347 </object>
240 <packing> 348 <packing>
349 <property name="expand">True</property>
350 <property name="fill">True</property>
241 <property name="position">3</property> 351 <property name="position">3</property>
242 </packing> 352 </packing>
243 </child> 353 </child>
244 <child> 354 <child>
245 <object class="GtkFileChooserButton" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button"> 355 <object class="GtkFileChooserButton" id="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button">
356 <property name="can_focus">False</property>
246 <property name="create_folders">False</property> 357 <property name="create_folders">False</property>
247 <property name="title" translatable="yes">Select file</property> 358 <property name="title" translatable="yes">Select file</property>
248 <signal name="file-set" handler="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb" swapped="no"/> 359 <signal name="file-set" handler="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb" swapped="no"/>
@@ -255,27 +366,35 @@
255 </child> 366 </child>
256 </object> 367 </object>
257 <packing> 368 <packing>
369 <property name="expand">True</property>
370 <property name="fill">True</property>
258 <property name="padding">5</property> 371 <property name="padding">5</property>
259 <property name="position">1</property> 372 <property name="position">1</property>
260 </packing> 373 </packing>
261 </child> 374 </child>
262 </object> 375 </object>
263 <packing> 376 <packing>
377 <property name="expand">False</property>
378 <property name="fill">True</property>
264 <property name="position">1</property> 379 <property name="position">1</property>
265 </packing> 380 </packing>
266 </child> 381 </child>
267 <child> 382 <child>
268 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_secondary_hbox"> 383 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_secondary_hbox">
269 <property name="visible">True</property> 384 <property name="visible">True</property>
385 <property name="can_focus">False</property>
270 <child> 386 <child>
271 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_keyword_entry_vbox"> 387 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_keyword_entry_vbox">
272 <property name="visible">True</property> 388 <property name="visible">True</property>
389 <property name="can_focus">False</property>
273 <child> 390 <child>
274 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_keyword_hbox"> 391 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_keyword_hbox">
275 <property name="visible">True</property> 392 <property name="visible">True</property>
393 <property name="can_focus">False</property>
276 <child> 394 <child>
277 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_keyword_label"> 395 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_keyword_label">
278 <property name="visible">True</property> 396 <property name="visible">True</property>
397 <property name="can_focus">False</property>
279 <property name="label" translatable="yes">_Keyword:</property> 398 <property name="label" translatable="yes">_Keyword:</property>
280 <property name="use_underline">True</property> 399 <property name="use_underline">True</property>
281 <property name="mnemonic_widget">GNUNET_GTK_advertise_pseudonym_keyword_entry</property> 400 <property name="mnemonic_widget">GNUNET_GTK_advertise_pseudonym_keyword_entry</property>
@@ -296,6 +415,8 @@
296 <signal name="activate" handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_activate_cb" swapped="no"/> 415 <signal name="activate" handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_activate_cb" swapped="no"/>
297 </object> 416 </object>
298 <packing> 417 <packing>
418 <property name="expand">True</property>
419 <property name="fill">True</property>
299 <property name="position">1</property> 420 <property name="position">1</property>
300 </packing> 421 </packing>
301 </child> 422 </child>
@@ -310,6 +431,7 @@
310 <child> 431 <child>
311 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_keyword_list_hbox"> 432 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_keyword_list_hbox">
312 <property name="visible">True</property> 433 <property name="visible">True</property>
434 <property name="can_focus">False</property>
313 <child> 435 <child>
314 <object class="GtkScrolledWindow" id="GNUNET_GTK_advertise_pseudonym_keyword_scrolled_window"> 436 <object class="GtkScrolledWindow" id="GNUNET_GTK_advertise_pseudonym_keyword_scrolled_window">
315 <property name="width_request">400</property> 437 <property name="width_request">400</property>
@@ -319,15 +441,17 @@
319 <property name="hadjustment">adjustment3</property> 441 <property name="hadjustment">adjustment3</property>
320 <property name="vadjustment">adjustment4</property> 442 <property name="vadjustment">adjustment4</property>
321 <property name="hscrollbar_policy">never</property> 443 <property name="hscrollbar_policy">never</property>
322 <property name="vscrollbar_policy">automatic</property>
323 <child> 444 <child>
324 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"> 445 <object class="GtkTreeView" id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view">
325 <property name="visible">True</property> 446 <property name="visible">True</property>
326 <property name="can_focus">True</property> 447 <property name="can_focus">True</property>
327 <property name="model">GNUNET_GTK_keyword_list_store</property>
328 <property name="hadjustment">adjustment3</property> 448 <property name="hadjustment">adjustment3</property>
329 <property name="vadjustment">adjustment4</property> 449 <property name="vadjustment">adjustment4</property>
450 <property name="model">GNUNET_GTK_keyword_list_store</property>
330 <property name="search_column">0</property> 451 <property name="search_column">0</property>
452 <child internal-child="selection">
453 <object class="GtkTreeSelection" id="treeview-selection3"/>
454 </child>
331 <child> 455 <child>
332 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column"> 456 <object class="GtkTreeViewColumn" id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column">
333 <property name="title" translatable="yes">Keywords</property> 457 <property name="title" translatable="yes">Keywords</property>
@@ -345,15 +469,19 @@
345 </child> 469 </child>
346 </object> 470 </object>
347 <packing> 471 <packing>
472 <property name="expand">True</property>
473 <property name="fill">True</property>
348 <property name="position">0</property> 474 <property name="position">0</property>
349 </packing> 475 </packing>
350 </child> 476 </child>
351 <child> 477 <child>
352 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_keyword_list_button_vbox"> 478 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_keyword_list_button_vbox">
353 <property name="visible">True</property> 479 <property name="visible">True</property>
480 <property name="can_focus">False</property>
354 <child> 481 <child>
355 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button"> 482 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button">
356 <property name="label">gtk-add</property> 483 <property name="label">gtk-add</property>
484 <property name="use_action_appearance">False</property>
357 <property name="visible">True</property> 485 <property name="visible">True</property>
358 <property name="sensitive">False</property> 486 <property name="sensitive">False</property>
359 <property name="can_focus">True</property> 487 <property name="can_focus">True</property>
@@ -371,6 +499,7 @@
371 <child> 499 <child>
372 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button"> 500 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button">
373 <property name="label">gtk-delete</property> 501 <property name="label">gtk-delete</property>
502 <property name="use_action_appearance">False</property>
374 <property name="visible">True</property> 503 <property name="visible">True</property>
375 <property name="sensitive">False</property> 504 <property name="sensitive">False</property>
376 <property name="can_focus">True</property> 505 <property name="can_focus">True</property>
@@ -396,11 +525,15 @@
396 </child> 525 </child>
397 </object> 526 </object>
398 <packing> 527 <packing>
528 <property name="expand">True</property>
529 <property name="fill">True</property>
399 <property name="position">1</property> 530 <property name="position">1</property>
400 </packing> 531 </packing>
401 </child> 532 </child>
402 </object> 533 </object>
403 <packing> 534 <packing>
535 <property name="expand">True</property>
536 <property name="fill">True</property>
404 <property name="padding">5</property> 537 <property name="padding">5</property>
405 <property name="position">0</property> 538 <property name="position">0</property>
406 </packing> 539 </packing>
@@ -408,9 +541,11 @@
408 <child> 541 <child>
409 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_misc_vbox"> 542 <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_misc_vbox">
410 <property name="visible">True</property> 543 <property name="visible">True</property>
544 <property name="can_focus">False</property>
411 <child> 545 <child>
412 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_options_label"> 546 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_options_label">
413 <property name="visible">True</property> 547 <property name="visible">True</property>
548 <property name="can_focus">False</property>
414 <property name="label" translatable="yes">Options</property> 549 <property name="label" translatable="yes">Options</property>
415 <property name="justify">center</property> 550 <property name="justify">center</property>
416 </object> 551 </object>
@@ -424,9 +559,11 @@
424 <child> 559 <child>
425 <object class="GtkHSeparator" id="hseparator3"> 560 <object class="GtkHSeparator" id="hseparator3">
426 <property name="visible">True</property> 561 <property name="visible">True</property>
562 <property name="can_focus">False</property>
427 </object> 563 </object>
428 <packing> 564 <packing>
429 <property name="expand">False</property> 565 <property name="expand">False</property>
566 <property name="fill">True</property>
430 <property name="padding">5</property> 567 <property name="padding">5</property>
431 <property name="position">1</property> 568 <property name="position">1</property>
432 </packing> 569 </packing>
@@ -434,9 +571,11 @@
434 <child> 571 <child>
435 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_anonymity_hbox"> 572 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_anonymity_hbox">
436 <property name="visible">True</property> 573 <property name="visible">True</property>
574 <property name="can_focus">False</property>
437 <child> 575 <child>
438 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_anonymity_label"> 576 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_anonymity_label">
439 <property name="visible">True</property> 577 <property name="visible">True</property>
578 <property name="can_focus">False</property>
440 <property name="label" translatable="yes">_Anonymity:</property> 579 <property name="label" translatable="yes">_Anonymity:</property>
441 <property name="use_underline">True</property> 580 <property name="use_underline">True</property>
442 </object> 581 </object>
@@ -457,6 +596,8 @@
457 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/> 596 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/>
458 </object> 597 </object>
459 <packing> 598 <packing>
599 <property name="expand">True</property>
600 <property name="fill">True</property>
460 <property name="position">1</property> 601 <property name="position">1</property>
461 </packing> 602 </packing>
462 </child> 603 </child>
@@ -470,6 +611,7 @@
470 <child> 611 <child>
471 <object class="GtkHSeparator" id="hseparator1"> 612 <object class="GtkHSeparator" id="hseparator1">
472 <property name="visible">True</property> 613 <property name="visible">True</property>
614 <property name="can_focus">False</property>
473 </object> 615 </object>
474 <packing> 616 <packing>
475 <property name="expand">False</property> 617 <property name="expand">False</property>
@@ -480,14 +622,17 @@
480 <child> 622 <child>
481 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_priority_hbox"> 623 <object class="GtkHBox" id="GNUNET_GTK_advertise_pseudonym_priority_hbox">
482 <property name="visible">True</property> 624 <property name="visible">True</property>
625 <property name="can_focus">False</property>
483 <child> 626 <child>
484 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_priority_label"> 627 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_priority_label">
485 <property name="visible">True</property> 628 <property name="visible">True</property>
629 <property name="can_focus">False</property>
486 <property name="label" translatable="yes">_Priority:</property> 630 <property name="label" translatable="yes">_Priority:</property>
487 <property name="use_underline">True</property> 631 <property name="use_underline">True</property>
488 </object> 632 </object>
489 <packing> 633 <packing>
490 <property name="expand">False</property> 634 <property name="expand">False</property>
635 <property name="fill">True</property>
491 <property name="padding">5</property> 636 <property name="padding">5</property>
492 <property name="position">0</property> 637 <property name="position">0</property>
493 </packing> 638 </packing>
@@ -502,6 +647,8 @@
502 <property name="numeric">True</property> 647 <property name="numeric">True</property>
503 </object> 648 </object>
504 <packing> 649 <packing>
650 <property name="expand">True</property>
651 <property name="fill">True</property>
505 <property name="position">1</property> 652 <property name="position">1</property>
506 </packing> 653 </packing>
507 </child> 654 </child>
@@ -515,23 +662,29 @@
515 <child> 662 <child>
516 <object class="GtkHSeparator" id="hseparator2"> 663 <object class="GtkHSeparator" id="hseparator2">
517 <property name="visible">True</property> 664 <property name="visible">True</property>
665 <property name="can_focus">False</property>
518 </object> 666 </object>
519 <packing> 667 <packing>
520 <property name="expand">False</property> 668 <property name="expand">False</property>
669 <property name="fill">True</property>
521 <property name="position">5</property> 670 <property name="position">5</property>
522 </packing> 671 </packing>
523 </child> 672 </child>
524 <child> 673 <child>
525 <object class="GtkHBox" id="hbox1"> 674 <object class="GtkHBox" id="hbox1">
526 <property name="visible">True</property> 675 <property name="visible">True</property>
676 <property name="can_focus">False</property>
527 <child> 677 <child>
528 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_root_label"> 678 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_root_label">
529 <property name="visible">True</property> 679 <property name="visible">True</property>
680 <property name="can_focus">False</property>
530 <property name="label" translatable="yes">_Root:</property> 681 <property name="label" translatable="yes">_Root:</property>
531 <property name="use_underline">True</property> 682 <property name="use_underline">True</property>
532 <property name="selectable">True</property> 683 <property name="selectable">True</property>
533 </object> 684 </object>
534 <packing> 685 <packing>
686 <property name="expand">True</property>
687 <property name="fill">True</property>
535 <property name="padding">5</property> 688 <property name="padding">5</property>
536 <property name="position">0</property> 689 <property name="position">0</property>
537 </packing> 690 </packing>
@@ -544,34 +697,43 @@
544 <property name="text" translatable="yes">root</property> 697 <property name="text" translatable="yes">root</property>
545 </object> 698 </object>
546 <packing> 699 <packing>
700 <property name="expand">True</property>
701 <property name="fill">True</property>
547 <property name="position">1</property> 702 <property name="position">1</property>
548 </packing> 703 </packing>
549 </child> 704 </child>
550 </object> 705 </object>
551 <packing> 706 <packing>
707 <property name="expand">True</property>
708 <property name="fill">True</property>
552 <property name="position">6</property> 709 <property name="position">6</property>
553 </packing> 710 </packing>
554 </child> 711 </child>
555 <child> 712 <child>
556 <object class="GtkHSeparator" id="hseparator4"> 713 <object class="GtkHSeparator" id="hseparator4">
557 <property name="visible">True</property> 714 <property name="visible">True</property>
715 <property name="can_focus">False</property>
558 </object> 716 </object>
559 <packing> 717 <packing>
560 <property name="expand">False</property> 718 <property name="expand">False</property>
719 <property name="fill">True</property>
561 <property name="position">7</property> 720 <property name="position">7</property>
562 </packing> 721 </packing>
563 </child> 722 </child>
564 <child> 723 <child>
565 <object class="GtkHBox" id="hbox2"> 724 <object class="GtkHBox" id="hbox2">
566 <property name="visible">True</property> 725 <property name="visible">True</property>
726 <property name="can_focus">False</property>
567 <child> 727 <child>
568 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_expiration_label"> 728 <object class="GtkLabel" id="GNUNET_GTK_advertise_pseudonym_expiration_label">
569 <property name="visible">True</property> 729 <property name="visible">True</property>
730 <property name="can_focus">False</property>
570 <property name="label" translatable="yes">_Expiration year:</property> 731 <property name="label" translatable="yes">_Expiration year:</property>
571 <property name="use_underline">True</property> 732 <property name="use_underline">True</property>
572 </object> 733 </object>
573 <packing> 734 <packing>
574 <property name="expand">False</property> 735 <property name="expand">False</property>
736 <property name="fill">True</property>
575 <property name="padding">5</property> 737 <property name="padding">5</property>
576 <property name="position">0</property> 738 <property name="position">0</property>
577 </packing> 739 </packing>
@@ -587,11 +749,15 @@
587 <property name="numeric">True</property> 749 <property name="numeric">True</property>
588 </object> 750 </object>
589 <packing> 751 <packing>
752 <property name="expand">True</property>
753 <property name="fill">True</property>
590 <property name="position">1</property> 754 <property name="position">1</property>
591 </packing> 755 </packing>
592 </child> 756 </child>
593 </object> 757 </object>
594 <packing> 758 <packing>
759 <property name="expand">True</property>
760 <property name="fill">True</property>
595 <property name="position">8</property> 761 <property name="position">8</property>
596 </packing> 762 </packing>
597 </child> 763 </child>
@@ -605,52 +771,12 @@
605 </child> 771 </child>
606 </object> 772 </object>
607 <packing> 773 <packing>
774 <property name="expand">False</property>
775 <property name="fill">True</property>
608 <property name="padding">5</property> 776 <property name="padding">5</property>
609 <property name="position">2</property> 777 <property name="position">2</property>
610 </packing> 778 </packing>
611 </child> 779 </child>
612 <child internal-child="action_area">
613 <object class="GtkHButtonBox" id="dialog-action_area13">
614 <property name="visible">True</property>
615 <property name="layout_style">end</property>
616 <child>
617 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_cancel_button">
618 <property name="label">gtk-cancel</property>
619 <property name="visible">True</property>
620 <property name="can_focus">True</property>
621 <property name="receives_default">True</property>
622 <property name="use_action_appearance">False</property>
623 <property name="use_stock">True</property>
624 </object>
625 <packing>
626 <property name="expand">False</property>
627 <property name="fill">False</property>
628 <property name="position">0</property>
629 </packing>
630 </child>
631 <child>
632 <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_confirm_button">
633 <property name="label">gtk-ok</property>
634 <property name="visible">True</property>
635 <property name="sensitive">False</property>
636 <property name="can_focus">True</property>
637 <property name="receives_default">True</property>
638 <property name="use_action_appearance">False</property>
639 <property name="use_stock">True</property>
640 </object>
641 <packing>
642 <property name="expand">False</property>
643 <property name="fill">False</property>
644 <property name="position">1</property>
645 </packing>
646 </child>
647 </object>
648 <packing>
649 <property name="expand">False</property>
650 <property name="pack_type">end</property>
651 <property name="position">0</property>
652 </packing>
653 </child>
654 </object> 780 </object>
655 </child> 781 </child>
656 <action-widgets> 782 <action-widgets>
@@ -658,50 +784,10 @@
658 <action-widget response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget> 784 <action-widget response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget>
659 </action-widgets> 785 </action-widgets>
660 </object> 786 </object>
661 <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store"> 787 <object class="GtkAdjustment" id="priority_adjustment">
662 <columns> 788 <property name="upper">10000000</property>
663 <!-- column-name extractor_meta_type --> 789 <property name="value">1000</property>
664 <column type="guint"/>
665 <!-- column-name extractor_meta_format -->
666 <column type="guint"/>
667 <!-- column-name extractor_meta_type_string -->
668 <column type="gchararray"/>
669 <!-- column-name extracotr_meta_value -->
670 <column type="gchararray"/>
671 </columns>
672 </object>
673 <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
674 <columns>
675 <!-- column-name description -->
676 <column type="gchararray"/>
677 <!-- column-name guint1 -->
678 <column type="guint"/>
679 <!-- column-name helptext -->
680 <column type="gchararray"/>
681 </columns>
682 </object>
683 <object class="GtkAdjustment" id="adjustment1">
684 <property name="upper">100</property>
685 <property name="step_increment">1</property>
686 <property name="page_increment">10</property>
687 <property name="page_size">10</property>
688 </object>
689 <object class="GtkAdjustment" id="adjustment2">
690 <property name="upper">100</property>
691 <property name="step_increment">1</property>
692 <property name="page_increment">10</property>
693 <property name="page_size">10</property>
694 </object>
695 <object class="GtkAdjustment" id="adjustment3">
696 <property name="upper">100</property>
697 <property name="step_increment">1</property>
698 <property name="page_increment">10</property>
699 <property name="page_size">10</property>
700 </object>
701 <object class="GtkAdjustment" id="adjustment4">
702 <property name="upper">100</property>
703 <property name="step_increment">1</property> 790 <property name="step_increment">1</property>
704 <property name="page_increment">10</property> 791 <property name="page_increment">10</property>
705 <property name="page_size">10</property>
706 </object> 792 </object>
707</interface> 793</interface>
diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index c7b87685..f97e5dbf 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -1,7 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment"> 4 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
6 <property name="upper">100</property> 5 <property name="upper">100</property>
7 <property name="step_increment">1</property> 6 <property name="step_increment">1</property>
@@ -44,490 +43,12 @@
44 <column type="gchararray"/> 43 <column type="gchararray"/>
45 </columns> 44 </columns>
46 </object> 45 </object>
47 <object class="GtkTextBuffer" id="GNUNET_GTK_open_url_dialog_url_textview_buffer">
48 <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb" swapped="no"/>
49 </object>
50 <object class="GtkWindow" id="GNUNET_GTK_open_url_window">
51 <property name="can_focus">False</property>
52 <property name="title" translatable="yes">Enter the URI to be downloaded</property>
53 <property name="modal">True</property>
54 <property name="default_width">640</property>
55 <property name="default_height">240</property>
56 <property name="destroy_with_parent">True</property>
57 <property name="skip_taskbar_hint">True</property>
58 <property name="skip_pager_hint">True</property>
59 <property name="deletable">False</property>
60 <property name="transient_for">GNUNET_GTK_main_window</property>
61 <signal name="delete-event" handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
62 <child>
63 <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
64 <property name="visible">True</property>
65 <property name="can_focus">False</property>
66 <property name="spacing">2</property>
67 <child>
68 <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
69 <property name="visible">True</property>
70 <property name="can_focus">False</property>
71 <child>
72 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_url_label">
73 <property name="visible">True</property>
74 <property name="can_focus">False</property>
75 <property name="label" translatable="yes">_URI:</property>
76 <property name="use_underline">True</property>
77 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
78 </object>
79 <packing>
80 <property name="expand">False</property>
81 <property name="fill">False</property>
82 <property name="padding">4</property>
83 <property name="position">0</property>
84 </packing>
85 </child>
86 <child>
87 <object class="GtkFrame" id="frame1">
88 <property name="visible">True</property>
89 <property name="can_focus">False</property>
90 <property name="label_xalign">0</property>
91 <property name="shadow_type">in</property>
92 <child>
93 <object class="GtkAlignment" id="alignment1">
94 <property name="visible">True</property>
95 <property name="can_focus">False</property>
96 <child>
97 <object class="GtkTextView" id="GNUNET_GTK_open_url_dialog_url_textview">
98 <property name="visible">True</property>
99 <property name="can_focus">True</property>
100 <property name="events">GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK</property>
101 <property name="wrap_mode">char</property>
102 <property name="indent">20</property>
103 <property name="buffer">GNUNET_GTK_open_url_dialog_url_textview_buffer</property>
104 <property name="accepts_tab">False</property>
105 <signal name="key-press-event" handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb" swapped="no"/>
106 </object>
107 </child>
108 </object>
109 </child>
110 <child type="label_item">
111 <placeholder/>
112 </child>
113 </object>
114 <packing>
115 <property name="expand">True</property>
116 <property name="fill">True</property>
117 <property name="position">1</property>
118 </packing>
119 </child>
120 </object>
121 <packing>
122 <property name="expand">True</property>
123 <property name="fill">True</property>
124 <property name="padding">5</property>
125 <property name="position">0</property>
126 </packing>
127 </child>
128 <child>
129 <object class="GtkHBox" id="hbox1">
130 <property name="visible">True</property>
131 <property name="can_focus">False</property>
132 <child>
133 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_execute_button">
134 <property name="label">_Execute</property>
135 <property name="use_action_appearance">False</property>
136 <property name="visible">True</property>
137 <property name="sensitive">False</property>
138 <property name="can_focus">True</property>
139 <property name="receives_default">True</property>
140 <property name="image">execute_stock_image</property>
141 <property name="use_underline">True</property>
142 <signal name="clicked" handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb" swapped="no"/>
143 </object>
144 <packing>
145 <property name="expand">False</property>
146 <property name="fill">False</property>
147 <property name="padding">4</property>
148 <property name="pack_type">end</property>
149 <property name="position">0</property>
150 </packing>
151 </child>
152 <child>
153 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_cancel_button">
154 <property name="label">gtk-cancel</property>
155 <property name="use_action_appearance">False</property>
156 <property name="visible">True</property>
157 <property name="can_focus">True</property>
158 <property name="receives_default">True</property>
159 <property name="use_stock">True</property>
160 <signal name="clicked" handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb" swapped="no"/>
161 </object>
162 <packing>
163 <property name="expand">False</property>
164 <property name="fill">False</property>
165 <property name="padding">4</property>
166 <property name="pack_type">end</property>
167 <property name="position">1</property>
168 </packing>
169 </child>
170 </object>
171 <packing>
172 <property name="expand">False</property>
173 <property name="fill">False</property>
174 <property name="padding">4</property>
175 <property name="pack_type">end</property>
176 <property name="position">1</property>
177 </packing>
178 </child>
179 <child>
180 <object class="GtkHBox" id="hbox8">
181 <property name="visible">True</property>
182 <property name="can_focus">False</property>
183 <child>
184 <object class="GtkAlignment" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_alignment">
185 <property name="visible">True</property>
186 <property name="can_focus">False</property>
187 <property name="yscale">0</property>
188 <child>
189 <object class="GtkComboBox" id="GNUNET_GTK_open_url_dialog_anonymity_combobox">
190 <property name="visible">True</property>
191 <property name="can_focus">False</property>
192 <property name="model">main_window_search_anonymity_liststore</property>
193 <property name="active">1</property>
194 <child>
195 <object class="GtkCellRendererText" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renderer"/>
196 <attributes>
197 <attribute name="foreground">2</attribute>
198 <attribute name="text">0</attribute>
199 </attributes>
200 </child>
201 <child>
202 <object class="GtkCellRendererText" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renerer_level"/>
203 <attributes>
204 <attribute name="text">1</attribute>
205 </attributes>
206 </child>
207 </object>
208 </child>
209 </object>
210 <packing>
211 <property name="expand">False</property>
212 <property name="fill">False</property>
213 <property name="pack_type">end</property>
214 <property name="position">0</property>
215 </packing>
216 </child>
217 <child>
218 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_anonymity_label">
219 <property name="visible">True</property>
220 <property name="can_focus">False</property>
221 <property name="label" translatable="yes">_Anonymity:</property>
222 <property name="use_underline">True</property>
223 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
224 </object>
225 <packing>
226 <property name="expand">False</property>
227 <property name="fill">False</property>
228 <property name="padding">4</property>
229 <property name="pack_type">end</property>
230 <property name="position">1</property>
231 </packing>
232 </child>
233 </object>
234 <packing>
235 <property name="expand">False</property>
236 <property name="fill">False</property>
237 <property name="position">2</property>
238 </packing>
239 </child>
240 </object>
241 </child>
242 </object>
243 <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
244 <columns>
245 <!-- column-name peer_identity -->
246 <column type="gchararray"/>
247 <!-- column-name number_of_known_addresses -->
248 <column type="guint"/>
249 <!-- column-name country_name -->
250 <column type="gchararray"/>
251 <!-- column-name country_flag -->
252 <column type="GdkPixbuf"/>
253 <!-- column-name bandwidth -->
254 <column type="guint64"/>
255 </columns>
256 </object>
257 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
258 <columns>
259 <!-- column-name namespace_name -->
260 <column type="gchararray"/>
261 <!-- column-name namespace_handle -->
262 <column type="gpointer"/>
263 </columns>
264 </object>
265 <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
266 <property name="can_focus">False</property>
267 <property name="border_width">5</property>
268 <property name="title" translatable="yes">Select pseudonym...</property>
269 <property name="modal">True</property>
270 <property name="default_width">400</property>
271 <property name="default_height">300</property>
272 <property name="destroy_with_parent">True</property>
273 <property name="type_hint">normal</property>
274 <signal name="realize" handler="GNUNET_GTK_select_pseudonym_dialog_realize_cb" swapped="no"/>
275 <signal name="delete-event" handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb" swapped="no"/>
276 <signal name="response" handler="GNUNET_GTK_select_pseudonym_dialog_response_cb" swapped="no"/>
277 <child internal-child="vbox">
278 <object class="GtkVBox" id="dialog-vbox3">
279 <property name="visible">True</property>
280 <property name="can_focus">False</property>
281 <property name="spacing">2</property>
282 <child internal-child="action_area">
283 <object class="GtkHButtonBox" id="dialog-action_area3">
284 <property name="visible">True</property>
285 <property name="can_focus">False</property>
286 <property name="layout_style">end</property>
287 <child>
288 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_cancel_button">
289 <property name="label">gtk-cancel</property>
290 <property name="use_action_appearance">False</property>
291 <property name="visible">True</property>
292 <property name="can_focus">True</property>
293 <property name="receives_default">True</property>
294 <property name="use_stock">True</property>
295 </object>
296 <packing>
297 <property name="expand">False</property>
298 <property name="fill">False</property>
299 <property name="position">0</property>
300 </packing>
301 </child>
302 <child>
303 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_ok_button">
304 <property name="label">gtk-ok</property>
305 <property name="use_action_appearance">False</property>
306 <property name="visible">True</property>
307 <property name="sensitive">False</property>
308 <property name="can_focus">True</property>
309 <property name="receives_default">True</property>
310 <property name="use_stock">True</property>
311 </object>
312 <packing>
313 <property name="expand">False</property>
314 <property name="fill">False</property>
315 <property name="position">1</property>
316 </packing>
317 </child>
318 </object>
319 <packing>
320 <property name="expand">False</property>
321 <property name="fill">True</property>
322 <property name="pack_type">end</property>
323 <property name="position">0</property>
324 </packing>
325 </child>
326 <child>
327 <object class="GtkScrolledWindow" id="GNUNET_GTK_select_pseudonym_scrolledwindow">
328 <property name="visible">True</property>
329 <property name="can_focus">True</property>
330 <property name="hadjustment">adjustment3</property>
331 <property name="vadjustment">adjustment4</property>
332 <property name="hscrollbar_policy">automatic</property>
333 <property name="vscrollbar_policy">automatic</property>
334 <property name="shadow_type">in</property>
335 <child>
336 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view">
337 <property name="visible">True</property>
338 <property name="can_focus">True</property>
339 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
340 <property name="hadjustment">adjustment3</property>
341 <property name="vadjustment">adjustment4</property>
342 <property name="search_column">0</property>
343 <child>
344 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column">
345 <property name="title">Name</property>
346 <property name="expand">True</property>
347 <property name="clickable">True</property>
348 <property name="reorderable">True</property>
349 <property name="sort_indicator">True</property>
350 <property name="sort_column_id">0</property>
351 <child>
352 <object class="GtkCellRendererText" id="GNUNET_GTK_select_pseudonym_name_renderer"/>
353 <attributes>
354 <attribute name="text">0</attribute>
355 </attributes>
356 </child>
357 </object>
358 </child>
359 </object>
360 </child>
361 </object>
362 <packing>
363 <property name="expand">True</property>
364 <property name="fill">True</property>
365 <property name="position">1</property>
366 </packing>
367 </child>
368 <child>
369 <placeholder/>
370 </child>
371 </object>
372 </child>
373 <action-widgets>
374 <action-widget response="-6">GNUNET_GTK_select_pseudonym_cancel_button</action-widget>
375 <action-widget response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
376 </action-widgets>
377 </object>
378 <object class="GtkImage" id="add_stock_image">
379 <property name="visible">True</property>
380 <property name="can_focus">False</property>
381 <property name="stock">gtk-add</property>
382 </object>
383 <object class="GtkAdjustment" id="adjustment1">
384 <property name="upper">100</property>
385 <property name="step_increment">1</property>
386 <property name="page_increment">10</property>
387 <property name="page_size">10</property>
388 </object>
389 <object class="GtkAdjustment" id="adjustment2"> 46 <object class="GtkAdjustment" id="adjustment2">
390 <property name="upper">100</property> 47 <property name="upper">100</property>
391 <property name="step_increment">1</property> 48 <property name="step_increment">1</property>
392 <property name="page_increment">10</property> 49 <property name="page_increment">10</property>
393 <property name="page_size">10</property> 50 <property name="page_size">10</property>
394 </object> 51 </object>
395 <object class="GtkAdjustment" id="adjustment3">
396 <property name="upper">100</property>
397 <property name="step_increment">1</property>
398 <property name="page_increment">10</property>
399 </object>
400 <object class="GtkAdjustment" id="adjustment4">
401 <property name="upper">100</property>
402 <property name="step_increment">1</property>
403 <property name="page_increment">10</property>
404 </object>
405 <object class="GtkAdjustment" id="adjustment5">
406 <property name="upper">100</property>
407 <property name="step_increment">1</property>
408 <property name="page_increment">10</property>
409 </object>
410 <object class="GtkAdjustment" id="adjustment6">
411 <property name="upper">100</property>
412 <property name="step_increment">1</property>
413 <property name="page_increment">10</property>
414 </object>
415 <object class="GtkAdjustment" id="adjustment7">
416 <property name="upper">100</property>
417 <property name="step_increment">1</property>
418 <property name="page_increment">10</property>
419 </object>
420 <object class="GtkAdjustment" id="adjustment8">
421 <property name="upper">100</property>
422 <property name="step_increment">1</property>
423 <property name="page_increment">10</property>
424 </object>
425 <object class="GtkImage" id="del_stock_image">
426 <property name="visible">True</property>
427 <property name="can_focus">False</property>
428 <property name="stock">gtk-delete</property>
429 </object>
430 <object class="GtkImage" id="down_stock_image">
431 <property name="visible">True</property>
432 <property name="can_focus">False</property>
433 <property name="stock">gtk-go-down</property>
434 </object>
435 <object class="GtkImage" id="execute_stock_image">
436 <property name="visible">True</property>
437 <property name="can_focus">False</property>
438 <property name="stock">gtk-execute</property>
439 </object>
440 <object class="GtkAdjustment" id="expiration_year_adjustment">
441 <property name="upper">9999</property>
442 <property name="step_increment">1</property>
443 <property name="page_increment">10</property>
444 </object>
445 <object class="GtkImage" id="find_stock_image">
446 <property name="visible">True</property>
447 <property name="can_focus">False</property>
448 <property name="stock">gtk-find</property>
449 </object>
450 <object class="GtkImage" id="index_stock_image">
451 <property name="visible">True</property>
452 <property name="can_focus">False</property>
453 <property name="stock">gtk-index</property>
454 </object>
455 <object class="GtkImage" id="left_stock_image">
456 <property name="visible">True</property>
457 <property name="can_focus">False</property>
458 <property name="stock">gtk-go-back</property>
459 </object>
460 <object class="GtkListStore" id="main_window_search_anonymity_liststore">
461 <columns>
462 <!-- column-name Name -->
463 <column type="gchararray"/>
464 <!-- column-name Level -->
465 <column type="guint"/>
466 <!-- column-name Color -->
467 <column type="gchararray"/>
468 </columns>
469 <data>
470 <row>
471 <col id="0" translatable="yes">None</col>
472 <col id="1">0</col>
473 <col id="2" translatable="yes">#AAAA00000000</col>
474 </row>
475 <row>
476 <col id="0" translatable="yes">Normal</col>
477 <col id="1">1</col>
478 <col id="2" translatable="yes">#000000000000</col>
479 </row>
480 <row>
481 <col id="0" translatable="yes">Paranoid</col>
482 <col id="1">10</col>
483 <col id="2" translatable="yes">#0000AAAA0000</col>
484 </row>
485 </data>
486 </object>
487 <object class="GtkListStore" id="main_window_search_mime_liststore">
488 <columns>
489 <!-- column-name MIME -->
490 <column type="gchararray"/>
491 <!-- column-name Type -->
492 <column type="gchararray"/>
493 <!-- column-name Extension -->
494 <column type="gchararray"/>
495 <!-- column-name Lossyness -->
496 <column type="gchararray"/>
497 <!-- column-name Freedom -->
498 <column type="gchararray"/>
499 </columns>
500 <data>
501 <row>
502 <col id="0"> </col>
503 <col id="1" translatable="yes">Any</col>
504 <col id="2" translatable="yes"> </col>
505 <col id="3" translatable="yes"> </col>
506 <col id="4" translatable="yes"> </col>
507 </row>
508 <row>
509 <col id="0">plain/text</col>
510 <col id="1" translatable="yes">Text</col>
511 <col id="2">txt</col>
512 <col id="3" translatable="yes">N/A</col>
513 <col id="4" translatable="yes">N/A</col>
514 </row>
515 <row>
516 <col id="0">application/zip</col>
517 <col id="1" translatable="yes">Zip</col>
518 <col id="2">zip</col>
519 <col id="3" translatable="yes">lossless</col>
520 <col id="4" translatable="yes">free</col>
521 </row>
522 <row>
523 <col id="0">audio/mpeg</col>
524 <col id="1" translatable="yes">MPEG audio</col>
525 <col id="2">mp3, mp2, mpeg</col>
526 <col id="3" translatable="yes">lossy</col>
527 <col id="4" translatable="yes">non-free</col>
528 </row>
529 </data>
530 </object>
531 <object class="GtkWindow" id="GNUNET_GTK_main_window"> 52 <object class="GtkWindow" id="GNUNET_GTK_main_window">
532 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
533 <property name="title" translatable="yes">gnunet-fs-gtk</property> 54 <property name="title" translatable="yes">gnunet-fs-gtk</property>
@@ -827,6 +348,7 @@
827 <property name="can_focus">True</property> 348 <property name="can_focus">True</property>
828 <property name="receives_default">True</property> 349 <property name="receives_default">True</property>
829 <property name="events">GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property> 350 <property name="events">GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
351 <property name="use_action_appearance">False</property>
830 <property name="image_position">right</property> 352 <property name="image_position">right</property>
831 <signal name="toggled" handler="main_window_search_namespace_dropdown_button_toggled_cb" swapped="no"/> 353 <signal name="toggled" handler="main_window_search_namespace_dropdown_button_toggled_cb" swapped="no"/>
832 <signal name="leave-notify-event" handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/> 354 <signal name="leave-notify-event" handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/>
@@ -862,6 +384,7 @@
862 <property name="visible">True</property> 384 <property name="visible">True</property>
863 <property name="can_focus">True</property> 385 <property name="can_focus">True</property>
864 <property name="receives_default">True</property> 386 <property name="receives_default">True</property>
387 <property name="use_action_appearance">False</property>
865 <property name="image">find_stock_image</property> 388 <property name="image">find_stock_image</property>
866 <signal name="clicked" handler="main_window_search_button_clicked_cb" swapped="no"/> 389 <signal name="clicked" handler="main_window_search_button_clicked_cb" swapped="no"/>
867 </object> 390 </object>
@@ -882,8 +405,6 @@
882 <property name="invisible_char_set">True</property> 405 <property name="invisible_char_set">True</property>
883 <property name="primary_icon_activatable">False</property> 406 <property name="primary_icon_activatable">False</property>
884 <property name="secondary_icon_activatable">False</property> 407 <property name="secondary_icon_activatable">False</property>
885 <property name="primary_icon_sensitive">True</property>
886 <property name="secondary_icon_sensitive">True</property>
887 <signal name="key-press-event" handler="main_window_search_entry_key_press_event_cb" swapped="no"/> 408 <signal name="key-press-event" handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
888 </object> 409 </object>
889 <packing> 410 <packing>
@@ -1021,9 +542,6 @@
1021 <property name="visible">True</property> 542 <property name="visible">True</property>
1022 <property name="can_focus">True</property> 543 <property name="can_focus">True</property>
1023 <property name="scrollable">True</property> 544 <property name="scrollable">True</property>
1024 <property name="tab_border">0</property>
1025 <property name="tab_hborder">0</property>
1026 <property name="tab_vborder">0</property>
1027 <signal name="switch-page" handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" swapped="no"/> 545 <signal name="switch-page" handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" swapped="no"/>
1028 </object> 546 </object>
1029 <packing> 547 <packing>
@@ -1057,21 +575,22 @@
1057 <property name="can_focus">True</property> 575 <property name="can_focus">True</property>
1058 <property name="hadjustment">adjustment1</property> 576 <property name="hadjustment">adjustment1</property>
1059 <property name="vadjustment">adjustment2</property> 577 <property name="vadjustment">adjustment2</property>
1060 <property name="hscrollbar_policy">automatic</property>
1061 <property name="vscrollbar_policy">automatic</property>
1062 <property name="shadow_type">in</property> 578 <property name="shadow_type">in</property>
1063 <child> 579 <child>
1064 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview"> 580 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview">
1065 <property name="visible">True</property> 581 <property name="visible">True</property>
1066 <property name="can_focus">True</property> 582 <property name="can_focus">True</property>
1067 <property name="model">GNUNET_GTK_meta_data_list_store</property>
1068 <property name="hadjustment">adjustment1</property> 583 <property name="hadjustment">adjustment1</property>
1069 <property name="vadjustment">adjustment2</property> 584 <property name="vadjustment">adjustment2</property>
585 <property name="model">GNUNET_GTK_meta_data_list_store</property>
1070 <property name="search_column">0</property> 586 <property name="search_column">0</property>
1071 <property name="rubber_banding">True</property> 587 <property name="rubber_banding">True</property>
1072 <property name="enable_grid_lines">both</property> 588 <property name="enable_grid_lines">both</property>
1073 <signal name="button-press-event" handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb" swapped="no"/> 589 <signal name="button-press-event" handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb" swapped="no"/>
1074 <signal name="popup-menu" handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/> 590 <signal name="popup-menu" handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/>
591 <child internal-child="selection">
592 <object class="GtkTreeSelection" id="treeview-selection2"/>
593 </child>
1075 <child> 594 <child>
1076 <object class="GtkTreeViewColumn" id="GNUNET_GTK_main_window_metadata_type_column"> 595 <object class="GtkTreeViewColumn" id="GNUNET_GTK_main_window_metadata_type_column">
1077 <property name="sizing">autosize</property> 596 <property name="sizing">autosize</property>
@@ -1130,6 +649,163 @@
1130 </object> 649 </object>
1131 </child> 650 </child>
1132 </object> 651 </object>
652 <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
653 <columns>
654 <!-- column-name peer_identity -->
655 <column type="gchararray"/>
656 <!-- column-name number_of_known_addresses -->
657 <column type="guint"/>
658 <!-- column-name country_name -->
659 <column type="gchararray"/>
660 <!-- column-name country_flag -->
661 <column type="GdkPixbuf"/>
662 <!-- column-name bandwidth -->
663 <column type="guint64"/>
664 </columns>
665 </object>
666 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
667 <columns>
668 <!-- column-name namespace_name -->
669 <column type="gchararray"/>
670 <!-- column-name namespace_handle -->
671 <column type="gpointer"/>
672 </columns>
673 </object>
674 <object class="GtkAdjustment" id="adjustment1">
675 <property name="upper">100</property>
676 <property name="step_increment">1</property>
677 <property name="page_increment">10</property>
678 <property name="page_size">10</property>
679 </object>
680 <object class="GtkAdjustment" id="adjustment3">
681 <property name="upper">100</property>
682 <property name="step_increment">1</property>
683 <property name="page_increment">10</property>
684 </object>
685 <object class="GtkAdjustment" id="adjustment4">
686 <property name="upper">100</property>
687 <property name="step_increment">1</property>
688 <property name="page_increment">10</property>
689 </object>
690 <object class="GtkAdjustment" id="adjustment5">
691 <property name="upper">100</property>
692 <property name="step_increment">1</property>
693 <property name="page_increment">10</property>
694 </object>
695 <object class="GtkAdjustment" id="adjustment6">
696 <property name="upper">100</property>
697 <property name="step_increment">1</property>
698 <property name="page_increment">10</property>
699 </object>
700 <object class="GtkAdjustment" id="adjustment7">
701 <property name="upper">100</property>
702 <property name="step_increment">1</property>
703 <property name="page_increment">10</property>
704 </object>
705 <object class="GtkAdjustment" id="adjustment8">
706 <property name="upper">100</property>
707 <property name="step_increment">1</property>
708 <property name="page_increment">10</property>
709 </object>
710 <object class="GtkImage" id="down_stock_image">
711 <property name="visible">True</property>
712 <property name="can_focus">False</property>
713 <property name="stock">gtk-go-down</property>
714 </object>
715 <object class="GtkImage" id="find_stock_image">
716 <property name="visible">True</property>
717 <property name="can_focus">False</property>
718 <property name="stock">gtk-find</property>
719 </object>
720 <object class="GtkImage" id="index_stock_image">
721 <property name="visible">True</property>
722 <property name="can_focus">False</property>
723 <property name="stock">gtk-index</property>
724 </object>
725 <object class="GtkListStore" id="main_window_search_anonymity_liststore">
726 <columns>
727 <!-- column-name Name -->
728 <column type="gchararray"/>
729 <!-- column-name Level -->
730 <column type="guint"/>
731 <!-- column-name Color -->
732 <column type="gchararray"/>
733 </columns>
734 <data>
735 <row>
736 <col id="0" translatable="yes">None</col>
737 <col id="1">0</col>
738 <col id="2" translatable="yes">#AAAA00000000</col>
739 </row>
740 <row>
741 <col id="0" translatable="yes">Normal</col>
742 <col id="1">1</col>
743 <col id="2" translatable="yes">#000000000000</col>
744 </row>
745 <row>
746 <col id="0" translatable="yes">Paranoid</col>
747 <col id="1">10</col>
748 <col id="2" translatable="yes">#0000AAAA0000</col>
749 </row>
750 </data>
751 </object>
752 <object class="GtkListStore" id="main_window_search_mime_liststore">
753 <columns>
754 <!-- column-name MIME -->
755 <column type="gchararray"/>
756 <!-- column-name Type -->
757 <column type="gchararray"/>
758 <!-- column-name Extension -->
759 <column type="gchararray"/>
760 <!-- column-name Lossyness -->
761 <column type="gchararray"/>
762 <!-- column-name Freedom -->
763 <column type="gchararray"/>
764 </columns>
765 <data>
766 <row>
767 <col id="0"> </col>
768 <col id="1" translatable="yes">Any</col>
769 <col id="2" translatable="yes"> </col>
770 <col id="3" translatable="yes"> </col>
771 <col id="4" translatable="yes"> </col>
772 </row>
773 <row>
774 <col id="0">plain/text</col>
775 <col id="1" translatable="yes">Text</col>
776 <col id="2">txt</col>
777 <col id="3" translatable="yes">N/A</col>
778 <col id="4" translatable="yes">N/A</col>
779 </row>
780 <row>
781 <col id="0">application/zip</col>
782 <col id="1" translatable="yes">Zip</col>
783 <col id="2">zip</col>
784 <col id="3" translatable="yes">lossless</col>
785 <col id="4" translatable="yes">free</col>
786 </row>
787 <row>
788 <col id="0">audio/mpeg</col>
789 <col id="1" translatable="yes">MPEG audio</col>
790 <col id="2">mp3, mp2, mpeg</col>
791 <col id="3" translatable="yes">lossy</col>
792 <col id="4" translatable="yes">non-free</col>
793 </row>
794 </data>
795 </object>
796 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
797 <property name="mode">vertical</property>
798 <widgets>
799 <widget name="main_window_search_entry"/>
800 <widget name="main_window_search_anonymity_combobox"/>
801 <widget name="main_window_search_mime_combobox"/>
802 </widgets>
803 </object>
804 <object class="GtkAdjustment" id="expiration_year_adjustment">
805 <property name="upper">9999</property>
806 <property name="step_increment">1</property>
807 <property name="page_increment">10</property>
808 </object>
1133 <object class="GtkTreeStore" id="main_window_search_namespace_treestore"> 809 <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
1134 <columns> 810 <columns>
1135 <!-- column-name Name --> 811 <!-- column-name Name -->
@@ -1184,6 +860,9 @@
1184 <property name="tooltip_column">3</property> 860 <property name="tooltip_column">3</property>
1185 <signal name="button-press-event" handler="namespace_selector_treeview_button_press_event_cb" swapped="no"/> 861 <signal name="button-press-event" handler="namespace_selector_treeview_button_press_event_cb" swapped="no"/>
1186 <signal name="button-release-event" handler="namespace_selector_treeview_button_release_event_cb" swapped="no"/> 862 <signal name="button-release-event" handler="namespace_selector_treeview_button_release_event_cb" swapped="no"/>
863 <child internal-child="selection">
864 <object class="GtkTreeSelection" id="treeview-selection3"/>
865 </child>
1187 <child> 866 <child>
1188 <object class="GtkTreeViewColumn" id="name_column"> 867 <object class="GtkTreeViewColumn" id="name_column">
1189 <property name="sizing">autosize</property> 868 <property name="sizing">autosize</property>
@@ -1232,24 +911,11 @@
1232 <property name="step_increment">1</property> 911 <property name="step_increment">1</property>
1233 <property name="page_increment">10</property> 912 <property name="page_increment">10</property>
1234 </object> 913 </object>
1235 <object class="GtkImage" id="right_stock_image">
1236 <property name="visible">True</property>
1237 <property name="can_focus">False</property>
1238 <property name="stock">gtk-go-forward</property>
1239 </object>
1240 <object class="GtkImage" id="up_stock_image"> 914 <object class="GtkImage" id="up_stock_image">
1241 <property name="visible">True</property> 915 <property name="visible">True</property>
1242 <property name="can_focus">False</property> 916 <property name="can_focus">False</property>
1243 <property name="stock">gtk-go-up</property> 917 <property name="stock">gtk-go-up</property>
1244 </object> 918 </object>
1245 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
1246 <property name="mode">vertical</property>
1247 <widgets>
1248 <widget name="main_window_search_entry"/>
1249 <widget name="main_window_search_anonymity_combobox"/>
1250 <widget name="main_window_search_mime_combobox"/>
1251 </widgets>
1252 </object>
1253 <object class="GtkSizeGroup" id="sizegroup4"/> 919 <object class="GtkSizeGroup" id="sizegroup4"/>
1254 <object class="GtkSizeGroup" id="sizegroup5"/> 920 <object class="GtkSizeGroup" id="sizegroup5"/>
1255</interface> 921</interface>
diff --git a/contrib/gnunet_fs_gtk_open_url_dialog.glade b/contrib/gnunet_fs_gtk_open_url_dialog.glade
index 139cec30..f755712d 100644
--- a/contrib/gnunet_fs_gtk_open_url_dialog.glade
+++ b/contrib/gnunet_fs_gtk_open_url_dialog.glade
@@ -1,156 +1,203 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="UTF-8"?>
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 <object class="GtkWindow" id="GNUNET_GTK_open_url_window">
5 <object class="GtkImage" id="execute_stock_image"> 5 <property name="can_focus">False</property>
6 <property name="visible">True</property> 6 <property name="title" translatable="yes">Enter the URI to be downloaded</property>
7 <property name="stock">gtk-execute</property>
8 </object>
9 <object class="GtkAdjustment" id="GNUNET_GTK_open_url_anonymity_adjustment">
10 <property name="value">1</property>
11 <property name="upper">100000</property>
12 <property name="step_increment">1</property>
13 <property name="page_increment">10</property>
14 </object>
15 <object class="GtkDialog" id="GNUNET_GTK_open_url_dialog">
16 <property name="border_width">5</property>
17 <property name="title" translatable="yes">Download from URI</property>
18 <property name="resizable">False</property>
19 <property name="modal">True</property> 7 <property name="modal">True</property>
8 <property name="default_width">640</property>
9 <property name="default_height">240</property>
20 <property name="destroy_with_parent">True</property> 10 <property name="destroy_with_parent">True</property>
21 <property name="icon_name">dialog-password</property>
22 <property name="type_hint">dialog</property>
23 <property name="skip_taskbar_hint">True</property> 11 <property name="skip_taskbar_hint">True</property>
24 <property name="skip_pager_hint">True</property> 12 <property name="skip_pager_hint">True</property>
25 <property name="has_separator">False</property> 13 <property name="deletable">False</property>
26 <child internal-child="vbox"> 14 <property name="transient_for">GNUNET_GTK_main_window</property>
15 <signal name="delete-event" handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
16 <child>
27 <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox"> 17 <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
28 <property name="visible">True</property> 18 <property name="visible">True</property>
29 <property name="orientation">vertical</property> 19 <property name="can_focus">False</property>
30 <property name="spacing">2</property> 20 <property name="spacing">2</property>
31 <child> 21 <child>
32 <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox"> 22 <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
33 <property name="visible">True</property> 23 <property name="visible">True</property>
24 <property name="can_focus">False</property>
34 <child> 25 <child>
35 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_url_label"> 26 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_url_label">
36 <property name="visible">True</property> 27 <property name="visible">True</property>
37 <property name="sensitive">False</property> 28 <property name="can_focus">False</property>
38 <property name="double_buffered">False</property>
39 <property name="label" translatable="yes">_URI:</property> 29 <property name="label" translatable="yes">_URI:</property>
40 <property name="use_underline">True</property> 30 <property name="use_underline">True</property>
41 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_entry</property> 31 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
42 <property name="single_line_mode">True</property>
43 <property name="track_visited_links">False</property>
44 </object> 32 </object>
45 <packing> 33 <packing>
46 <property name="expand">False</property> 34 <property name="expand">False</property>
47 <property name="fill">False</property> 35 <property name="fill">False</property>
48 <property name="padding">5</property> 36 <property name="padding">4</property>
49 <property name="position">0</property> 37 <property name="position">0</property>
50 </packing> 38 </packing>
51 </child> 39 </child>
52 <child> 40 <child>
53 <object class="GtkEntry" id="GNUNET_GTK_open_url_dialog_url_entry"> 41 <object class="GtkFrame" id="frame1">
54 <property name="visible">True</property> 42 <property name="visible">True</property>
55 <property name="can_focus">True</property> 43 <property name="can_focus">False</property>
56 <property name="max_length">250</property> 44 <property name="label_xalign">0</property>
57 <property name="invisible_char">&#x25CF;</property> 45 <property name="shadow_type">in</property>
58 <property name="activates_default">True</property> 46 <child>
59 <property name="width_chars">50</property> 47 <object class="GtkAlignment" id="alignment1">
60 <property name="caps_lock_warning">False</property> 48 <property name="visible">True</property>
61 <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb"/> 49 <property name="can_focus">False</property>
62 <signal name="activate" handler="GNUNET_GTK_search_dialog_search_button_clicked_cb"/> 50 <child>
51 <object class="GtkTextView" id="GNUNET_GTK_open_url_dialog_url_textview">
52 <property name="visible">True</property>
53 <property name="can_focus">True</property>
54 <property name="events">GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK</property>
55 <property name="wrap_mode">char</property>
56 <property name="indent">20</property>
57 <property name="buffer">GNUNET_GTK_open_url_dialog_url_textview_buffer</property>
58 <property name="accepts_tab">False</property>
59 <signal name="key-press-event" handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb" swapped="no"/>
60 </object>
61 </child>
62 </object>
63 </child>
64 <child type="label_item">
65 <placeholder/>
66 </child>
63 </object> 67 </object>
64 <packing> 68 <packing>
69 <property name="expand">True</property>
70 <property name="fill">True</property>
65 <property name="position">1</property> 71 <property name="position">1</property>
66 </packing> 72 </packing>
67 </child> 73 </child>
74 </object>
75 <packing>
76 <property name="expand">True</property>
77 <property name="fill">True</property>
78 <property name="padding">5</property>
79 <property name="position">0</property>
80 </packing>
81 </child>
82 <child>
83 <object class="GtkHBox" id="hbox1">
84 <property name="visible">True</property>
85 <property name="can_focus">False</property>
68 <child> 86 <child>
69 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_anonymity_label"> 87 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_execute_button">
88 <property name="label">_Execute</property>
89 <property name="use_action_appearance">False</property>
70 <property name="visible">True</property> 90 <property name="visible">True</property>
71 <property name="label" translatable="yes">_Anonymity:</property> 91 <property name="sensitive">False</property>
92 <property name="can_focus">True</property>
93 <property name="receives_default">True</property>
94 <property name="use_action_appearance">False</property>
95 <property name="image">execute_stock_image</property>
72 <property name="use_underline">True</property> 96 <property name="use_underline">True</property>
73 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_spin_button</property> 97 <signal name="clicked" handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb" swapped="no"/>
74 <property name="track_visited_links">False</property>
75 </object> 98 </object>
76 <packing> 99 <packing>
77 <property name="expand">False</property> 100 <property name="expand">False</property>
78 <property name="fill">False</property> 101 <property name="fill">False</property>
79 <property name="padding">5</property> 102 <property name="padding">4</property>
80 <property name="position">2</property> 103 <property name="pack_type">end</property>
104 <property name="position">0</property>
81 </packing> 105 </packing>
82 </child> 106 </child>
83 <child> 107 <child>
84 <object class="GtkSpinButton" id="GNUNET_GTK_open_url_dialog_anonymity_spin_button"> 108 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_cancel_button">
109 <property name="label">gtk-cancel</property>
110 <property name="use_action_appearance">False</property>
85 <property name="visible">True</property> 111 <property name="visible">True</property>
86 <property name="can_focus">True</property> 112 <property name="can_focus">True</property>
87 <property name="invisible_char">&#x25CF;</property> 113 <property name="receives_default">True</property>
88 <property name="caps_lock_warning">False</property> 114 <property name="use_action_appearance">False</property>
89 <property name="adjustment">GNUNET_GTK_open_url_anonymity_adjustment</property> 115 <property name="use_stock">True</property>
90 <property name="climb_rate">1</property> 116 <signal name="clicked" handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb" swapped="no"/>
91 <property name="numeric">True</property>
92 <signal name="value_changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb"/>
93 </object> 117 </object>
94 <packing> 118 <packing>
95 <property name="expand">False</property> 119 <property name="expand">False</property>
96 <property name="fill">False</property> 120 <property name="fill">False</property>
97 <property name="position">3</property> 121 <property name="padding">4</property>
122 <property name="pack_type">end</property>
123 <property name="position">1</property>
98 </packing> 124 </packing>
99 </child> 125 </child>
100 </object> 126 </object>
101 <packing> 127 <packing>
102 <property name="expand">False</property> 128 <property name="expand">False</property>
103 <property name="fill">False</property> 129 <property name="fill">False</property>
104 <property name="padding">5</property> 130 <property name="padding">4</property>
105 <property name="position">0</property> 131 <property name="pack_type">end</property>
132 <property name="position">1</property>
106 </packing> 133 </packing>
107 </child> 134 </child>
108 <child internal-child="action_area"> 135 <child>
109 <object class="GtkHButtonBox" id="GNUNET_GTK_open_url_dialog_action_area"> 136 <object class="GtkHBox" id="hbox8">
110 <property name="visible">True</property> 137 <property name="visible">True</property>
111 <property name="layout_style">end</property> 138 <property name="can_focus">False</property>
112 <child> 139 <child>
113 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_cancel_button"> 140 <object class="GtkAlignment" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_alignment">
114 <property name="label">gtk-cancel</property>
115 <property name="visible">True</property> 141 <property name="visible">True</property>
116 <property name="can_focus">True</property> 142 <property name="can_focus">False</property>
117 <property name="receives_default">True</property> 143 <property name="yscale">0</property>
118 <property name="use_stock">True</property> 144 <child>
145 <object class="GtkComboBox" id="GNUNET_GTK_open_url_dialog_anonymity_combobox">
146 <property name="visible">True</property>
147 <property name="can_focus">False</property>
148 <property name="model">main_window_search_anonymity_liststore</property>
149 <property name="active">1</property>
150 <child>
151 <object class="GtkCellRendererText" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renderer"/>
152 <attributes>
153 <attribute name="foreground">2</attribute>
154 <attribute name="text">0</attribute>
155 </attributes>
156 </child>
157 <child>
158 <object class="GtkCellRendererText" id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renerer_level"/>
159 <attributes>
160 <attribute name="text">1</attribute>
161 </attributes>
162 </child>
163 </object>
164 </child>
119 </object> 165 </object>
120 <packing> 166 <packing>
121 <property name="expand">False</property> 167 <property name="expand">False</property>
122 <property name="fill">False</property> 168 <property name="fill">False</property>
169 <property name="pack_type">end</property>
123 <property name="position">0</property> 170 <property name="position">0</property>
124 </packing> 171 </packing>
125 </child> 172 </child>
126 <child> 173 <child>
127 <object class="GtkButton" id="GNUNET_GTK_open_url_dialog_execute_button"> 174 <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_anonymity_label">
128 <property name="label">_Execute</property>
129 <property name="visible">True</property> 175 <property name="visible">True</property>
130 <property name="sensitive">False</property> 176 <property name="can_focus">False</property>
131 <property name="can_focus">True</property> 177 <property name="label" translatable="yes">_Anonymity:</property>
132 <property name="receives_default">True</property>
133 <property name="image">execute_stock_image</property>
134 <property name="use_underline">True</property> 178 <property name="use_underline">True</property>
179 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
135 </object> 180 </object>
136 <packing> 181 <packing>
137 <property name="expand">False</property> 182 <property name="expand">False</property>
138 <property name="fill">False</property> 183 <property name="fill">False</property>
184 <property name="padding">4</property>
185 <property name="pack_type">end</property>
139 <property name="position">1</property> 186 <property name="position">1</property>
140 </packing> 187 </packing>
141 </child> 188 </child>
142 </object> 189 </object>
143 <packing> 190 <packing>
144 <property name="expand">False</property> 191 <property name="expand">False</property>
145 <property name="pack_type">end</property> 192 <property name="fill">False</property>
146 <property name="position">1</property> 193 <property name="position">2</property>
147 </packing> 194 </packing>
148 </child> 195 </child>
149 </object> 196 </object>
150 </child> 197 </child>
151 <action-widgets>
152 <action-widget response="-6">GNUNET_GTK_open_url_dialog_cancel_button</action-widget>
153 <action-widget response="-5">GNUNET_GTK_open_url_dialog_execute_button</action-widget>
154 </action-widgets>
155 </object> 198 </object>
199 <object class="GtkTextBuffer" id="GNUNET_GTK_open_url_dialog_url_textview_buffer">
200 <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb" swapped="no"/>
201 </object>
202
156</interface> 203</interface>
diff --git a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade b/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
index 418231de..9c673e21 100644
--- a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
+++ b/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
@@ -1,7 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore"> 4 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
6 <columns> 5 <columns>
7 <!-- column-name namespace_name --> 6 <!-- column-name namespace_name -->
@@ -29,12 +28,13 @@
29 <property name="modal">True</property> 28 <property name="modal">True</property>
30 <property name="type_hint">normal</property> 29 <property name="type_hint">normal</property>
31 <child internal-child="vbox"> 30 <child internal-child="vbox">
32 <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox"> 31 <object class="GtkBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
33 <property name="visible">True</property> 32 <property name="visible">True</property>
34 <property name="can_focus">False</property> 33 <property name="can_focus">False</property>
34 <property name="orientation">vertical</property>
35 <property name="spacing">2</property> 35 <property name="spacing">2</property>
36 <child internal-child="action_area"> 36 <child internal-child="action_area">
37 <object class="GtkHButtonBox" id="GNUNET_GTK_select_pseudonym_dialog_action_area"> 37 <object class="GtkButtonBox" id="GNUNET_GTK_select_pseudonym_dialog_action_area">
38 <property name="visible">True</property> 38 <property name="visible">True</property>
39 <property name="can_focus">False</property> 39 <property name="can_focus">False</property>
40 <property name="layout_style">end</property> 40 <property name="layout_style">end</property>
@@ -45,6 +45,7 @@
45 <property name="visible">True</property> 45 <property name="visible">True</property>
46 <property name="can_focus">True</property> 46 <property name="can_focus">True</property>
47 <property name="receives_default">True</property> 47 <property name="receives_default">True</property>
48 <property name="use_action_appearance">False</property>
48 <property name="use_stock">True</property> 49 <property name="use_stock">True</property>
49 </object> 50 </object>
50 <packing> 51 <packing>
@@ -61,6 +62,7 @@
61 <property name="sensitive">False</property> 62 <property name="sensitive">False</property>
62 <property name="can_focus">True</property> 63 <property name="can_focus">True</property>
63 <property name="receives_default">True</property> 64 <property name="receives_default">True</property>
65 <property name="use_action_appearance">False</property>
64 <property name="use_stock">True</property> 66 <property name="use_stock">True</property>
65 </object> 67 </object>
66 <packing> 68 <packing>
@@ -73,7 +75,6 @@
73 <packing> 75 <packing>
74 <property name="expand">False</property> 76 <property name="expand">False</property>
75 <property name="fill">True</property> 77 <property name="fill">True</property>
76 <property name="pack_type">end</property>
77 <property name="position">0</property> 78 <property name="position">0</property>
78 </packing> 79 </packing>
79 </child> 80 </child>
@@ -83,15 +84,16 @@
83 <property name="can_focus">True</property> 84 <property name="can_focus">True</property>
84 <property name="hadjustment">adjustment1</property> 85 <property name="hadjustment">adjustment1</property>
85 <property name="vadjustment">adjustment2</property> 86 <property name="vadjustment">adjustment2</property>
86 <property name="hscrollbar_policy">automatic</property>
87 <property name="vscrollbar_policy">automatic</property>
88 <child> 87 <child>
89 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view"> 88 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view">
90 <property name="visible">True</property> 89 <property name="visible">True</property>
91 <property name="can_focus">True</property> 90 <property name="can_focus">True</property>
92 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
93 <property name="hadjustment">adjustment1</property> 91 <property name="hadjustment">adjustment1</property>
94 <property name="vadjustment">adjustment2</property> 92 <property name="vadjustment">adjustment2</property>
93 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
94 <child internal-child="selection">
95 <object class="GtkTreeSelection" id="treeview-selection1"/>
96 </child>
95 <child> 97 <child>
96 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column"> 98 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column">
97 <property name="title" translatable="yes">Name</property> 99 <property name="title" translatable="yes">Name</property>
@@ -117,9 +119,6 @@
117 <property name="position">1</property> 119 <property name="position">1</property>
118 </packing> 120 </packing>
119 </child> 121 </child>
120 <child>
121 <placeholder/>
122 </child>
123 </object> 122 </object>
124 </child> 123 </child>
125 <action-widgets> 124 <action-widgets>
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 4b975471..9836b576 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -14,6 +14,7 @@ gnunet_fs_gtk_SOURCES = \
14 gnunet-fs-gtk_about.c \ 14 gnunet-fs-gtk_about.c \
15 gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \ 15 gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
16 gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \ 16 gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
17 gnunet-fs-gtk_advertise-pseudonym.c \
17 gnunet-fs-gtk_create-pseudonym.c \ 18 gnunet-fs-gtk_create-pseudonym.c \
18 gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \ 19 gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
19 gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \ 20 gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
@@ -22,7 +23,6 @@ gnunet_fs_gtk_SOURCES = \
22 gnunet-fs-gtk_publish-dialog.c \ 23 gnunet-fs-gtk_publish-dialog.c \
23 gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \ 24 gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
24 gnunet-fs-gtk-main_window_meta_data_context_menu.c \ 25 gnunet-fs-gtk-main_window_meta_data_context_menu.c \
25 gnunet-fs-gtk-main_window_adv_pseudonym.c \
26 gnunet-fs-gtk-main_window_file_download.c \ 26 gnunet-fs-gtk-main_window_file_download.c \
27 gnunet-fs-gtk-main_window_namespace.c \ 27 gnunet-fs-gtk-main_window_namespace.c \
28 gnunet-fs-gtk-main_window_open_directory.c 28 gnunet-fs-gtk-main_window_open_directory.c
diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 41fb7e7f..b3355a48 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of GNUnet 2 This file is part of GNUnet
3 (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors) 3 (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors)
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 22 * @file src/fs/gnunet-fs-gtk_advertise-pseudonym.c
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 */ 24 */
25#include "gnunet-fs-gtk_common.h" 25#include "gnunet-fs-gtk_common.h"
@@ -33,6 +33,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget * widget,
33 GdkEvent * event, 33 GdkEvent * event,
34 gpointer user_Data) 34 gpointer user_Data)
35{ 35{
36 /* FIXME-LEAK: this doesn't destroy the dialog properly... */
36 gtk_widget_hide (widget); 37 gtk_widget_hide (widget);
37 return TRUE; 38 return TRUE;
38} 39}
@@ -52,36 +53,33 @@ add_to_list (void *cls, const char *name, const GNUNET_HashCode * id)
52{ 53{
53 GtkListStore *ls = cls; 54 GtkListStore *ls = cls;
54 GtkTreeIter iter; 55 GtkTreeIter iter;
55 gtk_list_store_insert_with_values (ls, &iter, -1, 0, name, 1,
56 GNUNET_FS_namespace_create
57 (GNUNET_FS_GTK_get_fs_handle (), name),
58 -1);
59}
60
61
62static void
63selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
64{
65 GtkTreeIter iter;
66 GtkWidget *ok_button;
67 GtkBuilder *builder;
68
69 builder = GTK_BUILDER (user_data);
70 56
71 ok_button = 57 gtk_list_store_insert_with_values (ls, &iter, -1,
72 GTK_WIDGET (gtk_builder_get_object 58 0, name,
73 (builder, "GNUNET_GTK_select_pseudonym_ok_button")); 59 1, GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (),
74 if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter)) 60 name),
75 gtk_widget_set_sensitive (ok_button, TRUE); 61 -1);
76 else
77 gtk_widget_set_sensitive (ok_button, FALSE);
78} 62}
79 63
80 64
65/**
66 *
67 */
81struct NamespaceAdvertisementContext 68struct NamespaceAdvertisementContext
82{ 69{
70 /**
71 *
72 */
83 struct GNUNET_FS_Namespace *ns; 73 struct GNUNET_FS_Namespace *ns;
74
75 /**
76 *
77 */
84 const char *root; 78 const char *root;
79
80 /**
81 *
82 */
85 struct GNUNET_FS_FileInformation *fip; 83 struct GNUNET_FS_FileInformation *fip;
86}; 84};
87 85
@@ -116,6 +114,9 @@ advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
116} 114}
117 115
118 116
117/**
118 *
119 */
119static void 120static void
120adv_pseudonym_edit_publish_dialog_cb (gpointer cls, 121adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
121 gint ret, 122 gint ret,
@@ -135,6 +136,9 @@ adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
135} 136}
136 137
137 138
139/**
140 *
141 */
138void 142void
139GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog, 143GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
140 gint response_id, 144 gint response_id,
@@ -210,22 +214,6 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
210} 214}
211 215
212 216
213void
214GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
215 gpointer user_data)
216{
217 GtkTreeView *tv;
218 GtkTreeSelection *sel;
219 GtkBuilder *builder;
220
221 builder = GTK_BUILDER (user_data);
222
223 tv = GTK_TREE_VIEW (gtk_builder_get_object
224 (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
225 sel = gtk_tree_view_get_selection (tv);
226 g_signal_connect (G_OBJECT (sel), "changed",
227 G_CALLBACK (selection_changed_cb), user_data);
228}
229 217
230 218
231/** 219/**
@@ -241,7 +229,6 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
241 GtkBuilder *builder; 229 GtkBuilder *builder;
242 230
243 builder = GTK_BUILDER (data); 231 builder = GTK_BUILDER (data);
244
245 ad = GTK_WIDGET (gtk_builder_get_object 232 ad = GTK_WIDGET (gtk_builder_get_object
246 (builder, "GNUNET_GTK_select_pseudonym_dialog")); 233 (builder, "GNUNET_GTK_select_pseudonym_dialog"));
247 ls = GTK_LIST_STORE (gtk_builder_get_object 234 ls = GTK_LIST_STORE (gtk_builder_get_object
@@ -255,4 +242,45 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
255} 242}
256 243
257 244
258/* end of gnunet-fs-gtk-main_window_adv_pseudonym.c */ 245/**
246 *
247 */
248static void
249selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
250{
251 GtkBuilder *builder = GTK_BUILDER (user_data);
252 GtkTreeIter iter;
253 GtkWidget *ok_button;
254
255 ok_button =
256 GTK_WIDGET (gtk_builder_get_object
257 (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
258 if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
259 gtk_widget_set_sensitive (ok_button, TRUE);
260 else
261 gtk_widget_set_sensitive (ok_button, FALSE);
262}
263
264
265/**
266 *
267 */
268void
269GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
270 gpointer user_data)
271{
272 GtkTreeView *tv;
273 GtkTreeSelection *sel;
274 GtkBuilder *builder;
275
276 builder = GTK_BUILDER (user_data);
277
278 tv = GTK_TREE_VIEW (gtk_builder_get_object
279 (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
280 sel = gtk_tree_view_get_selection (tv);
281 g_signal_connect (G_OBJECT (sel), "changed",
282 G_CALLBACK (selection_changed_cb), user_data);
283}
284
285
286/* end of gnunet-fs-gtk_advertise-pseudonym.c */