X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=4b778ad1dd2fabc9fb2889d03fcbc4fb2849c68e;hb=207298bf65c031a7aa144685a2646308ece0c5ab;hp=4d7aaf42413ddc2f83d32106a2bbc68b83208aa3;hpb=0602a1b0ce698da6ef427676db2660e174e28d49;p=dorian
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4d7aaf4..4b778ad 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -66,8 +66,6 @@ MainWindow::MainWindow(QWidget *parent):
"bookmarks", tr("Bookmarks"), true);
libraryAction = addToolBarAction(this, SLOT(showLibrary()),
"library", tr("Library"), false);
- rotateAction = addToolBarAction(this, SLOT(rotate()),
- "rotate", tr("Rotate"), true);
#ifdef Q_WS_MAEMO_5
settingsAction = menuBar()->addAction(tr("Settings"));
@@ -81,6 +79,8 @@ MainWindow::MainWindow(QWidget *parent):
"developer", tr("Developer"));
#endif
+ rotateAction = addToolBarAction(this, SLOT(rotate()),
+ "rotate", tr("Rotate"), true);
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 ¤t)
@@ -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;
@@ -363,11 +361,13 @@ void MainWindow::about()
label->setTextFormat(Qt::RichText);
label->setOpenExternalLinks(true);
label->setWordWrap(true);
- label->setText(tr("Dorian %1
Copyright © 2010 "
- "Akos Polster <akos@pipacs.com>
"
- "Licensed under GNU General Public License, Version 3
"
- "Source code:
"
- "dorian.garage.maemo.org").arg(version));
+ label->setText(tr("Dorian %1
"
+ "Copyright © 2010-2011 by "
+ "Akos Polster <akos@pipacs.com>
"
+ "Licensed under GNU General Public License, Version 3
"
+ ""
+ "dorian.garage.maemo.org
"
+ ).arg(version));
aboutDialog->addWidget(label);
aboutDialog->addStretch();
aboutDialog->show();