JsonWizard: split plugins and features when considering enabled state

Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.

Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

share/qtcreator/templates/wizards/classes/cpp/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "C++ Class",
     "trDisplayCategory": "C++",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.CppEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/classes/python/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Python Class",
     "trDisplayCategory": "Python",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.PythonEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('PythonEditor') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/classes/qtquickui/wizard.json

@@ -7,7 +7,8 @@
     "trDisplayName": "QtQuick UI File",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.QmlJSEditor", "QtSupport.Wizards.FeatureQtQuick.UiFiles" ],
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.UiFiles" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "options" : [
         { "key": "QmlFile", "value": "%{Class}.%{JS: Util.preferredSuffix('text/x-qml')}" },

share/qtcreator/templates/wizards/files/cppheader/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "C++ Header File",
     "trDisplayCategory": "C++",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.CppEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/cppsource/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "C++ Source File",
     "trDisplayCategory": "C++",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.CppEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/form/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Qt Designer Form",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.Designer" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Designer') >= 0}",
 
     "options": [
         { "key": "UiClass", "value": "%{JS: QtSupport.uiClassName([ %{FormContents} ].join('\\n'))}" },

share/qtcreator/templates/wizards/files/glsl/gl/fragment/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "GLSL",
     "icon": "../../../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.GLSLEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/glsl/gl/vertex/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "GLSL",
     "icon": "../../../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.GLSLEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/glsl/gles/fragment/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "GLSL",
     "icon": "../../../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.GLSLEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/glsl/gles/vertex/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "GLSL",
     "icon": "../../../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.GLSLEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('GLSLEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/java/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Java File",
     "trDisplayCategory": "Java",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.Android" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Android') >= 0}",
 
     "options": [ { "key": "ClassName", "value": "%{JS: '%{FileName}'.charAt(0).toUpperCase() + '%{FileName}'.substr(1)}" } ],
 

share/qtcreator/templates/wizards/files/js/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "JS File",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.QmlJSEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/python/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Python File",
     "trDisplayCategory": "Python",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.PythonEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('PythonEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/qrc/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Qt Resource File",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.ResourceEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('ResourceEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/qtquick1/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "QML File (Qt Quick 1)",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.QmlJSEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/qtquick2/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "QML File (Qt Quick 2)",
     "trDisplayCategory": "Qt",
     "icon": "../../global/genericfilewizard.png",
-    "featuresRequired": [ "Plugin.QmlJSEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlJSEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/files/scratch/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "General",
     "icon": "../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.TextEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('TextEditor') >= 0}",
 
     "options": [ { "key": "TargetPath", "value": "%{JS: Util.mktemp('scratch-XXXXXX.txt')}" } ],
 

share/qtcreator/templates/wizards/files/text/wizard.json

@@ -8,7 +8,7 @@
     "trDisplayCategory": "General",
     "icon": "../../global/genericfilewizard.png",
     "platformIndependent": true,
-    "featuresRequired": [ "Plugin.TextEditor" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('TextEditor') >= 0}",
 
     "pages" :
     [

share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json

@@ -7,7 +7,8 @@
     "trDisplayName": "Qt Console Application",
     "trDisplayCategory": "Application",
     "icon": "../../../global/consoleapplication.png",
-    "featuresRequired": [ "Plugin.QmakeProjectManager", "QtSupport.Wizards.FeatureQt" ],
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json

@@ -7,8 +7,8 @@
     "trDisplayName": "Empty qmake Project",
     "trDisplayCategory": "Other Project",
     "icon": "../../../global/guiapplication.png",
-    "featuresRequired": [ "Plugin.QmakeProjectManager", "QtSupport.Wizards.FeatureQt" ],
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
-
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
     "options":
     [
         { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },

share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json

@@ -7,7 +7,8 @@
     "trDisplayName": "Qt Quick Application",
     "trDisplayCategory": "Application",
     "icon": "qml_wizard.png",
-    "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.2.4", "Plugin.QmakeProjectManager", "QtSupport.Wizards.FeatureQt" ],
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.2.4", "QtSupport.Wizards.FeatureQt" ],
+    "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json

@@ -7,7 +7,8 @@
     "trDisplayName": "Qt Quick Controls Application",
     "trDisplayCategory": "Application",
     "icon": "../qtquickapplication/qml_wizard.png",
-    "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "Plugin.QmakeProjectManager", "QtSupport.Wizards.FeatureQt" ],
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQt" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json

@@ -7,6 +7,7 @@
     "trDisplayName": "Qt Quick UI",
     "trDisplayCategory": "Application",
     "icon": "../../qmake/qtquickapplication/qml_wizard.png",
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
 
     "options":

share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json

@@ -7,6 +7,7 @@
     "trDisplayName": "Qt Quick Controls UI",
     "trDisplayCategory": "Application",
     "icon": "../../qmake/qtquickapplication/qml_wizard.png",
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
 
     "options":

share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Bazaar Clone (Or Branch)",
     "trDisplayCategory": "Import Project",
     "icon": "icon.png",
-    "featuresRequired": [ "Plugin.Bazaar" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Bazaar') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "CVS Checkout",
     "trDisplayCategory": "Import Project",
     "icon": "icon.png",
-    "featuresRequired": [ "Plugin.CVS" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('CVS') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/vcs/git/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Git Clone",
     "trDisplayCategory": "Import Project",
     "icon": "icon.png",
-    "featuresRequired": [ "Plugin.Git" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Git') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Mercurial Clone",
     "trDisplayCategory": "Import Project",
     "icon": "icon.png",
-    "featuresRequired": [ "Plugin.Mercurial" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Mercurial') >= 0}",
 
     "options":
     [

share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json

@@ -7,7 +7,7 @@
     "trDisplayName": "Subversion Checkout",
     "trDisplayCategory": "Import Project",
     "icon": "icon.png",
-    "featuresRequired": [ "Plugin.Subversion" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('Subversion') >= 0}",
 
     "options":
     [

src/plugins/coreplugin/iwizardfactory.cpp

@@ -326,7 +326,7 @@ FeatureSet IWizardFactory::pluginFeatures() const
         // Implicitly create a feature for each plugin loaded:
         foreach (ExtensionSystem::PluginSpec *s, ExtensionSystem::PluginManager::plugins()) {
             if (s->state() == ExtensionSystem::PluginSpec::Running)
-                list.append(QString::fromLatin1("Plugin.") + s->name());
+                list.append(s->name());
         }
         plugins = FeatureSet::fromStringList(list);
     }

src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp

@@ -371,6 +371,9 @@ void JsonWizardFactory::runWizard(const QString &path, QWidget *parent, const QS
     tmp.remove(pluginFeatures());
     wizard.setValue(QStringLiteral("PreferredFeatures"), tmp.toStringList());
 
+    wizard.setValue(QStringLiteral("Features"), availableFeatures(platform).toStringList());
+    wizard.setValue(QStringLiteral("Plugins"), pluginFeatures().toStringList());
+
     // Add data to wizard:
     for (auto i = variables.constBegin(); i != variables.constEnd(); ++i)
         wizard.setProperty(i.key().toUtf8(), i.value());
@@ -477,8 +480,13 @@ bool JsonWizardFactory::isAvailable(const QString &platformName) const
         return false;
 
     Utils::MacroExpander expander;
+    Utils::MacroExpander *e = &expander;
     expander.registerVariable("Platform", tr("The platform selected for the wizard."),
                               [platformName]() { return platformName; });
+    expander.registerVariable("Features", tr("The features available to this wizard."),
+                              [this, e, platformName]() { return JsonWizard::stringListToArrayString(availableFeatures(platformName).toStringList(), e); });
+    expander.registerVariable("Plugins", tr("The plugins loaded."),
+                              [this, e]() { return JsonWizard::stringListToArrayString(pluginFeatures().toStringList(), e); });
 
     return JsonWizard::boolFromVariant(m_enabledExpression, &expander);
 }