projectmanager: re-organize New Project categories

Change-Id: Ie549f9843db985018af380eb6105e136f21989f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

13 files changed, 24 insertions, 50 deletions

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
index cf9dfff3e9..e3c88e2769 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 9ca0641ee2..d1cccf292a 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 d876ab1a8e..bd0a4da7fe 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 c25ae395e8..d30c6aeac6 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 8250c3b7a8..5ba9b55397 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 24e4299473..8cd7a27b03 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 2df7aac930..7e03147194 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 188262c035..95dcf4dfa9 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 5c21f28c5a..97d2aad148 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 c4021ed20e..468bb9554a 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 b589f2c6fb..9cdc2950b7 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 8d0901ac79..0c714595fa 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 45b2cdb57f..0f63048772 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 "