[Splash] remove duplicated lines

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,38 +88,10 @@ 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);
 
-    // Themes
-    QVariant themeChosen = medSettingsManager::instance()->value("startup","theme");
-    int themeIndex = themeChosen.toInt();
-    QPixmap splashLogo;
-    switch (themeIndex)
-    {
-        case 0:
-        case 1:
-        case 2:
-        default:
-        {
-            splashLogo.load(":MUSICardio_logo_darkbackground_notext.png");
-            break;
-        }
-        case 3:
-        case 4:
-        {
-            splashLogo.load(":MUSICardio_logo_lightbackground_notext.png");
-            break;
-        }
-    }
-    splashLogo = splashLogo.scaled(914, 147, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    medSplashScreen splash(splashLogo);
-
     setlocale(LC_NUMERIC, "C");
     QLocale::setDefault(QLocale("C"));
 
@@ -139,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)
     {
@@ -184,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);
@@ -197,11 +157,6 @@ int main(int argc,char* argv[])
     if (runningMedInria)
         return 0;
 
-    if (show_splash)
-    {
-        splash.show();
-    }
-
     medDataManager::instance()->setDatabaseLocation();
 
 #if(USE_PYTHON)
@@ -285,8 +240,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,34 @@ medApplication::medApplication(int & argc, char**argv) :
 {
     d->mainWindow = nullptr;
 
+    // Themes
+    QVariant themeChosen = medSettingsManager::instance().value("startup","theme");
+    int themeIndex = themeChosen.toInt();
+    QPixmap splashLogo;
+    switch (themeIndex)
+    {
+        case 0:
+        case 1:
+        case 2:
+        default:
+        {
+            splashLogo.load(":MUSICardio-2023-lightfont-notext-darkback-margin10.png");
+            break;
+        }
+        case 3:
+        case 4:
+        {
+            splashLogo.load(":MUSICardio-2023-darkfont-notext-whiteback-margin10.png");
+            break;
+        }
+    }
+    splashLogo = splashLogo.scaled(914, 147, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    d->splashScreen = new QSplashScreen(splashLogo,
+                                        Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
+    d->splashScreen->show();
+    this->processEvents();
+    d->splashScreen->repaint();
+
     this->setApplicationName(PROJECT_NAME); /*Beware, change database path*/
     this->setApplicationVersion(MEDINRIA_VERSION);
     this->setOrganizationName("INRIA_IHU-LIRYC"); /*Beware, change database path*/
@@ -80,10 +109,6 @@ medApplication::medApplication(int & argc, char**argv) :
         ::exit(1);
     }
 
-    // Themes
-    QVariant themeChosen = medSettingsManager::instance()->value("startup","theme");
-    int themeIndex = themeChosen.toInt();
-
     QString qssFile;
     switch (themeIndex)
     {
@@ -146,6 +171,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)

src/app/medInria/resources/medInria.qrc

@@ -168,8 +168,8 @@
 
         <file>../../../../LICENSE_MUSICardio.txt</file>
         <file>../../../../LICENSES_EXT.txt</file>
-        <file>MUSICardio_logo_lightbackground_notext.png</file>
-        <file>MUSICardio_logo_darkbackground_notext.png</file>
+        <file>MUSICardio-2023-lightfont-notext-darkback-margin10.png</file>
+        <file>MUSICardio-2023-darkfont-notext-whiteback-margin10.png</file>
         <file>MUSICardio_logo_light.png</file>
         <file>MUSICardio_logo_small_light.png</file>
         <file>MUSICardio_logo_dark.png</file>