Add tool bar on Symbian. Fix some orientation change bugs.

[dorian] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4c635cd..8f6e2ef 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -44,6 +44,17 @@ MainWindow::MainWindow(QWidget *parent):
 #endif
     setWindowTitle("Dorian");
 
+#ifdef Q_OS_SYMBIAN
+    // Tool bar
+    toolBar = new QToolBar("", this /*frame*/);
+    toolBar->setFixedWidth(QApplication::desktop()->
+                           availableGeometry().width());
+    toolBar->setFixedHeight(65);
+    toolBar->setStyleSheet("margin:0;border:0;padding:0");
+    toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+    addToolBar(Qt::BottomToolBarArea, toolBar);
+#endif
+
     // Central widget. Must be an intermediate, because the book view widget
     // can be re-parented later
     QFrame *central = new QFrame(this);
@@ -68,13 +79,13 @@ MainWindow::MainWindow(QWidget *parent):
 #endif
 
     chaptersAction = addToolBarAction(this, SLOT(showChapters()),
-                                      "chapters", tr("Chapters"));
+                                      "chapters", tr("Chapters"), true);
     bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
-                                       "bookmarks", tr("Bookmarks"));
+                                       "bookmarks", tr("Bookmarks"), true);
     infoAction = addToolBarAction(this, SLOT(showInfo()),
-                                  "info", tr("Book info"));
+                                  "info", tr("Book info"), true);
     libraryAction = addToolBarAction(this, SLOT(showLibrary()),
-                                     "library", tr("Library"));
+                                     "library", tr("Library"), true);
 
 #ifdef Q_WS_MAEMO_5
     settingsAction = menuBar()->addAction(tr("Settings"));
@@ -192,23 +203,30 @@ void MainWindow::showRegular()
     // Adjust geometry of decorations
 
     QRect geo = geometry();
+    qDebug() << geo;
     int y = geo.height() - progress->thickness();
-#if defined(Q_WS_MAEMO_5)
-    y -= toolBar->height();
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+    bool hasToolBar = false;
+#   if defined(Q_OS_SYMBIAN)
+    hasToolBar =
+        (QApplication::desktop()->width() < QApplication::desktop()->height());
+    qDebug() << (hasToolBar? "Portrait": "Landscape");
+#   endif
+    if (!hasToolBar) {
+        y -= toolBar->height();
+    }
 #endif
     progress->setGeometry(0, y, geo.width(), y + progress->thickness());
 
-#if defined(Q_WS_MAEMO_5)
-    previousButton->setGeometry(0,
-        geo.height() - toolBar->height() - TranslucentButton::pixels,
-        TranslucentButton::pixels, TranslucentButton::pixels);
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+    y = geo.height() - TranslucentButton::pixels;
+    if (!hasToolBar) {
+        y -= toolBar->height();
+    }
+    previousButton->setGeometry(0, y, TranslucentButton::pixels,
+                                TranslucentButton::pixels);
     nextButton->setGeometry(geo.width() - TranslucentButton::pixels, 0,
         TranslucentButton::pixels, TranslucentButton::pixels);
-#elif defined(Q_OS_SYMBIAN)
-    previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
-        TranslucentButton::pixels, TranslucentButton::pixels);
-    nextButton->setGeometry(geo.width() - TranslucentButton::pixels,
-        0, TranslucentButton::pixels, TranslucentButton::pixels);
 #else
     previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
         TranslucentButton::pixels, TranslucentButton::pixels);
@@ -234,9 +252,7 @@ void MainWindow::showBig()
 
     // Re-parent children
     leaveChildren();
-    QList<QWidget *> otherChildren;
-    otherChildren << progress << nextButton << previousButton;
-    fullScreenWindow->takeChildren(view, otherChildren);
+    fullScreenWindow->takeChildren(view, progress, previousButton, nextButton);
 
     // Adjust geometry of decorations
     QRect screen = QApplication::desktop()->screenGeometry();
@@ -300,7 +316,6 @@ void MainWindow::showBookmarks()
     Book *book = Library::instance()->book(mCurrent);
     if (book) {
         BookmarksDialog *bookmarks = new BookmarksDialog(book, this);
-        bookmarks->setWindowModality(Qt::WindowModal);
         connect(bookmarks, SIGNAL(addBookmark(const QString &)),
                 this, SLOT(onAddBookmark(const QString &)));
         connect(bookmarks, SIGNAL(goToBookmark(int)),
@@ -313,7 +328,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 {
     TRACE;
     view->setLastBookmark();
-    event->accept();
+    AdopterWindow::closeEvent(event);
 }
 
 void MainWindow::onSettingsChanged(const QString &key)
@@ -392,7 +407,6 @@ void MainWindow::showChapters()
     Book *book = Library::instance()->book(mCurrent);
     if (book) {
         ChaptersDialog *chapters = new ChaptersDialog(book, this);
-        chapters->setWindowModality(Qt::WindowModal);
         connect(chapters, SIGNAL(goToChapter(int)),
                 this, SLOT(onGoToChapter(int)));
         chapters->show();
@@ -430,41 +444,29 @@ void MainWindow::resizeEvent(QResizeEvent *e)
 {
     TRACE;
 
-    if (hasChild(progress)) {
-        qDebug() << "To" << e->size();
-        int y = e->size().height() - progress->thickness();
-#if defined(Q_WS_MAEMO_5)
-        y -= toolBar->height();
-#endif
-        progress->setGeometry(0, y, e->size().width(), y + progress->thickness());
+    int toolBarHeight = 0;
 
-#if defined(Q_WS_MAEMO_5)
-        previousButton->setGeometry(0,
-            e->size().height() - toolBar->height() - TranslucentButton::pixels,
-            TranslucentButton::pixels, TranslucentButton::pixels);
-        nextButton->setGeometry(e->size().width() - TranslucentButton::pixels, 0,
-            TranslucentButton::pixels, TranslucentButton::pixels);
-#elif defined(Q_OS_SYMBIAN)
-        previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels,
-            TranslucentButton::pixels, TranslucentButton::pixels);
-        nextButton->setGeometry(e->size().width() - TranslucentButton::pixels,
-            0, TranslucentButton::pixels, TranslucentButton::pixels);
-#else
-        previousButton->setGeometry(0,
-            e->size().height() - TranslucentButton::pixels,
+#ifdef Q_OS_SYMBIAN
+    // Tool bar is only useful in portrait mode
+    bool isPortrait = (e->size().width() < e->size().height());
+    toolBar->setVisible(isPortrait);
+    if (!isPortrait) {
+        toolBarHeight = toolBar->height();
+    }
+#endif // Q_OS_SYMBIAN
+
+    if (bookView) {
+        qDebug() << "BookView geometry" << bookView->geometry();
+        QRect geo = bookView->geometry();
+        progress->setGeometry(geo.x(),
+            geo.y() + geo.height() - progress->thickness() + toolBarHeight,
+            geo.width(), progress->thickness());
+        previousButton->setGeometry(geo.x(),
+            geo.y() + geo.height() - TranslucentButton::pixels + toolBarHeight,
             TranslucentButton::pixels, TranslucentButton::pixels);
-        nextButton->setGeometry(e->size().width() - TranslucentButton::pixels - 25,
-            toolBar->height(), TranslucentButton::pixels,
-            TranslucentButton::pixels);
-#endif // Q_WS_MAEMO_5
-
-#ifdef Q_WS_MAEMO_5
-        // This is needed on Maemo, in order not to lose current reading position
-        // after orientation change
-        QTimer::singleShot(250, view, SLOT(restoreLastBookmark()));
-#endif
-        previousButton->flash();
-        nextButton->flash();
+        nextButton->setGeometry(
+            geo.x() + geo.width() - TranslucentButton::pixels,
+            geo.y(), TranslucentButton::pixels, TranslucentButton::pixels);
     }
     QMainWindow::resizeEvent(e);
 }