From a0254ea7ee28ecf4ca9a5cd8ca5c9a75ff823482 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 6 Feb 2019 11:29:49 +0100 Subject: [PATCH] Kit settings page: Fix inconsistent labels The widget expected the KitInformation display names to have a colon at the end, which not all of them did. Instead, add the colon in the widget, because it's not really part of the name. Change-Id: I87d613031b462903bf4039eb7f8bdb99c15e37d6 Reviewed-by: Christian Stenger --- .../cmakeprojectmanager/cmakekitconfigwidget.cpp | 4 ++-- src/plugins/debugger/debuggerkitconfigwidget.cpp | 2 +- .../projectexplorer/kitinformationconfigwidget.cpp | 10 +++++----- src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 2 +- .../qmakeprojectmanager/qmakekitconfigwidget.cpp | 2 +- src/plugins/qtsupport/qtkitconfigwidget.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp index 01db2bd56c5..d264f1324f9 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp @@ -97,7 +97,7 @@ CMakeKitConfigWidget::~CMakeKitConfigWidget() QString CMakeKitConfigWidget::displayName() const { - return tr("CMake Tool:"); + return tr("CMake Tool"); } void CMakeKitConfigWidget::makeReadOnly() @@ -230,7 +230,7 @@ CMakeGeneratorKitConfigWidget::~CMakeGeneratorKitConfigWidget() QString CMakeGeneratorKitConfigWidget::displayName() const { - return tr("CMake generator:"); + return tr("CMake generator"); } void CMakeGeneratorKitConfigWidget::makeReadOnly() diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index 1486e7a08cf..d95a2861ac5 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -93,7 +93,7 @@ QString DebuggerKitConfigWidget::toolTip() const QString DebuggerKitConfigWidget::displayName() const { - return tr("Debugger:"); + return tr("Debugger"); } void DebuggerKitConfigWidget::makeReadOnly() diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index b1fcbcb6be4..a366d84646a 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -82,7 +82,7 @@ SysRootInformationConfigWidget::~SysRootInformationConfigWidget() QString SysRootInformationConfigWidget::displayName() const { - return tr("Sysroot:"); + return tr("Sysroot"); } QString SysRootInformationConfigWidget::toolTip() const @@ -177,7 +177,7 @@ ToolChainInformationConfigWidget::~ToolChainInformationConfigWidget() QString ToolChainInformationConfigWidget::displayName() const { - return tr("Compiler:"); + return tr("Compiler"); } QString ToolChainInformationConfigWidget::toolTip() const @@ -285,7 +285,7 @@ QWidget *DeviceTypeInformationConfigWidget::mainWidget() const QString DeviceTypeInformationConfigWidget::displayName() const { - return tr("Device type:"); + return tr("Device type"); } QString DeviceTypeInformationConfigWidget::toolTip() const @@ -358,7 +358,7 @@ QWidget *DeviceInformationConfigWidget::mainWidget() const QString DeviceInformationConfigWidget::displayName() const { - return tr("Device:"); + return tr("Device"); } QString DeviceInformationConfigWidget::toolTip() const @@ -437,7 +437,7 @@ QWidget *KitEnvironmentConfigWidget::mainWidget() const QString KitEnvironmentConfigWidget::displayName() const { - return tr("Environment:"); + return tr("Environment"); } QString KitEnvironmentConfigWidget::toolTip() const diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index c9b8391bd90..473c8455e25 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -216,7 +216,7 @@ void KitManagerConfigWidget::addConfigWidget(KitConfigWidget *widget) QTC_ASSERT(widget, return); QTC_ASSERT(!m_widgets.contains(widget), return); - QString name = widget->displayName(); + const QString name = widget->displayName() + ':'; QString toolTip = widget->toolTip(); auto action = new QAction(tr("Mark as Mutable"), nullptr); diff --git a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp index 3cfcfaaa599..ba90baf6f16 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp @@ -55,7 +55,7 @@ QWidget *QmakeKitConfigWidget::mainWidget() const QString QmakeKitConfigWidget::displayName() const { - return tr("Qt mkspec:"); + return tr("Qt mkspec"); } QString QmakeKitConfigWidget::toolTip() const diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index 53c6421038c..8b32ba44ded 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -72,7 +72,7 @@ QtKitConfigWidget::~QtKitConfigWidget() QString QtKitConfigWidget::displayName() const { - return tr("Qt version:"); + return tr("Qt version"); } QString QtKitConfigWidget::toolTip() const