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

ProjectExplorer: Add a base class for build aspects

Browse Source 
... and make use of it in the QmlDebuggingAspect.
A build setting is conceptually not a boolean, but a tri-state, as we
need to support force-switching a feature on and off as well as
specifying that it is to be left at its default value.

Change-Id: I15552614c5cf4f5187c026909d233c13e3487e81
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-11-25 13:31:27 +01:00
parent 9811f95aa7
commit 6c66af5c23
13 changed files with 153 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -76,6 +76,7 @@ public:
// These are all owned by the configuration widget.
QList<QPointer<QRadioButton>> m_buttons;
QPointer<QComboBox> m_comboBox;
QPointer<QLabel> m_label;
QPointer<QButtonGroup> m_buttonGroup;
};
@@ -400,11 +401,6 @@ void BaseBoolAspect::toMap(QVariantMap &data) const
data.insert(settingsKey(), d->m_value);
}
QCheckBox *BaseBoolAspect::checkBox() const
{
return d->m_checkBox;
}
bool BaseBoolAspect::defaultValue() const
{
return d->m_defaultValue;
@@ -473,13 +469,14 @@ void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
}
break;
case DisplayStyle::ComboBox:
d->m_label = new QLabel(displayName());
d->m_comboBox = new QComboBox;
for (int i = 0, n = d->m_options.size(); i < n; ++i)
d->m_comboBox->addItem(d->m_options.at(i).displayName);
connect(d->m_comboBox.data(), QOverload<int>::of(&QComboBox::activated), this,
[this](int index) { d->m_value = index; emit changed(); });
d->m_comboBox->setCurrentIndex(d->m_value);
builder.addItems(new QLabel(displayName()), d->m_comboBox.data());
builder.addItems(d->m_label.data(), d->m_comboBox.data());
break;
}
}
@@ -494,6 +491,16 @@ void BaseSelectionAspect::toMap(QVariantMap &data) const
data.insert(settingsKey(), d->m_value);
}
void BaseSelectionAspect::setVisibleDynamic(bool visible)
{
if (d->m_label)
d->m_label->setVisible(visible);
if (d->m_comboBox)
d->m_comboBox->setVisible(visible);
for (QRadioButton * const button : qAsConst(d->m_buttons))
button->setVisible(visible);
}
int BaseSelectionAspect::defaultValue() const
{
return d->m_defaultValue;
@@ -613,4 +620,27 @@ void BaseIntegerAspect::setDisplayScaleFactor(qint64 factor)
d->m_displayScaleFactor = factor;
}
BaseTriStateAspect::BaseTriStateAspect()
{
setDisplayStyle(DisplayStyle::ComboBox);
setDefaultValue(2);
addOption(tr("Enable"));
addOption(tr("Disable"));
addOption(tr("Leave at Default"));
}
BaseTriStateAspect::Value BaseTriStateAspect::setting() const
{
if (value() == 0)
return Value::Enabled;
if (value() == 1)
return Value::Disabled;
return Value::Default;
}
void BaseTriStateAspect::setSetting(BaseTriStateAspect::Value setting)
{
setValue(setting == Value::Enabled ? 0 : setting == Value::Disabled ? 1 : 2);
}
} // namespace ProjectExplorer