X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=8694cd24ebce2cad3f28cbf1e10a4a8f6a7652cb;hb=HEAD;hp=47319f1c0431998c6f5e71f5bf3c9757712be683;hpb=ed8d584a18548d3b0a1d537fe0e40afda38ac197;p=dorian diff --git a/mainwindow.cpp b/mainwindow.cpp index 47319f1..8694cd2 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,13 +1,11 @@ #include -#include -#include -#include -#include -#include +#include #ifdef Q_WS_MAEMO_5 -# include # include +# include +# include +# include # include # include #endif // Q_WS_MAEMO_5 @@ -26,28 +24,27 @@ #include "fullscreenwindow.h" #include "trace.h" #include "bookfinder.h" +#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 - -#ifdef Q_WS_MAC -# define ICON_PREFIX ":/icons/mac/" -#else -# define ICON_PREFIX ":/icons/" +# include "modeltest.h" #endif MainWindow::MainWindow(QWidget *parent): - QMainWindow(parent), view(0), preventBlankingTimer(-1) + AdopterWindow(parent), view(0), preventBlankingTimer(-1) { - Trace t("MainWindow::MainWindow"); + TRACE; #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow, true); #endif - setWindowTitle("Dorian"); // 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); @@ -55,56 +52,106 @@ MainWindow::MainWindow(QWidget *parent): setCentralWidget(central); // Book view - view = new BookView(central); - view->show(); - layout->addWidget(view); - - // Tool bar - setUnifiedTitleAndToolBarOnMac(true); - settings = new QDialog(this); - toolBar = addToolBar("controls"); - toolBar->setMovable(false); - toolBar->setFloatable(false); - toolBar->toggleViewAction()->setVisible(false); -#if defined(Q_WS_X11) && !defined(Q_WS_MAEMO_5) - toolBar->setIconSize(QSize(42, 42)); -#endif + view = new BookView(this); - previousAction = addToolBarAction(view, SLOT(goPrevious()), "previous"); - nextAction = addToolBarAction(view, SLOT(goNext()), "next"); - chaptersAction = addToolBarAction(this, SLOT(showChapters()), "chapters"); - bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), "bookmarks"); + // Tool bar actions + + chaptersAction = addToolBarAction(this, SLOT(showChapters()), + "chapters", tr("Chapters"), true); + bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), + "bookmarks", tr("Bookmarks"), true); + libraryAction = addToolBarAction(this, SLOT(showLibrary()), + "library", tr("Library"), false); #ifdef Q_WS_MAEMO_5 - infoAction = menuBar()->addAction(tr("Book details")); - connect(infoAction, SIGNAL(triggered()), this, SLOT(showInfo())); - libraryAction = menuBar()->addAction(tr("Library")); - connect(libraryAction, SIGNAL(triggered()), this, SLOT(showLibrary())); settingsAction = menuBar()->addAction(tr("Settings")); connect(settingsAction, SIGNAL(triggered()), this, SLOT(showSettings())); devToolsAction = menuBar()->addAction(tr("Developer")); connect(devToolsAction, SIGNAL(triggered()), this, SLOT(showDevTools())); #else - infoAction = addToolBarAction(this, SLOT(showInfo()), "document-properties"); - libraryAction = addToolBarAction(this, SLOT(showLibrary()), - "system-file-manager"); settingsAction = addToolBarAction(this, SLOT(showSettings()), - "preferences-system"); - devToolsAction = addToolBarAction(this, SLOT(showDevTools()), "developer"); -#endif // Q_WS_MAEMO_5 + "preferences-system", tr("Settings")); + devToolsAction = addToolBarAction(this, SLOT(showDevTools()), + "developer", tr("Developer")); +#endif - QFrame *frame = new QFrame(toolBar); - frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - toolBar->addWidget(frame); + rotateAction = addToolBarAction(this, SLOT(rotate()), + "rotate", tr("Rotate"), true); + addToolBarSpace(); + fullScreenAction = addToolBarAction(this, SLOT(showBig()), + "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 + addToolBarAction(this, SLOT(about()), "about", tr("About")); +#endif // defined(Q_WS_MAEMO_5) - fullScreenAction = addToolBarAction(this, SLOT(showBig()), "view-fullscreen"); +#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()), this, SLOT(onCurrentBookChanged())); - // Load book on command line, or load last read book, or load default book + // 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(upgrading(const QString &)), + this, SLOT(onUpgrading(const QString &))); + connect(library, SIGNAL(endUpgrade()), this, SLOT(onEndUpgrade())); + + // Handle loading book parts + connect(view, SIGNAL(partLoadStart(int)), this, SLOT(onPartLoadStart())); + connect(view, SIGNAL(partLoadEnd(int)), this, SLOT(onPartLoadEnd(int))); + + // Handle progress + connect(view, SIGNAL(progress(qreal)), prog, SLOT(setProgress(qreal))); + + // Shadow window for full screen reading + fullScreenWindow = new FullScreenWindow(); + connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular())); + + // Handle settings changes + connect(Settings::instance(), SIGNAL(valueChanged(const QString &)), + this, SLOT(onSettingsChanged(const QString &))); + + // Handle book view buttons + connect(next, SIGNAL(triggered()), this, SLOT(goToNextPage())); + connect(prev, SIGNAL(triggered()), this, SLOT(goToPreviousPage())); + +#ifdef DORIAN_TEST_MODEL + (void)new ModelTest(Library::instance(), this); +#endif +} + +MainWindow::~MainWindow() +{ + delete fullScreenWindow; +} + +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(); + + // 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); @@ -112,87 +159,54 @@ MainWindow::MainWindow(QWidget *parent): if (index.isValid()) { library->setNowReading(index); } - } - else { + } else { QModelIndex index = library->nowReading(); if (index.isValid()) { library->setNowReading(index); - } - else { + } else { if (!library->rowCount()) { - library->add(":/books/2 B R 0 2 B.epub"); + library->add(":/books/2BR02B.epub"); } - library->setNowReading(library->index(0)); + SortedLibrary sorted; + library->setNowReading(sorted.mapToSource(sorted.index(0, 0))); } } - - // Handle settings changes - Settings *settings = Settings::instance(); - connect(settings, SIGNAL(valueChanged(const QString &)), - this, SLOT(onSettingsChanged(const QString &))); - settings->setValue("orientation", settings->value("orientation")); - settings->setValue("lightson", settings->value("lightson")); - - // Handle loading chapters - connect(view, SIGNAL(chapterLoadStart(int)), - this, SLOT(onChapterLoadStart())); - connect(view, SIGNAL(chapterLoadEnd(int)), - this, SLOT(onChapterLoadEnd(int))); - - // Shadow window for full screen - fullScreenWindow = new FullScreenWindow(this); - connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular())); - - // Create thread for finding books in directories - bookFinder = new BookFinder(); - connect(bookFinder, SIGNAL(add(const QString &)), - library, SLOT(add(const QString &))); - connect(bookFinder, SIGNAL(remove(const QString &)), - library, SLOT(remove(const QString &))); - bookFinder->moveToThread(&bookFinderThread); - bookFinderThread.start(); - -#if 0 - bool ret = QMetaObject::invokeMethod( - bookFinder, - "find", - Q_ARG(QStringList, QStringList(QString("/Users/polster/Books"))), - Q_ARG(QStringList, library->bookPaths())); - t.trace(QString("Invoking BookFinder::find ") + (ret?"succeeded":"failed")); -#endif - -#ifdef DORIAN_TEST_MODEL - (void)new ModelTest(Library::instance(), this); -#endif -} - -MainWindow::~MainWindow() -{ - bookFinderThread.quit(); - bookFinderThread.wait(); - delete bookFinder; } void MainWindow::onCurrentBookChanged() { + TRACE; setCurrentBook(Library::instance()->nowReading()); } void MainWindow::showRegular() { - Trace t("MainWindow::showRegular"); + TRACE; + + view->setLastBookmark(); + fullScreenWindow->leaveBookView(); + takeBookView(view, prog, prev, next); + fullScreenWindow->hide(); - fullScreenWindow->leaveChild(); - view->setParent(centralWidget()); - centralWidget()->layout()->addWidget(view); + show(); + view->scheduleRestoreLastBookmark(); } void MainWindow::showBig() { - Trace t("MainWindow::showBig"); - centralWidget()->layout()->removeWidget(view); - fullScreenWindow->takeChild(view); + TRACE; + + view->setLastBookmark(); + leaveBookView(); + fullScreenWindow->takeBookView(view, prog, prev, next); + +#if defined(Q_WS_MAEMO_5) + fullScreenWindow->raise(); +#else + hide(); +#endif fullScreenWindow->showFullScreen(); + view->scheduleRestoreLastBookmark(); } void MainWindow::setCurrentBook(const QModelIndex ¤t) @@ -203,14 +217,6 @@ void MainWindow::setCurrentBook(const QModelIndex ¤t) setWindowTitle(book? book->shortName(): tr("Dorian")); } -QAction *MainWindow::addToolBarAction(const QObject *receiver, - const char *member, - const QString &name) -{ - return toolBar-> - addAction(QIcon(ICON_PREFIX + name + ".png"), "", receiver, member); -} - void MainWindow::showLibrary() { (new LibraryDialog(this))->show(); @@ -221,16 +227,18 @@ void MainWindow::showSettings() (new SettingsWindow(this))->show(); } -void MainWindow::showInfo() +void MainWindow::rotate() { - if (mCurrent.isValid()) { - (new InfoDialog(Library::instance()->book(mCurrent), this))->exec(); - } + 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() @@ -238,61 +246,47 @@ 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()), this, SLOT(onAddBookmark())); + connect(bookmarks, SIGNAL(addBookmark(const QString &)), + this, SLOT(onAddBookmark(const QString &))); connect(bookmarks, SIGNAL(goToBookmark(int)), this, SLOT(onGoToBookmark(int))); bookmarks->show(); } } -void MainWindow::closeEvent(QCloseEvent *event) -{ - Trace t("MainWindow::closeEvent"); - view->setLastBookmark(); - event->accept(); -} - void MainWindow::onSettingsChanged(const QString &key) { -#ifdef Q_WS_MAEMO_5 + TRACE; + qDebug() << "Key" << key; + if (key == "orientation") { - QString value = Settings::instance()->value(key).toString(); - Trace::trace(QString("MainWindow::onSettingsChanged: orientation %1"). - arg(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") { + QString value = Settings::instance()->value(key, + Platform::instance()->defaultOrientation()).toString(); + 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(); - Trace::trace(QString("MainWindow::onSettingsChanged: lightson: %1"). - arg(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() { - 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); @@ -304,26 +298,19 @@ void MainWindow::onPartLoadEnd(int index) enableNext = true; } } -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false); - previousAction->setIcon(QIcon(enablePrevious? - ":/icons/previous.png" : ":/icons/previous-disabled.png")); - nextAction->setIcon(QIcon(enableNext? - ":/icons/next.png": ":/icons/next-disabled.png")); -#endif // Q_WS_MAEMO_5 - previousAction->setEnabled(enablePrevious); - nextAction->setEnabled(enableNext); + Platform::instance()->showBusy(this, false); } -void MainWindow::onAddBookmark() +void MainWindow::onAddBookmark(const QString ¬e) { - Trace t("MainWindow:onAddBookmark"); - view->addBookmark(); + 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]); } @@ -333,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(); @@ -342,13 +328,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); } } } @@ -361,6 +348,88 @@ void MainWindow::timerEvent(QTimerEvent *event) MCE_REQUEST_IF, QDBusConnection::systemBus()); mce.call(MCE_PREVENT_BLANK_REQ); #endif // Q_WS_MAEMO_5 - Trace::trace("MainWindow::timerEvent: Prevent display blanking"); + qDebug() << "MainWindow::timerEvent: Prevent display blanking"; } + AdopterWindow::timerEvent(event); +} + +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); + label->setWordWrap(true); + 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(); +} + +void MainWindow::goToNextPage() +{ + next->flash(); + prev->flash(); + view->goNextPage(); +} + +void MainWindow::goToPreviousPage() +{ + next->flash(); + prev->flash(); + view->goPreviousPage(); +} + +void MainWindow::onBeginUpgrade(int total) +{ + libraryProgress->setVisible(total > 0); + libraryProgress->setWindowTitle(tr("Upgrading library")); + libraryProgress->setMaximum(total); +} + +void MainWindow::onUpgrading(const QString &path) +{ + libraryProgress->setLabelText(tr("Upgrading %1"). + arg(QFileInfo(path).fileName())); + libraryProgress->setValue(libraryProgress->value() + 1); +} + +void MainWindow::onEndUpgrade() +{ + libraryProgress->hide(); + libraryProgress->reset(); +} + +void MainWindow::onBeginLoad(int total) +{ + libraryProgress->setVisible(total > 0); + libraryProgress->setWindowTitle(tr("Loading library")); + libraryProgress->setMaximum(total); +} + +void MainWindow::onLoading(const QString &path) +{ + libraryProgress->setLabelText(tr("Loading %1"). + arg(QFileInfo(path).fileName())); + libraryProgress->setValue(libraryProgress->value() + 1); +} + +void MainWindow::onEndLoad() +{ + libraryProgress->hide(); + libraryProgress->reset(); }