X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=main.cpp;h=1a23466e6c10a5cf7699b400d7eb0b9b040d2321;hb=d32af855518f5b94cda767f60c8a1b98b4602f99;hp=c1b25ce546ae6350cd76f3a38ede6a72944c7f39;hpb=9736402a4c58e2d33b7a4ced8eb9b684adfaf352;p=dorian

diff --git a/main.cpp b/main.cpp
index c1b25ce..1a23466 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,12 +1,18 @@
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-#include <unistd.h>
-#endif
-
 #include <QtGui/QApplication>
 
 #include "mainwindow.h"
 #include "trace.h"
 #include "settings.h"
+#include "library.h"
+#include "settings.h"
+#include "bookdb.h"
+#include "search.h"
+#include "platform.h"
+#include "splash.h"
+
+#ifdef Q_OS_SYMBIAN
+#   include "mediakeysobserver.h"
+#endif
 
 static const char *DORIAN_VERSION =
 #include "pkg/version.txt"
@@ -22,33 +28,51 @@ static const QtMsgType DORIAN_DEFAULT_TRACE_LEVEL =
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+    int ret;
 
-    a.setApplicationName("Dorian");
-    a.setApplicationVersion(DORIAN_VERSION);
-    a.setOrganizationDomain("pipacs.com");
-    a.setOrganizationName("Pipacs");
+    // Set up application
+    QApplication app(argc, argv);
+    app.setApplicationName("Dorian");
+    app.setApplicationVersion(DORIAN_VERSION);
+    app.setOrganizationDomain("pipacs.com");
+    app.setOrganizationName("Pipacs");
 
-    Trace::level = (QtMsgType)Settings::instance()->
+    // Initialize tracing
+    Settings *settings = Settings::instance();
+    Trace::level = (QtMsgType)settings->
         value("tracelevel", (int)DORIAN_DEFAULT_TRACE_LEVEL).toInt();
+    Trace::setFileName(settings->value("tracefilename").toString());
     qInstallMsgHandler(Trace::messageHandler);
 
-    MainWindow w;
-    w.show();
+    // Show splash screen
+    Splash splash;
+    splash.show();
+    app.processEvents();
 
-#if 0 // FIXME #ifdef Q_OS_SYMBIAN
-    // Remove context menu from all widgets
-    foreach (QWidget *w, QApplication::allWidgets()) {
-        w->setContextMenuPolicy(Qt::NoContextMenu);
-    }
-#endif // Q_OS_SYMBIAN
+    // Initialize main window
+    MainWindow *mainWindow = new MainWindow();
+    settings->apply();
+    mainWindow->initialize();
 
-    int ret = a.exec();
+    // Hide splash screen
+    splash.finish(mainWindow);
+
+    // Run event loop, re-start application if event loop exit code was 1000
+    ret = app.exec();
     if (ret == 1000) {
-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-        extern char **environ;
-        execve(argv[0], argv, environ);
-#endif
+        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
+
     return ret;
 }