X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=bookview.cpp;h=cd6ba22b0f0102e24d81b01559601ebf4df16238;hb=f43cb8ff468e9d6ea889cf9a7b7f7abf2523208d;hp=fe43e02fb347810cfc1a2b7a979c3a433b4397b3;hpb=36a875cc735d49f85f02a325c915979863d2b063;p=dorian

diff --git a/bookview.cpp b/bookview.cpp
index fe43e02..cd6ba22 100644
--- a/bookview.cpp
+++ b/bookview.cpp
@@ -5,22 +5,23 @@
 #include <QDir>
 #include <QTimer>
 
+#if defined(Q_WS_MAEMO_5)
+#   include <QAbstractKineticScroller>
+#elif defined(Q_OS_SYMBIAN)
+#   include "flickcharm.h"
+#endif
+
 #include "book.h"
 #include "bookview.h"
 #include "library.h"
 #include "settings.h"
 #include "trace.h"
-
-#ifdef Q_WS_MAC
-#   define ICON_PREFIX ":/icons/mac/"
-#else
-#   define ICON_PREFIX ":/icons/"
-#endif
+#include "progress.h"
 
 BookView::BookView(QWidget *parent):
     QWebView(parent), contentIndex(-1), mBook(0),
     restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false),
-    contentsHeight(0), decorated(false)
+    contentsHeight(0)
 {
     Trace t("BookView::BookView");
     settings()->setAttribute(QWebSettings::AutoLoadImages, true);
@@ -40,12 +41,12 @@ BookView::BookView(QWidget *parent):
     settings()->setDefaultTextEncoding("utf-8");
     page()->setContentEditable(false);
 
-#if defined(Q_WS_MAEMO_5)
-    // Suppress unwanted text selections on Maemo
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
+    // Suppress unwanted text selections on Maemo and Symbian
     installEventFilter(this);
 #endif
     QWebFrame *frame = page()->mainFrame();
-#if defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
 #endif
     frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
@@ -73,13 +74,18 @@ BookView::BookView(QWidget *parent):
     s->setValue("scheme", s->value("scheme", "default"));
     setBook(0);
 
-    extractIcons();
+#if defined(Q_WS_MAEMO_5)
+    scrollerMonitor = 0;
+    scroller = property("kineticScroller").value<QAbstractKineticScroller *>();
+#elif defined(Q_OS_SYMBIAN)
+    FlickCharm *charm = new FlickCharm(this);
+    charm->activateOn(this);
+#endif
 }
 
 BookView::~BookView()
 {
     Trace t("BookView::~BookView");
-    removeIcons();
 }
 
 void BookView::loadContent(int index)
@@ -88,19 +94,21 @@ void BookView::loadContent(int index)
     if (!mBook) {
         return;
     }
-    if ((index < 0) || (index >= mBook->toc.size())) {
+    if ((index < 0) || (index >= mBook->parts.size())) {
         return;
     }
 
-    QString contentFile(mBook->content[mBook->toc[index]].href);
-    if (mBook->toc[index] == "error") {
+    QString contentFile(mBook->content[mBook->parts[index]].href);
+    if (mBook->parts[index] == "error") {
         setHtml(contentFile);
     }
     else {
         loaded = false;
-        decorated = false;
-        emit chapterLoadStart(index);
-        load(QUrl(contentFile));
+        emit partLoadStart(index);
+        QUrl u = QUrl::fromLocalFile(QDir(mBook->rootPath()).
+                                     absoluteFilePath(contentFile));
+        qDebug() << "Loading" << u;
+        load(u);
     }
     contentIndex = index;
 }
@@ -117,8 +125,13 @@ void BookView::setBook(Book *book)
         mBook = book;
         if (book) {
             contentIndex = -1;
-            book->open();
-            restoreLastBookmark();
+            if (book->open()) {
+                restoreLastBookmark();
+            } else {
+                mBook = 0;
+                contentIndex = 0;
+                setHtml(tr("Failed to open book"));
+            }
         }
         else {
             contentIndex = 0;
@@ -135,13 +148,19 @@ Book *BookView::book()
 void BookView::goPrevious()
 {
     Trace t("BookView::goPrevious");
-    loadContent(contentIndex - 1);
+    if (mBook && (contentIndex > 0)) {
+        mBook->setLastBookmark(contentIndex - 1, 0);
+        loadContent(contentIndex - 1);
+    }
 }
 
 void BookView::goNext()
 {
     Trace t("BookView::goNext");
-    loadContent(contentIndex + 1);
+    if (mBook && (contentIndex < (mBook->parts.size() - 1))) {
+        mBook->setLastBookmark(contentIndex + 1, 0);
+        loadContent(contentIndex + 1);
+    }
 }
 
 void BookView::setLastBookmark()
@@ -150,8 +169,8 @@ void BookView::setLastBookmark()
     if (mBook) {
         int height = contentsHeight;
         int pos = page()->mainFrame()->scrollPosition().y();
-        t.trace(QString("At %1 (%2%, height %3)").
-                arg(pos).arg((qreal)pos / (qreal)height * 100).arg(height));
+        qDebug() << QString("At %1 (%2%, height %3)").
+                arg(pos).arg((qreal)pos / (qreal)height * 100).arg(height);
         mBook->setLastBookmark(contentIndex, (qreal)pos / (qreal)height);
     }
 }
@@ -168,12 +187,12 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark)
 {
     Trace t("BookView::goToBookmark");
     if (mBook) {
-        if (bookmark.chapter != contentIndex) {
-            t.trace(QString("Loading new chapter %1").arg(bookmark.chapter));
-            mBook->setLastBookmark(bookmark.chapter, bookmark.pos);
+        if (bookmark.part != contentIndex) {
+            qDebug () << "Loading new part" << bookmark.part;
+            mBook->setLastBookmark(bookmark.part, bookmark.pos);
             restorePositionAfterLoad = true;
             positionAfterLoad = bookmark.pos;
-            loadContent(bookmark.chapter);
+            loadContent(bookmark.part);
         } else {
             goToPosition(bookmark.pos);
         }
@@ -184,13 +203,13 @@ void BookView::onLoadFinished(bool ok)
 {
     Trace t("BookView::onLoadFinished");
     if (!ok) {
-        t.trace("Not OK");
+        qDebug() << "Not OK";
         return;
     }
     loaded = true;
-    addNavigationBar();
     onSettingsChanged("scheme");
-    emit chapterLoadEnd(contentIndex);
+    emit partLoadEnd(contentIndex);
+    showProgress();
 }
 
 void BookView::onSettingsChanged(const QString &key)
@@ -230,11 +249,11 @@ void BookView::paintEvent(QPaintEvent *e)
     QPixmap bookmarkPixmap = QPixmap::fromImage(bookmarkImage);
     QPainter painter(this);
     foreach (Book::Bookmark b, mBook->bookmarks()) {
-        if (b.chapter != contentIndex) {
+        if (b.part != contentIndex) {
             continue;
         }
         int height = contentsHeight;
-        int bookmarkPos = (qreal)height * (qreal)b.pos;
+        int bookmarkPos = (int)((qreal)height * (qreal)b.pos);
         painter.drawPixmap(2, bookmarkPos - scrollPos.y(), bookmarkPixmap);
     }
 }
@@ -242,7 +261,17 @@ void BookView::paintEvent(QPaintEvent *e)
 void BookView::mousePressEvent(QMouseEvent *e)
 {
     QWebView::mousePressEvent(e);
-#ifndef Q_WS_MAEMO_5
+#ifdef Q_WS_MAEMO_5
+    // Start monitoring kinetic scroll
+    if (scrollerMonitor) {
+        killTimer(scrollerMonitor);
+        scrollerMonitor = 0;
+    }
+    if (scroller) {
+        scrollerMonitor = startTimer(500);
+    }
+#else
+    // Handle mouse presses on the scroll bar
     QWebFrame *frame = page()->mainFrame();
     if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) {
         e->accept();
@@ -252,53 +281,23 @@ void BookView::mousePressEvent(QMouseEvent *e)
     e->ignore();
 }
 
-void BookView::addBookmark()
+void BookView::wheelEvent(QWheelEvent *e)
 {
-    Trace t("BookView::addBookmark");
-    int y = page()->mainFrame()->scrollPosition().y();
-    int height = page()->mainFrame()->contentsSize().height();
-    t.trace(QString().setNum((qreal)y / (qreal)height));
-    mBook->addBookmark(contentIndex, (qreal)y / (qreal)height);
-    update();
+    QWebView::wheelEvent(e);
+    showProgress();
 }
 
-void BookView::addNavigationBar()
+void BookView::addBookmark(const QString &note)
 {
-    Trace t("BookView::addNavigationBar");
+    Trace t("BookView::addBookmark");
     if (!mBook) {
         return;
     }
-
-    QString naviPrev =
-            "<a href=\"javascript:bv.goPrevious();\">"
-            "<img width=\"95\" height=\"95\" style=\"float:left;clear:none;\" "
-            "src=\"file://"
-            + tmpPath() +
-            "/previous.png\" />"
-            "</a>";
-    QString naviNext =
-            "<a href=\"javascript:bv.goNext();\">"
-            "<img width=\"95\" height=\"95\" style=\"float:right;clear:none;\" "
-            "src=\"file://"
-            + tmpPath() +
-            "/next.png\" />"
-            "</a>";
-    if (contentIndex == 0) {
-        naviPrev = "";
-    }
-    if (contentIndex >= mBook->toc.size() - 1) {
-        naviNext = "";
-    }
-
-    QWebFrame *frame = page()->currentFrame();
-    QString headerScript = "document.body.innerHTML = '" +
-        naviPrev + naviNext + "<br />" + "' + document.body.innerHTML;";
-    QString trailerScript = "document.body.innerHTML += '<br /><br />" +
-        naviPrev + naviNext + "';";
-
-    frame->evaluateJavaScript(headerScript);
-    frame->evaluateJavaScript(trailerScript);
-    decorated = true;
+    int y = page()->mainFrame()->scrollPosition().y();
+    int height = page()->mainFrame()->contentsSize().height();
+    qDebug() << ((qreal)y / (qreal)height);
+    mBook->addBookmark(contentIndex, (qreal)y / (qreal)height, note);
+    update();
 }
 
 QString BookView::tmpPath()
@@ -306,43 +305,28 @@ QString BookView::tmpPath()
     return QDir::tempPath() + "/dorian";
 }
 
-void BookView::extractIcons()
-{
-    QFile next(ICON_PREFIX + QString("/next.png"));
-    QFile prev(ICON_PREFIX + QString("/previous.png"));
-
-    QDir().mkpath(tmpPath());
-    next.copy(tmpPath() + "/next.png");
-    prev.copy(tmpPath() + "/previous.png");
-}
-
-void BookView::removeIcons()
-{
-    QFile(ICON_PREFIX + QString("/next.png")).remove();
-    QFile(ICON_PREFIX + QString("/previous.png")).remove();
-    QDir().rmpath(tmpPath());
-}
-
 bool BookView::eventFilter(QObject *o, QEvent *e)
 {
-#if 0
     if (e->type() != QEvent::Paint && e->type() != QEvent::MouseMove) {
         if (e->type() == QEvent::Resize) {
-            Trace::trace(QString("BookView::eventFilter QEvent::Resize to %1").
-                         arg(page()->mainFrame()->contentsSize().height()));
+            qDebug() << "BookView::eventFilter QEvent::Resize to"
+                    << page()->mainFrame()->contentsSize().height();
+        } else if (e->type() == QEvent::Timer) {
+            qDebug() << "BookView::eventFilter" << "QEvent::Timer"
+                    << ((QTimerEvent *)e)->timerId();
         } else {
-            Trace::trace(QString("BookView::eventFilter %1").
-                         arg(Trace::event(e->type())));
+            qDebug() << "BookView::eventFilter" << Trace::event(e->type());
         }
     }
-#endif
 
+    // Work around Qt bug that sometimes selects web view contents during swipe
     switch (e->type()) {
     case QEvent::MouseButtonPress:
         emit suppressedMouseButtonPress();
         mousePressed = true;
         break;
     case QEvent::MouseButtonRelease:
+        showProgress();
         mousePressed = false;
         break;
     case QEvent::MouseMove:
@@ -367,12 +351,10 @@ void BookView::addJavaScriptObjects()
 void BookView::onContentsSizeChanged(const QSize &size)
 {
     contentsHeight = size.height();
-    if (decorated) {
-        if (restorePositionAfterLoad) {
-            Trace::trace("BookView::onContentSizeChanged: Time to restore");
-            restorePositionAfterLoad = false;
-            goToPosition(positionAfterLoad);
-        }
+    if (restorePositionAfterLoad) {
+        qDebug() << "BookView::onContentSizeChanged: Time to restore";
+        restorePositionAfterLoad = false;
+        goToPosition(positionAfterLoad);
     }
 }
 
@@ -395,9 +377,81 @@ void BookView::enterEvent(QEvent *e)
 
 void BookView::goToPosition(qreal position)
 {
-    int scrollPos = (qreal)contentsHeight * position;
+    int scrollPos = (int)((qreal)contentsHeight * position);
     page()->mainFrame()->setScrollPosition(QPoint(0, scrollPos));
     // FIXME: update();
-    Trace::trace(QString("BookView::goToPosition: To %1 (%2%, height %3)").
-            arg(scrollPos).arg(position * 100).arg(contentsHeight));
+    qDebug() << "BookView::goToPosition: To" << scrollPos << "("
+            << (position * 100) << "%, height" << contentsHeight << ")";
+}
+
+void BookView::showProgress()
+{
+    if (mBook) {
+        qreal pos = (qreal)(page()->mainFrame()->scrollPosition().y()) /
+                    (qreal)contentsHeight;
+        emit progress(mBook->getProgress(contentIndex, pos));
+    }
+}
+
+void BookView::timerEvent(QTimerEvent *e)
+{
+#ifdef Q_WS_MAEMO_5
+    if (e->timerId() == scrollerMonitor) {
+        if (scroller &&
+            ((scroller->state() == QAbstractKineticScroller::AutoScrolling) ||
+             (scroller->state() == QAbstractKineticScroller::Pushing))) {
+            showProgress();
+        } else {
+            killTimer(scrollerMonitor);
+        }
+    }
+#endif
+    QWebView::timerEvent(e);
+}
+
+void BookView::keyPressEvent(QKeyEvent* event)
+{
+    switch (event->key()) {
+    case Qt::Key_F7:
+        goNextPage();
+        event->accept();
+        break;
+    case Qt::Key_F8:
+        goPreviousPage();
+        event->accept();
+        break;
+    default:
+        ;
+    }
+    QWebView::keyPressEvent(event);
+}
+
+void BookView::goPreviousPage()
+{
+    QWebFrame *frame = page()->mainFrame();
+    int pos = frame->scrollPosition().y();
+    frame->scroll(0, -height());
+    if (pos == frame->scrollPosition().y()) {
+        if (contentIndex > 0) {
+            Book::Bookmark bookmark(contentIndex - 1, 1.0);
+            mBook->setLastBookmark(contentIndex - 1, 1.0);
+            goToBookmark(bookmark);
+        }
+    } else {
+        showProgress();
+    }
+}
+
+void BookView::goNextPage()
+{
+    Trace t("BookView::goNextPage");
+    QWebFrame *frame = page()->mainFrame();
+    int pos = frame->scrollPosition().y();
+    frame->scroll(0, height());
+    if (pos == frame->scrollPosition().y()) {
+        goNext();
+    } else {
+        setLastBookmark();
+        showProgress();
+    }
 }