Load modules asynchronously on startup.

src/calamares/CalamaresApplication.cpp

@@ -20,6 +20,7 @@
 
 #include "CalamaresWindow.h"
 #include "CalamaresVersion.h"
+#include "ModuleLoader.h"
 #include "Settings.h"
 #include "utils/CalamaresUtils.h"
 #include "utils/Logger.h"
@@ -55,11 +56,6 @@ CalamaresApplication::init()
     setWindowIcon( QIcon( "from branding" ) );
 
     initPlugins();
-
-    initJobQueue();
-
-    m_mainwindow = new CalamaresWindow();
-    m_mainwindow->show();
 }
 
 
@@ -85,6 +81,20 @@ CalamaresApplication::instance()
 }
 
 
+void
+CalamaresApplication::setDebug( bool enabled )
+{
+    m_debugMode = enabled;
+}
+
+
+bool
+CalamaresApplication::isDebug()
+{
+    return m_debugMode;
+}
+
+
 void
 CalamaresApplication::initSettings()
 {
@@ -102,28 +112,26 @@ CalamaresApplication::initBranding()
 void
 CalamaresApplication::initPlugins()
 {
-
+    m_moduleLoader = new Calamares::ModuleLoader(
+        Calamares::Settings::instance()->modulesSearchPaths(), this );
+    connect( m_moduleLoader, &Calamares::ModuleLoader::done,
+             this,           &CalamaresApplication::onPluginsReady );
+    m_moduleLoader->start();
 }
 
 
 void
-CalamaresApplication::initJobQueue()
+CalamaresApplication::onPluginsReady()
 {
+    initJobQueue();
 
+    m_mainwindow = new CalamaresWindow();
+    m_mainwindow->show();
 }
 
 
 void
-CalamaresApplication::setDebug( bool enabled )
+CalamaresApplication::initJobQueue()
 {
-    m_debugMode = enabled;
-}
-
 
-bool
-CalamaresApplication::isDebug()
-{
-    return m_debugMode;
 }
-
-

src/calamares/CalamaresApplication.h

@@ -25,6 +25,11 @@
 
 class CalamaresWindow;
 
+namespace Calamares
+{
+class ModuleLoader;
+}
+
 class CalamaresApplication : public QApplication
 {
     Q_OBJECT
@@ -35,16 +40,20 @@ public:
     void init();
     static CalamaresApplication* instance();
 
+    void setDebug( bool enabled );
+    bool isDebug();
+
+private slots:
+    void onPluginsReady();
+
+private:
     void initSettings();
     void initBranding();
     void initPlugins();
     void initJobQueue();
 
-    void setDebug( bool enabled );
-    bool isDebug();
-
-private:
     CalamaresWindow* m_mainwindow;
+    Calamares::ModuleLoader* m_moduleLoader;
 
     bool m_debugMode;
     //QPointer< Calamares::JobQueue > m_jobQueue;