projects
/
dorian
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[dorian]
/
adopterwindow.cpp
diff --git
a/adopterwindow.cpp
b/adopterwindow.cpp
index
daafa29
..
7ec642d
100644
(file)
--- a/
adopterwindow.cpp
+++ b/
adopterwindow.cpp
@@
-20,7
+20,7
@@
AdopterWindow::AdopterWindow(QWidget *parent): MainBase(parent), bookView(0),
{
TRACE;
{
TRACE;
- // Monitor settings
+ // Monitor settings changes
connect(Settings::instance(), SIGNAL(valueChanged(const QString &)),
this, SLOT(onSettingsChanged(const QString &)));
connect(Settings::instance(), SIGNAL(valueChanged(const QString &)),
this, SLOT(onSettingsChanged(const QString &)));
@@
-146,7
+146,7
@@
void AdopterWindow::resizeEvent(QResizeEvent *event)
#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
// Restore previous reading position
if (bookView) {
#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
// Restore previous reading position
if (bookView) {
- QTimer::singleShot(110, bookView, SLOT(restoreLastBookmark()));
+ bookView->scheduleRestoreLastBookmark();
}
#endif // defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
}
}
#endif // defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
}
@@
-157,6
+157,7
@@
void AdopterWindow::closeEvent(QCloseEvent *event)
if (bookView) {
bookView->setLastBookmark();
}
if (bookView) {
bookView->setLastBookmark();
}
+ hide();
MainBase::closeEvent(event);
}
MainBase::closeEvent(event);
}
@@
-171,7
+172,8
@@
void AdopterWindow::leaveEvent(QEvent *event)
void AdopterWindow::keyPressEvent(QKeyEvent *event)
{
void AdopterWindow::keyPressEvent(QKeyEvent *event)
{
- TRACE;
+ Trace t("AdopterWindow::keyPressEvent");
+
switch (event->key()) {
case Qt::Key_PageDown:
#ifdef Q_WS_MAEMO_5
switch (event->key()) {
case Qt::Key_PageDown:
#ifdef Q_WS_MAEMO_5