X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwindow.cpp;h=21194523b96fac76723ad0b37ab3dead38c5cbca;hb=b855b46f739479ca0d6dd15b73a4c56a8d8a2d2c;hp=639263145ec6e82eb85617496ab4e92cc16497fb;hpb=9ee78b359a52b91f772c6fe1df35a84a7aca6394;p=dorian

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6392631..2119452 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,11 +1,14 @@
 #include <QtGui>
-#include <QtDebug>
-#include <QDir>
-#include <QCoreApplication>
-#include <QFileInfo>
+#include <QEvent>
+
 #ifdef Q_WS_MAEMO_5
-#   include <QtMaemo5/QMaemo5InformationBox>
-#endif
+#   include <QtDBus>
+#   include <QtGui/QX11Info>
+#   include <X11/Xlib.h>
+#   include <X11/Xatom.h>
+#   include <mce/mode-names.h>
+#   include <mce/dbus-names.h>
+#endif // Q_WS_MAEMO_5
 
 #include "bookview.h"
 #include "book.h"
@@ -19,80 +22,133 @@
 #include "settings.h"
 #include "chaptersdialog.h"
 #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"
+#   include "modeltest.h"
 #endif
 
-#ifdef Q_WS_MAC
-#   define ICON_PREFIX ":/icons/mac/"
-#else
-#   define ICON_PREFIX ":/icons/"
-#endif
-
-const Qt::WindowFlags WIN_BIG_FLAGS =
-        Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-const int WIN_BIG_TIMER = 3000;
-
 MainWindow::MainWindow(QWidget *parent):
-        QMainWindow(parent), view(0), fullScreenWindow(0)
+    AdopterWindow(parent), view(0), preventBlankingTimer(-1)
 {
+    TRACE;
 #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
+    QFrame *central = new QFrame(this);
+    QVBoxLayout *layout = new QVBoxLayout(central);
+    layout->setMargin(0);
+    central->setLayout(layout);
+    setCentralWidget(central);
 
     // Book view
     view = new BookView(this);
-    setCentralWidget(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));
+
+    // Tool bar actions
+
+#ifdef Q_OS_SYMBIAN
+    fullScreenAction = addToolBarAction(this, SLOT(showBig()),
+                                        "view-fullscreen", tr("Full screen"));
 #endif
 
-    previousAction = addToolBarAction(view, SLOT(goPrevious()), "previous");
-    nextAction = addToolBarAction(view, SLOT(goNext()), "next");
-    chaptersAction = addToolBarAction(this, SLOT(showChapters()), "chapters");
-    bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()), "bookmarks");
+    chaptersAction = addToolBarAction(this, SLOT(showChapters()),
+                                      "chapters", tr("Chapters"), true);
+    bookmarksAction = addToolBarAction(this, SLOT(showBookmarks()),
+                                       "bookmarks", tr("Bookmarks"), true);
+    infoAction = addToolBarAction(this, SLOT(showInfo()),
+                                  "info", tr("Book info"), true);
+    libraryAction = addToolBarAction(this, SLOT(showLibrary()),
+                                     "library", tr("Library"), true);
 
 #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()));
+    QAction *aboutAction = menuBar()->addAction(tr("About"));
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 #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");
+                                      "preferences-system", tr("Settings"));
+    devToolsAction = addToolBarAction(this, SLOT(showDevTools()),
+                                      "developer", tr("Developer"));
+    addToolBarAction(this, SLOT(about()), "about", tr("About"));
 #endif // Q_WS_MAEMO_5
 
-    QFrame *frame = new QFrame(toolBar);
-    frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    toolBar->addWidget(frame);
+#ifndef Q_OS_SYMBIAN
+    addToolBarSpace();
+    fullScreenAction = addToolBarAction(this, SLOT(showBig()),
+                                        "view-fullscreen", tr("Full screen"));
+#else
+    (void)addToolBarAction(this, SLOT(close()), "", tr("Exit"));
+#endif
 
-    fullScreenAction = addToolBarAction(this, SLOT(showFullScreen()),
-                                        "view-fullscreen");
+    // 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(this);
+    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
+}
+
+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);
@@ -100,58 +156,59 @@ 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
-    connect(Settings::instance(), SIGNAL(valueChanged(const QString &)),
-            this, SLOT(onSettingsChanged(const QString &)));
-    Settings::instance()->setValue("orientation",
-                                   Settings::instance()->value("orientation"));
-
-    // Handle loading chapters
-    connect(view, SIGNAL(chapterLoadStart(int)),
-            this, SLOT(onChapterLoadStart()));
-    connect(view, SIGNAL(chapterLoadEnd(int)),
-            this, SLOT(onChapterLoadEnd(int)));
-
-#ifdef DORIAN_TEST_MODEL
-    (void)new ModelTest(Library::instance(), this);
-#endif
+    // Show in regular (non full-screen) mode
+    showRegular();
 }
 
 void MainWindow::onCurrentBookChanged()
 {
+    TRACE;
     setCurrentBook(Library::instance()->nowReading());
 }
 
-void MainWindow::showNormal()
+void MainWindow::showRegular()
 {
-    qDebug() << "MainWindow::showNormal";
-    view->setParent(this);
-    setCentralWidget(view);
+    TRACE;
+
+    // Re-parent children
+    fullScreenWindow->leaveBookView();
+    takeBookView(view, prog, prev, next);
+
+    fullScreenWindow->hide();
     show();
-    delete fullScreenWindow;
-    fullScreenWindow = 0;
+
+#if defined(Q_OS_SYMBIAN)
+    activateWindow();
+#endif
 }
 
-void MainWindow::showFullScreen()
+void MainWindow::showBig()
 {
-    qDebug() << "MainWindow::showFullscreen";
-    fullScreenWindow = new FullScreenWindow(view, this);
+    TRACE;
+
+    // Re-parent children
+    leaveBookView();
+    fullScreenWindow->takeBookView(view, prog, prev, next);
+
     fullScreenWindow->showFullScreen();
-    connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showNormal()));
+    hide();
+
+#ifdef Q_OS_SYMBIAN
+    fullScreenWindow->activateWindow();
+#endif
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -159,42 +216,30 @@ void MainWindow::setCurrentBook(const QModelIndex &current)
     mCurrent = current;
     Book *book = Library::instance()->book(current);
     view->setBook(book);
-    setWindowTitle(book? book->name(): tr("Dorian"));
-}
-
-QAction *MainWindow::addToolBarAction(const QObject *receiver,
-                                      const char *member,
-                                      const QString &name)
-{
-    return toolBar->
-        addAction(QIcon(ICON_PREFIX + name + ".png"), "", receiver, member);
+    setWindowTitle(book? book->shortName(): tr("Dorian"));
 }
 
 void MainWindow::showLibrary()
 {
-    LibraryDialog *dialog = new LibraryDialog(this);
-    dialog->show();
+    (new LibraryDialog(this))->show();
 }
 
 void MainWindow::showSettings()
 {
-    SettingsWindow *settings = new SettingsWindow(this);
-    settings->show();
+    (new SettingsWindow(this))->show();
 }
 
 void MainWindow::showInfo()
 {
     if (mCurrent.isValid()) {
-        InfoDialog *info =
-            new InfoDialog(Library::instance()->book(mCurrent), this);
-        info->exec();
+        (new InfoDialog(Library::instance()->book(mCurrent), this, false))->
+                exec();
     }
 }
 
 void MainWindow::showDevTools()
 {
-    DevTools *devTools = new DevTools();
-    devTools->exec();
+    (new DevTools())->exec();
 }
 
 void MainWindow::showBookmarks()
@@ -202,33 +247,41 @@ 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)
-{
-    qDebug() << "MainWindow::closeEvent";
-    view->setLastBookmark();
-    event->accept();
-}
-
 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_Maemo5PortraitOrientation, true);
             setAttribute(Qt::WA_Maemo5LandscapeOrientation, false);
-        }
-        else {
+            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;
+        killTimer(preventBlankingTimer);
+        if (enable) {
+            preventBlankingTimer = startTimer(29 * 1000);
         }
     }
 #else
@@ -236,15 +289,15 @@ void MainWindow::onSettingsChanged(const QString &key)
 #endif // Q_WS_MAEMO_5
 }
 
-void MainWindow::onChapterLoadStart()
+void MainWindow::onPartLoadStart()
 {
-#ifdef Q_WS_MAEMO_5
-    setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
-#endif
+    TRACE;
+    Platform::instance()->showBusy(this, true);
 }
 
-void MainWindow::onChapterLoadEnd(int index)
+void MainWindow::onPartLoadEnd(int index)
 {
+    TRACE;
     bool enablePrevious = false;
     bool enableNext = false;
     Book *book = Library::instance()->book(mCurrent);
@@ -252,28 +305,23 @@ void MainWindow::onChapterLoadEnd(int index)
         if (index > 0) {
             enablePrevious = true;
         }
-        if (index < (book->toc.size() - 1)) {
+        if (index < (book->parts.size() - 1)) {
             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 &note)
 {
-    view->addBookmark();
+    TRACE;
+    view->addBookmark(note);
+    Platform::instance()->information(tr("Bookmarked current position"), this);
 }
 
 void MainWindow::onGoToBookmark(int index)
 {
+    TRACE;
     Book *book = Library::instance()->book(mCurrent);
     view->goToBookmark(book->bookmarks()[index]);
 }
@@ -283,7 +331,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();
@@ -292,6 +339,100 @@ void MainWindow::showChapters()
 
 void MainWindow::onGoToChapter(int index)
 {
-    view->goToBookmark(Book::Bookmark(index, 0));
+    TRACE;
+
+    Book *book = Library::instance()->book(mCurrent);
+    if (book) {
+        QString fragment;
+        int partIndex = book->partFromChapter(index, fragment);
+        if (partIndex != -1) {
+            view->goToPart(partIndex, fragment);
+        }
+    }
+}
+
+void MainWindow::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == preventBlankingTimer) {
+#ifdef Q_WS_MAEMO_5
+        QDBusInterface mce(MCE_SERVICE, MCE_REQUEST_PATH,
+                           MCE_REQUEST_IF, QDBusConnection::systemBus());
+        mce.call(MCE_PREVENT_BLANK_REQ);
+#endif // Q_WS_MAEMO_5
+        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();
+    QLabel *label = new QLabel(aboutDialog);
+    label->setTextFormat(Qt::RichText);
+    label->setOpenExternalLinks(true);
+    label->setWordWrap(true);
+    label->setText(tr("<b>Dorian %1</b><br><br>Copyright &copy; 2010 "
+        "Akos Polster &lt;akos@pipacs.com&gt;<br>"
+        "Licensed under GNU General Public License, Version 3<br>"
+        "Source code:<br><a href='http://dorian.garage.maemo.org/'>"
+        "dorian.garage.maemo.org</a>").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();
+}