forked from qt-creator/qt-creator
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 <christian.stenger@qt.io>
This commit is contained in:
@@ -97,7 +97,7 @@ CMakeKitConfigWidget::~CMakeKitConfigWidget()
|
|||||||
|
|
||||||
QString CMakeKitConfigWidget::displayName() const
|
QString CMakeKitConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("CMake Tool:");
|
return tr("CMake Tool");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeKitConfigWidget::makeReadOnly()
|
void CMakeKitConfigWidget::makeReadOnly()
|
||||||
@@ -230,7 +230,7 @@ CMakeGeneratorKitConfigWidget::~CMakeGeneratorKitConfigWidget()
|
|||||||
|
|
||||||
QString CMakeGeneratorKitConfigWidget::displayName() const
|
QString CMakeGeneratorKitConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("CMake generator:");
|
return tr("CMake generator");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeGeneratorKitConfigWidget::makeReadOnly()
|
void CMakeGeneratorKitConfigWidget::makeReadOnly()
|
||||||
|
@@ -93,7 +93,7 @@ QString DebuggerKitConfigWidget::toolTip() const
|
|||||||
|
|
||||||
QString DebuggerKitConfigWidget::displayName() const
|
QString DebuggerKitConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Debugger:");
|
return tr("Debugger");
|
||||||
}
|
}
|
||||||
|
|
||||||
void DebuggerKitConfigWidget::makeReadOnly()
|
void DebuggerKitConfigWidget::makeReadOnly()
|
||||||
|
@@ -82,7 +82,7 @@ SysRootInformationConfigWidget::~SysRootInformationConfigWidget()
|
|||||||
|
|
||||||
QString SysRootInformationConfigWidget::displayName() const
|
QString SysRootInformationConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Sysroot:");
|
return tr("Sysroot");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString SysRootInformationConfigWidget::toolTip() const
|
QString SysRootInformationConfigWidget::toolTip() const
|
||||||
@@ -177,7 +177,7 @@ ToolChainInformationConfigWidget::~ToolChainInformationConfigWidget()
|
|||||||
|
|
||||||
QString ToolChainInformationConfigWidget::displayName() const
|
QString ToolChainInformationConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Compiler:");
|
return tr("Compiler");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ToolChainInformationConfigWidget::toolTip() const
|
QString ToolChainInformationConfigWidget::toolTip() const
|
||||||
@@ -285,7 +285,7 @@ QWidget *DeviceTypeInformationConfigWidget::mainWidget() const
|
|||||||
|
|
||||||
QString DeviceTypeInformationConfigWidget::displayName() const
|
QString DeviceTypeInformationConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Device type:");
|
return tr("Device type");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString DeviceTypeInformationConfigWidget::toolTip() const
|
QString DeviceTypeInformationConfigWidget::toolTip() const
|
||||||
@@ -358,7 +358,7 @@ QWidget *DeviceInformationConfigWidget::mainWidget() const
|
|||||||
|
|
||||||
QString DeviceInformationConfigWidget::displayName() const
|
QString DeviceInformationConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Device:");
|
return tr("Device");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString DeviceInformationConfigWidget::toolTip() const
|
QString DeviceInformationConfigWidget::toolTip() const
|
||||||
@@ -437,7 +437,7 @@ QWidget *KitEnvironmentConfigWidget::mainWidget() const
|
|||||||
|
|
||||||
QString KitEnvironmentConfigWidget::displayName() const
|
QString KitEnvironmentConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Environment:");
|
return tr("Environment");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString KitEnvironmentConfigWidget::toolTip() const
|
QString KitEnvironmentConfigWidget::toolTip() const
|
||||||
|
@@ -216,7 +216,7 @@ void KitManagerConfigWidget::addConfigWidget(KitConfigWidget *widget)
|
|||||||
QTC_ASSERT(widget, return);
|
QTC_ASSERT(widget, return);
|
||||||
QTC_ASSERT(!m_widgets.contains(widget), return);
|
QTC_ASSERT(!m_widgets.contains(widget), return);
|
||||||
|
|
||||||
QString name = widget->displayName();
|
const QString name = widget->displayName() + ':';
|
||||||
QString toolTip = widget->toolTip();
|
QString toolTip = widget->toolTip();
|
||||||
|
|
||||||
auto action = new QAction(tr("Mark as Mutable"), nullptr);
|
auto action = new QAction(tr("Mark as Mutable"), nullptr);
|
||||||
|
@@ -55,7 +55,7 @@ QWidget *QmakeKitConfigWidget::mainWidget() const
|
|||||||
|
|
||||||
QString QmakeKitConfigWidget::displayName() const
|
QString QmakeKitConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Qt mkspec:");
|
return tr("Qt mkspec");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QmakeKitConfigWidget::toolTip() const
|
QString QmakeKitConfigWidget::toolTip() const
|
||||||
|
@@ -72,7 +72,7 @@ QtKitConfigWidget::~QtKitConfigWidget()
|
|||||||
|
|
||||||
QString QtKitConfigWidget::displayName() const
|
QString QtKitConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Qt version:");
|
return tr("Qt version");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QtKitConfigWidget::toolTip() const
|
QString QtKitConfigWidget::toolTip() const
|
||||||
|
Reference in New Issue
Block a user