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: Add a command line option to open the previously read book when starting up. See #1483313 ([Enhancement] Viewer: auto adjust number of columns when display orientation changes)

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-17 09:25:53 +05:30
parent cecc7efb8a
commit 4e163a7aa2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class EbookViewer(MainWindow):
AUTOSAVE_INTERVAL = 10 # seconds AUTOSAVE_INTERVAL = 10 # seconds
def __init__(self, pathtoebook=None, debug_javascript=False, open_at=None, def __init__(self, pathtoebook=None, debug_javascript=False, open_at=None,
start_in_fullscreen=False): start_in_fullscreen=False, continue_reading=False):
MainWindow.__init__(self, debug_javascript) MainWindow.__init__(self, debug_javascript)
self.view.magnification_changed.connect(self.magnification_changed) self.view.magnification_changed.connect(self.magnification_changed)
self.closed = False self.closed = False
@ -148,6 +148,8 @@ class EbookViewer(MainWindow):
if pathtoebook is not None: if pathtoebook is not None:
f = functools.partial(self.load_ebook, pathtoebook, open_at=open_at) f = functools.partial(self.load_ebook, pathtoebook, open_at=open_at)
QTimer.singleShot(50, f) QTimer.singleShot(50, f)
elif continue_reading:
QTimer.singleShot(50, self.continue_reading)
self.window_mode_changed = None self.window_mode_changed = None
self.toggle_toolbar_action = QAction(_('Show/hide controls'), self) self.toggle_toolbar_action = QAction(_('Show/hide controls'), self)
self.toggle_toolbar_action.setCheckable(True) self.toggle_toolbar_action.setCheckable(True)
@ -244,6 +246,11 @@ class EbookViewer(MainWindow):
m.addAction(RecentAction(path, m)) m.addAction(RecentAction(path, m))
count += 1 count += 1
def continue_reading(self):
actions = self.open_history_menu.actions()[2:]
if actions:
actions[0].trigger()
def shutdown(self): def shutdown(self):
if self.isFullScreen() and not self.view.document.start_in_fullscreen: if self.isFullScreen() and not self.view.document.start_in_fullscreen:
self.action_full_screen.trigger() self.action_full_screen.trigger()
@ -1035,6 +1042,8 @@ def config(defaults=None):
c.add_opt('open_at', ['--open-at'], default=None, c.add_opt('open_at', ['--open-at'], default=None,
help=_('The position at which to open the specified book. The position is ' help=_('The position at which to open the specified book. The position is '
'a location as displayed in the top left corner of the viewer.')) 'a location as displayed in the top left corner of the viewer.'))
c.add_opt('continue_reading', ['--continue'], default=False,
help=_('Continue reading at the previously opened book'))
return c return c
@ -1064,7 +1073,7 @@ def main(args=sys.argv):
QApplication.setOrganizationName(ORG_NAME) QApplication.setOrganizationName(ORG_NAME)
QApplication.setApplicationName(APP_UID) QApplication.setApplicationName(APP_UID)
main = EbookViewer(args[1] if len(args) > 1 else None, main = EbookViewer(args[1] if len(args) > 1 else None,
debug_javascript=opts.debug_javascript, open_at=open_at, debug_javascript=opts.debug_javascript, open_at=open_at, continue_reading=opts.continue_reading,
start_in_fullscreen=opts.full_screen) start_in_fullscreen=opts.full_screen)
app.installEventFilter(main) app.installEventFilter(main)
# This is needed for paged mode. Without it, the first document that is # This is needed for paged mode. Without it, the first document that is