diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-05 16:54:04 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-05 16:54:04 +0200 |
commit | 111b89d7553fc1b3fdba4e7f4d4ec30f60c03c32 (patch) | |
tree | e69e2cf4385025c4b63d514625a0938035d10ab3 | |
parent | 5841b6ac31e5672218e748f5b1df8bf0b8f98306 (diff) | |
download | qt-creator-111b89d7553fc1b3fdba4e7f4d4ec30f60c03c32.tar.gz |
QML: Name wizards correctly.
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/lib.png (renamed from share/qtcreator/templates/wizards/qml-runtime/lib.png) | bin | 1245 -> 1245 bytes | |||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/object.cpp (renamed from share/qtcreator/templates/wizards/qml-runtime/object.cpp) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/object.h (renamed from share/qtcreator/templates/wizards/qml-runtime/object.h) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/plugin.cpp (renamed from share/qtcreator/templates/wizards/qml-runtime/plugin.cpp) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/plugin.h (renamed from share/qtcreator/templates/wizards/qml-runtime/plugin.h) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/project.pro (renamed from share/qtcreator/templates/wizards/qml-runtime/project.pro) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/qmldir (renamed from share/qtcreator/templates/wizards/qml-runtime/qmldir) | 0 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qml-extension/wizard.xml (renamed from share/qtcreator/templates/wizards/qml-runtime/wizard.xml) | 10 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp | 6 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp | 4 |
10 files changed, 10 insertions, 10 deletions
diff --git a/share/qtcreator/templates/wizards/qml-runtime/lib.png b/share/qtcreator/templates/wizards/qml-extension/lib.png Binary files differindex a4e818d986..a4e818d986 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/lib.png +++ b/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 index f2d9eb39d0..f2d9eb39d0 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/object.cpp +++ b/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 index 50898b454c..50898b454c 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/object.h +++ b/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 index 34383ef11f..34383ef11f 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/plugin.cpp +++ b/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 index d42a3c5123..d42a3c5123 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/plugin.h +++ b/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 index 6e3cb29342..6e3cb29342 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/project.pro +++ b/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 index ee07ff6b10..ee07ff6b10 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/qmldir +++ b/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 index 5800b8ef5d..82ab56676f 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 eafbc0385b..3f7727408e 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 39afe44706..640f0175e3 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)); |