Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Revert MyPaint brush settings

Rodney9a6792b78878
diff --git a/toonz/sources/include/toonzqt/styleeditor.h b/toonz/sources/include/toonzqt/styleeditor.h
index c9992f5a5..de61be761 100644
--- a/toonz/sources/include/toonzqt/styleeditor.h
+++ b/toonz/sources/include/toonzqt/styleeditor.h
@@ -818,6 +818,7 @@ class SettingsPage final : public QScrollArea {
QGridLayout *m_paramsLayout;
QCheckBox *m_autoFillCheckBox;
+ QPushButton *m_revertMyPaintButton;
TColorStyleP m_editedStyle; //!< A copy of the current style being edited by
//! the Style Editor.
@@ -846,6 +847,7 @@ private slots:
void onAutofillChanged();
void onValueChanged(bool isDragging = false);
void onValueReset();
+ void onMyPaintRevert();
};
//=============================================================================
diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp
index 040bd9dc5..193739824 100644
--- a/toonz/sources/toonzqt/styleeditor.cpp
+++ b/toonz/sources/toonzqt/styleeditor.cpp
@@ -2528,6 +2528,15 @@ SettingsPage::SettingsPage(QWidget *parent)
paramsContainerLayout->addLayout(m_paramsLayout);
paramsContainerLayout->addStretch(1);
+
+ m_revertMyPaintButton = new QPushButton(tr("Revert"), this);
+ m_revertMyPaintButton->hide();
+ paramsContainerLayout->addWidget(m_revertMyPaintButton, 0, Qt::AlignRight);
+
+ ret = connect(m_revertMyPaintButton, SIGNAL(clicked(bool)), this,
+ SLOT(onMyPaintRevert())) &&
+ ret;
+ assert(ret);
}
//-----------------------------------------------------------------------------
@@ -2564,6 +2573,8 @@ void SettingsPage::setStyle(const TColorStyleP &editedStyle) {
!(m_editedStyle && typeid(*m_editedStyle) == typeid(*editedStyle));
m_editedStyle = editedStyle;
+ m_revertMyPaintButton->setVisible(
+ dynamic_cast<TMyPaintBrushStyle *>(m_editedStyle.getPointer()));
if (clearLayout) locals::clearLayout(m_paramsLayout);
@@ -2696,6 +2707,11 @@ void SettingsPage::updateValues() {
// Deal with the autofill
m_autoFillCheckBox->setChecked(m_editedStyle->getFlags() & 1);
+ TMyPaintBrushStyle *myPaintStyle =
+ dynamic_cast<TMyPaintBrushStyle *>(m_editedStyle.getPointer());
+ if (myPaintStyle)
+ m_revertMyPaintButton->setEnabled(!myPaintStyle->getBaseValues().empty());
+
int p, pCount = m_editedStyle->getParamCount();
for (p = 0; p != pCount; ++p) {
// Update state of "reset to default" button
@@ -2792,6 +2808,8 @@ void SettingsPage::onValueReset() {
assert(0 <= p && p < m_editedStyle->getParamCount());
m_editedStyle->setParamDefault(p);
+ if (dynamic_cast<TMyPaintBrushStyle *>(m_editedStyle.getPointer()))
+ updateValues();
// Forward the signal to the style editor
if (!m_updating) emit paramStyleChanged(false);
@@ -2799,6 +2817,19 @@ void SettingsPage::onValueReset() {
//-----------------------------------------------------------------------------
+void SettingsPage::onMyPaintRevert() {
+ TMyPaintBrushStyle *myPaintStyle =
+ dynamic_cast<TMyPaintBrushStyle *>(m_editedStyle.getPointer());
+ assert(myPaintStyle);
+
+ myPaintStyle->resetBaseValues();
+ updateValues();
+
+ if (!m_updating) emit paramStyleChanged(false);
+}
+
+//-----------------------------------------------------------------------------
+
void SettingsPage::onValueChanged(bool isDragging) {
assert(m_editedStyle);
@@ -2834,6 +2865,11 @@ void SettingsPage::onValueChanged(bool isDragging) {
}
}
+ TMyPaintBrushStyle *myPaintStyle =
+ dynamic_cast<TMyPaintBrushStyle *>(m_editedStyle.getPointer());
+ if (myPaintStyle)
+ m_revertMyPaintButton->setEnabled(!myPaintStyle->getBaseValues().empty());
+
// Forward the signal to the style editor
if (!m_updating) emit paramStyleChanged(isDragging);
}