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

Utils: Add undo/redo to BoolAspect

Browse Source 
Change-Id: Ie80e81c2ceef232278e2815ffa56bcbaef903eb2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-12 07:36:55 +02:00
parent 797e6d55a6
commit 67aab38873
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/libs/utils/aspects.cpp
View File

@@ -698,6 +698,8 @@ public:
QPointer<QAbstractButton> m_button; // Owned by configuration widget QPointer<QAbstractButton> m_button; // Owned by configuration widget
QPointer<QGroupBox> m_groupBox; // For BoolAspects handling GroupBox check boxes QPointer<QGroupBox> m_groupBox; // For BoolAspects handling GroupBox check boxes
bool m_buttonIsAdopted = false; bool m_buttonIsAdopted = false;
UndoableValue<bool> m_undoable;
}; };
class ColorAspectPrivate class ColorAspectPrivate
@@ -1708,6 +1710,8 @@ BoolAspect::BoolAspect(AspectContainer *container)
{ {
setDefaultValue(false); setDefaultValue(false);
setSpan(2, 1); setSpan(2, 1);
d->m_undoable.setSilently(false);
} }
/*! /*!
@@ -1741,9 +1745,15 @@ void BoolAspect::addToLayout(Layouting::LayoutItem &parent)
break; break;
} }
connect(d->m_button.data(), &QAbstractButton::clicked, this, [this] {
pushUndo(d->m_undoable.set(d->m_button->isChecked()));
});
connect(&d->m_undoable.m_signal, &UndoSignaller::changed, d->m_button, [this]() {
d->m_button->setChecked(d->m_undoable.get());
handleGuiChanged();
});
bufferToGui(); bufferToGui();
connect(d->m_button.data(), &QAbstractButton::clicked,
this, &BoolAspect::handleGuiChanged);
} }
void BoolAspect::adoptButton(QAbstractButton *button) void BoolAspect::adoptButton(QAbstractButton *button)
@@ -1764,6 +1774,16 @@ std::function<void (QObject *)> BoolAspect::groupChecker()
groupBox->setCheckable(true); groupBox->setCheckable(true);
groupBox->setChecked(value()); groupBox->setChecked(value());
d->m_groupBox = groupBox; d->m_groupBox = groupBox;
connect(d->m_groupBox.data(), &QGroupBox::clicked, this, [this] {
pushUndo(d->m_undoable.set(d->m_groupBox->isChecked()));
});
connect(&d->m_undoable.m_signal, &UndoSignaller::changed, d->m_groupBox, [this]() {
d->m_groupBox->setChecked(d->m_undoable.get());
handleGuiChanged();
});
bufferToGui();
}; };
} }
@@ -1785,20 +1805,12 @@ QAction *BoolAspect::action()
bool BoolAspect::guiToBuffer() bool BoolAspect::guiToBuffer()
{ {
const bool old = m_buffer; return updateStorage(m_buffer, d->m_undoable.get());
if (d->m_button)
m_buffer = d->m_button->isChecked();
else if (d->m_groupBox)
m_buffer = d->m_groupBox->isChecked();
return m_buffer != old;
} }
void BoolAspect::bufferToGui() void BoolAspect::bufferToGui()
{ {
if (d->m_button) d->m_undoable.setWithoutUndo(m_buffer);
d->m_button->setChecked(m_buffer);
else if (d->m_groupBox)
d->m_groupBox->setChecked(m_buffer);
} }
void BoolAspect::setLabel(const QString &labelText, LabelPlacement labelPlacement) void BoolAspect::setLabel(const QString &labelText, LabelPlacement labelPlacement)