[nautilus] Revert "batch-rename-dialog: revealer for auto numbering"

[Carlos Soriano <csoriano src gnome org>]

commit aaef775663696a3f1f9d4f9b0442dfe5d2863da5
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Sep 29 22:36:12 2016 +0200

    Revert "batch-rename-dialog: revealer for auto numbering"
    
    This reverts commit b37950722078595699b127b154ea07e9c57cbc09.

 src/nautilus-batch-rename-dialog.c               |    8 +---
 src/resources/ui/nautilus-batch-rename-dialog.ui |   41 +++++++++------------
 2 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index 7b7213e..7f805ae 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -56,7 +56,6 @@ struct _NautilusBatchRenameDialog
     GtkWidget *scrolled_window;
     GtkWidget *numbering_order_popover;
     GtkWidget *numbering_order_button;
-    GtkWidget *numbering_revealer;
     GtkWidget *conflict_box;
     GtkWidget *conflict_label;
     GtkWidget *conflict_down;
@@ -1525,14 +1524,12 @@ update_display_text (NautilusBatchRenameDialog *dialog)
     if (!numbering_tag_is_some_added (dialog))
     {
         gtk_label_set_label (GTK_LABEL (dialog->numbering_label), "");
-        gtk_widget_hide (dialog->numbering_label);
-        gtk_revealer_set_reveal_child(GTK_REVEALER(dialog->numbering_revealer), FALSE);
+        gtk_widget_hide (dialog->numbering_order_button);
     }
     else
     {
         gtk_label_set_label (GTK_LABEL (dialog->numbering_label), _("Automatic Numbering Order"));
-        gtk_widget_show (dialog->numbering_label);
-        gtk_revealer_set_reveal_child(GTK_REVEALER(dialog->numbering_revealer), TRUE);
+        gtk_widget_show (dialog->numbering_order_button);
     }
 
     dialog->new_names = batch_rename_dialog_get_new_names (dialog);
@@ -2098,7 +2095,6 @@ nautilus_batch_rename_dialog_class_init (NautilusBatchRenameDialogClass *klass)
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, scrolled_window);
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, numbering_order_popover);
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, numbering_order_button);
-    gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, numbering_revealer);
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, numbering_order_menu);
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, conflict_box);
     gtk_widget_class_bind_template_child (widget_class, NautilusBatchRenameDialog, conflict_label);
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index bb05a3c..d4bef6d 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -155,7 +155,7 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="numbering_label">
-                        <property name="visible">False</property>
+                        <property name="visible">True</property>
                         <property name="label" translatable="yes">Automatic Numbering Order</property>
                         <property name="can_focus">False</property>
                         <property name="height-request">35</property>
@@ -168,33 +168,28 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRevealer" id="numbering_revealer">
+                      <object class="GtkToggleButton" id="numbering_order_button">
                         <property name="visible">True</property>
+                        <signal name="toggled" handler="numbering_order_button_clicked" swapped="yes" />
                         <child>
-                          <object class="GtkToggleButton" id="numbering_order_button">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
-                            <signal name="toggled" handler="numbering_order_button_clicked" swapped="yes" />
+                            <property name="orientation">horizontal</property>
+                            <property name="spacing">15</property>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkLabel" id="numbering_order_label">
                                 <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <property name="spacing">15</property>
-                                <child>
-                                  <object class="GtkLabel" id="numbering_order_label">
-                                    <property name="visible">True</property>
-                                    <property name="width-request">180</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Original Name 
(Ascending)</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImage" id="action_icon">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">pan-down-symbolic</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
+                                <property name="width-request">180</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Original Name 
(Ascending)</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImage" id="action_icon">
+                                <property name="visible">True</property>
+                                <property name="icon-name">pan-down-symbolic</property>
+                                <property name="icon-size">1</property>
                               </object>
                             </child>
                           </object>