From 36b17fd9747ae3a9666e3288e570dd4e81e462b0 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 4 Oct 2010 14:50:58 +0200
Subject: [PATCH] Wizards: Move QML standalone app wizard to QML category.
Task-number: QTCREATORBUG-2510
Reviewed-by: Alessandro Portale
---
.../qmlprojectmanager/qmlprojectapplicationwizard.cpp | 9 +++++----
src/plugins/qmlprojectmanager/qmlprojectconstants.h | 6 ------
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp | 7 ++++---
.../qt4projectmanager/qt4projectmanagerconstants.h | 8 +++++++-
.../qt4projectmanager/wizards/qmlstandaloneappwizard.cpp | 6 +++---
5 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 260cd600038..c58241c2c89 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -32,6 +32,7 @@
#include "qmlprojectconstants.h"
#include <projectexplorer/customwizard/customwizard.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <QtGui/QIcon>
@@ -61,7 +62,7 @@ QmlProjectApplicationWizard::~QmlProjectApplicationWizard()
Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
- parameters.setIcon(QIcon(QLatin1String(Constants::QML_WIZARD_ICON)));
+ parameters.setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::QML_WIZARD_ICON)));
parameters.setDisplayName(tr("Qt Quick UI"));
parameters.setId(QLatin1String("QA.QML Application"));
@@ -70,9 +71,9 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
"You can review Qt Quick UI projects in the QML Viewer and you need not build them. "
"You do not need to have the development environment installed "
"on your computer to create and run this type of projects."));
- parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
- parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
- Constants::QML_WIZARD_TR_CATEGORY));
+ parameters.setCategory(QLatin1String(Qt4ProjectManager::Constants::QML_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QCoreApplication::translate(Qt4ProjectManager::Constants::QML_WIZARD_TR_SCOPE,
+ Qt4ProjectManager::Constants::QML_WIZARD_TR_CATEGORY));
return parameters;
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index cd014f52767..3a4bda66a00 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -47,12 +47,6 @@ const char *const FILES_EDITOR_ID = "Qt4.QmlProjectEditor";
const char *const FILES_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".qmlproject Editor");
const char *const FILES_MIMETYPE = QMLMIMETYPE;
-// Wizard category
-const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
-const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
-const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
-const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png";
-
} // namespace Constants
} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index 640f0175e38..e3537db8411 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -34,6 +34,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
#include <projectexplorer/customwizard/customwizard.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/filenamevalidatinglineedit.h>
#include <utils/filewizardpage.h>
@@ -116,9 +117,9 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
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));
- parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
- Constants::QML_WIZARD_TR_CATEGORY));
+ parameters.setCategory(QLatin1String(Qt4ProjectManager::Constants::QML_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QCoreApplication::translate(Qt4ProjectManager::Constants::QML_WIZARD_TR_SCOPE,
+ Qt4ProjectManager::Constants::QML_WIZARD_TR_CATEGORY));
return parameters;
}
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 9d62da41eee..db3b1719f89 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -88,11 +88,17 @@ const char * const QT_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectMan
const char * const QTVERSION_SETTINGS_PAGE_ID = "Qt Versions";
const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions");
-// Wizard categories
+// C++ wizard categories
const char * const QT_APP_WIZARD_CATEGORY = "C.QtApplicationProjects";
const char * const QT_APP_WIZARD_TR_SCOPE = "Qt4ProjectManager";
const char * const QT_APP_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt C++ Project");
+// QML wizard categories
+const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
+const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
+const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
+const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png";
+
// Tasks
const char * const PROFILE_EVALUATE = "Qt4ProjectManager.ProFileEvaluate";
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
index 0ad152b1fd3..b15b995dd49 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
@@ -99,9 +99,9 @@ Core::BaseFileWizardParameters QmlStandaloneAppWizard::parameters()
parameters.setDisplayName(tr("Qt Quick Application"));
parameters.setId(QLatin1String("QA.QMLA Application"));
parameters.setDescription(tr("Creates a Qt Quick application that you can deploy to mobile devices."));
- parameters.setCategory(QLatin1String(Constants::QT_APP_WIZARD_CATEGORY));
- parameters.setDisplayCategory(QCoreApplication::translate(Constants::QT_APP_WIZARD_TR_SCOPE,
- Constants::QT_APP_WIZARD_TR_CATEGORY));
+ parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
+ Constants::QML_WIZARD_TR_CATEGORY));
return parameters;
}
--
GitLab