Show reading progress.

[dorian] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 47319f1..b7ebb8e 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -26,6 +26,7 @@
 #include "fullscreenwindow.h"
 #include "trace.h"
 #include "bookfinder.h"
+#include "progress.h"
 
 #ifdef DORIAN_TEST_MODEL
 #include "modeltest.h"
@@ -37,6 +38,8 @@
 #   define ICON_PREFIX ":/icons/"
 #endif
 
+const int PROGRESS_HEIGHT = 17;
+
 MainWindow::MainWindow(QWidget *parent):
     QMainWindow(parent), view(0), preventBlankingTimer(-1)
 {
@@ -59,6 +62,9 @@ MainWindow::MainWindow(QWidget *parent):
     view->show();
     layout->addWidget(view);
 
+    // Progress
+    progress = new Progress(central);
+
     // Tool bar
     setUnifiedTitleAndToolBarOnMac(true);
     settings = new QDialog(this);
@@ -139,6 +145,9 @@ MainWindow::MainWindow(QWidget *parent):
     connect(view, SIGNAL(chapterLoadEnd(int)),
             this, SLOT(onChapterLoadEnd(int)));
 
+    // Handle progress
+    connect(view, SIGNAL(progress(qreal)), progress, SLOT(setProgress(qreal)));
+
     // Shadow window for full screen
     fullScreenWindow = new FullScreenWindow(this);
     connect(fullScreenWindow, SIGNAL(restore()), this, SLOT(showRegular()));
@@ -152,15 +161,6 @@ MainWindow::MainWindow(QWidget *parent):
     bookFinder->moveToThread(&bookFinderThread);
     bookFinderThread.start();
 
-#if 0
-    bool ret = QMetaObject::invokeMethod(
-        bookFinder,
-        "find",
-        Q_ARG(QStringList, QStringList(QString("/Users/polster/Books"))),
-        Q_ARG(QStringList, library->bookPaths()));
-    t.trace(QString("Invoking BookFinder::find ") + (ret?"succeeded":"failed"));
-#endif
-
 #ifdef DORIAN_TEST_MODEL
     (void)new ModelTest(Library::instance(), this);
 #endif
@@ -184,15 +184,22 @@ void MainWindow::showRegular()
     fullScreenWindow->hide();
     fullScreenWindow->leaveChild();
     view->setParent(centralWidget());
+    progress->setParent(centralWidget());
+    progress->setGeometry(0, 0, geometry().width(), PROGRESS_HEIGHT);
     centralWidget()->layout()->addWidget(view);
+    progress->flash();
 }
 
 void MainWindow::showBig()
 {
     Trace t("MainWindow::showBig");
     centralWidget()->layout()->removeWidget(view);
+    progress->setParent(fullScreenWindow);
+    progress->setGeometry(0, 0, QApplication::desktop()->screenGeometry().width(),
+                          PROGRESS_HEIGHT);
     fullScreenWindow->takeChild(view);
     fullScreenWindow->showFullScreen();
+    progress->flash();
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -364,3 +371,9 @@ void MainWindow::timerEvent(QTimerEvent *event)
         Trace::trace("MainWindow::timerEvent: Prevent display blanking");
     }
 }
+
+void MainWindow::resizeEvent(QResizeEvent *e)
+{
+    progress->setGeometry(QRect(0, 0, e->size().width(), PROGRESS_HEIGHT));
+    QMainWindow::resizeEvent(e);
+}