-#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"
BookView::BookView(QWidget *parent):
QWebView(parent), contentIndex(-1), mBook(0),
restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false),
- contentsHeight(0), decorated(false), scrollerMonitor(-1)
+ contentsHeight(0)
{
- Trace t("BookView::BookView");
+ TRACE;
settings()->setAttribute(QWebSettings::AutoLoadImages, true);
settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
settings()->setAttribute(QWebSettings::JavaEnabled, false);
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);
s->setValue("scheme", s->value("scheme", "default"));
setBook(0);
- extractIcons();
-#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");
- removeIcons();
+ TRACE;
}
void BookView::loadContent(int index)
{
- Trace t("BookView::loadContent");
+ TRACE;
if (!mBook) {
return;
}
}
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();
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));
+ 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());
}
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;
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");
emit partLoadEnd(contentIndex);
showProgress();
void BookView::onSettingsChanged(const QString &key)
{
- Trace t("BookView::onSettingsChanged " + key);
+ TRACE;
if (key == "zoom") {
setZoomFactor(Settings::instance()->value(key).toFloat() / 100.);
}
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);
}
}
{
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
QWebFrame *frame = page()->mainFrame();
if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) {
e->accept();
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 =
- "<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 (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());
}
}
+ // Work around Qt bug that sometimes selects web view contents during swipe
switch (e->type()) {
case QEvent::MouseButtonPress:
emit suppressedMouseButtonPress();
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);
}
}
void BookView::leaveEvent(QEvent *e)
{
- Trace t("BookView::leaveEvent");
+ TRACE;
// Save current position, to be restored later
setLastBookmark();
QWebView::leaveEvent(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();
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()
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))) {
} else {
killTimer(scrollerMonitor);
}
-#endif // Q_WS_MAEMO_5
}
+#endif
+ QWebView::timerEvent(e);
}
void BookView::keyPressEvent(QKeyEvent* event)
frame->scroll(0, -height());
if (pos == frame->scrollPosition().y()) {
if (contentIndex > 0) {
- goToBookmark(Book::Bookmark(contentIndex - 1, 1.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");
+ TRACE;
QWebFrame *frame = page()->mainFrame();
int pos = frame->scrollPosition().y();
frame->scroll(0, height());
if (pos == frame->scrollPosition().y()) {
goNext();
} else {
+ setLastBookmark();
showProgress();
}
}
projects / dorian / blobdiff