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

Do not output unneccessary error messages from viewer when it is unintialized

Browse Source
This commit is contained in:
Kovid Goyal 2012-06-24 10:29:20 +05:30
parent c7bc47a805
commit 3c4cb3f492
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,8 @@ class Document(QWebPage): # {{{
return self.anchor_positions return self.anchor_positions
def switch_to_paged_mode(self, onresize=False): def switch_to_paged_mode(self, onresize=False):
if onresize and not self.loaded_javascript:
return
side_margin = self.javascript('window.paged_display.layout()', typ=int) side_margin = self.javascript('window.paged_display.layout()', typ=int)
# Setup the contents size to ensure that there is a right most margin. # Setup the contents size to ensure that there is a right most margin.
# Without this webkit renders the final column with no margin, as the # Without this webkit renders the final column with no margin, as the
@ -294,6 +296,7 @@ class Document(QWebPage): # {{{
self.mainFrame().setScrollPosition(QPoint(x, y)) self.mainFrame().setScrollPosition(QPoint(x, y))
def jump_to_anchor(self, anchor): def jump_to_anchor(self, anchor):
if not self.loaded_javascript: return
self.javascript('window.paged_display.jump_to_anchor("%s")'%anchor) self.javascript('window.paged_display.jump_to_anchor("%s")'%anchor)
def element_ypos(self, elem): def element_ypos(self, elem):
@ -352,7 +355,7 @@ class Document(QWebPage): # {{{
except ZeroDivisionError: except ZeroDivisionError:
return 0. return 0.
def fset(self, val): def fset(self, val):
if self.in_paged_mode: if self.in_paged_mode and self.loaded_javascript:
self.javascript('paged_display.scroll_to_pos(%f)'%val) self.javascript('paged_display.scroll_to_pos(%f)'%val)
else: else:
npos = val * (self.height - self.window_height) npos = val * (self.height - self.window_height)