[meld/deprecation-cleanup] melddoc: Migrate create-diff to Signal
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/deprecation-cleanup] melddoc: Migrate create-diff to Signal
- Date: Sun, 9 Dec 2018 21:32:10 +0000 (UTC)
commit ea1b50e64a8849e4c886b7b7d47b8376af3f8c78
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Dec 9 07:21:25 2018 +1000
melddoc: Migrate create-diff to Signal
meld/dirdiff.py | 8 +++++---
meld/melddoc.py | 8 +++++---
meld/meldwindow.py | 8 ++++----
meld/vcview.py | 8 +++++---
4 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 8943f200..88ced436 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1195,8 +1195,10 @@ class DirDiff(tree.TreeviewCommon, MeldDoc, Component):
if not rows[pane]:
return
if os.path.isfile(rows[pane]):
- self.emit("create-diff", [Gio.File.new_for_path(r)
- for r in rows if os.path.isfile(r)], {})
+ self.create_diff_signal.emit(
+ [Gio.File.new_for_path(r) for r in rows if os.path.isfile(r)],
+ {}
+ )
elif os.path.isdir(rows[pane]):
if view.row_expanded(path):
view.collapse_row(path)
@@ -1229,7 +1231,7 @@ class DirDiff(tree.TreeviewCommon, MeldDoc, Component):
row_paths = self.model.value_paths(it)
gfiles = [Gio.File.new_for_path(p)
for p in row_paths if os.path.exists(p)]
- self.emit("create-diff", gfiles, {})
+ self.create_diff_signal.emit(gfiles, {})
def on_button_diff_clicked(self, button):
pane = self._get_focused_pane()
diff --git a/meld/melddoc.py b/meld/melddoc.py
index 6f4b4dc3..b3953359 100644
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@ -73,9 +73,6 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject):
"""
__gsignals__ = {
- 'create-diff': (GObject.SignalFlags.RUN_FIRST, None,
- (GObject.TYPE_PYOBJECT,
- GObject.TYPE_PYOBJECT)),
'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None,
(bool, bool)),
}
@@ -84,6 +81,11 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject):
def close_signal(self, exit_code: int) -> None:
...
+ @GObject.Signal(name='create-diff')
+ def create_diff_signal(
+ self, gfiles: object, options: object) -> None:
+ ...
+
@GObject.Signal('file-changed')
def file_changed_signal(self, path: str) -> None:
...
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 98877036..eac820dd 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -528,8 +528,8 @@ class MeldWindow(Gtk.ApplicationWindow):
self.scheduler.add_scheduler(page.scheduler)
if isinstance(page, MeldDoc):
page.file_changed_signal.connect(self.on_file_changed)
- page.connect("create-diff", lambda obj, arg, kwargs:
- self.append_diff(arg, **kwargs))
+ page.create_diff_signal.connect(
+ lambda obj, arg, kwargs: self.append_diff(arg, **kwargs))
page.tab_state_changed.connect(self.on_page_state_changed)
page.close_signal.connect(self.page_removed)
@@ -635,8 +635,8 @@ class MeldWindow(Gtk.ApplicationWindow):
self.scheduler.add_scheduler(doc.scheduler)
path = gfile.get_path()
doc.set_location(path)
- doc.connect("create-diff", lambda obj, arg, kwargs:
- self.append_diff(arg, **kwargs))
+ doc.create_diff_signal.connect(
+ lambda obj, arg, kwargs: self.append_diff(arg, **kwargs))
doc.run_diff(path)
def open_paths(self, gfiles, auto_compare=False, auto_merge=False,
diff --git a/meld/vcview.py b/meld/vcview.py
index 5d8aaf2b..e7255177 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -434,7 +434,7 @@ class VcView(tree.TreeviewCommon, MeldDoc, Component):
def run_diff(self, path):
if os.path.isdir(path):
- self.emit("create-diff", [Gio.File.new_for_path(path)], {})
+ self.create_diff_signal.emit([Gio.File.new_for_path(path)], {})
return
basename = os.path.basename(path)
@@ -490,8 +490,10 @@ class VcView(tree.TreeviewCommon, MeldDoc, Component):
os.chmod(temp_file, 0o444)
_temp_files.append(temp_file)
- self.emit("create-diff",
- [Gio.File.new_for_path(d) for d in diffs], kwargs)
+ self.create_diff_signal.emit(
+ [Gio.File.new_for_path(d) for d in diffs],
+ kwargs,
+ )
def on_filter_state_toggled(self, button):
active_filters = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]