[SplashScreen] use directly QSplashScreen & update splash medInria logo

src/app/medInria/main.cpp

@@ -25,8 +25,6 @@
 
 #include <medMainWindow.h>
 #include <medApplication.h>
-#include <medSplashScreen.h>
-
 #include <medPluginManager.h>
 #include <medDataIndex.h>
 #include <medDataManager.h>
@@ -90,14 +88,9 @@ int main(int argc,char* argv[])
     fmt.setAlphaBufferSize(1);
     fmt.setStereo(false);
     fmt.setSamples(0);
-
     QSurfaceFormat::setDefaultFormat(fmt);
 
-    // this needs to be done before creating the QApplication object, as per the
-    // Qt doc, otherwise there are some edge cases where the style is not fully applied
-    //QApplication::setStyle("plastique");
     medApplication application(argc,argv);
-    medSplashScreen splash(QPixmap(":/pixmaps/medInria-logo-homepage.png"));
 
     setlocale(LC_NUMERIC, "C");
     QLocale::setDefault(QLocale("C"));
@@ -116,16 +109,6 @@ int main(int argc,char* argv[])
         return 1;
     }
 
-    // Do not show the splash screen in debug builds because it hogs the
-    // foreground, hiding all other windows. This makes debugging the startup
-    // operations difficult.
-
-    #if !defined(_DEBUG)
-    bool show_splash = true;
-    #else
-    bool show_splash = false;
-    #endif
-
     QStringList posargs;
     for (int i=1;i<application.arguments().size();++i)
     {
@@ -161,8 +144,8 @@ int main(int argc,char* argv[])
     const bool DirectView = dtkApplicationArgumentsContain(&application,"--view") || posargs.size()!=0;
 
     int runningMedInria = 0;
-    if (DirectView) {
-        show_splash = false;
+    if (DirectView)
+    {
         for (QStringList::const_iterator i=posargs.constBegin();i!=posargs.constEnd();++i) {
             const QString& message = QString("/open ")+*i;
             runningMedInria = application.sendMessage(message);
@@ -174,11 +157,6 @@ int main(int argc,char* argv[])
     if (runningMedInria)
         return 0;
 
-    if (show_splash)
-    {
-        splash.show();
-    }
-
     medDataManager::instance().setDatabaseLocation();
 
 #if(USE_PYTHON)
@@ -246,8 +224,6 @@ int main(int argc,char* argv[])
        QGLFormat::setDefaultFormat(format);
     }
 
-    splash.close();
-
 #if(USE_PYTHON)
     if(!pythonErrorMessage.isEmpty())
     {

src/app/medInria/medApplication.cpp

@@ -37,6 +37,7 @@ class medApplicationPrivate
 public:
     medMainWindow *mainWindow;
     QStringList systemOpenInstructions;
+    QSplashScreen *splashScreen;
 };
 
 // /////////////////////////////////////////////////////////////////
@@ -49,6 +50,12 @@ medApplication::medApplication(int & argc, char**argv) :
 {
     d->mainWindow = nullptr;
 
+    d->splashScreen = new QSplashScreen(QPixmap(":/pixmaps/medInria-splash.png"),
+        Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
+    d->splashScreen->setAttribute(Qt::WA_DeleteOnClose, true);
+    d->splashScreen->show();
+    this->processEvents();
+
     this->setApplicationName("medInria");
     this->setApplicationVersion(MEDINRIA_VERSION);
     this->setOrganizationName("inria");
@@ -98,6 +105,9 @@ void medApplication::setMainWindow(medMainWindow *mw)
     QVariant var = QVariant::fromValue((QObject*)d->mainWindow);
     this->setProperty("MainWindow",var);
     d->systemOpenInstructions.clear();
+
+    // Wait until the app is displayed to close itself
+    d->splashScreen->finish(d->mainWindow);
 }
 
 void medApplication::redirectMessageToSplash(const QString &message)