X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=4172e68840a99a1c28e0130a7ba091b8a2cc673a;hb=10a322c6f496282b8123422943bbdecd43a52fbe;hp=675bdd400cb0cd7428218d3c4323d620bac68d70;hpb=f43cb8ff468e9d6ea889cf9a7b7f7abf2523208d;p=dorian diff --git a/mainwindow.cpp b/mainwindow.cpp index 675bdd4..4172e68 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,14 +1,7 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include #ifdef Q_WS_MAEMO_5 -# include # include # include # include @@ -34,20 +27,18 @@ #include "progress.h" #include "dyalog.h" #include "translucentbutton.h" +#include "platform.h" +#include "progressdialog.h" +#include "sortedlibrary.h" #ifdef DORIAN_TEST_MODEL # include "modeltest.h" #endif -const int PROGRESS_HEIGHT = 17; -static const char *DORIAN_VERSION = -#include "pkg/version.txt" -; - MainWindow::MainWindow(QWidget *parent): AdopterWindow(parent), view(0), preventBlankingTimer(-1) { - Trace t("MainWindow::MainWindow"); + TRACE; #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow, true); #endif @@ -66,11 +57,8 @@ MainWindow::MainWindow(QWidget *parent): view->show(); layout->addWidget(view); - // Progress - progress = new Progress(central); - - // Settings dialog - settings = new QDialog(this); + // Dialogs + progress = new Progress(this); // Tool bar actions @@ -80,13 +68,13 @@ MainWindow::MainWindow(QWidget *parent): #endif chaptersAction = addToolBarAction(this, SLOT(showChapters()), - "chapters", tr("Chapters")); + "chapters", tr("Chapters"), true); bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), - "bookmarks", tr("Bookmarks")); + "bookmarks", tr("Bookmarks"), true); infoAction = addToolBarAction(this, SLOT(showInfo()), - "info", tr("Book info")); + "info", tr("Book info"), true); libraryAction = addToolBarAction(this, SLOT(showLibrary()), - "library", tr("Library")); + "library", tr("Library"), true); #ifdef Q_WS_MAEMO_5 settingsAction = menuBar()->addAction(tr("Settings")); @@ -107,6 +95,8 @@ MainWindow::MainWindow(QWidget *parent): addToolBarSpace(); fullScreenAction = addToolBarAction(this, SLOT(showBig()), "view-fullscreen", tr("Full screen")); +#else + (void)addToolBarAction(this, SLOT(close()), "", tr("Exit")); #endif // Buttons on top of the book view @@ -118,42 +108,12 @@ MainWindow::MainWindow(QWidget *parent): this, SLOT(onCurrentBookChanged())); // Load library, upgrade it if needed - libraryProgress = new QProgressDialog(tr("Upgrading library"), "", 0, 0, this); - libraryProgress->reset(); - libraryProgress->setMinimumDuration(0); - libraryProgress->setWindowModality(Qt::WindowModal); - libraryProgress->setCancelButton(0); + libraryProgress = new ProgressDialog(tr("Upgrading library"), this); Library *library = Library::instance(); 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())); - connect(library, SIGNAL(beginLoad(int)), this, SLOT(onBeginLoad(int))); - connect(library, SIGNAL(loading(const QString &)), - this, SLOT(onLoading(const QString &))); - connect(library, SIGNAL(endLoad()), this, SLOT(onEndLoad())); - library->upgrade(); - library->load(); - - // Load book on command line, or load last read book, or load default book - if (QCoreApplication::arguments().size() == 2) { - QString path = QCoreApplication::arguments()[1]; - library->add(path); - QModelIndex index = library->find(path); - if (index.isValid()) { - library->setNowReading(index); - } - } else { - QModelIndex index = library->nowReading(); - if (index.isValid()) { - library->setNowReading(index); - } else { - if (!library->rowCount()) { - library->add(":/books/2BR02B.epub"); - } - library->setNowReading(library->index(0)); - } - } // Handle loading book parts connect(view, SIGNAL(partLoadStart(int)), this, SLOT(onPartLoadStart())); @@ -167,42 +127,78 @@ MainWindow::MainWindow(QWidget *parent): connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular())); // Handle settings changes - Settings *settings = Settings::instance(); - connect(settings, SIGNAL(valueChanged(const QString &)), + connect(Settings::instance(), SIGNAL(valueChanged(const QString &)), this, SLOT(onSettingsChanged(const QString &))); - settings->setValue("orientation", settings->value("orientation")); - settings->setValue("lightson", settings->value("lightson")); - settings->setValue("usevolumekeys", settings->value("usevolumekeys")); // Handle book view buttons connect(nextButton, SIGNAL(triggered()), this, SLOT(goToNextPage())); connect(previousButton, SIGNAL(triggered()), this, SLOT(goToPreviousPage())); + // Adopt view, show window + showRegular(); + #ifdef DORIAN_TEST_MODEL (void)new ModelTest(Library::instance(), this); #endif } -MainWindow::~MainWindow() +void MainWindow::initialize() { + TRACE; + Library *library = Library::instance(); + + // Upgrade library if needed, then load it + library->upgrade(); + library->load(); + + // Load book on command line, or load last read book, or load default book + if (QCoreApplication::arguments().size() == 2) { + QString path = QCoreApplication::arguments()[1]; + library->add(path); + QModelIndex index = library->find(path); + if (index.isValid()) { + library->setNowReading(index); + } + } else { + QModelIndex index = library->nowReading(); + if (index.isValid()) { + library->setNowReading(index); + } else { + if (!library->rowCount()) { + library->add(":/books/2BR02B.epub"); + } + SortedLibrary sorted; + library->setNowReading(sorted.mapToSource(sorted.index(0, 0))); + } + } } void MainWindow::onCurrentBookChanged() { + TRACE; setCurrentBook(Library::instance()->nowReading()); } void MainWindow::showRegular() { - Trace t("MainWindow::showRegular"); - fullScreenWindow->hide(); - fullScreenWindow->leaveChildren(); + 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(), PROGRESS_HEIGHT); + qDebug() << geo; + int y = geo.height() - progress->thickness(); +#if defined(Q_WS_MAEMO_5) + y -= toolBar->height(); +#endif + progress->setGeometry(0, y, geo.width(), y + progress->thickness()); + #if defined(Q_WS_MAEMO_5) previousButton->setGeometry(0, geo.height() - toolBar->height() - TranslucentButton::pixels, @@ -218,39 +214,55 @@ void MainWindow::showRegular() previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels, TranslucentButton::pixels, TranslucentButton::pixels); nextButton->setGeometry(geo.width() - TranslucentButton::pixels - 25, - toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels); + toolBar->height(), TranslucentButton::pixels, + TranslucentButton::pixels); #endif // Q_WS_MAEMO_5 qDebug() << "previousButton geometry" << previousButton->geometry(); + + fullScreenWindow->hide(); + show(); +#if defined(Q_OS_SYMBIAN) + activateWindow(); +#endif progress->flash(); - nextButton->show(); - previousButton->show(); - nextButton->flash(1500); - previousButton->flash(1500); + nextButton->flash(); + previousButton->flash(); } void MainWindow::showBig() { - Trace t("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(), PROGRESS_HEIGHT); + int y = screen.height() - progress->thickness(); + progress->setGeometry(0, y, screen.width(), y + progress->thickness()); #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); + TranslucentButton::pixels, TranslucentButton::pixels); #endif // Q_WS_MAEMO_5 previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels, TranslucentButton::pixels, TranslucentButton::pixels); - fullScreenWindow->takeChildren(view, otherChildren); +#ifdef Q_OS_SYMBIAN + hide(); +#endif fullScreenWindow->showFullScreen(); +#ifdef Q_OS_SYMBIAN + fullScreenWindow->activateWindow(); +#endif progress->flash(); - nextButton->flash(1500); - previousButton->flash(1500); + nextButton->flash(); + previousButton->flash(); } void MainWindow::setCurrentBook(const QModelIndex ¤t) @@ -289,7 +301,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)), @@ -300,36 +311,39 @@ void MainWindow::showBookmarks() void MainWindow::closeEvent(QCloseEvent *event) { - Trace t("MainWindow::closeEvent"); + TRACE; view->setLastBookmark(); - event->accept(); + AdopterWindow::closeEvent(event); } void MainWindow::onSettingsChanged(const QString &key) { -#ifdef Q_WS_MAEMO_5 +#if defined(Q_WS_MAEMO_5) if (key == "orientation") { - QString value = Settings::instance()->value(key).toString(); + 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); + fullScreenWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation, + false); + fullScreenWindow->setAttribute(Qt::WA_Maemo5PortraitOrientation, true); } else { setAttribute(Qt::WA_Maemo5PortraitOrientation, false); setAttribute(Qt::WA_Maemo5LandscapeOrientation, true); + fullScreenWindow->setAttribute(Qt::WA_Maemo5PortraitOrientation, + false); + fullScreenWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation, + true); } } else if (key == "lightson") { bool enable = Settings::instance()->value(key, false).toBool(); - qDebug() << "MainWindow::onSettingsChanged: lightson:" << enable; + qDebug() << "MainWindow::onSettingsChanged: lightson" << enable; killTimer(preventBlankingTimer); if (enable) { preventBlankingTimer = startTimer(29 * 1000); } - } else if (key == "usevolumekeys") { - bool value = Settings::instance()->value(key).toBool(); - qDebug() << "MainWindow::onSettingsChanged: usevolumekeys" << value; - grabZoomKeys(value); - fullScreenWindow->grabZoomKeys(value); } #else Q_UNUSED(key); @@ -338,15 +352,13 @@ void MainWindow::onSettingsChanged(const QString &key) void MainWindow::onPartLoadStart() { - Trace t("MainWindow::onPartLoadStart"); -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true); -#endif + TRACE; + Platform::instance()->showBusy(this, true); } void MainWindow::onPartLoadEnd(int index) { - Trace t("MainWindow::onPartLoadEnd"); + TRACE; bool enablePrevious = false; bool enableNext = false; Book *book = Library::instance()->book(mCurrent); @@ -358,20 +370,19 @@ void MainWindow::onPartLoadEnd(int index) enableNext = true; } } -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false); -#endif // Q_WS_MAEMO_5 + Platform::instance()->showBusy(this, false); } void MainWindow::onAddBookmark(const QString ¬e) { - Trace t("MainWindow:onAddBookmark"); + TRACE; view->addBookmark(note); + Platform::instance()->information(tr("Bookmarked current position"), this); } void MainWindow::onGoToBookmark(int index) { - Trace t("MainWindow::onGoToBookmark"); + TRACE; Book *book = Library::instance()->book(mCurrent); view->goToBookmark(book->bookmarks()[index]); } @@ -381,7 +392,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(); @@ -390,13 +400,14 @@ void MainWindow::showChapters() void MainWindow::onGoToChapter(int index) { - Trace t("MainWindow::onGoToChapter"); + TRACE; Book *book = Library::instance()->book(mCurrent); if (book) { - int partIndex = book->partFromChapter(index); + QString fragment; + int partIndex = book->partFromChapter(index, fragment); if (partIndex != -1) { - view->goToBookmark(Book::Bookmark(partIndex, 0)); + view->goToPart(partIndex, fragment); } } } @@ -416,28 +427,21 @@ void MainWindow::timerEvent(QTimerEvent *event) void MainWindow::resizeEvent(QResizeEvent *e) { - Trace t("MainWindow::resizeEvent"); - progress->setGeometry(QRect(0, 0, e->size().width(), 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(); - previousButton->flash(1500); - nextButton->flash(1500); + TRACE; + + if (bookView) { + qDebug() << "BookView geometry" << bookView->geometry(); + QRect geo = bookView->geometry(); + progress->setGeometry(geo.x(), + geo.y() + geo.height() - progress->thickness(), geo.width(), + progress->thickness()); + previousButton->setGeometry(geo.x(), + geo.y() + geo.height() - TranslucentButton::pixels, + TranslucentButton::pixels, TranslucentButton::pixels); + nextButton->setGeometry( + geo.x() + geo.width() - TranslucentButton::pixels, + geo.y(), TranslucentButton::pixels, TranslucentButton::pixels); + } QMainWindow::resizeEvent(e); } @@ -445,6 +449,7 @@ void MainWindow::about() { Dyalog *aboutDialog = new Dyalog(this, false); aboutDialog->setWindowTitle(tr("About Dorian")); + QString version = Platform::instance()->version(); QLabel *label = new QLabel(aboutDialog); label->setTextFormat(Qt::RichText); label->setOpenExternalLinks(true); @@ -452,25 +457,24 @@ void MainWindow::about() 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(DORIAN_VERSION)); + "Source code:
" + "garage.maemo.org/projects/dorian").arg(version)); aboutDialog->addWidget(label); aboutDialog->addStretch(); aboutDialog->show(); } - void MainWindow::goToNextPage() { - nextButton->flash(1500); - previousButton->flash(1500); + nextButton->flash(); + previousButton->flash(); view->goNextPage(); } void MainWindow::goToPreviousPage() { - nextButton->flash(1500); - previousButton->flash(1500); + nextButton->flash(); + previousButton->flash(); view->goPreviousPage(); } @@ -494,7 +498,6 @@ void MainWindow::onEndUpgrade() libraryProgress->reset(); } - void MainWindow::onBeginLoad(int total) { libraryProgress->setVisible(total > 0); @@ -514,4 +517,3 @@ void MainWindow::onEndLoad() libraryProgress->hide(); libraryProgress->reset(); } -