Smoothen switch between full screen/normal view on Maemo.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 583928e..4ab3b90 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -81,7 +81,7 @@ MainWindow::MainWindow(QWidget *parent):
 
     rotateAction = addToolBarAction(this, SLOT(rotate()),
                                     "rotate", tr("Rotate"), true);
-    // addToolBarSpace();
+    addToolBarSpace();
     fullScreenAction = addToolBarAction(this, SLOT(showBig()),
         "view-fullscreen", tr("Full screen"), true);
 
@@ -198,7 +198,11 @@ void MainWindow::showBig()
     leaveBookView();
     fullScreenWindow->takeBookView(view, prog, prev, next);
 
+#ifdef Q_WS_MAEMO_5
+    fullScreenWindow->raise();
+#else
     hide();
+#endif
     fullScreenWindow->showFullScreen();
 }
 
@@ -230,7 +234,7 @@ void MainWindow::rotate()
 
 void MainWindow::showDevTools()
 {
-    (new DevTools())->exec();
+    (new DevTools(this))->exec();
 }
 
 void MainWindow::showBookmarks()

diff --git a/widgets/listwindow.cpp b/widgets/listwindow.cpp
index 76a7819..5e6fa34 100644 (file)
--- a/widgets/listwindow.cpp
+++ b/widgets/listwindow.cpp
@@ -129,7 +129,7 @@ void ListWindow::addItemButton(const QString &title, QObject *receiver,
     Q_UNUSED(title);
     Q_UNUSED(receiver);
     Q_UNUSED(slot);
-    Q_UNUSED(iconPath);
+    Q_UNUSED(iconName);
 #else
     QAction *toolBarAction =
             addToolBarAction(receiver, slot, iconName, title, true);

diff --git a/widgets/mainbase.cpp b/widgets/mainbase.cpp
index c9a4d54..4694de2 100755 (executable)
--- a/widgets/mainbase.cpp
+++ b/widgets/mainbase.cpp
@@ -92,10 +92,12 @@ QAction *MainBase::addToolBarAction(QObject *receiver,
 \r
 void MainBase::addToolBarSpace()\r
 {\r
+#ifndef Q_OS_SYMBIAN\r
     addToolBar();\r
     QFrame *frame = new QFrame(toolBar);\r
     frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);\r
     toolBar->addWidget(frame);\r
+#endif\r
 }\r
 \r
 int MainBase::toolBarHeight()\r