Refactor property editor management

Author: CrSjimo

src/plugins/coreplugin/core/CoreInterface.cpp

@@ -47,7 +47,6 @@
 #include <coreplugin/OpenSaveProjectFileScenario.h>
 #include <coreplugin/ProjectDocumentContext.h>
 #include <coreplugin/ProjectWindowInterface.h>
-#include <coreplugin/PropertyEditorManager.h>
 #include <coreplugin/TrackColorSchema.h>
 #include <coreplugin/DefaultLyricManager.h>
 
@@ -64,7 +63,6 @@ namespace Core {
         QQmlEngine *qmlEngine;
         QAK::ActionRegistry *actionRegistry;
         DspxCheckerRegistry *dspxCheckerRegistry;
-        PropertyEditorManager *propertyEditorManager;
         TrackColorSchema *trackColorSchema;
         DefaultLyricManager *defaultLyricManager;
 
@@ -73,7 +71,6 @@ namespace Core {
             qmlEngine = new QQmlEngine(q);
             actionRegistry = new QAK::ActionRegistry(q);
             dspxCheckerRegistry = new DspxCheckerRegistry(q);
-            propertyEditorManager = new PropertyEditorManager(q);
             trackColorSchema = new TrackColorSchema(q);
             defaultLyricManager = new DefaultLyricManager(q);
         }
@@ -100,11 +97,6 @@ namespace Core {
         return instance()->d_func()->dspxCheckerRegistry;
     }
 
-    PropertyEditorManager *CoreInterface::propertyEditorManager() {
-        Q_ASSERT(instance());
-        return instance()->d_func()->propertyEditorManager;
-    }
-
     TrackColorSchema *CoreInterface::trackColorSchema() {
         Q_ASSERT(instance());
         return instance()->d_func()->trackColorSchema;

src/plugins/coreplugin/core/CoreInterface.h

@@ -37,7 +37,6 @@ namespace Core {
         QML_SINGLETON
         Q_DECLARE_PRIVATE(CoreInterface)
         Q_PROPERTY(QAK::ActionRegistry *actionRegistry READ actionRegistry CONSTANT)
-        Q_PROPERTY(PropertyEditorManager *propertyEditorManager READ propertyEditorManager CONSTANT)
         Q_PROPERTY(TrackColorSchema *trackColorSchema READ trackColorSchema CONSTANT)
         Q_PROPERTY(DefaultLyricManager *defaultLyricManager READ defaultLyricManager CONSTANT)
     public:
@@ -48,8 +47,6 @@ namespace Core {
 
         static DspxCheckerRegistry *dspxCheckerRegistry();
 
-        static PropertyEditorManager *propertyEditorManager();
-
         static TrackColorSchema *trackColorSchema();
 
         static DefaultLyricManager *defaultLyricManager();

src/plugins/coreplugin/core/PropertyEditorManager.cpp

@@ -63,7 +63,6 @@
 #include <coreplugin/internal/UndoAddOn.h>
 #include <coreplugin/internal/ViewVisibilityAddOn.h>
 #include <coreplugin/internal/WorkspaceAddOn.h>
-#include <coreplugin/PropertyEditorManager.h>
 
 static auto getCoreActionExtension() {
     return QAK_STATIC_ACTION_EXTENSION(coreplugin);
@@ -377,38 +376,38 @@ namespace Core::Internal {
     }
 
     void CorePlugin::initializePropertyEditors() {
-        const auto f = [=, this](const QString &typeName, void(PropertyEditorManager::*addMethod)(QQmlComponent *)) {
+        const auto f = [=, this](const QString &typeName, const QString &id) {
             auto component = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", typeName, this);
             if (component->isError()) {
                 qFatal() << component->errorString();
             }
-            (CoreInterface::propertyEditorManager()->*addMethod)(component);
+            RuntimeInterface::instance()->addObject(id, component);
         };
-        f("MetadataPropertyEditor", &PropertyEditorManager::addNoneComponent);
-        f("MasterControlPropertyEditor", &PropertyEditorManager::addNoneComponent);
-        f("LoopPropertyEditor", &PropertyEditorManager::addNoneComponent);
+        f("MetadataPropertyEditor", "org.diffscope.core.propertyeditor.document");
+        f("MasterControlPropertyEditor", "org.diffscope.core.propertyeditor.document");
+        f("LoopPropertyEditor", "org.diffscope.core.propertyeditor.document");
 
-        f("ClipPropertyEditor", &PropertyEditorManager::addClipComponent);
-        f("AudioPropertyEditor", &PropertyEditorManager::addClipComponent);
-        f("VirtualSingerPropertyEditor", &PropertyEditorManager::addClipComponent);
-        f("ControlPropertyEditor", &PropertyEditorManager::addClipComponent);
-        f("ClipTimePropertyEditor", &PropertyEditorManager::addClipComponent);
+        f("ClipPropertyEditor", "org.diffscope.core.propertyeditor.clip");
+        f("AudioPropertyEditor", "org.diffscope.core.propertyeditor.clip");
+        f("VirtualSingerPropertyEditor", "org.diffscope.core.propertyeditor.clip");
+        f("ControlPropertyEditor", "org.diffscope.core.propertyeditor.clip");
+        f("ClipTimePropertyEditor", "org.diffscope.core.propertyeditor.clip");
 
-        f("LabelPropertyEditor", &PropertyEditorManager::addLabelComponent);
+        f("LabelPropertyEditor", "org.diffscope.core.propertyeditor.label");
 
-        f("NotePropertyEditor", &PropertyEditorManager::addNoteComponent);
-        f("NoteLyricPropertyEditor", &PropertyEditorManager::addNoteComponent);
-        f("NotePitchPropertyEditor", &PropertyEditorManager::addNoteComponent);
-        f("NoteTimePropertyEditor", &PropertyEditorManager::addNoteComponent);
-        f("NotePhonemePropertyEditor", &PropertyEditorManager::addNoteComponent);
+        f("NotePropertyEditor", "org.diffscope.core.propertyeditor.note");
+        f("NoteLyricPropertyEditor", "org.diffscope.core.propertyeditor.note");
+        f("NotePitchPropertyEditor", "org.diffscope.core.propertyeditor.note");
+        f("NoteTimePropertyEditor", "org.diffscope.core.propertyeditor.note");
+        f("NotePhonemePropertyEditor", "org.diffscope.core.propertyeditor.note");
 
-        f("TempoPropertyEditor", &PropertyEditorManager::addTempoComponent);
+        f("TempoPropertyEditor", "org.diffscope.core.propertyeditor.tempo");
 
-        f("TrackPropertyEditor", &PropertyEditorManager::addTrackComponent);
-        f("ControlPropertyEditor", &PropertyEditorManager::addTrackComponent);
-        f("TrackDisplayPropertyEditor", &PropertyEditorManager::addTrackComponent);
+        f("TrackPropertyEditor", "org.diffscope.core.propertyeditor.track");
+        f("ControlPropertyEditor", "org.diffscope.core.propertyeditor.track");
+        f("TrackDisplayPropertyEditor", "org.diffscope.core.propertyeditor.track");
 
-        f("KeySignaturePropertyEditor", &PropertyEditorManager::addKeySignatureComponent);
+        f("KeySignaturePropertyEditor", "org.diffscope.core.propertyeditor.keysignature");
 
     }
 

src/plugins/coreplugin/core/PropertyEditorManager.h

@@ -33,6 +33,16 @@ namespace Core::Internal {
     bool PropertiesAddOn::delayedInitialize() {
         return WindowInterfaceAddOn::delayedInitialize();
     }
+    QList<QQmlComponent *> PropertiesAddOn::getComponents(const QString &id) {
+        auto list = RuntimeInterface::instance()->getObjects("org.diffscope.core.propertyeditor." + id);
+        QList<QQmlComponent *> result;
+        for (auto obj : list) {
+            if (auto component = qobject_cast<QQmlComponent *>(obj)) {
+                result.append(component);
+            }
+        }
+        return result;
+    }
 }
 
 #include "moc_PropertiesAddOn.cpp"

src/plugins/coreplugin/core/PropertyEditorManager_p.h

@@ -3,6 +3,8 @@
 
 #include <CoreApi/windowinterface.h>
 
+class QQmlComponent;
+
 namespace Core::Internal {
 
     class PropertiesAddOn : public WindowInterfaceAddOn {
@@ -15,6 +17,8 @@ namespace Core::Internal {
         void extensionsInitialized() override;
         bool delayedInitialize() override;
 
+        Q_INVOKABLE static QList<QQmlComponent *> getComponents(const QString &id) ;
+
     private:
     };