From 4ac45ee354bc8c70407bedc8bf631301c111414d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 30 Jan 2014 12:16:25 +0530 Subject: [PATCH] ... --- src/calibre/gui2/tweak_book/diff/main.py | 16 ++++++++-------- src/calibre/gui2/tweak_book/diff/view.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py index 9ac14de83a..05236af518 100644 --- a/src/calibre/gui2/tweak_book/diff/main.py +++ b/src/calibre/gui2/tweak_book/diff/main.py @@ -208,20 +208,20 @@ class Diff(Dialog): l.addWidget(v, l.rowCount(), 0, 1, -1) r = l.rowCount() - self.bn = b = QToolButton(self) - b.setIcon(QIcon(I('back.png'))) - b.clicked.connect(partial(self.view.next_change, 1)) - b.setToolTip(_('Go to next change')) - b.setText(_('&Next change')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - l.addWidget(b, r, l.columnCount(), 1, 1) - self.bp = b = QToolButton(self) - b.setIcon(QIcon(I('forward.png'))) + b.setIcon(QIcon(I('back.png'))) b.clicked.connect(partial(self.view.next_change, -1)) b.setToolTip(_('Go to previous change')) b.setText(_('&Previous change')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) l.addWidget(b, r, l.columnCount(), 1, 1) + self.bn = b = QToolButton(self) + b.setIcon(QIcon(I('forward.png'))) + b.clicked.connect(partial(self.view.next_change, 1)) + b.setToolTip(_('Go to next change')) + b.setText(_('&Next change')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) + l.addWidget(b, r, l.columnCount(), 1, 1) + self.search = s = HistoryLineEdit2(self) s.initialize('diff_search_history') l.addWidget(s, r, l.columnCount(), 1, 1) diff --git a/src/calibre/gui2/tweak_book/diff/view.py b/src/calibre/gui2/tweak_book/diff/view.py index f9df6fb20a..fc1af271d0 100644 --- a/src/calibre/gui2/tweak_book/diff/view.py +++ b/src/calibre/gui2/tweak_book/diff/view.py @@ -27,7 +27,7 @@ from calibre.gui2 import info_dialog from calibre.gui2.tweak_book import tprefs from calibre.gui2.tweak_book.editor.text import PlainTextEdit, get_highlighter, default_font_family, LineNumbers from calibre.gui2.tweak_book.editor.themes import THEMES, default_theme, theme_color -from calibre.utils.diff import get_sequence_matcher +from calibre.gui2.tweak_book.diff import get_sequence_matcher Change = namedtuple('Change', 'ltop lbot rtop rbot kind')