[meld/ui-next] ui.findbar: Remove Find/Replace labels in find bar

[Kai Willadsen <kaiw src gnome org>]

commit 7bd84faf4b8fd557180002e03275bc97ed39117d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 10 08:53:47 2019 +1000

    ui.findbar: Remove Find/Replace labels in find bar
    
    This is partially to match with more modern layouts in other
    applications, and partially because the alignment switch from Find to
    Find + Replace was always slightly jarring.

 meld/resources/ui/findbar.ui | 41 +++++++----------------------------------
 meld/ui/findbar.py           |  2 --
 2 files changed, 7 insertions(+), 36 deletions(-)
---
diff --git a/meld/resources/ui/findbar.ui b/meld/resources/ui/findbar.ui
index 6a36c162..26646dde 100644
--- a/meld/resources/ui/findbar.ui
+++ b/meld/resources/ui/findbar.ui
@@ -55,7 +55,7 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">2</property>
+        <property name="left_attach">1</property>
         <property name="top_attach">1</property>
       </packing>
     </child>
@@ -102,21 +102,7 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="find_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Find:</property>
-        <property name="use_underline">True</property>
-        <property name="mnemonic_widget">find_entry</property>
-        <property name="xalign">0</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
+        <property name="left_attach">1</property>
         <property name="top_attach">0</property>
       </packing>
     </child>
@@ -131,23 +117,9 @@
         <signal name="changed" handler="on_find_entry_changed" swapped="no"/>
         <signal name="stop-search" handler="on_stop_search" swapped="no"/>
       </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="replace_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Replace _with:</property>
-        <property name="use_underline">True</property>
-        <property name="mnemonic_widget">replace_entry</property>
-        <property name="xalign">0</property>
-      </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -155,12 +127,13 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="width_chars">32</property>
+        <property name="primary_icon_name">edit-find-replace-symbolic</property>
         <property name="primary_icon_activatable">False</property>
         <property name="secondary_icon_activatable">False</property>
         <signal name="activate" handler="on_replace_button_clicked" swapped="no"/>
       </object>
       <packing>
-        <property name="left_attach">1</property>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
       </packing>
     </child>
@@ -219,7 +192,7 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">3</property>
+        <property name="left_attach">2</property>
         <property name="top_attach">0</property>
       </packing>
     </child>
@@ -255,7 +228,7 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">4</property>
+        <property name="left_attach">3</property>
         <property name="top_attach">0</property>
       </packing>
     </child>
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index 1f4f4091..17893ec7 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -34,7 +34,6 @@ class FindBar(Gtk.Grid):
     match_case = Template.Child()
     regex = Template.Child()
     replace_entry = Template.Child()
-    replace_label = Template.Child()
     whole_word = Template.Child()
     wrap_box = Template.Child()
 
@@ -78,7 +77,6 @@ class FindBar(Gtk.Grid):
 
     def start_find(self, textview, text=None):
         self.set_text_view(textview)
-        self.replace_label.hide()
         self.replace_entry.hide()
         self.hbuttonbox2.hide()
         self.find_entry.get_style_context().remove_class("not-found")