[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-kimageshop
Subject: [graphics/krita/rempt/toolpresets] /: Add object names to the relevant tool option widgets
From: Boudewijn Rempt <null () kde ! org>
Date: 2020-10-31 9:44:44
Message-ID: 20201031094444.4F38912412A5 () leptone ! kde ! org
[Download RAW message or body]
Git commit e75e0e2dd14ddf9f89e0e905bec3bc6c7ba1239c by Boudewijn Rempt.
Committed on 31/10/2020 at 09:44.
Pushed by rempt into branch 'rempt/toolpresets'.
Add object names to the relevant tool option widgets
Hand-constructor tool option widgets need explicit object names
for the widgets that contain settings, so the preset savng and
restoring works. UI file defined option widgets are fine by default.
CCMAIL:kimageshop@kde.org
M +1 -1 libs/ui/tool/kis_tool_shape.cc
M +1 -1 libs/ui/tool/kis_tool_shape.h
M +13 -0 plugins/tools/basictools/kis_tool_brush.cc
M +11 -5 plugins/tools/basictools/kis_tool_fill.cc
M +1 -1 plugins/tools/basictools/kis_tool_gradient.cc
M +1 -1 plugins/tools/basictools/kis_tool_gradient.h
M +4 -2 plugins/tools/basictools/kis_tool_line.cc
M +1 -1 plugins/tools/basictools/kis_tool_line.h
M +1 -0 plugins/tools/basictools/kis_tool_measure.cc
M +12 -0 plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
M +4 -18 plugins/tools/tool_dyna/kis_tool_dyna.cpp
M +1 -1 plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp
M +1 -1 plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h
M +1 -1 plugins/tools/tool_polyline/kis_tool_polyline.h
M +1 -1 plugins/tools/tool_smart_patch/kis_tool_smart_patch.h
M +1 -1 plugins/tools/tool_transform2/kis_tool_transform.cc
M +1 -1 plugins/tools/tool_transform2/kis_tool_transform.h
https://invent.kde.org/graphics/krita/commit/e75e0e2dd14ddf9f89e0e905bec3bc6c7ba1239c
diff --git a/libs/ui/tool/kis_tool_shape.cc \
b/libs/ui/tool/kis_tool_shape.cc index 2f6acb1535..cbcc4600f8 100644
--- a/libs/ui/tool/kis_tool_shape.cc
+++ b/libs/ui/tool/kis_tool_shape.cc
@@ -81,7 +81,7 @@ int KisToolShape::flags() const
|KisTool::FLAG_USES_CUSTOM_SIZE;
}
-QWidget * KisToolShape::createOptionWidget()
+QWidget *KisToolShape::createOptionWidget()
{
m_shapeOptionsWidget = new WdgGeometryOptions(0);
diff --git a/libs/ui/tool/kis_tool_shape.h b/libs/ui/tool/kis_tool_shape.h
index 6d22d93ea5..294cfa1d69 100644
--- a/libs/ui/tool/kis_tool_shape.h
+++ b/libs/ui/tool/kis_tool_shape.h
@@ -68,7 +68,7 @@ public Q_SLOTS:
virtual void patternScaleSettingChanged(qreal value);
protected:
- QWidget* createOptionWidget() override;
+ QWidget *createOptionWidget() override;
KisToolShapeUtils::FillStyle fillStyle();
KisToolShapeUtils::StrokeStyle strokeStyle();
diff --git a/plugins/tools/basictools/kis_tool_brush.cc \
b/plugins/tools/basictools/kis_tool_brush.cc index 44f9d9df99..5fa0e514c3 \
100644
--- a/plugins/tools/basictools/kis_tool_brush.cc
+++ b/plugins/tools/basictools/kis_tool_brush.cc
@@ -347,6 +347,7 @@ QWidget * KisToolBrush::createOptionWidget()
// Line smoothing configuration
m_cmbSmoothingType = new QComboBox(optionsWidget);
+ m_cmbSmoothingType->setObjectName("m_cmbSmoothingType");
m_cmbSmoothingType->addItems(QStringList()
<< i18nc("@item:inlistbox Brush \
Smoothing", "None")
<< i18nc("@item:inlistbox Brush \
Smoothing", "Basic") @@ -356,6 +357,7 @@ QWidget * \
KisToolBrush::createOptionWidget()
addOptionWidgetOption(m_cmbSmoothingType, new QLabel(i18n("Brush \
Smoothing:")));
m_sliderSmoothnessDistance = new \
KisDoubleSliderSpinBox(optionsWidget); + \
m_sliderSmoothnessDistance->setObjectName("m_sliderSmoothnessDistance"); \
m_sliderSmoothnessDistance->setEnabled(true);
connect(m_sliderSmoothnessDistance, SIGNAL(valueChanged(qreal)), \
SLOT(slotSetSmoothnessDistance(qreal)));
m_sliderSmoothnessDistance->setValue(smoothingOptions()->smoothnessDistance());
@@ -366,6 +368,7 @@ QWidget * KisToolBrush::createOptionWidget()
// Finish stabilizer curve
m_chkFinishStabilizedCurve = new QCheckBox(optionsWidget);
+ m_chkFinishStabilizedCurve->setObjectName("m_chkFinishStabilizedCurve");
m_chkFinishStabilizedCurve->setMinimumHeight(qMax(m_sliderSmoothnessDistance->sizeHint().height()-3,
\
m_chkFinishStabilizedCurve->sizeHint().height()));
connect(m_chkFinishStabilizedCurve, SIGNAL(toggled(bool)), this, \
SLOT(setFinishStabilizedCurve(bool))); @@ -380,11 +383,14 @@ QWidget * \
KisToolBrush::createOptionWidget()
delayLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
delayLayout->addWidget(delayLabel);
m_chkDelayDistance = new QCheckBox(optionsWidget);
+ m_chkDelayDistance->setObjectName("m_chkDelayDistance");
m_chkDelayDistance->setLayoutDirection(Qt::RightToLeft);
delayWidget->setToolTip(i18n("Delay the brush stroke to make the line \
smoother"));
connect(m_chkDelayDistance, SIGNAL(toggled(bool)), this, \
SLOT(setUseDelayDistance(bool))); \
delayLayout->addWidget(m_chkDelayDistance); +
m_sliderDelayDistance = new KisDoubleSliderSpinBox(optionsWidget);
+ m_sliderDelayDistance->setObjectName("m_sliderDelayDistance");
m_sliderDelayDistance->setToolTip(i18n("Radius where the brush is \
blocked")); m_sliderDelayDistance->setRange(0, 500);
m_sliderDelayDistance->setExponentRatio(3.0); // help pick smaller \
values @@ -401,6 +407,7 @@ QWidget * KisToolBrush::createOptionWidget()
// Stabilize sensors
m_chkStabilizeSensors = new QCheckBox(optionsWidget);
+ m_chkStabilizeSensors->setObjectName("m_chkStabilizeSensors");
m_chkStabilizeSensors->setMinimumHeight(qMax(m_sliderSmoothnessDistance->sizeHint().height()-3,
\
m_chkStabilizeSensors->sizeHint().height()));
connect(m_chkStabilizeSensors, SIGNAL(toggled(bool)), this, \
SLOT(setStabilizeSensors(bool))); @@ -409,6 +416,7 @@ QWidget * \
KisToolBrush::createOptionWidget()
m_sliderTailAggressiveness = new \
KisDoubleSliderSpinBox(optionsWidget); + \
m_sliderTailAggressiveness->setObjectName("m_sliderTailAggressiveness"); \
m_sliderTailAggressiveness->setRange(0.0, 1.0, 2); \
m_sliderTailAggressiveness->setEnabled(true);
connect(m_sliderTailAggressiveness, SIGNAL(valueChanged(qreal)), \
SLOT(slotSetTailAgressiveness(qreal))); @@ -416,6 +424,7 @@ QWidget * \
KisToolBrush::createOptionWidget()
addOptionWidgetOption(m_sliderTailAggressiveness, new \
QLabel(i18n("Stroke Ending:")));
m_chkSmoothPressure = new QCheckBox(optionsWidget);
+ m_chkSmoothPressure->setObjectName("m_chkSmoothPressure");
m_chkSmoothPressure->setMinimumHeight(qMax(m_sliderSmoothnessDistance->sizeHint().height()-3,
\
m_chkSmoothPressure->sizeHint().height()));
m_chkSmoothPressure->setChecked(smoothingOptions()->smoothPressure());
@@ -423,6 +432,7 @@ QWidget * KisToolBrush::createOptionWidget()
addOptionWidgetOption(m_chkSmoothPressure, new \
QLabel(QString("%1:").arg(i18n("Smooth Pressure"))));
m_chkUseScalableDistance = new QCheckBox(optionsWidget);
+ m_chkUseScalableDistance->setObjectName("m_chkUseScalableDistance");
m_chkUseScalableDistance->setChecked(smoothingOptions()->useScalableDistance());
m_chkUseScalableDistance->setMinimumHeight(qMax(m_sliderSmoothnessDistance->sizeHint().height()-3,
\
m_chkUseScalableDistance->sizeHint().height())); @@ -448,6 +458,7 @@ \
QWidget * KisToolBrush::createOptionWidget() \
assistantLayout->setSpacing(5);
m_chkAssistant = new QCheckBox(optionsWidget);
+ m_chkAssistant->setObjectName("m_chkAssistant");
m_chkAssistant->setText(i18n("Snap to Assistants"));
assistantWidget->setToolTip(i18n("You need to add Assistants before \
this tool will work.")); @@ -455,6 +466,7 @@ QWidget * \
KisToolBrush::createOptionWidget() addOptionWidgetOption(assistantWidget, \
m_chkAssistant);
m_sliderMagnetism = new KisSliderSpinBox(optionsWidget);
+ m_sliderMagnetism->setObjectName("m_sliderMagnetism");
m_sliderMagnetism->setToolTip(i18n("Assistant Magnetism"));
m_sliderMagnetism->setRange(0, MAXIMUM_MAGNETISM);
@@ -467,6 +479,7 @@ QWidget * KisToolBrush::createOptionWidget()
QLabel* snapSingleLabel = new QLabel(i18n("Snap Single:"));
m_chkOnlyOneAssistant = new QCheckBox(optionsWidget);
+ m_chkOnlyOneAssistant->setObjectName("m_chkOnlyOneAssistant");
m_chkOnlyOneAssistant->setToolTip(i18nc("@info:tooltip","Make it only \
snap to a single assistant, prevents snapping mess while using the infinite \
assistants."));
m_chkOnlyOneAssistant->setCheckState(Qt::Checked);//turn on by \
default.
connect(m_chkOnlyOneAssistant, SIGNAL(toggled(bool)), this, \
SLOT(setOnlyOneAssistantSnap(bool)));
diff --git a/plugins/tools/basictools/kis_tool_fill.cc \
b/plugins/tools/basictools/kis_tool_fill.cc index 6bc0f42d46..37b9050205 \
100644
--- a/plugins/tools/basictools/kis_tool_fill.cc
+++ b/plugins/tools/basictools/kis_tool_fill.cc
@@ -232,6 +232,7 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_fastMode = new QLabel(i18n("Fast mode: "), widget);
m_checkUseFastMode = new QCheckBox(QString(), widget);
+ m_checkUseFastMode->setObjectName("m_checkUseFastMode");
m_checkUseFastMode->setToolTip(
i18n("Fills area faster, but does not take composition "
"mode into account. Selections and other extended "
@@ -240,6 +241,7 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_threshold = new QLabel(i18nc("The Threshold label in Fill \
tool options", "Threshold: "), widget); m_slThreshold = new \
KisSliderSpinBox(widget); + \
m_slThreshold->setObjectName("m_slThreshold"); \
m_slThreshold->setObjectName("int_widget"); m_slThreshold->setRange(1, \
100); m_slThreshold->setPageStep(3);
@@ -247,6 +249,7 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_sizemod = new QLabel(i18n("Grow selection: "), widget);
m_sizemodWidget = new KisSliderSpinBox(widget);
+ m_sizemodWidget->setObjectName("m_sizemodWidget");
m_sizemodWidget->setObjectName("sizemod");
m_sizemodWidget->setRange(-40, 40);
m_sizemodWidget->setSingleStep(1);
@@ -254,6 +257,7 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_feather = new QLabel(i18n("Feathering radius: "), widget);
m_featherWidget = new KisSliderSpinBox(widget);
+ m_featherWidget->setObjectName("m_feathreWidget");
m_featherWidget->setObjectName("feather");
m_featherWidget->setRange(0, 40);
m_featherWidget->setSingleStep(1);
@@ -261,10 +265,12 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_usePattern = new QLabel(i18n("Use pattern:"), widget);
m_checkUsePattern = new QCheckBox(QString(), widget);
+ m_checkUsePattern->setObjectName("m_checkUsePattern");
m_checkUsePattern->setToolTip(i18n("When checked do not use the \
foreground color, but the pattern selected to fill with"));
QLabel *lbl_patternRotation = new QLabel(i18n("Rotate:"), widget);
m_sldPatternRotate = new KisDoubleSliderSpinBox(widget);
+ m_sldPatternRotate->setObjectName("m_sldPatternRotate");
m_sldPatternRotate->setObjectName("patternrotate");
m_sldPatternRotate->setRange(0, 360, 2);
m_sldPatternRotate->setSingleStep(1.0);
@@ -272,6 +278,7 @@ QWidget* KisToolFill::createOptionWidget()
QLabel *lbl_patternScale = new QLabel(i18n("Scale:"), widget);
m_sldPatternScale = new KisDoubleSliderSpinBox(widget);
+ m_sldPatternScale->setObjectName("m_sldPatternScale");
m_sldPatternScale->setObjectName("patternscale");
m_sldPatternScale->setRange(0, 500, 2);
m_sldPatternScale->setSingleStep(1.0);
@@ -282,6 +289,7 @@ QWidget* KisToolFill::createOptionWidget()
"Options together with the \
label are: /Sample current layer/ /Sample all layers/ " "/Sample color \
labeled layers/. Sample is a verb here and means something akin to 'take \
into account'.", "Sample:"), widget); m_cmbSampleLayersMode = new \
QComboBox(widget); + \
m_cmbSampleLayersMode->setObjectName("m_cmbSampleLayersMode");
m_cmbSampleLayersMode->addItem(sampleLayerModeToUserString(SAMPLE_LAYERS_MODE_CURRENT), \
SAMPLE_LAYERS_MODE_CURRENT);
m_cmbSampleLayersMode->addItem(sampleLayerModeToUserString(SAMPLE_LAYERS_MODE_ALL), \
SAMPLE_LAYERS_MODE_ALL);
m_cmbSampleLayersMode->addItem(sampleLayerModeToUserString(SAMPLE_LAYERS_MODE_COLOR_LABELED), \
SAMPLE_LAYERS_MODE_COLOR_LABELED); @@ -291,18 +299,19 @@ QWidget* \
KisToolFill::createOptionWidget()
"a choice of color labels that \
a layer can be marked with. Those color labels "
"will be used for calculating \
the area to fill.", "Labels used:"), widget); m_cmbSelectedLabels = new \
KisColorFilterCombo(widget, false, false); + \
m_cmbSelectedLabels->setObjectName("m_cmbSelectedLabels");
m_cmbSelectedLabels->updateAvailableLabels(currentImage().isNull() ? \
KisNodeSP() : currentImage()->root());
QLabel *lbl_fillSelection = new QLabel(i18n("Fill entire selection:"), \
widget); m_checkFillSelection = new QCheckBox(QString(), widget);
+ m_checkFillSelection->setObjectName("m_checkFillSelection");
m_checkFillSelection->setToolTip(i18n("When checked do not look at the \
current layer colors, but just fill all of the selected area"));
QLabel *lbl_useSelectionAsBoundary = new QLabel(i18nc("Description for \
a checkbox in a Fill Tool to use selection borders as boundary when \
filling", "Use selection as boundary:"), widget); \
m_checkUseSelectionAsBoundary = new QCheckBox(QString(), widget); + \
m_checkUseSelectionAsBoundary->setObjectName("m_checkUseSelectionAsBoundary");
m_checkUseSelectionAsBoundary->setToolTip(i18nc("Tooltip for 'Use \
selection as boundary' checkbox", "When checked, use selection borders as \
boundary when filling"));
-
-
connect (m_checkUseFastMode , SIGNAL(toggled(bool)) , this, \
SLOT(slotSetUseFastMode(bool)));
connect (m_slThreshold , SIGNAL(valueChanged(int)), this, \
SLOT(slotSetThreshold(int)));
connect (m_sizemodWidget , SIGNAL(valueChanged(int)), this, \
SLOT(slotSetSizemod(int))); @@ -334,8 +343,6 @@ QWidget* \
KisToolFill::createOptionWidget()
widget->setFixedHeight(widget->sizeHint().height());
-
-
// load configuration options
m_checkUseFastMode->setChecked(m_configGroup.readEntry("useFastMode", \
false));
m_slThreshold->setValue(m_configGroup.readEntry("thresholdAmount", \
80)); @@ -370,7 +377,6 @@ QWidget* KisToolFill::createOptionWidget()
// m_sampleLayersMode is set manually above
// selectedColors are also set manually
-
activateConnectionsToImage();
m_widgetsInitialized = true;
diff --git a/plugins/tools/basictools/kis_tool_gradient.cc \
b/plugins/tools/basictools/kis_tool_gradient.cc index \
b47a52e57f..1f2ef7e0fc 100644
--- a/plugins/tools/basictools/kis_tool_gradient.cc
+++ b/plugins/tools/basictools/kis_tool_gradient.cc
@@ -232,7 +232,7 @@ void KisToolGradient::paintLine(QPainter& gc)
}
}
-QWidget* KisToolGradient::createOptionWidget()
+QWidget *KisToolGradient::createOptionWidget()
{
QWidget *widget = KisToolPaint::createOptionWidget();
Q_CHECK_PTR(widget);
diff --git a/plugins/tools/basictools/kis_tool_gradient.h \
b/plugins/tools/basictools/kis_tool_gradient.h index e3a620e6ee..cd11911223 \
100644
--- a/plugins/tools/basictools/kis_tool_gradient.h
+++ b/plugins/tools/basictools/kis_tool_gradient.h
@@ -60,7 +60,7 @@ public:
void paint(QPainter &painter, const KoViewConverter &converter) \
override;
- QWidget* createOptionWidget() override;
+ QWidget *createOptionWidget() override;
public Q_SLOTS:
void activate(ToolActivation toolActivation, const QSet<KoShape*> \
&shapes) override;
diff --git a/plugins/tools/basictools/kis_tool_line.cc \
b/plugins/tools/basictools/kis_tool_line.cc index ca454e6818..bcba959b0d \
100644
--- a/plugins/tools/basictools/kis_tool_line.cc
+++ b/plugins/tools/basictools/kis_tool_line.cc
@@ -95,17 +95,20 @@ void KisToolLine::deactivate()
cancelStroke();
}
-QWidget* KisToolLine::createOptionWidget()
+QWidget *KisToolLine::createOptionWidget()
{
QWidget* widget = KisToolPaint::createOptionWidget();
m_chkUseSensors = new QCheckBox(i18n("Use sensors"));
+ m_chkUseSensors->setObjectName("m_chkUseSensors");
addOptionWidgetOption(m_chkUseSensors);
m_chkShowPreview = new QCheckBox(i18n("Show Preview"));
+ m_chkShowPreview->setObjectName("m_chkShowPreview");
addOptionWidgetOption(m_chkShowPreview);
m_chkShowGuideline = new QCheckBox(i18n("Show Guideline"));
+ m_chkShowGuideline->setObjectName("m_chkShowGuildeine");
addOptionWidgetOption(m_chkShowGuideline);
// hook up connections for value changing
@@ -113,7 +116,6 @@ QWidget* KisToolLine::createOptionWidget()
connect(m_chkShowPreview, SIGNAL(clicked(bool)), this, \
SLOT(setShowPreview(bool)) );
connect(m_chkShowGuideline, SIGNAL(clicked(bool)), this, \
SLOT(setShowGuideline(bool)) );
-
// read values in from configuration
m_chkUseSensors->setChecked(configGroup.readEntry("useSensors", \
true));
m_chkShowPreview->setChecked(configGroup.readEntry("showPreview", \
true));
diff --git a/plugins/tools/basictools/kis_tool_line.h \
b/plugins/tools/basictools/kis_tool_line.h index 3e6ef2103f..4c4d2e03ea \
100644
--- a/plugins/tools/basictools/kis_tool_line.h
+++ b/plugins/tools/basictools/kis_tool_line.h
@@ -78,7 +78,7 @@ private:
QPointF straightLine(QPointF point);
void updateGuideline();
void updatePreviewTimer(bool showGuide);
- QWidget* createOptionWidget() override;
+ QWidget *createOptionWidget() override;
void endStroke();
void cancelStroke();
diff --git a/plugins/tools/basictools/kis_tool_measure.cc \
b/plugins/tools/basictools/kis_tool_measure.cc index 714e26e641..43d51e8086 \
100644
--- a/plugins/tools/basictools/kis_tool_measure.cc
+++ b/plugins/tools/basictools/kis_tool_measure.cc
@@ -62,6 +62,7 @@ KisToolMeasureOptionsWidget::KisToolMeasureOptionsWidget(QWidget* \
parent, double optionLayout->addWidget(m_angleLabel, 1, 1);
KComboBox* unitBox = new KComboBox(this);
+ unitBox->setObjectName("unitBox");
unitBox->addItems(KoUnit::listOfUnitNameForUi(KoUnit::ListAll));
connect(unitBox, SIGNAL(currentIndexChanged(int)), this, \
SLOT(slotUnitChanged(int))); \
unitBox->setCurrentIndex(m_unit.indexInListForUi(KoUnit::ListAll));
diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp \
b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
index 4bf3971769..93ec731408 100644
--- a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
+++ b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
@@ -66,6 +66,7 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
layout->setContentsMargins(0, 0, 0, 0);
m_comboBox = new KComboBox(this);
+ m_comboBox->setObjectName("m_combobox");
layout->addWidget(m_comboBox, 0, 0);
m_saveButton = new QToolButton(this);
@@ -83,14 +84,17 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
detailsLayout->setVerticalSpacing(0);
m_usePath = new QCheckBox(i18n("&Follow selected path"), this);
+ m_usePath->setObjectName("m_usePath");
detailsLayout->addWidget(m_usePath, 0, 0, 1, 4);
m_usePressure = new QCheckBox(i18n("Use tablet &pressure"), this);
+ m_usePressure->setObjectName("m_usePressure");
detailsLayout->addWidget(m_usePressure, 1, 0, 1, 4);
QLabel *widthLabel = new QLabel(i18n("Width:"), this);
widthLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_widthBox = new KisDoubleParseSpinBox(this);
+ m_widthBox->setObjectName("m_widthBox");
m_widthBox->setRange(0.0, 999.0);
widthLabel->setBuddy(m_widthBox);
detailsLayout->addWidget(widthLabel, 2, 2);
@@ -99,18 +103,22 @@ \
KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget() QLabel \
*thinningLabel = new QLabel(i18n("Thinning:"), this); \
thinningLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); \
m_thinningBox = new KisDoubleParseSpinBox(this); + \
m_thinningBox->setObjectName("m_thinningBox"); \
m_thinningBox->setRange(-1.0, 1.0); m_thinningBox->setSingleStep(0.1);
+
thinningLabel->setBuddy(m_thinningBox);
detailsLayout->addWidget(thinningLabel, 2, 0);
detailsLayout->addWidget(m_thinningBox, 2, 1);
m_useAngle = new QCheckBox(i18n("Use tablet &angle"), this);
+ m_useAngle->setObjectName("m_useAngle");
detailsLayout->addWidget(m_useAngle, 3, 0, 1, 4);
QLabel *angleLabel = new QLabel(i18n("Angle:"), this);
angleLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_angleBox = new KisIntParseSpinBox(this);
+ m_angleBox->setObjectName("m_angleBox");
m_angleBox->setRange(0, 179);
m_angleBox->setWrapping(true);
angleLabel->setBuddy(m_angleBox);
@@ -120,6 +128,7 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
QLabel *fixationLabel = new QLabel(i18n("Fixation:"), this);
fixationLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_fixationBox = new KisDoubleParseSpinBox(this);
+ m_fixationBox->setObjectName("m_fixationBox");
m_fixationBox->setRange(0.0, 1.0);
m_fixationBox->setSingleStep(0.1);
fixationLabel->setBuddy(m_fixationBox);
@@ -129,6 +138,7 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
QLabel *capsLabel = new QLabel(i18n("Caps:"), this);
capsLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_capsBox = new KisDoubleParseSpinBox(this);
+ m_capsBox->setObjectName("m_capsBox");
m_capsBox->setRange(0.0, 2.0);
m_capsBox->setSingleStep(0.03);
capsLabel->setBuddy(m_capsBox);
@@ -138,6 +148,7 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
QLabel *massLabel = new QLabel(i18n("Mass:"), this);
massLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_massBox = new KisDoubleParseSpinBox(this);
+ m_massBox->setObjectName("m_massBox");
m_massBox->setRange(0.0, 20.0);
m_massBox->setDecimals(1);
massLabel->setBuddy(m_massBox);
@@ -147,6 +158,7 @@ KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
QLabel *dragLabel = new QLabel(i18n("Drag:"), this);
dragLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
m_dragBox = new KisDoubleParseSpinBox(this);
+ m_dragBox->setObjectName("m_dragBox");
m_dragBox->setRange(0.0, 1.0);
m_dragBox->setSingleStep(0.1);
dragLabel->setBuddy(m_dragBox);
diff --git a/plugins/tools/tool_dyna/kis_tool_dyna.cpp \
b/plugins/tools/tool_dyna/kis_tool_dyna.cpp index 1e2a90d9cd..529ba0631b \
100644
--- a/plugins/tools/tool_dyna/kis_tool_dyna.cpp
+++ b/plugins/tools/tool_dyna/kis_tool_dyna.cpp
@@ -287,12 +287,14 @@ QWidget * KisToolDyna::createOptionWidget()
QLabel* massLbl = new QLabel(i18n("Mass:"), optionsWidget);
m_massSPBox = new KisDoubleSliderSpinBox(optionsWidget);
+ m_massSPBox->setObjectName("m_massSPBox");
m_massSPBox->setRange(0.0,1.0,2);
connect(m_massSPBox, SIGNAL(valueChanged(qreal)), this, \
SLOT(slotSetMass(qreal))); \
KisToolFreehand::addOptionWidgetOption(m_massSPBox,massLbl);
QLabel* dragLbl = new QLabel(i18n("Drag:"), optionsWidget);
m_dragSPBox = new KisDoubleSliderSpinBox(optionsWidget);
+ m_dragSPBox->setObjectName("m_dragSPBox");
m_dragSPBox->setRange(0.0,1.0,2);
connect(m_dragSPBox, SIGNAL(valueChanged(qreal)), this, \
SLOT(slotSetDrag(qreal))); \
KisToolFreehand::addOptionWidgetOption(m_dragSPBox,dragLbl); @@ -300,10 \
+302,12 @@ QWidget * KisToolDyna::createOptionWidget()
//NOTE: so far unused, waiting for the changes to propagate \
rotation/pressure to freehand tool // fixed angle might be for 2.4, but \
the later one for 2.5 m_chkFixedAngle = new QCheckBox(i18n("Fixed \
angle:"), optionsWidget); + \
m_chkFixedAngle->setObjectName("m_chkFixedAngle"); \
m_chkFixedAngle->setEnabled(false);
connect(m_chkFixedAngle, SIGNAL(toggled(bool)), this, \
SLOT(slotSetFixedAngle(bool)));
m_angleDSSBox = new KisDoubleSliderSpinBox(optionsWidget);
+ m_angleDSSBox->setObjectName("m_angleDSSBox");
m_angleDSSBox->setRange(0,360,0);
m_angleDSSBox->setSuffix(QChar(Qt::Key_degree));
m_angleDSSBox->setEnabled(false);
@@ -317,24 +321,6 @@ QWidget * KisToolDyna::createOptionWidget()
m_chkFixedAngle->setChecked((bool)m_configGroup.readEntry("useFixedAngle", \
false)); m_angleDSSBox->setValue(m_configGroup.readEntry("angleAmount", \
20));
-
-#if 0
- QLabel* initWidthLbl = new QLabel(i18n("Initial width:"), \
optionWidget);
- m_initWidthSPBox = new QDoubleSpinBox(optionWidget);
- connect(m_initWidthSPBox, SIGNAL(valueChanged(double)), this, \
SLOT(slotSetDynaWidth(double)));
- KisToolFreehand::addOptionWidgetOption(m_initWidthSPBox,initWidthLbl);
-
- QLabel* widthRangeLbl = new QLabel(i18n("Width range:"), \
optionWidget);
- m_widthRangeSPBox = new QDoubleSpinBox(optionWidget);
- connect(m_widthRangeSPBox, SIGNAL(valueChanged(double)), this, \
SLOT(slotSetWidthRange(double)));
- //KisToolFreehand::addOptionWidgetOption(m_widthRangeSPBox,widthRangeLbl);
-
- m_initWidthSPBox->setValue(m_configGroup.readEntry("initWidth", 10));
- m_widthRangeSPBox->setValue(m_configGroup.readEntry("initWidthRange", \
20));
-
-
-#endif
-
return optionsWidget;
}
diff --git a/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp \
b/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp index \
15854c4fdb..dadc6edcfa 100644
--- a/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp
+++ b/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp
@@ -339,7 +339,7 @@ void KisToolLazyBrush::explicitUserStrokeEndRequest()
}
}
-QWidget * KisToolLazyBrush::createOptionWidget()
+QWidget *KisToolLazyBrush::createOptionWidget()
{
KisCanvas2 * kiscanvas = dynamic_cast<KisCanvas2*>(canvas());
diff --git a/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h \
b/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h index \
3935efce07..ad8ad8c79e 100644
--- a/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h
+++ b/plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h
@@ -42,7 +42,7 @@ public:
KisToolLazyBrush(KoCanvasBase * canvas);
~KisToolLazyBrush() override;
- QWidget * createOptionWidget() override;
+ QWidget *createOptionWidget() override;
void activatePrimaryAction() override;
void deactivatePrimaryAction() override;
diff --git a/plugins/tools/tool_polyline/kis_tool_polyline.h \
b/plugins/tools/tool_polyline/kis_tool_polyline.h index \
d5af3482ce..8b08b853ef 100644
--- a/plugins/tools/tool_polyline/kis_tool_polyline.h
+++ b/plugins/tools/tool_polyline/kis_tool_polyline.h
@@ -35,7 +35,7 @@ public:
~KisToolPolyline() override;
protected:
- QWidget* createOptionWidget() override;
+ QWidget *createOptionWidget() override;
void finishPolyline(const QVector<QPointF>& points) override;
protected Q_SLOTS:
diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.h \
b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.h index \
0b1ca6072b..6b801545b5 100644
--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.h
+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.h
@@ -47,7 +47,7 @@ public:
KisToolSmartPatch(KoCanvasBase * canvas);
~KisToolSmartPatch() override;
- QWidget * createOptionWidget() override;
+ QWidget *createOptionWidget() override;
void activatePrimaryAction() override;
void deactivatePrimaryAction() override;
diff --git a/plugins/tools/tool_transform2/kis_tool_transform.cc \
b/plugins/tools/tool_transform2/kis_tool_transform.cc index \
6fa94038c5..9f6374e151 100644
--- a/plugins/tools/tool_transform2/kis_tool_transform.cc
+++ b/plugins/tools/tool_transform2/kis_tool_transform.cc
@@ -950,7 +950,7 @@ QList<KisNodeSP> \
KisToolTransform::fetchNodesList(ToolTransformArgs::TransformMo return \
result; }
-QWidget* KisToolTransform::createOptionWidget()
+QWidget *KisToolTransform::createOptionWidget()
{
if (!m_canvas) return 0;
diff --git a/plugins/tools/tool_transform2/kis_tool_transform.h \
b/plugins/tools/tool_transform2/kis_tool_transform.h index \
81b9625d4c..188dce1f8e 100644
--- a/plugins/tools/tool_transform2/kis_tool_transform.h
+++ b/plugins/tools/tool_transform2/kis_tool_transform.h
@@ -142,7 +142,7 @@ public:
return false;
}
- QWidget* createOptionWidget() override;
+ QWidget *createOptionWidget() override;
void mousePressEvent(KoPointerEvent *e) override;
void mouseMoveEvent(KoPointerEvent *e) override;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic