X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=main.cpp;h=b6558660fa3488f9f1c8ae0b15f2913df66364f9;hb=e5e113cbbbd0691ac179e311fe57082f992a63a0;hp=8cd02b23bf146328263c14f217ffab1bcee2f316;hpb=5cad671b0742ca2b922edcb5e7a77f8816e59269;p=dorian

diff --git a/main.cpp b/main.cpp
index 8cd02b2..b655866 100644
--- a/main.cpp
+++ b/main.cpp
@@ -44,21 +44,30 @@ int main(int argc, char *argv[])
     Trace::setFileName(settings->value("tracefilename").toString());
     qInstallMsgHandler(Trace::messageHandler);
 
-#ifdef Q_OS_SYMBIAN
+#if 0 // def Q_OS_SYMBIAN
     // Show splash screen
     Splash *splash = new Splash();
     splash->showFullScreen();
+    // splash->showMaximized();
+    splash->raise();
     a.processEvents();
 #endif
 
-    // Create main window, run event loop
-    {
-        MainWindow w;
-#ifdef Q_OS_SYMBIAN
-        splash->close();
-        splash->deleteLater();
+    // Create and initialize main window, then run event loop
+    MainWindow *mainWindow = new MainWindow();
+    settings->apply();
+    mainWindow->initialize();
+#if 0 // def Q_OS_SYMBIAN
+    splash->close();
+    delete splash;
+    mainWindow->showNormal();
 #endif
-        ret = a.exec();
+    ret = a.exec();
+    delete mainWindow;
+
+    // Re-start application if event loop exit code was 1000
+    if (ret == 1000) {
+        Platform::instance()->restart(argv);
     }
 
     // Release singletons
@@ -66,13 +75,10 @@ int main(int argc, char *argv[])
     BookDb::close();
     Settings::close();
     Search::close();
+    Platform::close();
 #ifdef Q_OS_SYMBIAN
     MediaKeysObserver::close();
 #endif
 
-    // Re-start application if event loop exit code was 1000
-    if (ret == 1000) {
-        Platform::restart(argv);
-    }
     return ret;
 }