From 5afab6f018e0ad154c00ac78d61a0a1d5ce8edb0 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Sep 2017 16:40:31 +0200 Subject: [PATCH] ProjectExplorer: Create and populate 'Kits' settings category Kits are a central concept and structure in anything build and run related in Creator, their organization is crucial for the functionality of Creator and deserve to be emphasized over other, often more cosmetic settings. This is the first step of two, the second step would be moving the Device (list) page also in this category, possibly after some reorganization in the Device category. Change-Id: I4abc89472d0575c691fc9e5051397833126e5456 Reviewed-by: Tobias Hunger --- .../cmakeprojectmanager/cmakesettingspage.cpp | 6 ++--- src/plugins/coreplugin/coreconstants.h | 2 +- src/plugins/debugger/debuggeritemmanager.cpp | 6 ++--- .../projectexplorer/kitoptionspage.cpp | 6 ++--- .../projectexplorerconstants.h | 23 +++++++++++++------ .../projectexplorersettingspage.cpp | 8 +++---- .../projectexplorer/toolchainoptionspage.cpp | 6 ++--- .../qbsprofilessettingspage.cpp | 6 ++--- src/plugins/qtsupport/qtoptionspage.cpp | 6 ++--- 9 files changed, 39 insertions(+), 30 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 9f1b7538924..641132cb3f5 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -572,10 +572,10 @@ CMakeSettingsPage::CMakeSettingsPage() { setId(Constants::CMAKE_SETTINGSPAGE_ID); setDisplayName(tr("CMake")); - setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *CMakeSettingsPage::widget() diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index aa9b9fbbc25..4968af1971f 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -189,7 +189,7 @@ const char WIZARD_KIND_UNKNOWN[] = "unknown"; const char WIZARD_KIND_PROJECT[] = "project"; const char WIZARD_KIND_FILE[] = "file"; -const char SETTINGS_CATEGORY_CORE[] = "A.Core"; +const char SETTINGS_CATEGORY_CORE[] = "B.Core"; const char SETTINGS_CATEGORY_CORE_ICON[] = ":/core/images/category_core.png"; const char SETTINGS_TR_CATEGORY_CORE[] = QT_TRANSLATE_NOOP("Core", "Environment"); const char SETTINGS_ID_INTERFACE[] = "A.Interface"; diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index f78f9807995..b3026a67e7c 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -600,10 +600,10 @@ DebuggerOptionsPage::DebuggerOptionsPage() { setId(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID); setDisplayName(tr("Debuggers")); - setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *DebuggerOptionsPage::widget() diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index 418e1abe4ec..828f4689cf7 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -238,10 +238,10 @@ KitOptionsPage::KitOptionsPage() { setId(Constants::KITS_SETTINGS_PAGE_ID); setDisplayName(tr("Kits")); - setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *KitOptionsPage::widget() diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 79169c59582..af3f76737f9 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -99,19 +99,28 @@ const char QMLUI_MIMETYPE[] = "application/x-qt.ui+qml"; const char RESOURCE_MIMETYPE[] = "application/vnd.qt.xml.resource"; const char SCXML_MIMETYPE[] = "application/scxml+xml"; -// Settings page -const char PROJECTEXPLORER_SETTINGS_CATEGORY[] = "K.ProjectExplorer"; -const char PROJECTEXPLORER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Build & Run"); -const char PROJECTEXPLORER_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/category_buildrun.png"; -const char PROJECTEXPLORER_SETTINGS_ID[] = "A.ProjectExplorer.ProjectExplorer"; +// Kits settings category +const char KITS_SETTINGS_CATEGORY[] = "A.Kits"; +const char KITS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Kits"); +const char KITS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/mode_project_mask@2x.png"; + +// Kits pages +const char KITS_SETTINGS_PAGE_ID[] = "D.ProjectExplorer.KitsOptions"; +const char DEVICE_SETTINGS_PAGE_ID[] = "E.ProjectExplorer.DeviceOptions"; const char TOOLCHAIN_SETTINGS_PAGE_ID[] = "M.ProjectExplorer.ToolChainOptions"; const char DEBUGGER_SETTINGS_PAGE_ID[] = "N.ProjectExplorer.DebuggerOptions"; -const char KITS_SETTINGS_PAGE_ID[] = "D.ProjectExplorer.KitsOptions"; + +// Build and Run settings category +const char BUILD_AND_RUN_SETTINGS_CATEGORY[] = "K.BuildAndRun"; +const char BUILD_AND_RUN_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Build & Run"); +const char BUILD_AND_RUN_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/category_buildrun.png"; + +// Build and Run page +const char BUILD_AND_RUN_SETTINGS_PAGE_ID[] = "A.ProjectExplorer.BuildAndRunOptions"; // Device settings page const char DEVICE_SETTINGS_CATEGORY[] = "XW.Devices"; const char DEVICE_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Devices"); -const char DEVICE_SETTINGS_PAGE_ID[] = "AA.Device Settings"; // Task categories const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile"; diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 9d7f8b1c8b1..aed6bf8985d 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -185,12 +185,12 @@ void ProjectExplorerSettingsWidget::updateResetButton() // ------------------ ProjectExplorerSettingsPage ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() { - setId(Constants::PROJECTEXPLORER_SETTINGS_ID); + setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID); setDisplayName(tr("General")); - setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + Constants::BUILD_AND_RUN_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY_ICON)); } QWidget *ProjectExplorerSettingsPage::widget() diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 8cfd23655e8..b3ca52bdd60 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -432,10 +432,10 @@ ToolChainOptionsPage::ToolChainOptionsPage() { setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID); setDisplayName(tr("Compilers")); - setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *ToolChainOptionsPage::widget() diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index f0a1fb72358..56110a3baf8 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -71,10 +71,10 @@ QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent) { setId("Y.QbsProfiles"); setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs")); - setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *QbsProfilesSettingsPage::widget() diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index bdd358c1991..0af421831f3 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -156,10 +156,10 @@ QtOptionsPage::QtOptionsPage() { setId(Constants::QTVERSION_SETTINGS_PAGE_ID); setDisplayName(QCoreApplication::translate("QtSupport", Constants::QTVERSION_SETTINGS_PAGE_NAME)); - setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); + ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON)); } QWidget *QtOptionsPage::widget()