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

Fix #629

Browse Source
This commit is contained in:
Kovid Goyal 2008-04-11 21:16:26 +05:30
parent 57ff561aff
commit e55835dd63
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/lrf/objects.py
View File

@ -1013,6 +1013,7 @@ class Button(LRFObject):
for i in self.actions[button_type]:
if i[0] == 1:
return i[1:][0]
return (None, None)
def __unicode__(self):
s = u'<Button objid="%s">\n'%(self.id,)

11
src/calibre/gui2/lrf_renderer/document.py
View File

@ -366,7 +366,7 @@ class Document(QGraphicsScene):
def get_page_num(self, chapterid, objid):
cnum = self.chapter_map[chapterid]
page = self.chapters[cnum].object_to_page_map[objid]
return sum(self.chapter_layout[:cnum])+page
return sum(self.chapter_layout[:cnum])+page
def add_to_history(self):
page = self.chapter_page(self.current_page)[1]
@ -377,9 +377,10 @@ class Document(QGraphicsScene):
def link_activated(self, objid, on_creation=None):
if on_creation is None:
cid, oid = self.link_map[objid]
self.add_to_history()
page = self.get_page_num(cid, oid)
self.show_page(page)
if oid is not None:
self.add_to_history()
page = self.get_page_num(cid, oid)
self.show_page(page)
else:
jb = self.objects[objid]
self.link_map[objid] = (jb.refpage, jb.refobj)
@ -539,4 +540,4 @@ class Document(QGraphicsScene):
else:
self.add_to_history()
self.show_page(page_num)

6
src/calibre/gui2/lrf_renderer/main.py
View File

@ -228,6 +228,12 @@ class Main(MainWindow, Ui_MainWindow):
def back(self, triggered):
self.document.back()
def wheelEvent(self, ev):
if ev.delta() >= 0:
self.document.previous()
else:
self.document.next()
def closeEvent(self, event):
if self.renderer is not None and self.renderer.isRunning():
self.renderer.abort()