.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index aad12c5..1d647ff 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -191,9 +191,17 @@ void MainWindow::showRegular()
     fullScreenWindow->hide();
     fullScreenWindow->leaveChildren();
     QRect geo = geometry();
+    qDebug() << "Geometry:" << geo;
     progress->setGeometry(0, 0, geo.width(), PROGRESS_HEIGHT);
+#ifdef Q_WS_MAEMO_5
+    previousButton->setGeometry(0,geo.height() - toolBar->height() - 95,
+                                95, 95);
     nextButton->setGeometry(geo.width() - 95, 0, 95, 95);
+#else
     previousButton->setGeometry(0, geo.height() - 95, 95, 95);
+    nextButton->setGeometry(geo.width() - 95, toolBar->height(), 95, 95);
+#endif // Q_WS_MAEMO_5
+
     QList<QWidget *> otherChildren;
     otherChildren << progress << previousButton << nextButton;
     takeChildren(view, otherChildren);
@@ -398,8 +406,14 @@ void MainWindow::resizeEvent(QResizeEvent *e)
     Trace t("MainWindow::resizeEvent");
     progress->setGeometry(QRect(0, 0, e->size().width(), PROGRESS_HEIGHT));
     qDebug() << "Toolbar height" << toolBar->height();
+#ifdef Q_WS_MAEMO_5
+    previousButton->setGeometry(0, e->size().height() - toolBar->height() - 95,
+                                95, 95);
+    nextButton->setGeometry(e->size().width() - 95, 0, 95, 95);
+#else
     previousButton->setGeometry(0, e->size().height() - 95, 95, 95);
     nextButton->setGeometry(e->size().width() - 95, toolBar->height(), 95, 95);
+#endif // Q_WS_MAEMO_5
     previousButton->flash();
     nextButton->flash();
     QMainWindow::resizeEvent(e);

diff --git a/pkg/changelog b/pkg/changelog
index e44280b..05d89e0 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,6 +1,6 @@
 dorian (0.1.7-1) unstable; urgency=low
 
-  * 
+  * Navigate through pages instead of book parts
 
  -- Akos Polster <akos@pipacs.com>  Wed,  1 Aug 2010 02:00:00 +0200
 

diff --git a/widgets/translucentbutton.cpp b/widgets/translucentbutton.cpp
index fdd9d46..02c4e25 100644 (file)
--- a/widgets/translucentbutton.cpp
+++ b/widgets/translucentbutton.cpp
@@ -47,4 +47,5 @@ void TranslucentButton::mousePressEvent(QMouseEvent *e)
     Q_UNUSED(e);
     Trace t("TranslucentButton::mousePressEvent");
     emit triggered();
+    e->accept();
 }