QmlDesigner: Rename Effect Maker to Effect Composer

Only in the UI. No code renamings for now.

Fixes: QDS-11781
Change-Id: I257c649750ae30cbf4981073be2e6bfc9c92b4df
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

13 files changed, 20 insertions, 20 deletions

diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml
index 08cf51ee49..b5e0953ec3 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml
@@ -75,7 +75,7 @@ Rectangle {
 
         style: StudioTheme.Values.viewBarButtonStyle
         buttonIcon: StudioTheme.Constants.help
-        tooltip: qsTr("How to use Effect Maker:
+        tooltip: qsTr("How to use Effect Composer:
 1. Click \"+ Add Effect\" to add effect node
 2. Adjust the effect nodes properties
 3. Change the order of the effects, if you like
diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/SaveAsDialog.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/SaveAsDialog.qml
index eef2411669..16ce11b630 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/SaveAsDialog.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/SaveAsDialog.qml
@@ -18,7 +18,7 @@ StudioControls.Dialog {
     implicitWidth: 250
     implicitHeight: 160
 
-    property bool clearOnClose: false // clear the effect maker after saving
+    property bool clearOnClose: false // clear the effect composer after saving
 
     onOpened: {
         nameText.text = EffectMakerBackend.effectMakerModel.getUniqueEffectName()
diff --git a/share/qtcreator/qmldesigner/workspacePresets/Views-All.wrk b/share/qtcreator/qmldesigner/workspacePresets/Views-All.wrk
index 011ead83a6..f072a348f3 100644
--- a/share/qtcreator/qmldesigner/workspacePresets/Views-All.wrk
+++ b/share/qtcreator/qmldesigner/workspacePresets/Views-All.wrk
@@ -74,8 +74,8 @@
   <container floating="true">
     <geometry>AdnQywADAAAAAAQuAAAB5gAABdEAAAOcAAAELgAAAfkAAAXRAAADnAAAAAAAAAAACgAAAAQuAAAB+QAABdEAAAOc</geometry>
     <splitter orientation="Vertical" count="1">
-      <area tabs="1" current="Effect Maker">
-        <widget name="Effect Maker" closed="true"/>
+      <area tabs="1" current="Effect Composer">
+        <widget name="Effect Composer" closed="true"/>
       </area>
       <sizes>420</sizes>
     </splitter>
diff --git a/src/plugins/effectmakernew/EffectMakerNew.json.in b/src/plugins/effectmakernew/EffectMakerNew.json.in
index c48476418b..0e9490d033 100644
--- a/src/plugins/effectmakernew/EffectMakerNew.json.in
+++ b/src/plugins/effectmakernew/EffectMakerNew.json.in
@@ -8,7 +8,7 @@
                   "",
                   "Licensees holding valid Qt Enterprise licenses may use this plugin in accordance with the Qt Enterprise License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company."
     ],
-    "Description" : "Plugin for Effect Maker.",
+    "Description" : "Plugin for Effect Composer.",
     "Url" : "http://www.qt.io",
     "DisabledByDefault" : true,
     ${IDE_PLUGIN_DEPENDENCIES}
diff --git a/src/plugins/effectmakernew/effectmakerview.cpp b/src/plugins/effectmakernew/effectmakerview.cpp
index c36ea9e76f..832a83bbb0 100644
--- a/src/plugins/effectmakernew/effectmakerview.cpp
+++ b/src/plugins/effectmakernew/effectmakerview.cpp
@@ -59,8 +59,8 @@ QmlDesigner::WidgetInfo EffectMakerView::widgetInfo()
         Core::ICore::addContextObject(context);
     }
 
-    return createWidgetInfo(m_widget.data(), "Effect Maker",
-                            QmlDesigner::WidgetInfo::LeftPane, 0, tr("Effect Maker"));
+    return createWidgetInfo(m_widget.data(), "Effect Composer",
+                            QmlDesigner::WidgetInfo::LeftPane, 0, tr("Effect Composer [beta]"));
 }
 
 void EffectMakerView::customNotification([[maybe_unused]] const AbstractView *view,
@@ -82,7 +82,7 @@ void EffectMakerView::modelAttached(QmlDesigner::Model *model)
 
     QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toString();
 
-    // if starting a new project, clear the effect maker
+    // if starting a new project, clear the effect composer
     if (m_currProjectPath != currProjectPath)
         m_widget->effectMakerModel()->clear();
 
diff --git a/src/plugins/effectmakernew/effectmakerwidget.cpp b/src/plugins/effectmakernew/effectmakerwidget.cpp
index 5151c0568c..2b1349fa44 100644
--- a/src/plugins/effectmakernew/effectmakerwidget.cpp
+++ b/src/plugins/effectmakernew/effectmakerwidget.cpp
@@ -52,7 +52,7 @@ EffectMakerWidget::EffectMakerWidget(EffectMakerView *view)
     , m_effectMakerView(view)
     , m_quickWidget{new StudioQuickWidget(this)}
 {
-    setWindowTitle(tr("Effect Maker", "Title of effect maker widget"));
+    setWindowTitle(tr("Effect Composer", "Title of effect composer widget"));
     setMinimumWidth(250);
 
     m_quickWidget->quickWidget()->installEventFilter(this);
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
index 4134884eb9..c2359409eb 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
@@ -121,7 +121,7 @@ void AssetsLibraryModel::deleteFiles(const QStringList &filePaths, bool dontAskA
         if (fi.exists()) {
             if (QFile::remove(filePath)) {
                 if (Asset(filePath).isEffect()) {
-                    // If effect maker effect was removed, also remove effect module from project
+                    // If an effect composer effect was removed, also remove effect module from project
                     QString effectName = fi.baseName();
                     if (!effectName.isEmpty())
                         deletedEffects.append(effectName);
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
index 56fb1d0ba3..bc45fbe843 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
@@ -513,7 +513,7 @@ QPair<QString, QByteArray> AssetsLibraryWidget::getAssetTypeAndData(const QStrin
             // Data: Image format (suffix)
             return {Constants::MIME_TYPE_ASSET_TEXTURE3D, asset.suffix().toUtf8()};
         } else if (asset.isEffect()) {
-            // Data: Effect Maker format (suffix)
+            // Data: Effect Composer format (suffix)
             return {Constants::MIME_TYPE_ASSET_EFFECT, asset.suffix().toUtf8()};
         }
     }
diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
index 44015d59fc..17ba5aa970 100644
--- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
+++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
@@ -251,7 +251,7 @@ const char add3DAssetsDisplayString[] = QT_TRANSLATE_NOOP("QmlDesignerAddResourc
 const char addQt3DSPresentationsDisplayString[] = QT_TRANSLATE_NOOP("QmlDesignerAddResources",
                                                                     "Qt 3D Studio Presentations");
 const char addCustomEffectDialogDisplayString[] = QT_TRANSLATE_NOOP("QmlDesignerAddResources",
-                                                                    "Effect Maker Files");
+                                                                    "Effect Composer Files");
 
 } //ComponentCoreConstants
 
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index dd00cd48d4..ebba34dc16 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -1638,7 +1638,7 @@ void openEffectMaker(const QString &filePath)
     if (ModelNodeOperations::isNewEffectMakerActivated()) {
         QmlDesignerPlugin::instance()->viewManager()
             .emitCustomNotification("open_effectmaker_composition", {}, {filePath});
-        QmlDesignerPlugin::instance()->mainWidget()->showDockWidget("Effect Maker", true);
+        QmlDesignerPlugin::instance()->mainWidget()->showDockWidget("Effect Composer", true);
     } else {
         ModelNodeOperations::openOldEffectMaker(filePath);
     }
@@ -1742,7 +1742,7 @@ bool validateEffect(const QString &effectPath)
     if (!qmlPath.exists()) {
         QMessageBox msgBox;
         msgBox.setText(QObject::tr("Effect %1 is not complete.").arg(effectName));
-        msgBox.setInformativeText(QObject::tr("Ensure that you have saved it in Qt Quick Effect Maker."
+        msgBox.setInformativeText(QObject::tr("Ensure that you have saved it in the Effect Composer."
                                               "\nDo you want to edit this effect?"));
         msgBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
         msgBox.setDefaultButton(QMessageBox::Yes);
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index a0c5ebacd2..5cea0aab4e 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -297,7 +297,7 @@ void NavigatorView::dragStarted(QMimeData *mimeData)
             auto assetTypeAndData = AssetsLibraryWidget::getAssetTypeAndData(assetsPaths[0]);
             QString assetType = assetTypeAndData.first;
             if (assetType == Constants::MIME_TYPE_ASSET_EFFECT) {
-                // We use arbitrary type name because at this time we don't have effect maker
+                // We use arbitrary type name because at this time we don't have effect composer
                 // specific type
                 m_widget->update();
             } else if (assetType == Constants::MIME_TYPE_ASSET_TEXTURE3D) {
diff --git a/src/plugins/qmldesigner/utils/asset.cpp b/src/plugins/qmldesigner/utils/asset.cpp
index 5d6f42336c..2984a4d890 100644
--- a/src/plugins/qmldesigner/utils/asset.cpp
+++ b/src/plugins/qmldesigner/utils/asset.cpp
@@ -74,9 +74,9 @@ const QStringList &Asset::supportedTexture3DSuffixes()
     return retList;
 }
 
-const QStringList &Asset::supportedEffectMakerSuffixes()
+const QStringList &Asset::supportedEffectComposerSuffixes()
 {
-    // These are file types only supported by Effect Maker
+    // These are file types only supported by Effect Composer
     static QStringList retList {"*.qep"};
     return retList;
 }
@@ -95,7 +95,7 @@ const QSet<QString> &Asset::supportedSuffixes()
         insertSuffixes(supportedAudioSuffixes());
         insertSuffixes(supportedVideoSuffixes());
         insertSuffixes(supportedTexture3DSuffixes());
-        insertSuffixes(supportedEffectMakerSuffixes());
+        insertSuffixes(supportedEffectComposerSuffixes());
     }
     return allSuffixes;
 }
@@ -204,7 +204,7 @@ void Asset::resolveType()
         m_type = Asset::Type::Video;
     else if (supportedTexture3DSuffixes().contains(m_suffix))
         m_type = Asset::Type::Texture3D;
-    else if (supportedEffectMakerSuffixes().contains(m_suffix))
+    else if (supportedEffectComposerSuffixes().contains(m_suffix))
         m_type = Asset::Type::Effect;
 }
 
diff --git a/src/plugins/qmldesigner/utils/asset.h b/src/plugins/qmldesigner/utils/asset.h
index e779d4a734..cb09f3a5ee 100644
--- a/src/plugins/qmldesigner/utils/asset.h
+++ b/src/plugins/qmldesigner/utils/asset.h
@@ -31,7 +31,7 @@ public:
     static const QStringList &supportedAudioSuffixes();
     static const QStringList &supportedVideoSuffixes();
     static const QStringList &supportedTexture3DSuffixes();
-    static const QStringList &supportedEffectMakerSuffixes();
+    static const QStringList &supportedEffectComposerSuffixes();
     static const QSet<QString> &supportedSuffixes();
     static bool isSupported(const QString &path);