[meld/ui-next] Rename sourcemap -> overview map for some accuracy

[Kai Willadsen <kaiw src gnome org>]

commit cf7de33ef2d55a9d0431780deecf18bc82b420ac
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Apr 7 07:57:55 2019 +1000

    Rename sourcemap -> overview map for some accuracy

 data/org.gnome.meld.gschema.xml  | 4 ++--
 meld/accelerators.py             | 2 +-
 meld/filediff.py                 | 8 ++++----
 meld/preferences.py              | 4 ++--
 meld/resources/gtk/menus.ui      | 2 +-
 meld/resources/ui/preferences.ui | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index 3f8e8635..094d7089 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -120,8 +120,8 @@
           <description>The custom font to use, stored as a string and parsed as a Pango font 
description.</description>
       </key>
 
-      <!-- MeldSourceMap properties -->
-      <key name="show-sourcemap" type="b">
+      <!-- Overview map properties -->
+      <key name="show-overview-map" type="b">
           <default>true</default>
           <summary>Show overview source map</summary>
           <description>If true, file comparisons will have paired source maps for compared 
files.</description>
diff --git a/meld/accelerators.py b/meld/accelerators.py
index cff837f0..e7e47830 100644
--- a/meld/accelerators.py
+++ b/meld/accelerators.py
@@ -35,7 +35,7 @@ def register_accels(app: Gtk.Application):
         ('view.file-copy-left-down', '<Alt>semicolon'),
         ('view.file-copy-right-down', '<Alt>quoteright'),
         ('view.file-delete', ('<Alt>Delete', '<Alt>KP_Delete')),
-        ('view.show-sourcemap', 'F9'),
+        ('view.show-overview-map', 'F9'),
         # Folder comparison actions
         ('view.folder-compare', 'Return'),
         ('view.folder-copy-left', '<Alt>Left'),
diff --git a/meld/filediff.py b/meld/filediff.py
index a663cdb4..d4612af2 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -116,7 +116,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
 
     __gsettings_bindings_view__ = (
         ('ignore-blank-lines', 'ignore-blank-lines'),
-        ('show-sourcemap', 'show-sourcemap'),
+        ('show-overview-map', 'show-overview-map'),
         ('overview-map-style', 'overview-map-style'),
     )
 
@@ -126,7 +126,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
         blurb="Whether to ignore blank lines when comparing file contents",
         default=False,
     )
-    show_sourcemap = GObject.Property(type=bool, default=True)
+    show_overview_map = GObject.Property(type=bool, default=True)
     overview_map_style = GObject.Property(type=str, default='chunkmap')
 
     actiongutter0 = Template.Child()
@@ -289,7 +289,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
         self.view_action_group = Gio.SimpleActionGroup()
 
         property_actions = (
-            ('show-sourcemap', self, 'show-sourcemap'),
+            ('show-overview-map', self, 'show-overview-map'),
             ('lock-scrolling', self, 'lock_scrolling'),
         )
         for action_name, obj, prop_name in property_actions:
@@ -356,7 +356,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
 
         # Handle overview map visibility binding
         self.bind_property(
-            'show-sourcemap', self.sourcemap_revealer, 'reveal-child',
+            'show-overview-map', self.sourcemap_revealer, 'reveal-child',
             GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE,
         )
         self.sourcemap_revealer.bind_property(
diff --git a/meld/preferences.py b/meld/preferences.py
index c6e935e9..31dc3ba0 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -268,7 +268,7 @@ class PreferencesDialog(Gtk.Dialog):
     checkbutton_shallow_compare = Template.Child()
     checkbutton_show_commit_margin = Template.Child()
     checkbutton_show_line_numbers = Template.Child()
-    checkbutton_show_sourcemap = Template.Child()
+    checkbutton_show_overview_map = Template.Child()
     checkbutton_show_whitespace = Template.Child()
     checkbutton_spaces_instead_of_tabs = Template.Child()
     checkbutton_use_syntax_highlighting = Template.Child()
@@ -307,7 +307,7 @@ class PreferencesDialog(Gtk.Dialog):
             ('folder-filter-text', self.checkbutton_folder_filter_text, 'active'),  # noqa: E501
             ('folder-ignore-symlinks', self.checkbutton_ignore_symlinks, 'active'),  # noqa: E501
             ('vc-show-commit-margin', self.checkbutton_show_commit_margin, 'active'),  # noqa: E501
-            ('show-sourcemap', self.checkbutton_show_sourcemap, 'active'),
+            ('show-overview-map', self.checkbutton_show_overview_map, 'active'),
             ('vc-commit-margin', self.spinbutton_commit_margin, 'value'),
             ('vc-break-commit-message', self.checkbutton_break_commit_lines, 'active'),  # noqa: E501
             ('ignore-blank-lines', self.checkbutton_ignore_blank_lines, 'active'),  # noqa: E501
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 3020f783..b04f9b60 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -57,7 +57,7 @@
           <attribute name="id">view-section</attribute>
           <item>
             <attribute name="label" translatable="yes">Overview Map</attribute>
-            <attribute name="action">view.show-sourcemap</attribute>
+            <attribute name="action">view.show-overview-map</attribute>
           </item>
           <item>
             <attribute name="label" translatable="yes">Version control console</attribute>
diff --git a/meld/resources/ui/preferences.ui b/meld/resources/ui/preferences.ui
index a5acee7b..9ba43d71 100644
--- a/meld/resources/ui/preferences.ui
+++ b/meld/resources/ui/preferences.ui
@@ -503,7 +503,7 @@
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkCheckButton" id="checkbutton_show_sourcemap">
+                              <object class="GtkCheckButton" id="checkbutton_show_overview_map">
                                 <property name="label" translatable="yes">Show overview map</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>