Update action icons

Author: CrSjimo

src/libs/3rdparty/qactionkit

@@ -30,8 +30,8 @@ namespace UIShell {
         auto info = m_actionRegistry->actionInfo(id);
         auto text = info.text(true).isEmpty() ? info.text(false) : info.text(true);
         auto type = entry.type();
-        auto actionIcon = m_actionRegistry->actionIcon("", id);
-        auto iconSource = QUrl::fromLocalFile(actionIcon.filePath());
+        auto actionIcon = m_actionRegistry->actionIcon("", info.icon());
+        auto iconSource = actionIcon.url();
         auto iconColor = QColor::fromString(actionIcon.currentColor());
 
         auto ret = engine->newObject();

src/libs/3rdparty/svscraft

@@ -35,7 +35,6 @@
 #include <extensionsystem/pluginspec.h>
 
 #include <QAKCore/actionregistry.h>
-#include <QAKQuick/actioniconimageprovider.h>
 
 #include <SVSCraftQuick/Theme.h>
 
@@ -165,7 +164,6 @@ namespace Core::Internal {
 
         initializeSingletons();
         initializeBehaviorPreference();
-        initializeImageProviders();
         initializeActions();
         initializeSettings();
         initializeWindows();
@@ -291,47 +289,18 @@ namespace Core::Internal {
         new BehaviorPreference(this);
     }
 
-    void CorePlugin::initializeImageProviders() {
-        auto actionIconImageProvider = new QAK::ActionIconImageProvider;
-        actionIconImageProvider->setActionFamily(CoreInterface::actionRegistry());
-        RuntimeInterface::qmlEngine()->addImageProvider("action", actionIconImageProvider);
-    }
-
     void CorePlugin::initializeActions() {
         CoreInterface::actionRegistry()->addExtension(::getCoreActionExtension());
-
+        CoreInterface::actionRegistry()->addIconManifest(":/diffscope/coreplugin/icons/config.json");
         // TODO: move to icon manifest later
         const auto addIcon = [&](const QString &id, const QString &iconName) {
             QAK::ActionIcon icon;
-            icon.addFile(":/diffscope/coreplugin/icons/" + iconName + ".svg");
+            icon.addUrl("image://fluent-system-icons/" + iconName);
             CoreInterface::actionRegistry()->addIcon("", id, icon);
         };
-        addIcon("org.diffscope.core.homePreferences", "Settings16Filled");
-        addIcon("org.diffscope.core.help", "QuestionCircle16Filled");
-        addIcon("org.diffscope.core.file.new", "DocumentAdd16Filled");
-        addIcon("org.diffscope.core.file.open", "FolderOpen16Filled");
-        addIcon("org.diffscope.core.file.save", "Save16Filled");
-        addIcon("org.diffscope.core.settings", "Settings16Filled");
-        addIcon("org.diffscope.core.plugins", "PuzzlePiece16Filled");
-        addIcon("org.diffscope.core.showHomeWindow", "Home16Filled");
-        addIcon("org.diffscope.core.documentations", "QuestionCircle16Filled");
-        addIcon("org.diffscope.core.findActions", "Search16Filled");
-        addIcon("org.diffscope.core.edit.undo", "ArrowUndo16Filled");
-        addIcon("org.diffscope.core.edit.redo", "ArrowRedo16Filled");
-        addIcon("org.diffscope.core.edit.cut", "Cut16Filled");
-        addIcon("org.diffscope.core.edit.copy", "Copy16Filled");
-        addIcon("org.diffscope.core.edit.paste", "ClipboardPaste16Filled");
-        addIcon("org.diffscope.core.edit.delete", "Delete16Filled");
-        addIcon("org.diffscope.core.panel.properties", "TextBulletListSquareEdit20Filled");
-        addIcon("org.diffscope.core.panel.metadata", "TextBulletListSquareEdit20Filled");
-        addIcon("org.diffscope.core.panel.plugins", "PuzzlePiece16Filled");
-        addIcon("org.diffscope.visualeditor.panel.arrangement", "GanttChart16Filled");
-        addIcon("org.diffscope.visualeditor.panel.mixer", "OptionsVertical16Filled");
-        addIcon("org.diffscope.visualeditor.panel.pianoRoll", "Midi20Filled");
-        addIcon("org.diffscope.core.panel.notifications", "Alert16Filled");
-        addIcon("org.diffscope.core.panel.tips", "ChatSparkle16Filled");
-        addIcon("org.diffscope.core.timeline.goToStart", "Previous16Filled");
-        addIcon("org.diffscope.core.timeline.goToEnd", "Next16Filled");
+        addIcon("org.diffscope.visualeditor.panel.arrangement", "gantt_chart");
+        addIcon("org.diffscope.visualeditor.panel.mixer", "options_vertical");
+        addIcon("org.diffscope.visualeditor.panel.pianoRoll", "midi");
     }
 
     void CorePlugin::initializeSettings() const {

src/libs/application/uishell/src/ActionLayoutsEditorHelper.cpp

@@ -23,7 +23,6 @@ namespace Core::Internal {
 
     private:
         void initializeSingletons();
-        static void initializeImageProviders();
         static void initializeActions();
         void initializeSettings() const;
         static void initializeWindows();

src/plugins/coreplugin/internal/CorePlugin.cpp

@@ -70,7 +70,7 @@ namespace Core::Internal {
 
     void RecentFileAddOn::updateRecentFilesModel() const {
         static const QUrl dspxIconUrl{"image://appicon/dspx"};
-        static const QUrl nonExistFileIconUrl{"qrc:/diffscope/coreplugin/icons/DocumentError48Regular.svg"};
+        static const QUrl nonExistFileIconUrl{"image://fluent-system-icons/document_error?size=48&style=regular"};
         m_recentFilesModel->clear();
         for (const auto &file : CoreInterface::recentFileCollection()->recentFiles()) {
             QFileInfo fileInfo(file);

src/plugins/coreplugin/internal/CorePlugin.h

@@ -271,11 +271,11 @@ namespace Core::Internal {
         auto a = CoreInterface::actionRegistry()->catalog().children("org.diffscope.core.workspacePanelWidgets") | std::views::filter([=](const QString &id) -> bool { return windowInterface->actionContext()->action(id); });
         std::ranges::transform(a, std::back_inserter(ret), [](const QString &id) {
             auto info = CoreInterface::actionRegistry()->actionInfo(id);
-            auto actionIcon = CoreInterface::actionRegistry()->actionIcon("", info.id());
+            auto actionIcon = CoreInterface::actionRegistry()->actionIcon("", info.icon());
             return QVariantMap{
                 {"id", id},
                 {"text", info.text()},
-                {"iconSource", QUrl::fromLocalFile(actionIcon.filePath())},
+                {"iconSource", actionIcon.url()},
                 {"iconColor", QColor::fromString(actionIcon.currentColor())},
                 {"unique", info.attributes().contains(QAK::ActionAttributeKey("uniquePanel", "http://schemas.diffscope.org/diffscope/actions/diffscope"))}
             };

src/plugins/coreplugin/internal/addon/RecentFileAddOn.cpp

@@ -57,7 +57,7 @@ QtObject {
             ToolButton {
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                icon.source: "qrc:/diffscope/coreplugin/icons/Edit16Filled.svg"
+                icon.source: "image://fluent-system-icons/edit"
                 text: qsTr("Edit")
                 onClicked: () => {
 
@@ -107,7 +107,7 @@ QtObject {
                                     }
                                 }
                                 ToolButton {
-                                    icon.source: "qrc:/diffscope/coreplugin/icons/Open16Filled.svg"
+                                    icon.source: "image://fluent-system-icons/open"
                                     display: AbstractButton.IconOnly
                                     text: qsTr("Reveal in %1").arg(DesktopServices.fileManagerName)
                                     enabled: Boolean(d.fileLocker?.path)

src/plugins/coreplugin/internal/addon/WorkspaceAddOn.cpp

@@ -34,7 +34,7 @@ QtObject {
                 enabled: notificationItemsModel.count !== 0
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                icon.source: "qrc:/diffscope/coreplugin/icons/DismissSquareMultiple16Filled"
+                icon.source: "image://fluent-system-icons/dismiss_square_multiple"
                 text: qsTr("Clear All")
                 onClicked: () => {
                     let messages = d.notificationManager.messages()

src/plugins/coreplugin/qml/panels/MetadataPanel.qml

@@ -455,7 +455,7 @@ Item {
             }
             Button {
                 flat: true
-                icon.source: "qrc:/diffscope/coreplugin/icons/MoreHorizontal16Filled.svg"
+                icon.source: "image://fluent-system-icons/more_horizontal"
                 display: AbstractButton.IconOnly
                 text: qsTr("Preset Actions")
                 action: MenuAction {