aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-04-09 15:49:39 +0000
committerChristian Grothoff <christian@grothoff.org>2016-04-09 15:49:39 +0000
commitb2f918a9a4fb089772cf4cc6eec0dc1f96bb3f09 (patch)
tree2656dfeb280b3a45cb4bbed84e1658f7cba7a242 /contrib
parent991af52d8d7dc88fd31477220322b5575edfb018 (diff)
downloadgnunet-gtk-b2f918a9a4fb089772cf4cc6eec0dc1f96bb3f09.tar.gz
gnunet-gtk-b2f918a9a4fb089772cf4cc6eec0dc1f96bb3f09.zip
fix look and feel, remove use of deprecated widgets, remove filter for directories
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am13
-rw-r--r--contrib/gnunet_fs_gtk_publish_dialog.glade3
-rw-r--r--contrib/gnunet_fs_gtk_publish_directory_dialog.glade164
3 files changed, 79 insertions, 101 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 49245a47..ae743868 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,7 +3,7 @@
3 3
4SUBDIRS = . 4SUBDIRS = .
5 5
6pkgpixdir= $(pkgdatadir) 6pkgdatadir= $(prefix)/share/gnunet/
7 7
8IMAGES = \ 8IMAGES = \
9 gnunet-setup-oxygen-cancel.png \ 9 gnunet-setup-oxygen-cancel.png \
@@ -89,18 +89,18 @@ pkgdata_DATA = \
89 89
90install-data-local: 90install-data-local:
91 @$(NORMAL_INSTALL) 91 @$(NORMAL_INSTALL)
92 @list='$(srcdir)/flags/*.png'; test -n "$(pkgpixdir)/flags" || list=; \ 92 @list='$(srcdir)/flags/*.png'; test -n "$(prefix)/share/gnunet/flags" || list=; \
93 if test -n "$$list"; then \ 93 if test -n "$$list"; then \
94 echo " $(MKDIR_P) '$(DESTDIR)$(pkgpixdir)/flags'"; \ 94 echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/share/gnunet/flags'"; \
95 $(MKDIR_P) "$(DESTDIR)$(pkgpixdir)/flags" || exit 1; \ 95 $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gnunet/flags" || exit 1; \
96 fi; \ 96 fi; \
97 for p in $$list; do \ 97 for p in $$list; do \
98 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 98 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
99 echo "$$d$$p"; \ 99 echo "$$d$$p"; \
100 done | $(am__base_list) | \ 100 done | $(am__base_list) | \
101 while read files; do \ 101 while read files; do \
102 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgpixdir)/flags'"; \ 102 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(prefix)/share/gnunet/flags'"; \
103 $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgpixdir)/flags" || exit $$?; \ 103 $(INSTALL_DATA) $$files "$(DESTDIR)$(prefix)/share/gnunet/flags" || exit $$?; \
104 done 104 done
105 105
106dist-hook: 106dist-hook:
@@ -112,4 +112,3 @@ dist-hook:
112 fi \ 112 fi \
113 done \ 113 done \
114 fi 114 fi
115
diff --git a/contrib/gnunet_fs_gtk_publish_dialog.glade b/contrib/gnunet_fs_gtk_publish_dialog.glade
index 0b2d8d60..2c6d1ae2 100644
--- a/contrib/gnunet_fs_gtk_publish_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_dialog.glade
@@ -84,7 +84,8 @@
84 <property name="can_focus">False</property> 84 <property name="can_focus">False</property>
85 <property name="title" translatable="yes">Publish content on GNUnet</property> 85 <property name="title" translatable="yes">Publish content on GNUnet</property>
86 <property name="modal">True</property> 86 <property name="modal">True</property>
87 <property name="window_position">center-on-parent</property> 87 <property name="window_position">center</property>
88 <property name="gravity">center</property>
88 <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/> 89 <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
89 <child> 90 <child>
90 <object class="GtkBox" id="GNUNET_GTK_master_publish_dialog_vbox"> 91 <object class="GtkBox" id="GNUNET_GTK_master_publish_dialog_vbox">
diff --git a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
index 1e6546bc..2209af49 100644
--- a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
@@ -19,22 +19,25 @@
19 <property name="page_increment">10</property> 19 <property name="page_increment">10</property>
20 </object> 20 </object>
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="visible">True</property>
23 <property name="can_focus">True</property>
24 <property name="has_focus">True</property>
23 <property name="can_default">True</property> 25 <property name="can_default">True</property>
24 <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> 26 <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
25 <property name="border_width">5</property> 27 <property name="border_width">5</property>
28 <property name="title" translatable="yes">Select directory to publish</property>
26 <property name="modal">True</property> 29 <property name="modal">True</property>
27 <property name="window_position">center-on-parent</property> 30 <property name="window_position">center</property>
28 <property name="default_width">800</property> 31 <property name="default_width">800</property>
29 <property name="default_height">600</property> 32 <property name="default_height">600</property>
30 <property name="destroy_with_parent">True</property> 33 <property name="destroy_with_parent">True</property>
31 <property name="type_hint">dialog</property> 34 <property name="icon_name">document-open</property>
35 <property name="type_hint">normal</property>
32 <property name="skip_taskbar_hint">True</property> 36 <property name="skip_taskbar_hint">True</property>
33 <property name="skip_pager_hint">True</property> 37 <property name="skip_pager_hint">True</property>
38 <property name="gravity">center</property>
34 <property name="action">select-folder</property> 39 <property name="action">select-folder</property>
35 <property name="create_folders">False</property> 40 <property name="create_folders">False</property>
36 <property name="filter">gnunet_directory_filter</property>
37 <property name="select_multiple">True</property>
38 <signal name="response" handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/> 41 <signal name="response" handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/>
39 <child internal-child="vbox"> 42 <child internal-child="vbox">
40 <object class="GtkBox" id="GNUNET_GTK_publish_dialog_vbox"> 43 <object class="GtkBox" id="GNUNET_GTK_publish_dialog_vbox">
@@ -85,60 +88,58 @@
85 </packing> 88 </packing>
86 </child> 89 </child>
87 <child> 90 <child>
88 <object class="GtkTable" id="GNUNET_GTK_publish_dialog_action_table"> 91 <object class="GtkGrid" id="GNUNET_GTK_publish_directory_option_grid">
89 <property name="visible">True</property> 92 <property name="visible">True</property>
90 <property name="can_focus">False</property> 93 <property name="can_focus">False</property>
91 <property name="n_rows">2</property> 94 <property name="row_spacing">5</property>
92 <property name="n_columns">4</property> 95 <property name="column_spacing">5</property>
93 <child> 96 <child>
94 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label"> 97 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label">
95 <property name="visible">True</property> 98 <property name="visible">True</property>
96 <property name="can_focus">False</property> 99 <property name="can_focus">False</property>
97 <property name="label" translatable="yes">Priority:</property> 100 <property name="label" translatable="yes">Expiration year:</property>
98 </object> 101 </object>
99 <packing> 102 <packing>
100 <property name="left_attach">2</property> 103 <property name="left_attach">0</property>
101 <property name="right_attach">3</property> 104 <property name="top_attach">0</property>
102 <property name="x_options"/>
103 <property name="y_options"/>
104 </packing> 105 </packing>
105 </child> 106 </child>
106 <child> 107 <child>
107 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button"> 108 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
108 <property name="visible">True</property> 109 <property name="visible">True</property>
109 <property name="can_focus">True</property> 110 <property name="can_focus">True</property>
110 <property name="invisible_char">•</property> 111 <property name="invisible_char">•</property>
111 <property name="adjustment">priority_adjustment</property> 112 <property name="text" translatable="yes">0</property>
112 <property name="numeric">True</property> 113 <property name="adjustment">expiration_year_adjustment</property>
113 </object> 114 </object>
114 <packing> 115 <packing>
115 <property name="left_attach">3</property> 116 <property name="left_attach">1</property>
116 <property name="right_attach">4</property> 117 <property name="top_attach">0</property>
117 <property name="y_options"/>
118 </packing> 118 </packing>
119 </child> 119 </child>
120 <child> 120 <child>
121 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label"> 121 <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label">
122 <property name="visible">True</property> 122 <property name="visible">True</property>
123 <property name="can_focus">False</property> 123 <property name="can_focus">False</property>
124 <property name="label" translatable="yes">Expiration year:</property> 124 <property name="label" translatable="yes">Priority:</property>
125 </object> 125 </object>
126 <packing> 126 <packing>
127 <property name="x_options"/> 127 <property name="left_attach">2</property>
128 <property name="y_options"/> 128 <property name="top_attach">0</property>
129 </packing> 129 </packing>
130 </child> 130 </child>
131 <child> 131 <child>
132 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"> 132 <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
133 <property name="visible">True</property> 133 <property name="visible">True</property>
134 <property name="can_focus">True</property> 134 <property name="can_focus">True</property>
135 <property name="invisible_char">•</property> 135 <property name="invisible_char">•</property>
136 <property name="adjustment">expiration_year_adjustment</property> 136 <property name="text" translatable="yes">0</property>
137 <property name="adjustment">priority_adjustment</property>
138 <property name="numeric">True</property>
137 </object> 139 </object>
138 <packing> 140 <packing>
139 <property name="left_attach">1</property> 141 <property name="left_attach">3</property>
140 <property name="right_attach">2</property> 142 <property name="top_attach">0</property>
141 <property name="y_options"/>
142 </packing> 143 </packing>
143 </child> 144 </child>
144 <child> 145 <child>
@@ -148,10 +149,32 @@
148 <property name="label" translatable="yes">Anonymity:</property> 149 <property name="label" translatable="yes">Anonymity:</property>
149 </object> 150 </object>
150 <packing> 151 <packing>
152 <property name="left_attach">0</property>
153 <property name="top_attach">1</property>
154 </packing>
155 </child>
156 <child>
157 <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
158 <property name="visible">True</property>
159 <property name="can_focus">False</property>
160 <property name="active">1</property>
161 <child>
162 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
163 <attributes>
164 <attribute name="foreground">2</attribute>
165 <attribute name="text">0</attribute>
166 </attributes>
167 </child>
168 <child>
169 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
170 <attributes>
171 <attribute name="text">1</attribute>
172 </attributes>
173 </child>
174 </object>
175 <packing>
176 <property name="left_attach">1</property>
151 <property name="top_attach">1</property> 177 <property name="top_attach">1</property>
152 <property name="bottom_attach">2</property>
153 <property name="x_options"/>
154 <property name="y_options"/>
155 </packing> 178 </packing>
156 </child> 179 </child>
157 <child> 180 <child>
@@ -163,11 +186,7 @@
163 </object> 186 </object>
164 <packing> 187 <packing>
165 <property name="left_attach">2</property> 188 <property name="left_attach">2</property>
166 <property name="right_attach">3</property>
167 <property name="top_attach">1</property> 189 <property name="top_attach">1</property>
168 <property name="bottom_attach">2</property>
169 <property name="x_options"/>
170 <property name="y_options"/>
171 </packing> 190 </packing>
172 </child> 191 </child>
173 <child> 192 <child>
@@ -175,87 +194,46 @@
175 <property name="visible">True</property> 194 <property name="visible">True</property>
176 <property name="can_focus">True</property> 195 <property name="can_focus">True</property>
177 <property name="invisible_char">●</property> 196 <property name="invisible_char">●</property>
197 <property name="text" translatable="yes">0</property>
178 <property name="adjustment">replication_adjustment</property> 198 <property name="adjustment">replication_adjustment</property>
179 <property name="numeric">True</property> 199 <property name="numeric">True</property>
180 </object> 200 </object>
181 <packing> 201 <packing>
182 <property name="left_attach">3</property> 202 <property name="left_attach">3</property>
183 <property name="right_attach">4</property>
184 <property name="top_attach">1</property> 203 <property name="top_attach">1</property>
185 <property name="bottom_attach">2</property>
186 <property name="y_options"/>
187 </packing> 204 </packing>
188 </child> 205 </child>
189 <child> 206 <child>
190 <object class="GtkAlignment" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
191 <property name="visible">True</property>
192 <property name="can_focus">False</property>
193 <property name="yscale">0</property>
194 <child>
195 <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
196 <property name="visible">True</property>
197 <property name="can_focus">False</property>
198 <property name="active">1</property>
199 <child>
200 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
201 <attributes>
202 <attribute name="foreground">2</attribute>
203 <attribute name="text">0</attribute>
204 </attributes>
205 </child>
206 <child>
207 <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
208 <attributes>
209 <attribute name="text">1</attribute>
210 </attributes>
211 </child>
212 </object>
213 </child>
214 </object>
215 <packing>
216 <property name="left_attach">1</property>
217 <property name="right_attach">2</property>
218 <property name="top_attach">1</property>
219 <property name="bottom_attach">2</property>
220 <property name="y_options"/>
221 </packing>
222 </child>
223 </object>
224 <packing>
225 <property name="expand">False</property>
226 <property name="fill">False</property>
227 <property name="position">2</property>
228 </packing>
229 </child>
230 <child>
231 <object class="GtkBox" id="GNUNET_GTK_publish_dialog_index_hbox">
232 <property name="visible">True</property>
233 <property name="can_focus">False</property>
234 <child>
235 <placeholder/>
236 </child>
237 <child>
238 <object class="GtkCheckButton" id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton"> 207 <object class="GtkCheckButton" id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
239 <property name="label" translatable="yes">Index files</property> 208 <property name="label" translatable="yes">Index files</property>
240 <property name="visible">True</property> 209 <property name="visible">True</property>
241 <property name="can_focus">True</property> 210 <property name="can_focus">True</property>
242 <property name="receives_default">False</property> 211 <property name="receives_default">False</property>
243 <property name="use_underline">True</property> 212 <property name="use_underline">True</property>
244 <property name="xalign">0.5</property> 213 <property name="xalign">0</property>
245 <property name="active">True</property> 214 <property name="active">True</property>
246 <property name="draw_indicator">True</property> 215 <property name="draw_indicator">True</property>
247 </object> 216 </object>
248 <packing> 217 <packing>
249 <property name="expand">False</property> 218 <property name="left_attach">3</property>
250 <property name="fill">True</property> 219 <property name="top_attach">2</property>
251 <property name="position">1</property>
252 </packing> 220 </packing>
253 </child> 221 </child>
222 <child>
223 <placeholder/>
224 </child>
225 <child>
226 <placeholder/>
227 </child>
228 <child>
229 <placeholder/>
230 </child>
254 </object> 231 </object>
255 <packing> 232 <packing>
256 <property name="expand">False</property> 233 <property name="expand">False</property>
257 <property name="fill">False</property> 234 <property name="fill">True</property>
258 <property name="position">3</property> 235 <property name="padding">5</property>
236 <property name="position">2</property>
259 </packing> 237 </packing>
260 </child> 238 </child>
261 </object> 239 </object>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 13:27:42 +0000