Undo bad fix on Symbian.

diff --git a/adopterwindow.cpp b/adopterwindow.cpp
index 0c7fd08..daafa29 100644 (file)
--- a/adopterwindow.cpp
+++ b/adopterwindow.cpp
@@ -44,9 +44,7 @@ void AdopterWindow::takeBookView(BookView *view,
 
     bookView = view;
     bookView->setParent(this);
-#ifndef Q_OS_SYMBIAN
     centralWidget()->layout()->addWidget(bookView);
-#endif
     // bookView->show();
 
     progress = prog;
@@ -72,9 +70,7 @@ void AdopterWindow::leaveBookView()
     }
 
     // bookView->hide();
-#ifndef Q_OS_SYMBIAN
     centralWidget()->layout()->removeWidget(bookView);
-#endif
     bookView = 0;
     progress = 0;
     nextButton = 0;

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c8f5dfe..583928e 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -185,12 +185,8 @@ void MainWindow::showRegular()
     // Re-parent children
     fullScreenWindow->leaveBookView();
     takeBookView(view, prog, prev, next);
-    fullScreenWindow->hide();
 
-#ifdef Q_OS_SYMBIAN
-    view->setFixedSize(Platform::availableSize().width(),
-        Platform::availableSize().height() - Platform::softKeyHeight());
-#endif
+    fullScreenWindow->hide();
     show();
 }
 
@@ -201,11 +197,8 @@ void MainWindow::showBig()
     // Re-parent children
     leaveBookView();
     fullScreenWindow->takeBookView(view, prog, prev, next);
-    hide();
 
-#ifdef Q_OS_SYMBIAN
-    view->setFixedSize(Platform::size());
-#endif
+    hide();
     fullScreenWindow->showFullScreen();
 }
 

diff --git a/widgets/mainbase.cpp b/widgets/mainbase.cpp
index 1bb632f..c9a4d54 100755 (executable)
--- a/widgets/mainbase.cpp
+++ b/widgets/mainbase.cpp
@@ -38,7 +38,7 @@ void MainBase::addToolBar()
     toolBar = new QToolBar("", this);\r
     toolBar->setFixedHeight(Platform::softKeyHeight());\r
     toolBar->show();\r
-    // QMainWindow::addToolBar(Qt::NoToolBarArea, toolBar);\r
+    QMainWindow::addToolBar(Qt::BottomToolBarArea, toolBar);\r
 #else\r
     toolBar = QMainWindow::addToolBar("");\r
 #endif\r
@@ -116,7 +116,7 @@ void MainBase::show()
 #endif\r
 }\r
 \r
-#ifdef Q_OS_SYMBIAN\r
+#if 0 // ifdef Q_OS_SYMBIAN\r
 \r
 void MainBase::resizeEvent(QResizeEvent *e)\r
 {\r

diff --git a/widgets/mainbase.h b/widgets/mainbase.h
index c1103a4..a741f50 100755 (executable)
--- a/widgets/mainbase.h
+++ b/widgets/mainbase.h
@@ -42,13 +42,13 @@ protected:
     /** Return the height of the tool bar (or 0 if there is no tool bar). */\r
     int toolBarHeight();\r
 \r
-#ifdef Q_OS_SYMBIAN\r
+#if 0 // ifdef Q_OS_SYMBIAN\r
     /** Handle resize. */\r
     void resizeEvent(QResizeEvent *e);\r
 #endif\r
 \r
 private:\r
-    QToolBar *toolBar;      /**< Tool bar. */\r
+    QToolBar *toolBar;\r
 };\r
 \r
 #endif // MAINBASE_H\r