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

E-book viewer: Reloading the book now re-opens it at the current position even if the option to remember position when quitting is turned off

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-20 20:28:10 +05:30
parent d16d3ad900
commit ab50892a60
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,19 +756,23 @@ class EbookViewer(MainWindow):
self.bookmarks.set_bookmarks(bookmarks) self.bookmarks.set_bookmarks(bookmarks)
return self.build_bookmarks_menu(bookmarks) return self.build_bookmarks_menu(bookmarks)
@property
def current_page_bookmark(self):
bm = self.view.bookmark()
bm['spine'] = self.current_index
bm['title'] = 'calibre_current_page_bookmark'
return bm
def save_current_position(self): def save_current_position(self):
if not self.get_remember_current_page_opt(): if not self.get_remember_current_page_opt():
return return
if hasattr(self, 'current_index'): if hasattr(self, 'current_index'):
try: try:
bm = self.view.bookmark() self.iterator.add_bookmark(self.current_page_bookmark)
bm['spine'] = self.current_index
bm['title'] = 'calibre_current_page_bookmark'
self.iterator.add_bookmark(bm)
except: except:
traceback.print_exc() traceback.print_exc()
def load_ebook(self, pathtoebook, open_at=None): def load_ebook(self, pathtoebook, open_at=None, reopen_at=None):
if self.iterator is not None: if self.iterator is not None:
self.save_current_position() self.save_current_position()
self.iterator.__exit__() self.iterator.__exit__()
@ -830,6 +834,8 @@ class EbookViewer(MainWindow):
self.current_index = -1 self.current_index = -1
QApplication.instance().alert(self, 5000) QApplication.instance().alert(self, 5000)
previous = self.set_bookmarks(self.iterator.bookmarks) previous = self.set_bookmarks(self.iterator.bookmarks)
if reopen_at is not None:
previous = reopen_at
if open_at is None and previous is not None: if open_at is None and previous is not None:
self.goto_bookmark(previous) self.goto_bookmark(previous)
else: else:
@ -913,7 +919,11 @@ class EbookViewer(MainWindow):
def reload_book(self): def reload_book(self):
if getattr(self.iterator, 'pathtoebook', None): if getattr(self.iterator, 'pathtoebook', None):
self.load_ebook(self.iterator.pathtoebook) try:
reopen_at = self.current_page_bookmark
except Exception:
reopen_at = None
self.load_ebook(self.iterator.pathtoebook, reopen_at=reopen_at)
return return
def __enter__(self): def __enter__(self):