From b0779ad5f81bae5513df1a1eae6f9e5e2b6aa679 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 10 Mar 2020 11:20:03 +0100 Subject: [PATCH] Wizards: Make it more obvious to users that they can create C files Technically, almost any "new file" wizard could be used to create a C file, but conceptually, it makes the most sense to turn the "C++" category into "C/C++". Fixes: QTCREATORBUG-23621 Change-Id: I002365fa35cc6c9bf7c71039e122f72890f66b1a Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- .../projects/creator-only/creator-projects-creating.qdoc | 6 ++---- share/qtcreator/templates/wizards/classes/cpp/wizard.json | 2 +- .../qtcreator/templates/wizards/files/cppheader/wizard.json | 6 +++--- .../qtcreator/templates/wizards/files/cppsource/wizard.json | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc index 2b249293704..d20710d3074 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc @@ -270,11 +270,9 @@ \list - \li C++ + \li C/C++ - C++ class, source, or header files that you can use to write the - application logic in both Qt Quick projects and - Qt widget based projects + C or C++ source and header files \li Qt diff --git a/share/qtcreator/templates/wizards/classes/cpp/wizard.json b/share/qtcreator/templates/wizards/classes/cpp/wizard.json index bb8a1f9fefc..117139ed825 100644 --- a/share/qtcreator/templates/wizards/classes/cpp/wizard.json +++ b/share/qtcreator/templates/wizards/classes/cpp/wizard.json @@ -5,7 +5,7 @@ "category": "O.C++", "trDescription": "Creates a C++ header and a source file for a new class that you can add to a C++ project.", "trDisplayName": "C++ Class", - "trDisplayCategory": "C++", + "trDisplayCategory": "C/C++", "iconText": "h/cpp", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", diff --git a/share/qtcreator/templates/wizards/files/cppheader/wizard.json b/share/qtcreator/templates/wizards/files/cppheader/wizard.json index 6d4de509757..36956636a3f 100644 --- a/share/qtcreator/templates/wizards/files/cppheader/wizard.json +++ b/share/qtcreator/templates/wizards/files/cppheader/wizard.json @@ -3,9 +3,9 @@ "supportedProjectTypes": [ ], "id": "C.Header", "category": "O.C++", - "trDescription": "Creates a C++ header file that you can add to a C++ project.", - "trDisplayName": "C++ Header File", - "trDisplayCategory": "C++", + "trDescription": "Creates a header file that you can add to a C/C++ project.", + "trDisplayName": "C/C++ Header File", + "trDisplayCategory": "C/C++", "iconText": "h", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", diff --git a/share/qtcreator/templates/wizards/files/cppsource/wizard.json b/share/qtcreator/templates/wizards/files/cppsource/wizard.json index e9af17a913c..c75600ff8af 100644 --- a/share/qtcreator/templates/wizards/files/cppsource/wizard.json +++ b/share/qtcreator/templates/wizards/files/cppsource/wizard.json @@ -3,9 +3,9 @@ "supportedProjectTypes": [ ], "id": "B.Source", "category": "O.C++", - "trDescription": "Creates a C++ source file that you can add to a C++ project.", - "trDisplayName": "C++ Source File", - "trDisplayCategory": "C++", + "trDescription": "Creates a source file that you can add to a C/C++ project.", + "trDisplayName": "C/C++ Source File", + "trDisplayCategory": "C/C++", "iconText": "cpp", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}",