From 5d4202903bdc4012e10d79b1df3e6e50a36c71d5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 27 Dec 2011 18:34:22 +0530 Subject: [PATCH] ... --- src/calibre/gui2/viewer/documentview.py | 6 ++---- src/calibre/gui2/viewer/main.py | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 7f3ab26ec0..5903817149 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -959,10 +959,8 @@ class DocumentView(QWebView): # {{{ mods = event.modifiers() if mods & Qt.CTRL: if self.manager is not None and event.delta() != 0: - f = (self.manager.font_size_larger if event.delta() > 0 else - self.manager.font_size_smaller) - f(False) - return + (self.manager.font_size_larger if event.delta() > 0 else + self.manager.font_size_smaller)() if event.delta() < -14: if self.document.wheel_flips_pages: self.next_page() diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py index db6d0d8b91..10fb6ca93a 100644 --- a/src/calibre/gui2/viewer/main.py +++ b/src/calibre/gui2/viewer/main.py @@ -243,10 +243,8 @@ class EbookViewer(MainWindow, Ui_EbookViewer): self.connect(self.action_metadata, SIGNAL('triggered(bool)'), lambda x:self.metadata.setVisible(x)) self.action_table_of_contents.toggled[bool].connect(self.set_toc_visible) self.connect(self.action_copy, SIGNAL('triggered(bool)'), self.copy) - self.connect(self.action_font_size_larger, SIGNAL('triggered(bool)'), - self.font_size_larger) - self.connect(self.action_font_size_smaller, SIGNAL('triggered(bool)'), - self.font_size_smaller) + self.action_font_size_larger.triggered.connect(self.font_size_larger) + self.action_font_size_smaller.triggered.connect(self.font_size_smaller) self.connect(self.action_open_ebook, SIGNAL('triggered(bool)'), self.open_ebook) self.connect(self.action_next_page, SIGNAL('triggered(bool)'), @@ -482,13 +480,13 @@ class EbookViewer(MainWindow, Ui_EbookViewer): def open_recent(self, action): self.load_ebook(action.path) - def font_size_larger(self, checked): + def font_size_larger(self): frac = self.view.magnify_fonts() self.action_font_size_larger.setEnabled(self.view.multiplier < 3) self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2) self.set_page_number(frac) - def font_size_smaller(self, checked): + def font_size_smaller(self): frac = self.view.shrink_fonts() self.action_font_size_larger.setEnabled(self.view.multiplier < 3) self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2)