From 46eb49eafd5d231443ea5855e06d8885da26eca8 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 18 Nov 2011 12:54:41 +0100
Subject: [PATCH] projectmanager: re-organize New Project categories
Change-Id: Ie549f9843db985018af380eb6105e136f21989f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
.../templates/wizards/plaincapp-cmake/wizard.xml | 2 +-
.../qtcreator/templates/wizards/plaincapp/wizard.xml | 2 +-
.../templates/wizards/plaincppapp-cmake/wizard.xml | 2 +-
.../templates/wizards/plaincppapp/wizard.xml | 2 +-
.../templates/wizards/qtcreatorplugin/wizard.xml | 6 +++---
.../genericprojectmanager/genericprojectwizard.cpp | 4 ++--
.../projectexplorer/projectexplorerconstants.h | 11 ++++++++---
.../customwidgetwizard/customwidgetwizard.cpp | 5 ++---
.../qt4projectmanager/qt4projectmanagerconstants.h | 11 -----------
.../qt4projectmanager/wizards/consoleappwizard.cpp | 7 +++----
.../qt4projectmanager/wizards/emptyprojectwizard.cpp | 5 ++---
.../qt4projectmanager/wizards/guiappwizard.cpp | 11 ++++-------
src/plugins/qt4projectmanager/wizards/guiappwizard.h | 1 -
.../qt4projectmanager/wizards/html5appwizard.cpp | 8 ++++----
.../qt4projectmanager/wizards/librarywizard.cpp | 3 +--
.../qt4projectmanager/wizards/mobileappwizard.cpp | 7 +++----
src/plugins/qt4projectmanager/wizards/qtwizard.cpp | 7 ++-----
src/plugins/qt4projectmanager/wizards/qtwizard.h | 1 -
.../wizards/subdirsprojectwizard.cpp | 3 +--
src/plugins/qt4projectmanager/wizards/testwizard.cpp | 5 ++---
src/plugins/vcsbase/basecheckoutwizard.cpp | 5 +++--
src/plugins/vcsbase/vcsbaseconstants.h | 3 ---
22 files changed, 44 insertions(+), 67 deletions(-)
diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
index cb61d13d43d..d97b6ef5b61 100644
--- a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
@@ -41,7 +41,7 @@ leave room for the Qt 4 target page.
<icon>console.png</icon>
<description>Creates a plain C project using CMake, not using the Qt library.</description>
<displayname>Plain C Project (CMake Build)</displayname>;
- <displaycategory>Other Project</displaycategory>
+ <displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.c" openeditor="true"/>
<file source="CMakeLists.txt" openproject="true"/>
diff --git a/share/qtcreator/templates/wizards/plaincapp/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/wizard.xml
index 5e50789fd07..a5b860245ec 100644
--- a/share/qtcreator/templates/wizards/plaincapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp/wizard.xml
@@ -43,7 +43,7 @@ leave room for the Qt 4 target page.
<icon>console.png</icon>
<description>Creates a plain C project using qmake, not using the Qt library.</description>
<displayname>Plain C Project</displayname>;
- <displaycategory>Other Project</displaycategory>
+ <displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.c" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
index c9dd5536515..7cfd1d5a3be 100644
--- a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
@@ -41,7 +41,7 @@ leave room for the Qt 4 target page.
<icon>console.png</icon>
<description>Creates a plain C++ project using CMake, not using the Qt library.</description>
<displayname>Plain C++ Project (CMake Build)</displayname>;
- <displaycategory>Other Project</displaycategory>
+ <displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.cpp" openeditor="true"/>
<file source="CMakeLists.txt" openproject="true"/>
diff --git a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
index 1c3d2dd94d2..44cf3016fac 100644
--- a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
@@ -43,7 +43,7 @@ leave room for the Qt 4 target page.
<icon>console.png</icon>
<description>Creates a plain C++ project using qmake, not using the Qt library.</description>
<displayname>Plain C++ Project</displayname>;
- <displaycategory>Other Project</displaycategory>
+ <displaycategory>Non-Qt Project</displaycategory>
<files>
<file source="main.cpp" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
index e7d5f3d62ea..ee16a8de346 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
@@ -39,11 +39,11 @@ leave room for the Qt 4 target page.
-->
<wizard version="1" kind="project"
class="qt4project" firstpage="10"
- id="R.QtCreatorPlugin" category="I.Projects">
+ id="R.QtCreatorPlugin" category="F.QtProjects">
<icon>qtcreator_logo_24.png</icon>
<description>Creates a custom Qt Creator plugin.</description>
- <displayname>Qt Creator plugin</displayname>;
- <displaycategory>Other Project</displaycategory>
+ <displayname>Qt Creator Plugin</displayname>;
+ <displaycategory>Other Qt Project</displaycategory>
<files>
<file source="myplugin.pro" target="%PluginName:l%.pro" openproject="true"/>
<file source="MyPlugin.pluginspec.in" target="%PluginName%.pluginspec.in" openeditor="true"/>
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 43c36f9ddcd..00b961d8fe4 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -131,8 +131,8 @@ Core::BaseFileWizardParameters GenericProjectWizard::parameters()
parameters.setId(QLatin1String("Z.Makefile"));
parameters.setDescription(tr("Imports existing projects that do not use qmake or CMake. "
"This allows you to use Qt Creator as a code editor."));
- parameters.setCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY));
- parameters.setDisplayCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY));
+ parameters.setCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY));
return parameters;
}
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 46034fc4c1f..8111e3fd247 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -191,10 +191,15 @@ const char TOOLCHAIN_SETTINGS_PAGE_ID[] = "M.ProjectExplorer.ToolChainOptions";
const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile";
const char TASK_CATEGORY_BUILDSYSTEM[] = "Task.Category.Buildsystem";
-// Wizard category
+// Wizard categories
+const char QT_PROJECT_WIZARD_CATEGORY[] = "F.QtProjects";
+const char QT_PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Qt Project");
+
const char PROJECT_WIZARD_CATEGORY[] = "I.Projects"; // (after Qt)
-const char PROJECT_WIZARD_TR_SCOPE[] = "ProjectExplorer";
-const char PROJECT_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Project");
+const char PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Non-Qt Project");
+
+const char IMPORT_WIZARD_CATEGORY[] = "J.Import";
+const char IMPORT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Import Project");
// Build step lists ids:
const char BUILDSTEPS_CLEAN[] = "ProjectExplorer.BuildSteps.Clean";
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
index cf9dfff3e9c..e3c88e27690 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
@@ -45,9 +45,8 @@ namespace Internal {
CustomWidgetWizard::CustomWidgetWizard() :
QtWizard(QLatin1String("P.Qt4CustomWidget"),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("Qt Custom Designer Widget"),
tr("Creates a Qt Custom Designer Widget or a Custom Widget Collection."),
QIcon(QLatin1String(":/wizards/images/gui.png")))
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 9ca0641ee27..d1cccf292a5 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -66,17 +66,6 @@ const char ADDLIBRARY[] = "Qt4.AddLibrary";
const char JUMP_TO_FILE[] = "Qt4.JumpToFile";
const char SEPARATOR[] = "Qt4.Separator";
-// C++ wizard categories
-const char QT_APP_WIZARD_CATEGORY[] = "F.QtApplicationProjects";
-const char QT_APP_WIZARD_TR_SCOPE[] = "Qt4ProjectManager";
-const char QT_APP_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Widget Project");
-
-// Html5 wizard categories
-const char HTML5_WIZARD_CATEGORY[] = "I.Projects"; // (after Qt)
-const char HTML5_WIZARD_TR_SCOPE[] = "Qt4ProjectManager";
-const char HTML5_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Project");
-const char HTML5_WIZARD_ICON[] = ":/qmlproject/images/qml_wizard.png";
-
// Tasks
const char PROFILE_EVALUATE[] = "Qt4ProjectManager.ProFileEvaluate";
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index d876ab1a8eb..bd0a4da7fe1 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -42,7 +42,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
-static const char *mainCppC =
+static const char mainCppC[] =
"#include <QtCore/QCoreApplication>\n\n"
"int main(int argc, char *argv[])\n"
"{\n"
@@ -57,9 +57,8 @@ namespace Internal {
ConsoleAppWizard::ConsoleAppWizard()
: QtWizard(QLatin1String("E.Qt4Core"),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("Qt Console Application"),
tr("Creates a project containing a single main.cpp file with a stub implementation.\n\n"
"Preselects a desktop Qt for building the application if available."),
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
index c25ae395e88..d30c6aeac6e 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
@@ -43,9 +43,8 @@ namespace Internal {
EmptyProjectWizard::EmptyProjectWizard()
: QtWizard(QLatin1String("U.Qt4Empty"),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("Empty Qt Project"),
tr("Creates a qmake-based project without any files. This allows you to create "
"an application without any default classes."),
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 8250c3b7a8e..5ba9b553970 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -33,8 +33,8 @@
#include "guiappwizard.h"
#include "guiappwizarddialog.h"
-#include "qt4projectmanagerconstants.h"
+#include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/abstracteditorsupport.h>
#include <designer/cpp/formclasswizardparameters.h>
#include <coreplugin/icore.h>
@@ -84,9 +84,8 @@ namespace Internal {
GuiAppWizard::GuiAppWizard()
: QtWizard(QLatin1String("C.Qt4Gui"),
- QLatin1String(Constants::QT_APP_WIZARD_CATEGORY),
- QLatin1String(Constants::QT_APP_WIZARD_TR_SCOPE),
- QLatin1String(Constants::QT_APP_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("Qt Gui Application"),
tr("Creates a Qt application for the desktop. "
"Includes a Qt Designer-based main window.\n\n"
@@ -98,14 +97,12 @@ GuiAppWizard::GuiAppWizard()
GuiAppWizard::GuiAppWizard(const QString &id,
const QString &category,
- const QString &categoryTranslationScope,
const QString &displayCategory,
const QString &name,
const QString &description,
const QIcon &icon,
bool createMobile)
- : QtWizard(id, category, categoryTranslationScope,
- displayCategory, name, description, icon),
+ : QtWizard(id, category, displayCategory, name, description, icon),
m_createMobileProject(createMobile)
{
}
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
index 24e4299473b..8cd7a27b03c 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
@@ -50,7 +50,6 @@ public:
protected:
GuiAppWizard(const QString &id,
const QString &category,
- const QString &categoryTranslationScope,
const QString &displayCategory,
const QString &name,
const QString &description,
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 2df7aac9307..7e031471947 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -36,8 +36,9 @@
#include "html5appwizard.h"
#include "html5appwizardpages.h"
#include "targetsetuppage.h"
-
#include "qt4projectmanagerconstants.h"
+
+#include <projectexplorer/projectexplorerconstants.h>
#include <limits>
#include <QtCore/QCoreApplication>
@@ -104,9 +105,8 @@ Core::BaseFileWizardParameters Html5AppWizard::parameters()
"mobile target platforms. For example, you can create signed "
"Symbian Installation System (SIS) packages for this type of "
"projects."));
- parameters.setCategory(QLatin1String(Constants::HTML5_WIZARD_CATEGORY));
- parameters.setDisplayCategory(QCoreApplication::translate(Constants::HTML5_WIZARD_TR_SCOPE,
- Constants::HTML5_WIZARD_TR_CATEGORY));
+ parameters.setCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY_DISPLAY));
return parameters;
}
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 188262c0352..95dcf4dfa94 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -54,8 +54,7 @@ namespace Internal {
LibraryWizard::LibraryWizard()
: QtWizard(QLatin1String("H.Qt4Library"),
QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("C++ Library"),
tr("Creates a C++ library based on qmake. This can be used to create:<ul>"
"<li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li>"
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index 5c21f28c5a2..97d2aad1483 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -35,9 +35,9 @@
#include "mobileappwizardpages.h"
#include "mobileapp.h"
#include "targetsetuppage.h"
-
#include "qt4projectmanagerconstants.h"
+#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/task.h>
#include <QtCore/QCoreApplication>
@@ -96,9 +96,8 @@ Core::BaseFileWizardParameters MobileAppWizard::parameters()
parameters.setDisplayName(DisplayName);
parameters.setId(QLatin1String("C.Qt4GuiMobile"));
parameters.setDescription(Description);
- 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(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY));
+ parameters.setDisplayCategory(QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY));
return parameters;
}
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index c4021ed20e6..468bb9554aa 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -55,10 +55,9 @@
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-static inline Core::BaseFileWizardParameters
+static Core::BaseFileWizardParameters
wizardParameters(const QString &id,
const QString &category,
- const QString &categoryTranslationScope,
const QString &displayCategory,
const QString &name,
const QString &description,
@@ -66,7 +65,7 @@ static inline Core::BaseFileWizardParameters
{
Core::BaseFileWizardParameters rc(Core::IWizard::ProjectWizard);
rc.setCategory(category);
- rc.setDisplayCategory(QCoreApplication::translate(categoryTranslationScope.toLatin1(),
+ rc.setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
displayCategory.toLatin1()));
rc.setIcon(icon);
rc.setDisplayName(name);
@@ -78,13 +77,11 @@ static inline Core::BaseFileWizardParameters
// -------------------- QtWizard
QtWizard::QtWizard(const QString &id,
const QString &category,
- const QString &categoryTranslationScope,
const QString &displayCategory,
const QString &name,
const QString &description, const QIcon &icon) :
Core::BaseFileWizard(wizardParameters(id,
category,
- categoryTranslationScope,
displayCategory,
name,
description,
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index b589f2c6fbf..9cdc2950b7a 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -65,7 +65,6 @@ class QtWizard : public Core::BaseFileWizard
protected:
QtWizard(const QString &id,
const QString &category,
- const QString &categoryTranslationScope,
const QString &displayCategory,
const QString &name,
const QString &description,
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
index 8d0901ac791..0c714595faf 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
@@ -45,8 +45,7 @@ namespace Internal {
SubdirsProjectWizard::SubdirsProjectWizard()
: QtWizard(QLatin1String("U.Qt4Subdirs"),
QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String("Non-Qt Project"),
tr("Subdirs Project"),
tr("Creates a qmake-based subdirs project. This allows you to group "
"your projects in a tree structure."),
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index 45b2cdb57f4..0f63048772d 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -48,9 +48,8 @@ namespace Internal {
TestWizard::TestWizard() :
QtWizard(QLatin1String("L.Qt4Test"),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
- QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY),
+ QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY),
tr("Qt Unit Test"),
tr("Creates a QTestLib-based unit test for a feature or a class. "
"Unit tests allow you to verify that the code is fit for use "
diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp
index 99da59924cf..ffcb1e45de8 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizard.cpp
@@ -36,6 +36,7 @@
#include "checkoutjobs.h"
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QFileInfo>
@@ -100,12 +101,12 @@ Core::IWizard::WizardKind BaseCheckoutWizard::kind() const
QString BaseCheckoutWizard::category() const
{
- return QLatin1String(VCSBase::Constants::VCS_WIZARD_CATEGORY);
+ return QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY);
}
QString BaseCheckoutWizard::displayCategory() const
{
- return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_WIZARD_TR_CATEGORY);
+ return QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY);
}
QString BaseCheckoutWizard::id() const
diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h
index fc7513a331f..986a126c12d 100644
--- a/src/plugins/vcsbase/vcsbaseconstants.h
+++ b/src/plugins/vcsbase/vcsbaseconstants.h
@@ -44,9 +44,6 @@ const char SETTINGS_CATEGORY_VCS_ICON[] = ":/core/images/category_vcs.png";
const char VCS_COMMON_SETTINGS_ID[] = "A.Common";
const char VCS_COMMON_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("VCSBase", "Common");
-const char VCS_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("VCSBase", "Project from Version Control");
-const char VCS_WIZARD_CATEGORY[] = "L.Version Control";
-
// Ids for sort order (wizards and preferences)
const char VCS_ID_BAZAAR[] = "B.Bazaar";
const char VCS_ID_GIT[] = "G.Git";
--
GitLab