From 06412a4e268ed1d65896339635df76b37de95b92 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Nov 2012 16:01:02 +0530
Subject: [PATCH] E-book viewer: Add an option to hide the help message when
 entering full screen mode

---
 src/calibre/gui2/viewer/config.py       |  5 ++++-
 src/calibre/gui2/viewer/config.ui       | 13 ++++++++++---
 src/calibre/gui2/viewer/documentview.py |  1 +
 src/calibre/gui2/viewer/main.py         |  3 ++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index afef45af4b..abaf23b1d3 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -61,6 +61,8 @@ def config(defaults=None):
             help=_('Show the scrollbar in fullscreen mode.'))
     c.add_opt('start_in_fullscreen', default=False, action='store_true',
               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('use_book_margins', default=False, action='store_true')
     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_scrollbar.setChecked(opts.fullscreen_scrollbar)
         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_cols_per_screen.setValue(opts.cols_per_screen)
         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_pos', self.opt_fullscreen_pos.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('use_book_margins', not
                 self.opt_override_book_margins.isChecked())
diff --git a/src/calibre/gui2/viewer/config.ui b/src/calibre/gui2/viewer/config.ui
index f3fe8c7f1d..3ae2efe597 100644
--- a/src/calibre/gui2/viewer/config.ui
+++ b/src/calibre/gui2/viewer/config.ui
@@ -388,27 +388,34 @@ QToolBox::tab:hover {
              </property>
             </widget>
            </item>
-           <item row="4" column="0" colspan="2">
+           <item row="5" column="0" colspan="2">
             <widget class="QCheckBox" name="opt_fullscreen_pos">
              <property name="text">
               <string>Show reading &amp;position in full screen mode</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" colspan="2">
+           <item row="4" column="0" colspan="2">
             <widget class="QCheckBox" name="opt_fullscreen_scrollbar">
              <property name="text">
               <string>Show &amp;scrollbar in full screen mode</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" colspan="2">
+           <item row="3" column="0" colspan="2">
             <widget class="QCheckBox" name="opt_start_in_fullscreen">
              <property name="text">
               <string>&amp;Start viewer in full screen mode</string>
              </property>
             </widget>
            </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>
          </widget>
          <widget class="QWidget" name="page_6">
diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index 5566f00c19..5fc4de3e38 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -146,6 +146,7 @@ class Document(QWebPage): # {{{
         self.fullscreen_scrollbar = opts.fullscreen_scrollbar
         self.fullscreen_pos = opts.fullscreen_pos
         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.cols_per_screen = opts.cols_per_screen
         self.side_margin = opts.side_margin
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 395d14abda..5c22f09278 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -591,7 +591,8 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
             fs = self.window_mode_changed == 'fullscreen'
             self.window_mode_changed = None
             if fs:
-                self.show_full_screen_label()
+                if self.view.document.show_fullscreen_help:
+                    self.show_full_screen_label()
             else:
                 self.view.document.switch_to_window_mode()
             self.view.document.page_position.restore()