Commit 211f87ae authored by Boudewijn Rempt's avatar Boudewijn Rempt

Rename createSettingsWidget to createConfigWidget

parent 5cd510ba
......@@ -89,7 +89,7 @@ public:
/**
* create a widget that can display paintop settings
*/
virtual KisPaintOpConfigWidget* createSettingsWidget(QWidget* parent) = 0;
virtual KisPaintOpConfigWidget* createConfigWidget(QWidget* parent) = 0;
/**
* Set the priority of this paintop, as it is shown in the UI; lower number means
......
......@@ -115,8 +115,7 @@ KisSpacingInformation KisBrushBasedPaintOp::effectiveSpacing(qreal scale, qreal
return effectiveSpacing(metric.width(), metric.height(), 1.0, false, rotation);
}
KisSpacingInformation KisBrushBasedPaintOp::effectiveSpacing(qreal scale, qreal rotation, const KisPressureSpacingOption &spacingOption, const KisPaintInformation &pi) const
{
KisSpacingInformation KisBrushBasedPaintOp::effectiveSpacing(qreal scale, qreal rotation, const KisPressureSpacingOption &spacingOption, const KisPaintInformation &pi) const {
qreal extraSpacingScale = 1.0;
if (spacingOption.isChecked()) {
extraSpacingScale = spacingOption.apply(pi);
......
......@@ -106,7 +106,7 @@ public:
return settings;
}
KisPaintOpConfigWidget* createSettingsWidget(QWidget* parent) {
KisPaintOpConfigWidget* createConfigWidget(QWidget* parent) {
return new OpSettingsWidget(parent);
}
......
......@@ -403,7 +403,7 @@ void CompositeOpModel::resourceChanged(int key, const QVariant& /*v*/)
if (preset && d->currentPreset.data() != preset.data()) {
d->currentPreset = preset;
if (!d->settingsWidgets.contains(preset.data())) {
d->settingsWidgets[preset.data()] = KisPaintOpRegistry::instance()->get(preset->paintOp().id())->createSettingsWidget(0);
d->settingsWidgets[preset.data()] = KisPaintOpRegistry::instance()->get(preset->paintOp().id())->createConfigWidget(0);
d->settingsWidgets[preset.data()]->setImage(d->view->image());
d->settingsWidgets[preset.data()]->setConfiguration(preset->settings());
}
......
......@@ -476,7 +476,7 @@ void KisPaintopBox::setCurrentPaintop(const KoID& paintop, KisPaintOpPresetSP pr
if (!m_paintopOptionWidgets.contains(paintop))
m_paintopOptionWidgets[paintop] = KisPaintOpRegistry::instance()->get(paintop.id())->createSettingsWidget(this);
m_paintopOptionWidgets[paintop] = KisPaintOpRegistry::instance()->get(paintop.id())->createConfigWidget(this);
m_optionWidget = m_paintopOptionWidgets[paintop];
......
......@@ -145,7 +145,7 @@ void KisRecordedPaintActionEditor::nodeQueryPathChanged()
void KisRecordedPaintActionEditor::setPaintOpPreset()
{
delete m_configWidget;
m_configWidget = KisPaintOpRegistry::instance()->get(m_action->paintOpPreset()->paintOp().id())->createSettingsWidget(m_actionEditor->frmOptionWidgetContainer);
m_configWidget = KisPaintOpRegistry::instance()->get(m_action->paintOpPreset()->paintOp().id())->createConfigWidget(m_actionEditor->frmOptionWidgetContainer);
if (m_configWidget) {
m_gridLayout->addWidget(m_configWidget);
//TODO use default configuration instead?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment