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
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;
}