[meld/pathlabel: 70/73] Merge branch 'master' into pathlabel

[Kai Willadsen <kaiw src gnome org>]

commit 8102e89cf7c9dfbd91787e69a304c717edf0f257
Merge: 1a0277d7 b34f2082
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Aug 15 09:04:20 2021 +1000

    Merge branch 'master' into pathlabel

 .gitlab-ci.yml                        |    1 +
 .pre-commit-config.yaml               |    2 +
 data/org.gnome.meld.appdata.xml.in.in |    2 +-
 data/org.gnome.meld.gschema.xml       |    7 +
 docs/hosting.md                       |   39 +
 maint                                 |   76 -
 meld/build_helpers.py                 |   15 +-
 meld/chunkmap.py                      |    9 +-
 meld/dirdiff.py                       |   47 +-
 meld/filediff.py                      |   37 +-
 meld/matchers/helpers.py              |   11 +-
 meld/meldapp.py                       |   10 +-
 meld/meldbuffer.py                    |   77 +-
 meld/preferences.py                   |    2 +
 meld/resources/ui/about-dialog.ui     |    2 +-
 meld/resources/ui/dirdiff.ui          |   16 +-
 meld/resources/ui/filediff.ui         |   32 +-
 meld/resources/ui/new-diff-tab.ui     |  236 ++-
 meld/resources/ui/preferences.ui      |   22 +-
 meld/settings.py                      |    7 +-
 meld/sourceview.py                    |    5 +
 meld/style.py                         |    5 +-
 meld/ui/findbar.py                    |    7 +
 meld/ui/statusbar.py                  |   17 +-
 meld/vc/git.py                        |   19 +-
 meld/vcview.py                        |    2 +-
 po/ca.po                              | 3066 ++++++++++++---------------
 po/cs.po                              |  305 +--
 po/de.po                              |  321 ++-
 po/es.po                              |  422 ++--
 po/eu.po                              | 1284 ++++++------
 po/hu.po                              |  382 ++--
 po/id.po                              |  379 ++--
 po/pl.po                              |  618 +++---
 po/pt.po                              | 3158 +++++++++++++++-------------
 po/pt_BR.po                           | 1861 +++-------------
 po/ro.po                              | 3735 ++++++++++++++++-----------------
 po/sl.po                              |  501 ++---
 po/sr.po                              |  321 +--
 po/sv.po                              |  633 +++---
 po/tr.po                              |  703 ++++---
 po/uk.po                              |  550 ++---
 setup_win32.py                        |    1 +
 test/__init__.py                      |   16 +
 test/test_buffer_lines.py             |  118 +-
 45 files changed, 8965 insertions(+), 10114 deletions(-)
---
diff --cc meld/dirdiff.py
index 09848700,0d5e1c59..ec1b9dea
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@@ -387,9 -373,12 +387,9 @@@ class DirDiff(Gtk.VBox, tree.TreeviewCo
      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()
+     toolbar_sourcemap_revealer = Gtk.Template.Child()
  
      state_actions = {
          tree.STATE_NORMAL: ("normal", "folder-status-same"),
diff --cc meld/resources/ui/dirdiff.ui
index 9356d2e8,d0abbf66..fec969c8
--- a/meld/resources/ui/dirdiff.ui
+++ b/meld/resources/ui/dirdiff.ui
@@@ -406,12 -403,20 +406,20 @@@
            </packing>
          </child>
          <child>
-           <object class="GtkActionBar" id="dummy_toolbar_overview_map">
+           <object class="GtkRevealer" id="toolbar_sourcemap_revealer">
              <property name="visible">True</property>
              <property name="can_focus">False</property>
-             <style>
-               <class name="meld-actionbar"/>
-             </style>
+             <property name="reveal-child">True</property>
+             <property name="transition-type">GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT</property>
+             <child>
 -              <object class="GtkToolbar" id="dummy_toolbar_overview_map">
++              <object class="GtkActionBar" id="dummy_toolbar_overview_map">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+                 <style>
 -                  <class name="meld-notebook-toolbar"/>
++                  <class name="meld-actionbar"/>
+                 </style>
+               </object>
+             </child>
            </object>
            <packing>
              <property name="left_attach">5</property>
diff --cc meld/resources/ui/filediff.ui
index 35a1c3ce,dbb3f629..1a8612c3
--- a/meld/resources/ui/filediff.ui
+++ b/meld/resources/ui/filediff.ui
@@@ -579,12 -596,20 +579,20 @@@
            </packing>
          </child>
          <child>
-           <object class="GtkActionBar" id="dummy_toolbar_sourcemap">
+           <object class="GtkRevealer" id="toolbar_sourcemap_revealer">
              <property name="visible">True</property>
              <property name="can_focus">False</property>
-             <style>
-               <class name="meld-actionbar"/>
-             </style>
+             <property name="reveal-child">True</property>
+             <property name="transition-type">GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT</property>
+             <child>
 -              <object class="GtkToolbar" id="dummy_toolbar_sourcemap">
++              <object class="GtkActionBar" id="dummy_toolbar_sourcemap">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+                 <style>
 -                  <class name="meld-notebook-toolbar"/>
++                  <class name="meld-actionbar"/>
+                 </style>
+               </object>
+             </child>
            </object>
            <packing>
              <property name="left_attach">9</property>