[meld] ui: Remove icons from notebook labels

[Kai Willadsen <kaiw src gnome org>]

commit 3102078768cbe9917218d3a1bfcc5ef63f0ea319
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Sep 21 12:31:47 2019 +1000

    ui: Remove icons from notebook labels
    
    This was becoming increasingly inconsistent with other platform apps,
    the icons were never very good, and I don't even think they're actually
    useful in disambiguating the tabs.

 meld/meldwindow.py                  | 14 +++++++-------
 meld/resources/ui/notebook-label.ui |  9 ---------
 meld/ui/notebooklabel.py            | 11 -----------
 3 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index e14dc165..1192072d 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -311,8 +311,8 @@ class MeldWindow(Gtk.ApplicationWindow):
             # FIXME: Need error handling, but no sensible display location
             log.exception(f'Error opening recent file {uri}')
 
-    def _append_page(self, page, icon):
-        nbl = NotebookLabel(icon_name=icon, page=page)
+    def _append_page(self, page):
+        nbl = NotebookLabel(page=page)
         self.notebook.append_page(page, nbl)
         self.notebook.child_set_property(page, 'tab-expand', True)
 
@@ -337,7 +337,7 @@ class MeldWindow(Gtk.ApplicationWindow):
 
     def append_new_comparison(self):
         doc = NewDiffTab(self)
-        self._append_page(doc, "document-new")
+        self._append_page(doc)
         self.notebook.on_label_changed(doc, _("New comparison"), None)
 
         def diff_created_cb(doc, newdoc):
@@ -352,7 +352,7 @@ class MeldWindow(Gtk.ApplicationWindow):
         dirs = [d.get_path() if d else None for d in gfiles]
         assert len(dirs) in (1, 2, 3)
         doc = DirDiff(len(dirs))
-        self._append_page(doc, "folder")
+        self._append_page(doc)
         doc.set_locations(dirs)
         if auto_compare:
             doc.scheduler.add_task(doc.auto_compare)
@@ -362,7 +362,7 @@ class MeldWindow(Gtk.ApplicationWindow):
             self, gfiles, *, encodings=None, merge_output=None, meta=None):
         assert len(gfiles) in (1, 2, 3)
         doc = FileDiff(len(gfiles))
-        self._append_page(doc, "text-x-generic")
+        self._append_page(doc)
         doc.set_files(gfiles, encodings)
         if merge_output is not None:
             doc.set_merge_output_file(merge_output)
@@ -376,7 +376,7 @@ class MeldWindow(Gtk.ApplicationWindow):
                 _("Need three files to auto-merge, got: %r") %
                 [f.get_parse_name() for f in gfiles])
         doc = FileMerge(len(gfiles))
-        self._append_page(doc, "text-x-generic")
+        self._append_page(doc)
         doc.set_files(gfiles)
         if merge_output is not None:
             doc.set_merge_output_file(merge_output)
@@ -405,7 +405,7 @@ class MeldWindow(Gtk.ApplicationWindow):
 
     def append_vcview(self, location, auto_compare=False):
         doc = VcView()
-        self._append_page(doc, "meld-version-control")
+        self._append_page(doc)
         if isinstance(location, (list, tuple)):
             location = location[0]
         doc.set_location(location.get_path())
diff --git a/meld/resources/ui/notebook-label.ui b/meld/resources/ui/notebook-label.ui
index 8b9f54ee..270e93a9 100644
--- a/meld/resources/ui/notebook-label.ui
+++ b/meld/resources/ui/notebook-label.ui
@@ -16,15 +16,6 @@
             <property name="visible">True</property>
           </object>
         </child>
-        <child>
-          <object class="GtkImage" id="icon">
-            <property name="visible">True</property>
-            <property name="icon-size">1</property>
-          </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkButton" id="close_button">
             <property name="visible">True</property>
diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py
index bc6e0673..2191a25b 100644
--- a/meld/ui/notebooklabel.py
+++ b/meld/ui/notebooklabel.py
@@ -24,15 +24,8 @@ class NotebookLabel(Gtk.EventBox):
 
     __gtype_name__ = 'NotebookLabel'
 
-    icon = Gtk.Template.Child()
     label = Gtk.Template.Child()
 
-    icon_name = GObject.Property(
-        type=str,
-        nick='Name of the icon to display',
-        default=None,
-    )
-
     label_text = GObject.Property(
         type=str,
         nick='Text of this notebook label',
@@ -48,10 +41,6 @@ class NotebookLabel(Gtk.EventBox):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.bind_property(
-            'icon-name', self.icon, 'icon-name',
-            GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE,
-        )
         self.bind_property(
             'label-text', self.label, 'label',
             GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE,