[meld/pathlabel] vcview: Rework VC action bar buttons

[Kai Willadsen <kaiw src gnome org>]

commit 4ef740a7554d6e4bbf701f2136182d4bb717c01d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Sep 24 08:45:25 2021 +1000

    vcview: Rework VC action bar buttons
    
    This removes the delete-a-local-file action from our action bar, and
    changes the resolve conflicts action to be an icon button in the same
    linked block as other selection-based VC actions.
    
    The rationale here is that deleting a file is a relatively uncommon
    thing to do, and in any case isn't fundamental to the operation of Meld
    as a VC viewer. It's also still available from the context menu, which
    is how such actions are presented in e.g., Nautilus.
    
    By contrast, resolving a conflict is very much a VC operation and while
    it's comparatively rare... when it's needed it's very much needed.

 meld/resources/ui/vcview.ui | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/meld/resources/ui/vcview.ui b/meld/resources/ui/vcview.ui
index d451a1a6..57a6da8e 100644
--- a/meld/resources/ui/vcview.ui
+++ b/meld/resources/ui/vcview.ui
@@ -109,11 +109,11 @@
             <child>
               <object class="GtkButton">
                 <property name="visible">True</property>
-                <property name="action_name">view.vc-delete-locally</property>
-                <property name="tooltip_text" translatable="yes">Delete from working copy</property>
+                <property name="action_name">view.vc-resolve</property>
+                <property name="tooltip_text" translatable="yes">Mark as resolved in version 
control</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="icon-name">edit-delete-symbolic</property>
+                    <property name="icon-name">emblem-ok-symbolic</property>
                     <property name="visible">true</property>
                   </object>
                 </child>
@@ -121,20 +121,6 @@
             </child>
           </object>
         </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">True</property>
-            <property name="action_name">view.vc-resolve</property>
-            <property name="tooltip_text" translatable="yes">Mark as resolved in version control</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Resolve Conflict</property>
-              </object>
-            </child>
-          </object>
-        </child>
         <child type="center">
           <object class="GtkBox">
             <property name="visible">True</property>