BookView::BookView(QWidget *parent):
QWebView(parent), contentIndex(-1), mBook(0),
restorePositionAfterLoad(false), positionAfterLoad(0), loaded(false),
- contentsHeight(0), scrollerMonitor(-1)
+ contentsHeight(0)
{
Trace t("BookView::BookView");
settings()->setAttribute(QWebSettings::AutoLoadImages, true);
setBook(0);
#ifdef Q_WS_MAEMO_5
+ scrollerMonitor = 0;
scroller = property("kineticScroller").value<QAbstractKineticScroller *>();
#endif
}
QWebView::mousePressEvent(e);
#ifdef Q_WS_MAEMO_5
// Start monitoring kinetic scroll
+ if (scrollerMonitor) {
+ killTimer(scrollerMonitor);
+ }
if (scroller) {
- scrollerMonitor = startTimer(250);
+ scrollerMonitor = startTimer(500);
}
#else
// Handle mouse presses on the scroll bar
if (e->type() == QEvent::Resize) {
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 {
qDebug() << "BookView::eventFilter" << Trace::event(e->type());
}
bool mousePressed;
int contentsHeight; /**< Last know height of the frame. */
- int scrollerMonitor;
#ifdef Q_WS_MAEMO_5
+ int scrollerMonitor;
QAbstractKineticScroller *scroller;
#endif
};
#include <QApplication>
#include <QFileInfo>
#include <QStringList>
+#include <QWebView>
+#include <QWebFrame>
#ifdef Q_WS_MAEMO_5
# include <QtMaemo5/QMaemo5InformationBox>
#else
previousButton->setGeometry(0, geo.height() - TranslucentButton::pixels,
TranslucentButton::pixels, TranslucentButton::pixels);
- nextButton->setGeometry(geo.width() - TranslucentButton::pixels,
+ nextButton->setGeometry(geo.width() - TranslucentButton::pixels - 25,
toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
#endif // Q_WS_MAEMO_5
qDebug() << "previousButton geometry" << previousButton->geometry();
otherChildren << progress << nextButton << previousButton;
QRect screen = QApplication::desktop()->screenGeometry();
progress->setGeometry(0, 0, screen.width(), PROGRESS_HEIGHT);
+#if defined(Q_WS_MAEMO_5)
nextButton->setGeometry(screen.width() - TranslucentButton::pixels, 0,
TranslucentButton::pixels, TranslucentButton::pixels);
+#else
+ nextButton->setGeometry(screen.width() - TranslucentButton::pixels - 25, 0,
+ TranslucentButton::pixels, TranslucentButton::pixels);
+#endif // Q_WS_MAEMO_5
previousButton->setGeometry(0, screen.height() - TranslucentButton::pixels,
TranslucentButton::pixels, TranslucentButton::pixels);
#else
previousButton->setGeometry(0, e->size().height() - TranslucentButton::pixels,
TranslucentButton::pixels, TranslucentButton::pixels);
- nextButton->setGeometry(e->size().width() - TranslucentButton::pixels,
+ nextButton->setGeometry(e->size().width() - TranslucentButton::pixels - 25,
toolBar->height(), TranslucentButton::pixels, TranslucentButton::pixels);
#endif // Q_WS_MAEMO_5
qDebug() << "previousButton geometry" << previousButton->geometry();
foreach (QString key, coverKeys) {
if (content.contains(key)) {
qDebug() << "Loading cover image from" << content[key].href;
- cover = makeCover(rootPath() + "/" + content[key].href);
+ cover = makeCover(QDir(rootPath()).absoluteFilePath(content[key].href));
break;
}
}
}
if (!ncxFileName.isEmpty()) {
qDebug() << "Parsing NCX file" << ncxFileName;
- QFile ncxFile(rootPath() + "/" + ncxFileName);
+ QFile ncxFile(QDir(rootPath()).absoluteFilePath(ncxFileName));
source = new QXmlInputSource(&ncxFile);
NcxHandler *ncxHandler = new NcxHandler(*this);
errorHandler = new XmlErrorHandler();
// Calculate book part sizes
size = 0;
foreach (QString part, parts) {
- QFileInfo info(content[part].href);
+ QFileInfo info(QDir(rootPath()).absoluteFilePath(content[part].href));
content[part].size = info.size();
size += content[part].size;
}
* Fix TOC in "The Awakening" (and possibly other Google books) [#6318]
* Works on Symbian (far from usable)
* Make modal dialogs closeable on Mac
+ * Fix progress and bookmark positions
-- Akos Polster <akos@pipacs.com> Thu, 16 Sep 2010 02:00:00 +0200
setAttribute(Qt::WA_Maemo5StackedWindow, true);
setAttribute(Qt::WA_Maemo5NonComposited, true);
#endif // Q_WS_MAEMO_5
+ toolBar->hide();
QFrame *frame = new QFrame(this);
QVBoxLayout *layout = new QVBoxLayout(frame);
layout->setMargin(0);
#include "progress.h"
#include "trace.h"
-Progress::Progress(QWidget *parent): QLabel(parent), progress(0), timer(-1)
+Progress::Progress(QWidget *parent): QLabel(parent), progress(-1.0), timer(-1)
{
hide();
}
void Progress::setProgress(qreal p)
{
+ Trace t("Progress::setProgress");
+ qDebug() << p;
if (progress != p) {
progress = p;
flash();