Merge lp:~a1s/qbrz/fix-diff-button into lp:qbrz
Proposed by
Aleksandr Smyshliaev
Status: | Merged |
---|---|
Approved by: | Robert Ladyman |
Approved revision: | 1642 |
Merged at revision: | 1645 |
Proposed branch: | lp:~a1s/qbrz/fix-diff-button |
Merge into: | lp:qbrz |
Diff against target: |
106 lines (+16/-13) 5 files modified
lib/diff.py (+12/-9) lib/diffwindow.py (+1/-1) lib/log.py (+1/-1) lib/logwidget.py (+1/-1) lib/treewidget.py (+1/-1) |
To merge this branch: | bzr merge lp:~a1s/qbrz/fix-diff-button |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ladyman | Approve | ||
Review via email: mp+413830@code.launchpad.net |
Commit message
Fix launching diff viewers
Description of the change
In the diff push button and pop-up menu there is some confusion between Qt built-in signal, widget method with the same name, and custom signal bound to the QBrz classes.
With this patch, I rename the signal hanlder method, and connect the handlers to the QBrz signal instead of non-existing variant of the overloaded base signal.
Also, the syntax for external diff command lines has changed in Breezy config: now it's {old_path} and {new_path} instead of @old_path and @new_path. I've changed the external diff command in QBrz to use the new syntax.
To post a comment you must log in.