[meld/ui-next] filediff: Remove pull actions from toolbar

[Kai Willadsen <kaiw src gnome org>]

commit bfdf01a30d547f7eddcde098c806057d0cc61e23
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Mar 15 07:38:17 2019 +1000

    filediff: Remove pull actions from toolbar
    
    These actions really exist to make life better for keyboard users, so
    that there's no necessity to switch panes. If you're using a mouse, you
    can more easily use actions in the central bar, or just click on another
    pane and then take the relevant push action.
    
    Also, we didn't previously expose these actions in the toolbar and no
    one has ever asked for them to be.

 meld/resources/ui/filediff-actions.ui | 116 ++++++++++++----------------------
 1 file changed, 40 insertions(+), 76 deletions(-)
---
diff --git a/meld/resources/ui/filediff-actions.ui b/meld/resources/ui/filediff-actions.ui
index d72be9f3..668401a3 100644
--- a/meld/resources/ui/filediff-actions.ui
+++ b/meld/resources/ui/filediff-actions.ui
@@ -5,94 +5,58 @@
     <property name="orientation">horizontal</property>
     <property name="spacing">6</property>
     <child>
-      <object class="GtkButton">
-        <property name="visible">True</property>
-        <property name="action-name">view.file-push-left</property>
-        <property name="use-action-appearance">False</property>
-        <property name="tooltip-text">Push current change to the left</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-previous-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-push-right</property>
-        <property name="use-action-appearance">False</property>
-        <property name="tooltip-text">Push current change to the right</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-next-symbolic</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="action-name">view.file-pull-left</property>
-        <property name="use-action-appearance">False</property>
-        <property name="tooltip-text">Pull change from the left</property>
-        <property name="focus_on_click">False</property>
+        <property name="orientation">horizontal</property>
+        <property name="homogeneous">True</property>
         <style>
-          <class name="image-button"/>
+          <class name="linked"/>
         </style>
         <child>
-          <object class="GtkImage">
+          <object class="GtkButton">
             <property name="visible">True</property>
-            <!-- FIXME: icon abuse -->
-            <property name="icon-name">go-last-symbolic</property>
-            <property name="icon-size">1</property>
+            <property name="action-name">view.file-push-left</property>
+            <property name="use-action-appearance">False</property>
+            <property name="tooltip-text">Push current change to the left</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-previous-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">start</property>
+          </packing>
         </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-pull-right</property>
-        <property name="use-action-appearance">False</property>
-        <property name="tooltip-text">Pull change from the right</property>
-        <property name="focus_on_click">False</property>
-        <style>
-          <class name="image-button"/>
-        </style>
         <child>
-          <object class="GtkImage">
+          <object class="GtkButton">
             <property name="visible">True</property>
-            <!-- FIXME: icon abuse -->
-            <property name="icon-name">go-first-symbolic</property>
-            <property name="icon-size">1</property>
+            <property name="action-name">view.file-push-right</property>
+            <property name="use-action-appearance">False</property>
+            <property name="tooltip-text">Push current change to the right</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-next-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">start</property>
+          </packing>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
     </child>
     <child>
       <object class="GtkMenuButton" id="copy_action_button">