BookView::BookView(QWidget *parent): QWebView(parent), contentIndex(-1),
mBook(0), restorePositionAfterLoad(false), positionAfterLoad(0),
- loaded(false), grabbingVolumeKeys(false)
+ restoreFragmentAfterLoad(false), loaded(false), grabbingVolumeKeys(false)
{
TRACE;
settings()->setAttribute(QWebSettings::PluginsEnabled, false);
settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, false);
- settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
+ settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard,
+ false);
settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled,
false);
settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled,
frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
#endif
frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
- connect(this, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
+ connect(this, SIGNAL(loadFinished(bool)),
+ this, SLOT(onLoadFinished(bool)));
connect(frame, SIGNAL(javaScriptWindowObjectCleared()),
this, SLOT(addJavaScriptObjects()));
bookmarkImage = QImage(":/icons/bookmark.png");
// Handle settings changes, force handling initial settings
- Settings *s = Settings::instance();
- connect(s, SIGNAL(valueChanged(const QString &)),
+ connect(Settings::instance(), SIGNAL(valueChanged(const QString &)),
this, SLOT(onSettingsChanged(const QString &)));
- s->setValue("zoom", s->value("zoom", 160));
- s->setValue("font", s->value("font", Platform::defaultFont()));
- s->setValue("scheme", s->value("scheme", "default"));
- s->setValue("usevolumekeys", s->value("usevolumekeys", false));
setBook(0);
// Enable kinetic scrolling
}
}
-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);
}
}
{
TRACE;
if (mBook) {
- if (part != contentIndex) {
- qDebug() << "Loading new part" << part;
- restoreFragmentAfterLoad = true;
- fragmentAfterLoad = fragment;
- loadContent(part);
+ if (fragment.isEmpty()) {
+ goToBookmark(Book::Bookmark(part, 0));
} else {
- goToFragment(fragment);
- showProgress();
+ if (part != contentIndex) {
+ qDebug() << "Loading new part" << part;
+ restoreFragmentAfterLoad = true;
+ fragmentAfterLoad = fragment;
+ loadContent(part);
+ } else {
+ goToFragment(fragment);
+ showProgress();
+ }
}
}
}
QVariant ret = page()->mainFrame()->evaluateJavaScript(
QString("window.location='") + fragment + "'");
qDebug() << ret;
- setLastBookmark();
+ // FIXME: setLastBookmark();
}
}
void BookView::restoreAfterLoad()
{
+ TRACE;
if (restoreFragmentAfterLoad) {
qDebug() << "Restorint to fragment" << fragmentAfterLoad;
goToFragment(fragmentAfterLoad);
void BookView::onSettingsChanged(const QString &key)
{
- TRACE;
- qDebug() << key << Settings::instance()->value(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(key).toString();
+ QString face = s->value(key, p->defaultFont()).toString();
+ qDebug() << "BookView::onSettingsChanged: font" << face;
settings()->setFontFamily(QWebSettings::StandardFont, face);
}
else if (key == "scheme") {
(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") {
- grabVolumeKeys(Settings::instance()->value(key).toBool());
+ bool grab = s->value(key, false).toBool();
+ qDebug() << "BookView::onSettingsChanged: usevolumekeys" << grab;
+ grabVolumeKeys(grab);
}
}
int bookmarkPos = (int)((qreal)height * (qreal)b.pos);
painter.drawPixmap(2, bookmarkPos - scrollPos.y(), bookmarkPixmap);
}
+ 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);
+ }
+ }
}
void BookView::mousePressEvent(QMouseEvent *e)
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:
page()->mainFrame()->addToJavaScriptWindowObject("bv", this);
}
-#ifdef Q_WS_MAEMO_5
-
-void BookView::leaveEvent(QEvent *e)
-{
- TRACE;
- // Save current position, to be restored later
- setLastBookmark();
- QWebView::leaveEvent(e);
-}
-
-void BookView::enterEvent(QEvent *e)
-{
- 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 contentsHeight = page()->mainFrame()->contentsSize().height();
scrollerMonitor = -1;
}
}
-#endif
+#endif // Q_WS_MAEMO_5
+
QWebView::timerEvent(e);
}
{
QWebFrame *frame = page()->mainFrame();
int pos = frame->scrollPosition().y();
- frame->scroll(0, -height());
+ frame->scroll(0, -(height() - 19));
if (pos == frame->scrollPosition().y()) {
if (contentIndex > 0) {
Book::Bookmark bookmark(contentIndex - 1, 1.0);
TRACE;
QWebFrame *frame = page()->mainFrame();
int pos = frame->scrollPosition().y();
- frame->scroll(0, height());
+ frame->scroll(0, height() - 19);
if (pos == frame->scrollPosition().y()) {
goNext();
} else {
- setLastBookmark();
showProgress();
}
}
}
#endif // Q_OS_SYMBIAN
+
+void BookView::adjustPosition()
+{
+ QSize desktop = QApplication::desktop()->size();
+ qreal ratio = (qreal)(desktop.width()) / (qreal)(desktop.height());
+ if (mBook) {
+ QWebFrame *frame = page()->mainFrame();
+ int height = frame->contentsSize().height();
+ int pos = frame->scrollPosition().y();
+ qreal relativePos = (qreal)pos / (qreal)height;
+ // FIXME: Finish me
+ }
+}
projects / dorian / blobdiff