[meld] (175 commits) ...Merge branch 'ui-next' into 'master'

[Kai Willadsen <kaiw src gnome org>]

Summary of changes:

  45086fd... gutterrendererchunk: Remove the action GtkSourceGutter for  (*)
  4731660... filediff: Remove diffmaps (*)
  301c0f2... filediff: Move action mode to a gprop on FileDiff (*)
  26e2778... filediff: Give the statusbar row a consistent thin border (*)
  fc59f61... filediff: Remove an unneeded LinkMap expose (*)
  331f46c... actiongutter: New widget to replace GutterRendererChunkActi (*)
  ef84861... ui: Add ActionGutter to the glade catalogue (*)
  515b490... filediff: Integrate ActionGutter in to FileDiff (*)
  0aba59d... test: Update action mode test for ActionGutter changes (*)
  e2d35aa... linkmap: Style fix (*)
  4613a17... Initial pass at a SourceMap-based DiffMap replacement# (*)
  5cbca8d... sourceview: Support limiting the width of source maps (*)
  2a7cfc0... sourceview: Pull some GTK+ helper methods into a mixin clas (*)
  8955ca1... sourceview: Simplify new custom SourceMap (*)
  67fd8d3... filediff: Map the source map container so we can e.g., hide (*)
  016d4db... Pass the window through to tab switch handlers (*)
  a7dbd5d... filediff: Add a view menu item to show/hide the sourcemap (*)
  ab16d2a... filediff: Use a revealer for sourcemap visibility (*)
  ff5615d... filediff: Improve the visual separation of the sourcemap (*)
  7bc6b40... filediff: Fix statusbar appearance under new sourcemap (*)
  99c51f2... preferences: Re-save with new glade and fix a few deprecati (*)
  a65db58... preferences: Use Template.Child() shorthand form (*)
  a05b7f8... preferences: Add base UI for configuring the new sourcemaps (*)
  5e39ffe... preferences: Hook up sourcemap preference UI to new gschema (*)
  fb63fdf... sourceview: Hook up compact view property to config (*)
  ba305f0... actiongutter: Fix editable change toggling (*)
  a011440... filediff: Hook up the show-sourcemap setting (*)
  14217e3... diffgrid: Fix for new column arrangement and reinstate (*)
  1f226aa... dirdiff: Stop using the DiffGrid (*)
  4c7c4a0... filediff: Add an additional notebook child class to reset t (*)
  ac69b35... diffgrid: Fix handle drawing and prelight setting (*)
  1a5eb5e... Slightly improve sourcemap scrubber drawing (*)
  28959a8... Update source style schemes to have parent schemes (*)
  44ecd18... Add F1 as a shortcut for Help (*)
  9311278... dirdiff: Fix focus handling in cursor change event (*)
  d142b20... meldwindow: Log when we fail to open a recent file (*)
  a556565... tree: Fix sensitivity setting for rows without a path (*)
  715708e... Use symbolic icons in preferences list widgets (*)
  01423c8... filediff: Bump the inline limit (*)
  7accc08... ui.vcdialogs: Fix missing callback decorator from template  (*)
  cb27549... ui.findbar: Give our find bar some padding and a top border (*)
  95924c8... filediff: Fix find bar grid attachment (*)
  5ab185a... Update dev requirements to handle conditional typing import (*)
  f851409... findbar: Resave UI file with current Glade (*)
  7bd84fa... ui.findbar: Remove Find/Replace labels in find bar (*)
  00f4924... ui.findbar: Rework find bar appearance based on Builder's d (*)
  c366ef4... ui.findbar: Make find next/prev not show the find bar (*)
  93f95dc... ui.findbar: Get rid of code duplication between replace + f (*)
  a8437f4... filediff: Remove unneeded keymask handling in find/replace  (*)
  e63b78d... ui.findbar: Update styling on failed find (#290) (*)
  04b1c85... ui.findbar: Clarify some of our initialisation (*)
  879858e... ui.findbar: Move shift-return hidden shortcut to a real key (*)
  e1d3396... filediff: Remove undo/redo from toolbar (*)
  d6244d1... filediff: Remove save toolbar icon (*)
  85731fb... meldwindow: Move new-tab to GAction and header bar (*)
  b33ac6a... meldwindow: Move fullscreen to GAction and app menu (*)
  819d03c... meldwindow: Move scheduler cancellation to melddoc (*)
  33c3b72... melddoc: Make the action group swapping slightly simpler (*)
  a8a566d... Move next/previous change to GActions (*)
  20bacba... Move Stop to a GAction (*)
  cd3199f... Move Refresh to a GAction (*)
  0f9c741... Move format-as-patch to a GAction (*)
  b53ee06... Remove the now-unused app menu placeholder (*)
  12084c7... Move save & revert actions to GActions (*)
  2b8e5b4... filediff: Rename the local-to-filediff-the-widget action gr (*)
  b7126f0... Move Close to a GAction (*)
  2abd8e0... ui.recentselector: New implementation of a recent compariso (*)
  ccadf7d... meldwindow: Move recent opening to new popover widget (*)
  9f2394c... Move open-externally to GAction (*)
  03d9882... Consolidate several View menu placeholders (*)
  05b531a... dirdiff: Move state filters and ignore case to GActions (*)
  0687dff... Move undo/redo to GActions (*)
  e5a8800... filediff: Move scroll lock to a GAction (*)
  bc7eaf3... Move version control console visibility to GAction (*)
  558b9a3... Move version control status filters to GActions (*)
  8d1c6ab... Clean up some now-unused menu placeholders (*)
  2a2eef1... filediff: Move sync point actions to GActions (*)
  2d46310... vcview: Move all VC-specific actions to GActions (*)
  d87746a... melddoc: Log when our action helpers don't find named actio (*)
  0057552... dirdiff: Migrate folder actions to GActions (*)
  d71f715... Remove some now-unused menu placeholders (*)
  8e30908... dirdiff: Move custom filter actions to dynamically populate (*)
  069e071... meldwindow: Remove the now-unused toolbar (*)
  dcd4110... Move pane switching to GActions (*)
  144e9f2... dirdiff: Support previous/next pane actions (*)
  1790344... Remove custom cut/copy/paste actions (*)
  7e71d6e... dirdiff: Move folder expand/collapse to GActions (*)
  056a1b3... melddoc: Remove unused main_actiongroup attribute (*)
  d05744b... filediff: Move merge actions to GAction (*)
  a338921... filediff: Move go-to-line to GAction (*)
  67041ad... meldwindow: Import order cleanup (*)
  14d3847... Move find next/previous to GActions (*)
  211eb6e... Move find and replace to GActions (*)
  001596e... meldwindow: Simplify remaining action sensitivity setting (*)
  25427f3... Add back missed new-tab accelerator (*)
  2b8770a... accelerators: Fix quote consistency (*)
  e4d9f95... filediff: Move remaining actions to GActions (*)
  f9ef5df... Remove final traces of GtkUIManager (*)
  c4c9b6f... meldwindow: Clean up some actions + callbacks (*)
  1019b72... meldwindow: Don't add a border on our notebook (*)
  69abd9e... Remove GtkActionBar use in favour of plain GtkBox (*)
  56f7ec0... filediff: Better icons for next/previous conflict (*)
  6573c36... filediff: Base action sensitivity on the last focused pane (*)
  caff528... filediff: Move the copy actions into a popover (*)
  2994d51... Remove old filter icons (*)
  5a7a7e9... Move next/prev conflict to main bar (*)
  3ecf779... meldwindow: Fix focus issues for headerbar buttons (*)
  65a343c... accelerators: Bind F9 for hiding the sourcemap (*)
  8035579... Fix temporary actionback background with multiple tabs (*)
  bc75f5e... Default to the compact sourcemap (*)
  4e075e5... filediff: Fix expand flag on the faux-toolbar (*)
  78f1ad4... ui.filechooser: Fix encoding selector creation on widget cr (*)
  dd309b2... filediff: Move from GtkFileChooserButton to manual open but (*)
  b4d7ff6... Add folder comparison context menu back (*)
  469d08b... dirdiff: Remove compare from secondary toolbar (*)
  93a0d5e... meldwindow: Dynamically pack DirDiff view actions into the  (*)
  afea151... filediff: Move view actions to headerbar slot (*)
  bfdf01a... filediff: Remove pull actions from toolbar (*)
  e3f5075... filediff: Re-add cut/copy/paste actions for context menu us (*)
  4d854f2... filediff: Re-add file comparison context menu (*)
  2ae5473... vcview: Switch up VC selection UI to always show all option (*)
  c912970... vcview: Restore context menu (*)
  511a34f... vcview: Remove the Compare button from the toolbar (*)
  196c306... Rearrange previously-application menus to match other redes (*)
  3d31f9c... Move format-as-patch menu item to the Comparison section (*)
  41254c0... Remove Save from the menu (*)
  6ce6714... Move the open-externally menu item to the file section (*)
  832ac1b... vcview: Remove unnecessary additional border (*)
  853a186... newdifftab: Re-save UI with current Glade (*)
  7c3ba3b... filediff: Remove an unused menu (*)
  30cc281... newdifftab: Slight visual refresh (*)
  0fd6ab7... Remove now-unused version control icon (*)
  0277bbd... Remove old version control icons (*)
  a6d4c07... Override Adwaita's very odd notebook child background setti (*)
  9d2514e... filediff: Add a per-view text filter menu button (*)
  b2e881d... filediff: Reinstate grid handle CSS hack (*)
  0362986... filediff: Handle opening files from blank start (*)
  b250466... ui.statusbar: Fix default encoding and language display for (*)
  4635534... actiongutter: Delay some additional GTK+ setup to realize (*)
  e4eb745... filediff: Remove offset from our cursor struct (*)
  e0639de... filediff: Bind our statusbar cursor position with an adapte (*)
  2cc500d... ui.statusbar: Add a comment on where the assertion comes fr (*)
  a1d09e5... filediff: Don't move the cursor on initial go-to-line focus (*)
  c70dee9... ui.statusbar: Remove bad copy-paste description (*)
  1917b75... ui.statusbar: Set a reasonable cursor label width (*)
  6400f3a... Update a few copyright dates (*)
  cf81506... test: Avoid loading icons from theme in a test (*)
  6df2e30... test: Disable the ActionGutter test (*)
  22571e5... preferences: Use headerbar and remove internal border (*)
  ebf31fb... filediff: Remove existing diffmap coordinate helper (*)
  6d9294f... chunkmap: New widget to replace the old DiffMap implementat (*)
  f32c0c1... filediff: Add in the new ChunkMap (*)
  26c9e7a... Remove compact sourcemap binding (*)
  954a0c8... filediff: Fix a silly in the UI file (*)
  c1d427f... filediff, preferences: Make the overview map style user-con (*)
  6f82898... preferences: Hide the overview map style preference (*)
  fd3343c... chunkmap: Invalidate the pre-drawn cached map on theme chan (*)
  f1eb4c2... chunkmap: Split ChunkMap into a generic base class and Text (*)
  17a4301... dirdiff: Resave UI file with new glade (*)
  cf7de33... Rename sourcemap -> overview map for some accuracy (*)
  28c5ef1... dirdiff: Fix incorrect identical folder hint after copying  (*)
  4fa43ba... chunkmap: Always queue a draw when new chunks are set (*)
  ff0725f... chunkmap: Handle empty adjustment ranges (*)
  7e3d96c... chunkmap, dirdiff: Use new overview map widget for folder c (*)
  0ad3e7e... chunkmap: Scale textview chunk maps using paired textviews (*)
  b0d025a... filediff: Fix file/label confusion (*)
  09b50a4... meldwindow: Handle stop action not existing on window close (*)
  d5d33a6... vcview: Set the cursor on load so that shortcuts work (*)
  f928994... chunkmap: PEP8 (*)
  7d80fe3... chunkmap: Draw a background with theme colours and update h (*)
  4493354... diffmap: Remove this now-unused widget (*)
  5671339... meldwindow: Move the spinner to a stable position (*)
  5a4c2e7... dirdiff, preferences: flake8 fixes (*)
  9847097... Merge branch 'master' into ui-next (*)
  b86ae9c... Merge branch 'ui-next' into 'master'

(*) This commit already existed in another branch; no separate mail sent