X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=bookview.cpp;h=aaa3326973bb862920968e0466a0550dee293b16;hb=166f29f9d4d6e2ed8080e78d38f45edd68315be4;hp=a5bbfe0b31f90a7ecb1c63be20a068f59164fbc3;hpb=1b0510dddf070b07a73d893597e9634ed9f6e82f;p=dorian diff --git a/bookview.cpp b/bookview.cpp index a5bbfe0..aaa3326 100644 --- a/bookview.cpp +++ b/bookview.cpp @@ -1,12 +1,10 @@ -#include -#include -#include -#include #include -#include +#include +#include -#ifdef Q_WS_MAEMO_5 -# include +#if defined(Q_OS_SYMBIAN) +# include "mediakeysobserver.h" +# include "flickcharm.h" #endif #include "book.h" @@ -15,19 +13,16 @@ #include "settings.h" #include "trace.h" #include "progress.h" +#include "progressdialog.h" +#include "platform.h" -#ifdef Q_WS_MAC -# define ICON_PREFIX ":/icons/mac/" -#else -# define ICON_PREFIX ":/icons/" -#endif - -BookView::BookView(QWidget *parent): - QWebView(parent), contentIndex(-1), mBook(0), - restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false), - contentsHeight(0), decorated(false), scrollerMonitor(-1) +BookView::BookView(QWidget *parent): QWebView(parent), contentIndex(-1), + mBook(0), restorePositionAfterLoad(false), positionAfterLoad(0), + restoreFragmentAfterLoad(false), loaded(false), grabbingVolumeKeys(false) { - Trace t("BookView::BookView"); + TRACE; + + // Set up web view defaults 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); @@ -44,59 +40,50 @@ BookView::BookView(QWidget *parent): false); settings()->setDefaultTextEncoding("utf-8"); page()->setContentEditable(false); - -#if defined(Q_WS_MAEMO_5) - // Suppress unwanted text selections on Maemo - 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); - - bookmarkImage = QImage(":/icons/bookmark.png"); - connect(this, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool))); connect(frame, SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJavaScriptObjects())); - connect(frame, SIGNAL(contentsSizeChanged(const QSize &)), - this, SLOT(onContentsSizeChanged(const QSize &))); + + // Suppress unwanted text selections on Maemo and Symbian +#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN) + installEventFilter(this); +#endif + + // Pre-load bookmark icon + bookmarkImage = QImage(":/icons/bookmark.png"); + + // Handle settings changes, force handling initial settings connect(Settings::instance(), SIGNAL(valueChanged(const QString &)), 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("scheme", s->value("scheme", "default")); setBook(0); - extractIcons(); - -#ifdef Q_WS_MAEMO_5 + // Enable kinetic scrolling +#if defined(Q_WS_MAEMO_5) + scrollerMonitor = 0; scroller = property("kineticScroller").value(); - if (scroller) { - t.trace("Got scroller"); - } +#elif defined(Q_OS_SYMBIAN) + scrollerMonitor = 0; + charm = new FlickCharm(this); + charm->activateOn(this); #endif -} -BookView::~BookView() -{ - Trace t("BookView::~BookView"); - removeIcons(); + // Observe media keys on Symbian +#ifdef Q_OS_SYMBIAN + MediaKeysObserver *observer = MediaKeysObserver::instance(); + connect(observer, SIGNAL(mediaKeyPressed(MediaKeysObserver::MediaKeys)), + this, SLOT(onMediaKeysPressed(MediaKeysObserver::MediaKeys))); +#endif } void BookView::loadContent(int index) { - Trace t("BookView::loadContent"); + TRACE; + if (!mBook) { return; } @@ -107,19 +94,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; - decorated = false; emit partLoadStart(index); - load(QUrl(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(); @@ -151,31 +139,38 @@ Book *BookView::book() void BookView::goPrevious() { - Trace t("BookView::goPrevious"); - loadContent(contentIndex - 1); + TRACE; + if (mBook && (contentIndex > 0)) { + mBook->setLastBookmark(contentIndex - 1, 0); + loadContent(contentIndex - 1); + } } void BookView::goNext() { - Trace t("BookView::goNext"); - loadContent(contentIndex + 1); + TRACE; + if (mBook && (contentIndex < (mBook->parts.size() - 1))) { + mBook->setLastBookmark(contentIndex + 1, 0); + loadContent(contentIndex + 1); + } } void BookView::setLastBookmark() { - Trace t("BookView::setLastBookmark"); + TRACE; 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)); + QWebFrame *frame = page()->mainFrame(); + int height = frame->contentsSize().height(); + int pos = frame->scrollPosition().y(); + qDebug() << QString("At %1 (%2%, height %3)"). + arg(pos).arg((qreal)pos / (qreal)height * 100).arg(height); mBook->setLastBookmark(contentIndex, (qreal)pos / (qreal)height); } } void BookView::restoreLastBookmark() { - Trace t("BookView::restoreLastBookmark"); + TRACE; if (mBook) { goToBookmark(mBook->lastBookmark()); } @@ -183,10 +178,10 @@ void BookView::restoreLastBookmark() void BookView::goToBookmark(const Book::Bookmark &bookmark) { - Trace t("BookView::goToBookmark"); + TRACE; 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; @@ -197,28 +192,82 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark) } } +void BookView::goToPart(int part, const QString &fragment) +{ + TRACE; + if (mBook) { + if (fragment.isEmpty()) { + goToBookmark(Book::Bookmark(part, 0)); + } else { + 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; + // FIXME: setLastBookmark(); + } +} + void BookView::onLoadFinished(bool ok) { - Trace t("BookView::onLoadFinished"); + TRACE; if (!ok) { - t.trace("Not OK"); + qDebug() << "Not OK"; return; } loaded = true; - addNavigationBar(); onSettingsChanged("scheme"); + onSettingsChanged("zoom"); + onSettingsChanged("font"); + + QTimer::singleShot(210, this, SLOT(restoreAfterLoad())); +} + +void BookView::restoreAfterLoad() +{ + TRACE; + if (restoreFragmentAfterLoad) { + qDebug() << "Restorint to fragment" << fragmentAfterLoad; + goToFragment(fragmentAfterLoad); + restoreFragmentAfterLoad = false; + } else if (restorePositionAfterLoad) { + qDebug() << "Restoring to position" << positionAfterLoad; + goToPosition(positionAfterLoad); + restorePositionAfterLoad = false; + } + emit partLoadEnd(contentIndex); showProgress(); } void BookView::onSettingsChanged(const QString &key) { - Trace t("BookView::onSettingsChanged " + key); + Settings *s = Settings::instance(); + Platform *p = Platform::instance(); + if (key == "zoom") { - setZoomFactor(Settings::instance()->value(key).toFloat() / 100.); + int value = s->value(key, p->defaultZoom()).toInt(); + qDebug() << "BookView::onSettingsChanged: zoom" << value; + setZoomFactor(value / 100.); } else if (key == "font") { - QString face = Settings::instance()->value("font").toString(); + QString face = s->value(key, p->defaultFont()).toString(); + qDebug() << "BookView::onSettingsChanged: font" << face; settings()->setFontFamily(QWebSettings::StandardFont, face); } else if (key == "scheme") { @@ -228,11 +277,17 @@ void BookView::onSettingsChanged(const QString &key) (scheme != "default")) { scheme = "default"; } + qDebug() << "BookView::onSettingsChanged: scheme" << scheme; QFile script(":/styles/" + scheme + ".js"); script.open(QFile::ReadOnly); QString scriptText = script.readAll(); script.close(); - QVariant ret = frame->evaluateJavaScript(scriptText); + (void)frame->evaluateJavaScript(scriptText); + } + else if (key == "usevolumekeys") { + bool grab = s->value(key, false).toBool(); + qDebug() << "BookView::onSettingsChanged: usevolumekeys" << grab; + grabVolumeKeys(grab); } } @@ -244,7 +299,9 @@ void BookView::paintEvent(QPaintEvent *e) } // Paint bookmarks - QPoint scrollPos = page()->mainFrame()->scrollPosition(); + QWebFrame *frame = page()->mainFrame(); + int contentsHeight = frame->contentsSize().height(); + QPoint scrollPos = frame->scrollPosition(); QPixmap bookmarkPixmap = QPixmap::fromImage(bookmarkImage); QPainter painter(this); foreach (Book::Bookmark b, mBook->bookmarks()) { @@ -252,7 +309,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,11 +317,17 @@ void BookView::paintEvent(QPaintEvent *e) void BookView::mousePressEvent(QMouseEvent *e) { QWebView::mousePressEvent(e); -#ifdef Q_WS_MAEMO_5 +#if defined(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 QWebFrame *frame = page()->mainFrame(); if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) { e->accept(); @@ -280,94 +343,41 @@ void BookView::wheelEvent(QWheelEvent *e) showProgress(); } -void BookView::addBookmark() +void BookView::addBookmark(const QString ¬e) { - Trace t("BookView::addBookmark"); + TRACE; if (!mBook) { return; } 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); + qDebug() << ((qreal)y / (qreal)height); + mBook->addBookmark(contentIndex, (qreal)y / (qreal)height, note); update(); } -void BookView::addNavigationBar() -{ - Trace t("BookView::addNavigationBar"); - if (!mBook) { - return; - } - - QString naviPrev = - "" - "" - ""; - QString naviNext = - "" - "" - ""; - if (contentIndex == 0) { - naviPrev = ""; - } - if (contentIndex >= mBook->parts.size() - 1) { - naviNext = ""; - } - - QWebFrame *frame = page()->currentFrame(); - QString headerScript = "document.body.innerHTML = '" + - naviPrev + naviNext + "
" + "' + document.body.innerHTML;"; - QString trailerScript = "document.body.innerHTML += '

" + - 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 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(); @@ -396,47 +406,32 @@ void BookView::addJavaScriptObjects() page()->mainFrame()->addToJavaScriptWindowObject("bv", this); } -void BookView::onContentsSizeChanged(const QSize &size) -{ - contentsHeight = size.height(); - if (decorated) { - if (restorePositionAfterLoad) { - Trace::trace("BookView::onContentSizeChanged: Time to restore"); - restorePositionAfterLoad = false; - goToPosition(positionAfterLoad); - } - } -} +#ifdef Q_WS_MAEMO_5 void BookView::leaveEvent(QEvent *e) { - Trace t("BookView::leaveEvent"); - // Save current position, to be restored later + TRACE; + // Save current position, to be restored later, in MainWindow::resizeEvent() setLastBookmark(); QWebView::leaveEvent(e); } -void BookView::enterEvent(QEvent *e) -{ - Trace t("BookView::enterEvent"); - // 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 contentsHeight = page()->mainFrame()->contentsSize().height(); + 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) { + int contentsHeight = page()->mainFrame()->contentsSize().height(); qreal pos = (qreal)(page()->mainFrame()->scrollPosition().y()) / (qreal)contentsHeight; emit progress(mBook->getProgress(contentIndex, pos)); @@ -445,15 +440,72 @@ void BookView::showProgress() void BookView::timerEvent(QTimerEvent *e) { +#if defined(Q_WS_MAEMO_5) if (e->timerId() == scrollerMonitor) { -#ifdef Q_WS_MAEMO_5 if (scroller && ((scroller->state() == QAbstractKineticScroller::AutoScrolling) || (scroller->state() == QAbstractKineticScroller::Pushing))) { showProgress(); } else { killTimer(scrollerMonitor); + scrollerMonitor = -1; } } -#endif // Q_WS_MAEMO_5 +#endif + QWebView::timerEvent(e); } + +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; + QWebFrame *frame = page()->mainFrame(); + int pos = frame->scrollPosition().y(); + frame->scroll(0, height()); + if (pos == frame->scrollPosition().y()) { + goNext(); + } else { + setLastBookmark(); + showProgress(); + } +} + +void BookView::grabVolumeKeys(bool grab) +{ + TRACE; + grabbingVolumeKeys = grab; +} + +#ifdef Q_OS_SYMBIAN + +void BookView::onMediaKeysPressed(MediaKeysObserver::MediaKeys key) +{ + TRACE; + qDebug() << "Key" << (int)key; + if (grabbingVolumeKeys) { + if (key == MediaKeysObserver::EVolIncKey) { + qDebug() << "Volume up"; + goPreviousPage(); + } else if (key == MediaKeysObserver::EVolDecKey){ + qDebug() << "Volume down"; + goNextPage(); + } + } +} + +#endif // Q_OS_SYMBIAN