Add splash screen on Maemo, too. Switch to new splash pixmap. Fix bug

[dorian] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2aa7abe..4b778ad 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -143,6 +143,9 @@ void MainWindow::initialize()
     TRACE;
     Library *library = Library::instance();
 
+    // Show in regular (non full-screen) mode
+    showRegular();
+
     // Upgrade library if needed, then load it
     library->upgrade();
     library->load();
@@ -167,9 +170,6 @@ void MainWindow::initialize()
             library->setNowReading(sorted.mapToSource(sorted.index(0, 0)));
         }
     }
-
-    // Show in regular (non full-screen) mode
-    showRegular();
 }
 
 void MainWindow::onCurrentBookChanged()
@@ -188,6 +188,7 @@ void MainWindow::showRegular()
 
     fullScreenWindow->hide();
     show();
+    view->scheduleRestoreLastBookmark();
 }
 
 void MainWindow::showBig()
@@ -204,6 +205,7 @@ void MainWindow::showBig()
     hide();
 #endif
     fullScreenWindow->showFullScreen();
+    view->scheduleRestoreLastBookmark();
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -229,6 +231,7 @@ void MainWindow::rotate()
     QString current = Settings::instance()->value("orientation",
         Platform::instance()->defaultOrientation()).toString();
     QString target = (current == "landscape")? "portrait": "landscape";
+    view->setLastBookmark();
     Settings::instance()->setValue("orientation", target);
 }
 
@@ -256,7 +259,6 @@ void MainWindow::onSettingsChanged(const QString &key)
     qDebug() << "Key" << key;
 
     if (key == "orientation") {
-        view->setLastBookmark();
         QString value = Settings::instance()->value(key,
             Platform::instance()->defaultOrientation()).toString();
         qDebug() << "Value: orientation" << value;