X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=adopterwindow.h;h=7420d2c6bad5862926d3ec3ea01a23eb6a67cf6b;hb=482bb4e19882aab891836a780f2584387e9abc10;hp=c6c99cd4adc3ea104f86f90d2a4f957497142137;hpb=5b90676a3adb2b9df8504684093c165f684eac29;p=dorian

diff --git a/adopterwindow.h b/adopterwindow.h
index c6c99cd..7420d2c 100644
--- a/adopterwindow.h
+++ b/adopterwindow.h
@@ -1,14 +1,12 @@
 #ifndef ADOPTERWINDOW_H
 #define ADOPTERWINDOW_H
 
-#include <QMainWindow>
 #include <QList>
+#include "mainbase.h"
 
 class QWidget;
-class QToolBar;
 class QAction;
 class BookView;
-class QVBoxLayout;
 class Progress;
 class TranslucentButton;
 
@@ -16,7 +14,7 @@ class TranslucentButton;
  * A toplevel window that can adopt a BookView and other children.
  * On Maemo, it can also grab the volume keys.
  */
-class AdopterWindow: public QMainWindow
+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);
 
@@ -86,22 +64,11 @@ protected:
     /** 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 +77,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. */