Minor fixes

Moved splash messages
r52 · Nov 3, 2017 · c6889e3 · c6889e3
1 parent 0aad975
commit c6889e3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/plugins/win_audio_viz/win_audio_viz.cpp b/plugins/win_audio_viz/win_audio_viz.cpp
@@ -44,7 +44,7 @@
 
 quasar_data_source_t sources[1] =
     {
-      { "viz", -1, 0 }
+        { "viz", -1, 0 }
     };
 
 using namespace kfr;
@@ -670,21 +670,21 @@ void win_audio_viz_update_settings(quasar_settings_t* settings)
 
 quasar_plugin_info_t info =
     {
-      QUASAR_API_VERSION,
-      PLUGIN_NAME,
-      PLUGIN_CODE,
-      "v1",
-      "me",
-      "Supplies desktop audio frequency data",
-
-      _countof(sources),
-      sources,
-
-      win_audio_viz_init,            //init
-      win_audio_viz_shutdown,        //shutdown
-      win_audio_viz_get_data,        //data
-      win_audio_viz_create_settings, //create setting
-      win_audio_viz_update_settings  // update setting
+        QUASAR_API_VERSION,
+        PLUGIN_NAME,
+        PLUGIN_CODE,
+        "v1",
+        "me",
+        "Supplies desktop audio frequency data",
+
+        std::size(sources),
+        sources,
+
+        win_audio_viz_init,            //init
+        win_audio_viz_shutdown,        //shutdown
+        win_audio_viz_get_data,        //data
+        win_audio_viz_create_settings, //create setting
+        win_audio_viz_update_settings  // update setting
     };
 
 quasar_plugin_info_t* quasar_plugin_load(void)

diff --git a/plugins/win_simple_perf/win_simple_perf.cpp b/plugins/win_simple_perf/win_simple_perf.cpp
@@ -140,7 +140,7 @@ quasar_plugin_info_t info =
         "me",
         "Sample plugin that queries basic performance numbers",
 
-        _countof(sources),
+        std::size(sources),
         sources,
 
         simple_perf_init,

diff --git a/src/main.cpp b/src/main.cpp
@@ -25,13 +25,16 @@ int main(int argc, char* argv[])
     QSplashScreen splash(pixmap);
     splash.show();
 
+    splash.showMessage("Loading configuration...", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    a.processEvents();
+
     QApplication::setApplicationName("Quasar");
     QApplication::setOrganizationName("Quasar");
     QSettings::setDefaultFormat(QSettings::IniFormat);
 
     QWebEngineProfile::defaultProfile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
 
-    splash.showMessage("Loaded configuration", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    splash.showMessage("Loading modules...", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
     a.processEvents();
 
     // preload
@@ -41,12 +44,12 @@ int main(int argc, char* argv[])
     WidgetRegistry* reg      = new WidgetRegistry();
     AppLauncher*    launcher = new AppLauncher(server, reg);
 
-    splash.showMessage("Loaded modules", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
-    a.processEvents();
-
     Quasar w(log, server, reg, launcher);
     w.hide();
 
+    splash.showMessage("Loading widgets...", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    a.processEvents();
+
     // Load widgets
     QSettings   settings;
     QStringList loadedList = settings.value(QUASAR_CONFIG_LOADED).toStringList();
@@ -56,9 +59,6 @@ int main(int argc, char* argv[])
         reg->loadWebWidget(f, false);
     }
 
-    splash.showMessage("Loaded widgets", Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
-    a.processEvents();
-
     splash.finish(&w);
 
     return a.exec();