Jump to exact position on page, as identified by TOC entry. Handle
[dorian] / bookview.cpp
index 66cf03f..e11f56e 100644 (file)
@@ -1,12 +1,11 @@
-#include <QDebug>
-#include <QWebFrame>
-#include <QMouseEvent>
-#include <QFile>
 #include <QDir>
-#include <QTimer>
+#include <QtGui>
+#include <QWebFrame>
 
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5)
 #   include <QAbstractKineticScroller>
+#elif defined(Q_OS_SYMBIAN)
+#   include "flickcharm.h"
 #endif
 
 #include "book.h"
 #include "settings.h"
 #include "trace.h"
 #include "progress.h"
-
-#ifdef Q_WS_MAC
-#   define ICON_PREFIX ":/icons/mac/"
-#else
-#   define ICON_PREFIX ":/icons/"
-#endif
+#include "progressdialog.h"
+#include "platform.h"
 
 BookView::BookView(QWidget *parent):
     QWebView(parent), contentIndex(-1), mBook(0),
     restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false),
-    contentsHeight(0), scrollerMonitor(-1)
+    contentsHeight(0)
 {
-    Trace t("BookView::BookView");
+    TRACE;
     settings()->setAttribute(QWebSettings::AutoLoadImages, true);
     settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
     settings()->setAttribute(QWebSettings::JavaEnabled, false);
@@ -35,7 +30,8 @@ BookView::BookView(QWidget *parent):
     settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
     settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, false);
     settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
-    settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, false);
+    settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled,
+                             false);
     settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled,
                              false);
     settings()->setAttribute(QWebSettings::LocalStorageEnabled, false);
@@ -45,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);
@@ -66,31 +62,27 @@ BookView::BookView(QWidget *parent):
             this, SLOT(onSettingsChanged(const QString &)));
     Settings *s = Settings::instance();
     s->setValue("zoom", s->value("zoom", 160));
-    s->setValue("font", s->value("font",
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_X11)
-                                 "Serif"
-#elif defined(Q_WS_MAC)
-                                 "Hoefler Text"
-#else
-                                 "Times New Roman"
-#endif
-                                 ));
+    s->setValue("font", s->value("font", Platform::defaultFont()));
     s->setValue("scheme", s->value("scheme", "default"));
     setBook(0);
 
-#ifdef Q_WS_MAEMO_5
+#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");
+    TRACE;
 }
 
 void BookView::loadContent(int index)
 {
-    Trace t("BookView::loadContent");
+    TRACE;
     if (!mBook) {
         return;
     }
@@ -101,18 +93,20 @@ void BookView::loadContent(int index)
     QString contentFile(mBook->content[mBook->parts[index]].href);
     if (mBook->parts[index] == "error") {
         setHtml(contentFile);
-    }
-    else {
+    } else {
         loaded = false;
         emit partLoadStart(index);
-        load(QUrl(mBook->rootPath() + "/" + contentFile));
+        QUrl u = QUrl::fromLocalFile(QDir(mBook->rootPath()).
+                                     absoluteFilePath(contentFile));
+        qDebug() << "Loading" << u;
+        load(u);
     }
     contentIndex = index;
 }
 
 void BookView::setBook(Book *book)
 {
-    Trace t("BookView::setBook");
+    TRACE;
 
     // Save position in current book
     setLastBookmark();
@@ -144,7 +138,7 @@ Book *BookView::book()
 
 void BookView::goPrevious()
 {
-    Trace t("BookView::goPrevious");
+    TRACE;
     if (mBook && (contentIndex > 0)) {
         mBook->setLastBookmark(contentIndex - 1, 0);
         loadContent(contentIndex - 1);
@@ -153,7 +147,7 @@ void BookView::goPrevious()
 
 void BookView::goNext()
 {
-    Trace t("BookView::goNext");
+    TRACE;
     if (mBook && (contentIndex < (mBook->parts.size() - 1))) {
         mBook->setLastBookmark(contentIndex + 1, 0);
         loadContent(contentIndex + 1);
@@ -162,7 +156,7 @@ void BookView::goNext()
 
 void BookView::setLastBookmark()
 {
-    Trace t("BookView::setLastBookmark");
+    TRACE;
     if (mBook) {
         int height = contentsHeight;
         int pos = page()->mainFrame()->scrollPosition().y();
@@ -174,7 +168,7 @@ void BookView::setLastBookmark()
 
 void BookView::restoreLastBookmark()
 {
-    Trace t("BookView::restoreLastBookmark");
+    TRACE;
     if (mBook) {
         goToBookmark(mBook->lastBookmark());
     }
@@ -182,7 +176,7 @@ void BookView::restoreLastBookmark()
 
 void BookView::goToBookmark(const Book::Bookmark &bookmark)
 {
-    Trace t("BookView::goToBookmark");
+    TRACE;
     if (mBook) {
         if (bookmark.part != contentIndex) {
             qDebug () << "Loading new part" << bookmark.part;
@@ -196,9 +190,36 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark)
     }
 }
 
+void BookView::goToPart(int part, const QString &fragment)
+{
+    TRACE;
+    if (mBook) {
+        if (part != contentIndex) {
+            qDebug() << "Loading new part" << part;
+            restoreFragmentAfterLoad = true;
+            fragmentAfterLoad = fragment;
+            loadContent(part);
+        } else {
+            goToFragment(fragment);
+            showProgress();
+        }
+    }
+}
+
+void BookView::goToFragment(const QString &fragment)
+{
+    TRACE;
+    if (!fragment.isEmpty()) {
+        QVariant ret = page()->mainFrame()->evaluateJavaScript(
+                QString("window.location='") + fragment + "'");
+        qDebug() << ret;
+        setLastBookmark();
+    }
+}
+
 void BookView::onLoadFinished(bool ok)
 {
-    Trace t("BookView::onLoadFinished");
+    TRACE;
     if (!ok) {
         qDebug() << "Not OK";
         return;
@@ -211,12 +232,14 @@ void BookView::onLoadFinished(bool ok)
 
 void BookView::onSettingsChanged(const QString &key)
 {
-    Trace t("BookView::onSettingsChanged " + key);
+    TRACE;
+    qDebug() << key << Settings::instance()->value(key);
+
     if (key == "zoom") {
         setZoomFactor(Settings::instance()->value(key).toFloat() / 100.);
     }
     else if (key == "font") {
-        QString face = Settings::instance()->value("font").toString();
+        QString face = Settings::instance()->value(key).toString();
         settings()->setFontFamily(QWebSettings::StandardFont, face);
     }
     else if (key == "scheme") {
@@ -250,7 +273,7 @@ void BookView::paintEvent(QPaintEvent *e)
             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);
     }
 }
@@ -260,8 +283,12 @@ void BookView::mousePressEvent(QMouseEvent *e)
     QWebView::mousePressEvent(e);
 #ifdef Q_WS_MAEMO_5
     // Start monitoring kinetic scroll
+    if (scrollerMonitor) {
+        killTimer(scrollerMonitor);
+        scrollerMonitor = 0;
+    }
     if (scroller) {
-        scrollerMonitor = startTimer(250);
+        scrollerMonitor = startTimer(500);
     }
 #else
     // Handle mouse presses on the scroll bar
@@ -280,16 +307,16 @@ void BookView::wheelEvent(QWheelEvent *e)
     showProgress();
 }
 
-void BookView::addBookmark()
+void BookView::addBookmark(const QString &note)
 {
-    Trace t("BookView::addBookmark");
+    TRACE;
     if (!mBook) {
         return;
     }
     int y = page()->mainFrame()->scrollPosition().y();
     int height = page()->mainFrame()->contentsSize().height();
     qDebug() << ((qreal)y / (qreal)height);
-    mBook->addBookmark(contentIndex, (qreal)y / (qreal)height);
+    mBook->addBookmark(contentIndex, (qreal)y / (qreal)height, note);
     update();
 }
 
@@ -304,6 +331,9 @@ bool BookView::eventFilter(QObject *o, QEvent *e)
         if (e->type() == QEvent::Resize) {
             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 {
             qDebug() << "BookView::eventFilter" << Trace::event(e->type());
         }
@@ -340,17 +370,24 @@ void BookView::addJavaScriptObjects()
 
 void BookView::onContentsSizeChanged(const QSize &size)
 {
+    TRACE;
     contentsHeight = size.height();
-    if (restorePositionAfterLoad) {
-        qDebug() << "BookView::onContentSizeChanged: Time to restore";
-        restorePositionAfterLoad = false;
+    if (restoreFragmentAfterLoad) {
+        qDebug() << "Restorint to fragment" << fragmentAfterLoad;
+        goToFragment(fragmentAfterLoad);
+    } else if (restorePositionAfterLoad) {
+        qDebug() << "Restoring to position";
         goToPosition(positionAfterLoad);
     }
+    restorePositionAfterLoad = false;
+    restoreFragmentAfterLoad = false;
 }
 
+#ifdef Q_WS_MAEMO_5
+
 void BookView::leaveEvent(QEvent *e)
 {
-    Trace t("BookView::leaveEvent");
+    TRACE;
     // Save current position, to be restored later
     setLastBookmark();
     QWebView::leaveEvent(e);
@@ -358,16 +395,18 @@ void BookView::leaveEvent(QEvent *e)
 
 void BookView::enterEvent(QEvent *e)
 {
-    Trace t("BookView::enterEvent");
+    TRACE;
     // Restore position saved at Leave event. This seems to be required,
     // after temporarily switching from portrait to landscape and back
     restoreLastBookmark();
     QWebView::enterEvent(e);
 }
 
+#endif // Q_WS_MAEMO_5
+
 void BookView::goToPosition(qreal position)
 {
-    int scrollPos = (qreal)contentsHeight * position;
+    int scrollPos = (int)((qreal)contentsHeight * position);
     page()->mainFrame()->setScrollPosition(QPoint(0, scrollPos));
     // FIXME: update();
     qDebug() << "BookView::goToPosition: To" << scrollPos << "("
@@ -385,8 +424,8 @@ void BookView::showProgress()
 
 void BookView::timerEvent(QTimerEvent *e)
 {
-    if (e->timerId() == scrollerMonitor) {
 #ifdef Q_WS_MAEMO_5
+    if (e->timerId() == scrollerMonitor) {
         if (scroller &&
             ((scroller->state() == QAbstractKineticScroller::AutoScrolling) ||
              (scroller->state() == QAbstractKineticScroller::Pushing))) {
@@ -394,8 +433,9 @@ void BookView::timerEvent(QTimerEvent *e)
         } else {
             killTimer(scrollerMonitor);
         }
-#endif // Q_WS_MAEMO_5
     }
+#endif
+    QWebView::timerEvent(e);
 }
 
 void BookView::keyPressEvent(QKeyEvent* event)
@@ -433,7 +473,7 @@ void BookView::goPreviousPage()
 
 void BookView::goNextPage()
 {
-    Trace t("BookView::goNextPage");
+    TRACE;
     QWebFrame *frame = page()->mainFrame();
     int pos = frame->scrollPosition().y();
     frame->scroll(0, height());