aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-07 09:49:04 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-07 09:49:04 +0000
commite2ebf3bcc24c93e78333d8845224d9bfc33564ec (patch)
tree6ec117f422389ea596ab07b86d131fd4d3654f89
parentc15f41337424c9347a261f6737a588872ccc58d8 (diff)
downloadgnunet-gtk-e2ebf3bcc24c93e78333d8845224d9bfc33564ec.tar.gz
gnunet-gtk-e2ebf3bcc24c93e78333d8845224d9bfc33564ec.zip
-fix #3036
-rw-r--r--contrib/gnunet_fs_gtk_download_as_dialog.glade112
-rw-r--r--contrib/gnunet_fs_gtk_open_directory_dialog.glade1
-rw-r--r--contrib/gnunet_fs_gtk_progress_dialog.glade33
-rw-r--r--contrib/gnunet_fs_gtk_pseu_progress_dialog.glade2
-rw-r--r--contrib/gnunet_fs_gtk_publish_dialog.glade32
-rw-r--r--contrib/gnunet_fs_gtk_unindex.glade111
-rw-r--r--contrib/gnunet_identity_gtk_advertise_dialog.glade86
-rw-r--r--contrib/gnunet_setup_calendar_dialog.glade1
8 files changed, 215 insertions, 163 deletions
diff --git a/contrib/gnunet_fs_gtk_download_as_dialog.glade b/contrib/gnunet_fs_gtk_download_as_dialog.glade
index 2fa82b48..6ec420f4 100644
--- a/contrib/gnunet_fs_gtk_download_as_dialog.glade
+++ b/contrib/gnunet_fs_gtk_download_as_dialog.glade
@@ -1,45 +1,95 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- 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="value">1</property>
7 <property name="upper">100000</property> 6 <property name="upper">100000</property>
7 <property name="value">1</property>
8 <property name="step_increment">1</property> 8 <property name="step_increment">1</property>
9 <property name="page_increment">10</property> 9 <property name="page_increment">10</property>
10 </object> 10 </object>
11 <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog"> 11 <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog">
12 <property name="can_focus">False</property>
12 <property name="can_default">True</property> 13 <property name="can_default">True</property>
13 <property name="has_default">True</property> 14 <property name="has_default">True</property>
14 <property name="border_width">5</property> 15 <property name="border_width">5</property>
15 <property name="title" translatable="yes">Save file as...</property> 16 <property name="title" translatable="yes">Save file as...</property>
17 <property name="modal">True</property>
16 <property name="window_position">center-on-parent</property> 18 <property name="window_position">center-on-parent</property>
17 <property name="destroy_with_parent">True</property>
18 <property name="icon_name">document-save-as</property> 19 <property name="icon_name">document-save-as</property>
19 <property name="type_hint">dialog</property> 20 <property name="type_hint">dialog</property>
20 <property name="action">save</property> 21 <property name="action">save</property>
21 <property name="use_preview_label">False</property>
22 <property name="do_overwrite_confirmation">True</property> 22 <property name="do_overwrite_confirmation">True</property>
23 <property name="preview_widget_active">False</property> 23 <property name="preview_widget_active">False</property>
24 <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb"/> 24 <property name="use_preview_label">False</property>
25 <signal name="delete_event" handler="GNUNET_GTK_save_as_dialog_delete_event_cb"/> 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 <child internal-child="vbox"> 27 <child internal-child="vbox">
27 <object class="GtkVBox" id="dialog-vbox4"> 28 <object class="GtkVBox" id="dialog-vbox4">
28 <property name="visible">True</property> 29 <property name="visible">True</property>
29 <property name="orientation">vertical</property> 30 <property name="can_focus">False</property>
30 <property name="spacing">2</property> 31 <property name="spacing">2</property>
32 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="dialog-action_area5">
34 <property name="visible">True</property>
35 <property name="can_focus">False</property>
36 <property name="layout_style">end</property>
37 <child>
38 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_cancel_button">
39 <property name="label">gtk-cancel</property>
40 <property name="use_action_appearance">False</property>
41 <property name="visible">True</property>
42 <property name="can_focus">True</property>
43 <property name="receives_default">False</property>
44 <property name="use_stock">True</property>
45 </object>
46 <packing>
47 <property name="expand">False</property>
48 <property name="fill">False</property>
49 <property name="position">0</property>
50 </packing>
51 </child>
52 <child>
53 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_ok_button">
54 <property name="label">gtk-save</property>
55 <property name="use_action_appearance">False</property>
56 <property name="visible">True</property>
57 <property name="can_focus">True</property>
58 <property name="can_default">True</property>
59 <property name="has_default">True</property>
60 <property name="receives_default">True</property>
61 <property name="use_stock">True</property>
62 </object>
63 <packing>
64 <property name="expand">False</property>
65 <property name="fill">False</property>
66 <property name="position">1</property>
67 </packing>
68 </child>
69 </object>
70 <packing>
71 <property name="expand">False</property>
72 <property name="fill">True</property>
73 <property name="pack_type">end</property>
74 <property name="position">0</property>
75 </packing>
76 </child>
31 <child> 77 <child>
32 <object class="GtkHBox" id="GNUNET_GTK_save_as_dialog_options_hbox"> 78 <object class="GtkHBox" id="GNUNET_GTK_save_as_dialog_options_hbox">
33 <property name="visible">True</property> 79 <property name="visible">True</property>
80 <property name="can_focus">False</property>
34 <child> 81 <child>
35 <object class="GtkLabel" id="GNUNET_GTK_save_as_dialog_anonymity_label"> 82 <object class="GtkLabel" id="GNUNET_GTK_save_as_dialog_anonymity_label">
36 <property name="visible">True</property> 83 <property name="visible">True</property>
84 <property name="can_focus">False</property>
37 <property name="label" translatable="yes">_Anonymity:</property> 85 <property name="label" translatable="yes">_Anonymity:</property>
38 <property name="use_underline">True</property> 86 <property name="use_underline">True</property>
39 <property name="selectable">True</property> 87 <property name="selectable">True</property>
40 <property name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property> 88 <property name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property>
41 </object> 89 </object>
42 <packing> 90 <packing>
91 <property name="expand">True</property>
92 <property name="fill">True</property>
43 <property name="position">0</property> 93 <property name="position">0</property>
44 </packing> 94 </packing>
45 </child> 95 </child>
@@ -47,13 +97,15 @@
47 <object class="GtkSpinButton" id="GNUNET_GTK_save_as_dialog_anonymity_spin_button"> 97 <object class="GtkSpinButton" id="GNUNET_GTK_save_as_dialog_anonymity_spin_button">
48 <property name="visible">True</property> 98 <property name="visible">True</property>
49 <property name="can_focus">True</property> 99 <property name="can_focus">True</property>
50 <property name="invisible_char">&#x25CF;</property> 100 <property name="invisible_char"></property>
51 <property name="caps_lock_warning">False</property> 101 <property name="caps_lock_warning">False</property>
102 <property name="primary_icon_activatable">False</property>
103 <property name="secondary_icon_activatable">False</property>
52 <property name="primary_icon_sensitive">True</property> 104 <property name="primary_icon_sensitive">True</property>
53 <property name="secondary_icon_sensitive">True</property> 105 <property name="secondary_icon_sensitive">True</property>
54 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property> 106 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
55 <property name="numeric">True</property> 107 <property name="numeric">True</property>
56 <signal name="value_changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes"/> 108 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/>
57 </object> 109 </object>
58 <packing> 110 <packing>
59 <property name="expand">False</property> 111 <property name="expand">False</property>
@@ -64,6 +116,7 @@
64 <child> 116 <child>
65 <object class="GtkCheckButton" id="GNUNET_GTK_save_as_recursive_check_button"> 117 <object class="GtkCheckButton" id="GNUNET_GTK_save_as_recursive_check_button">
66 <property name="label" translatable="yes">_recursive</property> 118 <property name="label" translatable="yes">_recursive</property>
119 <property name="use_action_appearance">False</property>
67 <property name="visible">True</property> 120 <property name="visible">True</property>
68 <property name="sensitive">False</property> 121 <property name="sensitive">False</property>
69 <property name="can_focus">True</property> 122 <property name="can_focus">True</property>
@@ -85,47 +138,6 @@
85 <property name="position">2</property> 138 <property name="position">2</property>
86 </packing> 139 </packing>
87 </child> 140 </child>
88 <child internal-child="action_area">
89 <object class="GtkHButtonBox" id="dialog-action_area5">
90 <property name="visible">True</property>
91 <property name="layout_style">end</property>
92 <child>
93 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_cancel_button">
94 <property name="label">gtk-cancel</property>
95 <property name="visible">True</property>
96 <property name="can_focus">True</property>
97 <property name="receives_default">False</property>
98 <property name="use_stock">True</property>
99 </object>
100 <packing>
101 <property name="expand">False</property>
102 <property name="fill">False</property>
103 <property name="position">0</property>
104 </packing>
105 </child>
106 <child>
107 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_ok_button">
108 <property name="label">gtk-save</property>
109 <property name="visible">True</property>
110 <property name="can_focus">True</property>
111 <property name="can_default">True</property>
112 <property name="has_default">True</property>
113 <property name="receives_default">True</property>
114 <property name="use_stock">True</property>
115 </object>
116 <packing>
117 <property name="expand">False</property>
118 <property name="fill">False</property>
119 <property name="position">1</property>
120 </packing>
121 </child>
122 </object>
123 <packing>
124 <property name="expand">False</property>
125 <property name="pack_type">end</property>
126 <property name="position">0</property>
127 </packing>
128 </child>
129 </object> 141 </object>
130 </child> 142 </child>
131 <action-widgets> 143 <action-widgets>
diff --git a/contrib/gnunet_fs_gtk_open_directory_dialog.glade b/contrib/gnunet_fs_gtk_open_directory_dialog.glade
index a807742a..1217ebea 100644
--- a/contrib/gnunet_fs_gtk_open_directory_dialog.glade
+++ b/contrib/gnunet_fs_gtk_open_directory_dialog.glade
@@ -7,6 +7,7 @@
7 <property name="can_focus">False</property> 7 <property name="can_focus">False</property>
8 <property name="can_default">True</property> 8 <property name="can_default">True</property>
9 <property name="border_width">5</property> 9 <property name="border_width">5</property>
10 <property name="modal">True</property>
10 <property name="type_hint">normal</property> 11 <property name="type_hint">normal</property>
11 <property name="create_folders">False</property> 12 <property name="create_folders">False</property>
12 <property name="filter">gnunet_directory_filter</property> 13 <property name="filter">gnunet_directory_filter</property>
diff --git a/contrib/gnunet_fs_gtk_progress_dialog.glade b/contrib/gnunet_fs_gtk_progress_dialog.glade
index c008d3e2..9433c942 100644
--- a/contrib/gnunet_fs_gtk_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_progress_dialog.glade
@@ -1,27 +1,36 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
6 <property name="upper">100</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property>
9 <property name="page_size">10</property>
10 </object>
5 <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog"> 11 <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
12 <property name="can_focus">False</property>
6 <property name="border_width">2</property> 13 <property name="border_width">2</property>
14 <property name="modal">True</property>
7 <property name="window_position">center-on-parent</property> 15 <property name="window_position">center-on-parent</property>
8 <property name="default_width">800</property> 16 <property name="default_width">800</property>
9 <property name="default_height">600</property> 17 <property name="default_height">600</property>
10 <property name="destroy_with_parent">True</property> 18 <signal name="delete-event" handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb" swapped="no"/>
11 <signal name="delete_event" handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb"/>
12 <child> 19 <child>
13 <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox"> 20 <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
14 <property name="visible">True</property> 21 <property name="visible">True</property>
15 <property name="orientation">vertical</property> 22 <property name="can_focus">False</property>
16 <property name="spacing">2</property> 23 <property name="spacing">2</property>
17 <child> 24 <child>
18 <object class="GtkFrame" id="GNUNET_FS_GTK_progress_dialog_frame"> 25 <object class="GtkFrame" id="GNUNET_FS_GTK_progress_dialog_frame">
19 <property name="visible">True</property> 26 <property name="visible">True</property>
27 <property name="can_focus">False</property>
20 <property name="label_xalign">0</property> 28 <property name="label_xalign">0</property>
21 <property name="shadow_type">none</property> 29 <property name="shadow_type">none</property>
22 <child> 30 <child>
23 <object class="GtkAlignment" id="GNUNET_FS_GTK_progress_dialog_alignment"> 31 <object class="GtkAlignment" id="GNUNET_FS_GTK_progress_dialog_alignment">
24 <property name="visible">True</property> 32 <property name="visible">True</property>
33 <property name="can_focus">False</property>
25 <property name="left_padding">12</property> 34 <property name="left_padding">12</property>
26 <child> 35 <child>
27 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_progress_dialog_scrolled_window"> 36 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_progress_dialog_scrolled_window">
@@ -49,21 +58,25 @@
49 <child type="label"> 58 <child type="label">
50 <object class="GtkLabel" id="GNUNET_FS_GTK_progress_dialog_label"> 59 <object class="GtkLabel" id="GNUNET_FS_GTK_progress_dialog_label">
51 <property name="visible">True</property> 60 <property name="visible">True</property>
61 <property name="can_focus">False</property>
52 <property name="label" translatable="yes">&lt;b&gt;Messages&lt;/b&gt;</property> 62 <property name="label" translatable="yes">&lt;b&gt;Messages&lt;/b&gt;</property>
53 <property name="use_markup">True</property> 63 <property name="use_markup">True</property>
54 </object> 64 </object>
55 </child> 65 </child>
56 </object> 66 </object>
57 <packing> 67 <packing>
68 <property name="expand">True</property>
69 <property name="fill">True</property>
58 <property name="position">0</property> 70 <property name="position">0</property>
59 </packing> 71 </packing>
60 </child> 72 </child>
61 <child> 73 <child>
62 <object class="GtkProgressBar" id="GNUNET_FS_GTK_progress_dialog_progressbar"> 74 <object class="GtkProgressBar" id="GNUNET_FS_GTK_progress_dialog_progressbar">
63 <property name="visible">True</property> 75 <property name="visible">True</property>
76 <property name="can_focus">False</property>
64 <property name="activity_mode">True</property> 77 <property name="activity_mode">True</property>
65 <property name="show_text">True</property> 78 <property name="show_text">True</property>
66 <property name="pulse_step">0.05</property> 79 <property name="pulse_step">0.050000000000000003</property>
67 <property name="text" translatable="yes">Preprocessing...</property> 80 <property name="text" translatable="yes">Preprocessing...</property>
68 <property name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property> 81 <property name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property>
69 <property name="discrete_blocks">5</property> 82 <property name="discrete_blocks">5</property>
@@ -77,6 +90,7 @@
77 <child> 90 <child>
78 <object class="GtkHBox" id="GNUNET_FS_GTK_progress_dialog_buttons_hbox"> 91 <object class="GtkHBox" id="GNUNET_FS_GTK_progress_dialog_buttons_hbox">
79 <property name="visible">True</property> 92 <property name="visible">True</property>
93 <property name="can_focus">False</property>
80 <property name="spacing">2</property> 94 <property name="spacing">2</property>
81 <child> 95 <child>
82 <placeholder/> 96 <placeholder/>
@@ -84,11 +98,12 @@
84 <child> 98 <child>
85 <object class="GtkButton" id="GNUNET_FS_GTK_progress_dialog_cancel_button"> 99 <object class="GtkButton" id="GNUNET_FS_GTK_progress_dialog_cancel_button">
86 <property name="label">gtk-cancel</property> 100 <property name="label">gtk-cancel</property>
101 <property name="use_action_appearance">False</property>
87 <property name="visible">True</property> 102 <property name="visible">True</property>
88 <property name="can_focus">True</property> 103 <property name="can_focus">True</property>
89 <property name="receives_default">True</property> 104 <property name="receives_default">True</property>
90 <property name="use_stock">True</property> 105 <property name="use_stock">True</property>
91 <signal name="clicked" handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb"/> 106 <signal name="clicked" handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb" swapped="no"/>
92 </object> 107 </object>
93 <packing> 108 <packing>
94 <property name="expand">False</property> 109 <property name="expand">False</property>
@@ -118,10 +133,4 @@
118 <property name="step_increment">1</property> 133 <property name="step_increment">1</property>
119 <property name="page_increment">10</property> 134 <property name="page_increment">10</property>
120 </object> 135 </object>
121 <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
122 <property name="upper">100</property>
123 <property name="step_increment">1</property>
124 <property name="page_increment">10</property>
125 <property name="page_size">10</property>
126 </object>
127</interface> 136</interface>
diff --git a/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade b/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
index ebd050e2..005a3ff6 100644
--- a/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
@@ -12,10 +12,10 @@
12 <property name="can_focus">False</property> 12 <property name="can_focus">False</property>
13 <property name="border_width">2</property> 13 <property name="border_width">2</property>
14 <property name="title" translatable="yes">Preparing to save namespace in GNS zone</property> 14 <property name="title" translatable="yes">Preparing to save namespace in GNS zone</property>
15 <property name="modal">True</property>
15 <property name="window_position">center-on-parent</property> 16 <property name="window_position">center-on-parent</property>
16 <property name="default_width">800</property> 17 <property name="default_width">800</property>
17 <property name="default_height">600</property> 18 <property name="default_height">600</property>
18 <property name="destroy_with_parent">True</property>
19 <signal name="delete-event" handler="GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb" swapped="no"/> 19 <signal name="delete-event" handler="GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb" swapped="no"/>
20 <child> 20 <child>
21 <object class="GtkVBox" id="GNUNET_FS_GTK_pseu_progress_dialog_main_vbox"> 21 <object class="GtkVBox" id="GNUNET_FS_GTK_pseu_progress_dialog_main_vbox">
diff --git a/contrib/gnunet_fs_gtk_publish_dialog.glade b/contrib/gnunet_fs_gtk_publish_dialog.glade
index dc4679e9..5cd85a12 100644
--- a/contrib/gnunet_fs_gtk_publish_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_dialog.glade
@@ -26,6 +26,7 @@
26 <property name="height_request">500</property> 26 <property name="height_request">500</property>
27 <property name="can_focus">False</property> 27 <property name="can_focus">False</property>
28 <property name="title" translatable="yes">Publish content on GNUnet</property> 28 <property name="title" translatable="yes">Publish content on GNUnet</property>
29 <property name="modal">True</property>
29 <property name="window_position">center-on-parent</property> 30 <property name="window_position">center-on-parent</property>
30 <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/> 31 <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
31 <child> 32 <child>
@@ -115,6 +116,7 @@
115 <child> 116 <child>
116 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_add_button"> 117 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_add_button">
117 <property name="label" translatable="yes">Add _File</property> 118 <property name="label" translatable="yes">Add _File</property>
119 <property name="use_action_appearance">False</property>
118 <property name="visible">True</property> 120 <property name="visible">True</property>
119 <property name="can_focus">True</property> 121 <property name="can_focus">True</property>
120 <property name="receives_default">True</property> 122 <property name="receives_default">True</property>
@@ -125,6 +127,7 @@
125 <child> 127 <child>
126 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_new_button"> 128 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_new_button">
127 <property name="label" translatable="yes">_Create empty directory</property> 129 <property name="label" translatable="yes">_Create empty directory</property>
130 <property name="use_action_appearance">False</property>
128 <property name="visible">True</property> 131 <property name="visible">True</property>
129 <property name="can_focus">True</property> 132 <property name="can_focus">True</property>
130 <property name="receives_default">True</property> 133 <property name="receives_default">True</property>
@@ -140,6 +143,7 @@
140 <child> 143 <child>
141 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_open_button"> 144 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_open_button">
142 <property name="label" translatable="yes">Add _Directory</property> 145 <property name="label" translatable="yes">Add _Directory</property>
146 <property name="use_action_appearance">False</property>
143 <property name="visible">True</property> 147 <property name="visible">True</property>
144 <property name="can_focus">True</property> 148 <property name="can_focus">True</property>
145 <property name="receives_default">True</property> 149 <property name="receives_default">True</property>
@@ -154,6 +158,7 @@
154 <child> 158 <child>
155 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_edit_button"> 159 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_edit_button">
156 <property name="label">gtk-edit</property> 160 <property name="label">gtk-edit</property>
161 <property name="use_action_appearance">False</property>
157 <property name="visible">True</property> 162 <property name="visible">True</property>
158 <property name="sensitive">False</property> 163 <property name="sensitive">False</property>
159 <property name="can_focus">True</property> 164 <property name="can_focus">True</property>
@@ -171,6 +176,7 @@
171 <child> 176 <child>
172 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_delete_button"> 177 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_delete_button">
173 <property name="label">gtk-delete</property> 178 <property name="label">gtk-delete</property>
179 <property name="use_action_appearance">False</property>
174 <property name="visible">True</property> 180 <property name="visible">True</property>
175 <property name="sensitive">False</property> 181 <property name="sensitive">False</property>
176 <property name="can_focus">True</property> 182 <property name="can_focus">True</property>
@@ -203,6 +209,7 @@
203 <child> 209 <child>
204 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_up_button"> 210 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_up_button">
205 <property name="label">gtk-go-up</property> 211 <property name="label">gtk-go-up</property>
212 <property name="use_action_appearance">False</property>
206 <property name="visible">True</property> 213 <property name="visible">True</property>
207 <property name="sensitive">False</property> 214 <property name="sensitive">False</property>
208 <property name="can_focus">True</property> 215 <property name="can_focus">True</property>
@@ -219,6 +226,7 @@
219 <child> 226 <child>
220 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_left_button"> 227 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_left_button">
221 <property name="label" translatable="yes">_Left</property> 228 <property name="label" translatable="yes">_Left</property>
229 <property name="use_action_appearance">False</property>
222 <property name="visible">True</property> 230 <property name="visible">True</property>
223 <property name="sensitive">False</property> 231 <property name="sensitive">False</property>
224 <property name="can_focus">True</property> 232 <property name="can_focus">True</property>
@@ -236,6 +244,7 @@
236 <child> 244 <child>
237 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_down_button"> 245 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_down_button">
238 <property name="label">gtk-go-down</property> 246 <property name="label">gtk-go-down</property>
247 <property name="use_action_appearance">False</property>
239 <property name="visible">True</property> 248 <property name="visible">True</property>
240 <property name="sensitive">False</property> 249 <property name="sensitive">False</property>
241 <property name="can_focus">True</property> 250 <property name="can_focus">True</property>
@@ -254,6 +263,7 @@
254 <child> 263 <child>
255 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_right_button"> 264 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_right_button">
256 <property name="label" translatable="yes">_Right</property> 265 <property name="label" translatable="yes">_Right</property>
266 <property name="use_action_appearance">False</property>
257 <property name="visible">True</property> 267 <property name="visible">True</property>
258 <property name="sensitive">False</property> 268 <property name="sensitive">False</property>
259 <property name="can_focus">True</property> 269 <property name="can_focus">True</property>
@@ -354,6 +364,12 @@
354 <child> 364 <child>
355 <placeholder/> 365 <placeholder/>
356 </child> 366 </child>
367 <child>
368 <placeholder/>
369 </child>
370 <child>
371 <placeholder/>
372 </child>
357 </object> 373 </object>
358 <packing> 374 <packing>
359 <property name="expand">False</property> 375 <property name="expand">False</property>
@@ -398,6 +414,7 @@
398 <child> 414 <child>
399 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_global_checkbox"> 415 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_global_checkbox">
400 <property name="label" translatable="yes">Publish in global namespace</property> 416 <property name="label" translatable="yes">Publish in global namespace</property>
417 <property name="use_action_appearance">False</property>
401 <property name="visible">True</property> 418 <property name="visible">True</property>
402 <property name="can_focus">True</property> 419 <property name="can_focus">True</property>
403 <property name="receives_default">False</property> 420 <property name="receives_default">False</property>
@@ -429,6 +446,7 @@ Disabling this is equivalent to pressing the "Remove all Keywords" button before
429 <child> 446 <child>
430 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_own_checkbox"> 447 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_own_checkbox">
431 <property name="label" translatable="yes">Publish in your own namespace</property> 448 <property name="label" translatable="yes">Publish in your own namespace</property>
449 <property name="use_action_appearance">False</property>
432 <property name="visible">True</property> 450 <property name="visible">True</property>
433 <property name="sensitive">False</property> 451 <property name="sensitive">False</property>
434 <property name="can_focus">True</property> 452 <property name="can_focus">True</property>
@@ -616,6 +634,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
616 <child> 634 <child>
617 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_updateable_checkbox"> 635 <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_updateable_checkbox">
618 <property name="label" translatable="yes">Make publication updateable</property> 636 <property name="label" translatable="yes">Make publication updateable</property>
637 <property name="use_action_appearance">False</property>
619 <property name="visible">True</property> 638 <property name="visible">True</property>
620 <property name="sensitive">False</property> 639 <property name="sensitive">False</property>
621 <property name="can_focus">True</property> 640 <property name="can_focus">True</property>
@@ -720,6 +739,7 @@ Leaving this field blank makes publication unupdateable.</property>
720 <child> 739 <child>
721 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_execute_button"> 740 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_execute_button">
722 <property name="label" translatable="yes">_Execute</property> 741 <property name="label" translatable="yes">_Execute</property>
742 <property name="use_action_appearance">False</property>
723 <property name="visible">True</property> 743 <property name="visible">True</property>
724 <property name="can_focus">True</property> 744 <property name="can_focus">True</property>
725 <property name="receives_default">True</property> 745 <property name="receives_default">True</property>
@@ -736,6 +756,7 @@ Leaving this field blank makes publication unupdateable.</property>
736 <child> 756 <child>
737 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_clear_button"> 757 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_clear_button">
738 <property name="label" translatable="yes">Remove all _Keywords</property> 758 <property name="label" translatable="yes">Remove all _Keywords</property>
759 <property name="use_action_appearance">False</property>
739 <property name="visible">True</property> 760 <property name="visible">True</property>
740 <property name="can_focus">True</property> 761 <property name="can_focus">True</property>
741 <property name="receives_default">True</property> 762 <property name="receives_default">True</property>
@@ -755,6 +776,7 @@ Note that meta data is unaffected when using this function.</property>
755 <child> 776 <child>
756 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_cancel_button"> 777 <object class="GtkButton" id="GNUNET_GTK_master_publish_dialog_cancel_button">
757 <property name="label" translatable="yes">_Cancel</property> 778 <property name="label" translatable="yes">_Cancel</property>
779 <property name="use_action_appearance">False</property>
758 <property name="visible">True</property> 780 <property name="visible">True</property>
759 <property name="can_focus">True</property> 781 <property name="can_focus">True</property>
760 <property name="receives_default">True</property> 782 <property name="receives_default">True</property>
@@ -800,6 +822,11 @@ Note that meta data is unaffected when using this function.</property>
800 <column type="gchararray"/> 822 <column type="gchararray"/>
801 </columns> 823 </columns>
802 </object> 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>
803 <object class="GtkImage" id="new_stock_image"> 830 <object class="GtkImage" id="new_stock_image">
804 <property name="visible">True</property> 831 <property name="visible">True</property>
805 <property name="can_focus">False</property> 832 <property name="can_focus">False</property>
@@ -810,11 +837,6 @@ Note that meta data is unaffected when using this function.</property>
810 <property name="can_focus">False</property> 837 <property name="can_focus">False</property>
811 <property name="stock">gtk-go-forward</property> 838 <property name="stock">gtk-go-forward</property>
812 </object> 839 </object>
813 <object class="GtkImage" id="left_stock_image">
814 <property name="visible">True</property>
815 <property name="can_focus">False</property>
816 <property name="stock">gtk-go-back</property>
817 </object>
818 <object class="GtkSizeGroup" id="GNUNET_GTK_master_publish_dialog_labels_sizegroup"> 840 <object class="GtkSizeGroup" id="GNUNET_GTK_master_publish_dialog_labels_sizegroup">
819 <widgets> 841 <widgets>
820 <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/> 842 <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/>
diff --git a/contrib/gnunet_fs_gtk_unindex.glade b/contrib/gnunet_fs_gtk_unindex.glade
index 95fe85b1..b8c26329 100644
--- a/contrib/gnunet_fs_gtk_unindex.glade
+++ b/contrib/gnunet_fs_gtk_unindex.glade
@@ -1,7 +1,12 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.16"/> 3 <requires lib="gtk+" version="2.18"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8 <property name="stock">gtk-delete</property>
9 </object>
5 <object class="GtkListStore" id="GNUNET_FS_GTK_unindex_liststore"> 10 <object class="GtkListStore" id="GNUNET_FS_GTK_unindex_liststore">
6 <columns> 11 <columns>
7 <!-- column-name filename --> 12 <!-- column-name filename -->
@@ -25,15 +30,65 @@
25 <object class="GtkDialog" id="GNUNET_FS_GTK_unindex_dialog"> 30 <object class="GtkDialog" id="GNUNET_FS_GTK_unindex_dialog">
26 <property name="width_request">600</property> 31 <property name="width_request">600</property>
27 <property name="height_request">300</property> 32 <property name="height_request">300</property>
33 <property name="can_focus">False</property>
28 <property name="border_width">5</property> 34 <property name="border_width">5</property>
29 <property name="title" translatable="yes">Indexed files</property> 35 <property name="title" translatable="yes">Indexed files</property>
36 <property name="modal">True</property>
30 <property name="icon_name">folder</property> 37 <property name="icon_name">folder</property>
31 <property name="type_hint">normal</property> 38 <property name="type_hint">normal</property>
32 <child internal-child="vbox"> 39 <child internal-child="vbox">
33 <object class="GtkVBox" id="GNUNET_FS_GTK_unindex_dialog-vbox"> 40 <object class="GtkVBox" id="GNUNET_FS_GTK_unindex_dialog-vbox">
34 <property name="visible">True</property> 41 <property name="visible">True</property>
35 <property name="orientation">vertical</property> 42 <property name="can_focus">False</property>
36 <property name="spacing">2</property> 43 <property name="spacing">2</property>
44 <child internal-child="action_area">
45 <object class="GtkHButtonBox" id="GNUNET_FS_GTK_unindex_dialog-action_area">
46 <property name="visible">True</property>
47 <property name="can_focus">False</property>
48 <property name="layout_style">end</property>
49 <child>
50 <object class="GtkButton" id="GNUNET_FS_GTK_unindex_button">
51 <property name="label">_Unindex</property>
52 <property name="use_action_appearance">False</property>
53 <property name="visible">True</property>
54 <property name="sensitive">False</property>
55 <property name="can_focus">True</property>
56 <property name="receives_default">True</property>
57 <property name="tooltip_text" translatable="yes">Unindex the selected indexed file.</property>
58 <property name="image">GNUNET_FS_GTK_unindex_delete_image</property>
59 <property name="use_underline">True</property>
60 <signal name="clicked" handler="GNUNET_FS_GTK_unindex_button_clicked_cb" swapped="no"/>
61 </object>
62 <packing>
63 <property name="expand">False</property>
64 <property name="fill">False</property>
65 <property name="position">0</property>
66 </packing>
67 </child>
68 <child>
69 <object class="GtkButton" id="GNUNET_FS_GTK_unindex_close_button">
70 <property name="label">gtk-close</property>
71 <property name="use_action_appearance">False</property>
72 <property name="visible">True</property>
73 <property name="can_focus">True</property>
74 <property name="receives_default">True</property>
75 <property name="use_stock">True</property>
76 <signal name="clicked" handler="GNUNET_FS_GTK_unindex_close_button_clicked_cb" swapped="no"/>
77 </object>
78 <packing>
79 <property name="expand">False</property>
80 <property name="fill">False</property>
81 <property name="position">1</property>
82 </packing>
83 </child>
84 </object>
85 <packing>
86 <property name="expand">False</property>
87 <property name="fill">True</property>
88 <property name="pack_type">end</property>
89 <property name="position">0</property>
90 </packing>
91 </child>
37 <child> 92 <child>
38 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_unindex_scrolledwindow"> 93 <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_unindex_scrolledwindow">
39 <property name="visible">True</property> 94 <property name="visible">True</property>
@@ -94,53 +149,9 @@
94 </child> 149 </child>
95 </object> 150 </object>
96 <packing> 151 <packing>
97 <property name="position">1</property>
98 <property name="expand">True</property> 152 <property name="expand">True</property>
99 <property name="fill">True</property> 153 <property name="fill">True</property>
100 </packing> 154 <property name="position">1</property>
101 </child>
102 <child internal-child="action_area">
103 <object class="GtkHButtonBox" id="GNUNET_FS_GTK_unindex_dialog-action_area">
104 <property name="visible">True</property>
105 <property name="layout_style">end</property>
106 <child>
107 <object class="GtkButton" id="GNUNET_FS_GTK_unindex_button">
108 <property name="label">_Unindex</property>
109 <property name="visible">True</property>
110 <property name="sensitive">False</property>
111 <property name="can_focus">True</property>
112 <property name="receives_default">True</property>
113 <property name="tooltip_text" translatable="yes">Unindex the selected indexed file.</property>
114 <property name="image">GNUNET_FS_GTK_unindex_delete_image</property>
115 <property name="use_underline">True</property>
116 <signal name="clicked" handler="GNUNET_FS_GTK_unindex_button_clicked_cb"/>
117 </object>
118 <packing>
119 <property name="expand">False</property>
120 <property name="fill">False</property>
121 <property name="position">0</property>
122 </packing>
123 </child>
124 <child>
125 <object class="GtkButton" id="GNUNET_FS_GTK_unindex_close_button">
126 <property name="label">gtk-close</property>
127 <property name="visible">True</property>
128 <property name="can_focus">True</property>
129 <property name="receives_default">True</property>
130 <property name="use_stock">True</property>
131 <signal name="clicked" handler="GNUNET_FS_GTK_unindex_close_button_clicked_cb"/>
132 </object>
133 <packing>
134 <property name="expand">False</property>
135 <property name="fill">False</property>
136 <property name="position">1</property>
137 </packing>
138 </child>
139 </object>
140 <packing>
141 <property name="expand">False</property>
142 <property name="pack_type">end</property>
143 <property name="position">0</property>
144 </packing> 155 </packing>
145 </child> 156 </child>
146 </object> 157 </object>
@@ -150,8 +161,4 @@
150 <action-widget response="0">GNUNET_FS_GTK_unindex_close_button</action-widget> 161 <action-widget response="0">GNUNET_FS_GTK_unindex_close_button</action-widget>
151 </action-widgets> 162 </action-widgets>
152 </object> 163 </object>
153 <object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
154 <property name="visible">True</property>
155 <property name="stock">gtk-delete</property>
156 </object>
157</interface> 164</interface>
diff --git a/contrib/gnunet_identity_gtk_advertise_dialog.glade b/contrib/gnunet_identity_gtk_advertise_dialog.glade
index 8d9380ee..2884ca38 100644
--- a/contrib/gnunet_identity_gtk_advertise_dialog.glade
+++ b/contrib/gnunet_identity_gtk_advertise_dialog.glade
@@ -2,6 +2,11 @@
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_hadj">
6 <property name="upper">100</property>
7 <property name="step_increment">1</property>
8 <property name="page_increment">10</property>
9 </object>
5 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore"> 10 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore">
6 <columns> 11 <columns>
7 <!-- column-name Keyword --> 12 <!-- column-name Keyword -->
@@ -13,10 +18,30 @@
13 <property name="step_increment">1</property> 18 <property name="step_increment">1</property>
14 <property name="page_increment">10</property> 19 <property name="page_increment">10</property>
15 </object> 20 </object>
21 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj">
22 <property name="upper">100</property>
23 <property name="step_increment">1</property>
24 <property name="page_increment">10</property>
25 </object>
26 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_metadata_liststore">
27 <columns>
28 <!-- column-name TypeBin -->
29 <column type="gint"/>
30 <!-- column-name Type -->
31 <column type="gchararray"/>
32 <!-- column-name Value -->
33 <column type="gchararray"/>
34 </columns>
35 </object>
36 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_vadj">
37 <property name="upper">100</property>
38 <property name="step_increment">1</property>
39 <property name="page_increment">10</property>
40 </object>
16 <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog"> 41 <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
17 <property name="can_focus">False</property> 42 <property name="can_focus">False</property>
18 <property name="border_width">5</property> 43 <property name="border_width">5</property>
19 <property name="destroy_with_parent">True</property> 44 <property name="modal">True</property>
20 <property name="type_hint">dialog</property> 45 <property name="type_hint">dialog</property>
21 <signal name="response" handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/> 46 <signal name="response" handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/>
22 <child internal-child="vbox"> 47 <child internal-child="vbox">
@@ -561,48 +586,6 @@
561 <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget> 586 <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
562 </action-widgets> 587 </action-widgets>
563 </object> 588 </object>
564 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_hadj">
565 <property name="upper">100</property>
566 <property name="step_increment">1</property>
567 <property name="page_increment">10</property>
568 </object>
569 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj">
570 <property name="upper">100</property>
571 <property name="step_increment">1</property>
572 <property name="page_increment">10</property>
573 </object>
574 <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_metadata_liststore">
575 <columns>
576 <!-- column-name TypeBin -->
577 <column type="gint"/>
578 <!-- column-name Type -->
579 <column type="gchararray"/>
580 <!-- column-name Value -->
581 <column type="gchararray"/>
582 </columns>
583 </object>
584 <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_vadj">
585 <property name="upper">100</property>
586 <property name="step_increment">1</property>
587 <property name="page_increment">10</property>
588 </object>
589 <object class="GtkAdjustment" id="expiration_year_adjustment">
590 <property name="upper">9999</property>
591 <property name="step_increment">1</property>
592 <property name="page_increment">10</property>
593 </object>
594 <object class="GtkAdjustment" id="priority_adjustment">
595 <property name="upper">100000000</property>
596 <property name="value">1000</property>
597 <property name="step_increment">1</property>
598 <property name="page_increment">10</property>
599 </object>
600 <object class="GtkAdjustment" id="replication_adjustment">
601 <property name="upper">99999</property>
602 <property name="value">5</property>
603 <property name="step_increment">1</property>
604 <property name="page_increment">10</property>
605 </object>
606 <object class="GtkListStore" id="GNUNET_GTK_identity_metadata_types_liststore"> 589 <object class="GtkListStore" id="GNUNET_GTK_identity_metadata_types_liststore">
607 <columns> 590 <columns>
608 <!-- column-name type_as_string --> 591 <!-- column-name type_as_string -->
@@ -638,4 +621,21 @@
638 </row> 621 </row>
639 </data> 622 </data>
640 </object> 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> 641</interface>
diff --git a/contrib/gnunet_setup_calendar_dialog.glade b/contrib/gnunet_setup_calendar_dialog.glade
index 9652c230..0b9ef0ab 100644
--- a/contrib/gnunet_setup_calendar_dialog.glade
+++ b/contrib/gnunet_setup_calendar_dialog.glade
@@ -5,6 +5,7 @@
5 <object class="GtkDialog" id="GNUNET_setup_calendar_dialog"> 5 <object class="GtkDialog" id="GNUNET_setup_calendar_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>
8 <property name="modal">True</property>
8 <property name="type_hint">dialog</property> 9 <property name="type_hint">dialog</property>
9 <signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb" swapped="no"/> 10 <signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb" swapped="no"/>
10 <child internal-child="vbox"> 11 <child internal-child="vbox">