X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=82fde67ba2e3c14abb7b8ae3267ce9317d0d192f;hb=20bcc7d2b18201f309e4d2cc85d7690ae482ed25;hp=4860d41646b35c8ea585a0a475bd23af1a00a284;hpb=707b1e5f9b76acbcb6b085d0c129763093b6d52a;p=dorian

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4860d41..82fde67 100755
--- 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);
 
@@ -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()
@@ -182,32 +182,30 @@ void MainWindow::showRegular()
 {
     TRACE;
 
-    // Re-parent children
+    view->setLastBookmark();
     fullScreenWindow->leaveBookView();
     takeBookView(view, prog, prev, next);
 
     fullScreenWindow->hide();
     show();
-
-#if defined(Q_OS_SYMBIAN)
-    activateWindow();
-#endif
+    view->scheduleRestoreLastBookmark();
 }
 
 void MainWindow::showBig()
 {
     TRACE;
 
-    // Re-parent children
+    view->setLastBookmark();
     leaveBookView();
     fullScreenWindow->takeBookView(view, prog, prev, next);
 
-    fullScreenWindow->showFullScreen();
+#ifdef Q_WS_MAEMO_5
+    fullScreenWindow->raise();
+#else
     hide();
-
-#ifdef Q_OS_SYMBIAN
-    fullScreenWindow->activateWindow();
 #endif
+    fullScreenWindow->showFullScreen();
+    view->scheduleRestoreLastBookmark();
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -233,12 +231,13 @@ 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);
 }
 
 void MainWindow::showDevTools()
 {
-    (new DevTools())->exec();
+    (new DevTools(this))->exec();
 }
 
 void MainWindow::showBookmarks()
@@ -260,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;
@@ -359,6 +357,12 @@ void MainWindow::about()
     Dyalog *aboutDialog = new Dyalog(this, false);
     aboutDialog->setWindowTitle(tr("About Dorian"));
     QString version = Platform::instance()->version();
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN)
+    QLabel *icon = new QLabel(aboutDialog);
+    QPixmap pixmap(Platform::instance()->icon("dorian"));
+    icon->setPixmap(pixmap);
+    aboutDialog->addWidget(icon);
+#endif
     QLabel *label = new QLabel(aboutDialog);
     label->setTextFormat(Qt::RichText);
     label->setOpenExternalLinks(true);