Add splash screen on Maemo, too. Switch to new splash pixmap. Fix bug

with wait notification never stopping.

diff --git a/bookview.cpp b/bookview.cpp
index f4606b7..96b9b6e 100644 (file)
--- a/bookview.cpp
+++ b/bookview.cpp
@@ -202,6 +202,7 @@ void BookView::goToBookmark(const Book::Bookmark &bookmark)
             positionAfterLoad = bookmark.pos;
             loadContent(bookmark.part);
         } else {
+            emit partLoadEnd(contentIndex);
             goToPosition(bookmark.pos);
         }
     }

diff --git a/dorian.qrc b/dorian.qrc
index 7c789dd..67686c2 100644 (file)
--- a/dorian.qrc
+++ b/dorian.qrc
@@ -54,5 +54,6 @@
         <file>icons/goto.png</file>
         <file>icons/edit.png</file>
         <file>icons/rotate.png</file>
+        <file>icons/maemo/splash-landscape.jpg</file>
     </qresource>
 </RCC>

diff --git a/icons/maemo/splash-landscape.jpg b/icons/maemo/splash-landscape.jpg
new file mode 100644 (file)
index 0000000..d275a70
Binary files /dev/null and b/icons/maemo/splash-landscape.jpg differ

diff --git a/icons/maemo/splash-landscape.png b/icons/maemo/splash-landscape.png
new file mode 100755 (executable)
index 0000000..82d9e38
Binary files /dev/null and b/icons/maemo/splash-landscape.png differ

diff --git a/main.cpp b/main.cpp
index 0628f04..1a23466 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -44,22 +44,18 @@ int main(int argc, char *argv[])
     Trace::setFileName(settings->value("tracefilename").toString());
     qInstallMsgHandler(Trace::messageHandler);
 
-#ifdef Q_OS_SYMBIAN
     // Show splash screen
     Splash splash;
     splash.show();
     app.processEvents();
-#endif
 
     // Initialize main window
     MainWindow *mainWindow = new MainWindow();
     settings->apply();
     mainWindow->initialize();
 
-#ifdef Q_OS_SYMBIAN
     // Hide splash screen
     splash.finish(mainWindow);
-#endif
 
     // Run event loop, re-start application if event loop exit code was 1000
     ret = app.exec();

diff --git a/platform.cpp b/platform.cpp
index 873d4fb..1681638 100644 (file)
--- a/platform.cpp
+++ b/platform.cpp
@@ -26,6 +26,8 @@
 #   define DORIAN_ICON_PREFIX ":/icons/mac/"
 #elif defined(Q_OS_SYMBIAN)
 #   define DORIAN_ICON_PREFIX ":/icons/symbian/"
+#elif defined(Q_WS_MAEMO_5)
+#   define DORIAN_ICON_PREFIX ":/icons/maemo/"
 #else
 #   define DORIAN_ICON_PREFIX ":/icons/"
 #endif
@@ -64,13 +66,13 @@ QString Platform::dbPath()
     return QDir(base).absoluteFilePath("books.db");
 }
 
-QString Platform::icon(const QString &name)
+QString Platform::icon(const QString &name, const QString &extension)
 {
-    QString iconName = QString(DORIAN_ICON_PREFIX) + name + ".png";
+    QString iconName = QString(DORIAN_ICON_PREFIX) + name + extension;
     if (QFile(iconName).exists()) {
         return iconName;
     } else {
-        return QString(":/icons/") + name + ".png";
+        return QString(":/icons/") + name + extension;
     }
 }
 

diff --git a/platform.h b/platform.h
index 30628dd..4481695 100644 (file)
--- a/platform.h
+++ b/platform.h
@@ -14,7 +14,7 @@ public:
     static void close();
 
     QString dbPath();
-    QString icon(const QString &name);
+    QString icon(const QString &name, const QString &externsion = ".png");
     void restart(char *argv[]);
     QString version();
     QString downloadDir();

diff --git a/widgets/splash.cpp b/widgets/splash.cpp
index 243be58..b149e5e 100755 (executable)
--- a/widgets/splash.cpp
+++ b/widgets/splash.cpp
@@ -1,15 +1,23 @@
 #include <QtGui>\r
 \r
 #include "splash.h"\r
+#include "platform.h"\r
 \r
 Splash::Splash(): QSplashScreen()\r
 {\r
+    Platform *platform = Platform::instance();\r
+#if defined(Q_OS_SYMBIAN)\r
     QRect geo = QApplication::desktop()->availableGeometry();\r
     if (geo.width() < geo.height()) {\r
-        setPixmap(QPixmap(":/icons/splash.jpg").scaled(360, 518,\r
+        setPixmap(QPixmap(platform->icon("splash", ".jpg")).scaled(360, 518,\r
             Qt::IgnoreAspectRatio, Qt::SmoothTransformation));\r
     } else {\r
-        setPixmap(QPixmap(":/icons/splash-landscape.jpg").scaled(520, 330,\r
-            Qt::IgnoreAspectRatio, Qt::SmoothTransformation));\r
+        setPixmap(QPixmap(platform->icon("splash-landscape", ".jpg")).\r
+            scaled(520, 330,\r
+                   Qt::IgnoreAspectRatio, Qt::SmoothTransformation));\r
     }\r
+#elif defined(Q_WS_MAEMO_5)\r
+    platform->setOrientation(this, "landscape");\r
+    setPixmap(QPixmap(platform->icon("splash-landscape", ".jpg")));\r
+#endif\r
 }\r