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
{
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::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);
}
}
void BookView::leaveEvent(QEvent *e)
{
TRACE;
- // Save current position, to be restored later
+ // Save current position, to be restored later, in MainWindow::resizeEvent()
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)