Update

Author: SineStriker

.gitmodules

@@ -33,3 +33,7 @@
 [submodule "jetbrains-docking-system"]
 	path = libs/jetbrains-docking-system
 	url = ../../stdware/jetbrains-docking-system.git
+
+[submodule "libs/idecore"]
+	path = libs/idecore
+	url = ../../diffscope/idecore.git

libs/CMakeLists.txt

@@ -5,6 +5,7 @@ set(OPENDSPX_INSTALL off)
 set(JBDS_INSTALL off)
 set(SUBSTATE_INSTALL off)
 set(TALCS_INSTALL off)
+set(IDECORE_INSTALL off)
 
 add_subdirectory(qtmediate)
 
@@ -20,6 +21,8 @@ add_subdirectory(substate)
 
 add_subdirectory(talcs)
 
+add_subdirectory(idecore)
+
 set(CK_CMAKE_MODULES_DIR ${CMAKE_CURRENT_LIST_DIR}/choruskit/cmake PARENT_SCOPE)
 
 set(CK_CKAEC_EXECUTABLE $<TARGET_FILE:ckaec> PARENT_SCOPE)

libs/choruskit

@@ -8,7 +8,7 @@ qm_configure_target(${PROJECT_NAME}
     QT_LINKS
         Core Widgets
     LINKS_PRIVATE
-        ChorusKit::Loader ChorusKit::AppCore
+        ChorusKit::Loader idecore::Framework
     INCLUDE_PRIVATE
         ${CK_BUILD_INCLUDE_DIR}
 )

libs/idecore

@@ -2,7 +2,6 @@
 #include <QtCore/QProcess>
 #include <QtNetwork/QNetworkProxyFactory>
 #include <QtWidgets/QApplication>
-#include <QtWidgets/QToolTip>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -21,6 +20,8 @@
 
 #include <choruskit_config.h>
 
+#include <idecoreFramework/initroutine.h>
+
 class MyLoaderConfiguration : public Loader::LoaderConfiguration {
 public:
     MyLoaderConfiguration() {
@@ -55,69 +56,7 @@ class MyLoaderConfiguration : public Loader::LoaderConfiguration {
         QNetworkProxyFactory::setUseSystemConfiguration(true);
 
         // Restore language and themes
-        {
-            auto settings = ExtensionSystem::PluginManager::settings();
-            settings->beginGroup(QStringLiteral("Preferences"));
-            auto value = settings->value(QStringLiteral("Translation"));
-            if (!value.isNull()) {
-                qIDec->setLocale(value.toString());
-            }
-
-            value = settings->value(QStringLiteral("Theme"));
-            if (!value.isNull()) {
-                qIDec->setTheme(value.toString());
-            }
-
-            value = settings->value(QStringLiteral("Zoom"));
-            if (!value.isNull()) {
-                qIDec->setZoomRatio(value.toString().toDouble() / 100);
-            }
-
-            value = settings->value(QStringLiteral("Font"));
-            {
-                // Default font
-                QFont font(QMAppExtension::systemDefaultFont());
-                font.setPixelSize(12);
-
-                // Get font
-                if (!value.isNull()) {
-                    font.fromString(value.toString());
-                }
-
-                // Normalize font
-                if (font.pixelSize() <= 0) {
-                    font.setPixelSize(12);
-                }
-                qIDec->setFontRatio(font.pixelSize() / 12.0);
-
-                // The application font is determined at startup and remains unchanged, using the
-                // `userFont` property to record the changes made by the user during the current
-                // application life.
-                qApp->setProperty("userFont", font);
-                qApp->setProperty("userFontInitial", font);
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-                font.setPointSize(font.pixelSize() * 0.75 * qIDec->zoomRatio());
-#else
-                font.setPixelSize(font.pixelSize() * qIDec->zoomRatio());
-#endif
-                // Make the default font update with system dpi
-                QGuiApplication::setFont(font);
-                QToolTip::setFont(font);
-            }
-
-            value = settings->value(QStringLiteral("UseSystemFont"));
-            {
-                // Default value
-                qApp->setProperty("useSystemFont", true);
-                // Get value
-                if (value.type() == QVariant::String) {
-                    qApp->setProperty("useSystemFont",
-                                      value.toString().toLower() == QStringLiteral("true"));
-                }
-            }
-            settings->endGroup();
-        }
+        Core::InitRoutine::initializeAppearance(ExtensionSystem::PluginManager::settings());
 
         // Set ILoader settings path
         Core::ILoader &loader = *Core::ILoader::instance();
@@ -127,9 +66,6 @@ class MyLoaderConfiguration : public Loader::LoaderConfiguration {
         loader.setSettingsPath(QSettings::SystemScope,
                                QStringLiteral("%1/%2.settings.json")
                                    .arg(systemSettingsPath, QStringLiteral(APP_NAME)));
-
-        // Pass splash screen to core plugin
-        Core::ILoaderPrivate::quickData(0) = splash;
     }
 
     void afterLoadPlugins() override {

libs/qtmediate

@@ -9,9 +9,10 @@
 
 #include <CoreApi/iloader.h>
 
+#include <idecoreFramework/initroutine.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/iprojectwindow.h>
-#include <coreplugin/initroutine.h>
 
 #include <audioplugin/internal/audiosystem.h>
 #include <audioplugin/internal/outputsystem.h>

libs/svscraft

@@ -28,9 +28,9 @@ qm_configure_target(${PROJECT_NAME}
         Gui
         Widgets
     LINKS
+        idecore::Framework
         ExtensionSystem::ExtensionSystem
         ChorusKit::AppCore
-        svscraft::Widgets
         JetBrainsDockingSystem
         dspxmodel
         opendspx::opendspx

libs/talcs

@@ -21,7 +21,6 @@ namespace Core {
         explicit ActionManager(QObject *parent = nullptr);
         ~ActionManager();
 
-
     public:
         ActionDomain *domain() const;
 

src/app/CMakeLists.txt

@@ -21,10 +21,11 @@
 #include <CoreApi/iloader.h>
 #include <CoreApi/private/icorebase_p.h>
 
+#include <idecoreFramework/settingsdialog.h>
+#include <idecoreFramework/plugindialog.h>
+
 #include "dspxspec.h"
 #include "ihomewindow.h"
-#include "settingsdialog.h"
-#include "plugindialog.h"
 #include "appextra.h"
 
 namespace Core {
@@ -48,7 +49,7 @@ namespace Core {
     }
 
     int ICore::showSettingsDialog(const QString &id, QWidget *parent) {
-        static Internal::SettingsDialog *dlg = nullptr;
+        static SettingsDialog *dlg = nullptr;
 
         if (dlg) {
             if (!id.isEmpty())
@@ -58,7 +59,7 @@ namespace Core {
 
         int code;
         {
-            Internal::SettingsDialog dlg2(parent);
+            SettingsDialog dlg2(parent);
             dlg = &dlg2;
             if (!id.isEmpty())
                 dlg2.selectPage(id);
@@ -70,7 +71,7 @@ namespace Core {
     }
 
     void ICore::showPluginsDialog(QWidget *parent) {
-        Internal::PluginDialog dlg(parent);
+        PluginDialog dlg(parent);
         dlg.exec();
     }
 

src/app/main.cpp

@@ -18,8 +18,9 @@
 #include <CoreApi/private/iloader_p.h>
 #include <CoreApi/actiondomain.h>
 
+#include <idecoreFramework/initroutine.h>
+
 #include "dspxspec.h"
-#include "initroutine_p.h"
 
 // Windows
 #include "ihomewindow.h"
@@ -30,8 +31,9 @@
 #include "projectaddon.h"
 
 // Settings
+#include <idecoreFramework/appearancepage.h>
+
 #include "enviromenttoppage.h"
-#include "appearancepage.h"
 #include "actionlayoutspage.h"
 #include "keymappage.h"
 #include "menutoolbarpage.h"
@@ -46,8 +48,6 @@ namespace Core::Internal {
 
     static QSplashScreen *splash = nullptr;
 
-    InitRoutinePrivate *ir = nullptr;
-
     static int openFileFromCommand(QString workingDir, const QStringList &args, IWindow *iWin) {
         int cnt = 0;
 
@@ -87,18 +87,11 @@ namespace Core::Internal {
     }
 
     bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) {
-        // Receive splash screen
-        std::swap(splash, reinterpret_cast<QSplashScreen *&>(ILoaderPrivate::quickData(0)));
-
-        static InitRoutinePrivate ir1;
-        ir = &ir1;
-        ir->splash = splash;
-
         // Add resources
         qIDec->addTranslationPath(pluginSpec()->location() + QStringLiteral("/translations"));
         qIDec->addThemePath(pluginSpec()->location() + QStringLiteral("/themes"));
 
-        splash->showMessage(tr("Initializing core plugin..."));
+        InitRoutine::splash()->showMessage(tr("Initializing core plugin..."));
 
         // Init ICore instance
         icore = new ICore(this);
@@ -171,8 +164,8 @@ namespace Core::Internal {
     bool CorePlugin::delayedInitialize() {
         splash->showMessage(tr("Initializing user interface..."));
 
-        if (ir->entry) {
-            waitSplash(ir->entry());
+        if (auto entry = InitRoutine::startEntry()) {
+            waitSplash(entry());
             return false;
         }