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

diff --git a/main.cpp b/main.cpp
index 8cd02b2..69bf13c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,11 +31,11 @@ int main(int argc, char *argv[])
     int ret;
 
     // Set up application
-    QApplication a(argc, argv);
-    a.setApplicationName("Dorian");
-    a.setApplicationVersion(DORIAN_VERSION);
-    a.setOrganizationDomain("pipacs.com");
-    a.setOrganizationName("Pipacs");
+    QApplication app(argc, argv);
+    app.setApplicationName("Dorian");
+    app.setApplicationVersion(DORIAN_VERSION);
+    app.setOrganizationDomain("pipacs.com");
+    app.setOrganizationName("Pipacs");
 
     // Initialize tracing
     Settings *settings = Settings::instance();
@@ -46,33 +46,37 @@ int main(int argc, char *argv[])
 
 #ifdef Q_OS_SYMBIAN
     // Show splash screen
-    Splash *splash = new Splash();
-    splash->showFullScreen();
-    a.processEvents();
+    Splash splash;
+    splash.show();
+    app.processEvents();
 #endif
 
-    // Create main window, run event loop
-    {
-        MainWindow w;
+    // Initialize main window
+    MainWindow *mainWindow = new MainWindow();
+    settings->apply();
+    mainWindow->initialize();
+
 #ifdef Q_OS_SYMBIAN
-        splash->close();
-        splash->deleteLater();
+    // Hide splash screen
+    splash.finish(mainWindow);
 #endif
-        ret = a.exec();
+
+    // Run event loop, Re-start application if event loop exit code was 1000
+    ret = app.exec();
+    if (ret == 1000) {
+        Platform::instance()->restart(argv);
     }
 
     // Release singletons
+    delete mainWindow;
     Library::close();
     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;
 }