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 an option to hide the help message when entering full screen mode

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-19 16:01:02 +05:30
parent 20a1857704
commit 06412a4e26
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/viewer/config.py
View File

@ -61,6 +61,8 @@ def config(defaults=None):
help=_('Show the scrollbar in fullscreen mode.')) help=_('Show the scrollbar in fullscreen mode.'))
c.add_opt('start_in_fullscreen', default=False, action='store_true', c.add_opt('start_in_fullscreen', default=False, action='store_true',
help=_('Start viewer in full screen mode')) help=_('Start viewer in full screen mode'))
c.add_opt('show_fullscreen_help', default=True, action='store_false',
help=_('Show full screen usage help'))
c.add_opt('cols_per_screen', default=1) c.add_opt('cols_per_screen', default=1)
c.add_opt('use_book_margins', default=False, action='store_true') c.add_opt('use_book_margins', default=False, action='store_true')
c.add_opt('top_margin', default=20) c.add_opt('top_margin', default=20)
@ -209,6 +211,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
self.opt_fullscreen_clock.setChecked(opts.fullscreen_clock) self.opt_fullscreen_clock.setChecked(opts.fullscreen_clock)
self.opt_fullscreen_scrollbar.setChecked(opts.fullscreen_scrollbar) self.opt_fullscreen_scrollbar.setChecked(opts.fullscreen_scrollbar)
self.opt_start_in_fullscreen.setChecked(opts.start_in_fullscreen) self.opt_start_in_fullscreen.setChecked(opts.start_in_fullscreen)
self.opt_show_fullscreen_help.setChecked(opts.show_fullscreen_help)
self.opt_fullscreen_pos.setChecked(opts.fullscreen_pos) self.opt_fullscreen_pos.setChecked(opts.fullscreen_pos)
self.opt_cols_per_screen.setValue(opts.cols_per_screen) self.opt_cols_per_screen.setValue(opts.cols_per_screen)
self.opt_override_book_margins.setChecked(not opts.use_book_margins) self.opt_override_book_margins.setChecked(not opts.use_book_margins)
@ -282,7 +285,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
c.set('fullscreen_clock', self.opt_fullscreen_clock.isChecked()) c.set('fullscreen_clock', self.opt_fullscreen_clock.isChecked())
c.set('fullscreen_pos', self.opt_fullscreen_pos.isChecked()) c.set('fullscreen_pos', self.opt_fullscreen_pos.isChecked())
c.set('fullscreen_scrollbar', self.opt_fullscreen_scrollbar.isChecked()) c.set('fullscreen_scrollbar', self.opt_fullscreen_scrollbar.isChecked())
c.set('start_in_fullscreen', self.opt_start_in_fullscreen.isChecked()) c.set('show_fullscreen_help', self.opt_show_fullscreen_help.isChecked())
c.set('cols_per_screen', int(self.opt_cols_per_screen.value())) c.set('cols_per_screen', int(self.opt_cols_per_screen.value()))
c.set('use_book_margins', not c.set('use_book_margins', not
self.opt_override_book_margins.isChecked()) self.opt_override_book_margins.isChecked())

13
src/calibre/gui2/viewer/config.ui
View File

@ -388,27 +388,34 @@ QToolBox::tab:hover {
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="opt_fullscreen_pos"> <widget class="QCheckBox" name="opt_fullscreen_pos">
<property name="text"> <property name="text">
<string>Show reading &amp;position in full screen mode</string> <string>Show reading &amp;position in full screen mode</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="opt_fullscreen_scrollbar"> <widget class="QCheckBox" name="opt_fullscreen_scrollbar">
<property name="text"> <property name="text">
<string>Show &amp;scrollbar in full screen mode</string> <string>Show &amp;scrollbar in full screen mode</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="opt_start_in_fullscreen"> <widget class="QCheckBox" name="opt_start_in_fullscreen">
<property name="text"> <property name="text">
<string>&amp;Start viewer in full screen mode</string> <string>&amp;Start viewer in full screen mode</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="opt_show_fullscreen_help">
<property name="text">
<string>Show &amp;help message when starting full screen mode</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_6"> <widget class="QWidget" name="page_6">

1
src/calibre/gui2/viewer/documentview.py
View File

@ -146,6 +146,7 @@ class Document(QWebPage): # {{{
self.fullscreen_scrollbar = opts.fullscreen_scrollbar self.fullscreen_scrollbar = opts.fullscreen_scrollbar
self.fullscreen_pos = opts.fullscreen_pos self.fullscreen_pos = opts.fullscreen_pos
self.start_in_fullscreen = opts.start_in_fullscreen self.start_in_fullscreen = opts.start_in_fullscreen
self.show_fullscreen_help = opts.show_fullscreen_help
self.use_book_margins = opts.use_book_margins self.use_book_margins = opts.use_book_margins
self.cols_per_screen = opts.cols_per_screen self.cols_per_screen = opts.cols_per_screen
self.side_margin = opts.side_margin self.side_margin = opts.side_margin

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

@ -591,7 +591,8 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
fs = self.window_mode_changed == 'fullscreen' fs = self.window_mode_changed == 'fullscreen'
self.window_mode_changed = None self.window_mode_changed = None
if fs: if fs:
self.show_full_screen_label() if self.view.document.show_fullscreen_help:
self.show_full_screen_label()
else: else:
self.view.document.switch_to_window_mode() self.view.document.switch_to_window_mode()
self.view.document.page_position.restore() self.view.document.page_position.restore()