From: Akos Polster <akos@pipacs.com>
Date: Mon, 7 Feb 2011 20:22:06 +0000 (+0100)
Subject: Add landscape splash image.
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=9f73b19627aba7a802daa22df7b7683fd47ec809;hp=d32af855518f5b94cda767f60c8a1b98b4602f99;p=dorian

Add landscape splash image.
---

diff --git a/dorian.qrc b/dorian.qrc
index 67686c2..ad574c6 100644
--- a/dorian.qrc
+++ b/dorian.qrc
@@ -55,5 +55,6 @@
         <file>icons/edit.png</file>
         <file>icons/rotate.png</file>
         <file>icons/maemo/splash-landscape.jpg</file>
+        <file>icons/maemo/splash.jpg</file>
     </qresource>
 </RCC>
diff --git a/icons/maemo/splash.jpg b/icons/maemo/splash.jpg
new file mode 100644
index 0000000..a5d112d
Binary files /dev/null and b/icons/maemo/splash.jpg differ
diff --git a/icons/maemo/splash.png b/icons/maemo/splash.png
new file mode 100755
index 0000000..cea6ee0
Binary files /dev/null and b/icons/maemo/splash.png differ
diff --git a/main.cpp b/main.cpp
index 1a23466..e622dc8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -51,12 +51,14 @@ int main(int argc, char *argv[])
 
     // Initialize main window
     MainWindow *mainWindow = new MainWindow();
-    settings->apply();
     mainWindow->initialize();
 
     // Hide splash screen
     splash.finish(mainWindow);
 
+    // Apply settings (orientation, style etc.)
+    settings->apply();
+
     // Run event loop, re-start application if event loop exit code was 1000
     ret = app.exec();
     if (ret == 1000) {
diff --git a/widgets/splash.cpp b/widgets/splash.cpp
index b149e5e..3d8e94b 100755
--- a/widgets/splash.cpp
+++ b/widgets/splash.cpp
@@ -2,9 +2,12 @@
 
 #include "splash.h"
 #include "platform.h"
+#include "settings.h"
+#include "trace.h"
 
 Splash::Splash(): QSplashScreen()
 {
+    TRACE;
     Platform *platform = Platform::instance();
 #if defined(Q_OS_SYMBIAN)
     QRect geo = QApplication::desktop()->availableGeometry();
@@ -17,6 +20,7 @@ Splash::Splash(): QSplashScreen()
                    Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
     }
 #elif defined(Q_WS_MAEMO_5)
+    // Force landscape: QSplash seems to be broken in portrait
     platform->setOrientation(this, "landscape");
     setPixmap(QPixmap(platform->icon("splash-landscape", ".jpg")));
 #endif