diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py index 597008341a..7d778cfa55 100644 --- a/src/calibre/gui2/viewer/toolbars.py +++ b/src/calibre/gui2/viewer/toolbars.py @@ -232,6 +232,10 @@ class ActionsToolBar(ToolBar): def update_visibility(self): self.setVisible(bool(get_session_pref('show_actions_toolbar', default=False))) + @property + def visible_in_fullscreen(self): + return bool(get_session_pref('show_actions_toolbar_in_fullscreen', default=False)) + def customize(self): d = ConfigureToolBar(parent=self.parent()) if d.exec_() == d.Accepted: diff --git a/src/calibre/gui2/viewer/ui.py b/src/calibre/gui2/viewer/ui.py index 2fc4d8445b..179a67f4cb 100644 --- a/src/calibre/gui2/viewer/ui.py +++ b/src/calibre/gui2/viewer/ui.py @@ -210,7 +210,8 @@ class EbookViewer(MainWindow): def set_full_screen(self, on): if on: self.maximized_at_last_fullscreen = self.isMaximized() - self.actions_toolbar.setVisible(False) + if not self.actions_toolbar.visible_in_fullscreen: + self.actions_toolbar.setVisible(False) self.showFullScreen() else: self.actions_toolbar.update_visibility() diff --git a/src/pyj/read_book/prefs/misc.pyj b/src/pyj/read_book/prefs/misc.pyj index 610897561d..f858a54d69 100644 --- a/src/pyj/read_book/prefs/misc.pyj +++ b/src/pyj/read_book/prefs/misc.pyj @@ -17,6 +17,7 @@ DEFAULTS = { 'remember_window_geometry': False, 'remember_last_read': True, 'show_actions_toolbar': False, + 'show_actions_toolbar_in_fullscreen': False, 'save_annotations_in_ebook': True, 'singleinstance': False, } @@ -50,6 +51,7 @@ def create_misc_panel(container, apply_func, cancel_func): container.lastChild.append(E.span('\xa0')) container.lastChild.append( create_button(_('Customize toolbar'), action=ui_operations.customize_toolbar)) + container.append(cb('show_actions_toolbar_in_fullscreen', _('Keep the toolbar in full screen mode (needs restart)'))) container.append(cb('remember_last_read', _('Remember current page when quitting'))) container.append(cb('save_annotations_in_ebook', _('Keep a copy of annotations/bookmarks in the e-book file, for easy sharing'))) container.append(cb('singleinstance', _('Allow only a single instance of the viewer (needs restart)')))