[meld/ui-next] Remove compact sourcemap binding



commit 26c9e7a9e272350c3f1cfb02f394260af99fae6f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 6 08:29:43 2019 +1000

    Remove compact sourcemap binding
    
    This is turning into a multi-way option, so needs more complicated
    handling.

 data/org.gnome.meld.gschema.xml | 6 ------
 meld/preferences.py             | 2 --
 meld/sourceview.py              | 8 --------
 3 files changed, 16 deletions(-)
---
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index 64a3da2d..4bb17b1c 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -121,12 +121,6 @@
           <description>If true, file comparisons will have paired source maps for compared 
files.</description>
       </key>
 
-      <key name="use-compact-sourcemap" type="b">
-          <default>true</default>
-          <summary>Use compact source map</summary>
-          <description>If true, file comparisons source maps will be narrower.</description>
-      </key>
-
       <!-- File comparison settings -->
       <key name="ignore-blank-lines" type="b">
           <default>false</default>
diff --git a/meld/preferences.py b/meld/preferences.py
index 9ed0a44f..6338b2fb 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -271,7 +271,6 @@ class PreferencesDialog(Gtk.Dialog):
     checkbutton_show_sourcemap = Template.Child()
     checkbutton_show_whitespace = Template.Child()
     checkbutton_spaces_instead_of_tabs = Template.Child()
-    checkbutton_use_compact_sourcemap = Template.Child()
     checkbutton_use_syntax_highlighting = Template.Child()
     checkbutton_wrap_text = Template.Child()
     checkbutton_wrap_word = Template.Child()
@@ -308,7 +307,6 @@ class PreferencesDialog(Gtk.Dialog):
             ('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'),
-            ('use-compact-sourcemap', self.checkbutton_use_compact_sourcemap, 'active'),  # noqa: E501
             ('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/sourceview.py b/meld/sourceview.py
index d0798c01..152b31b7 100644
--- a/meld/sourceview.py
+++ b/meld/sourceview.py
@@ -407,10 +407,6 @@ class MeldSourceMap(GtkSource.Map, SourceViewHelperMixin):
 
     __gtype_name__ = "MeldSourceMap"
 
-    __gsettings_bindings_view__ = (
-        ('use-compact-sourcemap', 'compact-view'),
-    )
-
     compact_view = GObject.Property(
         type=bool,
         nick="Limit the view to a fixed width",
@@ -423,10 +419,6 @@ class MeldSourceMap(GtkSource.Map, SourceViewHelperMixin):
         super().__init__(*args, **kwargs)
         self.connect('notify::compact-view', lambda *args: self.queue_resize())
 
-    def do_realize(self):
-        bind_settings(self)
-        return GtkSource.Map.do_realize(self)
-
     def do_draw_layer(self, layer, context):
         if layer != Gtk.TextViewLayer.BELOW_TEXT:
             return GtkSource.Map.do_draw_layer(self, layer, context)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]