From 111b89d7553fc1b3fdba4e7f4d4ec30f60c03c32 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 5 Aug 2010 16:54:04 +0200
Subject: [PATCH] QML: Name wizards correctly.
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
---
.../wizards/{qml-runtime => qml-extension}/lib.png | Bin
.../{qml-runtime => qml-extension}/object.cpp | 0
.../wizards/{qml-runtime => qml-extension}/object.h | 0
.../{qml-runtime => qml-extension}/plugin.cpp | 0
.../wizards/{qml-runtime => qml-extension}/plugin.h | 0
.../{qml-runtime => qml-extension}/project.pro | 0
.../wizards/{qml-runtime => qml-extension}/qmldir | 0
.../{qml-runtime => qml-extension}/wizard.xml | 10 +++++-----
.../qmlprojectapplicationwizard.cpp | 6 +++---
.../qmlprojectmanager/qmlprojectimportwizard.cpp | 4 ++--
10 files changed, 10 insertions(+), 10 deletions(-)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/lib.png (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/object.cpp (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/object.h (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/plugin.cpp (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/plugin.h (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/project.pro (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/qmldir (100%)
rename share/qtcreator/templates/wizards/{qml-runtime => qml-extension}/wizard.xml (84%)
diff --git a/share/qtcreator/templates/wizards/qml-runtime/lib.png b/share/qtcreator/templates/wizards/qml-extension/lib.png
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/lib.png
rename to share/qtcreator/templates/wizards/qml-extension/lib.png
diff --git a/share/qtcreator/templates/wizards/qml-runtime/object.cpp b/share/qtcreator/templates/wizards/qml-extension/object.cpp
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/object.cpp
rename to share/qtcreator/templates/wizards/qml-extension/object.cpp
diff --git a/share/qtcreator/templates/wizards/qml-runtime/object.h b/share/qtcreator/templates/wizards/qml-extension/object.h
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/object.h
rename to share/qtcreator/templates/wizards/qml-extension/object.h
diff --git a/share/qtcreator/templates/wizards/qml-runtime/plugin.cpp b/share/qtcreator/templates/wizards/qml-extension/plugin.cpp
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/plugin.cpp
rename to share/qtcreator/templates/wizards/qml-extension/plugin.cpp
diff --git a/share/qtcreator/templates/wizards/qml-runtime/plugin.h b/share/qtcreator/templates/wizards/qml-extension/plugin.h
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/plugin.h
rename to share/qtcreator/templates/wizards/qml-extension/plugin.h
diff --git a/share/qtcreator/templates/wizards/qml-runtime/project.pro b/share/qtcreator/templates/wizards/qml-extension/project.pro
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/project.pro
rename to share/qtcreator/templates/wizards/qml-extension/project.pro
diff --git a/share/qtcreator/templates/wizards/qml-runtime/qmldir b/share/qtcreator/templates/wizards/qml-extension/qmldir
similarity index 100%
rename from share/qtcreator/templates/wizards/qml-runtime/qmldir
rename to share/qtcreator/templates/wizards/qml-extension/qmldir
diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
similarity index 84%
rename from share/qtcreator/templates/wizards/qml-runtime/wizard.xml
rename to share/qtcreator/templates/wizards/qml-extension/wizard.xml
index 5800b8ef5d6..82ab56676f3 100644
--- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
+++ b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
@@ -36,11 +36,11 @@ leave room for the Qt 4 target page.
-->
<wizard version="1" kind="project"
class="qt4project" firstpage="10"
- id="QmlRuntimePlugin" category="F.Projects">
+ id="QmlExtensionPlugin" category="F.Projects">
<icon>lib.png</icon>
- <description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description>
- <displayname>QML Runtime Plug-in</displayname>
- <displaycategory>QML Runtime Plug-in</displaycategory>
+ <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
+ <displayname>Custom QML Extension Plugin</displayname>
+ <displaycategory>QML Extension Plugin</displaycategory>
<files>
<file source="qmldir" target="qmldir"/>
<file source="plugin.h" target="%ProjectName%.h"/>
@@ -50,7 +50,7 @@ leave room for the Qt 4 target page.
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
</files>
<!-- Create a 2nd wizard page with parameters -->
- <fieldpagetitle>QML Runtime Plug-in Parameters</fieldpagetitle>
+ <fieldpagetitle>Custom QML Extension Plugin Parameters</fieldpagetitle>
<fields>
<field mandatory="false" name="ObjectName">
<fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$' defaulttext="ExampleObject"/>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index eafbc0385ba..3f7727408ea 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -69,10 +69,10 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
p.drawPixmap(3, 3, 16, 16, QPixmap(QLatin1String(Constants::QML_WIZARD_ICON)));
parameters.setIcon(icon);
}
- parameters.setDisplayName(tr("Qt QML Application"));
+ parameters.setDisplayName(tr("QML Application"));
parameters.setId(QLatin1String("QA.QML Application"));
- parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n"
- "QML application projects are executed through the QML runtime and do not need to be built."));
+ parameters.setDescription(tr("Creates a QML application project with a single QML file containing the main view.\n\n"
+ "QML application projects are executed by the Qt QML Viewer and do not need to be built."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index 39afe447062..640f0175e38 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -61,7 +61,7 @@ namespace Internal {
QmlProjectImportWizardDialog::QmlProjectImportWizardDialog(QWidget *parent)
: Utils::Wizard(parent)
{
- setWindowTitle(tr("Import Existing Qt QML Directory"));
+ setWindowTitle(tr("Import Existing QML Directory"));
// first page
m_firstPage = new FileWizardPage;
@@ -113,7 +113,7 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
parameters.setIcon(icon);
}
- parameters.setDisplayName(tr("Import Existing Qt QML Directory"));
+ parameters.setDisplayName(tr("Import Existing QML Directory"));
parameters.setId(QLatin1String("QI.QML Import"));
parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
--
GitLab