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

View File

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

View File

@ -377,9 +377,10 @@ class Document(QGraphicsScene):
def link_activated(self, objid, on_creation=None): def link_activated(self, objid, on_creation=None):
if on_creation is None: if on_creation is None:
cid, oid = self.link_map[objid] cid, oid = self.link_map[objid]
self.add_to_history() if oid is not None:
page = self.get_page_num(cid, oid) self.add_to_history()
self.show_page(page) page = self.get_page_num(cid, oid)
self.show_page(page)
else: else:
jb = self.objects[objid] jb = self.objects[objid]
self.link_map[objid] = (jb.refpage, jb.refobj) self.link_map[objid] = (jb.refpage, jb.refobj)

View File

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