feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Create and populate 'Kits' settings category

Browse Source 
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 <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-09-15 16:40:31 +02:00
parent 1963122dcd
commit 5afab6f018
9 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -572,10 +572,10 @@ CMakeSettingsPage::CMakeSettingsPage()
{ {
setId(Constants::CMAKE_SETTINGSPAGE_ID); setId(Constants::CMAKE_SETTINGSPAGE_ID);
setDisplayName(tr("CMake")); setDisplayName(tr("CMake"));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *CMakeSettingsPage::widget() QWidget *CMakeSettingsPage::widget()

2
src/plugins/coreplugin/coreconstants.h
View File

@@ -189,7 +189,7 @@ const char WIZARD_KIND_UNKNOWN[] = "unknown";
const char WIZARD_KIND_PROJECT[] = "project"; const char WIZARD_KIND_PROJECT[] = "project";
const char WIZARD_KIND_FILE[] = "file"; 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_CATEGORY_CORE_ICON[] = ":/core/images/category_core.png";
const char SETTINGS_TR_CATEGORY_CORE[] = QT_TRANSLATE_NOOP("Core", "Environment"); const char SETTINGS_TR_CATEGORY_CORE[] = QT_TRANSLATE_NOOP("Core", "Environment");
const char SETTINGS_ID_INTERFACE[] = "A.Interface"; const char SETTINGS_ID_INTERFACE[] = "A.Interface";

6
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -600,10 +600,10 @@ DebuggerOptionsPage::DebuggerOptionsPage()
{ {
setId(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID); setId(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID);
setDisplayName(tr("Debuggers")); setDisplayName(tr("Debuggers"));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *DebuggerOptionsPage::widget() QWidget *DebuggerOptionsPage::widget()

6
src/plugins/projectexplorer/kitoptionspage.cpp
View File

@@ -238,10 +238,10 @@ KitOptionsPage::KitOptionsPage()
{ {
setId(Constants::KITS_SETTINGS_PAGE_ID); setId(Constants::KITS_SETTINGS_PAGE_ID);
setDisplayName(tr("Kits")); setDisplayName(tr("Kits"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(Constants::KITS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *KitOptionsPage::widget() QWidget *KitOptionsPage::widget()

23
src/plugins/projectexplorer/projectexplorerconstants.h
View File

@@ -99,19 +99,28 @@ const char QMLUI_MIMETYPE[] = "application/x-qt.ui+qml";
const char RESOURCE_MIMETYPE[] = "application/vnd.qt.xml.resource"; const char RESOURCE_MIMETYPE[] = "application/vnd.qt.xml.resource";
const char SCXML_MIMETYPE[] = "application/scxml+xml"; const char SCXML_MIMETYPE[] = "application/scxml+xml";
// Settings page // Kits settings category
const char PROJECTEXPLORER_SETTINGS_CATEGORY[] = "K.ProjectExplorer"; const char KITS_SETTINGS_CATEGORY[] = "A.Kits";
const char PROJECTEXPLORER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Build & Run"); const char KITS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Kits");
const char PROJECTEXPLORER_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/category_buildrun.png"; const char KITS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/mode_project_mask@2x.png";
const char PROJECTEXPLORER_SETTINGS_ID[] = "A.ProjectExplorer.ProjectExplorer";
// 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 TOOLCHAIN_SETTINGS_PAGE_ID[] = "M.ProjectExplorer.ToolChainOptions";
const char DEBUGGER_SETTINGS_PAGE_ID[] = "N.ProjectExplorer.DebuggerOptions"; 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 // Device settings page
const char DEVICE_SETTINGS_CATEGORY[] = "XW.Devices"; const char DEVICE_SETTINGS_CATEGORY[] = "XW.Devices";
const char DEVICE_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Devices"); const char DEVICE_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Devices");
const char DEVICE_SETTINGS_PAGE_ID[] = "AA.Device Settings";
// Task categories // Task categories
const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile"; const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile";

8
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -185,12 +185,12 @@ void ProjectExplorerSettingsWidget::updateResetButton()
// ------------------ ProjectExplorerSettingsPage // ------------------ ProjectExplorerSettingsPage
ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() ProjectExplorerSettingsPage::ProjectExplorerSettingsPage()
{ {
setId(Constants::PROJECTEXPLORER_SETTINGS_ID); setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID);
setDisplayName(tr("General")); setDisplayName(tr("General"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); Constants::BUILD_AND_RUN_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY_ICON));
} }
QWidget *ProjectExplorerSettingsPage::widget() QWidget *ProjectExplorerSettingsPage::widget()

6
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -432,10 +432,10 @@ ToolChainOptionsPage::ToolChainOptionsPage()
{ {
setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID); setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID);
setDisplayName(tr("Compilers")); setDisplayName(tr("Compilers"));
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(Constants::KITS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *ToolChainOptionsPage::widget() QWidget *ToolChainOptionsPage::widget()

6
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -71,10 +71,10 @@ QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent)
{ {
setId("Y.QbsProfiles"); setId("Y.QbsProfiles");
setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs")); setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs"));
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *QbsProfilesSettingsPage::widget() QWidget *QbsProfilesSettingsPage::widget()

6
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -156,10 +156,10 @@ QtOptionsPage::QtOptionsPage()
{ {
setId(Constants::QTVERSION_SETTINGS_PAGE_ID); setId(Constants::QTVERSION_SETTINGS_PAGE_ID);
setDisplayName(QCoreApplication::translate("QtSupport", Constants::QTVERSION_SETTINGS_PAGE_NAME)); 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", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY));
setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY_ICON));
} }
QWidget *QtOptionsPage::widget() QWidget *QtOptionsPage::widget()