-add replication spin button for publishing directories

2 files changed, 62 insertions, 13 deletions

diff --git a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
index 52bbf7af..3b23603c 100644
--- a/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
@@ -8,8 +8,8 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
     <property name="value">1000</property>
+    <property name="upper">100000000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -26,16 +26,18 @@
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
-    <property name="action">select-folder</property>
     <property name="select_multiple">True</property>
     <property name="create_folders">False</property>
+    <property name="action">select-folder</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
@@ -45,7 +47,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -75,7 +76,7 @@
                   <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="invisible_char">&#x2022;</property>
                     <property name="adjustment">priority_adjustment</property>
                     <property name="numeric">True</property>
                   </object>
@@ -111,7 +112,7 @@
                   <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="invisible_char">&#x2022;</property>
                     <property name="adjustment">expiration_year_adjustment</property>
                   </object>
                   <packing>
@@ -135,10 +136,10 @@
                   <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_anonymity_spin_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
+                    <property name="invisible_char">&#x2022;</property>
                     <property name="adjustment">anonymity_adjustment</property>
                     <property name="numeric">True</property>
-                    <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+                    <signal name="value_changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -152,6 +153,47 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="hbox3">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="GNUNET_GTK_publish_directory_dialog_replication_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Replication:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="adjustment">replication_adjustment</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">1</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">2</property>
@@ -167,7 +209,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -183,7 +224,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -207,8 +247,13 @@
     </action-widgets>
   </object>
   <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
     <property name="value">1</property>
+    <property name="upper">10000000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="replication_adjustment">
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 8c4be512..e5efd423 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -1365,11 +1365,15 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
          &bo.anonymity_level))
       bo.anonymity_level = 1;
     bo.content_priority =
-        gtk_spin_button_get_value (GTK_SPIN_BUTTON
+      gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                    (gtk_builder_get_object
                                     (builder,
                                      "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
-    bo.replication_level = 0;   /* FIXME: replication level in GUI? */
+    bo.replication_level = 
+      gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                                 (gtk_builder_get_object
+                                  (builder,
+                                   "GNUNET_GTK_publish_directory_dialog_replication_spin_button")));
     bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
     do_index =
         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON