[meld/pathlabel] dirdiff: Move from GtkToolbar to GtkActionBar

[Kai Willadsen <kaiw src gnome org>]

commit eac1f607d706148bb6014b9eb5078ff95f636bdb
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 17 06:55:11 2021 +1000

    dirdiff: Move from GtkToolbar to GtkActionBar

 meld/dirdiff.py              | 14 ++++-----
 meld/resources/ui/dirdiff.ui | 72 +++++++++++---------------------------------
 2 files changed, 25 insertions(+), 61 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 7bc3c5ad..78d893f6 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -370,15 +370,15 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
     msgarea_mgr1 = Gtk.Template.Child()
     msgarea_mgr2 = Gtk.Template.Child()
     overview_map_revealer = Gtk.Template.Child()
+    pane_actionbar0 = Gtk.Template.Child()
+    pane_actionbar1 = Gtk.Template.Child()
+    pane_actionbar2 = Gtk.Template.Child()
     vbox0 = Gtk.Template.Child()
     vbox1 = Gtk.Template.Child()
     vbox2 = Gtk.Template.Child()
     dummy_toolbar_overview_map = Gtk.Template.Child()
     dummy_toolbar_linkmap0 = Gtk.Template.Child()
     dummy_toolbar_linkmap1 = Gtk.Template.Child()
-    file_toolbar0 = Gtk.Template.Child()
-    file_toolbar1 = Gtk.Template.Child()
-    file_toolbar2 = Gtk.Template.Child()
 
     state_actions = {
         tree.STATE_NORMAL: ("normal", "folder-status-same"),
@@ -481,8 +481,8 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
             [
                 "treeview", "fileentry", "scrolledwindow", "chunkmap",
                 "linkmap", "msgarea_mgr", "vbox", "dummy_toolbar_linkmap",
-                "file_toolbar",
-            ]
+                "pane_actionbar",
+            ],
         )
 
         self.ensure_style()
@@ -1566,13 +1566,13 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
             treeview.set_model(self.model)
 
         for widget in (
-                self.vbox[:num_panes] + self.file_toolbar[:num_panes] +
+                self.vbox[:num_panes] + self.pane_actionbar[:num_panes] +
                 self.chunkmap[:num_panes] + self.linkmap[:num_panes - 1] +
                 self.dummy_toolbar_linkmap[:num_panes - 1]):
             widget.show()
 
         for widget in (
-                self.vbox[num_panes:] + self.file_toolbar[num_panes:] +
+                self.vbox[num_panes:] + self.pane_actionbar[num_panes:] +
                 self.chunkmap[num_panes:] + self.linkmap[num_panes - 1:] +
                 self.dummy_toolbar_linkmap[num_panes - 1:]):
             widget.hide()
diff --git a/meld/resources/ui/dirdiff.ui b/meld/resources/ui/dirdiff.ui
index cdb47e19..63e174e9 100644
--- a/meld/resources/ui/dirdiff.ui
+++ b/meld/resources/ui/dirdiff.ui
@@ -14,32 +14,20 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkToolbar" id="file_toolbar0">
+          <object class="GtkActionBar" id="pane_actionbar0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="show_arrow">False</property>
-            <property name="icon_size">1</property>
             <child>
-              <object class="GtkToolItem" id="fileentry_toolitem0">
+              <object class="GtkFileChooserButton" id="fileentry0">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkFileChooserButton" id="fileentry0">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="action">select-folder</property>
-                    <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
-                  </object>
-                </child>
+                <property name="hexpand">True</property>
+                <property name="action">select-folder</property>
+                <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="homogeneous">False</property>
-              </packing>
             </child>
             <style>
-              <class name="meld-notebook-toolbar"/>
+              <class name="meld-actionbar"/>
             </style>
           </object>
           <packing>
@@ -48,32 +36,20 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="file_toolbar1">
+          <object class="GtkActionBar" id="pane_actionbar1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="show_arrow">False</property>
-            <property name="icon_size">1</property>
             <child>
-              <object class="GtkToolItem" id="fileentry_toolitem1">
+              <object class="GtkFileChooserButton" id="fileentry1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkFileChooserButton" id="fileentry1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="action">select-folder</property>
-                    <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
-                  </object>
-                </child>
+                <property name="hexpand">True</property>
+                <property name="action">select-folder</property>
+                <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="homogeneous">False</property>
-              </packing>
             </child>
             <style>
-              <class name="meld-notebook-toolbar"/>
+              <class name="meld-actionbar"/>
             </style>
           </object>
           <packing>
@@ -82,32 +58,20 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="file_toolbar2">
+          <object class="GtkActionBar" id="pane_actionbar2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="show_arrow">False</property>
-            <property name="icon_size">1</property>
             <child>
-              <object class="GtkToolItem" id="fileentry_toolitem2">
+              <object class="GtkFileChooserButton" id="fileentry2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkFileChooserButton" id="fileentry2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="action">select-folder</property>
-                    <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
-                  </object>
-                </child>
+                <property name="hexpand">True</property>
+                <property name="action">select-folder</property>
+                <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="homogeneous">False</property>
-              </packing>
             </child>
             <style>
-              <class name="meld-notebook-toolbar"/>
+              <class name="meld-actionbar"/>
             </style>
           </object>
           <packing>