From b2f918a9a4fb089772cf4cc6eec0dc1f96bb3f09 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 9 Apr 2016 15:49:39 +0000
Subject: fix look and feel, remove use of deprecated widgets, remove filter
 for directories

---
 contrib/Makefile.am                                |  13 +-
 contrib/gnunet_fs_gtk_publish_dialog.glade         |   3 +-
 .../gnunet_fs_gtk_publish_directory_dialog.glade   | 164 +++++++++------------
 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 @@
 
 SUBDIRS = .
 
-pkgpixdir= $(pkgdatadir)
+pkgdatadir= $(prefix)/share/gnunet/
 
 IMAGES = \
  gnunet-setup-oxygen-cancel.png \
@@ -89,18 +89,18 @@ pkgdata_DATA = \
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	@list='$(srcdir)/flags/*.png'; test -n "$(pkgpixdir)/flags" || list=; \
+	@list='$(srcdir)/flags/*.png'; test -n "$(prefix)/share/gnunet/flags" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgpixdir)/flags'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgpixdir)/flags" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/share/gnunet/flags'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gnunet/flags" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgpixdir)/flags'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgpixdir)/flags" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(prefix)/share/gnunet/flags'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(prefix)/share/gnunet/flags" || exit $$?; \
 	done
 
 dist-hook:
@@ -112,4 +112,3 @@ dist-hook:
 	    fi \
 	  done \
 	fi
-
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 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Publish content on GNUnet</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="window_position">center</property>
+    <property name="gravity">center</property>
     <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
     <child>
       <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 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_directory_dialog">
-    <property name="can_focus">False</property>
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="has_focus">True</property>
     <property name="can_default">True</property>
     <property name="events">GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Select directory to publish</property>
     <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="window_position">center</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
+    <property name="icon_name">document-open</property>
+    <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="gravity">center</property>
     <property name="action">select-folder</property>
     <property name="create_folders">False</property>
-    <property name="filter">gnunet_directory_filter</property>
-    <property name="select_multiple">True</property>
     <signal name="response" handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="GNUNET_GTK_publish_dialog_vbox">
@@ -85,60 +88,58 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="GNUNET_GTK_publish_dialog_action_table">
+          <object class="GtkGrid" id="GNUNET_GTK_publish_directory_option_grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">4</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label">
+              <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Priority:</property>
+                <property name="label" translatable="yes">Expiration year:</property>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="x_options"/>
-                <property name="y_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
+              <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>
-                <property name="adjustment">priority_adjustment</property>
-                <property name="numeric">True</property>
+                <property name="text" translatable="yes">0</property>
+                <property name="adjustment">expiration_year_adjustment</property>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
-                <property name="y_options"/>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_expiration_label">
+              <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_priority_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Expiration year:</property>
+                <property name="label" translatable="yes">Priority:</property>
               </object>
               <packing>
-                <property name="x_options"/>
-                <property name="y_options"/>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
+              <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>
-                <property name="adjustment">expiration_year_adjustment</property>
+                <property name="text" translatable="yes">0</property>
+                <property name="adjustment">priority_adjustment</property>
+                <property name="numeric">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"/>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -148,10 +149,32 @@
                 <property name="label" translatable="yes">Anonymity:</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">1</property>
+                <child>
+                  <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
+                  <attributes>
+                    <attribute name="foreground">2</attribute>
+                    <attribute name="text">0</attribute>
+                  </attributes>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options"/>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
@@ -163,11 +186,7 @@
               </object>
               <packing>
                 <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options"/>
-                <property name="y_options"/>
               </packing>
             </child>
             <child>
@@ -175,65 +194,15 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">●</property>
+                <property name="text" translatable="yes">0</property>
                 <property name="adjustment">replication_adjustment</property>
                 <property name="numeric">True</property>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"/>
               </packing>
             </child>
-            <child>
-              <object class="GtkAlignment" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="yscale">0</property>
-                <child>
-                  <object class="GtkComboBox" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="active">1</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
-                      <attributes>
-                        <attribute name="foreground">2</attribute>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                    <child>
-                      <object class="GtkCellRendererText" id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"/>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="GNUNET_GTK_publish_dialog_index_hbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <placeholder/>
-            </child>
             <child>
               <object class="GtkCheckButton" id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
                 <property name="label" translatable="yes">Index files</property>
@@ -241,21 +210,30 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.5</property>
+                <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
+            <property name="fill">True</property>
+            <property name="padding">5</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
-- 
cgit v1.2.3