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

Move some knowledge from KitAspectWidget to KitAspect

Browse Source 
The authoritative source of information about a KitAspect is the
KitAspect itself, not the associated widget.

Change-Id: I72d3d0425b845457846a940350bab59f1ff0cc2c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-06 16:16:07 +01:00
parent ce19540b77
commit 09a7d2bd45
13 changed files with 50 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -111,7 +111,6 @@ public:
private:
// KitAspectWidget interface
QString displayName() const override { return tr("CMake Tool"); }
void makeReadOnly() override { m_comboBox->setEnabled(false); }
QWidget *mainWidget() const override { return m_comboBox; }
QWidget *buttonWidget() const override { return m_manageButton; }
@@ -122,12 +121,6 @@ private:
m_comboBox->setCurrentIndex(tool ? indexOf(tool->id()) : -1);
}
QString toolTip() const override
{
return tr("The CMake Tool to use when building a project with CMake.<br>"
"This setting is ignored when using other build systems.");
}
int indexOf(const Core::Id &id)
{
for (int i = 0; i < m_comboBox->count(); ++i) {
@@ -213,6 +206,9 @@ CMakeKitAspect::CMakeKitAspect()
{
setObjectName(QLatin1String("CMakeKitAspect"));
setId(TOOL_ID);
setDisplayName(tr("CMake Tool"));
setDescription(tr("The CMake Tool to use when building a project with CMake.<br>"
"This setting is ignored when using other build systems."));
setPriority(20000);
//make sure the default value is set if a selected CMake is removed
@@ -347,7 +343,6 @@ public:
private:
// KitAspectWidget interface
QString displayName() const override { return tr("CMake generator"); }
void makeReadOnly() override { m_changeButton->setEnabled(false); }
QWidget *mainWidget() const override { return m_label; }
QWidget *buttonWidget() const override { return m_changeButton; }
@@ -375,12 +370,6 @@ private:
m_label->setText(message);
}
QString toolTip() const override
{
return tr("CMake generator defines how a project is built when using CMake.<br>"
"This setting is ignored when using other build systems.");
}
void changeGenerator()
{
QPointer<QDialog> changeDialog = new QDialog(m_changeButton);
@@ -531,6 +520,9 @@ CMakeGeneratorKitAspect::CMakeGeneratorKitAspect()
{
setObjectName(QLatin1String("CMakeGeneratorKitAspect"));
setId(GENERATOR_ID);
setDisplayName(tr("CMake generator"));
setDescription(tr("CMake generator defines how a project is built when using CMake.<br>"
"This setting is ignored when using other build systems."));
setPriority(19000);
}
@@ -804,7 +796,6 @@ public:
private:
// KitAspectWidget interface
QString displayName() const override { return tr("CMake Configuration"); }
QWidget *mainWidget() const override { return m_summaryLabel; }
QWidget *buttonWidget() const override { return m_manageButton; }
@@ -824,11 +815,6 @@ private:
m_editor->setPlainText(current.join('\n'));
}
QString toolTip() const override
{
return tr("Default configuration passed to CMake when setting up a project.");
}
void editConfigurationChanges()
{
if (m_dialog) {
@@ -903,6 +889,8 @@ CMakeConfigurationKitAspect::CMakeConfigurationKitAspect()
{
setObjectName(QLatin1String("CMakeConfigurationKitAspect"));
setId(CONFIGURATION_ID);
setDisplayName(tr("CMake Configuration"));
setDescription(tr("Default configuration passed to CMake when setting up a project."));
setPriority(18000);
}