[meld/pathlabel] pathlabel: Make path label popover use text instead of image buttons

[Kai Willadsen <kaiw src gnome org>]

commit a01bb007ba56474fd2975ea4231ff966745b1358
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Aug 9 07:45:44 2021 +1000

    pathlabel: Make path label popover use text instead of image buttons
    
    The image buttons weren't very obvious about what they actually did.
    Since this isn't a situation where we need to be preserving vertical
    (or horizontal!) space, the clarity of the text buttons wins out.

 meld/resources/ui/path-label.ui | 96 +++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 47 deletions(-)
---
diff --git a/meld/resources/ui/path-label.ui b/meld/resources/ui/path-label.ui
index d5dafc55..9a143efa 100644
--- a/meld/resources/ui/path-label.ui
+++ b/meld/resources/ui/path-label.ui
@@ -1,33 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkPopover" id="path_popover">
-    <property name="can_focus">True</property>
+    <property name="can-focus">True</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
+        <property name="can-focus">False</property>
+        <property name="border-width">6</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">Path:</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="full_path_label">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="editable">False</property>
-            <property name="width_chars">60</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Path:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="full_path_label">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="editable">False</property>
+                <property name="width-chars">60</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -38,23 +50,18 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
+            <property name="halign">end</property>
             <property name="homogeneous">True</property>
             <child>
               <object class="GtkButton">
+                <property name="label" translatable="yes">Copy Path</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text">Copy Full Path</property>
-                <property name="action_name">widget.copy-full-path</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">edit-copy-symbolic</property>
-                  </object>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="focus-on-click">False</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text">Copy the full path</property>
+                <property name="action-name">widget.copy-full-path</property>
                 <style>
                   <class name="image-button"/>
                 </style>
@@ -67,19 +74,13 @@
             </child>
             <child>
               <object class="GtkButton">
+                <property name="label" translatable="yes">Open Folder</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text">Open Containing Folder</property>
-                <property name="action_name">widget.open-folder</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">folder-open-symbolic</property>
-                  </object>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="focus-on-click">False</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text">Open the folder containing this path</property>
+                <property name="action-name">widget.open-folder</property>
                 <style>
                   <class name="image-button"/>
                 </style>
@@ -97,6 +98,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="pack-type">end</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -104,8 +106,8 @@
     </child>
   </object>
   <template class="PathLabel" parent="GtkMenuButton">
-    <property name="can_focus">False</property>
-    <property name="receives_default">False</property>
+    <property name="can-focus">False</property>
+    <property name="receives-default">False</property>
     <property name="popover">path_popover</property>
     <child>
       <placeholder/>