Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-12-27 18:34:22 +05:30
parent ddfba447fb
commit 5d4202903b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/viewer/documentview.py
View File

@ -959,10 +959,8 @@ class DocumentView(QWebView): # {{{
mods = event.modifiers() mods = event.modifiers()
if mods & Qt.CTRL: if mods & Qt.CTRL:
if self.manager is not None and event.delta() != 0: 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_larger if event.delta() > 0 else
self.manager.font_size_smaller) self.manager.font_size_smaller)()
f(False)
return
if event.delta() < -14: if event.delta() < -14:
if self.document.wheel_flips_pages: if self.document.wheel_flips_pages:
self.next_page() self.next_page()

10
src/calibre/gui2/viewer/main.py
View File

@ -243,10 +243,8 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
self.connect(self.action_metadata, SIGNAL('triggered(bool)'), lambda x:self.metadata.setVisible(x)) 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.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_copy, SIGNAL('triggered(bool)'), self.copy)
self.connect(self.action_font_size_larger, SIGNAL('triggered(bool)'), self.action_font_size_larger.triggered.connect(self.font_size_larger)
self.font_size_larger) self.action_font_size_smaller.triggered.connect(self.font_size_smaller)
self.connect(self.action_font_size_smaller, SIGNAL('triggered(bool)'),
self.font_size_smaller)
self.connect(self.action_open_ebook, SIGNAL('triggered(bool)'), self.connect(self.action_open_ebook, SIGNAL('triggered(bool)'),
self.open_ebook) self.open_ebook)
self.connect(self.action_next_page, SIGNAL('triggered(bool)'), self.connect(self.action_next_page, SIGNAL('triggered(bool)'),
@ -482,13 +480,13 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
def open_recent(self, action): def open_recent(self, action):
self.load_ebook(action.path) self.load_ebook(action.path)
def font_size_larger(self, checked): def font_size_larger(self):
frac = self.view.magnify_fonts() frac = self.view.magnify_fonts()
self.action_font_size_larger.setEnabled(self.view.multiplier < 3) self.action_font_size_larger.setEnabled(self.view.multiplier < 3)
self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2) self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2)
self.set_page_number(frac) self.set_page_number(frac)
def font_size_smaller(self, checked): def font_size_smaller(self):
frac = self.view.shrink_fonts() frac = self.view.shrink_fonts()
self.action_font_size_larger.setEnabled(self.view.multiplier < 3) self.action_font_size_larger.setEnabled(self.view.multiplier < 3)
self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2) self.action_font_size_smaller.setEnabled(self.view.multiplier > 0.2)