#include <QDir>
#include <QTimer>
-#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 "trace.h"
#include "progress.h"
-#ifdef Q_WS_MAC
-# define ICON_PREFIX ":/icons/mac/"
-#else
-# define ICON_PREFIX ":/icons/"
-#endif
-
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);
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);
-#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
}
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
showProgress();
}
-void BookView::addBookmark()
+void BookView::addBookmark(const QString ¬e)
{
Trace t("BookView::addBookmark");
if (!mBook) {
int y = page()->mainFrame()->scrollPosition().y();
int height = page()->mainFrame()->contentsSize().height();
qDebug() << ((qreal)y / (qreal)height);
- mBook->addBookmark(contentIndex, (qreal)y / (qreal)height);
+ mBook->addBookmark(contentIndex, (qreal)y / (qreal)height, note);
update();
}
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());
}
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)