ui.notebook: Move handling for tab label changes to MeldNotebook

Author: kaiw

data/ui/meldapp.ui

@@ -32,6 +32,7 @@
             <signal name="page-reordered" handler="after_page_reordered" after="yes" swapped="no"/>
             <signal name="switch-page" handler="on_switch_page" swapped="no"/>
             <signal name="switch-page" handler="after_switch_page" after="yes" swapped="no"/>
+            <signal name="page-label-changed" handler="on_page_label_changed" swapped="no"/>
           </object>
           <packing>
             <property name="expand">True</property>

meld/meldwindow.py

@@ -389,18 +389,8 @@ def after_switch_page(self, notebook, page, which):
     def after_page_reordered(self, notebook, page, page_num):
         self._update_page_action_sensitivity()
 
-    def on_notebook_label_changed(self, component, text, tooltip):
-        page = component.widget
-        nbl = self.notebook.get_tab_label(page)
-        nbl.set_label_text(text)
-        nbl.set_tooltip_text(tooltip)
-
-        # Only update the window title if the current page is active
-        if self.notebook.get_current_page() == self.notebook.page_num(page):
-            self.widget.set_title(text + " - Meld")
-        if isinstance(text, unicode):
-            text = text.encode('utf8')
-        self.notebook.child_set_property(page, "menu-label", text)
+    def on_page_label_changed(self, notebook, label_text):
+        self.widget.set_title(label_text + " - Meld")
 
     def on_can_undo(self, undosequence, can):
         self.actiongroup.get_action("Undo").set_sensitive(can)
@@ -558,7 +548,6 @@ def _append_page(self, page, icon):
         if hasattr(page, 'scheduler'):
             self.scheduler.add_scheduler(page.scheduler)
         if isinstance(page, melddoc.MeldDoc):
-            page.connect("label-changed", self.on_notebook_label_changed)
             page.connect("file-changed", self.on_file_changed)
             page.connect("create-diff", lambda obj, arg, kwargs:
                          self.append_diff(arg, **kwargs))
@@ -570,6 +559,7 @@ def _append_page(self, page, icon):
     def append_new_comparison(self):
         doc = newdifftab.NewDiffTab(self)
         self._append_page(doc, "document-new")
+        self.notebook.on_label_changed(doc, _("New comparison"), None)
 
         def diff_created_cb(doc, newdoc):
             doc.on_delete_event()

meld/ui/notebook.py

@@ -25,6 +25,7 @@ class MeldNotebook(Gtk.Notebook):
 
     __gsignals__ = {
         'tab-switch': (GObject.SignalFlags.ACTION, None, (int,)),
+        'page-label-changed': (0, None, (GObject.TYPE_STRING,)),
     }
 
     css = """
@@ -88,6 +89,8 @@ def __init__(self, *args, **kwargs):
 
         self.connect('button-press-event', self.on_button_press_event)
         self.connect('popup-menu', self.on_popup_menu)
+        self.connect('page-added', self.on_page_added)
+        self.connect('page-removed', self.on_page_removed)
 
     def do_tab_switch(self, notebook, page_num):
         notebook.set_current_page(page_num)
@@ -126,3 +129,22 @@ def on_tab_move_right(self, *args):
         page_num = self.get_current_page()
         child = self.get_nth_page(page_num)
         self.reorder_child(child, page_num + 1)
+
+    def on_page_added(self, notebook, child, page_num, *args):
+        child.pyobject.connect("label-changed", self.on_label_changed)
+
+    def on_page_removed(self, notebook, child, page_num, *args):
+        child.pyobject.disconnect_by_func(self.on_label_changed)
+
+    def on_label_changed(self, component, text, tooltip):
+        page = component.widget
+        nbl = self.get_tab_label(page)
+        nbl.set_label_text(text)
+        nbl.set_tooltip_text(tooltip)
+
+        # Only update the window title if the current page is active
+        if self.get_current_page() == self.page_num(page):
+            self.emit('page-label-changed', text)
+        if isinstance(text, unicode):
+            text = text.encode('utf8')
+        self.child_set_property(page, "menu-label", text)