{
TRACE;
+ // Create timer for scheduling restores
+ restoreTimer = new QTimer(this);
+
// Set up web view defaults
settings()->setAttribute(QWebSettings::AutoLoadImages, true);
settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
{
TRACE;
- // Save position in current book
+ // Bail out if new book is the same as current book
+ if (book == mBook) {
+ return;
+ }
+
+ // Save reading position of current book
setLastBookmark();
- // Open new book, restore last position
- if (book != mBook) {
- mBook = book;
- if (book) {
- contentIndex = -1;
- if (book->open()) {
- restoreLastBookmark();
- } else {
- mBook = 0;
- contentIndex = 0;
- setHtml(tr("Failed to open book"));
- }
- }
- else {
- contentIndex = 0;
- setHtml(tr("No book"));
- }
+ // Set new book as the current book
+ mBook = book;
+
+ // Bail out if new book is null
+ if (!book) {
+ contentIndex = 0;
+ setHtml(tr("No book"));
+ return;
+ }
+
+ // Open new book
+ if (book->open()) {
+ // Restore last reading position - this will force
+ // a reload as well
+ contentIndex = -1;
+ restoreLastBookmark();
+ } else {
+ mBook = 0;
+ contentIndex = 0;
+ setHtml(tr("Failed to open book"));
}
}
}
}
-void BookView::setLastBookmark()
+void BookView::setLastBookmark(bool fast)
{
TRACE;
if (mBook) {
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);
+ mBook->setLastBookmark(contentIndex, (qreal)pos / (qreal)height, fast);
+ } else {
+ qDebug() << "(no book)";
}
}
positionAfterLoad = bookmark.pos;
loadContent(bookmark.part);
} else {
+ emit partLoadEnd(contentIndex);
goToPosition(bookmark.pos);
}
}
QVariant ret = page()->mainFrame()->evaluateJavaScript(
QString("window.location='") + fragment + "'");
qDebug() << ret;
- // FIXME: setLastBookmark();
}
}
onSettingsChanged("scheme");
onSettingsChanged("zoom");
onSettingsChanged("font");
+ scheduleRestoreAfterLoad();
+}
+
+void BookView::scheduleRestoreAfterLoad()
+{
+ TRACE;
+ if (restoreTimer->isActive()) {
+ // Ignore request if a restore is already in progress
+ return;
+ }
+
+ disconnect(restoreTimer, SIGNAL(timeout()), this, 0);
+ connect(restoreTimer, SIGNAL(timeout()), this, SLOT(restoreAfterLoad()));
+ restoreTimer->setSingleShot(true);
+ restoreTimer->start(210);
+}
+
+void BookView::scheduleRestoreLastBookmark()
+{
+ TRACE;
+ if (restoreTimer->isActive()) {
+ // Ignore request if a restore is already in progress
+ return;
+ }
- QTimer::singleShot(210, this, SLOT(restoreAfterLoad()));
+ disconnect(restoreTimer, SIGNAL(timeout()), this, 0);
+ connect(restoreTimer, SIGNAL(timeout()), this,
+ SLOT(restoreLastBookmark()));
+ restoreTimer->setSingleShot(true);
+ restoreTimer->start(210);
}
void BookView::restoreAfterLoad()
int bookmarkPos = (int)((qreal)height * (qreal)b.pos);
painter.drawPixmap(2, bookmarkPos - scrollPos.y(), bookmarkPixmap);
}
- QPen pen(Qt::gray);
- pen.setStyle(Qt::DotLine);
- pen.setWidth(3);
- painter.setPen(pen);
- if (contentIndex > 0) {
- painter.drawLine(0, -scrollPos.y(), width(), -scrollPos.y());
- }
- if (contentIndex < (mBook->parts.size() - 1)) {
- int h = contentsHeight - scrollPos.y() - 1;
- painter.drawLine(0, h, width(), h);
+ if (mBook) {
+ QPen pen(Qt::gray);
+ pen.setStyle(Qt::DotLine);
+ pen.setWidth(3);
+ painter.setPen(pen);
+ if (contentIndex > 0) {
+ painter.drawLine(0, -scrollPos.y(), width(), -scrollPos.y());
+ }
+ if (contentIndex < (mBook->parts.size() - 1)) {
+ int h = contentsHeight - scrollPos.y() - 1;
+ painter.drawLine(0, h, width(), h);
+ }
}
}
if (scroller) {
scrollerMonitor = startTimer(500);
}
+#elif defined(Q_OS_SYMBIAN)
+ // Do nothing
#else
- // Handle mouse presses on the scroll bar
+ // Handle mouse press on the scroll bar
QWebFrame *frame = page()->mainFrame();
if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) {
e->accept();
return;
}
-#endif // Q_WS_MAEMO_5
+#endif
e->ignore();
}
// 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:
+#ifndef Q_OS_SYMBIAN // Too heavy on Symbian
showProgress();
+#endif
mousePressed = false;
break;
case QEvent::MouseMove:
void BookView::addJavaScriptObjects()
{
+ TRACE;
page()->mainFrame()->addToJavaScriptWindowObject("bv", this);
}
void BookView::goToPosition(qreal position)
{
+ TRACE;
int contentsHeight = page()->mainFrame()->contentsSize().height();
int scrollPos = (int)((qreal)contentsHeight * position);
page()->mainFrame()->setScrollPosition(QPoint(0, scrollPos));
void BookView::showProgress()
{
+ TRACE;
if (mBook) {
int contentsHeight = page()->mainFrame()->contentsSize().height();
qreal pos = (qreal)(page()->mainFrame()->scrollPosition().y()) /
scrollerMonitor = -1;
}
}
-#endif
+#endif // Q_WS_MAEMO_5
+
QWebView::timerEvent(e);
}
+void BookView::hideEvent(QHideEvent *e)
+{
+ Trace t("BookView::hideEvent");
+
+#if defined(Q_OS_SYMBIAN)
+ setLastBookmark();
+#endif
+
+ QWebView::hideEvent(e);
+}
+
void BookView::goPreviousPage()
{
QWebFrame *frame = page()->mainFrame();
- int pos = frame->scrollPosition().y();
- frame->scroll(0, -(height() - 19));
+ const int pos = frame->scrollPosition().y();
+ frame->scroll(0, -1);
if (pos == frame->scrollPosition().y()) {
if (contentIndex > 0) {
Book::Bookmark bookmark(contentIndex - 1, 1.0);
}
} else {
showProgress();
+ QPropertyAnimation *slide =
+ new QPropertyAnimation(frame, "scrollPosition");
+ const QPoint *offset = new QPoint(0, height() - 18);
+ slide->setDuration(400);
+ slide->setStartValue(frame->scrollPosition());
+ slide->setEndValue(frame->scrollPosition() - *offset);
+ slide->setEasingCurve(QEasingCurve::OutQuad);
+ slide->start(QAbstractAnimation::DeleteWhenStopped);
+ delete offset;
}
}
{
TRACE;
QWebFrame *frame = page()->mainFrame();
- int pos = frame->scrollPosition().y();
- frame->scroll(0, height() - 19);
+ const int pos = frame->scrollPosition().y();
+ frame->scroll(0, 1);
if (pos == frame->scrollPosition().y()) {
goNext();
} else {
- // setLastBookmark();
showProgress();
+ QPropertyAnimation *slide =
+ new QPropertyAnimation(frame, "scrollPosition");
+ const QPoint *offset = new QPoint(0, (height() - 18));
+ slide->setDuration(400);
+ slide->setStartValue(frame->scrollPosition());
+ slide->setEndValue(frame->scrollPosition() + *offset);
+ slide->setEasingCurve(QEasingCurve::OutQuad);
+ slide->start(QAbstractAnimation::DeleteWhenStopped);
+ delete offset;
}
}