[meld/ui-next] Move next/prev conflict to main bar

[Kai Willadsen <kaiw src gnome org>]

commit 5a7a7e998ab2b8f4c15a09feb750ed7fe0b15fd9
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 2 11:26:55 2019 +1000

    Move next/prev conflict to main bar
    
    This isn't actually supported in the other views yet, but it makes sense
    to do so.

 meld/resources/ui/appwindow.ui | 48 ++++++++++++++++++++++++++++++++++++++++++
 meld/resources/ui/filediff.ui  | 44 --------------------------------------
 2 files changed, 48 insertions(+), 44 deletions(-)
---
diff --git a/meld/resources/ui/appwindow.ui b/meld/resources/ui/appwindow.ui
index 09c9fe11..c926ac08 100644
--- a/meld/resources/ui/appwindow.ui
+++ b/meld/resources/ui/appwindow.ui
@@ -106,6 +106,54 @@
             <property name="pack-type">start</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="homogeneous">True</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="action-name">view.file-previous-conflict</property>
+                <property name="tooltip-text">Go to the previous conflict</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon-name">go-top-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="action-name">view.file-next-conflict</property>
+                <property name="tooltip-text">Go to the next conflict</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon-name">go-bottom-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkMenuButton" id="gear_menu_button">
             <property name="visible">true</property>
diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui
index 34361cb3..214c9cdf 100644
--- a/meld/resources/ui/filediff.ui
+++ b/meld/resources/ui/filediff.ui
@@ -16,50 +16,6 @@
         <style>
           <class name="meld-actionbar"/>
         </style>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">True</property>
-            <property name="action-name">view.file-previous-conflict</property>
-            <property name="use-action-appearance">False</property>
-            <property name="tooltip-text">Go to the previous conflict</property>
-            <property name="focus_on_click">False</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon-name">go-top-symbolic</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">True</property>
-            <property name="action-name">view.file-next-conflict</property>
-            <property name="use-action-appearance">False</property>
-            <property name="tooltip-text">Go to the next conflict</property>
-            <property name="focus_on_click">False</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon-name">go-bottom-symbolic</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkButton">
             <property name="visible">True</property>