projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More stagnation.
[dorian]
/
bookview.h
diff --git
a/bookview.h
b/bookview.h
index
8465f3c
..
74ef200
100644
(file)
--- a/
bookview.h
+++ b/
bookview.h
@@
-41,7
+41,7
@@
public:
void addBookmark(const QString ¬e);
/** Save current reading position into book. */
void addBookmark(const QString ¬e);
/** Save current reading position into book. */
- void setLastBookmark();
+ void setLastBookmark(bool fast = false);
/** Go to given part + part fragment URL. */
void goToPart(int part, const QString &fragment);
/** Go to given part + part fragment URL. */
void goToPart(int part, const QString &fragment);
@@
-59,9
+59,6
@@
signals:
/** Part loading finished. */
void partLoadEnd(int index);
/** Part loading finished. */
void partLoadEnd(int index);
- /** Signal button press, when the real event has been suppressed. */
- void suppressedMouseButtonPress();
-
/** Signal progress in reading the book. */
void progress(qreal p);
/** Signal progress in reading the book. */
void progress(qreal p);
@@
-105,9
+102,7
@@
protected:
void wheelEvent(QWheelEvent *);
bool eventFilter(QObject *o, QEvent *e);
void timerEvent(QTimerEvent *e);
void wheelEvent(QWheelEvent *);
bool eventFilter(QObject *o, QEvent *e);
void timerEvent(QTimerEvent *e);
-#ifdef Q_WS_MAEMO_5
- void leaveEvent(QEvent *e);
-#endif // Q_WS_MAEMO_5
+ void hideEvent(QHideEvent *e);
/** Load given part. */
void loadContent(int index);
/** Load given part. */
void loadContent(int index);
@@
-121,6
+116,7
@@
protected:
/** Show reading progress. */
void showProgress();
/** Show reading progress. */
void showProgress();
+private:
int contentIndex; /**< Current part in book. */
Book *mBook; /**< Book to show. */
bool restorePositionAfterLoad;
int contentIndex; /**< Current part in book. */
Book *mBook; /**< Book to show. */
bool restorePositionAfterLoad;
@@
-138,10
+134,13
@@
protected:
#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
int scrollerMonitor; /**< ID of timer monitoring kinetic scroll. */
#endif
#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
int scrollerMonitor; /**< ID of timer monitoring kinetic scroll. */
#endif
+
#if defined(Q_WS_MAEMO_5)
QAbstractKineticScroller *scroller;
#if defined(Q_WS_MAEMO_5)
QAbstractKineticScroller *scroller;
-#elif defined(Q_OS_SYMBIAN)
- FlickCharm *charm;
+#endif
+
+#if defined(Q_OS_SYMBIAN)
+ FlickCharm *charm; /**< Kinetic scroller. */
#endif
};
#endif
};