Fix forward navigation control on Linux.

[dorian] / adopterwindow.h

diff --git a/adopterwindow.h b/adopterwindow.h
index eca7669..26c08cb 100644 (file)
--- a/adopterwindow.h
+++ b/adopterwindow.h
@@ -2,21 +2,19 @@
 #define ADOPTERWINDOW_H
 
 #include <QList>
-#include "mainwindow.h"
+#include "mainbase.h"
 
 class QWidget;
-class QToolBar;
 class QAction;
 class BookView;
-class QVBoxLayout;
 class Progress;
 class TranslucentButton;
 
 /**
  * A toplevel window that can adopt a BookView and other children.
- * On Maemo, it can also grab the volume keys.
+ * On some platforms, it can also grab the volume keys.
  */
-class AdopterWindow: public MainWindow
+class AdopterWindow: public MainBase
 {
     Q_OBJECT
 
@@ -33,26 +31,6 @@ public:
     /** Return true if the book view is currently adopted. */
     bool hasBookView();
 
-    /**
-     * Add action that is visible on the tool bar.
-     * @param   receiver    Object receiving "activated" signal.
-     * @param   slot        Slot receiving "activated" signal.
-     * @param   iconName    Base name of tool bar icon in resource file.
-     * @param   text        Tool bar item text.
-     * @param   important   On Symbian, only "important" actions are added to
-     *                      the tool bar. All actions are added to the Options
-     *                      menu though.
-     */
-    QAction *addToolBarAction(QObject *receiver, const char *slot,
-                              const QString &iconName, const QString &text,
-                              bool important = false);
-
-    /** Add spacing to tool bar. */
-    void addToolBarSpace();
-
-    /** Show window. */
-    void show();
-
     /** If grab is true, volume keys will navigate the book view. */
     void grabVolumeKeys(bool grab);
 
@@ -73,35 +51,25 @@ protected:
 
     /**
      * Handle show events.
-     * On Symbian, volume keys can only be grabbed, if the window is shown.
+     * On Symbian, volume keys can only be grabbed, when the window is shown.
+     * So we do it from here.
      */
     void showEvent(QShowEvent *event);
 
     /** Handle resize event: Restore reading position. */
     void resizeEvent(QResizeEvent *event);
 
-    /** Handle close event. */
+    /** Handle close event: Save reading position. */
     void closeEvent(QCloseEvent *event);
 
     /** Handle leave event: Save reading position. */
     void leaveEvent(QEvent *event);
 
-#ifdef Q_OS_SYMBIAN
-    /** Update toolbar visibility. */
-    void updateToolBar();
-
-    /** Return true in portrait mode. */
-    bool portrait();
-#endif // Q_OS_SYMBIAN
-
 #ifdef Q_WS_MAEMO_5
     /** Actually grab the volume keys. */
     void doGrabVolumeKeys(bool grab);
 #endif // Q_WS_MAEMO_5
 
-    /** Hide tool bar if visible. */
-    void hideToolBar();
-
 protected slots:
     void placeDecorations();
     void onPageDown();
@@ -110,7 +78,6 @@ protected slots:
 private:
     BookView *bookView;     /**< Book view widget. */
     bool grabbingVolumeKeys;/**< True, if volume keys should be grabbed. */
-    QToolBar *toolBar;      /**< Tool bar. */
     Progress *progress;     /**< Reading progress indicator. */
     TranslucentButton *previousButton;  /**< Previous page indicator. */
     TranslucentButton *nextButton;      /**< Next page indicator. */