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
bc2cf3f
..
74ef200
100644
(file)
--- a/
bookview.h
+++ b/
bookview.h
@@
-27,24
+27,37
@@
class BookView: public QWebView
public:
explicit BookView(QWidget *parent = 0);
public:
explicit BookView(QWidget *parent = 0);
+
+ /** Set current book. */
void setBook(Book *book);
void setBook(Book *book);
+
+ /** Get current book. */
Book *book();
Book *book();
+
+ /** Go to the position decribed by "bookmark". */
void goToBookmark(const Book::Bookmark &bookmark);
void goToBookmark(const Book::Bookmark &bookmark);
+
+ /** Add bookmark to book at the current position. */
void addBookmark(const QString ¬e);
void addBookmark(const QString ¬e);
- void setLastBookmark();
- void restoreLastBookmark();
+
+ /** Save current reading position into book. */
+ void setLastBookmark(bool fast = false);
+
+ /** Go to given part + part fragment URL. */
void goToPart(int part, const QString &fragment);
void goToPart(int part, const QString &fragment);
+
+ /** Go to given fragment URL in current part. */
void goToFragment(const QString &fragment);
/** If grab is true, volume keys will generate act as page up/down. */
void grabVolumeKeys(bool grab);
signals:
void goToFragment(const QString &fragment);
/** If grab is true, volume keys will generate act as page up/down. */
void grabVolumeKeys(bool grab);
signals:
+ /** Part loading started. */
void partLoadStart(int index);
void partLoadStart(int index);
- void partLoadEnd(int index);
- /** Signal button press, when the real event has been suppressed. */
- void suppressedMouseButtonPress();
+ /** Part loading finished. */
+ void partLoadEnd(int index);
/** Signal progress in reading the book. */
void progress(qreal p);
/** Signal progress in reading the book. */
void progress(qreal p);
@@
-56,21
+69,27
@@
public slots:
/** Go to previous part. */
void goNext();
/** Go to previous part. */
void goNext();
+ /** Actions to perform after URL loading finished. */
void onLoadFinished(bool ok);
void onLoadFinished(bool ok);
+
+ /** Handle settings changes. */
void onSettingsChanged(const QString &key);
/** Add QObjects to the main frame. */
void addJavaScriptObjects();
void onSettingsChanged(const QString &key);
/** Add QObjects to the main frame. */
void addJavaScriptObjects();
- /** Handle main frame contents size changes. */
- void onContentsSizeChanged(const QSize &size);
-
/** Go to previous page. */
void goPreviousPage();
/** Go to next page. */
void goNextPage();
/** Go to previous page. */
void goPreviousPage();
/** Go to next page. */
void goNextPage();
+ /** Restore saved position after URL loading finished. */
+ void restoreAfterLoad();
+
+ /** Restore book's last reading position. */
+ void restoreLastBookmark();
+
protected slots:
#ifdef Q_OS_SYMBIAN
/** Observe media keys. */
protected slots:
#ifdef Q_OS_SYMBIAN
/** Observe media keys. */
@@
-83,10
+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);
- void enterEvent(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);
@@
-100,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;
@@
-112,16
+129,18
@@
protected:
QImage bookmarkImage; /**< Bookmark icon pre-loaded. */
bool loaded; /**< True, if content has been loaded. */
bool mousePressed; /**< Event filter's mouse button state. */
QImage bookmarkImage; /**< Bookmark icon pre-loaded. */
bool loaded; /**< True, if content has been loaded. */
bool mousePressed; /**< Event filter's mouse button state. */
- int contentsHeight; /**< Last know height of the frame. */
bool grabbingVolumeKeys;/**< True, if volume keys should be grabbed. */
#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
int scrollerMonitor; /**< ID of timer monitoring kinetic scroll. */
#endif
bool grabbingVolumeKeys;/**< True, if volume keys should be grabbed. */
#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
};