X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=c8f5dfe93646f7059993750de18f110579809ca8;hb=7a3717897911dc312fc22afe687a42ed0afd1da1;hp=4a5f266e8663d75488404af63afaa854885f89af;hpb=678671f16bae6bf6276d9a56bf9f4bd17119c239;p=dorian diff --git a/mainwindow.cpp b/mainwindow.cpp index 4a5f266..c8f5dfe 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -29,13 +29,12 @@ #include "translucentbutton.h" #include "platform.h" #include "progressdialog.h" +#include "sortedlibrary.h" #ifdef DORIAN_TEST_MODEL # include "modeltest.h" #endif -const int DORIAN_PROGRESS_HEIGHT = 17; - MainWindow::MainWindow(QWidget *parent): AdopterWindow(parent), view(0), preventBlankingTimer(-1) { @@ -43,10 +42,13 @@ MainWindow::MainWindow(QWidget *parent): #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow, true); #endif + +#ifndef Q_OS_SYMBIAN setWindowTitle("Dorian"); +#endif // Central widget. Must be an intermediate, because the book view widget - // can be re-parented later + // might be re-parented later QFrame *central = new QFrame(this); QVBoxLayout *layout = new QVBoxLayout(central); layout->setMargin(0); @@ -54,55 +56,50 @@ MainWindow::MainWindow(QWidget *parent): setCentralWidget(central); // Book view - view = new BookView(central); - view->show(); - layout->addWidget(view); - - // Dialogs - progress = new Progress(this); + view = new BookView(this); // Tool bar actions -#ifdef Q_OS_SYMBIAN - fullScreenAction = addToolBarAction(this, SLOT(showBig()), - "view-fullscreen", tr("Full screen")); -#endif - chaptersAction = addToolBarAction(this, SLOT(showChapters()), - "chapters", tr("Chapters")); + "chapters", tr("Chapters"), true); bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), - "bookmarks", tr("Bookmarks")); - infoAction = addToolBarAction(this, SLOT(showInfo()), - "info", tr("Book info")); + "bookmarks", tr("Bookmarks"), true); libraryAction = addToolBarAction(this, SLOT(showLibrary()), - "library", tr("Library")); + "library", tr("Library"), false); #ifdef Q_WS_MAEMO_5 settingsAction = menuBar()->addAction(tr("Settings")); connect(settingsAction, SIGNAL(triggered()), this, SLOT(showSettings())); devToolsAction = menuBar()->addAction(tr("Developer")); connect(devToolsAction, SIGNAL(triggered()), this, SLOT(showDevTools())); - QAction *aboutAction = menuBar()->addAction(tr("About")); - connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); #else settingsAction = addToolBarAction(this, SLOT(showSettings()), "preferences-system", tr("Settings")); devToolsAction = addToolBarAction(this, SLOT(showDevTools()), "developer", tr("Developer")); - addToolBarAction(this, SLOT(about()), "about", tr("About")); -#endif // Q_WS_MAEMO_5 +#endif -#ifndef Q_OS_SYMBIAN - addToolBarSpace(); + rotateAction = addToolBarAction(this, SLOT(rotate()), + "rotate", tr("Rotate"), true); + // addToolBarSpace(); fullScreenAction = addToolBarAction(this, SLOT(showBig()), - "view-fullscreen", tr("Full screen")); + "view-fullscreen", tr("Full screen"), true); + +#if defined(Q_WS_MAEMO_5) + QAction *aboutAction = menuBar()->addAction(tr("About")); + connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); #else - (void)addToolBarAction(this, SLOT(close()), "", tr("Exit")); -#endif + addToolBarAction(this, SLOT(about()), "about", tr("About")); +#endif // defined(Q_WS_MAEMO_5) - // Buttons on top of the book view - previousButton = new TranslucentButton("back", this); - nextButton = new TranslucentButton("forward", this); +#if defined(Q_OS_SYMBIAN) + (void)addToolBarAction(this, SLOT(close()), "", tr("Exit"), false); +#endif // defined(Q_OS_SYMBIAN) + + // Decorations + prev = new TranslucentButton("back", this); + next = new TranslucentButton("forward", this); + prog = new Progress(this); // Handle model changes connect(Library::instance(), SIGNAL(nowReadingChanged()), @@ -111,7 +108,8 @@ MainWindow::MainWindow(QWidget *parent): // Load library, upgrade it if needed libraryProgress = new ProgressDialog(tr("Upgrading library"), this); Library *library = Library::instance(); - connect(library, SIGNAL(beginUpgrade(int)), this, SLOT(onBeginUpgrade(int))); + connect(library, SIGNAL(beginUpgrade(int)), + this, SLOT(onBeginUpgrade(int))); connect(library, SIGNAL(upgrading(const QString &)), this, SLOT(onUpgrading(const QString &))); connect(library, SIGNAL(endUpgrade()), this, SLOT(onEndUpgrade())); @@ -121,7 +119,7 @@ MainWindow::MainWindow(QWidget *parent): connect(view, SIGNAL(partLoadEnd(int)), this, SLOT(onPartLoadEnd(int))); // Handle progress - connect(view, SIGNAL(progress(qreal)), progress, SLOT(setProgress(qreal))); + connect(view, SIGNAL(progress(qreal)), prog, SLOT(setProgress(qreal))); // Shadow window for full screen reading fullScreenWindow = new FullScreenWindow(this); @@ -132,11 +130,8 @@ MainWindow::MainWindow(QWidget *parent): this, SLOT(onSettingsChanged(const QString &))); // Handle book view buttons - connect(nextButton, SIGNAL(triggered()), this, SLOT(goToNextPage())); - connect(previousButton, SIGNAL(triggered()), this, SLOT(goToPreviousPage())); - - // Adopt view, show window - showRegular(); + connect(next, SIGNAL(triggered()), this, SLOT(goToNextPage())); + connect(prev, SIGNAL(triggered()), this, SLOT(goToPreviousPage())); #ifdef DORIAN_TEST_MODEL (void)new ModelTest(Library::instance(), this); @@ -168,9 +163,13 @@ void MainWindow::initialize() if (!library->rowCount()) { library->add(":/books/2BR02B.epub"); } - library->setNowReading(library->index(0)); + SortedLibrary sorted; + library->setNowReading(sorted.mapToSource(sorted.index(0, 0))); } } + + // Show in regular (non full-screen) mode + showRegular(); } void MainWindow::onCurrentBookChanged() @@ -184,42 +183,15 @@ void MainWindow::showRegular() TRACE; // Re-parent children - fullScreenWindow->leaveChildren(); - QList otherChildren; - otherChildren << progress << previousButton << nextButton; - takeChildren(view, otherChildren); - - // Adjust geometry of decorations - QRect geo = geometry(); - progress->setGeometry(0, 0, geo.width(), DORIAN_PROGRESS_HEIGHT); -#if defined(Q_WS_MAEMO_5) - previousButton->setGeometry(0, - geo.height() - toolBar->height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(geo.width() - TranslucentButton::pixels, 0, - TranslucentButton::pixels, TranslucentButton::pixels); -#elif defined(Q_OS_SYMBIAN) - previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(geo.width() - TranslucentButton::pixels, - 0, TranslucentButton::pixels, TranslucentButton::pixels); -#else - previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(geo.width() - TranslucentButton::pixels - 25, - toolBar->height(), TranslucentButton::pixels, - TranslucentButton::pixels); -#endif // Q_WS_MAEMO_5 - qDebug() << "previousButton geometry" << previousButton->geometry(); - + fullScreenWindow->leaveBookView(); + takeBookView(view, prog, prev, next); fullScreenWindow->hide(); - show(); -#if defined(Q_OS_SYMBIAN) - activateWindow(); + +#ifdef Q_OS_SYMBIAN + view->setFixedSize(Platform::availableSize().width(), + Platform::availableSize().height() - Platform::softKeyHeight()); #endif - progress->flash(); - nextButton->flash(); - previousButton->flash(); + show(); } void MainWindow::showBig() @@ -227,34 +199,14 @@ void MainWindow::showBig() TRACE; // Re-parent children - leaveChildren(); - QList otherChildren; - otherChildren << progress << nextButton << previousButton; - fullScreenWindow->takeChildren(view, otherChildren); - - // Adjust geometry of decorations - QRect screen = QApplication::desktop()->screenGeometry(); - progress->setGeometry(0, 0, screen.width(), DORIAN_PROGRESS_HEIGHT); -#if defined(Q_WS_MAEMO_5) - nextButton->setGeometry(screen.width() - TranslucentButton::pixels, 0, - TranslucentButton::pixels, TranslucentButton::pixels); -#else - nextButton->setGeometry(screen.width() - TranslucentButton::pixels - 25, 0, - TranslucentButton::pixels, TranslucentButton::pixels); -#endif // Q_WS_MAEMO_5 - previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); + leaveBookView(); + fullScreenWindow->takeBookView(view, prog, prev, next); + hide(); #ifdef Q_OS_SYMBIAN - hide(); + view->setFixedSize(Platform::size()); #endif fullScreenWindow->showFullScreen(); -#ifdef Q_OS_SYMBIAN - fullScreenWindow->activateWindow(); -#endif - progress->flash(); - nextButton->flash(); - previousButton->flash(); } void MainWindow::setCurrentBook(const QModelIndex ¤t) @@ -275,12 +227,12 @@ void MainWindow::showSettings() (new SettingsWindow(this))->show(); } -void MainWindow::showInfo() +void MainWindow::rotate() { - if (mCurrent.isValid()) { - (new InfoDialog(Library::instance()->book(mCurrent), this, false))-> - exec(); - } + QString current = Settings::instance()->value("orientation", + Platform::instance()->defaultOrientation()).toString(); + QString target = (current == "landscape")? "portrait": "landscape"; + Settings::instance()->setValue("orientation", target); } void MainWindow::showDevTools() @@ -293,7 +245,6 @@ void MainWindow::showBookmarks() Book *book = Library::instance()->book(mCurrent); if (book) { BookmarksDialog *bookmarks = new BookmarksDialog(book, this); - bookmarks->setWindowModality(Qt::WindowModal); connect(bookmarks, SIGNAL(addBookmark(const QString &)), this, SLOT(onAddBookmark(const QString &))); connect(bookmarks, SIGNAL(goToBookmark(int)), @@ -302,38 +253,29 @@ void MainWindow::showBookmarks() } } -void MainWindow::closeEvent(QCloseEvent *event) +void MainWindow::onSettingsChanged(const QString &key) { TRACE; - view->setLastBookmark(); - event->accept(); -} + qDebug() << "Key" << key; -void MainWindow::onSettingsChanged(const QString &key) -{ -#if defined(Q_WS_MAEMO_5) if (key == "orientation") { + view->setLastBookmark(); QString value = Settings::instance()->value(key, Platform::instance()->defaultOrientation()).toString(); - qDebug() << "MainWindow::onSettingsChanged: orientation" << value; - if (value == "portrait") { - setAttribute(Qt::WA_Maemo5LandscapeOrientation, false); - setAttribute(Qt::WA_Maemo5PortraitOrientation, true); - } else { - setAttribute(Qt::WA_Maemo5PortraitOrientation, false); - setAttribute(Qt::WA_Maemo5LandscapeOrientation, true); - } - } else if (key == "lightson") { + qDebug() << "Value: orientation" << value; + Platform::instance()->setOrientation(this, value); + Platform::instance()->setOrientation(fullScreenWindow, value); + } + +#if defined(Q_WS_MAEMO_5) + else if (key == "lightson") { bool enable = Settings::instance()->value(key, false).toBool(); - qDebug() << "MainWindow::onSettingsChanged: lightson" << enable; killTimer(preventBlankingTimer); if (enable) { preventBlankingTimer = startTimer(29 * 1000); } } -#else - Q_UNUSED(key); -#endif // Q_WS_MAEMO_5 +#endif // defined(Q_WS_MAEMO_5) } void MainWindow::onPartLoadStart() @@ -378,7 +320,6 @@ void MainWindow::showChapters() Book *book = Library::instance()->book(mCurrent); if (book) { ChaptersDialog *chapters = new ChaptersDialog(book, this); - chapters->setWindowModality(Qt::WindowModal); connect(chapters, SIGNAL(goToChapter(int)), this, SLOT(onGoToChapter(int))); chapters->show(); @@ -412,39 +353,6 @@ void MainWindow::timerEvent(QTimerEvent *event) AdopterWindow::timerEvent(event); } -void MainWindow::resizeEvent(QResizeEvent *e) -{ - TRACE; - progress->setGeometry(QRect(0, 0, e->size().width(), DORIAN_PROGRESS_HEIGHT)); -#if defined(Q_WS_MAEMO_5) - previousButton->setGeometry(0, - e->size().height() - toolBar->height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(e->size().width() - TranslucentButton::pixels, 0, - TranslucentButton::pixels, TranslucentButton::pixels); -#elif defined(Q_OS_SYMBIAN) - previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(e->size().width() - TranslucentButton::pixels, - 0, TranslucentButton::pixels, TranslucentButton::pixels); -#else - previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels, - TranslucentButton::pixels, TranslucentButton::pixels); - nextButton->setGeometry(e->size().width() - TranslucentButton::pixels - 25, - toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels); -#endif // Q_WS_MAEMO_5 - qDebug() << "previousButton geometry" << previousButton->geometry(); - -#ifdef Q_WS_MAEMO_5 - // This is needed on Maemo, in order not to lose current reading position - // after orientation change - QTimer::singleShot(250, view, SLOT(restoreLastBookmark())); -#endif - previousButton->flash(); - nextButton->flash(); - QMainWindow::resizeEvent(e); -} - void MainWindow::about() { Dyalog *aboutDialog = new Dyalog(this, false); @@ -454,11 +362,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:
" - "garage.maemo.org/projects/dorian").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(); @@ -466,15 +376,15 @@ void MainWindow::about() void MainWindow::goToNextPage() { - nextButton->flash(); - previousButton->flash(); + next->flash(); + prev->flash(); view->goNextPage(); } void MainWindow::goToPreviousPage() { - nextButton->flash(); - previousButton->flash(); + next->flash(); + prev->flash(); view->goPreviousPage(); }