Fix popup widgets' positions. Add tool bar on Symbian.

[dorian] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4172e68..6486ec5 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);
@@ -53,7 +64,7 @@ MainWindow::MainWindow(QWidget *parent):
     setCentralWidget(central);
 
     // Book view
-    view = new BookView(central);
+    view = new BookView(this);
     view->show();
     layout->addWidget(view);
 
@@ -189,27 +200,36 @@ void MainWindow::showRegular()
     otherChildren << progress << previousButton << nextButton;
     takeChildren(view, otherChildren);
 
+#if 0
+
     // Adjust geometry of decorations
 
     QRect geo = geometry();
-    qDebug() << geo;
+    qDebug() << "MainWindow (MainWindow::showRegular)" << geo;
+    qDebug() << "BookView (MainWindow::showRegular)" << view->geometry();
     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);
@@ -219,14 +239,13 @@ void MainWindow::showRegular()
 #endif // Q_WS_MAEMO_5
     qDebug() << "previousButton geometry" << previousButton->geometry();
 
+#endif
+
     fullScreenWindow->hide();
     show();
 #if defined(Q_OS_SYMBIAN)
     activateWindow();
 #endif
-    progress->flash();
-    nextButton->flash();
-    previousButton->flash();
 }
 
 void MainWindow::showBig()
@@ -235,9 +254,9 @@ void MainWindow::showBig()
 
     // Re-parent children
     leaveChildren();
-    QList<QWidget *> otherChildren;
-    otherChildren << progress << nextButton << previousButton;
-    fullScreenWindow->takeChildren(view, otherChildren);
+    fullScreenWindow->takeChildren(view, progress, previousButton, nextButton);
+
+#if 0
 
     // Adjust geometry of decorations
     QRect screen = QApplication::desktop()->screenGeometry();
@@ -253,16 +272,16 @@ void MainWindow::showBig()
     previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels,
         TranslucentButton::pixels, TranslucentButton::pixels);
 
-#ifdef Q_OS_SYMBIAN
-    hide();
 #endif
+
+// #ifdef Q_OS_SYMBIAN
+    hide();
+// #endif
+
     fullScreenWindow->showFullScreen();
 #ifdef Q_OS_SYMBIAN
     fullScreenWindow->activateWindow();
 #endif
-    progress->flash();
-    nextButton->flash();
-    previousButton->flash();
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -427,22 +446,63 @@ void MainWindow::timerEvent(QTimerEvent *event)
 
 void MainWindow::resizeEvent(QResizeEvent *e)
 {
-    TRACE;
+    Trace t("MainWindow::resizeEvent");
+#ifdef Q_OS_SYMBIAN
+    // Tool bar is only useful in portrait mode
+    bool isPortrait =
+        (QApplication::desktop()->width() < QApplication::desktop()->height());
+    toolBar->setVisible(isPortrait);
+#endif
+    QTimer::singleShot(100, this, SLOT(placeChildren()));
+    AdopterWindow::resizeEvent(e);
+}
 
-    if (bookView) {
-        qDebug() << "BookView geometry" << bookView->geometry();
-        QRect geo = bookView->geometry();
+void MainWindow::placeChildren()
+{
+    Trace t("MainWindow::placeChildren");
+
+    int toolBarHeight = 0;
+
+#ifdef Q_OS_SYMBIAN
+    // Tool bar is only useful in portrait mode
+    bool isPortrait =
+        (QApplication::desktop()->width() < QApplication::desktop()->height());
+    // toolBar->setVisible(isPortrait);
+
+    // Work around Symbian bug: If there is no tool bar, increase decorator
+    // widgets' Y coordinates
+    if (!isPortrait) {
+        toolBarHeight = toolBar->height();
+    }
+#endif // Q_OS_SYMBIAN
+
+    if (hasChild(view)) {
+        QRect geo = centralWidget()->geometry();
+        qDebug() << "centralWidget (MainWindow::resizeEvent)" << geo;
+#ifdef Q_OS_SYMBIAN
+        // FIXME: When returning from full screen in landscape mode,
+        // the central widget's height is miscalculated on Symbian.
+        // My apologies for this kludge
+        if (geo.height() == 288) {
+            geo.setHeight(223);
+        }
+#endif // Q_OS_SYMBIAN
         progress->setGeometry(geo.x(),
-            geo.y() + geo.height() - progress->thickness(), geo.width(),
-            progress->thickness());
+            geo.y() + geo.height() - progress->thickness() + toolBarHeight,
+            geo.width(), progress->thickness());
         previousButton->setGeometry(geo.x(),
-            geo.y() + geo.height() - TranslucentButton::pixels,
+            geo.y() + geo.height() - TranslucentButton::pixels + toolBarHeight,
             TranslucentButton::pixels, TranslucentButton::pixels);
         nextButton->setGeometry(
             geo.x() + geo.width() - TranslucentButton::pixels,
             geo.y(), TranslucentButton::pixels, TranslucentButton::pixels);
+        progress->flash();
+        previousButton->flash();
+        nextButton->flash();
+        qDebug() << "Progress (MainWindow::resizeEvent)"
+                << progress->geometry();
     }
-    QMainWindow::resizeEvent(e);
+
 }
 
 void MainWindow::about()