Skip to content

Commit 833eb13

Browse files
CrSjimoCrSjimo
committed
Update identifiers
1 parent 8bd0dd2 commit 833eb13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+649
-648
lines changed

‎src/app/main.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class MyLoaderSpec : public Loader::LoaderSpec {
5252
splashConfigPath = ApplicationInfo::applicationLocation(ApplicationInfo::BuiltinResources) +
5353
QStringLiteral("/config.json");
5454
pluginPaths << ApplicationInfo::applicationLocation(ApplicationInfo::BuiltinPlugins);
55+
coreName = QStringLiteral("org.diffscope.core");
5556
}
5657

5758
QSettings *createExtensionSystemSettings(QSettings::Scope scope) override {

‎src/plugins/achievement/plugin.json.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"Url": "@APPLICATION_URL@",
1818
"Required": false,
1919
"Dependencies" : [
20-
{ "Name" : "Core", "Version" : "@PLUGIN_METADATA_VERSION@" }
20+
{ "Name" : "org.diffscope.core", "Version" : "@PLUGIN_METADATA_VERSION@" }
2121
]
2222
}

‎src/plugins/achievement/qml/actions/AchievementActions.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ActionCollection {
1616
required property AchievementAddOn addOn
1717

1818
ActionItem {
19-
actionId: "achievement.achievements"
19+
actionId: "org.diffscope.achievement.achievements"
2020
Action {
2121
onTriggered: () => {
2222
let window = d.addOn.window

‎src/plugins/achievement/res/org.diffscope.achievement_actions.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<version>1.0</version>
44
<id>org.diffscope.achievement</id>
55
<configuration>
6-
<defaultCatalog>core.mainMenu</defaultCatalog>
6+
<defaultCatalog>org.diffscope.core.mainMenu</defaultCatalog>
77
<translationContext
88
text="Application::ActionText"
99
class="Application::ActionClass"
@@ -15,12 +15,12 @@
1515
</configuration>
1616

1717
<items>
18-
<action id="achievement.achievements" />
18+
<action id="org.diffscope.achievement.achievements" />
1919
</items>
2020

2121
<insertions>
22-
<insertion target="core.help" anchor="last">
23-
<action id="achievement.achievements" />
22+
<insertion target="org.diffscope.core.help" anchor="last">
23+
<action id="org.diffscope.achievement.achievements" />
2424
</insertion>
2525
</insertions>
2626

‎src/plugins/audio/plugin.json.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"Description": "The audio plugin for @APPLICATION_DISPLAY_NAME@.",
1717
"Url": "@APPLICATION_URL@",
1818
"Dependencies" : [
19-
{ "Name" : "Core", "Version" : "@PLUGIN_METADATA_VERSION@" }
19+
{ "Name" : "org.diffscope.core", "Version" : "@PLUGIN_METADATA_VERSION@" }
2020
]
2121
}

‎src/plugins/audio/res/org.diffscope.audio_actions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<version>1.0</version>
44
<id>org.diffscope.core</id>
55
<configuration>
6-
<defaultCatalog>core.mainMenu</defaultCatalog>
6+
<defaultCatalog>org.diffscope.core.mainMenu</defaultCatalog>
77
<translationContext
88
text="Application::ActionText"
99
class="Application::ActionClass"

‎src/plugins/coreplugin/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(coreplugin
44
)
55

66
diffscope_add_builtin_plugin(${PROJECT_NAME}
7-
NAME Core
7+
NAME org.diffscope.core
88
DISPLAY_NAME Core
99
MACRO_PREFIX CORE
1010
QML_MODULE_NAME Core

‎src/plugins/coreplugin/core/CoreInterface.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ namespace Core {
9999

100100
auto settings = RuntimeInterface::settings();
101101
settings->beginGroup("DiffScope.Core.SettingDialog");
102-
settings->setValue("currentId", settings->value("currentId", "core.General"));
102+
settings->setValue("currentId", settings->value("currentId", "org.diffscope.core.General"));
103103
qCDebug(lcCoreInterface) << "Saved current id" << settings->value("currentId").toString();
104104
settings->endGroup();
105105

‎src/plugins/coreplugin/internal/CorePlugin.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -320,32 +320,32 @@ namespace Core::Internal {
320320
icon.addFile(":/diffscope/coreplugin/icons/" + iconName + ".svg");
321321
CoreInterface::actionRegistry()->addIcon("", id, icon);
322322
};
323-
addIcon("core.homePreferences", "Settings16Filled");
324-
addIcon("core.help", "QuestionCircle16Filled");
325-
addIcon("core.file.new", "DocumentAdd16Filled");
326-
addIcon("core.file.open", "FolderOpen16Filled");
327-
addIcon("core.file.save", "Save16Filled");
328-
addIcon("core.settings", "Settings16Filled");
329-
addIcon("core.plugins", "PuzzlePiece16Filled");
330-
addIcon("core.showHomeWindow", "Home16Filled");
331-
addIcon("core.documentations", "QuestionCircle16Filled");
332-
addIcon("core.findActions", "Search16Filled");
333-
addIcon("core.edit.undo", "ArrowUndo16Filled");
334-
addIcon("core.edit.redo", "ArrowRedo16Filled");
335-
addIcon("core.edit.cut", "Cut16Filled");
336-
addIcon("core.edit.copy", "Copy16Filled");
337-
addIcon("core.edit.paste", "ClipboardPaste16Filled");
338-
addIcon("core.edit.delete", "Delete16Filled");
339-
addIcon("core.panel.properties", "TextBulletListSquareEdit20Filled");
340-
addIcon("core.panel.metadata", "TextBulletListSquareEdit20Filled");
341-
addIcon("core.panel.plugins", "PuzzlePiece16Filled");
342-
addIcon("core.panel.arrangement", "GanttChart16Filled");
343-
addIcon("core.panel.mixer", "OptionsVertical16Filled");
344-
addIcon("core.panel.pianoRoll", "Midi20Filled");
345-
addIcon("core.panel.notifications", "Alert16Filled");
346-
addIcon("core.panel.tips", "ChatSparkle16Filled");
347-
addIcon("core.timeline.goToStart", "Previous16Filled");
348-
addIcon("core.timeline.goToEnd", "Next16Filled");
323+
addIcon("org.diffscope.core.homePreferences", "Settings16Filled");
324+
addIcon("org.diffscope.core.help", "QuestionCircle16Filled");
325+
addIcon("org.diffscope.core.file.new", "DocumentAdd16Filled");
326+
addIcon("org.diffscope.core.file.open", "FolderOpen16Filled");
327+
addIcon("org.diffscope.core.file.save", "Save16Filled");
328+
addIcon("org.diffscope.core.settings", "Settings16Filled");
329+
addIcon("org.diffscope.core.plugins", "PuzzlePiece16Filled");
330+
addIcon("org.diffscope.core.showHomeWindow", "Home16Filled");
331+
addIcon("org.diffscope.core.documentations", "QuestionCircle16Filled");
332+
addIcon("org.diffscope.core.findActions", "Search16Filled");
333+
addIcon("org.diffscope.core.edit.undo", "ArrowUndo16Filled");
334+
addIcon("org.diffscope.core.edit.redo", "ArrowRedo16Filled");
335+
addIcon("org.diffscope.core.edit.cut", "Cut16Filled");
336+
addIcon("org.diffscope.core.edit.copy", "Copy16Filled");
337+
addIcon("org.diffscope.core.edit.paste", "ClipboardPaste16Filled");
338+
addIcon("org.diffscope.core.edit.delete", "Delete16Filled");
339+
addIcon("org.diffscope.core.panel.properties", "TextBulletListSquareEdit20Filled");
340+
addIcon("org.diffscope.core.panel.metadata", "TextBulletListSquareEdit20Filled");
341+
addIcon("org.diffscope.core.panel.plugins", "PuzzlePiece16Filled");
342+
addIcon("org.diffscope.core.panel.arrangement", "GanttChart16Filled");
343+
addIcon("org.diffscope.core.panel.mixer", "OptionsVertical16Filled");
344+
addIcon("org.diffscope.core.panel.pianoRoll", "Midi20Filled");
345+
addIcon("org.diffscope.core.panel.notifications", "Alert16Filled");
346+
addIcon("org.diffscope.core.panel.tips", "ChatSparkle16Filled");
347+
addIcon("org.diffscope.core.timeline.goToStart", "Previous16Filled");
348+
addIcon("org.diffscope.core.timeline.goToEnd", "Next16Filled");
349349
}
350350

351351
void CorePlugin::initializeSettings() const {

‎src/plugins/coreplugin/internal/addon/MetadataAddOn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Core::Internal {
2929
},
3030
RuntimeInterface::qmlEngine()->rootContext());
3131
o->setParent(this);
32-
windowInterface->actionContext()->addAction("core.panel.metadata", o->property("metadataPanelComponent").value<QQmlComponent *>());
32+
windowInterface->actionContext()->addAction("org.diffscope.core.panel.metadata", o->property("metadataPanelComponent").value<QQmlComponent *>());
3333
}
3434

3535
void MetadataAddOn::extensionsInitialized() {

0 commit comments

Comments
 (0)