Not much progress.
[dorian] / bookview.cpp
index 39870b5..840f878 100644 (file)
@@ -5,6 +5,10 @@
 #include <QDir>
 #include <QTimer>
 
+#ifdef Q_WS_MAEMO_5
+#   include <QAbstractKineticScroller>
+#endif
+
 #include "book.h"
 #include "bookview.h"
 #include "library.h"
@@ -21,7 +25,7 @@
 BookView::BookView(QWidget *parent):
     QWebView(parent), contentIndex(-1), mBook(0),
     restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false),
-    contentsHeight(0), decorated(false)
+    contentsHeight(0), scrollerMonitor(-1)
 {
     Trace t("BookView::BookView");
     settings()->setAttribute(QWebSettings::AutoLoadImages, true);
@@ -74,13 +78,14 @@ BookView::BookView(QWidget *parent):
     s->setValue("scheme", s->value("scheme", "default"));
     setBook(0);
 
-    extractIcons();
+#ifdef Q_WS_MAEMO_5
+    scroller = property("kineticScroller").value<QAbstractKineticScroller *>();
+#endif
 }
 
 BookView::~BookView()
 {
     Trace t("BookView::~BookView");
-    removeIcons();
 }
 
 void BookView::loadContent(int index)
@@ -99,7 +104,6 @@ void BookView::loadContent(int index)
     }
     else {
         loaded = false;
-        decorated = false;
         emit partLoadStart(index);
         load(QUrl(contentFile));
     }
@@ -141,13 +145,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()
@@ -156,8 +166,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);
     }
 }
@@ -175,7 +185,7 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark)
     Trace t("BookView::goToBookmark");
     if (mBook) {
         if (bookmark.part != contentIndex) {
-            t.trace(QString("Loading new part %1").arg(bookmark.part));
+            qDebug () << "Loading new part" << bookmark.part;
             mBook->setLastBookmark(bookmark.part, bookmark.pos);
             restorePositionAfterLoad = true;
             positionAfterLoad = bookmark.pos;
@@ -190,11 +200,10 @@ 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 partLoadEnd(contentIndex);
     showProgress();
@@ -249,7 +258,13 @@ 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 (scroller) {
+        scrollerMonitor = startTimer(250);
+    }
+#else
+    // Handle mouse presses on the scroll bar
     QWebFrame *frame = page()->mainFrame();
     if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) {
         e->accept();
@@ -259,12 +274,6 @@ void BookView::mousePressEvent(QMouseEvent *e)
     e->ignore();
 }
 
-void BookView::mouseReleaseEvent(QMouseEvent *e)
-{
-    QWebView::mouseReleaseEvent(e);
-    showProgress();
-}
-
 void BookView::wheelEvent(QWheelEvent *e)
 {
     QWebView::wheelEvent(e);
@@ -279,86 +288,28 @@ void BookView::addBookmark()
     }
     int y = page()->mainFrame()->scrollPosition().y();
     int height = page()->mainFrame()->contentsSize().height();
-    t.trace(QString().setNum((qreal)y / (qreal)height));
+    qDebug() << ((qreal)y / (qreal)height);
     mBook->addBookmark(contentIndex, (qreal)y / (qreal)height);
     update();
 }
 
-void BookView::addNavigationBar()
-{
-    Trace t("BookView::addNavigationBar");
-    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->parts.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;
-}
-
 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 {
-            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();
@@ -390,12 +341,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);
     }
 }
 
@@ -421,8 +370,8 @@ void BookView::goToPosition(qreal position)
     int scrollPos = (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()
@@ -433,3 +382,65 @@ void BookView::showProgress()
         emit progress(mBook->getProgress(contentIndex, pos));
     }
 }
+
+void BookView::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == scrollerMonitor) {
+#ifdef Q_WS_MAEMO_5
+        if (scroller &&
+            ((scroller->state() == QAbstractKineticScroller::AutoScrolling) ||
+             (scroller->state() == QAbstractKineticScroller::Pushing))) {
+            showProgress();
+        } else {
+            killTimer(scrollerMonitor);
+        }
+#endif // Q_WS_MAEMO_5
+    }
+}
+
+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();
+    }
+}