Modify UI

https://bugzilla.gnome.org/show_bug.cgi?id=768311

3 files changed, 164 insertions, 347 deletions

diff --git a/src/nautilus-batch-rename.c b/src/nautilus-batch-rename.c
index e50621f7a..fa1e086d5 100644
--- a/src/nautilus-batch-rename.c
+++ b/src/nautilus-batch-rename.c
@@ -38,18 +38,15 @@ struct _NautilusBatchRename
         GtkWidget               *cancel_button;
         GtkWidget               *conflict_listbox;
         GtkWidget               *error_label;
-        GtkWidget               *expander;
+        //GtkWidget               *expander;
         GtkWidget               *name_entry;
         GtkWidget               *rename_button;
-        GtkWidget               *find_label;
         GtkWidget               *find_entry;
         GtkWidget               *mode_stack;
-        GtkWidget               *label_stack;
+       // GtkWidget               *label_stack;
         GtkWidget               *replace_entry;
-        GtkWidget               *replace_label;
-        GtkWidget               *new_name_button;
-        GtkWidget               *append_button;
-        GtkWidget               *prepend_button;
+        GtkWidget               *format_mode_button;
+        GtkWidget               *replace_mode_button;
 
         GList                   *listbox_rows;
 
@@ -119,53 +116,6 @@ rename_files_on_names_accepted (NautilusBatchRename *dialog,
 }
 
 static void
-batch_rename_format_mode_changed (NautilusBatchRename *dialog)
-{
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->new_name_button)))
-                dialog->mode = NAUTILUS_BATCH_RENAME_NEW_NAME;
-
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->prepend_button)))
-                dialog->mode = NAUTILUS_BATCH_RENAME_PREPEND;
-
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->append_button)))
-                dialog->mode = NAUTILUS_BATCH_RENAME_APPEND;
-
-        /* update display text */
-        file_names_widget_entry_on_changed (dialog);
-}
-
-static void
-mode_stack_changed (GtkStack            *stack,
-                    GParamSpec          *pspec,
-                    NautilusBatchRename *dialog)
-{
-        const gchar *visible_child;
-        visible_child = gtk_stack_get_visible_child_name (stack);
-
-        if (strcmp (visible_child, "format") == 0) {
-                /* switch the mode to what was before set with the radio buttons */
-                batch_rename_format_mode_changed (dialog);
-
-                gtk_entry_set_text (GTK_ENTRY (dialog->name_entry),
-                                    gtk_entry_get_text (GTK_ENTRY (dialog->find_entry)));
-
-                gtk_widget_grab_focus (dialog->name_entry);
-        }
-
-        if (strcmp (visible_child, "replace") == 0) {
-                dialog->mode = NAUTILUS_BATCH_RENAME_REPLACE;
-
-                gtk_entry_set_text (GTK_ENTRY (dialog->find_entry),
-                                               gtk_entry_get_text (GTK_ENTRY (dialog->name_entry)));
-
-                gtk_widget_grab_focus (dialog->find_entry);
-        }
-
-        /* update display text */
-        file_names_widget_entry_on_changed (dialog);
-}
-
-static void
 listbox_header_func (GtkListBoxRow         *row,
                      GtkListBoxRow         *before,
                      NautilusBatchRename   *dialog)
@@ -277,7 +227,7 @@ file_names_widget_entry_on_changed (NautilusBatchRename *dialog)
                 gtk_widget_set_sensitive (dialog->rename_button, FALSE);
 
                 /* check if there is more than one conflict */
-                if (!singe_conflict)
+                /*if (!singe_conflict)
                         gtk_expander_set_label (GTK_EXPANDER (dialog->expander),
                                                 "Multiple file conflicts");
                 else {
@@ -293,12 +243,12 @@ file_names_widget_entry_on_changed (NautilusBatchRename *dialog)
                         } else {
                                gtk_label_set_label (GTK_LABEL (dialog->error_label), file_name);
                         }
-                }
+                }*/
 
                 if (!singe_conflict || strlen (file_name) >= MAX_DISPLAY_LEN) {
-                        gtk_expander_set_expanded (GTK_EXPANDER (dialog->expander), FALSE);
-                        gtk_stack_set_visible_child (GTK_STACK (dialog->label_stack),
-                                                     GTK_WIDGET (dialog->expander));
+                       // gtk_expander_set_expanded (GTK_EXPANDER (dialog->expander), FALSE);
+                      //  gtk_stack_set_visible_child (GTK_STACK (dialog->label_stack),
+                       //                              GTK_WIDGET (dialog->expander));
                 }
 
                 /* add name conflicts to the listbox */
@@ -311,11 +261,11 @@ file_names_widget_entry_on_changed (NautilusBatchRename *dialog)
         else
                 /* re-enable the rename button if there are no more name conflicts */
                 if (duplicates == NULL && !gtk_widget_is_sensitive (dialog->rename_button)) {
-                        gtk_expander_set_expanded (GTK_EXPANDER (dialog->expander), FALSE);
+                        //gtk_expander_set_expanded (GTK_EXPANDER (dialog->expander), FALSE);
 
                         gtk_widget_set_sensitive (dialog->rename_button, TRUE);
 
-                        gtk_stack_set_visible_child (GTK_STACK (dialog->label_stack), GTK_WIDGET (dialog->error_label));
+                        //gtk_stack_set_visible_child (GTK_STACK (dialog->label_stack), GTK_WIDGET (dialog->error_label));
                 }
 
         /* Update label that shows an example of the renaming result */
@@ -373,6 +323,24 @@ file_names_widget_on_activate (NautilusBatchRename *dialog)
 }
 
 static void
+batch_rename_mode_changed (NautilusBatchRename *dialog)
+{
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->format_mode_button))) {
+                gtk_stack_set_visible_child_name (dialog->mode_stack, "format");
+
+                dialog->mode = NAUTILUS_BATCH_RENAME_FORMAT;
+        } else {
+                gtk_stack_set_visible_child_name (dialog->mode_stack, "replace");
+
+                dialog->mode = NAUTILUS_BATCH_RENAME_REPLACE;
+        }
+
+        /* update display text */
+        file_names_widget_entry_on_changed (dialog);
+
+}
+
+static void
 nautilus_batch_rename_class_init (NautilusBatchRenameClass *klass)
 {
         GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
@@ -386,29 +354,28 @@ nautilus_batch_rename_class_init (NautilusBatchRenameClass *klass)
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, cancel_button);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, conflict_listbox);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, error_label);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, expander);
+        //gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, expander);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, name_entry);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, rename_button);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, find_label);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, find_entry);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, label_stack);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, replace_label);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, replace_entry);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, new_name_button);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, append_button);
-        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, prepend_button);
         gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, mode_stack);
+        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, replace_mode_button);
+        gtk_widget_class_bind_template_child (widget_class, NautilusBatchRename, format_mode_button);
 
         gtk_widget_class_bind_template_callback (widget_class, file_names_widget_entry_on_changed);
         gtk_widget_class_bind_template_callback (widget_class, batch_rename_dialog_on_closed);
         gtk_widget_class_bind_template_callback (widget_class, file_names_widget_on_activate);
-        gtk_widget_class_bind_template_callback (widget_class, batch_rename_format_mode_changed);
+        gtk_widget_class_bind_template_callback (widget_class, batch_rename_mode_changed);
 }
 
 GtkWidget*
 nautilus_batch_rename_new (NautilusFilesView *view)
 {
         NautilusBatchRename *dialog;
+        gint files_nr;
+        GList *l;
+        gchar *dialog_title;
 
         dialog = g_object_new (NAUTILUS_TYPE_BATCH_RENAME,"use-header-bar",1, NULL);
 
@@ -420,24 +387,28 @@ nautilus_batch_rename_new (NautilusFilesView *view)
 
         gtk_widget_grab_focus (dialog->name_entry);
 
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->append_button), TRUE);
-
         gtk_label_set_ellipsize (GTK_LABEL (dialog->error_label), PANGO_ELLIPSIZE_END);
         gtk_label_set_max_width_chars (GTK_LABEL (dialog->error_label), MAX_DISPLAY_LEN);
 
-        gtk_label_set_ellipsize (GTK_LABEL (dialog->expander_label), PANGO_ELLIPSIZE_END);
-        gtk_label_set_max_width_chars (GTK_LABEL (dialog->expander_label), MAX_DISPLAY_LEN - 1);
+        //gtk_label_set_ellipsize (GTK_LABEL (dialog->expander_label), PANGO_ELLIPSIZE_END);
+        //gtk_label_set_max_width_chars (GTK_LABEL (dialog->expander_label), MAX_DISPLAY_LEN - 1);
 
         gtk_widget_set_vexpand (dialog->rename_button, FALSE);
 
-        g_signal_connect (dialog->mode_stack,
-                          "notify::visible-child",
-                          G_CALLBACK (mode_stack_changed),
-                          dialog);
+        files_nr = 0;
+
+        for (l = dialog->selection; l != NULL; l = l->next)
+                files_nr++;
+
+        dialog_title = malloc (25);
+        sprintf (dialog_title, "Renaming %d files", files_nr);
+        gtk_window_set_title (GTK_WINDOW (dialog), dialog_title);
 
         /* update display text */
         file_names_widget_entry_on_changed (dialog);
 
+        g_free (dialog_title);
+
         return GTK_WIDGET (dialog);
 }
 
@@ -451,7 +422,7 @@ nautilus_batch_rename_init (NautilusBatchRename *self)
                                 self,
                                 NULL);
 
-        self->expander_label = gtk_label_new ("");
+        //self->expander_label = gtk_label_new ("");
 
         self->mode = NAUTILUS_BATCH_RENAME_PREPEND;
 }
\ No newline at end of file
diff --git a/src/nautilus-batch-rename.h b/src/nautilus-batch-rename.h
index 27e77ec38..63fab696b 100644
--- a/src/nautilus-batch-rename.h
+++ b/src/nautilus-batch-rename.h
@@ -12,7 +12,7 @@ typedef enum {
         NAUTILUS_BATCH_RENAME_APPEND = 0,
         NAUTILUS_BATCH_RENAME_PREPEND = 1,
         NAUTILUS_BATCH_RENAME_REPLACE = 2,
-        NAUTILUS_BATCH_RENAME_NEW_NAME = 3,
+        NAUTILUS_BATCH_RENAME_FORMAT = 3,
 } NautilusBatchRenameModes;
 
 #define NAUTILUS_TYPE_BATCH_RENAME (nautilus_batch_rename_get_type())
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui b/src/resources/ui/nautilus-batch-rename-dialog.ui
index 0fd0d2f8c..e497d5012 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -6,58 +6,82 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
 
-    <child internal-child="headerbar">
-      <object class="GtkHeaderBar" id="headerbar1">
-        <property name="visible">1</property>
-        <property name="show-close-button">0</property>
-        <child type="title">
-          <object class="GtkStackSwitcher" id="stack_switcher">
-            <property name="visible">True</property>
-            <property name="stack">mode_stack</property>
-            <property name="no-show-all">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="cancel_button">
-            <property name="label" translatable="yes">_Cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="use_underline">True</property>
-            <signal name="clicked" handler="batch_rename_dialog_on_closed" swapped="yes" />
-          </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="rename_button">
-            <property name="label" translatable="yes">_Rename</property>
-            <property name="visible">True</property>
-            <property name="use_underline">True</property>
-            <property name="can_default">True</property>
-            <signal name="clicked" handler="file_names_widget_on_activate" swapped="yes" />
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label" translatable="yes">_Cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="use_underline">True</property>
+        <signal name="clicked" handler="batch_rename_dialog_on_closed" swapped="yes" />
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="rename_button">
+        <property name="label" translatable="yes">_Rename</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="can_default">True</property>
+        <signal name="clicked" handler="file_names_widget_on_activate" swapped="yes" />
+        <style>
+          <class name="suggested-action"/>
+        </style>
       </object>
     </child>
+
+    <action-widgets>
+      <action-widget response="ok" default="true">rename_button</action-widget>
+      <action-widget response="cancel">cancel_button</action-widget>
+    </action-widgets>
+
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
-            <property name="margin">10</property>
+            <property name="margin">0</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">6</property>
             <property name="hexpand">True</property>
             <property name="row-homogeneous">False</property>
             <property name="column-homogeneous">False</property>
             <child>
+              <object class="GtkBox">
+                <property name="orientation">horizontal</property>
+                <property name="spacing">15</property>
+                <property name="visible">True</property>
+                <property name="halign">center</property>
+                <property name="margin">20</property>
+                <child>
+                  <object class="GtkRadioButton" id="format_mode_button">
+                    <property name="label" translatable="yes">_Format mode</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <signal name="toggled" handler="batch_rename_mode_changed" swapped="yes" />
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="replace_mode_button">
+                    <property name="label" translatable="yes">Find and _replace text</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="group">format_mode_button</property>
+                    <signal name="toggled" handler="batch_rename_mode_changed" swapped="yes" />
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">0</property>
+                <property name="width">1</property>                
+              </packing>
+            </child>
+            <child>
               <object class="GtkStack" id="mode_stack">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -68,206 +92,49 @@
                 <child>
                   <object class="GtkGrid" id="format_stack_child">
                     <property name="visible">True</property>
-                    <property name="margin">10</property>
+                    <property name="margin-left">40</property>
+                    <property name="margin-right">40</property>
+                    <property name="margin-top">0</property>
+                    <property name="margin-bottom">10</property>
                     <property name="row-spacing">6</property>
                     <property name="column-spacing">6</property>
                     <child>
-                      <object class="GtkBox" id="hbox3">
+                      <object class="GtkBox">
                         <property name="orientation">horizontal</property>
-                        <property name="spacing">15</property>
+                        <property name="spacing">0</property>
                         <property name="visible">True</property>
                         <property name="halign">center</property>
                         <child>
-                          <object class="GtkRadioButton" id="new_name_button">
-                            <property name="label" translatable="yes">_New Name</property>
+                          <object class="GtkEntry" id="name_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">True</property>
-                            <signal name="toggled" handler="batch_rename_format_mode_changed" swapped="yes" />
+                            <property name="width_request">400</property>
+                            <property name="hexpand">False</property>
+                            <property name="activates-default">True</property>
+                            <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
+                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
                           </object>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="append_button">
-                            <property name="label" translatable="yes">_Append</property>
+                          <object class="GtkPopover" id="add_popover">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">False</property>
-                            <property name="group">new_name_button</property>
-                            <signal name="toggled" handler="batch_rename_format_mode_changed" swapped="yes" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="prepend_button">
-                            <property name="label" translatable="yes">_Prepend</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">False</property>
-                            <property name="group">new_name_button</property>
-                            <signal name="toggled" handler="batch_rename_format_mode_changed" swapped="yes" />
+                            <child>
+                              <object class="GtkLabel" id="_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Replace With</property>
+                                <property name="can_focus">False</property>
+                                <property name="sensitive">False</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
                         <property name="top-attach">0</property>
-                        <property name="width">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="name_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_request">550</property>
-                        <property name="hexpand">False</property>
-                        <property name="activates-default">True</property>
-                        <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
-                        <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
-                      </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
                         <property name="width">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="name_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Name:</property>
-                      <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="where_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Where</property>
-                      <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">3</property>
-                        <property name="top-attach">2</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="add_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Add</property>
-                      <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="vbox3">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <property name="visible">True</property>
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkRadioButton" id="after">
-                            <property name="label" translatable="yes">_After Name</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="before">
-                            <property name="label" translatable="yes">_Before Name</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">False</property>
-                            <property name="group">after</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">3</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                     <child>
-                      <object class="GtkBox" id="vbox4">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <property name="visible">True</property>
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkCheckButton" id="index">
-                            <property name="label" translatable="yes">Index</property>
-                            <property name="visible">True</property>
-                            <property name="active">False</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="padding">
-                            <property name="label" translatable="yes">Zero padding</property>
-                            <property name="visible">True</property>
-                            <property name="active">False</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="date">
-                            <property name="label" translatable="yes">Date</property>
-                            <property name="visible">True</property>
-                            <property name="active">False</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="start_at">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Start at</property>
-                      <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">4</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spinbutton1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="width-chars">2</property>
-                        <property name="max-width-chars">2</property>
-                        <property name="adjustment">adjustment</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">4</property>
-                        <property name="width">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="name">format</property>
@@ -277,14 +144,18 @@
                 <child>
                   <object class="GtkGrid" id="replace_stack_child">
                     <property name="visible">True</property>
-                    <property name="margin">10</property>
+                    <property name="margin-left">40</property>
+                    <property name="margin-right">40</property>
+                    <property name="margin-top">0</property>
+                    <property name="margin-bottom">10</property>
                     <property name="row-spacing">6</property>
                     <property name="column-spacing">6</property>
                     <child>
-                      <object class="GtkLabel" id="find_label">
+                      <object class="GtkLabel" id="existing_text_label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Replace:</property>
+                        <property name="label" translatable="yes">Existing Text</property>
                         <property name="can_focus">False</property>
+                        <property name="sensitive">False</property>
                       </object>
                         <packing>
                           <property name="left-attach">0</property>
@@ -296,7 +167,7 @@
                       <object class="GtkEntry" id="find_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="width_request">275</property>
+                        <property name="width_request">400</property>
                         <property name="hexpand">False</property>
                         <property name="activates-default">True</property>
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
@@ -311,12 +182,13 @@
                     <child>
                       <object class="GtkLabel" id="replace_label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">With:</property>
+                        <property name="label" translatable="yes">Replace With</property>
                         <property name="can_focus">False</property>
+                        <property name="sensitive">False</property>
                       </object>
                         <packing>
-                          <property name="left-attach">4</property>
-                          <property name="top-attach">0</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
                           <property name="width">1</property>
                         </packing>
                     </child>
@@ -324,13 +196,13 @@
                       <object class="GtkEntry" id="replace_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="width_request">275</property>
+                        <property name="width_request">400</property>
                         <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
                         <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
                       </object>
                         <packing>
-                          <property name="left-attach">6</property>
-                          <property name="top-attach">0</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
                           <property name="width">3</property>
                         </packing>
                     </child>
@@ -340,16 +212,6 @@
                     <property name="title" translatable="yes">Replace</property>
                   </packing>
                 </child>
-                <!--Metadata mode (nonexistent yet)-->
-                <child>
-                  <object class="GtkBox" id="metadata_stack_child">
-                        <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="name">metadata</property>
-                    <property name="title" translatable="yes">Metadata</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -358,43 +220,20 @@
               </packing>
             </child>
             <child>
-              <object class="GtkStack" id="label_stack">
+              <object class="GtkScrolledWindow">
+                <property name="height_request">250</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">False</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkLabel" id="error_label">
+                  <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="halign">start</property>
                     <property name="can_focus">False</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkExpander" id="expander">
-                    <property name="visible">True</property>
-                    <property name="valign">center</property>
-                    <child type="label">
-                      <object class="GtkLabel" id="expander-label"/>
-                    </child>
                     <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="height_request">100</property>
-                        <property name="width_request">100</property>
+                      <object class="GtkListBox" id="conflict_listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">False</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkViewport">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkListBox" id="conflict_listbox">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                   </object>
@@ -406,6 +245,13 @@
                 <property name="width">8</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="error_label">
+                <property name="visible">False</property>
+                <property name="halign">start</property>
+                <property name="can_focus">False</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>