aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gnunet_conversation_gtk_main_window.glade2
-rw-r--r--contrib/gnunet_fs_gtk_download_as_dialog.glade12
-rw-r--r--contrib/gnunet_fs_gtk_edit_publication.glade123
-rw-r--r--contrib/gnunet_fs_gtk_enter_nick_dialog.glade6
-rw-r--r--contrib/gnunet_fs_gtk_main_window.glade694
-rw-r--r--contrib/gnunet_fs_gtk_open_directory_dialog.glade9
-rw-r--r--contrib/gnunet_fs_gtk_open_url_dialog.glade4
-rw-r--r--contrib/gnunet_fs_gtk_progress_dialog.glade33
-rw-r--r--contrib/gnunet_fs_gtk_pseu_progress_dialog.glade9
-rw-r--r--contrib/gnunet_fs_gtk_publish_dialog.glade102
-rw-r--r--contrib/gnunet_fs_gtk_publish_directory_dialog.glade149
-rw-r--r--contrib/gnunet_fs_gtk_publish_file_dialog.glade51
-rw-r--r--contrib/gnunet_fs_gtk_publish_tab.glade9
-rw-r--r--contrib/gnunet_fs_gtk_search_tab.glade25
-rw-r--r--contrib/gnunet_fs_gtk_unindex.glade14
-rw-r--r--contrib/gnunet_gtk_status_bar_menu.glade8
-rw-r--r--contrib/gnunet_identity_gtk_advertise_dialog.glade141
-rw-r--r--contrib/gnunet_namestore_edit_a.glade59
-rw-r--r--contrib/gnunet_namestore_edit_aaaa.glade59
-rw-r--r--contrib/gnunet_namestore_edit_cert.glade64
-rw-r--r--contrib/gnunet_namestore_edit_gns2dns.glade28
-rw-r--r--contrib/gnunet_namestore_edit_leho.glade25
-rw-r--r--contrib/gnunet_namestore_edit_mx.glade27
-rw-r--r--contrib/gnunet_namestore_edit_phone.glade27
-rw-r--r--contrib/gnunet_namestore_edit_pkey.glade25
-rw-r--r--contrib/gnunet_namestore_edit_ptr.glade25
-rw-r--r--contrib/gnunet_namestore_edit_soa.glade37
-rw-r--r--contrib/gnunet_namestore_edit_srv.glade31
-rw-r--r--contrib/gnunet_namestore_edit_tlsa.glade35
-rw-r--r--contrib/gnunet_namestore_edit_txt.glade25
-rw-r--r--contrib/gnunet_namestore_edit_vpn.glade29
-rw-r--r--contrib/gnunet_namestore_gtk_main_window.glade243
-rw-r--r--contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade9
-rw-r--r--contrib/gnunet_statistics_gtk_main_window.glade10
34 files changed, 1036 insertions, 1113 deletions
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index a195ea45..6c8061c1 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -490,7 +490,7 @@
490 <property name="receives_default">True</property> 490 <property name="receives_default">True</property>
491 <property name="use_action_appearance">False</property> 491 <property name="use_action_appearance">False</property>
492 <property name="xalign">0.4699999988079071</property> 492 <property name="xalign">0.4699999988079071</property>
493 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/> 493 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_use_current_button_clicked" swapped="no"/>
494 </object> 494 </object>
495 <packing> 495 <packing>
496 <property name="expand">False</property> 496 <property name="expand">False</property>
diff --git a/contrib/gnunet_fs_gtk_download_as_dialog.glade b/contrib/gnunet_fs_gtk_download_as_dialog.glade
index 6ec420f4..705d9da1 100644
--- a/contrib/gnunet_fs_gtk_download_as_dialog.glade
+++ b/contrib/gnunet_fs_gtk_download_as_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
6 <property name="upper">100000</property> 6 <property name="upper">100000</property>
7 <property name="value">1</property> 7 <property name="value">1</property>
@@ -25,12 +25,13 @@
25 <signal name="delete-event" handler="GNUNET_GTK_save_as_dialog_delete_event_cb" swapped="no"/> 25 <signal name="delete-event" handler="GNUNET_GTK_save_as_dialog_delete_event_cb" swapped="no"/>
26 <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb" swapped="no"/> 26 <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb" swapped="no"/>
27 <child internal-child="vbox"> 27 <child internal-child="vbox">
28 <object class="GtkVBox" id="dialog-vbox4"> 28 <object class="GtkBox" id="dialog-vbox4">
29 <property name="visible">True</property> 29 <property name="visible">True</property>
30 <property name="can_focus">False</property> 30 <property name="can_focus">False</property>
31 <property name="orientation">vertical</property>
31 <property name="spacing">2</property> 32 <property name="spacing">2</property>
32 <child internal-child="action_area"> 33 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="dialog-action_area5"> 34 <object class="GtkButtonBox" id="dialog-action_area5">
34 <property name="visible">True</property> 35 <property name="visible">True</property>
35 <property name="can_focus">False</property> 36 <property name="can_focus">False</property>
36 <property name="layout_style">end</property> 37 <property name="layout_style">end</property>
@@ -101,8 +102,6 @@
101 <property name="caps_lock_warning">False</property> 102 <property name="caps_lock_warning">False</property>
102 <property name="primary_icon_activatable">False</property> 103 <property name="primary_icon_activatable">False</property>
103 <property name="secondary_icon_activatable">False</property> 104 <property name="secondary_icon_activatable">False</property>
104 <property name="primary_icon_sensitive">True</property>
105 <property name="secondary_icon_sensitive">True</property>
106 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property> 105 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
107 <property name="numeric">True</property> 106 <property name="numeric">True</property>
108 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/> 107 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/>
@@ -122,6 +121,7 @@
122 <property name="can_focus">True</property> 121 <property name="can_focus">True</property>
123 <property name="receives_default">False</property> 122 <property name="receives_default">False</property>
124 <property name="use_underline">True</property> 123 <property name="use_underline">True</property>
124 <property name="xalign">0.5</property>
125 <property name="draw_indicator">True</property> 125 <property name="draw_indicator">True</property>
126 </object> 126 </object>
127 <packing> 127 <packing>
diff --git a/contrib/gnunet_fs_gtk_edit_publication.glade b/contrib/gnunet_fs_gtk_edit_publication.glade
index 82038d42..2fea42b3 100644
--- a/contrib/gnunet_fs_gtk_edit_publication.glade
+++ b/contrib/gnunet_fs_gtk_edit_publication.glade
@@ -1,7 +1,25 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide --> 5 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
6 <property name="upper">100</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property>
9 </object>
10 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment">
11 <property name="upper">100</property>
12 <property name="step_increment">1</property>
13 <property name="page_increment">10</property>
14 </object>
15 <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
16 <columns>
17 <!-- column-name Keyword -->
18 <column type="gchararray"/>
19 <!-- column-name Added -->
20 <column type="gboolean"/>
21 </columns>
22 </object>
5 <object class="GtkListStore" id="GNUNET_GTK_publication_metadata_liststore"> 23 <object class="GtkListStore" id="GNUNET_GTK_publication_metadata_liststore">
6 <columns> 24 <columns>
7 <!-- column-name Type --> 25 <!-- column-name Type -->
@@ -66,23 +84,40 @@
66 </row> 84 </row>
67 </data> 85 </data>
68 </object> 86 </object>
69 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment"> 87 <object class="GtkImage" id="add_stock_image">
70 <property name="upper">100</property> 88 <property name="visible">True</property>
89 <property name="can_focus">False</property>
90 <property name="stock">gtk-add</property>
91 </object>
92 <object class="GtkImage" id="add_stock_image1">
93 <property name="visible">True</property>
94 <property name="can_focus">False</property>
95 <property name="stock">gtk-add</property>
96 </object>
97 <object class="GtkImage" id="del_stock_image">
98 <property name="visible">True</property>
99 <property name="can_focus">False</property>
100 <property name="stock">gtk-delete</property>
101 </object>
102 <object class="GtkImage" id="del_stock_image1">
103 <property name="visible">True</property>
104 <property name="can_focus">False</property>
105 <property name="stock">gtk-delete</property>
106 </object>
107 <object class="GtkAdjustment" id="expiration_year_adjustment">
108 <property name="upper">9999</property>
71 <property name="step_increment">1</property> 109 <property name="step_increment">1</property>
72 <property name="page_increment">10</property> 110 <property name="page_increment">10</property>
73 </object> 111 </object>
74 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment"> 112 <object class="GtkAdjustment" id="priority_adjustment">
75 <property name="upper">100</property> 113 <property name="upper">10000000</property>
76 <property name="step_increment">1</property> 114 <property name="step_increment">1</property>
77 <property name="page_increment">10</property> 115 <property name="page_increment">10</property>
78 </object> 116 </object>
79 <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore"> 117 <object class="GtkAdjustment" id="replication_adjustment">
80 <columns> 118 <property name="upper">999999</property>
81 <!-- column-name Keyword --> 119 <property name="step_increment">1</property>
82 <column type="gchararray"/> 120 <property name="page_increment">10</property>
83 <!-- column-name Added -->
84 <column type="gboolean"/>
85 </columns>
86 </object> 121 </object>
87 <object class="GtkWindow" id="GNUNET_GTK_edit_publication_window"> 122 <object class="GtkWindow" id="GNUNET_GTK_edit_publication_window">
88 <property name="can_focus">False</property> 123 <property name="can_focus">False</property>
@@ -195,8 +230,6 @@
195 <property name="height_request">120</property> 230 <property name="height_request">120</property>
196 <property name="visible">True</property> 231 <property name="visible">True</property>
197 <property name="can_focus">True</property> 232 <property name="can_focus">True</property>
198 <property name="hscrollbar_policy">automatic</property>
199 <property name="vscrollbar_policy">automatic</property>
200 <property name="shadow_type">in</property> 233 <property name="shadow_type">in</property>
201 <child> 234 <child>
202 <object class="GtkTreeView" id="GNUNET_GTK_edit_publication_metadata_tree_view"> 235 <object class="GtkTreeView" id="GNUNET_GTK_edit_publication_metadata_tree_view">
@@ -206,6 +239,9 @@
206 <property name="enable_search">False</property> 239 <property name="enable_search">False</property>
207 <property name="search_column">0</property> 240 <property name="search_column">0</property>
208 <property name="tooltip_column">4</property> 241 <property name="tooltip_column">4</property>
242 <child internal-child="selection">
243 <object class="GtkTreeSelection" id="treeview-selection1"/>
244 </child>
209 <child> 245 <child>
210 <object class="GtkTreeViewColumn" id="GNUNET_GTK_edit_publication_metadata_tree_view_type_column"> 246 <object class="GtkTreeViewColumn" id="GNUNET_GTK_edit_publication_metadata_tree_view_type_column">
211 <property name="resizable">True</property> 247 <property name="resizable">True</property>
@@ -294,8 +330,6 @@
294 <property name="can_focus">True</property> 330 <property name="can_focus">True</property>
295 <property name="hadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment</property> 331 <property name="hadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment</property>
296 <property name="vadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment</property> 332 <property name="vadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment</property>
297 <property name="hscrollbar_policy">automatic</property>
298 <property name="vscrollbar_policy">automatic</property>
299 <child> 333 <child>
300 <object class="GtkViewport" id="GNUNET_GTK_edit_publication_metadata_preview_image_viewport"> 334 <object class="GtkViewport" id="GNUNET_GTK_edit_publication_metadata_preview_image_viewport">
301 <property name="visible">True</property> 335 <property name="visible">True</property>
@@ -376,12 +410,9 @@
376 <property name="can_focus">True</property> 410 <property name="can_focus">True</property>
377 <property name="events">GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK</property> 411 <property name="events">GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK</property>
378 <property name="invisible_char">●</property> 412 <property name="invisible_char">●</property>
379 <property name="invisible_char_set">True</property>
380 <property name="caps_lock_warning">False</property> 413 <property name="caps_lock_warning">False</property>
381 <property name="primary_icon_activatable">False</property> 414 <property name="primary_icon_activatable">False</property>
382 <property name="secondary_icon_activatable">False</property> 415 <property name="secondary_icon_activatable">False</property>
383 <property name="primary_icon_sensitive">True</property>
384 <property name="secondary_icon_sensitive">True</property>
385 </object> 416 </object>
386 <packing> 417 <packing>
387 <property name="expand">True</property> 418 <property name="expand">True</property>
@@ -422,7 +453,6 @@
422 <property name="visible">True</property> 453 <property name="visible">True</property>
423 <property name="can_focus">True</property> 454 <property name="can_focus">True</property>
424 <property name="hscrollbar_policy">never</property> 455 <property name="hscrollbar_policy">never</property>
425 <property name="vscrollbar_policy">automatic</property>
426 <property name="shadow_type">in</property> 456 <property name="shadow_type">in</property>
427 <child> 457 <child>
428 <object class="GtkTreeView" id="GNUNET_GTK_edit_publication_keyword_list_tree_view"> 458 <object class="GtkTreeView" id="GNUNET_GTK_edit_publication_keyword_list_tree_view">
@@ -430,6 +460,9 @@
430 <property name="can_focus">True</property> 460 <property name="can_focus">True</property>
431 <property name="model">GNUNET_GTK_publication_keywords_liststore</property> 461 <property name="model">GNUNET_GTK_publication_keywords_liststore</property>
432 <property name="search_column">0</property> 462 <property name="search_column">0</property>
463 <child internal-child="selection">
464 <object class="GtkTreeSelection" id="treeview-selection2"/>
465 </child>
433 <child> 466 <child>
434 <object class="GtkTreeViewColumn" id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column"> 467 <object class="GtkTreeViewColumn" id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column">
435 <property name="title">Keywords</property> 468 <property name="title">Keywords</property>
@@ -524,6 +557,7 @@
524 <property name="visible">True</property> 557 <property name="visible">True</property>
525 <property name="can_focus">True</property> 558 <property name="can_focus">True</property>
526 <property name="receives_default">False</property> 559 <property name="receives_default">False</property>
560 <property name="xalign">0.5</property>
527 <property name="draw_indicator">True</property> 561 <property name="draw_indicator">True</property>
528 </object> 562 </object>
529 <packing> 563 <packing>
@@ -564,11 +598,8 @@
564 <property name="can_focus">True</property> 598 <property name="can_focus">True</property>
565 <property name="invisible_char">•</property> 599 <property name="invisible_char">•</property>
566 <property name="text">root</property> 600 <property name="text">root</property>
567 <property name="invisible_char_set">True</property>
568 <property name="primary_icon_activatable">False</property> 601 <property name="primary_icon_activatable">False</property>
569 <property name="secondary_icon_activatable">False</property> 602 <property name="secondary_icon_activatable">False</property>
570 <property name="primary_icon_sensitive">True</property>
571 <property name="secondary_icon_sensitive">True</property>
572 </object> 603 </object>
573 <packing> 604 <packing>
574 <property name="expand">False</property> 605 <property name="expand">False</property>
@@ -665,11 +696,8 @@
665 <property name="visible">True</property> 696 <property name="visible">True</property>
666 <property name="can_focus">True</property> 697 <property name="can_focus">True</property>
667 <property name="invisible_char">●</property> 698 <property name="invisible_char">●</property>
668 <property name="invisible_char_set">True</property>
669 <property name="primary_icon_activatable">False</property> 699 <property name="primary_icon_activatable">False</property>
670 <property name="secondary_icon_activatable">False</property> 700 <property name="secondary_icon_activatable">False</property>
671 <property name="primary_icon_sensitive">True</property>
672 <property name="secondary_icon_sensitive">True</property>
673 <property name="adjustment">priority_adjustment</property> 701 <property name="adjustment">priority_adjustment</property>
674 <property name="numeric">True</property> 702 <property name="numeric">True</property>
675 </object> 703 </object>
@@ -711,11 +739,8 @@
711 <property name="can_focus">True</property> 739 <property name="can_focus">True</property>
712 <property name="max_length">4</property> 740 <property name="max_length">4</property>
713 <property name="invisible_char">•</property> 741 <property name="invisible_char">•</property>
714 <property name="invisible_char_set">True</property>
715 <property name="primary_icon_activatable">False</property> 742 <property name="primary_icon_activatable">False</property>
716 <property name="secondary_icon_activatable">False</property> 743 <property name="secondary_icon_activatable">False</property>
717 <property name="primary_icon_sensitive">True</property>
718 <property name="secondary_icon_sensitive">True</property>
719 <property name="adjustment">expiration_year_adjustment</property> 744 <property name="adjustment">expiration_year_adjustment</property>
720 <property name="climb_rate">1</property> 745 <property name="climb_rate">1</property>
721 <property name="numeric">True</property> 746 <property name="numeric">True</property>
@@ -756,11 +781,8 @@
756 <property name="visible">True</property> 781 <property name="visible">True</property>
757 <property name="can_focus">True</property> 782 <property name="can_focus">True</property>
758 <property name="invisible_char">●</property> 783 <property name="invisible_char">●</property>
759 <property name="invisible_char_set">True</property>
760 <property name="primary_icon_activatable">False</property> 784 <property name="primary_icon_activatable">False</property>
761 <property name="secondary_icon_activatable">False</property> 785 <property name="secondary_icon_activatable">False</property>
762 <property name="primary_icon_sensitive">True</property>
763 <property name="secondary_icon_sensitive">True</property>
764 <property name="adjustment">replication_adjustment</property> 786 <property name="adjustment">replication_adjustment</property>
765 </object> 787 </object>
766 <packing> 788 <packing>
@@ -863,41 +885,6 @@
863 </object> 885 </object>
864 </child> 886 </child>
865 </object> 887 </object>
866 <object class="GtkImage" id="add_stock_image">
867 <property name="visible">True</property>
868 <property name="can_focus">False</property>
869 <property name="stock">gtk-add</property>
870 </object>
871 <object class="GtkImage" id="add_stock_image1">
872 <property name="visible">True</property>
873 <property name="can_focus">False</property>
874 <property name="stock">gtk-add</property>
875 </object>
876 <object class="GtkImage" id="del_stock_image">
877 <property name="visible">True</property>
878 <property name="can_focus">False</property>
879 <property name="stock">gtk-delete</property>
880 </object>
881 <object class="GtkImage" id="del_stock_image1">
882 <property name="visible">True</property>
883 <property name="can_focus">False</property>
884 <property name="stock">gtk-delete</property>
885 </object>
886 <object class="GtkAdjustment" id="expiration_year_adjustment">
887 <property name="upper">9999</property>
888 <property name="step_increment">1</property>
889 <property name="page_increment">10</property>
890 </object>
891 <object class="GtkAdjustment" id="replication_adjustment">
892 <property name="upper">999999</property>
893 <property name="step_increment">1</property>
894 <property name="page_increment">10</property>
895 </object>
896 <object class="GtkAdjustment" id="priority_adjustment">
897 <property name="upper">10000000</property>
898 <property name="step_increment">1</property>
899 <property name="page_increment">10</property>
900 </object>
901 <object class="GtkSizeGroup" id="sizegroup1"> 888 <object class="GtkSizeGroup" id="sizegroup1">
902 <widgets> 889 <widgets>
903 <widget name="GNUNET_GTK_edit_publication_root_entry"/> 890 <widget name="GNUNET_GTK_edit_publication_root_entry"/>
diff --git a/contrib/gnunet_fs_gtk_enter_nick_dialog.glade b/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
index aba1c058..ca62128a 100644
--- a/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
+++ b/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkWindow" id="GNUNET_GTK_enter_nick_window"> 5 <object class="GtkWindow" id="GNUNET_GTK_enter_nick_window">
6 <property name="can_focus">False</property> 6 <property name="can_focus">False</property>
7 <property name="title" translatable="yes">Enter the desired nickname for the namespace</property> 7 <property name="title" translatable="yes">Enter the desired nickname for the namespace</property>
@@ -44,8 +44,6 @@
44 <property name="invisible_char">●</property> 44 <property name="invisible_char">●</property>
45 <property name="primary_icon_activatable">False</property> 45 <property name="primary_icon_activatable">False</property>
46 <property name="secondary_icon_activatable">False</property> 46 <property name="secondary_icon_activatable">False</property>
47 <property name="primary_icon_sensitive">True</property>
48 <property name="secondary_icon_sensitive">True</property>
49 <signal name="changed" handler="GNUNET_GTK_enter_nick_window_nick_entry_changed_cb" swapped="no"/> 47 <signal name="changed" handler="GNUNET_GTK_enter_nick_window_nick_entry_changed_cb" swapped="no"/>
50 </object> 48 </object>
51 <packing> 49 <packing>
diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 3348f828..4a7dc633 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy toplevel-contextual -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
6 <property name="upper">100</property> 6 <property name="upper">100</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -88,6 +88,329 @@
88 <column type="gchararray"/> 88 <column type="gchararray"/>
89 </columns> 89 </columns>
90 </object> 90 </object>
91 <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
92 <columns>
93 <!-- column-name peer_identity -->
94 <column type="gchararray"/>
95 <!-- column-name number_of_known_addresses -->
96 <column type="guint"/>
97 <!-- column-name country_name -->
98 <column type="gchararray"/>
99 <!-- column-name country_flag -->
100 <column type="GdkPixbuf"/>
101 <!-- column-name bandwidth -->
102 <column type="guint64"/>
103 </columns>
104 </object>
105 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
106 <columns>
107 <!-- column-name namespace_name -->
108 <column type="gchararray"/>
109 <!-- column-name namespace_handle -->
110 <column type="gpointer"/>
111 </columns>
112 </object>
113 <object class="GtkAdjustment" id="adjustment1">
114 <property name="upper">100</property>
115 <property name="step_increment">1</property>
116 <property name="page_increment">10</property>
117 <property name="page_size">10</property>
118 </object>
119 <object class="GtkAdjustment" id="adjustment2">
120 <property name="upper">100</property>
121 <property name="step_increment">1</property>
122 <property name="page_increment">10</property>
123 <property name="page_size">10</property>
124 </object>
125 <object class="GtkAdjustment" id="adjustment3">
126 <property name="upper">100</property>
127 <property name="step_increment">1</property>
128 <property name="page_increment">10</property>
129 </object>
130 <object class="GtkAdjustment" id="adjustment4">
131 <property name="upper">100</property>
132 <property name="step_increment">1</property>
133 <property name="page_increment">10</property>
134 </object>
135 <object class="GtkAdjustment" id="adjustment5">
136 <property name="upper">100</property>
137 <property name="step_increment">1</property>
138 <property name="page_increment">10</property>
139 </object>
140 <object class="GtkAdjustment" id="adjustment6">
141 <property name="upper">100</property>
142 <property name="step_increment">1</property>
143 <property name="page_increment">10</property>
144 </object>
145 <object class="GtkAdjustment" id="adjustment7">
146 <property name="upper">100</property>
147 <property name="step_increment">1</property>
148 <property name="page_increment">10</property>
149 </object>
150 <object class="GtkAdjustment" id="adjustment8">
151 <property name="upper">100</property>
152 <property name="step_increment">1</property>
153 <property name="page_increment">10</property>
154 </object>
155 <object class="GtkListStore" id="anonymity_level_liststore">
156 <columns>
157 <!-- column-name Name -->
158 <column type="gchararray"/>
159 <!-- column-name Level -->
160 <column type="guint"/>
161 <!-- column-name Color -->
162 <column type="gchararray"/>
163 </columns>
164 <data>
165 <row>
166 <col id="0" translatable="yes">None</col>
167 <col id="1">0</col>
168 <col id="2" translatable="yes">#AAAA00000000</col>
169 </row>
170 <row>
171 <col id="0" translatable="yes">Normal</col>
172 <col id="1">1</col>
173 <col id="2" translatable="yes">#000000000000</col>
174 </row>
175 <row>
176 <col id="0" translatable="yes">Paranoid</col>
177 <col id="1">10</col>
178 <col id="2" translatable="yes">#0000AAAA0000</col>
179 </row>
180 </data>
181 </object>
182 <object class="GtkImage" id="down_stock_image">
183 <property name="visible">True</property>
184 <property name="can_focus">False</property>
185 <property name="stock">gtk-go-down</property>
186 </object>
187 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
188 <property name="mode">vertical</property>
189 </object>
190 <object class="GtkAdjustment" id="expiration_year_adjustment">
191 <property name="upper">9999</property>
192 <property name="step_increment">1</property>
193 <property name="page_increment">10</property>
194 </object>
195 <object class="GtkImage" id="find_and_replace_stock_image">
196 <property name="visible">True</property>
197 <property name="can_focus">False</property>
198 <property name="stock">gtk-find-and-replace</property>
199 </object>
200 <object class="GtkImage" id="find_stock_image">
201 <property name="visible">True</property>
202 <property name="can_focus">False</property>
203 <property name="stock">gtk-find</property>
204 </object>
205 <object class="GtkImage" id="index_stock_image">
206 <property name="visible">True</property>
207 <property name="can_focus">False</property>
208 <property name="stock">gtk-index</property>
209 </object>
210 <object class="GtkListStore" id="main_window_search_mime_liststore">
211 <columns>
212 <!-- column-name MIME -->
213 <column type="gchararray"/>
214 <!-- column-name Type -->
215 <column type="gchararray"/>
216 <!-- column-name Extension -->
217 <column type="gchararray"/>
218 <!-- column-name Lossyness -->
219 <column type="gchararray"/>
220 <!-- column-name Freedom -->
221 <column type="gchararray"/>
222 </columns>
223 <data>
224 <row>
225 <col id="0"> </col>
226 <col id="1" translatable="yes">Any</col>
227 <col id="2" translatable="yes"> </col>
228 <col id="3" translatable="yes"> </col>
229 <col id="4" translatable="yes"> </col>
230 </row>
231 <row>
232 <col id="0">mimetype:text</col>
233 <col id="1" translatable="yes">Text</col>
234 <col id="2">txt, html</col>
235 <col id="3" translatable="yes">N/A</col>
236 <col id="4" translatable="yes">N/A</col>
237 </row>
238 <row>
239 <col id="0">mimetype:image</col>
240 <col id="1" translatable="yes">Image</col>
241 <col id="2">png, jpeg, gif, ...</col>
242 <col id="3" translatable="yes">N/A</col>
243 <col id="4" translatable="yes">N/A</col>
244 </row>
245 <row>
246 <col id="0">application/pdf</col>
247 <col id="1" translatable="yes">PDF documents</col>
248 <col id="2">pdf</col>
249 <col id="3" translatable="yes">lossless</col>
250 <col id="4" translatable="yes">non-free</col>
251 </row>
252 <row>
253 <col id="0">image/jpeg</col>
254 <col id="1" translatable="yes">JPEG image</col>
255 <col id="2">jpg, jpeg</col>
256 <col id="3" translatable="yes">lossy</col>
257 <col id="4" translatable="yes">free</col>
258 </row>
259 <row>
260 <col id="0">image/png</col>
261 <col id="1" translatable="yes">PNG image</col>
262 <col id="2">png</col>
263 <col id="3" translatable="yes">lossless</col>
264 <col id="4" translatable="yes">non-free</col>
265 </row>
266 <row>
267 <col id="0">mimetype:audio</col>
268 <col id="1" translatable="yes">Audio</col>
269 <col id="2">wav, mp3, ogg, ...</col>
270 <col id="3" translatable="yes"> </col>
271 <col id="4" translatable="yes"> </col>
272 </row>
273 <row>
274 <col id="0">audio/ogg</col>
275 <col id="1" translatable="yes">OGG Vorbis audio</col>
276 <col id="2">ogg</col>
277 <col id="3" translatable="yes">lossy</col>
278 <col id="4" translatable="yes">non-free</col>
279 </row>
280 <row>
281 <col id="0">audio/mpeg</col>
282 <col id="1" translatable="yes">MPEG audio</col>
283 <col id="2">mp3, mp2, mpeg</col>
284 <col id="3" translatable="yes">lossy</col>
285 <col id="4" translatable="yes">non-free</col>
286 </row>
287 <row>
288 <col id="0">mimetype:video</col>
289 <col id="1" translatable="yes">Vorbis</col>
290 <col id="2">ogv, mpeg, mp4, flv, ...</col>
291 <col id="3" translatable="yes"> </col>
292 <col id="4" translatable="yes"> </col>
293 </row>
294 <row>
295 <col id="0">video/ogg</col>
296 <col id="1" translatable="yes">OGG Vorbis video</col>
297 <col id="2">ogv</col>
298 <col id="3" translatable="yes">lossy</col>
299 <col id="4" translatable="yes">free</col>
300 </row>
301 <row>
302 <col id="0">video/mpeg</col>
303 <col id="1" translatable="yes">MPEG video (v2)</col>
304 <col id="2">mpg, mpeg</col>
305 <col id="3" translatable="yes">lossy</col>
306 <col id="4" translatable="yes">non-free</col>
307 </row>
308 <row>
309 <col id="0">video/mp4</col>
310 <col id="1" translatable="yes">MPEG video (v4)</col>
311 <col id="2">mp4</col>
312 <col id="3" translatable="yes">lossy</col>
313 <col id="4" translatable="yes">non-free</col>
314 </row>
315 <row>
316 <col id="0">video/x-msvideo</col>
317 <col id="1" translatable="yes">AVI video</col>
318 <col id="2">avi</col>
319 <col id="3" translatable="yes">lossy</col>
320 <col id="4" translatable="yes">non-free</col>
321 </row>
322 <row>
323 <col id="0">video/x-ms-asf</col>
324 <col id="1" translatable="yes">ASF video</col>
325 <col id="2">asf</col>
326 <col id="3" translatable="yes">lossy</col>
327 <col id="4" translatable="yes">non-free</col>
328 </row>
329 <row>
330 <col id="0">video/x-flv</col>
331 <col id="1" translatable="yes">Flash video</col>
332 <col id="2">flv</col>
333 <col id="3" translatable="yes">lossy</col>
334 <col id="4" translatable="yes">non-free</col>
335 </row>
336 <row>
337 <col id="0">application/x-tar</col>
338 <col id="1" translatable="yes">Tar archive</col>
339 <col id="2">tar, tgz</col>
340 <col id="3" translatable="yes">lossless</col>
341 <col id="4" translatable="yes">free</col>
342 </row>
343 <row>
344 <col id="0">application/zip</col>
345 <col id="1" translatable="yes">Zip archive</col>
346 <col id="2">zip</col>
347 <col id="3" translatable="yes">lossless</col>
348 <col id="4" translatable="yes">free</col>
349 </row>
350 </data>
351 </object>
352 <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
353 <columns>
354 <!-- column-name Name -->
355 <column type="gchararray"/>
356 <!-- column-name Key -->
357 <column type="gpointer"/>
358 <!-- column-name Root -->
359 <column type="gchararray"/>
360 <!-- column-name Tooltip -->
361 <column type="gchararray"/>
362 </columns>
363 </object>
364 <object class="GtkMenu" id="metadata_popup_menu">
365 <property name="visible">True</property>
366 <property name="can_focus">False</property>
367 <child>
368 <object class="GtkMenuItem" id="Copy selection">
369 <property name="visible">True</property>
370 <property name="can_focus">False</property>
371 <property name="label" translatable="yes">Copy selection</property>
372 <property name="use_underline">True</property>
373 <signal name="activate" handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
374 </object>
375 </child>
376 </object>
377 <object class="GtkListStore" id="namespace_label_liststore">
378 <columns>
379 <!-- column-name Name -->
380 <column type="gchararray"/>
381 </columns>
382 <data>
383 <row>
384 <col id="0" translatable="yes">&lt;none&gt;</col>
385 </row>
386 </data>
387 </object>
388 <object class="GtkImage" id="new_stock_image">
389 <property name="visible">True</property>
390 <property name="can_focus">False</property>
391 <property name="stock">gtk-new</property>
392 </object>
393 <object class="GtkImage" id="open_stock_image">
394 <property name="visible">True</property>
395 <property name="can_focus">False</property>
396 <property name="stock">gtk-open</property>
397 </object>
398 <object class="GtkAdjustment" id="priority_adjustment">
399 <property name="upper">10000000</property>
400 <property name="value">1000</property>
401 <property name="step_increment">1</property>
402 <property name="page_increment">10</property>
403 </object>
404 <object class="GtkAdjustment" id="replication_adjustment">
405 <property name="upper">999999</property>
406 <property name="step_increment">1</property>
407 <property name="page_increment">10</property>
408 </object>
409 <object class="GtkImage" id="up_stock_image">
410 <property name="visible">True</property>
411 <property name="can_focus">False</property>
412 <property name="stock">gtk-go-up</property>
413 </object>
91 <object class="GtkWindow" id="GNUNET_GTK_main_window"> 414 <object class="GtkWindow" id="GNUNET_GTK_main_window">
92 <property name="can_focus">False</property> 415 <property name="can_focus">False</property>
93 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> 416 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
@@ -164,8 +487,8 @@
164 <property name="use_underline">True</property> 487 <property name="use_underline">True</property>
165 <property name="image">up_stock_image</property> 488 <property name="image">up_stock_image</property>
166 <property name="use_stock">False</property> 489 <property name="use_stock">False</property>
167 <accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
168 <signal name="activate" handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/> 490 <signal name="activate" handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
491 <accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
169 </object> 492 </object>
170 </child> 493 </child>
171 <child> 494 <child>
@@ -193,8 +516,8 @@
193 <property name="use_underline">True</property> 516 <property name="use_underline">True</property>
194 <property name="image">down_stock_image</property> 517 <property name="image">down_stock_image</property>
195 <property name="use_stock">False</property> 518 <property name="use_stock">False</property>
196 <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
197 <signal name="activate" handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/> 519 <signal name="activate" handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
520 <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
198 </object> 521 </object>
199 </child> 522 </child>
200 <child> 523 <child>
@@ -207,8 +530,8 @@
207 <property name="use_underline">True</property> 530 <property name="use_underline">True</property>
208 <property name="image">open_stock_image</property> 531 <property name="image">open_stock_image</property>
209 <property name="use_stock">False</property> 532 <property name="use_stock">False</property>
210 <accelerator key="F3" signal="activate"/>
211 <signal name="activate" handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb" swapped="no"/> 533 <signal name="activate" handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb" swapped="no"/>
534 <accelerator key="F3" signal="activate"/>
212 </object> 535 </object>
213 </child> 536 </child>
214 <child> 537 <child>
@@ -226,8 +549,8 @@
226 <property name="accel_path">&lt;gnunet-fs-gtk&gt;/Quit</property> 549 <property name="accel_path">&lt;gnunet-fs-gtk&gt;/Quit</property>
227 <property name="use_underline">True</property> 550 <property name="use_underline">True</property>
228 <property name="use_stock">True</property> 551 <property name="use_stock">True</property>
229 <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
230 <signal name="activate" handler="GNUNET_FS_GTK_menu_quit_activate_cb" swapped="no"/> 552 <signal name="activate" handler="GNUNET_FS_GTK_menu_quit_activate_cb" swapped="no"/>
553 <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
231 </object> 554 </object>
232 </child> 555 </child>
233 </object> 556 </object>
@@ -372,6 +695,11 @@
372 <attribute name="text">0</attribute> 695 <attribute name="text">0</attribute>
373 </attributes> 696 </attributes>
374 </child> 697 </child>
698 <child internal-child="entry">
699 <object class="GtkEntry" id="combobox-entry1">
700 <property name="can_focus">False</property>
701 </object>
702 </child>
375 </object> 703 </object>
376 <packing> 704 <packing>
377 <property name="expand">False</property> 705 <property name="expand">False</property>
@@ -425,11 +753,8 @@ This operation will be executed using the anonymity level specified on the right
425 <property name="visible">True</property> 753 <property name="visible">True</property>
426 <property name="can_focus">True</property> 754 <property name="can_focus">True</property>
427 <property name="invisible_char">●</property> 755 <property name="invisible_char">●</property>
428 <property name="invisible_char_set">True</property>
429 <property name="primary_icon_activatable">False</property> 756 <property name="primary_icon_activatable">False</property>
430 <property name="secondary_icon_activatable">False</property> 757 <property name="secondary_icon_activatable">False</property>
431 <property name="primary_icon_sensitive">True</property>
432 <property name="secondary_icon_sensitive">True</property>
433 <signal name="key-press-event" handler="main_window_search_entry_key_press_event_cb" swapped="no"/> 758 <signal name="key-press-event" handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
434 </object> 759 </object>
435 <packing> 760 <packing>
@@ -635,9 +960,12 @@ This operation will be executed using the anonymity level specified on the right
635 <property name="search_column">6</property> 960 <property name="search_column">6</property>
636 <property name="enable_grid_lines">horizontal</property> 961 <property name="enable_grid_lines">horizontal</property>
637 <property name="enable_tree_lines">True</property> 962 <property name="enable_tree_lines">True</property>
638 <signal name="cursor-changed" handler="GNUNET_FS_GTK_download_frame_treeview_cursor_changed_cb" swapped="no"/>
639 <signal name="button-press-event" handler="GNUNET_GTK_download_frame_button_press_event_cb" swapped="no"/> 963 <signal name="button-press-event" handler="GNUNET_GTK_download_frame_button_press_event_cb" swapped="no"/>
964 <signal name="cursor-changed" handler="GNUNET_FS_GTK_download_frame_treeview_cursor_changed_cb" swapped="no"/>
640 <signal name="popup-menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/> 965 <signal name="popup-menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
966 <child internal-child="selection">
967 <object class="GtkTreeSelection" id="treeview-selection1"/>
968 </child>
641 <child> 969 <child>
642 <object class="GtkTreeViewColumn" id="GNUNET_GTK_download_description_column"> 970 <object class="GtkTreeViewColumn" id="GNUNET_GTK_download_description_column">
643 <property name="title">Description</property> 971 <property name="title">Description</property>
@@ -808,7 +1136,7 @@ This operation will be executed using the anonymity level specified on the right
808 <property name="visible">True</property> 1136 <property name="visible">True</property>
809 <property name="can_focus">False</property> 1137 <property name="can_focus">False</property>
810 <property name="stock">gtk-clear</property> 1138 <property name="stock">gtk-clear</property>
811 <property name="icon-size">2</property> 1139 <property name="icon_size">2</property>
812 </object> 1140 </object>
813 </child> 1141 </child>
814 </object> 1142 </object>
@@ -899,11 +1227,8 @@ This operation will be executed using the anonymity level specified on the right
899 <property name="visible">True</property> 1227 <property name="visible">True</property>
900 <property name="can_focus">True</property> 1228 <property name="can_focus">True</property>
901 <property name="invisible_char">●</property> 1229 <property name="invisible_char">●</property>
902 <property name="invisible_char_set">True</property>
903 <property name="primary_icon_activatable">False</property> 1230 <property name="primary_icon_activatable">False</property>
904 <property name="secondary_icon_activatable">False</property> 1231 <property name="secondary_icon_activatable">False</property>
905 <property name="primary_icon_sensitive">True</property>
906 <property name="secondary_icon_sensitive">True</property>
907 </object> 1232 </object>
908 <packing> 1233 <packing>
909 <property name="expand">True</property> 1234 <property name="expand">True</property>
@@ -992,6 +1317,7 @@ This operation will be executed using the anonymity level specified on the right
992 <property name="visible">True</property> 1317 <property name="visible">True</property>
993 <property name="can_focus">True</property> 1318 <property name="can_focus">True</property>
994 <property name="receives_default">False</property> 1319 <property name="receives_default">False</property>
1320 <property name="xalign">0.5</property>
995 <property name="draw_indicator">True</property> 1321 <property name="draw_indicator">True</property>
996 </object> 1322 </object>
997 <packing> 1323 <packing>
@@ -1077,14 +1403,17 @@ This operation will be executed using the anonymity level specified on the right
1077 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview"> 1403 <object class="GtkTreeView" id="GNUNET_GTK_main_window_metadata_treeview">
1078 <property name="visible">True</property> 1404 <property name="visible">True</property>
1079 <property name="can_focus">True</property> 1405 <property name="can_focus">True</property>
1080 <property name="model">GNUNET_GTK_meta_data_list_store</property>
1081 <property name="hadjustment">adjustment1</property> 1406 <property name="hadjustment">adjustment1</property>
1082 <property name="vadjustment">adjustment2</property> 1407 <property name="vadjustment">adjustment2</property>
1408 <property name="model">GNUNET_GTK_meta_data_list_store</property>
1083 <property name="search_column">0</property> 1409 <property name="search_column">0</property>
1084 <property name="rubber_banding">True</property> 1410 <property name="rubber_banding">True</property>
1085 <property name="enable_grid_lines">both</property> 1411 <property name="enable_grid_lines">both</property>
1086 <signal name="button-press-event" handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb" swapped="no"/> 1412 <signal name="button-press-event" handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb" swapped="no"/>
1087 <signal name="popup-menu" handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/> 1413 <signal name="popup-menu" handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/>
1414 <child internal-child="selection">
1415 <object class="GtkTreeSelection" id="treeview-selection2"/>
1416 </child>
1088 <child> 1417 <child>
1089 <object class="GtkTreeViewColumn" id="GNUNET_GTK_main_window_metadata_type_column"> 1418 <object class="GtkTreeViewColumn" id="GNUNET_GTK_main_window_metadata_type_column">
1090 <property name="sizing">autosize</property> 1419 <property name="sizing">autosize</property>
@@ -1143,320 +1472,6 @@ This operation will be executed using the anonymity level specified on the right
1143 </object> 1472 </object>
1144 </child> 1473 </child>
1145 </object> 1474 </object>
1146 <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
1147 <columns>
1148 <!-- column-name peer_identity -->
1149 <column type="gchararray"/>
1150 <!-- column-name number_of_known_addresses -->
1151 <column type="guint"/>
1152 <!-- column-name country_name -->
1153 <column type="gchararray"/>
1154 <!-- column-name country_flag -->
1155 <column type="GdkPixbuf"/>
1156 <!-- column-name bandwidth -->
1157 <column type="guint64"/>
1158 </columns>
1159 </object>
1160 <object class="GtkSizeGroup" id="GNUNET_GTK_download_frame_labels_size_group">
1161 <widgets>
1162 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1163 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1164 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1165 </widgets>
1166 </object>
1167 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
1168 <columns>
1169 <!-- column-name namespace_name -->
1170 <column type="gchararray"/>
1171 <!-- column-name namespace_handle -->
1172 <column type="gpointer"/>
1173 </columns>
1174 </object>
1175 <object class="GtkAdjustment" id="adjustment1">
1176 <property name="upper">100</property>
1177 <property name="step_increment">1</property>
1178 <property name="page_increment">10</property>
1179 <property name="page_size">10</property>
1180 </object>
1181 <object class="GtkAdjustment" id="adjustment2">
1182 <property name="upper">100</property>
1183 <property name="step_increment">1</property>
1184 <property name="page_increment">10</property>
1185 <property name="page_size">10</property>
1186 </object>
1187 <object class="GtkAdjustment" id="adjustment3">
1188 <property name="upper">100</property>
1189 <property name="step_increment">1</property>
1190 <property name="page_increment">10</property>
1191 </object>
1192 <object class="GtkAdjustment" id="adjustment4">
1193 <property name="upper">100</property>
1194 <property name="step_increment">1</property>
1195 <property name="page_increment">10</property>
1196 </object>
1197 <object class="GtkAdjustment" id="adjustment5">
1198 <property name="upper">100</property>
1199 <property name="step_increment">1</property>
1200 <property name="page_increment">10</property>
1201 </object>
1202 <object class="GtkAdjustment" id="adjustment6">
1203 <property name="upper">100</property>
1204 <property name="step_increment">1</property>
1205 <property name="page_increment">10</property>
1206 </object>
1207 <object class="GtkAdjustment" id="adjustment7">
1208 <property name="upper">100</property>
1209 <property name="step_increment">1</property>
1210 <property name="page_increment">10</property>
1211 </object>
1212 <object class="GtkAdjustment" id="adjustment8">
1213 <property name="upper">100</property>
1214 <property name="step_increment">1</property>
1215 <property name="page_increment">10</property>
1216 </object>
1217 <object class="GtkListStore" id="anonymity_level_liststore">
1218 <columns>
1219 <!-- column-name Name -->
1220 <column type="gchararray"/>
1221 <!-- column-name Level -->
1222 <column type="guint"/>
1223 <!-- column-name Color -->
1224 <column type="gchararray"/>
1225 </columns>
1226 <data>
1227 <row>
1228 <col id="0" translatable="yes">None</col>
1229 <col id="1">0</col>
1230 <col id="2" translatable="yes">#AAAA00000000</col>
1231 </row>
1232 <row>
1233 <col id="0" translatable="yes">Normal</col>
1234 <col id="1">1</col>
1235 <col id="2" translatable="yes">#000000000000</col>
1236 </row>
1237 <row>
1238 <col id="0" translatable="yes">Paranoid</col>
1239 <col id="1">10</col>
1240 <col id="2" translatable="yes">#0000AAAA0000</col>
1241 </row>
1242 </data>
1243 </object>
1244 <object class="GtkImage" id="down_stock_image">
1245 <property name="visible">True</property>
1246 <property name="can_focus">False</property>
1247 <property name="stock">gtk-go-down</property>
1248 </object>
1249 <object class="GtkAdjustment" id="expiration_year_adjustment">
1250 <property name="upper">9999</property>
1251 <property name="step_increment">1</property>
1252 <property name="page_increment">10</property>
1253 </object>
1254 <object class="GtkImage" id="find_and_replace_stock_image">
1255 <property name="visible">True</property>
1256 <property name="can_focus">False</property>
1257 <property name="stock">gtk-find-and-replace</property>
1258 </object>
1259 <object class="GtkImage" id="find_stock_image">
1260 <property name="visible">True</property>
1261 <property name="can_focus">False</property>
1262 <property name="stock">gtk-find</property>
1263 </object>
1264 <object class="GtkImage" id="index_stock_image">
1265 <property name="visible">True</property>
1266 <property name="can_focus">False</property>
1267 <property name="stock">gtk-index</property>
1268 </object>
1269 <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
1270 <property name="mode">vertical</property>
1271 </object>
1272 <object class="GtkListStore" id="main_window_search_mime_liststore">
1273 <columns>
1274 <!-- column-name MIME -->
1275 <column type="gchararray"/>
1276 <!-- column-name Type -->
1277 <column type="gchararray"/>
1278 <!-- column-name Extension -->
1279 <column type="gchararray"/>
1280 <!-- column-name Lossyness -->
1281 <column type="gchararray"/>
1282 <!-- column-name Freedom -->
1283 <column type="gchararray"/>
1284 </columns>
1285 <data>
1286 <row>
1287 <col id="0"> </col>
1288 <col id="1" translatable="yes">Any</col>
1289 <col id="2" translatable="yes"> </col>
1290 <col id="3" translatable="yes"> </col>
1291 <col id="4" translatable="yes"> </col>
1292 </row>
1293 <row>
1294 <col id="0">mimetype:text</col>
1295 <col id="1" translatable="yes">Text</col>
1296 <col id="2">txt, html</col>
1297 <col id="3" translatable="yes">N/A</col>
1298 <col id="4" translatable="yes">N/A</col>
1299 </row>
1300 <row>
1301 <col id="0">mimetype:image</col>
1302 <col id="1" translatable="yes">Image</col>
1303 <col id="2">png, jpeg, gif, ...</col>
1304 <col id="3" translatable="yes">N/A</col>
1305 <col id="4" translatable="yes">N/A</col>
1306 </row>
1307 <row>
1308 <col id="0">application/pdf</col>
1309 <col id="1" translatable="yes">PDF documents</col>
1310 <col id="2">pdf</col>
1311 <col id="3" translatable="yes">lossless</col>
1312 <col id="4" translatable="yes">non-free</col>
1313 </row>
1314 <row>
1315 <col id="0">image/jpeg</col>
1316 <col id="1" translatable="yes">JPEG image</col>
1317 <col id="2">jpg, jpeg</col>
1318 <col id="3" translatable="yes">lossy</col>
1319 <col id="4" translatable="yes">free</col>
1320 </row>
1321 <row>
1322 <col id="0">image/png</col>
1323 <col id="1" translatable="yes">PNG image</col>
1324 <col id="2">png</col>
1325 <col id="3" translatable="yes">lossless</col>
1326 <col id="4" translatable="yes">non-free</col>
1327 </row>
1328 <row>
1329 <col id="0">mimetype:audio</col>
1330 <col id="1" translatable="yes">Audio</col>
1331 <col id="2">wav, mp3, ogg, ...</col>
1332 <col id="3" translatable="yes"> </col>
1333 <col id="4" translatable="yes"> </col>
1334 </row>
1335 <row>
1336 <col id="0">audio/ogg</col>
1337 <col id="1" translatable="yes">OGG Vorbis audio</col>
1338 <col id="2">ogg</col>
1339 <col id="3" translatable="yes">lossy</col>
1340 <col id="4" translatable="yes">non-free</col>
1341 </row>
1342 <row>
1343 <col id="0">audio/mpeg</col>
1344 <col id="1" translatable="yes">MPEG audio</col>
1345 <col id="2">mp3, mp2, mpeg</col>
1346 <col id="3" translatable="yes">lossy</col>
1347 <col id="4" translatable="yes">non-free</col>
1348 </row>
1349 <row>
1350 <col id="0">mimetype:video</col>
1351 <col id="1" translatable="yes">Vorbis</col>
1352 <col id="2">ogv, mpeg, mp4, flv, ...</col>
1353 <col id="3" translatable="yes"> </col>
1354 <col id="4" translatable="yes"> </col>
1355 </row>
1356 <row>
1357 <col id="0">video/ogg</col>
1358 <col id="1" translatable="yes">OGG Vorbis video</col>
1359 <col id="2">ogv</col>
1360 <col id="3" translatable="yes">lossy</col>
1361 <col id="4" translatable="yes">free</col>
1362 </row>
1363 <row>
1364 <col id="0">video/mpeg</col>
1365 <col id="1" translatable="yes">MPEG video (v2)</col>
1366 <col id="2">mpg, mpeg</col>
1367 <col id="3" translatable="yes">lossy</col>
1368 <col id="4" translatable="yes">non-free</col>
1369 </row>
1370 <row>
1371 <col id="0">video/mp4</col>
1372 <col id="1" translatable="yes">MPEG video (v4)</col>
1373 <col id="2">mp4</col>
1374 <col id="3" translatable="yes">lossy</col>
1375 <col id="4" translatable="yes">non-free</col>
1376 </row>
1377 <row>
1378 <col id="0">video/x-msvideo</col>
1379 <col id="1" translatable="yes">AVI video</col>
1380 <col id="2">avi</col>
1381 <col id="3" translatable="yes">lossy</col>
1382 <col id="4" translatable="yes">non-free</col>
1383 </row>
1384 <row>
1385 <col id="0">video/x-ms-asf</col>
1386 <col id="1" translatable="yes">ASF video</col>
1387 <col id="2">asf</col>
1388 <col id="3" translatable="yes">lossy</col>
1389 <col id="4" translatable="yes">non-free</col>
1390 </row>
1391 <row>
1392 <col id="0">video/x-flv</col>
1393 <col id="1" translatable="yes">Flash video</col>
1394 <col id="2">flv</col>
1395 <col id="3" translatable="yes">lossy</col>
1396 <col id="4" translatable="yes">non-free</col>
1397 </row>
1398 <row>
1399 <col id="0">application/x-tar</col>
1400 <col id="1" translatable="yes">Tar archive</col>
1401 <col id="2">tar, tgz</col>
1402 <col id="3" translatable="yes">lossless</col>
1403 <col id="4" translatable="yes">free</col>
1404 </row>
1405 <row>
1406 <col id="0">application/zip</col>
1407 <col id="1" translatable="yes">Zip archive</col>
1408 <col id="2">zip</col>
1409 <col id="3" translatable="yes">lossless</col>
1410 <col id="4" translatable="yes">free</col>
1411 </row>
1412 </data>
1413 </object>
1414 <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
1415 <columns>
1416 <!-- column-name Name -->
1417 <column type="gchararray"/>
1418 <!-- column-name Key -->
1419 <column type="gpointer"/>
1420 <!-- column-name Root -->
1421 <column type="gchararray"/>
1422 <!-- column-name Tooltip -->
1423 <column type="gchararray"/>
1424 </columns>
1425 </object>
1426 <object class="GtkMenu" id="metadata_popup_menu">
1427 <property name="visible">True</property>
1428 <property name="can_focus">False</property>
1429 <child>
1430 <object class="GtkMenuItem" id="Copy selection">
1431 <property name="visible">True</property>
1432 <property name="can_focus">False</property>
1433 <property name="label" translatable="yes">Copy selection</property>
1434 <property name="use_underline">True</property>
1435 <signal name="activate" handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
1436 </object>
1437 </child>
1438 </object>
1439 <object class="GtkListStore" id="namespace_label_liststore">
1440 <columns>
1441 <!-- column-name Name -->
1442 <column type="gchararray"/>
1443 </columns>
1444 <data>
1445 <row>
1446 <col id="0" translatable="yes">&lt;none&gt;</col>
1447 </row>
1448 </data>
1449 </object>
1450 <object class="GtkImage" id="new_stock_image">
1451 <property name="visible">True</property>
1452 <property name="can_focus">False</property>
1453 <property name="stock">gtk-new</property>
1454 </object>
1455 <object class="GtkImage" id="open_stock_image">
1456 <property name="visible">True</property>
1457 <property name="can_focus">False</property>
1458 <property name="stock">gtk-open</property>
1459 </object>
1460 <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group"> 1475 <object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
1461 <property name="mode">vertical</property> 1476 <property name="mode">vertical</property>
1462 <property name="ignore_hidden">True</property> 1477 <property name="ignore_hidden">True</property>
@@ -1471,20 +1486,11 @@ This operation will be executed using the anonymity level specified on the right
1471 <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/> 1486 <widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
1472 </widgets> 1487 </widgets>
1473 </object> 1488 </object>
1474 <object class="GtkAdjustment" id="priority_adjustment"> 1489 <object class="GtkSizeGroup" id="GNUNET_GTK_download_frame_labels_size_group">
1475 <property name="upper">10000000</property> 1490 <widgets>
1476 <property name="value">1000</property> 1491 <widget name="GNUNET_GTK_search_frame_download_location_label"/>
1477 <property name="step_increment">1</property> 1492 <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
1478 <property name="page_increment">10</property> 1493 <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
1479 </object> 1494 </widgets>
1480 <object class="GtkAdjustment" id="replication_adjustment">
1481 <property name="upper">999999</property>
1482 <property name="step_increment">1</property>
1483 <property name="page_increment">10</property>
1484 </object>
1485 <object class="GtkImage" id="up_stock_image">
1486 <property name="visible">True</property>
1487 <property name="can_focus">False</property>
1488 <property name="stock">gtk-go-up</property>
1489 </object> 1495 </object>
1490</interface> 1496</interface>
diff --git a/contrib/gnunet_fs_gtk_open_directory_dialog.glade b/contrib/gnunet_fs_gtk_open_directory_dialog.glade
index 1217ebea..741c79b5 100644
--- a/contrib/gnunet_fs_gtk_open_directory_dialog.glade
+++ b/contrib/gnunet_fs_gtk_open_directory_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkFileFilter" id="gnunet_directory_filter"/> 5 <object class="GtkFileFilter" id="gnunet_directory_filter"/>
6 <object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog"> 6 <object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog">
7 <property name="can_focus">False</property> 7 <property name="can_focus">False</property>
@@ -13,12 +13,13 @@
13 <property name="filter">gnunet_directory_filter</property> 13 <property name="filter">gnunet_directory_filter</property>
14 <signal name="response" handler="GNUNET_GTK_open_directory_dialog_response_cb" swapped="no"/> 14 <signal name="response" handler="GNUNET_GTK_open_directory_dialog_response_cb" swapped="no"/>
15 <child internal-child="vbox"> 15 <child internal-child="vbox">
16 <object class="GtkVBox" id="dialog-vbox3"> 16 <object class="GtkBox" id="dialog-vbox3">
17 <property name="visible">True</property> 17 <property name="visible">True</property>
18 <property name="can_focus">False</property> 18 <property name="can_focus">False</property>
19 <property name="orientation">vertical</property>
19 <property name="spacing">2</property> 20 <property name="spacing">2</property>
20 <child internal-child="action_area"> 21 <child internal-child="action_area">
21 <object class="GtkHButtonBox" id="dialog-action_area4"> 22 <object class="GtkButtonBox" id="dialog-action_area4">
22 <property name="visible">True</property> 23 <property name="visible">True</property>
23 <property name="can_focus">False</property> 24 <property name="can_focus">False</property>
24 <property name="layout_style">end</property> 25 <property name="layout_style">end</property>
diff --git a/contrib/gnunet_fs_gtk_open_url_dialog.glade b/contrib/gnunet_fs_gtk_open_url_dialog.glade
index 1fbcf5bb..d80f30b4 100644
--- a/contrib/gnunet_fs_gtk_open_url_dialog.glade
+++ b/contrib/gnunet_fs_gtk_open_url_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy toplevel-contextual -->
5 <object class="GtkTextBuffer" id="GNUNET_GTK_open_url_dialog_url_textview_buffer"> 5 <object class="GtkTextBuffer" id="GNUNET_GTK_open_url_dialog_url_textview_buffer">
6 <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb" swapped="no"/> 6 <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb" swapped="no"/>
7 </object> 7 </object>
diff --git a/contrib/gnunet_fs_gtk_progress_dialog.glade b/contrib/gnunet_fs_gtk_progress_dialog.glade
index 9433c942..120ecca4 100644
--- a/contrib/gnunet_fs_gtk_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_progress_dialog.glade
@@ -1,13 +1,24 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
6 <property name="upper">100</property> 6 <property name="upper">100</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property> 8 <property name="page_increment">10</property>
9 <property name="page_size">10</property> 9 <property name="page_size">10</property>
10 </object> 10 </object>
11 <object class="GtkTextBuffer" id="GNUNET_FS_GTK_progress_dialog_textbuffer"/>
12 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment">
13 <property name="upper">100</property>
14 <property name="step_increment">1</property>
15 <property name="page_increment">10</property>
16 </object>
17 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment">
18 <property name="upper">100</property>
19 <property name="step_increment">1</property>
20 <property name="page_increment">10</property>
21 </object>
11 <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog"> 22 <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
12 <property name="can_focus">False</property> 23 <property name="can_focus">False</property>
13 <property name="border_width">2</property> 24 <property name="border_width">2</property>
@@ -38,8 +49,6 @@
38 <property name="can_focus">True</property> 49 <property name="can_focus">True</property>
39 <property name="hadjustment">GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment</property> 50 <property name="hadjustment">GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment</property>
40 <property name="vadjustment">GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment</property> 51 <property name="vadjustment">GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment</property>
41 <property name="hscrollbar_policy">automatic</property>
42 <property name="vscrollbar_policy">automatic</property>
43 <child> 52 <child>
44 <object class="GtkTextView" id="GNUNET_FS_GTK_progress_dialog_textview"> 53 <object class="GtkTextView" id="GNUNET_FS_GTK_progress_dialog_textview">
45 <property name="visible">True</property> 54 <property name="visible">True</property>
@@ -74,12 +83,9 @@
74 <object class="GtkProgressBar" id="GNUNET_FS_GTK_progress_dialog_progressbar"> 83 <object class="GtkProgressBar" id="GNUNET_FS_GTK_progress_dialog_progressbar">
75 <property name="visible">True</property> 84 <property name="visible">True</property>
76 <property name="can_focus">False</property> 85 <property name="can_focus">False</property>
77 <property name="activity_mode">True</property>
78 <property name="show_text">True</property>
79 <property name="pulse_step">0.050000000000000003</property> 86 <property name="pulse_step">0.050000000000000003</property>
80 <property name="text" translatable="yes">Preprocessing...</property> 87 <property name="text" translatable="yes">Preprocessing...</property>
81 <property name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property> 88 <property name="show_text">True</property>
82 <property name="discrete_blocks">5</property>
83 </object> 89 </object>
84 <packing> 90 <packing>
85 <property name="expand">False</property> 91 <property name="expand">False</property>
@@ -122,15 +128,4 @@
122 </object> 128 </object>
123 </child> 129 </child>
124 </object> 130 </object>
125 <object class="GtkTextBuffer" id="GNUNET_FS_GTK_progress_dialog_textbuffer"/>
126 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment">
127 <property name="upper">100</property>
128 <property name="step_increment">1</property>
129 <property name="page_increment">10</property>
130 </object>
131 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment">
132 <property name="upper">100</property>
133 <property name="step_increment">1</property>
134 <property name="page_increment">10</property>
135 </object>
136</interface> 131</interface>
diff --git a/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade b/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
index 005a3ff6..21938619 100644
--- a/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_FS_GTK_pseu_progress_bar_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_FS_GTK_pseu_progress_bar_adjustment">
6 <property name="upper">100</property> 6 <property name="upper">100</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -26,12 +26,9 @@
26 <object class="GtkProgressBar" id="GNUNET_FS_GTK_pseu_progress_dialog_progressbar"> 26 <object class="GtkProgressBar" id="GNUNET_FS_GTK_pseu_progress_dialog_progressbar">
27 <property name="visible">True</property> 27 <property name="visible">True</property>
28 <property name="can_focus">False</property> 28 <property name="can_focus">False</property>
29 <property name="activity_mode">True</property>
30 <property name="show_text">True</property>
31 <property name="pulse_step">0.050000000000000003</property> 29 <property name="pulse_step">0.050000000000000003</property>
32 <property name="text" translatable="yes">Trying to discover nickname...</property> 30 <property name="text" translatable="yes">Trying to discover nickname...</property>
33 <property name="adjustment">GNUNET_FS_GTK_pseu_progress_bar_adjustment</property> 31 <property name="show_text">True</property>
34 <property name="discrete_blocks">5</property>
35 </object> 32 </object>
36 <packing> 33 <packing>
37 <property name="expand">False</property> 34 <property name="expand">False</property>
diff --git a/contrib/gnunet_fs_gtk_publish_dialog.glade b/contrib/gnunet_fs_gtk_publish_dialog.glade
index 5cd85a12..cecc80e7 100644
--- a/contrib/gnunet_fs_gtk_publish_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_publishing_tree_store"> 5 <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_publishing_tree_store">
6 <columns> 6 <columns>
7 <!-- column-name filesize --> 7 <!-- column-name filesize -->
@@ -22,6 +22,43 @@
22 <column type="guint"/> 22 <column type="guint"/>
23 </columns> 23 </columns>
24 </object> 24 </object>
25 <object class="GtkListStore" id="GNUNET_GTK_master_publish_dialog_ego_liststore">
26 <columns>
27 <!-- column-name name -->
28 <column type="gchararray"/>
29 <!-- column-name ego -->
30 <column type="gpointer"/>
31 </columns>
32 </object>
33 <object class="GtkTreeStore" id="GNUNET_GTK_update_identifiers_treestore">
34 <columns>
35 <!-- column-name Identifier -->
36 <column type="gchararray"/>
37 <!-- column-name UpdateIdentifier -->
38 <column type="gchararray"/>
39 <!-- column-name Description -->
40 <column type="gchararray"/>
41 <!-- column-name PathToOriginal -->
42 <column type="gchararray"/>
43 <!-- column-name IdentifierMarkedUp -->
44 <column type="gchararray"/>
45 </columns>
46 </object>
47 <object class="GtkImage" id="left_stock_image">
48 <property name="visible">True</property>
49 <property name="can_focus">False</property>
50 <property name="stock">gtk-go-back</property>
51 </object>
52 <object class="GtkImage" id="new_stock_image">
53 <property name="visible">True</property>
54 <property name="can_focus">False</property>
55 <property name="stock">gtk-new</property>
56 </object>
57 <object class="GtkImage" id="right_stock_image">
58 <property name="visible">True</property>
59 <property name="can_focus">False</property>
60 <property name="stock">gtk-go-forward</property>
61 </object>
25 <object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog"> 62 <object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog">
26 <property name="height_request">500</property> 63 <property name="height_request">500</property>
27 <property name="can_focus">False</property> 64 <property name="can_focus">False</property>
@@ -55,8 +92,6 @@
55 <object class="GtkScrolledWindow" id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window"> 92 <object class="GtkScrolledWindow" id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
56 <property name="visible">True</property> 93 <property name="visible">True</property>
57 <property name="can_focus">True</property> 94 <property name="can_focus">True</property>
58 <property name="hscrollbar_policy">automatic</property>
59 <property name="vscrollbar_policy">automatic</property>
60 <child> 95 <child>
61 <object class="GtkTreeView" id="GNUNET_GTK_master_publish_dialog_file_information_tree_view"> 96 <object class="GtkTreeView" id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
62 <property name="visible">True</property> 97 <property name="visible">True</property>
@@ -66,6 +101,9 @@
66 <property name="expander_column">GNUNET_GTK_master_publish_dialog_file_information_filename_column</property> 101 <property name="expander_column">GNUNET_GTK_master_publish_dialog_file_information_filename_column</property>
67 <property name="search_column">0</property> 102 <property name="search_column">0</property>
68 <property name="enable_tree_lines">True</property> 103 <property name="enable_tree_lines">True</property>
104 <child internal-child="selection">
105 <object class="GtkTreeSelection" id="treeview-selection1"/>
106 </child>
69 <child> 107 <child>
70 <object class="GtkTreeViewColumn" id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column"> 108 <object class="GtkTreeViewColumn" id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
71 <property name="sizing">autosize</property> 109 <property name="sizing">autosize</property>
@@ -370,6 +408,12 @@
370 <child> 408 <child>
371 <placeholder/> 409 <placeholder/>
372 </child> 410 </child>
411 <child>
412 <placeholder/>
413 </child>
414 <child>
415 <placeholder/>
416 </child>
373 </object> 417 </object>
374 <packing> 418 <packing>
375 <property name="expand">False</property> 419 <property name="expand">False</property>
@@ -420,6 +464,7 @@
420 <property name="receives_default">False</property> 464 <property name="receives_default">False</property>
421 <property name="tooltip_text" translatable="yes">Make unsigned publication that will be searchable in global (anonymous) namespace. 465 <property name="tooltip_text" translatable="yes">Make unsigned publication that will be searchable in global (anonymous) namespace.
422Disabling this is equivalent to pressing the "Remove all Keywords" button before starting the publication.</property> 466Disabling this is equivalent to pressing the "Remove all Keywords" button before starting the publication.</property>
467 <property name="xalign">0.5</property>
423 <property name="draw_indicator">True</property> 468 <property name="draw_indicator">True</property>
424 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_global_checkbox_toggled_cb" swapped="no"/> 469 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_global_checkbox_toggled_cb" swapped="no"/>
425 </object> 470 </object>
@@ -460,6 +505,7 @@ Once other users discover your namespace, they will be able to get files from yo
460 505
461Publishing in both global and private namespaces will not double storage requirements for published files. 506Publishing in both global and private namespaces will not double storage requirements for published files.
462</property> 507</property>
508 <property name="xalign">0.5</property>
463 <property name="draw_indicator">True</property> 509 <property name="draw_indicator">True</property>
464 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_own_checkbox_toggled_cb" swapped="no"/> 510 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_own_checkbox_toggled_cb" swapped="no"/>
465 </object> 511 </object>
@@ -528,8 +574,6 @@ Type in an identifier, or select one of the update identifiers (from previous up
528 <property name="invisible_char">●</property> 574 <property name="invisible_char">●</property>
529 <property name="primary_icon_activatable">False</property> 575 <property name="primary_icon_activatable">False</property>
530 <property name="secondary_icon_activatable">False</property> 576 <property name="secondary_icon_activatable">False</property>
531 <property name="primary_icon_sensitive">True</property>
532 <property name="secondary_icon_sensitive">True</property>
533 <signal name="changed" handler="GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb" swapped="no"/> 577 <signal name="changed" handler="GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb" swapped="no"/>
534 </object> 578 </object>
535 <packing> 579 <packing>
@@ -570,8 +614,6 @@ Type in an identifier, or select one of the update identifiers (from previous up
570 <child> 614 <child>
571 <object class="GtkScrolledWindow" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_scrolled"> 615 <object class="GtkScrolledWindow" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_scrolled">
572 <property name="can_focus">True</property> 616 <property name="can_focus">True</property>
573 <property name="hscrollbar_policy">automatic</property>
574 <property name="vscrollbar_policy">automatic</property>
575 <property name="shadow_type">in</property> 617 <property name="shadow_type">in</property>
576 <child> 618 <child>
577 <object class="GtkTreeView" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview"> 619 <object class="GtkTreeView" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview">
@@ -582,6 +624,9 @@ Type in an identifier, or select one of the update identifiers (from previous up
582 <property name="expander_column">GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column</property> 624 <property name="expander_column">GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column</property>
583 <property name="enable_search">False</property> 625 <property name="enable_search">False</property>
584 <property name="enable_tree_lines">True</property> 626 <property name="enable_tree_lines">True</property>
627 <child internal-child="selection">
628 <object class="GtkTreeSelection" id="treeview-selection2"/>
629 </child>
585 <child> 630 <child>
586 <object class="GtkTreeViewColumn" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column"> 631 <object class="GtkTreeViewColumn" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column">
587 <property name="sizing">autosize</property> 632 <property name="sizing">autosize</property>
@@ -642,6 +687,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
642 <property name="tooltip_text" translatable="yes">With the update mechanism, you can publish updates to a file that will be automatically located when a users searches for the original identifier. 687 <property name="tooltip_text" translatable="yes">With the update mechanism, you can publish updates to a file that will be automatically located when a users searches for the original identifier.
643 688
644To enable updates, you must check this box and specify an update identifier.</property> 689To enable updates, you must check this box and specify an update identifier.</property>
690 <property name="xalign">0.5</property>
645 <property name="draw_indicator">True</property> 691 <property name="draw_indicator">True</property>
646 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_updateable_checkbox_toggled_cb" swapped="no"/> 692 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_updateable_checkbox_toggled_cb" swapped="no"/>
647 </object> 693 </object>
@@ -687,11 +733,8 @@ To enable updates, you must check this box and specify an update identifier.</pr
687GNUnet clients will use it to try to find updated version of this publication automatically. 733GNUnet clients will use it to try to find updated version of this publication automatically.
688Leaving this field blank makes publication unupdateable.</property> 734Leaving this field blank makes publication unupdateable.</property>
689 <property name="invisible_char">●</property> 735 <property name="invisible_char">●</property>
690 <property name="invisible_char_set">True</property>
691 <property name="primary_icon_activatable">False</property> 736 <property name="primary_icon_activatable">False</property>
692 <property name="secondary_icon_activatable">False</property> 737 <property name="secondary_icon_activatable">False</property>
693 <property name="primary_icon_sensitive">True</property>
694 <property name="secondary_icon_sensitive">True</property>
695 </object> 738 </object>
696 <packing> 739 <packing>
697 <property name="expand">True</property> 740 <property name="expand">True</property>
@@ -800,43 +843,6 @@ Note that meta data is unaffected when using this function.</property>
800 </object> 843 </object>
801 </child> 844 </child>
802 </object> 845 </object>
803 <object class="GtkListStore" id="GNUNET_GTK_master_publish_dialog_ego_liststore">
804 <columns>
805 <!-- column-name name -->
806 <column type="gchararray"/>
807 <!-- column-name ego -->
808 <column type="gpointer"/>
809 </columns>
810 </object>
811 <object class="GtkTreeStore" id="GNUNET_GTK_update_identifiers_treestore">
812 <columns>
813 <!-- column-name Identifier -->
814 <column type="gchararray"/>
815 <!-- column-name UpdateIdentifier -->
816 <column type="gchararray"/>
817 <!-- column-name Description -->
818 <column type="gchararray"/>
819 <!-- column-name PathToOriginal -->
820 <column type="gchararray"/>
821 <!-- column-name IdentifierMarkedUp -->
822 <column type="gchararray"/>
823 </columns>
824 </object>
825 <object class="GtkImage" id="left_stock_image">
826 <property name="visible">True</property>
827 <property name="can_focus">False</property>
828 <property name="stock">gtk-go-back</property>
829 </object>
830 <object class="GtkImage" id="new_stock_image">
831 <property name="visible">True</property>
832 <property name="can_focus">False</property>
833 <property name="stock">gtk-new</property>
834 </object>
835 <object class="GtkImage" id="right_stock_image">
836 <property name="visible">True</property>
837 <property name="can_focus">False</property>
838 <property name="stock">gtk-go-forward</property>
839 </object>
840 <object class="GtkSizeGroup" id="GNUNET_GTK_master_publish_dialog_labels_sizegroup"> 846 <object class="GtkSizeGroup" id="GNUNET_GTK_master_publish_dialog_labels_sizegroup">
841 <widgets> 847 <widgets>
842 <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/> 848 <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/>
diff --git a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
index c07612b1..eb496b31 100644
--- a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
@@ -1,12 +1,13 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="expiration_year_adjustment"> 5 <object class="GtkAdjustment" id="expiration_year_adjustment">
6 <property name="upper">9999</property> 6 <property name="upper">9999</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property> 8 <property name="page_increment">10</property>
9 </object> 9 </object>
10 <object class="GtkFileFilter" id="gnunet_directory_filter"/>
10 <object class="GtkAdjustment" id="priority_adjustment"> 11 <object class="GtkAdjustment" id="priority_adjustment">
11 <property name="upper">10000000</property> 12 <property name="upper">10000000</property>
12 <property name="step_increment">1</property> 13 <property name="step_increment">1</property>
@@ -17,8 +18,8 @@
17 <property name="step_increment">1</property> 18 <property name="step_increment">1</property>
18 <property name="page_increment">10</property> 19 <property name="page_increment">10</property>
19 </object> 20 </object>
20 <object class="GtkFileFilter" id="gnunet_directory_filter"/>
21 <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_directory_dialog"> 21 <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_directory_dialog">
22 <property name="can_focus">False</property>
22 <property name="can_default">True</property> 23 <property name="can_default">True</property>
23 <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> 24 <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
24 <property name="border_width">5</property> 25 <property name="border_width">5</property>
@@ -34,87 +35,129 @@
34 <property name="create_folders">False</property> 35 <property name="create_folders">False</property>
35 <property name="filter">gnunet_directory_filter</property> 36 <property name="filter">gnunet_directory_filter</property>
36 <property name="select_multiple">True</property> 37 <property name="select_multiple">True</property>
37 <signal name="response" handler="GNUNET_GTK_publish_directory_dialog_response_cb"/> 38 <signal name="response" handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/>
38 <child internal-child="vbox"> 39 <child internal-child="vbox">
39 <object class="GtkVBox" id="dialog-vbox8"> 40 <object class="GtkBox" id="GNUNET_GTK_publish_dialog_vbox">
40 <property name="visible">True</property> 41 <property name="visible">True</property>
42 <property name="can_focus">False</property>
41 <property name="orientation">vertical</property> 43 <property name="orientation">vertical</property>
42 <property name="spacing">2</property> 44 <property name="spacing">2</property>
45 <child internal-child="action_area">
46 <object class="GtkButtonBox" id="dialog-action_area9">
47 <property name="visible">True</property>
48 <property name="can_focus">False</property>
49 <property name="layout_style">end</property>
50 <child>
51 <object class="GtkButton" id="GNUNET_GTK_publish_dialog_cancel_button">
52 <property name="label">gtk-cancel</property>
53 <property name="visible">True</property>
54 <property name="can_focus">True</property>
55 <property name="receives_default">True</property>
56 <property name="use_stock">True</property>
57 </object>
58 <packing>
59 <property name="expand">False</property>
60 <property name="fill">False</property>
61 <property name="position">0</property>
62 </packing>
63 </child>
64 <child>
65 <object class="GtkButton" id="GNUNET_GTK_publish_directory_dialog_ok_button">
66 <property name="label">gtk-ok</property>
67 <property name="visible">True</property>
68 <property name="can_focus">True</property>
69 <property name="can_default">True</property>
70 <property name="receives_default">True</property>
71 <property name="use_stock">True</property>
72 </object>
73 <packing>
74 <property name="expand">False</property>
75 <property name="fill">False</property>
76 <property name="position">1</property>
77 </packing>
78 </child>
79 </object>
80 <packing>
81 <property name="expand">False</property>
82 <property name="fill">True</property>
83 <property name="pack_type">end</property>
84 <property name="position">0</property>
85 </packing>
86 </child>
43 <child> 87 <child>
44 <object class="GtkTable" id="table1"> 88 <object class="GtkTable" id="GNUNET_GTK_publish_dialog_action_table">
45 <property name="visible">True</property> 89 <property name="visible">True</property>
90 <property name="can_focus">False</property>
46 <property name="n_rows">2</property> 91 <property name="n_rows">2</property>
47 <property name="n_columns">4</property> 92 <property name="n_columns">4</property>
48 <child> 93 <child>
49 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label"> 94 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label">
50 <property name="visible">True</property> 95 <property name="visible">True</property>
96 <property name="can_focus">False</property>
51 <property name="label" translatable="yes">Priority:</property> 97 <property name="label" translatable="yes">Priority:</property>
52 </object> 98 </object>
53 <packing> 99 <packing>
54 <property name="left_attach">2</property> 100 <property name="left_attach">2</property>
55 <property name="right_attach">3</property> 101 <property name="right_attach">3</property>
56 <property name="x_options"></property> 102 <property name="x_options"/>
57 <property name="y_options"></property> 103 <property name="y_options"/>
58 </packing> 104 </packing>
59 </child> 105 </child>
60 <child> 106 <child>
61 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button"> 107 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
62 <property name="visible">True</property> 108 <property name="visible">True</property>
63 <property name="can_focus">True</property> 109 <property name="can_focus">True</property>
64 <property name="invisible_char">&#x2022;</property> 110 <property name="invisible_char">•</property>
65 <property name="invisible_char_set">True</property>
66 <property name="primary_icon_sensitive">True</property>
67 <property name="secondary_icon_sensitive">True</property>
68 <property name="adjustment">priority_adjustment</property> 111 <property name="adjustment">priority_adjustment</property>
69 <property name="numeric">True</property> 112 <property name="numeric">True</property>
70 </object> 113 </object>
71 <packing> 114 <packing>
72 <property name="left_attach">3</property> 115 <property name="left_attach">3</property>
73 <property name="right_attach">4</property> 116 <property name="right_attach">4</property>
74 <property name="y_options"></property> 117 <property name="y_options"/>
75 </packing> 118 </packing>
76 </child> 119 </child>
77 <child> 120 <child>
78 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label"> 121 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label">
79 <property name="visible">True</property> 122 <property name="visible">True</property>
123 <property name="can_focus">False</property>
80 <property name="label" translatable="yes">Expiration year:</property> 124 <property name="label" translatable="yes">Expiration year:</property>
81 </object> 125 </object>
82 <packing> 126 <packing>
83 <property name="x_options"></property> 127 <property name="x_options"/>
84 <property name="y_options"></property> 128 <property name="y_options"/>
85 </packing> 129 </packing>
86 </child> 130 </child>
87 <child> 131 <child>
88 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"> 132 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
89 <property name="visible">True</property> 133 <property name="visible">True</property>
90 <property name="can_focus">True</property> 134 <property name="can_focus">True</property>
91 <property name="invisible_char">&#x2022;</property> 135 <property name="invisible_char">•</property>
92 <property name="invisible_char_set">True</property>
93 <property name="primary_icon_sensitive">True</property>
94 <property name="secondary_icon_sensitive">True</property>
95 <property name="adjustment">expiration_year_adjustment</property> 136 <property name="adjustment">expiration_year_adjustment</property>
96 </object> 137 </object>
97 <packing> 138 <packing>
98 <property name="left_attach">1</property> 139 <property name="left_attach">1</property>
99 <property name="right_attach">2</property> 140 <property name="right_attach">2</property>
100 <property name="y_options"></property> 141 <property name="y_options"/>
101 </packing> 142 </packing>
102 </child> 143 </child>
103 <child> 144 <child>
104 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_anonymity_label"> 145 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
105 <property name="visible">True</property> 146 <property name="visible">True</property>
147 <property name="can_focus">False</property>
106 <property name="label" translatable="yes">Anonymity:</property> 148 <property name="label" translatable="yes">Anonymity:</property>
107 </object> 149 </object>
108 <packing> 150 <packing>
109 <property name="top_attach">1</property> 151 <property name="top_attach">1</property>
110 <property name="bottom_attach">2</property> 152 <property name="bottom_attach">2</property>
111 <property name="x_options"></property> 153 <property name="x_options"/>
112 <property name="y_options"></property> 154 <property name="y_options"/>
113 </packing> 155 </packing>
114 </child> 156 </child>
115 <child> 157 <child>
116 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_replication_label"> 158 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_replication_label">
117 <property name="visible">True</property> 159 <property name="visible">True</property>
160 <property name="can_focus">False</property>
118 <property name="label" translatable="yes">_Replication:</property> 161 <property name="label" translatable="yes">_Replication:</property>
119 <property name="use_underline">True</property> 162 <property name="use_underline">True</property>
120 </object> 163 </object>
@@ -123,18 +166,15 @@
123 <property name="right_attach">3</property> 166 <property name="right_attach">3</property>
124 <property name="top_attach">1</property> 167 <property name="top_attach">1</property>
125 <property name="bottom_attach">2</property> 168 <property name="bottom_attach">2</property>
126 <property name="x_options"></property> 169 <property name="x_options"/>
127 <property name="y_options"></property> 170 <property name="y_options"/>
128 </packing> 171 </packing>
129 </child> 172 </child>
130 <child> 173 <child>
131 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_replication_spin_button"> 174 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
132 <property name="visible">True</property> 175 <property name="visible">True</property>
133 <property name="can_focus">True</property> 176 <property name="can_focus">True</property>
134 <property name="invisible_char">&#x25CF;</property> 177 <property name="invisible_char">●</property>
135 <property name="invisible_char_set">True</property>
136 <property name="primary_icon_sensitive">True</property>
137 <property name="secondary_icon_sensitive">True</property>
138 <property name="adjustment">replication_adjustment</property> 178 <property name="adjustment">replication_adjustment</property>
139 <property name="numeric">True</property> 179 <property name="numeric">True</property>
140 </object> 180 </object>
@@ -143,16 +183,18 @@
143 <property name="right_attach">4</property> 183 <property name="right_attach">4</property>
144 <property name="top_attach">1</property> 184 <property name="top_attach">1</property>
145 <property name="bottom_attach">2</property> 185 <property name="bottom_attach">2</property>
146 <property name="y_options"></property> 186 <property name="y_options"/>
147 </packing> 187 </packing>
148 </child> 188 </child>
149 <child> 189 <child>
150 <object class="GtkAlignment" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment"> 190 <object class="GtkAlignment" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
151 <property name="visible">True</property> 191 <property name="visible">True</property>
192 <property name="can_focus">False</property>
152 <property name="yscale">0</property> 193 <property name="yscale">0</property>
153 <child> 194 <child>
154 <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox"> 195 <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
155 <property name="visible">True</property> 196 <property name="visible">True</property>
197 <property name="can_focus">False</property>
156 <property name="active">1</property> 198 <property name="active">1</property>
157 <child> 199 <child>
158 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/> 200 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
@@ -175,7 +217,7 @@
175 <property name="right_attach">2</property> 217 <property name="right_attach">2</property>
176 <property name="top_attach">1</property> 218 <property name="top_attach">1</property>
177 <property name="bottom_attach">2</property> 219 <property name="bottom_attach">2</property>
178 <property name="y_options"></property> 220 <property name="y_options"/>
179 </packing> 221 </packing>
180 </child> 222 </child>
181 </object> 223 </object>
@@ -186,8 +228,9 @@
186 </packing> 228 </packing>
187 </child> 229 </child>
188 <child> 230 <child>
189 <object class="GtkHBox" id="hbox1"> 231 <object class="GtkHBox" id="GNUNET_GTK_publish_dialog_index_hbox">
190 <property name="visible">True</property> 232 <property name="visible">True</property>
233 <property name="can_focus">False</property>
191 <child> 234 <child>
192 <placeholder/> 235 <placeholder/>
193 </child> 236 </child>
@@ -198,11 +241,13 @@
198 <property name="can_focus">True</property> 241 <property name="can_focus">True</property>
199 <property name="receives_default">False</property> 242 <property name="receives_default">False</property>
200 <property name="use_underline">True</property> 243 <property name="use_underline">True</property>
244 <property name="xalign">0.5</property>
201 <property name="active">True</property> 245 <property name="active">True</property>
202 <property name="draw_indicator">True</property> 246 <property name="draw_indicator">True</property>
203 </object> 247 </object>
204 <packing> 248 <packing>
205 <property name="expand">False</property> 249 <property name="expand">False</property>
250 <property name="fill">True</property>
206 <property name="position">1</property> 251 <property name="position">1</property>
207 </packing> 252 </packing>
208 </child> 253 </child>
@@ -213,46 +258,6 @@
213 <property name="position">3</property> 258 <property name="position">3</property>
214 </packing> 259 </packing>
215 </child> 260 </child>
216 <child internal-child="action_area">
217 <object class="GtkHButtonBox" id="dialog-action_area9">
218 <property name="visible">True</property>
219 <property name="layout_style">end</property>
220 <child>
221 <object class="GtkButton" id="GNUNET_GTK_publish_dialog_cancel_button">
222 <property name="label">gtk-cancel</property>
223 <property name="visible">True</property>
224 <property name="can_focus">True</property>
225 <property name="receives_default">True</property>
226 <property name="use_stock">True</property>
227 </object>
228 <packing>
229 <property name="expand">False</property>
230 <property name="fill">False</property>
231 <property name="position">0</property>
232 </packing>
233 </child>
234 <child>
235 <object class="GtkButton" id="GNUNET_GTK_publish_directory_dialog_ok_button">
236 <property name="label">gtk-ok</property>
237 <property name="visible">True</property>
238 <property name="can_focus">True</property>
239 <property name="can_default">True</property>
240 <property name="receives_default">True</property>
241 <property name="use_stock">True</property>
242 </object>
243 <packing>
244 <property name="expand">False</property>
245 <property name="fill">False</property>
246 <property name="position">1</property>
247 </packing>
248 </child>
249 </object>
250 <packing>
251 <property name="expand">False</property>
252 <property name="pack_type">end</property>
253 <property name="position">0</property>
254 </packing>
255 </child>
256 </object> 261 </object>
257 </child> 262 </child>
258 <action-widgets> 263 <action-widgets>
diff --git a/contrib/gnunet_fs_gtk_publish_file_dialog.glade b/contrib/gnunet_fs_gtk_publish_file_dialog.glade
index 2208076b..a295d0c3 100644
--- a/contrib/gnunet_fs_gtk_publish_file_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_file_dialog.glade
@@ -1,7 +1,23 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide --> 5 <object class="GtkAdjustment" id="expiration_year_adjustment">
6 <property name="upper">9999</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property>
9 </object>
10 <object class="GtkAdjustment" id="priority_adjustment">
11 <property name="upper">100000000</property>
12 <property name="value">1000</property>
13 <property name="step_increment">1</property>
14 <property name="page_increment">10</property>
15 </object>
16 <object class="GtkAdjustment" id="replication_adjustment">
17 <property name="upper">99999</property>
18 <property name="step_increment">1</property>
19 <property name="page_increment">10</property>
20 </object>
5 <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog"> 21 <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
6 <property name="can_focus">False</property> 22 <property name="can_focus">False</property>
7 <property name="can_default">True</property> 23 <property name="can_default">True</property>
@@ -14,12 +30,13 @@
14 <property name="select_multiple">True</property> 30 <property name="select_multiple">True</property>
15 <signal name="response" handler="GNUNET_GTK_publish_file_dialog_response_cb" swapped="no"/> 31 <signal name="response" handler="GNUNET_GTK_publish_file_dialog_response_cb" swapped="no"/>
16 <child internal-child="vbox"> 32 <child internal-child="vbox">
17 <object class="GtkVBox" id="dialog-vbox1"> 33 <object class="GtkBox" id="dialog-vbox1">
18 <property name="visible">True</property> 34 <property name="visible">True</property>
19 <property name="can_focus">False</property> 35 <property name="can_focus">False</property>
36 <property name="orientation">vertical</property>
20 <property name="spacing">2</property> 37 <property name="spacing">2</property>
21 <child internal-child="action_area"> 38 <child internal-child="action_area">
22 <object class="GtkHButtonBox" id="dialog-action_area2"> 39 <object class="GtkButtonBox" id="dialog-action_area2">
23 <property name="visible">True</property> 40 <property name="visible">True</property>
24 <property name="can_focus">False</property> 41 <property name="can_focus">False</property>
25 <property name="layout_style">end</property> 42 <property name="layout_style">end</property>
@@ -74,6 +91,7 @@
74 <property name="can_focus">True</property> 91 <property name="can_focus">True</property>
75 <property name="receives_default">False</property> 92 <property name="receives_default">False</property>
76 <property name="use_underline">True</property> 93 <property name="use_underline">True</property>
94 <property name="xalign">0.5</property>
77 <property name="active">True</property> 95 <property name="active">True</property>
78 <property name="draw_indicator">True</property> 96 <property name="draw_indicator">True</property>
79 </object> 97 </object>
@@ -170,11 +188,8 @@
170 <property name="visible">True</property> 188 <property name="visible">True</property>
171 <property name="can_focus">True</property> 189 <property name="can_focus">True</property>
172 <property name="invisible_char">•</property> 190 <property name="invisible_char">•</property>
173 <property name="invisible_char_set">True</property>
174 <property name="primary_icon_activatable">False</property> 191 <property name="primary_icon_activatable">False</property>
175 <property name="secondary_icon_activatable">False</property> 192 <property name="secondary_icon_activatable">False</property>
176 <property name="primary_icon_sensitive">True</property>
177 <property name="secondary_icon_sensitive">True</property>
178 <property name="adjustment">priority_adjustment</property> 193 <property name="adjustment">priority_adjustment</property>
179 <property name="numeric">True</property> 194 <property name="numeric">True</property>
180 </object> 195 </object>
@@ -199,11 +214,8 @@
199 <property name="visible">True</property> 214 <property name="visible">True</property>
200 <property name="can_focus">True</property> 215 <property name="can_focus">True</property>
201 <property name="invisible_char">•</property> 216 <property name="invisible_char">•</property>
202 <property name="invisible_char_set">True</property>
203 <property name="primary_icon_activatable">False</property> 217 <property name="primary_icon_activatable">False</property>
204 <property name="secondary_icon_activatable">False</property> 218 <property name="secondary_icon_activatable">False</property>
205 <property name="primary_icon_sensitive">True</property>
206 <property name="secondary_icon_sensitive">True</property>
207 <property name="adjustment">expiration_year_adjustment</property> 219 <property name="adjustment">expiration_year_adjustment</property>
208 <property name="numeric">True</property> 220 <property name="numeric">True</property>
209 </object> 221 </object>
@@ -231,11 +243,8 @@
231 <property name="visible">True</property> 243 <property name="visible">True</property>
232 <property name="can_focus">True</property> 244 <property name="can_focus">True</property>
233 <property name="invisible_char">●</property> 245 <property name="invisible_char">●</property>
234 <property name="invisible_char_set">True</property>
235 <property name="primary_icon_activatable">False</property> 246 <property name="primary_icon_activatable">False</property>
236 <property name="secondary_icon_activatable">False</property> 247 <property name="secondary_icon_activatable">False</property>
237 <property name="primary_icon_sensitive">True</property>
238 <property name="secondary_icon_sensitive">True</property>
239 <property name="adjustment">replication_adjustment</property> 248 <property name="adjustment">replication_adjustment</property>
240 <property name="numeric">True</property> 249 <property name="numeric">True</property>
241 </object> 250 </object>
@@ -261,20 +270,4 @@
261 <action-widget response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget> 270 <action-widget response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
262 </action-widgets> 271 </action-widgets>
263 </object> 272 </object>
264 <object class="GtkAdjustment" id="expiration_year_adjustment">
265 <property name="upper">9999</property>
266 <property name="step_increment">1</property>
267 <property name="page_increment">10</property>
268 </object>
269 <object class="GtkAdjustment" id="priority_adjustment">
270 <property name="upper">100000000</property>
271 <property name="value">1000</property>
272 <property name="step_increment">1</property>
273 <property name="page_increment">10</property>
274 </object>
275 <object class="GtkAdjustment" id="replication_adjustment">
276 <property name="upper">99999</property>
277 <property name="step_increment">1</property>
278 <property name="page_increment">10</property>
279 </object>
280</interface> 273</interface>
diff --git a/contrib/gnunet_fs_gtk_publish_tab.glade b/contrib/gnunet_fs_gtk_publish_tab.glade
index 098471e5..cbbc5700 100644
--- a/contrib/gnunet_fs_gtk_publish_tab.glade
+++ b/contrib/gnunet_fs_gtk_publish_tab.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy toplevel-contextual -->
5 <object class="GtkTreeStore" id="_publish_frame_tree_store"> 5 <object class="GtkTreeStore" id="_publish_frame_tree_store">
6 <columns> 6 <columns>
7 <!-- column-name filename --> 7 <!-- column-name filename -->
@@ -36,6 +36,9 @@
36 <property name="enable_tree_lines">True</property> 36 <property name="enable_tree_lines">True</property>
37 <signal name="button-press-event" handler="GNUNET_FS_GTK_publish_treeview_button_press_event" swapped="no"/> 37 <signal name="button-press-event" handler="GNUNET_FS_GTK_publish_treeview_button_press_event" swapped="no"/>
38 <signal name="popup-menu" handler="GNUNET_FS_GTK_publish_treeview_popup_menu" swapped="no"/> 38 <signal name="popup-menu" handler="GNUNET_FS_GTK_publish_treeview_popup_menu" swapped="no"/>
39 <child internal-child="selection">
40 <object class="GtkTreeSelection" id="treeview-selection1"/>
41 </child>
39 <child> 42 <child>
40 <object class="GtkTreeViewColumn" id="filename"> 43 <object class="GtkTreeViewColumn" id="filename">
41 <property name="sizing">autosize</property> 44 <property name="sizing">autosize</property>
@@ -127,7 +130,7 @@
127 <property name="visible">True</property> 130 <property name="visible">True</property>
128 <property name="can_focus">False</property> 131 <property name="can_focus">False</property>
129 <property name="stock">gtk-close</property> 132 <property name="stock">gtk-close</property>
130 <property name="icon-size">2</property> 133 <property name="icon_size">2</property>
131 </object> 134 </object>
132 </child> 135 </child>
133 </object> 136 </object>
diff --git a/contrib/gnunet_fs_gtk_search_tab.glade b/contrib/gnunet_fs_gtk_search_tab.glade
index 0affbca5..377c4347 100644
--- a/contrib/gnunet_fs_gtk_search_tab.glade
+++ b/contrib/gnunet_fs_gtk_search_tab.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_result_tree_store"> 5 <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_result_tree_store">
6 <columns> 6 <columns>
7 <!-- column-name metadata --> 7 <!-- column-name metadata -->
@@ -59,8 +59,6 @@
59 <object class="GtkScrolledWindow" id="_search_frame_scrolled_window"> 59 <object class="GtkScrolledWindow" id="_search_frame_scrolled_window">
60 <property name="visible">True</property> 60 <property name="visible">True</property>
61 <property name="can_focus">True</property> 61 <property name="can_focus">True</property>
62 <property name="hscrollbar_policy">automatic</property>
63 <property name="vscrollbar_policy">automatic</property>
64 <child> 62 <child>
65 <object class="GtkTreeView" id="_search_result_frame"> 63 <object class="GtkTreeView" id="_search_result_frame">
66 <property name="visible">True</property> 64 <property name="visible">True</property>
@@ -69,10 +67,13 @@
69 <property name="search_column">6</property> 67 <property name="search_column">6</property>
70 <property name="enable_grid_lines">horizontal</property> 68 <property name="enable_grid_lines">horizontal</property>
71 <property name="enable_tree_lines">True</property> 69 <property name="enable_tree_lines">True</property>
72 <signal name="cursor-changed" handler="GNUNET_FS_GTK_search_treeview_cursor_changed" swapped="no"/>
73 <signal name="button-press-event" handler="GNUNET_FS_GTK_search_treeview_button_press_event" swapped="no"/> 70 <signal name="button-press-event" handler="GNUNET_FS_GTK_search_treeview_button_press_event" swapped="no"/>
74 <signal name="row-activated" handler="GNUNET_FS_GTK_search_treeview_row_activated" swapped="no"/> 71 <signal name="cursor-changed" handler="GNUNET_FS_GTK_search_treeview_cursor_changed" swapped="no"/>
75 <signal name="popup-menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/> 72 <signal name="popup-menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
73 <signal name="row-activated" handler="GNUNET_FS_GTK_search_treeview_row_activated" swapped="no"/>
74 <child internal-child="selection">
75 <object class="GtkTreeSelection" id="treeview-selection1"/>
76 </child>
76 <child> 77 <child>
77 <object class="GtkTreeViewColumn" id="search_result_description_column"> 78 <object class="GtkTreeViewColumn" id="search_result_description_column">
78 <property name="title">Description</property> 79 <property name="title">Description</property>
@@ -216,6 +217,9 @@
216 </object> 217 </object>
217 </child> 218 </child>
218 </object> 219 </object>
220 <object class="GtkSizeGroup" id="_search_result_label_buttons_size_group">
221 <property name="mode">both</property>
222 </object>
219 <object class="GtkWindow" id="_search_result_label_window"> 223 <object class="GtkWindow" id="_search_result_label_window">
220 <property name="can_focus">False</property> 224 <property name="can_focus">False</property>
221 <property name="type">popup</property> 225 <property name="type">popup</property>
@@ -253,7 +257,7 @@
253 <property name="visible">True</property> 257 <property name="visible">True</property>
254 <property name="can_focus">False</property> 258 <property name="can_focus">False</property>
255 <property name="stock">gtk-media-play</property> 259 <property name="stock">gtk-media-play</property>
256 <property name="icon-size">2</property> 260 <property name="icon_size">2</property>
257 </object> 261 </object>
258 </child> 262 </child>
259 </object> 263 </object>
@@ -274,7 +278,7 @@
274 <property name="visible">True</property> 278 <property name="visible">True</property>
275 <property name="can_focus">False</property> 279 <property name="can_focus">False</property>
276 <property name="stock">gtk-media-pause</property> 280 <property name="stock">gtk-media-pause</property>
277 <property name="icon-size">2</property> 281 <property name="icon_size">2</property>
278 </object> 282 </object>
279 </child> 283 </child>
280 </object> 284 </object>
@@ -296,7 +300,7 @@
296 <property name="visible">True</property> 300 <property name="visible">True</property>
297 <property name="can_focus">False</property> 301 <property name="can_focus">False</property>
298 <property name="stock">gtk-close</property> 302 <property name="stock">gtk-close</property>
299 <property name="icon-size">2</property> 303 <property name="icon_size">2</property>
300 </object> 304 </object>
301 </child> 305 </child>
302 </object> 306 </object>
@@ -309,7 +313,4 @@
309 </object> 313 </object>
310 </child> 314 </child>
311 </object> 315 </object>
312 <object class="GtkSizeGroup" id="_search_result_label_buttons_size_group">
313 <property name="mode">both</property>
314 </object>
315</interface> 316</interface>
diff --git a/contrib/gnunet_fs_gtk_unindex.glade b/contrib/gnunet_fs_gtk_unindex.glade
index b8c26329..a7153731 100644
--- a/contrib/gnunet_fs_gtk_unindex.glade
+++ b/contrib/gnunet_fs_gtk_unindex.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.18"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image"> 5 <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
6 <property name="visible">True</property> 6 <property name="visible">True</property>
7 <property name="can_focus">False</property> 7 <property name="can_focus">False</property>
@@ -37,12 +37,13 @@
37 <property name="icon_name">folder</property> 37 <property name="icon_name">folder</property>
38 <property name="type_hint">normal</property> 38 <property name="type_hint">normal</property>
39 <child internal-child="vbox"> 39 <child internal-child="vbox">
40 <object class="GtkVBox" id="GNUNET_FS_GTK_unindex_dialog-vbox"> 40 <object class="GtkBox" id="GNUNET_FS_GTK_unindex_dialog-vbox">
41 <property name="visible">True</property> 41 <property name="visible">True</property>
42 <property name="can_focus">False</property> 42 <property name="can_focus">False</property>
43 <property name="orientation">vertical</property>
43 <property name="spacing">2</property> 44 <property name="spacing">2</property>
44 <child internal-child="action_area"> 45 <child internal-child="action_area">
45 <object class="GtkHButtonBox" id="GNUNET_FS_GTK_unindex_dialog-action_area"> 46 <object class="GtkButtonBox" id="GNUNET_FS_GTK_unindex_dialog-action_area">
46 <property name="visible">True</property> 47 <property name="visible">True</property>
47 <property name="can_focus">False</property> 48 <property name="can_focus">False</property>
48 <property name="layout_style">end</property> 49 <property name="layout_style">end</property>
@@ -93,13 +94,14 @@
93 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_unindex_scrolledwindow"> 94 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_unindex_scrolledwindow">
94 <property name="visible">True</property> 95 <property name="visible">True</property>
95 <property name="can_focus">True</property> 96 <property name="can_focus">True</property>
96 <property name="hscrollbar_policy">automatic</property>
97 <property name="vscrollbar_policy">automatic</property>
98 <child> 97 <child>
99 <object class="GtkTreeView" id="GNUNET_FS_GTK_unindex_treeview"> 98 <object class="GtkTreeView" id="GNUNET_FS_GTK_unindex_treeview">
100 <property name="visible">True</property> 99 <property name="visible">True</property>
101 <property name="can_focus">True</property> 100 <property name="can_focus">True</property>
102 <property name="model">GNUNET_FS_GTK_unindex_liststore</property> 101 <property name="model">GNUNET_FS_GTK_unindex_liststore</property>
102 <child internal-child="selection">
103 <object class="GtkTreeSelection" id="treeview-selection1"/>
104 </child>
103 <child> 105 <child>
104 <object class="GtkTreeViewColumn" id="GNUNET_FS_GTK_unindex_filesize_treeviewcolumn"> 106 <object class="GtkTreeViewColumn" id="GNUNET_FS_GTK_unindex_filesize_treeviewcolumn">
105 <property name="sizing">autosize</property> 107 <property name="sizing">autosize</property>
diff --git a/contrib/gnunet_gtk_status_bar_menu.glade b/contrib/gnunet_gtk_status_bar_menu.glade
index a425f263..2c3e7d98 100644
--- a/contrib/gnunet_gtk_status_bar_menu.glade
+++ b/contrib/gnunet_gtk_status_bar_menu.glade
@@ -1,15 +1,17 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkMenu" id="GNUNET_GTK_status_bar_popup_menu"> 5 <object class="GtkMenu" id="GNUNET_GTK_status_bar_popup_menu">
6 <property name="visible">True</property> 6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
7 <child> 8 <child>
8 <object class="GtkImageMenuItem" id="GNUNET_GTK_status_bar_popup_menu_quit"> 9 <object class="GtkImageMenuItem" id="GNUNET_GTK_status_bar_popup_menu_quit">
9 <property name="label">gtk-quit</property> 10 <property name="label">gtk-quit</property>
11 <property name="use_action_appearance">False</property>
10 <property name="visible">True</property> 12 <property name="visible">True</property>
13 <property name="can_focus">False</property>
11 <property name="tooltip_text" translatable="yes">Quit</property> 14 <property name="tooltip_text" translatable="yes">Quit</property>
12 <property name="use_action_appearance">False</property>
13 <property name="use_underline">True</property> 15 <property name="use_underline">True</property>
14 <property name="use_stock">True</property> 16 <property name="use_stock">True</property>
15 <property name="always_show_image">True</property> 17 <property name="always_show_image">True</property>
diff --git a/contrib/gnunet_identity_gtk_advertise_dialog.glade b/contrib/gnunet_identity_gtk_advertise_dialog.glade
index 2884ca38..df9bf35a 100644
--- a/contrib/gnunet_identity_gtk_advertise_dialog.glade
+++ b/contrib/gnunet_identity_gtk_advertise_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_hadj"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_hadj">
6 <property name="upper">100</property> 6 <property name="upper">100</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -38,6 +38,58 @@
38 <property name="step_increment">1</property> 38 <property name="step_increment">1</property>
39 <property name="page_increment">10</property> 39 <property name="page_increment">10</property>
40 </object> 40 </object>
41 <object class="GtkListStore" id="GNUNET_GTK_identity_metadata_types_liststore">
42 <columns>
43 <!-- column-name type_as_string -->
44 <column type="gchararray"/>
45 <!-- column-name type_as_enum -->
46 <column type="guint"/>
47 </columns>
48 </object>
49 <object class="GtkListStore" id="anonymity_level_liststore">
50 <columns>
51 <!-- column-name Name -->
52 <column type="gchararray"/>
53 <!-- column-name Level -->
54 <column type="guint"/>
55 <!-- column-name Color -->
56 <column type="gchararray"/>
57 </columns>
58 <data>
59 <row>
60 <col id="0" translatable="yes">None</col>
61 <col id="1">0</col>
62 <col id="2" translatable="yes">#AAAA00000000</col>
63 </row>
64 <row>
65 <col id="0" translatable="yes">Normal</col>
66 <col id="1">1</col>
67 <col id="2" translatable="yes">#000000000000</col>
68 </row>
69 <row>
70 <col id="0" translatable="yes">Paranoid</col>
71 <col id="1">10</col>
72 <col id="2" translatable="yes">#0000AAAA0000</col>
73 </row>
74 </data>
75 </object>
76 <object class="GtkAdjustment" id="expiration_year_adjustment">
77 <property name="upper">9999</property>
78 <property name="step_increment">1</property>
79 <property name="page_increment">10</property>
80 </object>
81 <object class="GtkAdjustment" id="priority_adjustment">
82 <property name="upper">100000000</property>
83 <property name="value">1000</property>
84 <property name="step_increment">1</property>
85 <property name="page_increment">10</property>
86 </object>
87 <object class="GtkAdjustment" id="replication_adjustment">
88 <property name="upper">99999</property>
89 <property name="value">5</property>
90 <property name="step_increment">1</property>
91 <property name="page_increment">10</property>
92 </object>
41 <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog"> 93 <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
42 <property name="can_focus">False</property> 94 <property name="can_focus">False</property>
43 <property name="border_width">5</property> 95 <property name="border_width">5</property>
@@ -45,9 +97,10 @@
45 <property name="type_hint">dialog</property> 97 <property name="type_hint">dialog</property>
46 <signal name="response" handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/> 98 <signal name="response" handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/>
47 <child internal-child="vbox"> 99 <child internal-child="vbox">
48 <object class="GtkVBox" id="GNUNET_GTK_identity_advertise_vbox"> 100 <object class="GtkBox" id="GNUNET_GTK_identity_advertise_vbox">
49 <property name="visible">True</property> 101 <property name="visible">True</property>
50 <property name="can_focus">False</property> 102 <property name="can_focus">False</property>
103 <property name="orientation">vertical</property>
51 <property name="spacing">2</property> 104 <property name="spacing">2</property>
52 <child> 105 <child>
53 <object class="GtkFrame" id="GNUNET_GTK_identity_advertise_root_frame"> 106 <object class="GtkFrame" id="GNUNET_GTK_identity_advertise_root_frame">
@@ -68,8 +121,6 @@
68 <property name="invisible_char">●</property> 121 <property name="invisible_char">●</property>
69 <property name="primary_icon_activatable">False</property> 122 <property name="primary_icon_activatable">False</property>
70 <property name="secondary_icon_activatable">False</property> 123 <property name="secondary_icon_activatable">False</property>
71 <property name="primary_icon_sensitive">True</property>
72 <property name="secondary_icon_sensitive">True</property>
73 </object> 124 </object>
74 </child> 125 </child>
75 </object> 126 </object>
@@ -157,11 +208,8 @@
157 <property name="visible">True</property> 208 <property name="visible">True</property>
158 <property name="can_focus">True</property> 209 <property name="can_focus">True</property>
159 <property name="invisible_char">●</property> 210 <property name="invisible_char">●</property>
160 <property name="invisible_char_set">True</property>
161 <property name="primary_icon_activatable">False</property> 211 <property name="primary_icon_activatable">False</property>
162 <property name="secondary_icon_activatable">False</property> 212 <property name="secondary_icon_activatable">False</property>
163 <property name="primary_icon_sensitive">True</property>
164 <property name="secondary_icon_sensitive">True</property>
165 <signal name="changed" handler="GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb" swapped="no"/> 213 <signal name="changed" handler="GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb" swapped="no"/>
166 </object> 214 </object>
167 <packing> 215 <packing>
@@ -215,16 +263,14 @@
215 <property name="can_focus">True</property> 263 <property name="can_focus">True</property>
216 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property> 264 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
217 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property> 265 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
218 <property name="hscrollbar_policy">automatic</property>
219 <property name="vscrollbar_policy">automatic</property>
220 <property name="shadow_type">in</property> 266 <property name="shadow_type">in</property>
221 <child> 267 <child>
222 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_metadata_treeview"> 268 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_metadata_treeview">
223 <property name="visible">True</property> 269 <property name="visible">True</property>
224 <property name="can_focus">True</property> 270 <property name="can_focus">True</property>
225 <property name="model">GNUNET_GTK_identity_advertise_metadata_liststore</property>
226 <property name="hadjustment">GNUNET_GTK_identity_advertise_metadata_hadj</property> 271 <property name="hadjustment">GNUNET_GTK_identity_advertise_metadata_hadj</property>
227 <property name="vadjustment">GNUNET_GTK_identity_advertise_metadata_vadj</property> 272 <property name="vadjustment">GNUNET_GTK_identity_advertise_metadata_vadj</property>
273 <property name="model">GNUNET_GTK_identity_advertise_metadata_liststore</property>
228 <property name="headers_clickable">False</property> 274 <property name="headers_clickable">False</property>
229 <property name="rules_hint">True</property> 275 <property name="rules_hint">True</property>
230 <property name="search_column">0</property> 276 <property name="search_column">0</property>
@@ -232,6 +278,9 @@
232 <property name="rubber_banding">True</property> 278 <property name="rubber_banding">True</property>
233 <property name="enable_grid_lines">both</property> 279 <property name="enable_grid_lines">both</property>
234 <signal name="key-press-event" handler="GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb" swapped="no"/> 280 <signal name="key-press-event" handler="GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb" swapped="no"/>
281 <child internal-child="selection">
282 <object class="GtkTreeSelection" id="treeview-selection1"/>
283 </child>
235 <child> 284 <child>
236 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_metadata_type_column"> 285 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_metadata_type_column">
237 <property name="title" translatable="yes">Type</property> 286 <property name="title" translatable="yes">Type</property>
@@ -302,20 +351,21 @@
302 <property name="can_focus">True</property> 351 <property name="can_focus">True</property>
303 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property> 352 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
304 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property> 353 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
305 <property name="hscrollbar_policy">automatic</property>
306 <property name="vscrollbar_policy">automatic</property>
307 <child> 354 <child>
308 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_keywords_treeview"> 355 <object class="GtkTreeView" id="GNUNET_GTK_identity_advertise_keywords_treeview">
309 <property name="visible">True</property> 356 <property name="visible">True</property>
310 <property name="can_focus">True</property> 357 <property name="can_focus">True</property>
311 <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
312 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property> 358 <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
313 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property> 359 <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
360 <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
314 <property name="reorderable">True</property> 361 <property name="reorderable">True</property>
315 <property name="enable_search">False</property> 362 <property name="enable_search">False</property>
316 <property name="search_column">0</property> 363 <property name="search_column">0</property>
317 <property name="show_expanders">False</property> 364 <property name="show_expanders">False</property>
318 <property name="rubber_banding">True</property> 365 <property name="rubber_banding">True</property>
366 <child internal-child="selection">
367 <object class="GtkTreeSelection" id="treeview-selection2"/>
368 </child>
319 <child> 369 <child>
320 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_keywords_name_column"> 370 <object class="GtkTreeViewColumn" id="GNUNET_GTK_identity_advertise_keywords_name_column">
321 <property name="title" translatable="yes">Name</property> 371 <property name="title" translatable="yes">Name</property>
@@ -438,11 +488,8 @@
438 <property name="visible">True</property> 488 <property name="visible">True</property>
439 <property name="can_focus">True</property> 489 <property name="can_focus">True</property>
440 <property name="invisible_char">•</property> 490 <property name="invisible_char">•</property>
441 <property name="invisible_char_set">True</property>
442 <property name="primary_icon_activatable">False</property> 491 <property name="primary_icon_activatable">False</property>
443 <property name="secondary_icon_activatable">False</property> 492 <property name="secondary_icon_activatable">False</property>
444 <property name="primary_icon_sensitive">True</property>
445 <property name="secondary_icon_sensitive">True</property>
446 <property name="adjustment">priority_adjustment</property> 493 <property name="adjustment">priority_adjustment</property>
447 <property name="numeric">True</property> 494 <property name="numeric">True</property>
448 </object> 495 </object>
@@ -467,11 +514,8 @@
467 <property name="visible">True</property> 514 <property name="visible">True</property>
468 <property name="can_focus">True</property> 515 <property name="can_focus">True</property>
469 <property name="invisible_char">•</property> 516 <property name="invisible_char">•</property>
470 <property name="invisible_char_set">True</property>
471 <property name="primary_icon_activatable">False</property> 517 <property name="primary_icon_activatable">False</property>
472 <property name="secondary_icon_activatable">False</property> 518 <property name="secondary_icon_activatable">False</property>
473 <property name="primary_icon_sensitive">True</property>
474 <property name="secondary_icon_sensitive">True</property>
475 <property name="adjustment">expiration_year_adjustment</property> 519 <property name="adjustment">expiration_year_adjustment</property>
476 <property name="numeric">True</property> 520 <property name="numeric">True</property>
477 </object> 521 </object>
@@ -499,11 +543,8 @@
499 <property name="visible">True</property> 543 <property name="visible">True</property>
500 <property name="can_focus">True</property> 544 <property name="can_focus">True</property>
501 <property name="invisible_char">●</property> 545 <property name="invisible_char">●</property>
502 <property name="invisible_char_set">True</property>
503 <property name="primary_icon_activatable">False</property> 546 <property name="primary_icon_activatable">False</property>
504 <property name="secondary_icon_activatable">False</property> 547 <property name="secondary_icon_activatable">False</property>
505 <property name="primary_icon_sensitive">True</property>
506 <property name="secondary_icon_sensitive">True</property>
507 <property name="adjustment">replication_adjustment</property> 548 <property name="adjustment">replication_adjustment</property>
508 <property name="numeric">True</property> 549 <property name="numeric">True</property>
509 </object> 550 </object>
@@ -534,7 +575,7 @@
534 </packing> 575 </packing>
535 </child> 576 </child>
536 <child internal-child="action_area"> 577 <child internal-child="action_area">
537 <object class="GtkHButtonBox" id="GNUNET_GTK_identity_advertise_action_area"> 578 <object class="GtkButtonBox" id="GNUNET_GTK_identity_advertise_action_area">
538 <property name="visible">True</property> 579 <property name="visible">True</property>
539 <property name="can_focus">False</property> 580 <property name="can_focus">False</property>
540 <property name="layout_style">end</property> 581 <property name="layout_style">end</property>
@@ -586,56 +627,4 @@
586 <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget> 627 <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
587 </action-widgets> 628 </action-widgets>
588 </object> 629 </object>
589 <object class="GtkListStore" id="GNUNET_GTK_identity_metadata_types_liststore">
590 <columns>
591 <!-- column-name type_as_string -->
592 <column type="gchararray"/>
593 <!-- column-name type_as_enum -->
594 <column type="guint"/>
595 </columns>
596 </object>
597 <object class="GtkListStore" id="anonymity_level_liststore">
598 <columns>
599 <!-- column-name Name -->
600 <column type="gchararray"/>
601 <!-- column-name Level -->
602 <column type="guint"/>
603 <!-- column-name Color -->
604 <column type="gchararray"/>
605 </columns>
606 <data>
607 <row>
608 <col id="0" translatable="yes">None</col>
609 <col id="1">0</col>
610 <col id="2" translatable="yes">#AAAA00000000</col>
611 </row>
612 <row>
613 <col id="0" translatable="yes">Normal</col>
614 <col id="1">1</col>
615 <col id="2" translatable="yes">#000000000000</col>
616 </row>
617 <row>
618 <col id="0" translatable="yes">Paranoid</col>
619 <col id="1">10</col>
620 <col id="2" translatable="yes">#0000AAAA0000</col>
621 </row>
622 </data>
623 </object>
624 <object class="GtkAdjustment" id="expiration_year_adjustment">
625 <property name="upper">9999</property>
626 <property name="step_increment">1</property>
627 <property name="page_increment">10</property>
628 </object>
629 <object class="GtkAdjustment" id="priority_adjustment">
630 <property name="upper">100000000</property>
631 <property name="value">1000</property>
632 <property name="step_increment">1</property>
633 <property name="page_increment">10</property>
634 </object>
635 <object class="GtkAdjustment" id="replication_adjustment">
636 <property name="upper">99999</property>
637 <property name="value">5</property>
638 <property name="step_increment">1</property>
639 <property name="page_increment">10</property>
640 </object>
641</interface> 630</interface>
diff --git a/contrib/gnunet_namestore_edit_a.glade b/contrib/gnunet_namestore_edit_a.glade
index 7912c620..7197bc5d 100644
--- a/contrib/gnunet_namestore_edit_a.glade
+++ b/contrib/gnunet_namestore_edit_a.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -17,6 +17,23 @@
17 <property name="step_increment">1</property> 17 <property name="step_increment">1</property>
18 <property name="page_increment">10</property> 18 <property name="page_increment">10</property>
19 </object> 19 </object>
20 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
21 <columns>
22 <!-- column-name relativetime -->
23 <column type="gchararray"/>
24 </columns>
25 <data>
26 <row>
27 <col id="0">7 days</col>
28 </row>
29 <row>
30 <col id="0">1 day</col>
31 </row>
32 <row>
33 <col id="0">1 h</col>
34 </row>
35 </data>
36 </object>
20 <object class="GtkDialog" id="edit_a_dialog"> 37 <object class="GtkDialog" id="edit_a_dialog">
21 <property name="can_focus">False</property> 38 <property name="can_focus">False</property>
22 <property name="border_width">5</property> 39 <property name="border_width">5</property>
@@ -25,12 +42,13 @@
25 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
26 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
27 <child internal-child="vbox"> 44 <child internal-child="vbox">
28 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
29 <property name="visible">True</property> 46 <property name="visible">True</property>
30 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
31 <property name="spacing">2</property> 49 <property name="spacing">2</property>
32 <child internal-child="action_area"> 50 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
34 <property name="visible">True</property> 52 <property name="visible">True</property>
35 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
36 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -112,8 +130,6 @@
112 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
113 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
114 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
115 <property name="primary_icon_sensitive">True</property>
116 <property name="secondary_icon_sensitive">True</property>
117 </object> 133 </object>
118 <packing> 134 <packing>
119 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -199,8 +215,6 @@
199 <property name="invisible_char">●</property> 215 <property name="invisible_char">●</property>
200 <property name="primary_icon_activatable">False</property> 216 <property name="primary_icon_activatable">False</property>
201 <property name="secondary_icon_activatable">False</property> 217 <property name="secondary_icon_activatable">False</property>
202 <property name="primary_icon_sensitive">True</property>
203 <property name="secondary_icon_sensitive">True</property>
204 <signal name="changed" handler="GNS_edit_dialog_a_entry_changed_cb" swapped="no"/> 218 <signal name="changed" handler="GNS_edit_dialog_a_entry_changed_cb" swapped="no"/>
205 </object> 219 </object>
206 <packing> 220 <packing>
@@ -251,6 +265,7 @@
251 <property name="can_focus">True</property> 265 <property name="can_focus">True</property>
252 <property name="receives_default">False</property> 266 <property name="receives_default">False</property>
253 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 267 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
268 <property name="xalign">0.5</property>
254 <property name="draw_indicator">True</property> 269 <property name="draw_indicator">True</property>
255 </object> 270 </object>
256 <packing> 271 <packing>
@@ -266,6 +281,7 @@
266 <property name="can_focus">True</property> 281 <property name="can_focus">True</property>
267 <property name="receives_default">False</property> 282 <property name="receives_default">False</property>
268 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 283 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
284 <property name="xalign">0.5</property>
269 <property name="draw_indicator">True</property> 285 <property name="draw_indicator">True</property>
270 </object> 286 </object>
271 <packing> 287 <packing>
@@ -280,6 +296,7 @@
280 <property name="visible">True</property> 296 <property name="visible">True</property>
281 <property name="can_focus">True</property> 297 <property name="can_focus">True</property>
282 <property name="receives_default">False</property> 298 <property name="receives_default">False</property>
299 <property name="xalign">0.5</property>
283 <property name="draw_indicator">True</property> 300 <property name="draw_indicator">True</property>
284 </object> 301 </object>
285 <packing> 302 <packing>
@@ -336,6 +353,7 @@
336 <property name="can_focus">True</property> 353 <property name="can_focus">True</property>
337 <property name="receives_default">False</property> 354 <property name="receives_default">False</property>
338 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
356 <property name="xalign">0.5</property>
339 <property name="active">True</property> 357 <property name="active">True</property>
340 <property name="draw_indicator">True</property> 358 <property name="draw_indicator">True</property>
341 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -353,6 +371,7 @@
353 <property name="can_focus">True</property> 371 <property name="can_focus">True</property>
354 <property name="receives_default">False</property> 372 <property name="receives_default">False</property>
355 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
374 <property name="xalign">0.5</property>
356 <property name="active">True</property> 375 <property name="active">True</property>
357 <property name="draw_indicator">True</property> 376 <property name="draw_indicator">True</property>
358 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 377 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -371,6 +390,7 @@
371 <property name="can_focus">True</property> 390 <property name="can_focus">True</property>
372 <property name="receives_default">False</property> 391 <property name="receives_default">False</property>
373 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 392 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
393 <property name="xalign">0.5</property>
374 <property name="active">True</property> 394 <property name="active">True</property>
375 <property name="draw_indicator">True</property> 395 <property name="draw_indicator">True</property>
376 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 396 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -430,8 +450,6 @@
430 <property name="invisible_char">●</property> 450 <property name="invisible_char">●</property>
431 <property name="primary_icon_activatable">False</property> 451 <property name="primary_icon_activatable">False</property>
432 <property name="secondary_icon_activatable">False</property> 452 <property name="secondary_icon_activatable">False</property>
433 <property name="primary_icon_sensitive">True</property>
434 <property name="secondary_icon_sensitive">True</property>
435 <property name="adjustment">absolute_expiration_hours_adjustment</property> 453 <property name="adjustment">absolute_expiration_hours_adjustment</property>
436 </object> 454 </object>
437 <packing> 455 <packing>
@@ -462,8 +480,6 @@
462 <property name="invisible_char">●</property> 480 <property name="invisible_char">●</property>
463 <property name="primary_icon_activatable">False</property> 481 <property name="primary_icon_activatable">False</property>
464 <property name="secondary_icon_activatable">False</property> 482 <property name="secondary_icon_activatable">False</property>
465 <property name="primary_icon_sensitive">True</property>
466 <property name="secondary_icon_sensitive">True</property>
467 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 483 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
468 </object> 484 </object>
469 <packing> 485 <packing>
@@ -494,8 +510,6 @@
494 <property name="invisible_char">●</property> 510 <property name="invisible_char">●</property>
495 <property name="primary_icon_activatable">False</property> 511 <property name="primary_icon_activatable">False</property>
496 <property name="secondary_icon_activatable">False</property> 512 <property name="secondary_icon_activatable">False</property>
497 <property name="primary_icon_sensitive">True</property>
498 <property name="secondary_icon_sensitive">True</property>
499 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 513 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
500 </object> 514 </object>
501 <packing> 515 <packing>
@@ -558,21 +572,4 @@
558 <action-widget response="-5">edit_dialog_save_button</action-widget> 572 <action-widget response="-5">edit_dialog_save_button</action-widget>
559 </action-widgets> 573 </action-widgets>
560 </object> 574 </object>
561 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
562 <columns>
563 <!-- column-name relativetime -->
564 <column type="gchararray"/>
565 </columns>
566 <data>
567 <row>
568 <col id="0">7 days</col>
569 </row>
570 <row>
571 <col id="0">1 day</col>
572 </row>
573 <row>
574 <col id="0">1 h</col>
575 </row>
576 </data>
577 </object>
578</interface> 575</interface>
diff --git a/contrib/gnunet_namestore_edit_aaaa.glade b/contrib/gnunet_namestore_edit_aaaa.glade
index b9277522..a36d7183 100644
--- a/contrib/gnunet_namestore_edit_aaaa.glade
+++ b/contrib/gnunet_namestore_edit_aaaa.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -17,6 +17,23 @@
17 <property name="step_increment">1</property> 17 <property name="step_increment">1</property>
18 <property name="page_increment">10</property> 18 <property name="page_increment">10</property>
19 </object> 19 </object>
20 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
21 <columns>
22 <!-- column-name relativetime -->
23 <column type="gchararray"/>
24 </columns>
25 <data>
26 <row>
27 <col id="0">7 days</col>
28 </row>
29 <row>
30 <col id="0">1 day</col>
31 </row>
32 <row>
33 <col id="0">1 h</col>
34 </row>
35 </data>
36 </object>
20 <object class="GtkDialog" id="edit_aaaa_dialog"> 37 <object class="GtkDialog" id="edit_aaaa_dialog">
21 <property name="can_focus">False</property> 38 <property name="can_focus">False</property>
22 <property name="border_width">5</property> 39 <property name="border_width">5</property>
@@ -25,12 +42,13 @@
25 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
26 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
27 <child internal-child="vbox"> 44 <child internal-child="vbox">
28 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
29 <property name="visible">True</property> 46 <property name="visible">True</property>
30 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
31 <property name="spacing">2</property> 49 <property name="spacing">2</property>
32 <child internal-child="action_area"> 50 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
34 <property name="visible">True</property> 52 <property name="visible">True</property>
35 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
36 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -112,8 +130,6 @@
112 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
113 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
114 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
115 <property name="primary_icon_sensitive">True</property>
116 <property name="secondary_icon_sensitive">True</property>
117 </object> 133 </object>
118 <packing> 134 <packing>
119 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -199,8 +215,6 @@
199 <property name="invisible_char">●</property> 215 <property name="invisible_char">●</property>
200 <property name="primary_icon_activatable">False</property> 216 <property name="primary_icon_activatable">False</property>
201 <property name="secondary_icon_activatable">False</property> 217 <property name="secondary_icon_activatable">False</property>
202 <property name="primary_icon_sensitive">True</property>
203 <property name="secondary_icon_sensitive">True</property>
204 <signal name="changed" handler="GNS_edit_dialog_aaaa_entry_changed_cb" swapped="no"/> 218 <signal name="changed" handler="GNS_edit_dialog_aaaa_entry_changed_cb" swapped="no"/>
205 </object> 219 </object>
206 <packing> 220 <packing>
@@ -251,6 +265,7 @@
251 <property name="can_focus">True</property> 265 <property name="can_focus">True</property>
252 <property name="receives_default">False</property> 266 <property name="receives_default">False</property>
253 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 267 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
268 <property name="xalign">0.5</property>
254 <property name="draw_indicator">True</property> 269 <property name="draw_indicator">True</property>
255 </object> 270 </object>
256 <packing> 271 <packing>
@@ -266,6 +281,7 @@
266 <property name="can_focus">True</property> 281 <property name="can_focus">True</property>
267 <property name="receives_default">False</property> 282 <property name="receives_default">False</property>
268 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 283 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
284 <property name="xalign">0.5</property>
269 <property name="draw_indicator">True</property> 285 <property name="draw_indicator">True</property>
270 </object> 286 </object>
271 <packing> 287 <packing>
@@ -280,6 +296,7 @@
280 <property name="visible">True</property> 296 <property name="visible">True</property>
281 <property name="can_focus">True</property> 297 <property name="can_focus">True</property>
282 <property name="receives_default">False</property> 298 <property name="receives_default">False</property>
299 <property name="xalign">0.5</property>
283 <property name="draw_indicator">True</property> 300 <property name="draw_indicator">True</property>
284 </object> 301 </object>
285 <packing> 302 <packing>
@@ -336,6 +353,7 @@
336 <property name="can_focus">True</property> 353 <property name="can_focus">True</property>
337 <property name="receives_default">False</property> 354 <property name="receives_default">False</property>
338 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
356 <property name="xalign">0.5</property>
339 <property name="active">True</property> 357 <property name="active">True</property>
340 <property name="draw_indicator">True</property> 358 <property name="draw_indicator">True</property>
341 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -353,6 +371,7 @@
353 <property name="can_focus">True</property> 371 <property name="can_focus">True</property>
354 <property name="receives_default">False</property> 372 <property name="receives_default">False</property>
355 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
374 <property name="xalign">0.5</property>
356 <property name="active">True</property> 375 <property name="active">True</property>
357 <property name="draw_indicator">True</property> 376 <property name="draw_indicator">True</property>
358 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 377 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -371,6 +390,7 @@
371 <property name="can_focus">True</property> 390 <property name="can_focus">True</property>
372 <property name="receives_default">False</property> 391 <property name="receives_default">False</property>
373 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 392 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
393 <property name="xalign">0.5</property>
374 <property name="active">True</property> 394 <property name="active">True</property>
375 <property name="draw_indicator">True</property> 395 <property name="draw_indicator">True</property>
376 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 396 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -430,8 +450,6 @@
430 <property name="invisible_char">●</property> 450 <property name="invisible_char">●</property>
431 <property name="primary_icon_activatable">False</property> 451 <property name="primary_icon_activatable">False</property>
432 <property name="secondary_icon_activatable">False</property> 452 <property name="secondary_icon_activatable">False</property>
433 <property name="primary_icon_sensitive">True</property>
434 <property name="secondary_icon_sensitive">True</property>
435 <property name="adjustment">absolute_expiration_hours_adjustment</property> 453 <property name="adjustment">absolute_expiration_hours_adjustment</property>
436 </object> 454 </object>
437 <packing> 455 <packing>
@@ -462,8 +480,6 @@
462 <property name="invisible_char">●</property> 480 <property name="invisible_char">●</property>
463 <property name="primary_icon_activatable">False</property> 481 <property name="primary_icon_activatable">False</property>
464 <property name="secondary_icon_activatable">False</property> 482 <property name="secondary_icon_activatable">False</property>
465 <property name="primary_icon_sensitive">True</property>
466 <property name="secondary_icon_sensitive">True</property>
467 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 483 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
468 </object> 484 </object>
469 <packing> 485 <packing>
@@ -494,8 +510,6 @@
494 <property name="invisible_char">●</property> 510 <property name="invisible_char">●</property>
495 <property name="primary_icon_activatable">False</property> 511 <property name="primary_icon_activatable">False</property>
496 <property name="secondary_icon_activatable">False</property> 512 <property name="secondary_icon_activatable">False</property>
497 <property name="primary_icon_sensitive">True</property>
498 <property name="secondary_icon_sensitive">True</property>
499 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 513 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
500 </object> 514 </object>
501 <packing> 515 <packing>
@@ -558,21 +572,4 @@
558 <action-widget response="-5">edit_dialog_save_button</action-widget> 572 <action-widget response="-5">edit_dialog_save_button</action-widget>
559 </action-widgets> 573 </action-widgets>
560 </object> 574 </object>
561 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
562 <columns>
563 <!-- column-name relativetime -->
564 <column type="gchararray"/>
565 </columns>
566 <data>
567 <row>
568 <col id="0">7 days</col>
569 </row>
570 <row>
571 <col id="0">1 day</col>
572 </row>
573 <row>
574 <col id="0">1 h</col>
575 </row>
576 </data>
577 </object>
578</interface> 575</interface>
diff --git a/contrib/gnunet_namestore_edit_cert.glade b/contrib/gnunet_namestore_edit_cert.glade
index fef290e3..5e7f4b04 100644
--- a/contrib/gnunet_namestore_edit_cert.glade
+++ b/contrib/gnunet_namestore_edit_cert.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -17,6 +17,23 @@
17 <property name="step_increment">1</property> 17 <property name="step_increment">1</property>
18 <property name="page_increment">10</property> 18 <property name="page_increment">10</property>
19 </object> 19 </object>
20 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
21 <columns>
22 <!-- column-name relativetime -->
23 <column type="gchararray"/>
24 </columns>
25 <data>
26 <row>
27 <col id="0">7 days</col>
28 </row>
29 <row>
30 <col id="0">1 day</col>
31 </row>
32 <row>
33 <col id="0">1 h</col>
34 </row>
35 </data>
36 </object>
20 <object class="GtkDialog" id="edit_a_dialog"> 37 <object class="GtkDialog" id="edit_a_dialog">
21 <property name="can_focus">False</property> 38 <property name="can_focus">False</property>
22 <property name="border_width">5</property> 39 <property name="border_width">5</property>
@@ -25,12 +42,13 @@
25 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
26 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
27 <child internal-child="vbox"> 44 <child internal-child="vbox">
28 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
29 <property name="visible">True</property> 46 <property name="visible">True</property>
30 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
31 <property name="spacing">2</property> 49 <property name="spacing">2</property>
32 <child internal-child="action_area"> 50 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
34 <property name="visible">True</property> 52 <property name="visible">True</property>
35 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
36 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -112,8 +130,6 @@
112 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
113 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
114 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
115 <property name="primary_icon_sensitive">True</property>
116 <property name="secondary_icon_sensitive">True</property>
117 </object> 133 </object>
118 <packing> 134 <packing>
119 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -213,6 +229,7 @@
213 <property name="can_focus">True</property> 229 <property name="can_focus">True</property>
214 <property name="receives_default">False</property> 230 <property name="receives_default">False</property>
215 <property name="use_underline">True</property> 231 <property name="use_underline">True</property>
232 <property name="xalign">0.5</property>
216 <property name="active">True</property> 233 <property name="active">True</property>
217 <property name="draw_indicator">True</property> 234 <property name="draw_indicator">True</property>
218 </object> 235 </object>
@@ -230,6 +247,7 @@
230 <property name="can_focus">True</property> 247 <property name="can_focus">True</property>
231 <property name="receives_default">False</property> 248 <property name="receives_default">False</property>
232 <property name="use_underline">True</property> 249 <property name="use_underline">True</property>
250 <property name="xalign">0.5</property>
233 <property name="active">True</property> 251 <property name="active">True</property>
234 <property name="draw_indicator">True</property> 252 <property name="draw_indicator">True</property>
235 <property name="group">edit_dialog_cert_type_pkix_radiobutton</property> 253 <property name="group">edit_dialog_cert_type_pkix_radiobutton</property>
@@ -272,8 +290,6 @@
272 <property name="invisible_char">●</property> 290 <property name="invisible_char">●</property>
273 <property name="primary_icon_activatable">False</property> 291 <property name="primary_icon_activatable">False</property>
274 <property name="secondary_icon_activatable">False</property> 292 <property name="secondary_icon_activatable">False</property>
275 <property name="primary_icon_sensitive">True</property>
276 <property name="secondary_icon_sensitive">True</property>
277 </object> 293 </object>
278 <packing> 294 <packing>
279 <property name="expand">True</property> 295 <property name="expand">True</property>
@@ -316,11 +332,8 @@ For PGP, specify the key identifier.
316</property> 332</property>
317 <property name="max_length">15</property> 333 <property name="max_length">15</property>
318 <property name="invisible_char">●</property> 334 <property name="invisible_char">●</property>
319 <property name="invisible_char_set">True</property>
320 <property name="primary_icon_activatable">False</property> 335 <property name="primary_icon_activatable">False</property>
321 <property name="secondary_icon_activatable">False</property> 336 <property name="secondary_icon_activatable">False</property>
322 <property name="primary_icon_sensitive">True</property>
323 <property name="secondary_icon_sensitive">True</property>
324 <signal name="changed" handler="GNS_edit_dialog_cert_entry_changed_cb" swapped="no"/> 337 <signal name="changed" handler="GNS_edit_dialog_cert_entry_changed_cb" swapped="no"/>
325 </object> 338 </object>
326 <packing> 339 <packing>
@@ -396,6 +409,7 @@ For PGP, specify the key identifier.
396 <property name="can_focus">True</property> 409 <property name="can_focus">True</property>
397 <property name="receives_default">False</property> 410 <property name="receives_default">False</property>
398 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 411 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
412 <property name="xalign">0.5</property>
399 <property name="draw_indicator">True</property> 413 <property name="draw_indicator">True</property>
400 </object> 414 </object>
401 <packing> 415 <packing>
@@ -411,6 +425,7 @@ For PGP, specify the key identifier.
411 <property name="can_focus">True</property> 425 <property name="can_focus">True</property>
412 <property name="receives_default">False</property> 426 <property name="receives_default">False</property>
413 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 427 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
428 <property name="xalign">0.5</property>
414 <property name="draw_indicator">True</property> 429 <property name="draw_indicator">True</property>
415 </object> 430 </object>
416 <packing> 431 <packing>
@@ -425,6 +440,7 @@ For PGP, specify the key identifier.
425 <property name="visible">True</property> 440 <property name="visible">True</property>
426 <property name="can_focus">True</property> 441 <property name="can_focus">True</property>
427 <property name="receives_default">False</property> 442 <property name="receives_default">False</property>
443 <property name="xalign">0.5</property>
428 <property name="draw_indicator">True</property> 444 <property name="draw_indicator">True</property>
429 </object> 445 </object>
430 <packing> 446 <packing>
@@ -481,6 +497,7 @@ For PGP, specify the key identifier.
481 <property name="can_focus">True</property> 497 <property name="can_focus">True</property>
482 <property name="receives_default">False</property> 498 <property name="receives_default">False</property>
483 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 499 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
500 <property name="xalign">0.5</property>
484 <property name="active">True</property> 501 <property name="active">True</property>
485 <property name="draw_indicator">True</property> 502 <property name="draw_indicator">True</property>
486 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 503 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -498,6 +515,7 @@ For PGP, specify the key identifier.
498 <property name="can_focus">True</property> 515 <property name="can_focus">True</property>
499 <property name="receives_default">False</property> 516 <property name="receives_default">False</property>
500 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 517 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
518 <property name="xalign">0.5</property>
501 <property name="active">True</property> 519 <property name="active">True</property>
502 <property name="draw_indicator">True</property> 520 <property name="draw_indicator">True</property>
503 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 521 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -516,6 +534,7 @@ For PGP, specify the key identifier.
516 <property name="can_focus">True</property> 534 <property name="can_focus">True</property>
517 <property name="receives_default">False</property> 535 <property name="receives_default">False</property>
518 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 536 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
537 <property name="xalign">0.5</property>
519 <property name="active">True</property> 538 <property name="active">True</property>
520 <property name="draw_indicator">True</property> 539 <property name="draw_indicator">True</property>
521 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 540 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -575,8 +594,6 @@ For PGP, specify the key identifier.
575 <property name="invisible_char">●</property> 594 <property name="invisible_char">●</property>
576 <property name="primary_icon_activatable">False</property> 595 <property name="primary_icon_activatable">False</property>
577 <property name="secondary_icon_activatable">False</property> 596 <property name="secondary_icon_activatable">False</property>
578 <property name="primary_icon_sensitive">True</property>
579 <property name="secondary_icon_sensitive">True</property>
580 <property name="adjustment">absolute_expiration_hours_adjustment</property> 597 <property name="adjustment">absolute_expiration_hours_adjustment</property>
581 </object> 598 </object>
582 <packing> 599 <packing>
@@ -607,8 +624,6 @@ For PGP, specify the key identifier.
607 <property name="invisible_char">●</property> 624 <property name="invisible_char">●</property>
608 <property name="primary_icon_activatable">False</property> 625 <property name="primary_icon_activatable">False</property>
609 <property name="secondary_icon_activatable">False</property> 626 <property name="secondary_icon_activatable">False</property>
610 <property name="primary_icon_sensitive">True</property>
611 <property name="secondary_icon_sensitive">True</property>
612 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 627 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
613 </object> 628 </object>
614 <packing> 629 <packing>
@@ -639,8 +654,6 @@ For PGP, specify the key identifier.
639 <property name="invisible_char">●</property> 654 <property name="invisible_char">●</property>
640 <property name="primary_icon_activatable">False</property> 655 <property name="primary_icon_activatable">False</property>
641 <property name="secondary_icon_activatable">False</property> 656 <property name="secondary_icon_activatable">False</property>
642 <property name="primary_icon_sensitive">True</property>
643 <property name="secondary_icon_sensitive">True</property>
644 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 657 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
645 </object> 658 </object>
646 <packing> 659 <packing>
@@ -703,21 +716,4 @@ For PGP, specify the key identifier.
703 <action-widget response="-5">edit_dialog_save_button</action-widget> 716 <action-widget response="-5">edit_dialog_save_button</action-widget>
704 </action-widgets> 717 </action-widgets>
705 </object> 718 </object>
706 <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
707 <columns>
708 <!-- column-name relativetime -->
709 <column type="gchararray"/>
710 </columns>
711 <data>
712 <row>
713 <col id="0">7 days</col>
714 </row>
715 <row>
716 <col id="0">1 day</col>
717 </row>
718 <row>
719 <col id="0">1 h</col>
720 </row>
721 </data>
722 </object>
723</interface> 719</interface>
diff --git a/contrib/gnunet_namestore_edit_gns2dns.glade b/contrib/gnunet_namestore_edit_gns2dns.glade
index d72dacc1..5df942ab 100644
--- a/contrib/gnunet_namestore_edit_gns2dns.glade
+++ b/contrib/gnunet_namestore_edit_gns2dns.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,9 +42,10 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child> 50 <child>
50 <object class="GtkFrame" id="edit_dialog_name_frame"> 51 <object class="GtkFrame" id="edit_dialog_name_frame">
@@ -71,8 +72,6 @@
71 <property name="invisible_char">●</property> 72 <property name="invisible_char">●</property>
72 <property name="primary_icon_activatable">False</property> 73 <property name="primary_icon_activatable">False</property>
73 <property name="secondary_icon_activatable">False</property> 74 <property name="secondary_icon_activatable">False</property>
74 <property name="primary_icon_sensitive">True</property>
75 <property name="secondary_icon_sensitive">True</property>
76 </object> 75 </object>
77 <packing> 76 <packing>
78 <property name="expand">True</property> 77 <property name="expand">True</property>
@@ -155,11 +154,8 @@
155 <property name="tooltip_text" translatable="yes">Enter the name of the DNS domain that this label delegates to. Resolution will continue under the given target domain, asking the DNS server specified below.</property> 154 <property name="tooltip_text" translatable="yes">Enter the name of the DNS domain that this label delegates to. Resolution will continue under the given target domain, asking the DNS server specified below.</property>
156 <property name="max_length">253</property> 155 <property name="max_length">253</property>
157 <property name="invisible_char">●</property> 156 <property name="invisible_char">●</property>
158 <property name="invisible_char_set">True</property>
159 <property name="primary_icon_activatable">False</property> 157 <property name="primary_icon_activatable">False</property>
160 <property name="secondary_icon_activatable">False</property> 158 <property name="secondary_icon_activatable">False</property>
161 <property name="primary_icon_sensitive">True</property>
162 <property name="secondary_icon_sensitive">True</property>
163 <signal name="changed" handler="GNS_edit_dialog_gns2dns_ns_entry_changed_cb" swapped="no"/> 159 <signal name="changed" handler="GNS_edit_dialog_gns2dns_ns_entry_changed_cb" swapped="no"/>
164 </object> 160 </object>
165 <packing> 161 <packing>
@@ -217,8 +213,6 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
217 <property name="invisible_char">●</property> 213 <property name="invisible_char">●</property>
218 <property name="primary_icon_activatable">False</property> 214 <property name="primary_icon_activatable">False</property>
219 <property name="secondary_icon_activatable">False</property> 215 <property name="secondary_icon_activatable">False</property>
220 <property name="primary_icon_sensitive">True</property>
221 <property name="secondary_icon_sensitive">True</property>
222 <signal name="changed" handler="GNS_edit_dialog_gns2dns_ip_entry_changed_cb" swapped="no"/> 216 <signal name="changed" handler="GNS_edit_dialog_gns2dns_ip_entry_changed_cb" swapped="no"/>
223 </object> 217 </object>
224 <packing> 218 <packing>
@@ -269,6 +263,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
269 <property name="can_focus">True</property> 263 <property name="can_focus">True</property>
270 <property name="receives_default">False</property> 264 <property name="receives_default">False</property>
271 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 265 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
266 <property name="xalign">0.5</property>
272 <property name="draw_indicator">True</property> 267 <property name="draw_indicator">True</property>
273 </object> 268 </object>
274 <packing> 269 <packing>
@@ -284,6 +279,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
284 <property name="can_focus">True</property> 279 <property name="can_focus">True</property>
285 <property name="receives_default">False</property> 280 <property name="receives_default">False</property>
286 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 281 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
282 <property name="xalign">0.5</property>
287 <property name="draw_indicator">True</property> 283 <property name="draw_indicator">True</property>
288 </object> 284 </object>
289 <packing> 285 <packing>
@@ -298,6 +294,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
298 <property name="visible">True</property> 294 <property name="visible">True</property>
299 <property name="can_focus">True</property> 295 <property name="can_focus">True</property>
300 <property name="receives_default">False</property> 296 <property name="receives_default">False</property>
297 <property name="xalign">0.5</property>
301 <property name="draw_indicator">True</property> 298 <property name="draw_indicator">True</property>
302 </object> 299 </object>
303 <packing> 300 <packing>
@@ -354,6 +351,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
354 <property name="can_focus">True</property> 351 <property name="can_focus">True</property>
355 <property name="receives_default">False</property> 352 <property name="receives_default">False</property>
356 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 353 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
354 <property name="xalign">0.5</property>
357 <property name="active">True</property> 355 <property name="active">True</property>
358 <property name="draw_indicator">True</property> 356 <property name="draw_indicator">True</property>
359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 357 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -371,6 +369,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
371 <property name="can_focus">True</property> 369 <property name="can_focus">True</property>
372 <property name="receives_default">False</property> 370 <property name="receives_default">False</property>
373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 371 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
372 <property name="xalign">0.5</property>
374 <property name="active">True</property> 373 <property name="active">True</property>
375 <property name="draw_indicator">True</property> 374 <property name="draw_indicator">True</property>
376 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 375 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -389,6 +388,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
389 <property name="can_focus">True</property> 388 <property name="can_focus">True</property>
390 <property name="receives_default">False</property> 389 <property name="receives_default">False</property>
391 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 390 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
391 <property name="xalign">0.5</property>
392 <property name="active">True</property> 392 <property name="active">True</property>
393 <property name="draw_indicator">True</property> 393 <property name="draw_indicator">True</property>
394 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 394 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -448,8 +448,6 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
448 <property name="invisible_char">●</property> 448 <property name="invisible_char">●</property>
449 <property name="primary_icon_activatable">False</property> 449 <property name="primary_icon_activatable">False</property>
450 <property name="secondary_icon_activatable">False</property> 450 <property name="secondary_icon_activatable">False</property>
451 <property name="primary_icon_sensitive">True</property>
452 <property name="secondary_icon_sensitive">True</property>
453 <property name="adjustment">absolute_expiration_hours_adjustment</property> 451 <property name="adjustment">absolute_expiration_hours_adjustment</property>
454 </object> 452 </object>
455 <packing> 453 <packing>
@@ -480,8 +478,6 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
480 <property name="invisible_char">●</property> 478 <property name="invisible_char">●</property>
481 <property name="primary_icon_activatable">False</property> 479 <property name="primary_icon_activatable">False</property>
482 <property name="secondary_icon_activatable">False</property> 480 <property name="secondary_icon_activatable">False</property>
483 <property name="primary_icon_sensitive">True</property>
484 <property name="secondary_icon_sensitive">True</property>
485 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 481 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
486 </object> 482 </object>
487 <packing> 483 <packing>
@@ -512,8 +508,6 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
512 <property name="invisible_char">●</property> 508 <property name="invisible_char">●</property>
513 <property name="primary_icon_activatable">False</property> 509 <property name="primary_icon_activatable">False</property>
514 <property name="secondary_icon_activatable">False</property> 510 <property name="secondary_icon_activatable">False</property>
515 <property name="primary_icon_sensitive">True</property>
516 <property name="secondary_icon_sensitive">True</property>
517 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 511 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
518 </object> 512 </object>
519 <packing> 513 <packing>
@@ -569,7 +563,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
569 </packing> 563 </packing>
570 </child> 564 </child>
571 <child internal-child="action_area"> 565 <child internal-child="action_area">
572 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 566 <object class="GtkButtonBox" id="edit_dialog_action_area">
573 <property name="visible">True</property> 567 <property name="visible">True</property>
574 <property name="can_focus">False</property> 568 <property name="can_focus">False</property>
575 <property name="layout_style">end</property> 569 <property name="layout_style">end</property>
diff --git a/contrib/gnunet_namestore_edit_leho.glade b/contrib/gnunet_namestore_edit_leho.glade
index 1cd8fb6e..776d0c3e 100644
--- a/contrib/gnunet_namestore_edit_leho.glade
+++ b/contrib/gnunet_namestore_edit_leho.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -216,8 +215,6 @@
216 <property name="invisible_char">●</property> 215 <property name="invisible_char">●</property>
217 <property name="primary_icon_activatable">False</property> 216 <property name="primary_icon_activatable">False</property>
218 <property name="secondary_icon_activatable">False</property> 217 <property name="secondary_icon_activatable">False</property>
219 <property name="primary_icon_sensitive">True</property>
220 <property name="secondary_icon_sensitive">True</property>
221 <signal name="changed" handler="GNS_edit_dialog_leho_entry_changed_cb" swapped="no"/> 218 <signal name="changed" handler="GNS_edit_dialog_leho_entry_changed_cb" swapped="no"/>
222 </object> 219 </object>
223 <packing> 220 <packing>
@@ -268,6 +265,7 @@
268 <property name="can_focus">True</property> 265 <property name="can_focus">True</property>
269 <property name="receives_default">False</property> 266 <property name="receives_default">False</property>
270 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 267 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
268 <property name="xalign">0.5</property>
271 <property name="draw_indicator">True</property> 269 <property name="draw_indicator">True</property>
272 </object> 270 </object>
273 <packing> 271 <packing>
@@ -283,6 +281,7 @@
283 <property name="can_focus">True</property> 281 <property name="can_focus">True</property>
284 <property name="receives_default">False</property> 282 <property name="receives_default">False</property>
285 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 283 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
284 <property name="xalign">0.5</property>
286 <property name="draw_indicator">True</property> 285 <property name="draw_indicator">True</property>
287 </object> 286 </object>
288 <packing> 287 <packing>
@@ -297,6 +296,7 @@
297 <property name="visible">True</property> 296 <property name="visible">True</property>
298 <property name="can_focus">True</property> 297 <property name="can_focus">True</property>
299 <property name="receives_default">False</property> 298 <property name="receives_default">False</property>
299 <property name="xalign">0.5</property>
300 <property name="draw_indicator">True</property> 300 <property name="draw_indicator">True</property>
301 </object> 301 </object>
302 <packing> 302 <packing>
@@ -353,6 +353,7 @@
353 <property name="can_focus">True</property> 353 <property name="can_focus">True</property>
354 <property name="receives_default">False</property> 354 <property name="receives_default">False</property>
355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
356 <property name="xalign">0.5</property>
356 <property name="active">True</property> 357 <property name="active">True</property>
357 <property name="draw_indicator">True</property> 358 <property name="draw_indicator">True</property>
358 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -370,6 +371,7 @@
370 <property name="can_focus">True</property> 371 <property name="can_focus">True</property>
371 <property name="receives_default">False</property> 372 <property name="receives_default">False</property>
372 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
374 <property name="xalign">0.5</property>
373 <property name="active">True</property> 375 <property name="active">True</property>
374 <property name="draw_indicator">True</property> 376 <property name="draw_indicator">True</property>
375 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 377 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
388 <property name="can_focus">True</property> 390 <property name="can_focus">True</property>
389 <property name="receives_default">False</property> 391 <property name="receives_default">False</property>
390 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 392 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
393 <property name="xalign">0.5</property>
391 <property name="active">True</property> 394 <property name="active">True</property>
392 <property name="draw_indicator">True</property> 395 <property name="draw_indicator">True</property>
393 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 396 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
447 <property name="invisible_char">●</property> 450 <property name="invisible_char">●</property>
448 <property name="primary_icon_activatable">False</property> 451 <property name="primary_icon_activatable">False</property>
449 <property name="secondary_icon_activatable">False</property> 452 <property name="secondary_icon_activatable">False</property>
450 <property name="primary_icon_sensitive">True</property>
451 <property name="secondary_icon_sensitive">True</property>
452 <property name="adjustment">absolute_expiration_hours_adjustment</property> 453 <property name="adjustment">absolute_expiration_hours_adjustment</property>
453 </object> 454 </object>
454 <packing> 455 <packing>
@@ -479,8 +480,6 @@
479 <property name="invisible_char">●</property> 480 <property name="invisible_char">●</property>
480 <property name="primary_icon_activatable">False</property> 481 <property name="primary_icon_activatable">False</property>
481 <property name="secondary_icon_activatable">False</property> 482 <property name="secondary_icon_activatable">False</property>
482 <property name="primary_icon_sensitive">True</property>
483 <property name="secondary_icon_sensitive">True</property>
484 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 483 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
485 </object> 484 </object>
486 <packing> 485 <packing>
@@ -511,8 +510,6 @@
511 <property name="invisible_char">●</property> 510 <property name="invisible_char">●</property>
512 <property name="primary_icon_activatable">False</property> 511 <property name="primary_icon_activatable">False</property>
513 <property name="secondary_icon_activatable">False</property> 512 <property name="secondary_icon_activatable">False</property>
514 <property name="primary_icon_sensitive">True</property>
515 <property name="secondary_icon_sensitive">True</property>
516 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 513 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
517 </object> 514 </object>
518 <packing> 515 <packing>
diff --git a/contrib/gnunet_namestore_edit_mx.glade b/contrib/gnunet_namestore_edit_mx.glade
index 2ba389b0..01ed7feb 100644
--- a/contrib/gnunet_namestore_edit_mx.glade
+++ b/contrib/gnunet_namestore_edit_mx.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -47,12 +47,13 @@
47 <property name="destroy_with_parent">True</property> 47 <property name="destroy_with_parent">True</property>
48 <property name="type_hint">dialog</property> 48 <property name="type_hint">dialog</property>
49 <child internal-child="vbox"> 49 <child internal-child="vbox">
50 <object class="GtkVBox" id="edit_dialog_vbox"> 50 <object class="GtkBox" id="edit_dialog_vbox">
51 <property name="visible">True</property> 51 <property name="visible">True</property>
52 <property name="can_focus">False</property> 52 <property name="can_focus">False</property>
53 <property name="orientation">vertical</property>
53 <property name="spacing">2</property> 54 <property name="spacing">2</property>
54 <child internal-child="action_area"> 55 <child internal-child="action_area">
55 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 56 <object class="GtkButtonBox" id="edit_dialog_action_area">
56 <property name="visible">True</property> 57 <property name="visible">True</property>
57 <property name="can_focus">False</property> 58 <property name="can_focus">False</property>
58 <property name="layout_style">end</property> 59 <property name="layout_style">end</property>
@@ -134,8 +135,6 @@
134 <property name="invisible_char">●</property> 135 <property name="invisible_char">●</property>
135 <property name="primary_icon_activatable">False</property> 136 <property name="primary_icon_activatable">False</property>
136 <property name="secondary_icon_activatable">False</property> 137 <property name="secondary_icon_activatable">False</property>
137 <property name="primary_icon_sensitive">True</property>
138 <property name="secondary_icon_sensitive">True</property>
139 </object> 138 </object>
140 <packing> 139 <packing>
141 <property name="expand">True</property> 140 <property name="expand">True</property>
@@ -221,8 +220,6 @@
221 <property name="invisible_char">●</property> 220 <property name="invisible_char">●</property>
222 <property name="primary_icon_activatable">False</property> 221 <property name="primary_icon_activatable">False</property>
223 <property name="secondary_icon_activatable">False</property> 222 <property name="secondary_icon_activatable">False</property>
224 <property name="primary_icon_sensitive">True</property>
225 <property name="secondary_icon_sensitive">True</property>
226 <signal name="changed" handler="GNS_edit_dialog_mx_entry_changed_cb" swapped="no"/> 223 <signal name="changed" handler="GNS_edit_dialog_mx_entry_changed_cb" swapped="no"/>
227 </object> 224 </object>
228 <packing> 225 <packing>
@@ -251,8 +248,6 @@
251 <property name="invisible_char">●</property> 248 <property name="invisible_char">●</property>
252 <property name="primary_icon_activatable">False</property> 249 <property name="primary_icon_activatable">False</property>
253 <property name="secondary_icon_activatable">False</property> 250 <property name="secondary_icon_activatable">False</property>
254 <property name="primary_icon_sensitive">True</property>
255 <property name="secondary_icon_sensitive">True</property>
256 <property name="adjustment">mx_distance_adjustment</property> 251 <property name="adjustment">mx_distance_adjustment</property>
257 <property name="numeric">True</property> 252 <property name="numeric">True</property>
258 </object> 253 </object>
@@ -304,6 +299,7 @@
304 <property name="can_focus">True</property> 299 <property name="can_focus">True</property>
305 <property name="receives_default">False</property> 300 <property name="receives_default">False</property>
306 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 301 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
302 <property name="xalign">0.5</property>
307 <property name="draw_indicator">True</property> 303 <property name="draw_indicator">True</property>
308 </object> 304 </object>
309 <packing> 305 <packing>
@@ -319,6 +315,7 @@
319 <property name="can_focus">True</property> 315 <property name="can_focus">True</property>
320 <property name="receives_default">False</property> 316 <property name="receives_default">False</property>
321 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 317 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
318 <property name="xalign">0.5</property>
322 <property name="draw_indicator">True</property> 319 <property name="draw_indicator">True</property>
323 </object> 320 </object>
324 <packing> 321 <packing>
@@ -333,6 +330,7 @@
333 <property name="visible">True</property> 330 <property name="visible">True</property>
334 <property name="can_focus">True</property> 331 <property name="can_focus">True</property>
335 <property name="receives_default">False</property> 332 <property name="receives_default">False</property>
333 <property name="xalign">0.5</property>
336 <property name="draw_indicator">True</property> 334 <property name="draw_indicator">True</property>
337 </object> 335 </object>
338 <packing> 336 <packing>
@@ -389,6 +387,7 @@
389 <property name="can_focus">True</property> 387 <property name="can_focus">True</property>
390 <property name="receives_default">False</property> 388 <property name="receives_default">False</property>
391 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 389 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
390 <property name="xalign">0.5</property>
392 <property name="active">True</property> 391 <property name="active">True</property>
393 <property name="draw_indicator">True</property> 392 <property name="draw_indicator">True</property>
394 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 393 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -406,6 +405,7 @@
406 <property name="can_focus">True</property> 405 <property name="can_focus">True</property>
407 <property name="receives_default">False</property> 406 <property name="receives_default">False</property>
408 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 407 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
408 <property name="xalign">0.5</property>
409 <property name="active">True</property> 409 <property name="active">True</property>
410 <property name="draw_indicator">True</property> 410 <property name="draw_indicator">True</property>
411 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 411 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -424,6 +424,7 @@
424 <property name="can_focus">True</property> 424 <property name="can_focus">True</property>
425 <property name="receives_default">False</property> 425 <property name="receives_default">False</property>
426 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 426 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
427 <property name="xalign">0.5</property>
427 <property name="active">True</property> 428 <property name="active">True</property>
428 <property name="draw_indicator">True</property> 429 <property name="draw_indicator">True</property>
429 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 430 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -483,8 +484,6 @@
483 <property name="invisible_char">●</property> 484 <property name="invisible_char">●</property>
484 <property name="primary_icon_activatable">False</property> 485 <property name="primary_icon_activatable">False</property>
485 <property name="secondary_icon_activatable">False</property> 486 <property name="secondary_icon_activatable">False</property>
486 <property name="primary_icon_sensitive">True</property>
487 <property name="secondary_icon_sensitive">True</property>
488 <property name="adjustment">absolute_expiration_hours_adjustment</property> 487 <property name="adjustment">absolute_expiration_hours_adjustment</property>
489 </object> 488 </object>
490 <packing> 489 <packing>
@@ -515,8 +514,6 @@
515 <property name="invisible_char">●</property> 514 <property name="invisible_char">●</property>
516 <property name="primary_icon_activatable">False</property> 515 <property name="primary_icon_activatable">False</property>
517 <property name="secondary_icon_activatable">False</property> 516 <property name="secondary_icon_activatable">False</property>
518 <property name="primary_icon_sensitive">True</property>
519 <property name="secondary_icon_sensitive">True</property>
520 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 517 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
521 </object> 518 </object>
522 <packing> 519 <packing>
@@ -547,8 +544,6 @@
547 <property name="invisible_char">●</property> 544 <property name="invisible_char">●</property>
548 <property name="primary_icon_activatable">False</property> 545 <property name="primary_icon_activatable">False</property>
549 <property name="secondary_icon_activatable">False</property> 546 <property name="secondary_icon_activatable">False</property>
550 <property name="primary_icon_sensitive">True</property>
551 <property name="secondary_icon_sensitive">True</property>
552 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 547 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
553 </object> 548 </object>
554 <packing> 549 <packing>
diff --git a/contrib/gnunet_namestore_edit_phone.glade b/contrib/gnunet_namestore_edit_phone.glade
index 196a0699..1c6fafe5 100644
--- a/contrib/gnunet_namestore_edit_phone.glade
+++ b/contrib/gnunet_namestore_edit_phone.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -48,12 +48,13 @@
48 <property name="destroy_with_parent">True</property> 48 <property name="destroy_with_parent">True</property>
49 <property name="type_hint">dialog</property> 49 <property name="type_hint">dialog</property>
50 <child internal-child="vbox"> 50 <child internal-child="vbox">
51 <object class="GtkVBox" id="edit_dialog_vbox"> 51 <object class="GtkBox" id="edit_dialog_vbox">
52 <property name="visible">True</property> 52 <property name="visible">True</property>
53 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
54 <property name="orientation">vertical</property>
54 <property name="spacing">2</property> 55 <property name="spacing">2</property>
55 <child internal-child="action_area"> 56 <child internal-child="action_area">
56 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 57 <object class="GtkButtonBox" id="edit_dialog_action_area">
57 <property name="visible">True</property> 58 <property name="visible">True</property>
58 <property name="can_focus">False</property> 59 <property name="can_focus">False</property>
59 <property name="layout_style">end</property> 60 <property name="layout_style">end</property>
@@ -135,8 +136,6 @@
135 <property name="invisible_char">●</property> 136 <property name="invisible_char">●</property>
136 <property name="primary_icon_activatable">False</property> 137 <property name="primary_icon_activatable">False</property>
137 <property name="secondary_icon_activatable">False</property> 138 <property name="secondary_icon_activatable">False</property>
138 <property name="primary_icon_sensitive">True</property>
139 <property name="secondary_icon_sensitive">True</property>
140 </object> 139 </object>
141 <packing> 140 <packing>
142 <property name="expand">True</property> 141 <property name="expand">True</property>
@@ -235,8 +234,6 @@
235 <property name="invisible_char">●</property> 234 <property name="invisible_char">●</property>
236 <property name="primary_icon_activatable">False</property> 235 <property name="primary_icon_activatable">False</property>
237 <property name="secondary_icon_activatable">False</property> 236 <property name="secondary_icon_activatable">False</property>
238 <property name="primary_icon_sensitive">True</property>
239 <property name="secondary_icon_sensitive">True</property>
240 <signal name="changed" handler="GNS_edit_dialog_phone_peer_entry_changed_cb" swapped="no"/> 237 <signal name="changed" handler="GNS_edit_dialog_phone_peer_entry_changed_cb" swapped="no"/>
241 </object> 238 </object>
242 <packing> 239 <packing>
@@ -266,8 +263,6 @@
266 <property name="invisible_char">●</property> 263 <property name="invisible_char">●</property>
267 <property name="primary_icon_activatable">False</property> 264 <property name="primary_icon_activatable">False</property>
268 <property name="secondary_icon_activatable">False</property> 265 <property name="secondary_icon_activatable">False</property>
269 <property name="primary_icon_sensitive">True</property>
270 <property name="secondary_icon_sensitive">True</property>
271 <property name="adjustment">phone_line_adjustment</property> 266 <property name="adjustment">phone_line_adjustment</property>
272 <property name="numeric">True</property> 267 <property name="numeric">True</property>
273 </object> 268 </object>
@@ -319,6 +314,7 @@
319 <property name="can_focus">True</property> 314 <property name="can_focus">True</property>
320 <property name="receives_default">False</property> 315 <property name="receives_default">False</property>
321 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 316 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
317 <property name="xalign">0.5</property>
322 <property name="draw_indicator">True</property> 318 <property name="draw_indicator">True</property>
323 </object> 319 </object>
324 <packing> 320 <packing>
@@ -334,6 +330,7 @@
334 <property name="can_focus">True</property> 330 <property name="can_focus">True</property>
335 <property name="receives_default">False</property> 331 <property name="receives_default">False</property>
336 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 332 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
333 <property name="xalign">0.5</property>
337 <property name="draw_indicator">True</property> 334 <property name="draw_indicator">True</property>
338 </object> 335 </object>
339 <packing> 336 <packing>
@@ -348,6 +345,7 @@
348 <property name="visible">True</property> 345 <property name="visible">True</property>
349 <property name="can_focus">True</property> 346 <property name="can_focus">True</property>
350 <property name="receives_default">False</property> 347 <property name="receives_default">False</property>
348 <property name="xalign">0.5</property>
351 <property name="draw_indicator">True</property> 349 <property name="draw_indicator">True</property>
352 </object> 350 </object>
353 <packing> 351 <packing>
@@ -404,6 +402,7 @@
404 <property name="can_focus">True</property> 402 <property name="can_focus">True</property>
405 <property name="receives_default">False</property> 403 <property name="receives_default">False</property>
406 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 404 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
405 <property name="xalign">0.5</property>
407 <property name="active">True</property> 406 <property name="active">True</property>
408 <property name="draw_indicator">True</property> 407 <property name="draw_indicator">True</property>
409 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 408 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -421,6 +420,7 @@
421 <property name="can_focus">True</property> 420 <property name="can_focus">True</property>
422 <property name="receives_default">False</property> 421 <property name="receives_default">False</property>
423 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 422 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
423 <property name="xalign">0.5</property>
424 <property name="active">True</property> 424 <property name="active">True</property>
425 <property name="draw_indicator">True</property> 425 <property name="draw_indicator">True</property>
426 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 426 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -439,6 +439,7 @@
439 <property name="can_focus">True</property> 439 <property name="can_focus">True</property>
440 <property name="receives_default">False</property> 440 <property name="receives_default">False</property>
441 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 441 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
442 <property name="xalign">0.5</property>
442 <property name="active">True</property> 443 <property name="active">True</property>
443 <property name="draw_indicator">True</property> 444 <property name="draw_indicator">True</property>
444 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 445 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -498,8 +499,6 @@
498 <property name="invisible_char">●</property> 499 <property name="invisible_char">●</property>
499 <property name="primary_icon_activatable">False</property> 500 <property name="primary_icon_activatable">False</property>
500 <property name="secondary_icon_activatable">False</property> 501 <property name="secondary_icon_activatable">False</property>
501 <property name="primary_icon_sensitive">True</property>
502 <property name="secondary_icon_sensitive">True</property>
503 <property name="adjustment">absolute_expiration_hours_adjustment</property> 502 <property name="adjustment">absolute_expiration_hours_adjustment</property>
504 </object> 503 </object>
505 <packing> 504 <packing>
@@ -530,8 +529,6 @@
530 <property name="invisible_char">●</property> 529 <property name="invisible_char">●</property>
531 <property name="primary_icon_activatable">False</property> 530 <property name="primary_icon_activatable">False</property>
532 <property name="secondary_icon_activatable">False</property> 531 <property name="secondary_icon_activatable">False</property>
533 <property name="primary_icon_sensitive">True</property>
534 <property name="secondary_icon_sensitive">True</property>
535 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 532 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
536 </object> 533 </object>
537 <packing> 534 <packing>
@@ -562,8 +559,6 @@
562 <property name="invisible_char">●</property> 559 <property name="invisible_char">●</property>
563 <property name="primary_icon_activatable">False</property> 560 <property name="primary_icon_activatable">False</property>
564 <property name="secondary_icon_activatable">False</property> 561 <property name="secondary_icon_activatable">False</property>
565 <property name="primary_icon_sensitive">True</property>
566 <property name="secondary_icon_sensitive">True</property>
567 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 562 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
568 </object> 563 </object>
569 <packing> 564 <packing>
diff --git a/contrib/gnunet_namestore_edit_pkey.glade b/contrib/gnunet_namestore_edit_pkey.glade
index 65491918..1cfb24ff 100644
--- a/contrib/gnunet_namestore_edit_pkey.glade
+++ b/contrib/gnunet_namestore_edit_pkey.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -216,8 +215,6 @@
216 <property name="invisible_char">●</property> 215 <property name="invisible_char">●</property>
217 <property name="primary_icon_activatable">False</property> 216 <property name="primary_icon_activatable">False</property>
218 <property name="secondary_icon_activatable">False</property> 217 <property name="secondary_icon_activatable">False</property>
219 <property name="primary_icon_sensitive">True</property>
220 <property name="secondary_icon_sensitive">True</property>
221 <signal name="changed" handler="GNS_edit_dialog_pkey_entry_changed_cb" swapped="no"/> 218 <signal name="changed" handler="GNS_edit_dialog_pkey_entry_changed_cb" swapped="no"/>
222 </object> 219 </object>
223 <packing> 220 <packing>
@@ -268,6 +265,7 @@
268 <property name="can_focus">True</property> 265 <property name="can_focus">True</property>
269 <property name="receives_default">False</property> 266 <property name="receives_default">False</property>
270 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 267 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
268 <property name="xalign">0.5</property>
271 <property name="draw_indicator">True</property> 269 <property name="draw_indicator">True</property>
272 </object> 270 </object>
273 <packing> 271 <packing>
@@ -283,6 +281,7 @@
283 <property name="can_focus">True</property> 281 <property name="can_focus">True</property>
284 <property name="receives_default">False</property> 282 <property name="receives_default">False</property>
285 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 283 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
284 <property name="xalign">0.5</property>
286 <property name="draw_indicator">True</property> 285 <property name="draw_indicator">True</property>
287 </object> 286 </object>
288 <packing> 287 <packing>
@@ -297,6 +296,7 @@
297 <property name="visible">True</property> 296 <property name="visible">True</property>
298 <property name="can_focus">True</property> 297 <property name="can_focus">True</property>
299 <property name="receives_default">False</property> 298 <property name="receives_default">False</property>
299 <property name="xalign">0.5</property>
300 <property name="draw_indicator">True</property> 300 <property name="draw_indicator">True</property>
301 </object> 301 </object>
302 <packing> 302 <packing>
@@ -353,6 +353,7 @@
353 <property name="can_focus">True</property> 353 <property name="can_focus">True</property>
354 <property name="receives_default">False</property> 354 <property name="receives_default">False</property>
355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
356 <property name="xalign">0.5</property>
356 <property name="active">True</property> 357 <property name="active">True</property>
357 <property name="draw_indicator">True</property> 358 <property name="draw_indicator">True</property>
358 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -370,6 +371,7 @@
370 <property name="can_focus">True</property> 371 <property name="can_focus">True</property>
371 <property name="receives_default">False</property> 372 <property name="receives_default">False</property>
372 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
374 <property name="xalign">0.5</property>
373 <property name="active">True</property> 375 <property name="active">True</property>
374 <property name="draw_indicator">True</property> 376 <property name="draw_indicator">True</property>
375 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 377 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
388 <property name="can_focus">True</property> 390 <property name="can_focus">True</property>
389 <property name="receives_default">False</property> 391 <property name="receives_default">False</property>
390 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 392 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
393 <property name="xalign">0.5</property>
391 <property name="active">True</property> 394 <property name="active">True</property>
392 <property name="draw_indicator">True</property> 395 <property name="draw_indicator">True</property>
393 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 396 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
447 <property name="invisible_char">●</property> 450 <property name="invisible_char">●</property>
448 <property name="primary_icon_activatable">False</property> 451 <property name="primary_icon_activatable">False</property>
449 <property name="secondary_icon_activatable">False</property> 452 <property name="secondary_icon_activatable">False</property>
450 <property name="primary_icon_sensitive">True</property>
451 <property name="secondary_icon_sensitive">True</property>
452 <property name="adjustment">absolute_expiration_hours_adjustment</property> 453 <property name="adjustment">absolute_expiration_hours_adjustment</property>
453 </object> 454 </object>
454 <packing> 455 <packing>
@@ -479,8 +480,6 @@
479 <property name="invisible_char">●</property> 480 <property name="invisible_char">●</property>
480 <property name="primary_icon_activatable">False</property> 481 <property name="primary_icon_activatable">False</property>
481 <property name="secondary_icon_activatable">False</property> 482 <property name="secondary_icon_activatable">False</property>
482 <property name="primary_icon_sensitive">True</property>
483 <property name="secondary_icon_sensitive">True</property>
484 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 483 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
485 </object> 484 </object>
486 <packing> 485 <packing>
@@ -511,8 +510,6 @@
511 <property name="invisible_char">●</property> 510 <property name="invisible_char">●</property>
512 <property name="primary_icon_activatable">False</property> 511 <property name="primary_icon_activatable">False</property>
513 <property name="secondary_icon_activatable">False</property> 512 <property name="secondary_icon_activatable">False</property>
514 <property name="primary_icon_sensitive">True</property>
515 <property name="secondary_icon_sensitive">True</property>
516 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 513 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
517 </object> 514 </object>
518 <packing> 515 <packing>
diff --git a/contrib/gnunet_namestore_edit_ptr.glade b/contrib/gnunet_namestore_edit_ptr.glade
index 7774e499..ec8d2039 100644
--- a/contrib/gnunet_namestore_edit_ptr.glade
+++ b/contrib/gnunet_namestore_edit_ptr.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -216,8 +215,6 @@
216 <property name="invisible_char">●</property> 215 <property name="invisible_char">●</property>
217 <property name="primary_icon_activatable">False</property> 216 <property name="primary_icon_activatable">False</property>
218 <property name="secondary_icon_activatable">False</property> 217 <property name="secondary_icon_activatable">False</property>
219 <property name="primary_icon_sensitive">True</property>
220 <property name="secondary_icon_sensitive">True</property>
221 <signal name="changed" handler="GNS_edit_dialog_ptr_entry_changed_cb" swapped="no"/> 218 <signal name="changed" handler="GNS_edit_dialog_ptr_entry_changed_cb" swapped="no"/>
222 </object> 219 </object>
223 <packing> 220 <packing>
@@ -268,6 +265,7 @@
268 <property name="can_focus">True</property> 265 <property name="can_focus">True</property>
269 <property name="receives_default">False</property> 266 <property name="receives_default">False</property>
270 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 267 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
268 <property name="xalign">0.5</property>
271 <property name="draw_indicator">True</property> 269 <property name="draw_indicator">True</property>
272 </object> 270 </object>
273 <packing> 271 <packing>
@@ -283,6 +281,7 @@
283 <property name="can_focus">True</property> 281 <property name="can_focus">True</property>
284 <property name="receives_default">False</property> 282 <property name="receives_default">False</property>
285 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 283 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
284 <property name="xalign">0.5</property>
286 <property name="draw_indicator">True</property> 285 <property name="draw_indicator">True</property>
287 </object> 286 </object>
288 <packing> 287 <packing>
@@ -297,6 +296,7 @@
297 <property name="visible">True</property> 296 <property name="visible">True</property>
298 <property name="can_focus">True</property> 297 <property name="can_focus">True</property>
299 <property name="receives_default">False</property> 298 <property name="receives_default">False</property>
299 <property name="xalign">0.5</property>
300 <property name="draw_indicator">True</property> 300 <property name="draw_indicator">True</property>
301 </object> 301 </object>
302 <packing> 302 <packing>
@@ -353,6 +353,7 @@
353 <property name="can_focus">True</property> 353 <property name="can_focus">True</property>
354 <property name="receives_default">False</property> 354 <property name="receives_default">False</property>
355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 355 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
356 <property name="xalign">0.5</property>
356 <property name="active">True</property> 357 <property name="active">True</property>
357 <property name="draw_indicator">True</property> 358 <property name="draw_indicator">True</property>
358 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 359 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -370,6 +371,7 @@
370 <property name="can_focus">True</property> 371 <property name="can_focus">True</property>
371 <property name="receives_default">False</property> 372 <property name="receives_default">False</property>
372 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 373 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
374 <property name="xalign">0.5</property>
373 <property name="active">True</property> 375 <property name="active">True</property>
374 <property name="draw_indicator">True</property> 376 <property name="draw_indicator">True</property>
375 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 377 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
388 <property name="can_focus">True</property> 390 <property name="can_focus">True</property>
389 <property name="receives_default">False</property> 391 <property name="receives_default">False</property>
390 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 392 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
393 <property name="xalign">0.5</property>
391 <property name="active">True</property> 394 <property name="active">True</property>
392 <property name="draw_indicator">True</property> 395 <property name="draw_indicator">True</property>
393 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 396 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
447 <property name="invisible_char">●</property> 450 <property name="invisible_char">●</property>
448 <property name="primary_icon_activatable">False</property> 451 <property name="primary_icon_activatable">False</property>
449 <property name="secondary_icon_activatable">False</property> 452 <property name="secondary_icon_activatable">False</property>
450 <property name="primary_icon_sensitive">True</property>
451 <property name="secondary_icon_sensitive">True</property>
452 <property name="adjustment">absolute_expiration_hours_adjustment</property> 453 <property name="adjustment">absolute_expiration_hours_adjustment</property>
453 </object> 454 </object>
454 <packing> 455 <packing>
@@ -479,8 +480,6 @@
479 <property name="invisible_char">●</property> 480 <property name="invisible_char">●</property>
480 <property name="primary_icon_activatable">False</property> 481 <property name="primary_icon_activatable">False</property>
481 <property name="secondary_icon_activatable">False</property> 482 <property name="secondary_icon_activatable">False</property>
482 <property name="primary_icon_sensitive">True</property>
483 <property name="secondary_icon_sensitive">True</property>
484 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 483 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
485 </object> 484 </object>
486 <packing> 485 <packing>
@@ -511,8 +510,6 @@
511 <property name="invisible_char">●</property> 510 <property name="invisible_char">●</property>
512 <property name="primary_icon_activatable">False</property> 511 <property name="primary_icon_activatable">False</property>
513 <property name="secondary_icon_activatable">False</property> 512 <property name="secondary_icon_activatable">False</property>
514 <property name="primary_icon_sensitive">True</property>
515 <property name="secondary_icon_sensitive">True</property>
516 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 513 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
517 </object> 514 </object>
518 <packing> 515 <packing>
diff --git a/contrib/gnunet_namestore_edit_soa.glade b/contrib/gnunet_namestore_edit_soa.glade
index d66646eb..442da4d9 100644
--- a/contrib/gnunet_namestore_edit_soa.glade
+++ b/contrib/gnunet_namestore_edit_soa.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -71,12 +71,13 @@
71 <property name="destroy_with_parent">True</property> 71 <property name="destroy_with_parent">True</property>
72 <property name="type_hint">dialog</property> 72 <property name="type_hint">dialog</property>
73 <child internal-child="vbox"> 73 <child internal-child="vbox">
74 <object class="GtkVBox" id="edit_dialog_vbox"> 74 <object class="GtkBox" id="edit_dialog_vbox">
75 <property name="visible">True</property> 75 <property name="visible">True</property>
76 <property name="can_focus">False</property> 76 <property name="can_focus">False</property>
77 <property name="orientation">vertical</property>
77 <property name="spacing">2</property> 78 <property name="spacing">2</property>
78 <child internal-child="action_area"> 79 <child internal-child="action_area">
79 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 80 <object class="GtkButtonBox" id="edit_dialog_action_area">
80 <property name="visible">True</property> 81 <property name="visible">True</property>
81 <property name="can_focus">False</property> 82 <property name="can_focus">False</property>
82 <property name="layout_style">end</property> 83 <property name="layout_style">end</property>
@@ -158,8 +159,6 @@
158 <property name="invisible_char">●</property> 159 <property name="invisible_char">●</property>
159 <property name="primary_icon_activatable">False</property> 160 <property name="primary_icon_activatable">False</property>
160 <property name="secondary_icon_activatable">False</property> 161 <property name="secondary_icon_activatable">False</property>
161 <property name="primary_icon_sensitive">True</property>
162 <property name="secondary_icon_sensitive">True</property>
163 </object> 162 </object>
164 <packing> 163 <packing>
165 <property name="expand">True</property> 164 <property name="expand">True</property>
@@ -335,8 +334,6 @@
335 <property name="invisible_char">●</property> 334 <property name="invisible_char">●</property>
336 <property name="primary_icon_activatable">False</property> 335 <property name="primary_icon_activatable">False</property>
337 <property name="secondary_icon_activatable">False</property> 336 <property name="secondary_icon_activatable">False</property>
338 <property name="primary_icon_sensitive">True</property>
339 <property name="secondary_icon_sensitive">True</property>
340 <property name="adjustment">soa_serial_adjustment</property> 337 <property name="adjustment">soa_serial_adjustment</property>
341 <property name="numeric">True</property> 338 <property name="numeric">True</property>
342 </object> 339 </object>
@@ -355,8 +352,6 @@
355 <property name="invisible_char">●</property> 352 <property name="invisible_char">●</property>
356 <property name="primary_icon_activatable">False</property> 353 <property name="primary_icon_activatable">False</property>
357 <property name="secondary_icon_activatable">False</property> 354 <property name="secondary_icon_activatable">False</property>
358 <property name="primary_icon_sensitive">True</property>
359 <property name="secondary_icon_sensitive">True</property>
360 <property name="adjustment">soa_refresh_time_adjustment</property> 355 <property name="adjustment">soa_refresh_time_adjustment</property>
361 <property name="numeric">True</property> 356 <property name="numeric">True</property>
362 </object> 357 </object>
@@ -375,8 +370,6 @@
375 <property name="invisible_char">●</property> 370 <property name="invisible_char">●</property>
376 <property name="primary_icon_activatable">False</property> 371 <property name="primary_icon_activatable">False</property>
377 <property name="secondary_icon_activatable">False</property> 372 <property name="secondary_icon_activatable">False</property>
378 <property name="primary_icon_sensitive">True</property>
379 <property name="secondary_icon_sensitive">True</property>
380 <property name="adjustment">soa_retry_time_adjustment</property> 373 <property name="adjustment">soa_retry_time_adjustment</property>
381 <property name="numeric">True</property> 374 <property name="numeric">True</property>
382 </object> 375 </object>
@@ -395,8 +388,6 @@
395 <property name="invisible_char">●</property> 388 <property name="invisible_char">●</property>
396 <property name="primary_icon_activatable">False</property> 389 <property name="primary_icon_activatable">False</property>
397 <property name="secondary_icon_activatable">False</property> 390 <property name="secondary_icon_activatable">False</property>
398 <property name="primary_icon_sensitive">True</property>
399 <property name="secondary_icon_sensitive">True</property>
400 <property name="adjustment">soa_expire_time_adjustment</property> 391 <property name="adjustment">soa_expire_time_adjustment</property>
401 <property name="numeric">True</property> 392 <property name="numeric">True</property>
402 </object> 393 </object>
@@ -415,8 +406,6 @@
415 <property name="invisible_char">●</property> 406 <property name="invisible_char">●</property>
416 <property name="primary_icon_activatable">False</property> 407 <property name="primary_icon_activatable">False</property>
417 <property name="secondary_icon_activatable">False</property> 408 <property name="secondary_icon_activatable">False</property>
418 <property name="primary_icon_sensitive">True</property>
419 <property name="secondary_icon_sensitive">True</property>
420 <property name="adjustment">soa_minimum_ttl_adjustment</property> 409 <property name="adjustment">soa_minimum_ttl_adjustment</property>
421 <property name="numeric">True</property> 410 <property name="numeric">True</property>
422 </object> 411 </object>
@@ -435,8 +424,6 @@
435 <property name="invisible_char">●</property> 424 <property name="invisible_char">●</property>
436 <property name="primary_icon_activatable">False</property> 425 <property name="primary_icon_activatable">False</property>
437 <property name="secondary_icon_activatable">False</property> 426 <property name="secondary_icon_activatable">False</property>
438 <property name="primary_icon_sensitive">True</property>
439 <property name="secondary_icon_sensitive">True</property>
440 <signal name="changed" handler="GNS_edit_dialog_soa_source_host_entry_changed_cb" swapped="no"/> 427 <signal name="changed" handler="GNS_edit_dialog_soa_source_host_entry_changed_cb" swapped="no"/>
441 </object> 428 </object>
442 <packing> 429 <packing>
@@ -452,8 +439,6 @@
452 <property name="invisible_char">●</property> 439 <property name="invisible_char">●</property>
453 <property name="primary_icon_activatable">False</property> 440 <property name="primary_icon_activatable">False</property>
454 <property name="secondary_icon_activatable">False</property> 441 <property name="secondary_icon_activatable">False</property>
455 <property name="primary_icon_sensitive">True</property>
456 <property name="secondary_icon_sensitive">True</property>
457 <signal name="changed" handler="GNS_edit_dialog_soa_contact_email_entry_changed_cb" swapped="no"/> 442 <signal name="changed" handler="GNS_edit_dialog_soa_contact_email_entry_changed_cb" swapped="no"/>
458 </object> 443 </object>
459 <packing> 444 <packing>
@@ -505,6 +490,7 @@
505 <property name="can_focus">True</property> 490 <property name="can_focus">True</property>
506 <property name="receives_default">False</property> 491 <property name="receives_default">False</property>
507 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 492 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
493 <property name="xalign">0.5</property>
508 <property name="draw_indicator">True</property> 494 <property name="draw_indicator">True</property>
509 </object> 495 </object>
510 <packing> 496 <packing>
@@ -520,6 +506,7 @@
520 <property name="can_focus">True</property> 506 <property name="can_focus">True</property>
521 <property name="receives_default">False</property> 507 <property name="receives_default">False</property>
522 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 508 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
509 <property name="xalign">0.5</property>
523 <property name="draw_indicator">True</property> 510 <property name="draw_indicator">True</property>
524 </object> 511 </object>
525 <packing> 512 <packing>
@@ -534,6 +521,7 @@
534 <property name="visible">True</property> 521 <property name="visible">True</property>
535 <property name="can_focus">True</property> 522 <property name="can_focus">True</property>
536 <property name="receives_default">False</property> 523 <property name="receives_default">False</property>
524 <property name="xalign">0.5</property>
537 <property name="draw_indicator">True</property> 525 <property name="draw_indicator">True</property>
538 </object> 526 </object>
539 <packing> 527 <packing>
@@ -590,6 +578,7 @@
590 <property name="can_focus">True</property> 578 <property name="can_focus">True</property>
591 <property name="receives_default">False</property> 579 <property name="receives_default">False</property>
592 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 580 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
581 <property name="xalign">0.5</property>
593 <property name="active">True</property> 582 <property name="active">True</property>
594 <property name="draw_indicator">True</property> 583 <property name="draw_indicator">True</property>
595 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 584 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -607,6 +596,7 @@
607 <property name="can_focus">True</property> 596 <property name="can_focus">True</property>
608 <property name="receives_default">False</property> 597 <property name="receives_default">False</property>
609 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 598 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
599 <property name="xalign">0.5</property>
610 <property name="active">True</property> 600 <property name="active">True</property>
611 <property name="draw_indicator">True</property> 601 <property name="draw_indicator">True</property>
612 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 602 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -625,6 +615,7 @@
625 <property name="can_focus">True</property> 615 <property name="can_focus">True</property>
626 <property name="receives_default">False</property> 616 <property name="receives_default">False</property>
627 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 617 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
618 <property name="xalign">0.5</property>
628 <property name="active">True</property> 619 <property name="active">True</property>
629 <property name="draw_indicator">True</property> 620 <property name="draw_indicator">True</property>
630 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 621 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -684,8 +675,6 @@
684 <property name="invisible_char">●</property> 675 <property name="invisible_char">●</property>
685 <property name="primary_icon_activatable">False</property> 676 <property name="primary_icon_activatable">False</property>
686 <property name="secondary_icon_activatable">False</property> 677 <property name="secondary_icon_activatable">False</property>
687 <property name="primary_icon_sensitive">True</property>
688 <property name="secondary_icon_sensitive">True</property>
689 <property name="adjustment">absolute_expiration_hours_adjustment</property> 678 <property name="adjustment">absolute_expiration_hours_adjustment</property>
690 </object> 679 </object>
691 <packing> 680 <packing>
@@ -716,8 +705,6 @@
716 <property name="invisible_char">●</property> 705 <property name="invisible_char">●</property>
717 <property name="primary_icon_activatable">False</property> 706 <property name="primary_icon_activatable">False</property>
718 <property name="secondary_icon_activatable">False</property> 707 <property name="secondary_icon_activatable">False</property>
719 <property name="primary_icon_sensitive">True</property>
720 <property name="secondary_icon_sensitive">True</property>
721 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 708 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
722 </object> 709 </object>
723 <packing> 710 <packing>
@@ -748,8 +735,6 @@
748 <property name="invisible_char">●</property> 735 <property name="invisible_char">●</property>
749 <property name="primary_icon_activatable">False</property> 736 <property name="primary_icon_activatable">False</property>
750 <property name="secondary_icon_activatable">False</property> 737 <property name="secondary_icon_activatable">False</property>
751 <property name="primary_icon_sensitive">True</property>
752 <property name="secondary_icon_sensitive">True</property>
753 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 738 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
754 </object> 739 </object>
755 <packing> 740 <packing>
diff --git a/contrib/gnunet_namestore_edit_srv.glade b/contrib/gnunet_namestore_edit_srv.glade
index c4bd2d74..ff5f7a35 100644
--- a/contrib/gnunet_namestore_edit_srv.glade
+++ b/contrib/gnunet_namestore_edit_srv.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -57,12 +57,13 @@
57 <property name="destroy_with_parent">True</property> 57 <property name="destroy_with_parent">True</property>
58 <property name="type_hint">dialog</property> 58 <property name="type_hint">dialog</property>
59 <child internal-child="vbox"> 59 <child internal-child="vbox">
60 <object class="GtkVBox" id="edit_dialog_vbox"> 60 <object class="GtkBox" id="edit_dialog_vbox">
61 <property name="visible">True</property> 61 <property name="visible">True</property>
62 <property name="can_focus">False</property> 62 <property name="can_focus">False</property>
63 <property name="orientation">vertical</property>
63 <property name="spacing">2</property> 64 <property name="spacing">2</property>
64 <child internal-child="action_area"> 65 <child internal-child="action_area">
65 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 66 <object class="GtkButtonBox" id="edit_dialog_action_area">
66 <property name="visible">True</property> 67 <property name="visible">True</property>
67 <property name="can_focus">False</property> 68 <property name="can_focus">False</property>
68 <property name="layout_style">end</property> 69 <property name="layout_style">end</property>
@@ -144,8 +145,6 @@
144 <property name="invisible_char">●</property> 145 <property name="invisible_char">●</property>
145 <property name="primary_icon_activatable">False</property> 146 <property name="primary_icon_activatable">False</property>
146 <property name="secondary_icon_activatable">False</property> 147 <property name="secondary_icon_activatable">False</property>
147 <property name="primary_icon_sensitive">True</property>
148 <property name="secondary_icon_sensitive">True</property>
149 </object> 148 </object>
150 <packing> 149 <packing>
151 <property name="expand">True</property> 150 <property name="expand">True</property>
@@ -281,8 +280,6 @@
281 <property name="invisible_char">●</property> 280 <property name="invisible_char">●</property>
282 <property name="primary_icon_activatable">False</property> 281 <property name="primary_icon_activatable">False</property>
283 <property name="secondary_icon_activatable">False</property> 282 <property name="secondary_icon_activatable">False</property>
284 <property name="primary_icon_sensitive">True</property>
285 <property name="secondary_icon_sensitive">True</property>
286 <property name="adjustment">srv_priority_adjustment</property> 283 <property name="adjustment">srv_priority_adjustment</property>
287 <property name="numeric">True</property> 284 <property name="numeric">True</property>
288 </object> 285 </object>
@@ -299,8 +296,6 @@
299 <property name="invisible_char">●</property> 296 <property name="invisible_char">●</property>
300 <property name="primary_icon_activatable">False</property> 297 <property name="primary_icon_activatable">False</property>
301 <property name="secondary_icon_activatable">False</property> 298 <property name="secondary_icon_activatable">False</property>
302 <property name="primary_icon_sensitive">True</property>
303 <property name="secondary_icon_sensitive">True</property>
304 <property name="adjustment">srv_weight_adjustment</property> 299 <property name="adjustment">srv_weight_adjustment</property>
305 <property name="numeric">True</property> 300 <property name="numeric">True</property>
306 </object> 301 </object>
@@ -319,8 +314,6 @@
319 <property name="invisible_char">●</property> 314 <property name="invisible_char">●</property>
320 <property name="primary_icon_activatable">False</property> 315 <property name="primary_icon_activatable">False</property>
321 <property name="secondary_icon_activatable">False</property> 316 <property name="secondary_icon_activatable">False</property>
322 <property name="primary_icon_sensitive">True</property>
323 <property name="secondary_icon_sensitive">True</property>
324 <property name="adjustment">srv_port_adjustment</property> 317 <property name="adjustment">srv_port_adjustment</property>
325 <property name="numeric">True</property> 318 <property name="numeric">True</property>
326 </object> 319 </object>
@@ -339,8 +332,6 @@
339 <property name="invisible_char">●</property> 332 <property name="invisible_char">●</property>
340 <property name="primary_icon_activatable">False</property> 333 <property name="primary_icon_activatable">False</property>
341 <property name="secondary_icon_activatable">False</property> 334 <property name="secondary_icon_activatable">False</property>
342 <property name="primary_icon_sensitive">True</property>
343 <property name="secondary_icon_sensitive">True</property>
344 <signal name="changed" handler="GNS_edit_dialog_srv_target_entry_changed_cb" swapped="no"/> 335 <signal name="changed" handler="GNS_edit_dialog_srv_target_entry_changed_cb" swapped="no"/>
345 </object> 336 </object>
346 <packing> 337 <packing>
@@ -392,6 +383,7 @@
392 <property name="can_focus">True</property> 383 <property name="can_focus">True</property>
393 <property name="receives_default">False</property> 384 <property name="receives_default">False</property>
394 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 385 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
386 <property name="xalign">0.5</property>
395 <property name="draw_indicator">True</property> 387 <property name="draw_indicator">True</property>
396 </object> 388 </object>
397 <packing> 389 <packing>
@@ -407,6 +399,7 @@
407 <property name="can_focus">True</property> 399 <property name="can_focus">True</property>
408 <property name="receives_default">False</property> 400 <property name="receives_default">False</property>
409 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 401 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
402 <property name="xalign">0.5</property>
410 <property name="draw_indicator">True</property> 403 <property name="draw_indicator">True</property>
411 </object> 404 </object>
412 <packing> 405 <packing>
@@ -421,6 +414,7 @@
421 <property name="visible">True</property> 414 <property name="visible">True</property>
422 <property name="can_focus">True</property> 415 <property name="can_focus">True</property>
423 <property name="receives_default">False</property> 416 <property name="receives_default">False</property>
417 <property name="xalign">0.5</property>
424 <property name="draw_indicator">True</property> 418 <property name="draw_indicator">True</property>
425 </object> 419 </object>
426 <packing> 420 <packing>
@@ -477,6 +471,7 @@
477 <property name="can_focus">True</property> 471 <property name="can_focus">True</property>
478 <property name="receives_default">False</property> 472 <property name="receives_default">False</property>
479 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 473 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
474 <property name="xalign">0.5</property>
480 <property name="active">True</property> 475 <property name="active">True</property>
481 <property name="draw_indicator">True</property> 476 <property name="draw_indicator">True</property>
482 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 477 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -494,6 +489,7 @@
494 <property name="can_focus">True</property> 489 <property name="can_focus">True</property>
495 <property name="receives_default">False</property> 490 <property name="receives_default">False</property>
496 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 491 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
492 <property name="xalign">0.5</property>
497 <property name="active">True</property> 493 <property name="active">True</property>
498 <property name="draw_indicator">True</property> 494 <property name="draw_indicator">True</property>
499 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 495 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -512,6 +508,7 @@
512 <property name="can_focus">True</property> 508 <property name="can_focus">True</property>
513 <property name="receives_default">False</property> 509 <property name="receives_default">False</property>
514 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 510 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
511 <property name="xalign">0.5</property>
515 <property name="active">True</property> 512 <property name="active">True</property>
516 <property name="draw_indicator">True</property> 513 <property name="draw_indicator">True</property>
517 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 514 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -571,8 +568,6 @@
571 <property name="invisible_char">●</property> 568 <property name="invisible_char">●</property>
572 <property name="primary_icon_activatable">False</property> 569 <property name="primary_icon_activatable">False</property>
573 <property name="secondary_icon_activatable">False</property> 570 <property name="secondary_icon_activatable">False</property>
574 <property name="primary_icon_sensitive">True</property>
575 <property name="secondary_icon_sensitive">True</property>
576 <property name="adjustment">absolute_expiration_hours_adjustment</property> 571 <property name="adjustment">absolute_expiration_hours_adjustment</property>
577 </object> 572 </object>
578 <packing> 573 <packing>
@@ -603,8 +598,6 @@
603 <property name="invisible_char">●</property> 598 <property name="invisible_char">●</property>
604 <property name="primary_icon_activatable">False</property> 599 <property name="primary_icon_activatable">False</property>
605 <property name="secondary_icon_activatable">False</property> 600 <property name="secondary_icon_activatable">False</property>
606 <property name="primary_icon_sensitive">True</property>
607 <property name="secondary_icon_sensitive">True</property>
608 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 601 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
609 </object> 602 </object>
610 <packing> 603 <packing>
@@ -635,8 +628,6 @@
635 <property name="invisible_char">●</property> 628 <property name="invisible_char">●</property>
636 <property name="primary_icon_activatable">False</property> 629 <property name="primary_icon_activatable">False</property>
637 <property name="secondary_icon_activatable">False</property> 630 <property name="secondary_icon_activatable">False</property>
638 <property name="primary_icon_sensitive">True</property>
639 <property name="secondary_icon_sensitive">True</property>
640 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 631 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
641 </object> 632 </object>
642 <packing> 633 <packing>
diff --git a/contrib/gnunet_namestore_edit_tlsa.glade b/contrib/gnunet_namestore_edit_tlsa.glade
index 1f975688..c05d85b5 100644
--- a/contrib/gnunet_namestore_edit_tlsa.glade
+++ b/contrib/gnunet_namestore_edit_tlsa.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -230,6 +229,7 @@
230 <property name="can_focus">True</property> 229 <property name="can_focus">True</property>
231 <property name="receives_default">False</property> 230 <property name="receives_default">False</property>
232 <property name="use_underline">True</property> 231 <property name="use_underline">True</property>
232 <property name="xalign">0.5</property>
233 <property name="active">True</property> 233 <property name="active">True</property>
234 <property name="draw_indicator">True</property> 234 <property name="draw_indicator">True</property>
235 </object> 235 </object>
@@ -247,6 +247,7 @@
247 <property name="can_focus">True</property> 247 <property name="can_focus">True</property>
248 <property name="receives_default">False</property> 248 <property name="receives_default">False</property>
249 <property name="use_underline">True</property> 249 <property name="use_underline">True</property>
250 <property name="xalign">0.5</property>
250 <property name="active">True</property> 251 <property name="active">True</property>
251 <property name="draw_indicator">True</property> 252 <property name="draw_indicator">True</property>
252 <property name="group">edit_dialog_tlsa_usage_ca_radiobutton</property> 253 <property name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
@@ -264,6 +265,7 @@
264 <property name="visible">True</property> 265 <property name="visible">True</property>
265 <property name="can_focus">True</property> 266 <property name="can_focus">True</property>
266 <property name="receives_default">False</property> 267 <property name="receives_default">False</property>
268 <property name="xalign">0.5</property>
267 <property name="yalign">0.60000002384185791</property> 269 <property name="yalign">0.60000002384185791</property>
268 <property name="active">True</property> 270 <property name="active">True</property>
269 <property name="draw_indicator">True</property> 271 <property name="draw_indicator">True</property>
@@ -282,6 +284,7 @@
282 <property name="visible">True</property> 284 <property name="visible">True</property>
283 <property name="can_focus">True</property> 285 <property name="can_focus">True</property>
284 <property name="receives_default">False</property> 286 <property name="receives_default">False</property>
287 <property name="xalign">0.5</property>
285 <property name="active">True</property> 288 <property name="active">True</property>
286 <property name="draw_indicator">True</property> 289 <property name="draw_indicator">True</property>
287 <property name="group">edit_dialog_tlsa_usage_ca_radiobutton</property> 290 <property name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
@@ -323,6 +326,7 @@
323 <property name="visible">True</property> 326 <property name="visible">True</property>
324 <property name="can_focus">True</property> 327 <property name="can_focus">True</property>
325 <property name="receives_default">False</property> 328 <property name="receives_default">False</property>
329 <property name="xalign">0.5</property>
326 <property name="active">True</property> 330 <property name="active">True</property>
327 <property name="draw_indicator">True</property> 331 <property name="draw_indicator">True</property>
328 </object> 332 </object>
@@ -339,6 +343,7 @@
339 <property name="visible">True</property> 343 <property name="visible">True</property>
340 <property name="can_focus">True</property> 344 <property name="can_focus">True</property>
341 <property name="receives_default">False</property> 345 <property name="receives_default">False</property>
346 <property name="xalign">0.5</property>
342 <property name="active">True</property> 347 <property name="active">True</property>
343 <property name="draw_indicator">True</property> 348 <property name="draw_indicator">True</property>
344 <property name="group">edit_dialog_tlsa_selector_full_cert_radiobutton</property> 349 <property name="group">edit_dialog_tlsa_selector_full_cert_radiobutton</property>
@@ -380,6 +385,7 @@
380 <property name="visible">True</property> 385 <property name="visible">True</property>
381 <property name="can_focus">True</property> 386 <property name="can_focus">True</property>
382 <property name="receives_default">False</property> 387 <property name="receives_default">False</property>
388 <property name="xalign">0.5</property>
383 <property name="active">True</property> 389 <property name="active">True</property>
384 <property name="draw_indicator">True</property> 390 <property name="draw_indicator">True</property>
385 </object> 391 </object>
@@ -396,6 +402,7 @@
396 <property name="visible">True</property> 402 <property name="visible">True</property>
397 <property name="can_focus">True</property> 403 <property name="can_focus">True</property>
398 <property name="receives_default">False</property> 404 <property name="receives_default">False</property>
405 <property name="xalign">0.5</property>
399 <property name="active">True</property> 406 <property name="active">True</property>
400 <property name="draw_indicator">True</property> 407 <property name="draw_indicator">True</property>
401 <property name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property> 408 <property name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
@@ -413,6 +420,7 @@
413 <property name="visible">True</property> 420 <property name="visible">True</property>
414 <property name="can_focus">True</property> 421 <property name="can_focus">True</property>
415 <property name="receives_default">False</property> 422 <property name="receives_default">False</property>
423 <property name="xalign">0.5</property>
416 <property name="active">True</property> 424 <property name="active">True</property>
417 <property name="draw_indicator">True</property> 425 <property name="draw_indicator">True</property>
418 <property name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property> 426 <property name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
@@ -495,11 +503,8 @@ For PGP, specify the key identifier.
495</property> 503</property>
496 <property name="max_length">15</property> 504 <property name="max_length">15</property>
497 <property name="invisible_char">●</property> 505 <property name="invisible_char">●</property>
498 <property name="invisible_char_set">True</property>
499 <property name="primary_icon_activatable">False</property> 506 <property name="primary_icon_activatable">False</property>
500 <property name="secondary_icon_activatable">False</property> 507 <property name="secondary_icon_activatable">False</property>
501 <property name="primary_icon_sensitive">True</property>
502 <property name="secondary_icon_sensitive">True</property>
503 <signal name="changed" handler="GNS_edit_dialog_tlsa_entry_changed_cb" swapped="no"/> 508 <signal name="changed" handler="GNS_edit_dialog_tlsa_entry_changed_cb" swapped="no"/>
504 </object> 509 </object>
505 <packing> 510 <packing>
@@ -575,6 +580,7 @@ For PGP, specify the key identifier.
575 <property name="can_focus">True</property> 580 <property name="can_focus">True</property>
576 <property name="receives_default">False</property> 581 <property name="receives_default">False</property>
577 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 582 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
583 <property name="xalign">0.5</property>
578 <property name="draw_indicator">True</property> 584 <property name="draw_indicator">True</property>
579 </object> 585 </object>
580 <packing> 586 <packing>
@@ -590,6 +596,7 @@ For PGP, specify the key identifier.
590 <property name="can_focus">True</property> 596 <property name="can_focus">True</property>
591 <property name="receives_default">False</property> 597 <property name="receives_default">False</property>
592 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 598 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
599 <property name="xalign">0.5</property>
593 <property name="draw_indicator">True</property> 600 <property name="draw_indicator">True</property>
594 </object> 601 </object>
595 <packing> 602 <packing>
@@ -604,6 +611,7 @@ For PGP, specify the key identifier.
604 <property name="visible">True</property> 611 <property name="visible">True</property>
605 <property name="can_focus">True</property> 612 <property name="can_focus">True</property>
606 <property name="receives_default">False</property> 613 <property name="receives_default">False</property>
614 <property name="xalign">0.5</property>
607 <property name="draw_indicator">True</property> 615 <property name="draw_indicator">True</property>
608 </object> 616 </object>
609 <packing> 617 <packing>
@@ -660,6 +668,7 @@ For PGP, specify the key identifier.
660 <property name="can_focus">True</property> 668 <property name="can_focus">True</property>
661 <property name="receives_default">False</property> 669 <property name="receives_default">False</property>
662 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 670 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
671 <property name="xalign">0.5</property>
663 <property name="active">True</property> 672 <property name="active">True</property>
664 <property name="draw_indicator">True</property> 673 <property name="draw_indicator">True</property>
665 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 674 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -677,6 +686,7 @@ For PGP, specify the key identifier.
677 <property name="can_focus">True</property> 686 <property name="can_focus">True</property>
678 <property name="receives_default">False</property> 687 <property name="receives_default">False</property>
679 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 688 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
689 <property name="xalign">0.5</property>
680 <property name="active">True</property> 690 <property name="active">True</property>
681 <property name="draw_indicator">True</property> 691 <property name="draw_indicator">True</property>
682 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 692 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -695,6 +705,7 @@ For PGP, specify the key identifier.
695 <property name="can_focus">True</property> 705 <property name="can_focus">True</property>
696 <property name="receives_default">False</property> 706 <property name="receives_default">False</property>
697 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 707 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
708 <property name="xalign">0.5</property>
698 <property name="active">True</property> 709 <property name="active">True</property>
699 <property name="draw_indicator">True</property> 710 <property name="draw_indicator">True</property>
700 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 711 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -754,8 +765,6 @@ For PGP, specify the key identifier.
754 <property name="invisible_char">●</property> 765 <property name="invisible_char">●</property>
755 <property name="primary_icon_activatable">False</property> 766 <property name="primary_icon_activatable">False</property>
756 <property name="secondary_icon_activatable">False</property> 767 <property name="secondary_icon_activatable">False</property>
757 <property name="primary_icon_sensitive">True</property>
758 <property name="secondary_icon_sensitive">True</property>
759 <property name="adjustment">absolute_expiration_hours_adjustment</property> 768 <property name="adjustment">absolute_expiration_hours_adjustment</property>
760 </object> 769 </object>
761 <packing> 770 <packing>
@@ -786,8 +795,6 @@ For PGP, specify the key identifier.
786 <property name="invisible_char">●</property> 795 <property name="invisible_char">●</property>
787 <property name="primary_icon_activatable">False</property> 796 <property name="primary_icon_activatable">False</property>
788 <property name="secondary_icon_activatable">False</property> 797 <property name="secondary_icon_activatable">False</property>
789 <property name="primary_icon_sensitive">True</property>
790 <property name="secondary_icon_sensitive">True</property>
791 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 798 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
792 </object> 799 </object>
793 <packing> 800 <packing>
@@ -818,8 +825,6 @@ For PGP, specify the key identifier.
818 <property name="invisible_char">●</property> 825 <property name="invisible_char">●</property>
819 <property name="primary_icon_activatable">False</property> 826 <property name="primary_icon_activatable">False</property>
820 <property name="secondary_icon_activatable">False</property> 827 <property name="secondary_icon_activatable">False</property>
821 <property name="primary_icon_sensitive">True</property>
822 <property name="secondary_icon_sensitive">True</property>
823 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 828 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
824 </object> 829 </object>
825 <packing> 830 <packing>
diff --git a/contrib/gnunet_namestore_edit_txt.glade b/contrib/gnunet_namestore_edit_txt.glade
index cb0926e3..2b5510ca 100644
--- a/contrib/gnunet_namestore_edit_txt.glade
+++ b/contrib/gnunet_namestore_edit_txt.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -215,8 +214,6 @@
215 <property name="invisible_char">●</property> 214 <property name="invisible_char">●</property>
216 <property name="primary_icon_activatable">False</property> 215 <property name="primary_icon_activatable">False</property>
217 <property name="secondary_icon_activatable">False</property> 216 <property name="secondary_icon_activatable">False</property>
218 <property name="primary_icon_sensitive">True</property>
219 <property name="secondary_icon_sensitive">True</property>
220 <signal name="changed" handler="GNS_edit_dialog_txt_entry_changed_cb" swapped="no"/> 217 <signal name="changed" handler="GNS_edit_dialog_txt_entry_changed_cb" swapped="no"/>
221 </object> 218 </object>
222 <packing> 219 <packing>
@@ -267,6 +264,7 @@
267 <property name="can_focus">True</property> 264 <property name="can_focus">True</property>
268 <property name="receives_default">False</property> 265 <property name="receives_default">False</property>
269 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 266 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
267 <property name="xalign">0.5</property>
270 <property name="draw_indicator">True</property> 268 <property name="draw_indicator">True</property>
271 </object> 269 </object>
272 <packing> 270 <packing>
@@ -282,6 +280,7 @@
282 <property name="can_focus">True</property> 280 <property name="can_focus">True</property>
283 <property name="receives_default">False</property> 281 <property name="receives_default">False</property>
284 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 282 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
283 <property name="xalign">0.5</property>
285 <property name="draw_indicator">True</property> 284 <property name="draw_indicator">True</property>
286 </object> 285 </object>
287 <packing> 286 <packing>
@@ -296,6 +295,7 @@
296 <property name="visible">True</property> 295 <property name="visible">True</property>
297 <property name="can_focus">True</property> 296 <property name="can_focus">True</property>
298 <property name="receives_default">False</property> 297 <property name="receives_default">False</property>
298 <property name="xalign">0.5</property>
299 <property name="draw_indicator">True</property> 299 <property name="draw_indicator">True</property>
300 </object> 300 </object>
301 <packing> 301 <packing>
@@ -352,6 +352,7 @@
352 <property name="can_focus">True</property> 352 <property name="can_focus">True</property>
353 <property name="receives_default">False</property> 353 <property name="receives_default">False</property>
354 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 354 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
355 <property name="xalign">0.5</property>
355 <property name="active">True</property> 356 <property name="active">True</property>
356 <property name="draw_indicator">True</property> 357 <property name="draw_indicator">True</property>
357 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 358 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -369,6 +370,7 @@
369 <property name="can_focus">True</property> 370 <property name="can_focus">True</property>
370 <property name="receives_default">False</property> 371 <property name="receives_default">False</property>
371 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 372 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
373 <property name="xalign">0.5</property>
372 <property name="active">True</property> 374 <property name="active">True</property>
373 <property name="draw_indicator">True</property> 375 <property name="draw_indicator">True</property>
374 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 376 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -387,6 +389,7 @@
387 <property name="can_focus">True</property> 389 <property name="can_focus">True</property>
388 <property name="receives_default">False</property> 390 <property name="receives_default">False</property>
389 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 391 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
392 <property name="xalign">0.5</property>
390 <property name="active">True</property> 393 <property name="active">True</property>
391 <property name="draw_indicator">True</property> 394 <property name="draw_indicator">True</property>
392 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 395 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -446,8 +449,6 @@
446 <property name="invisible_char">●</property> 449 <property name="invisible_char">●</property>
447 <property name="primary_icon_activatable">False</property> 450 <property name="primary_icon_activatable">False</property>
448 <property name="secondary_icon_activatable">False</property> 451 <property name="secondary_icon_activatable">False</property>
449 <property name="primary_icon_sensitive">True</property>
450 <property name="secondary_icon_sensitive">True</property>
451 <property name="adjustment">absolute_expiration_hours_adjustment</property> 452 <property name="adjustment">absolute_expiration_hours_adjustment</property>
452 </object> 453 </object>
453 <packing> 454 <packing>
@@ -478,8 +479,6 @@
478 <property name="invisible_char">●</property> 479 <property name="invisible_char">●</property>
479 <property name="primary_icon_activatable">False</property> 480 <property name="primary_icon_activatable">False</property>
480 <property name="secondary_icon_activatable">False</property> 481 <property name="secondary_icon_activatable">False</property>
481 <property name="primary_icon_sensitive">True</property>
482 <property name="secondary_icon_sensitive">True</property>
483 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 482 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
484 </object> 483 </object>
485 <packing> 484 <packing>
@@ -510,8 +509,6 @@
510 <property name="invisible_char">●</property> 509 <property name="invisible_char">●</property>
511 <property name="primary_icon_activatable">False</property> 510 <property name="primary_icon_activatable">False</property>
512 <property name="secondary_icon_activatable">False</property> 511 <property name="secondary_icon_activatable">False</property>
513 <property name="primary_icon_sensitive">True</property>
514 <property name="secondary_icon_sensitive">True</property>
515 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 512 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
516 </object> 513 </object>
517 <packing> 514 <packing>
diff --git a/contrib/gnunet_namestore_edit_vpn.glade b/contrib/gnunet_namestore_edit_vpn.glade
index 2e8fef92..ae63f311 100644
--- a/contrib/gnunet_namestore_edit_vpn.glade
+++ b/contrib/gnunet_namestore_edit_vpn.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment"> 5 <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
6 <property name="upper">23</property> 6 <property name="upper">23</property>
7 <property name="step_increment">1</property> 7 <property name="step_increment">1</property>
@@ -42,12 +42,13 @@
42 <property name="destroy_with_parent">True</property> 42 <property name="destroy_with_parent">True</property>
43 <property name="type_hint">dialog</property> 43 <property name="type_hint">dialog</property>
44 <child internal-child="vbox"> 44 <child internal-child="vbox">
45 <object class="GtkVBox" id="edit_dialog_vbox"> 45 <object class="GtkBox" id="edit_dialog_vbox">
46 <property name="visible">True</property> 46 <property name="visible">True</property>
47 <property name="can_focus">False</property> 47 <property name="can_focus">False</property>
48 <property name="orientation">vertical</property>
48 <property name="spacing">2</property> 49 <property name="spacing">2</property>
49 <child internal-child="action_area"> 50 <child internal-child="action_area">
50 <object class="GtkHButtonBox" id="edit_dialog_action_area"> 51 <object class="GtkButtonBox" id="edit_dialog_action_area">
51 <property name="visible">True</property> 52 <property name="visible">True</property>
52 <property name="can_focus">False</property> 53 <property name="can_focus">False</property>
53 <property name="layout_style">end</property> 54 <property name="layout_style">end</property>
@@ -129,8 +130,6 @@
129 <property name="invisible_char">●</property> 130 <property name="invisible_char">●</property>
130 <property name="primary_icon_activatable">False</property> 131 <property name="primary_icon_activatable">False</property>
131 <property name="secondary_icon_activatable">False</property> 132 <property name="secondary_icon_activatable">False</property>
132 <property name="primary_icon_sensitive">True</property>
133 <property name="secondary_icon_sensitive">True</property>
134 </object> 133 </object>
135 <packing> 134 <packing>
136 <property name="expand">True</property> 135 <property name="expand">True</property>
@@ -256,6 +255,7 @@
256 <property name="can_focus">True</property> 255 <property name="can_focus">True</property>
257 <property name="receives_default">False</property> 256 <property name="receives_default">False</property>
258 <property name="tooltip_text" translatable="yes">Service is available via TCP</property> 257 <property name="tooltip_text" translatable="yes">Service is available via TCP</property>
258 <property name="xalign">0.5</property>
259 <property name="active">True</property> 259 <property name="active">True</property>
260 <property name="draw_indicator">True</property> 260 <property name="draw_indicator">True</property>
261 </object> 261 </object>
@@ -272,6 +272,7 @@
272 <property name="can_focus">True</property> 272 <property name="can_focus">True</property>
273 <property name="receives_default">False</property> 273 <property name="receives_default">False</property>
274 <property name="tooltip_text" translatable="yes">Service is available via UDP</property> 274 <property name="tooltip_text" translatable="yes">Service is available via UDP</property>
275 <property name="xalign">0.5</property>
275 <property name="active">True</property> 276 <property name="active">True</property>
276 <property name="draw_indicator">True</property> 277 <property name="draw_indicator">True</property>
277 <property name="group">edit_dialog_vpn_protocol_tcp_radiobutton</property> 278 <property name="group">edit_dialog_vpn_protocol_tcp_radiobutton</property>
@@ -297,8 +298,6 @@
297 <property name="invisible_char">●</property> 298 <property name="invisible_char">●</property>
298 <property name="primary_icon_activatable">False</property> 299 <property name="primary_icon_activatable">False</property>
299 <property name="secondary_icon_activatable">False</property> 300 <property name="secondary_icon_activatable">False</property>
300 <property name="primary_icon_sensitive">True</property>
301 <property name="secondary_icon_sensitive">True</property>
302 <signal name="changed" handler="GNS_edit_dialog_vpn_peer_entry_changed_cb" swapped="no"/> 301 <signal name="changed" handler="GNS_edit_dialog_vpn_peer_entry_changed_cb" swapped="no"/>
303 </object> 302 </object>
304 <packing> 303 <packing>
@@ -316,8 +315,6 @@
316 <property name="invisible_char">●</property> 315 <property name="invisible_char">●</property>
317 <property name="primary_icon_activatable">False</property> 316 <property name="primary_icon_activatable">False</property>
318 <property name="secondary_icon_activatable">False</property> 317 <property name="secondary_icon_activatable">False</property>
319 <property name="primary_icon_sensitive">True</property>
320 <property name="secondary_icon_sensitive">True</property>
321 </object> 318 </object>
322 <packing> 319 <packing>
323 <property name="left_attach">1</property> 320 <property name="left_attach">1</property>
@@ -368,6 +365,7 @@
368 <property name="can_focus">True</property> 365 <property name="can_focus">True</property>
369 <property name="receives_default">False</property> 366 <property name="receives_default">False</property>
370 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property> 367 <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well. Please be aware that once a record is made public, you are less free to change expiration times. Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
368 <property name="xalign">0.5</property>
371 <property name="draw_indicator">True</property> 369 <property name="draw_indicator">True</property>
372 </object> 370 </object>
373 <packing> 371 <packing>
@@ -383,6 +381,7 @@
383 <property name="can_focus">True</property> 381 <property name="can_focus">True</property>
384 <property name="receives_default">False</property> 382 <property name="receives_default">False</property>
385 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property> 383 <property name="tooltip_text" translatable="yes">A shadow record is a record which becomes valid in the future. They are not used as long as a second non-expired record with the same name and type exists. This is useful if a mapping is to be changed as soon as an existing record expires. For example, if a users are supposed to switch at midnight from one IP address to another, two records would be placed into the system: one that is valid until midnight, and a second "shadow" record that becomes valid at midnight.</property>
384 <property name="xalign">0.5</property>
386 <property name="draw_indicator">True</property> 385 <property name="draw_indicator">True</property>
387 </object> 386 </object>
388 <packing> 387 <packing>
@@ -397,6 +396,7 @@
397 <property name="visible">True</property> 396 <property name="visible">True</property>
398 <property name="can_focus">True</property> 397 <property name="can_focus">True</property>
399 <property name="receives_default">False</property> 398 <property name="receives_default">False</property>
399 <property name="xalign">0.5</property>
400 <property name="draw_indicator">True</property> 400 <property name="draw_indicator">True</property>
401 </object> 401 </object>
402 <packing> 402 <packing>
@@ -453,6 +453,7 @@
453 <property name="can_focus">True</property> 453 <property name="can_focus">True</property>
454 <property name="receives_default">False</property> 454 <property name="receives_default">False</property>
455 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property> 455 <property name="tooltip_text" translatable="yes">Records with a relative expiration time (such as 1 week) are always valid for at least that time period into the future. In other words, the auto-renew their own expiration to the given time period into the future. When you convert a public record with a relative expiration time to one with an absolute expiration time, the earliest possible expiration will be the respective relative time in the future. Use relative expiration times for entries for which you do not know a specific date when they will expire.</property>
456 <property name="xalign">0.5</property>
456 <property name="active">True</property> 457 <property name="active">True</property>
457 <property name="draw_indicator">True</property> 458 <property name="draw_indicator">True</property>
458 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/> 459 <signal name="toggled" handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb" swapped="no"/>
@@ -470,6 +471,7 @@
470 <property name="can_focus">True</property> 471 <property name="can_focus">True</property>
471 <property name="receives_default">False</property> 472 <property name="receives_default">False</property>
472 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property> 473 <property name="tooltip_text" translatable="yes">Records with an absolute expiration time are valid until the specified date. You can change that date to an even later date, but you cannot set it to an earlier time (as other users may have cached the longer expiration time). Use absolute expiration times if you know that a particular record will only be valid until a particular day.</property>
474 <property name="xalign">0.5</property>
473 <property name="active">True</property> 475 <property name="active">True</property>
474 <property name="draw_indicator">True</property> 476 <property name="draw_indicator">True</property>
475 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 477 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -488,6 +490,7 @@
488 <property name="can_focus">True</property> 490 <property name="can_focus">True</property>
489 <property name="receives_default">False</property> 491 <property name="receives_default">False</property>
490 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property> 492 <property name="tooltip_text" translatable="yes">Records can be set to be valid forever. This is great if you are worried about censorship or certain that the mapping will never change. Note that if you set a public record to never expire, you cannot later change it (as other users are free to cache the old value forever).</property>
493 <property name="xalign">0.5</property>
491 <property name="active">True</property> 494 <property name="active">True</property>
492 <property name="draw_indicator">True</property> 495 <property name="draw_indicator">True</property>
493 <property name="group">edit_dialog_expiration_relative_radiobutton</property> 496 <property name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -547,8 +550,6 @@
547 <property name="invisible_char">●</property> 550 <property name="invisible_char">●</property>
548 <property name="primary_icon_activatable">False</property> 551 <property name="primary_icon_activatable">False</property>
549 <property name="secondary_icon_activatable">False</property> 552 <property name="secondary_icon_activatable">False</property>
550 <property name="primary_icon_sensitive">True</property>
551 <property name="secondary_icon_sensitive">True</property>
552 <property name="adjustment">absolute_expiration_hours_adjustment</property> 553 <property name="adjustment">absolute_expiration_hours_adjustment</property>
553 </object> 554 </object>
554 <packing> 555 <packing>
@@ -579,8 +580,6 @@
579 <property name="invisible_char">●</property> 580 <property name="invisible_char">●</property>
580 <property name="primary_icon_activatable">False</property> 581 <property name="primary_icon_activatable">False</property>
581 <property name="secondary_icon_activatable">False</property> 582 <property name="secondary_icon_activatable">False</property>
582 <property name="primary_icon_sensitive">True</property>
583 <property name="secondary_icon_sensitive">True</property>
584 <property name="adjustment">absolute_expiration_minutes_adjustment</property> 583 <property name="adjustment">absolute_expiration_minutes_adjustment</property>
585 </object> 584 </object>
586 <packing> 585 <packing>
@@ -611,8 +610,6 @@
611 <property name="invisible_char">●</property> 610 <property name="invisible_char">●</property>
612 <property name="primary_icon_activatable">False</property> 611 <property name="primary_icon_activatable">False</property>
613 <property name="secondary_icon_activatable">False</property> 612 <property name="secondary_icon_activatable">False</property>
614 <property name="primary_icon_sensitive">True</property>
615 <property name="secondary_icon_sensitive">True</property>
616 <property name="adjustment">absolute_expiration_seconds_adjustment</property> 613 <property name="adjustment">absolute_expiration_seconds_adjustment</property>
617 </object> 614 </object>
618 <packing> 615 <packing>
diff --git a/contrib/gnunet_namestore_gtk_main_window.glade b/contrib/gnunet_namestore_gtk_main_window.glade
index ed8d5c09..fd3f3916 100644
--- a/contrib/gnunet_namestore_gtk_main_window.glade
+++ b/contrib/gnunet_namestore_gtk_main_window.glade
@@ -1,7 +1,120 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy toplevel-contextual --> 5 <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8 <child>
9 <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
10 <property name="visible">True</property>
11 <property name="can_focus">False</property>
12 <property name="tooltip_text" translatable="yes">Edit GNS entry</property>
13 <property name="label" translatable="yes">Edit</property>
14 <signal name="activate" handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
15 </object>
16 </child>
17 </object>
18 <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
19 <columns>
20 <!-- column-name name -->
21 <column type="gchararray"/>
22 <!-- column-name is_public -->
23 <column type="gboolean"/>
24 <!-- column-name record_type -->
25 <column type="guint"/>
26 <!-- column-name record_type_as_string -->
27 <column type="gchararray"/>
28 <!-- column-name expiration_time -->
29 <column type="guint64"/>
30 <!-- column-name expiration_time_is_relative -->
31 <column type="gboolean"/>
32 <!-- column-name expiration_time_as_string -->
33 <column type="gchararray"/>
34 <!-- column-name value_as_string -->
35 <column type="gchararray"/>
36 <!-- column-name value_color -->
37 <column type="gchararray"/>
38 <!-- column-name name_is_editable -->
39 <column type="gboolean"/>
40 <!-- column-name name_is_record_row -->
41 <column type="gboolean"/>
42 <!-- column-name not_dummy_row -->
43 <column type="gboolean"/>
44 <!-- column-name expiration_time_color -->
45 <column type="gchararray"/>
46 <!-- column-name name_color -->
47 <column type="gchararray"/>
48 <!-- column-name type_is_editable -->
49 <column type="gboolean"/>
50 <!-- column-name is_shadow -->
51 <column type="gboolean"/>
52 <!-- column-name name_is_editable1 -->
53 <column type="gboolean"/>
54 <!-- column-name record_offset -->
55 <column type="guint"/>
56 <!-- column-name record_is_pending -->
57 <column type="gboolean"/>
58 </columns>
59 </object>
60 <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
61 <columns>
62 <!-- column-name type -->
63 <column type="guint"/>
64 <!-- column-name typename -->
65 <column type="gchararray"/>
66 </columns>
67 <data>
68 <row>
69 <col id="0">1</col>
70 <col id="1">A</col>
71 </row>
72 <row>
73 <col id="0">5</col>
74 <col id="1">CNAME</col>
75 </row>
76 <row>
77 <col id="0">15</col>
78 <col id="1">MX</col>
79 </row>
80 <row>
81 <col id="0">16</col>
82 <col id="1">TXT</col>
83 </row>
84 <row>
85 <col id="0">28</col>
86 <col id="1">AAAA</col>
87 </row>
88 <row>
89 <col id="0">65536</col>
90 <col id="1">PKEY</col>
91 </row>
92 <row>
93 <col id="0">65538</col>
94 <col id="1">LEHO</col>
95 </row>
96 <row>
97 <col id="0">65539</col>
98 <col id="1">VPN</col>
99 </row>
100 <row>
101 <col id="0">65540</col>
102 <col id="1">GNS2DNS</col>
103 </row>
104 <row>
105 <col id="0">65542</col>
106 <col id="1">PHONE</col>
107 </row>
108 </data>
109 </object>
110 <object class="GtkListStore" id="zone_liststore">
111 <columns>
112 <!-- column-name ego_name -->
113 <column type="gchararray"/>
114 <!-- column-name ego -->
115 <column type="gpointer"/>
116 </columns>
117 </object>
5 <object class="GtkDialog" id="gnunet_namestore_gtk_dialog"> 118 <object class="GtkDialog" id="gnunet_namestore_gtk_dialog">
6 <property name="width_request">800</property> 119 <property name="width_request">800</property>
7 <property name="height_request">600</property> 120 <property name="height_request">600</property>
@@ -14,9 +127,10 @@
14 <property name="type_hint">normal</property> 127 <property name="type_hint">normal</property>
15 <signal name="destroy" handler="gnunet_namestore_gtk_quit_cb" swapped="no"/> 128 <signal name="destroy" handler="gnunet_namestore_gtk_quit_cb" swapped="no"/>
16 <child internal-child="vbox"> 129 <child internal-child="vbox">
17 <object class="GtkVBox" id="gnunet_namestore_gtk_dialog-vbox"> 130 <object class="GtkBox" id="gnunet_namestore_gtk_dialog-vbox">
18 <property name="visible">True</property> 131 <property name="visible">True</property>
19 <property name="can_focus">False</property> 132 <property name="can_focus">False</property>
133 <property name="orientation">vertical</property>
20 <property name="spacing">2</property> 134 <property name="spacing">2</property>
21 <child> 135 <child>
22 <object class="GtkVBox" id="gnunet_namestore_gtk_vbox"> 136 <object class="GtkVBox" id="gnunet_namestore_gtk_vbox">
@@ -94,11 +208,8 @@
94 <property name="max_length">63</property> 208 <property name="max_length">63</property>
95 <property name="invisible_char">●</property> 209 <property name="invisible_char">●</property>
96 <property name="width_chars">32</property> 210 <property name="width_chars">32</property>
97 <property name="invisible_char_set">True</property>
98 <property name="primary_icon_activatable">False</property> 211 <property name="primary_icon_activatable">False</property>
99 <property name="secondary_icon_activatable">False</property> 212 <property name="secondary_icon_activatable">False</property>
100 <property name="primary_icon_sensitive">True</property>
101 <property name="secondary_icon_sensitive">True</property>
102 <signal name="changed" handler="gnunet_namestore_gtk_pseu_entry_changed_cb" swapped="no"/> 213 <signal name="changed" handler="gnunet_namestore_gtk_pseu_entry_changed_cb" swapped="no"/>
103 </object> 214 </object>
104 <packing> 215 <packing>
@@ -209,8 +320,6 @@
209 <child> 320 <child>
210 <object class="GtkScrolledWindow" id="gnunet_namestore_gtk_scrolledwindow"> 321 <object class="GtkScrolledWindow" id="gnunet_namestore_gtk_scrolledwindow">
211 <property name="can_focus">True</property> 322 <property name="can_focus">True</property>
212 <property name="hscrollbar_policy">automatic</property>
213 <property name="vscrollbar_policy">automatic</property>
214 <child> 323 <child>
215 <object class="GtkTreeView" id="gnunet_namestore_gtk_treeview"> 324 <object class="GtkTreeView" id="gnunet_namestore_gtk_treeview">
216 <property name="visible">True</property> 325 <property name="visible">True</property>
@@ -220,6 +329,9 @@
220 <signal name="button-press-event" handler="gnunet_namestore_gtk_treeview_button_press_event_cb" swapped="no"/> 329 <signal name="button-press-event" handler="gnunet_namestore_gtk_treeview_button_press_event_cb" swapped="no"/>
221 <signal name="key-press-event" handler="gnunet_namestore_gtk_treeview_key_press_event_cb" swapped="no"/> 330 <signal name="key-press-event" handler="gnunet_namestore_gtk_treeview_key_press_event_cb" swapped="no"/>
222 <signal name="popup-menu" handler="gnunet_namestore_gtk_treeview_popup_menu_cb" swapped="no"/> 331 <signal name="popup-menu" handler="gnunet_namestore_gtk_treeview_popup_menu_cb" swapped="no"/>
332 <child internal-child="selection">
333 <object class="GtkTreeSelection" id="treeview-selection1"/>
334 </child>
223 <child> 335 <child>
224 <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_name_treeviewcolumn"> 336 <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_name_treeviewcolumn">
225 <property name="title">Name</property> 337 <property name="title">Name</property>
@@ -346,7 +458,7 @@
346 </packing> 458 </packing>
347 </child> 459 </child>
348 <child internal-child="action_area"> 460 <child internal-child="action_area">
349 <object class="GtkHButtonBox" id="gnunet_namestore_gtk_dialog-action_area"> 461 <object class="GtkButtonBox" id="gnunet_namestore_gtk_dialog-action_area">
350 <property name="can_focus">False</property> 462 <property name="can_focus">False</property>
351 <property name="layout_style">end</property> 463 <property name="layout_style">end</property>
352 <child> 464 <child>
@@ -404,117 +516,4 @@
404 <action-widget response="-3">gnunet_namestore_gtk_save_button</action-widget> 516 <action-widget response="-3">gnunet_namestore_gtk_save_button</action-widget>
405 </action-widgets> 517 </action-widgets>
406 </object> 518 </object>
407 <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
408 <property name="visible">True</property>
409 <property name="can_focus">False</property>
410 <child>
411 <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
412 <property name="visible">True</property>
413 <property name="can_focus">False</property>
414 <property name="tooltip_text" translatable="yes">Edit GNS entry</property>
415 <property name="label" translatable="yes">Edit</property>
416 <signal name="activate" handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
417 </object>
418 </child>
419 </object>
420 <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
421 <columns>
422 <!-- column-name name -->
423 <column type="gchararray"/>
424 <!-- column-name is_public -->
425 <column type="gboolean"/>
426 <!-- column-name record_type -->
427 <column type="guint"/>
428 <!-- column-name record_type_as_string -->
429 <column type="gchararray"/>
430 <!-- column-name expiration_time -->
431 <column type="guint64"/>
432 <!-- column-name expiration_time_is_relative -->
433 <column type="gboolean"/>
434 <!-- column-name expiration_time_as_string -->
435 <column type="gchararray"/>
436 <!-- column-name value_as_string -->
437 <column type="gchararray"/>
438 <!-- column-name value_color -->
439 <column type="gchararray"/>
440 <!-- column-name name_is_editable -->
441 <column type="gboolean"/>
442 <!-- column-name name_is_record_row -->
443 <column type="gboolean"/>
444 <!-- column-name not_dummy_row -->
445 <column type="gboolean"/>
446 <!-- column-name expiration_time_color -->
447 <column type="gchararray"/>
448 <!-- column-name name_color -->
449 <column type="gchararray"/>
450 <!-- column-name type_is_editable -->
451 <column type="gboolean"/>
452 <!-- column-name is_shadow -->
453 <column type="gboolean"/>
454 <!-- column-name name_is_editable1 -->
455 <column type="gboolean"/>
456 <!-- column-name record_offset -->
457 <column type="guint"/>
458 <!-- column-name record_is_pending -->
459 <column type="gboolean"/>
460 </columns>
461 </object>
462 <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
463 <columns>
464 <!-- column-name type -->
465 <column type="guint"/>
466 <!-- column-name typename -->
467 <column type="gchararray"/>
468 </columns>
469 <data>
470 <row>
471 <col id="0">1</col>
472 <col id="1">A</col>
473 </row>
474 <row>
475 <col id="0">5</col>
476 <col id="1">CNAME</col>
477 </row>
478 <row>
479 <col id="0">15</col>
480 <col id="1">MX</col>
481 </row>
482 <row>
483 <col id="0">16</col>
484 <col id="1">TXT</col>
485 </row>
486 <row>
487 <col id="0">28</col>
488 <col id="1">AAAA</col>
489 </row>
490 <row>
491 <col id="0">65536</col>
492 <col id="1">PKEY</col>
493 </row>
494 <row>
495 <col id="0">65538</col>
496 <col id="1">LEHO</col>
497 </row>
498 <row>
499 <col id="0">65539</col>
500 <col id="1">VPN</col>
501 </row>
502 <row>
503 <col id="0">65540</col>
504 <col id="1">GNS2DNS</col>
505 </row>
506 <row>
507 <col id="0">65542</col>
508 <col id="1">PHONE</col>
509 </row>
510 </data>
511 </object>
512 <object class="GtkListStore" id="zone_liststore">
513 <columns>
514 <!-- column-name ego_name -->
515 <column type="gchararray"/>
516 <!-- column-name ego -->
517 <column type="gpointer"/>
518 </columns>
519 </object>
520</interface> 519</interface>
diff --git a/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade b/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
index da5806ac..5e13902e 100644
--- a/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
+++ b/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.24"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkFileChooserDialog" id="gnunet_namestore_gtk_qr_save_as_dialog"> 5 <object class="GtkFileChooserDialog" id="gnunet_namestore_gtk_qr_save_as_dialog">
6 <property name="can_focus">False</property> 6 <property name="can_focus">False</property>
7 <property name="border_width">5</property> 7 <property name="border_width">5</property>
@@ -14,12 +14,13 @@
14 <property name="action">save</property> 14 <property name="action">save</property>
15 <signal name="response" handler="gnunet_namestore_gtk_qr_save_as_dialog_response_cb" swapped="no"/> 15 <signal name="response" handler="gnunet_namestore_gtk_qr_save_as_dialog_response_cb" swapped="no"/>
16 <child internal-child="vbox"> 16 <child internal-child="vbox">
17 <object class="GtkVBox" id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-vbox"> 17 <object class="GtkBox" id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-vbox">
18 <property name="visible">True</property> 18 <property name="visible">True</property>
19 <property name="can_focus">False</property> 19 <property name="can_focus">False</property>
20 <property name="orientation">vertical</property>
20 <property name="spacing">2</property> 21 <property name="spacing">2</property>
21 <child internal-child="action_area"> 22 <child internal-child="action_area">
22 <object class="GtkHButtonBox" id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-action_area"> 23 <object class="GtkButtonBox" id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-action_area">
23 <property name="visible">True</property> 24 <property name="visible">True</property>
24 <property name="can_focus">False</property> 25 <property name="can_focus">False</property>
25 <property name="layout_style">end</property> 26 <property name="layout_style">end</property>
diff --git a/contrib/gnunet_statistics_gtk_main_window.glade b/contrib/gnunet_statistics_gtk_main_window.glade
index a1d70f7c..3e5a4932 100644
--- a/contrib/gnunet_statistics_gtk_main_window.glade
+++ b/contrib/gnunet_statistics_gtk_main_window.glade
@@ -1,6 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.18.3 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <object class="GtkWindow" id="GNUNET_STATISTICS_GTK_main_window"> 5 <object class="GtkWindow" id="GNUNET_STATISTICS_GTK_main_window">
5 <property name="can_focus">False</property> 6 <property name="can_focus">False</property>
6 <property name="title" translatable="yes">gnunet-statistics-gtk</property> 7 <property name="title" translatable="yes">gnunet-statistics-gtk</property>
@@ -19,9 +20,9 @@
19 <property name="can_focus">False</property> 20 <property name="can_focus">False</property>
20 <child> 21 <child>
21 <object class="GtkMenuItem" id="GNUNET_STATISTICS_GTK_main_menu_help"> 22 <object class="GtkMenuItem" id="GNUNET_STATISTICS_GTK_main_menu_help">
23 <property name="use_action_appearance">False</property>
22 <property name="visible">True</property> 24 <property name="visible">True</property>
23 <property name="can_focus">False</property> 25 <property name="can_focus">False</property>
24 <property name="use_action_appearance">False</property>
25 <property name="label" translatable="yes">_Help</property> 26 <property name="label" translatable="yes">_Help</property>
26 <property name="use_underline">True</property> 27 <property name="use_underline">True</property>
27 <child type="submenu"> 28 <child type="submenu">
@@ -31,10 +32,10 @@
31 <child> 32 <child>
32 <object class="GtkImageMenuItem" id="GNUNET_STATISTICS_GTK_main_menu_help_about"> 33 <object class="GtkImageMenuItem" id="GNUNET_STATISTICS_GTK_main_menu_help_about">
33 <property name="label">gtk-about</property> 34 <property name="label">gtk-about</property>
35 <property name="use_action_appearance">False</property>
34 <property name="visible">True</property> 36 <property name="visible">True</property>
35 <property name="can_focus">False</property> 37 <property name="can_focus">False</property>
36 <property name="tooltip_text" translatable="yes">Display information about this version of gnunet-statistics-gtk</property> 38 <property name="tooltip_text" translatable="yes">Display information about this version of gnunet-statistics-gtk</property>
37 <property name="use_action_appearance">False</property>
38 <property name="accel_path">&lt;gnunet-statistics-gtk&gt;/Help/About</property> 39 <property name="accel_path">&lt;gnunet-statistics-gtk&gt;/Help/About</property>
39 <property name="use_underline">True</property> 40 <property name="use_underline">True</property>
40 <property name="use_stock">True</property> 41 <property name="use_stock">True</property>
@@ -60,7 +61,6 @@
60 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_connectivity_box"> 61 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_connectivity_box">
61 <property name="visible">True</property> 62 <property name="visible">True</property>
62 <property name="can_focus">False</property> 63 <property name="can_focus">False</property>
63 <property name="orientation">vertical</property>
64 <child> 64 <child>
65 <placeholder/> 65 <placeholder/>
66 </child> 66 </child>
@@ -81,7 +81,6 @@
81 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_traffic_box"> 81 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_traffic_box">
82 <property name="visible">True</property> 82 <property name="visible">True</property>
83 <property name="can_focus">False</property> 83 <property name="can_focus">False</property>
84 <property name="orientation">vertical</property>
85 <child> 84 <child>
86 <placeholder/> 85 <placeholder/>
87 </child> 86 </child>
@@ -106,7 +105,6 @@
106 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_storage_box"> 105 <object class="GtkHBox" id="GNUNET_STATISTICS_GTK_storage_box">
107 <property name="visible">True</property> 106 <property name="visible">True</property>
108 <property name="can_focus">False</property> 107 <property name="can_focus">False</property>
109 <property name="orientation">vertical</property>
110 <child> 108 <child>
111 <placeholder/> 109 <placeholder/>
112 </child> 110 </child>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 07:43:01 +0000