diff --git a/ab.diff b/ab.diff new file mode 100644 --- /dev/null +++ b/ab.diff @@ -0,0 +1,1004 @@ +diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp +index 3a7a0c9ddb..0affeadcac 100644 +--- a/libs/ui/widgets/kis_curve_widget.cpp ++++ b/libs/ui/widgets/kis_curve_widget.cpp +@@ -77,7 +77,7 @@ KisCurveWidget::KisCurveWidget(QWidget *parent, Qt::WindowFlags f) + setAutoFillBackground(false); + setAttribute(Qt::WA_OpaquePaintEvent); + setMinimumSize(150, 50); +- setMaximumSize(250, 250); ++ setMaximumSize(16777215, 16777215); + + d->setCurveModified(); + +diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +index 6ba0de794e..6504cc3e51 100644 +--- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp ++++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +@@ -63,9 +63,9 @@ KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* parent): + addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter")); + addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(),KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); + + addPaintOpOption(new KisTextureOption(), i18n("Pattern")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength")); +diff --git a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +index b0d7b31147..52eb9bce52 100644 +--- a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp ++++ b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +@@ -74,9 +74,9 @@ KisBrushOpSettingsWidget::KisBrushOpSettingsWidget(QWidget* parent) + addPaintOpOption(new KisColorSourceOptionWidget(), i18n("Source")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureDarkenOption(), i18n("0.0"), i18n("1.0")), i18n("Darken")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureMixOption(), i18n("Foreground"), i18n("Background")), i18n("Mix")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(), KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); + addPaintOpOption(new KisAirbrushOptionWidget(false), i18n("Airbrush")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureRateOption(), i18n("0%"), i18n("100%")), i18n("Rate")); + +diff --git a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +index a01ffd4d68..b2a1e81162 100644 +--- a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui ++++ b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +@@ -42,6 +42,9 @@ + + + ++ ++ 6 ++ + + + +@@ -57,10 +60,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -76,10 +85,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -95,10 +110,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -114,10 +135,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -133,10 +160,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -152,10 +185,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -171,10 +210,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -190,10 +235,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -251,32 +302,6 @@ + + + +- +- +- +- Qt::Horizontal +- +- +- +- 2 +- 2 +- +- +- +- +- +- +- +- Qt::Vertical +- +- +- +- 2 +- 2 +- +- +- +- + + + +@@ -289,6 +314,9 @@ + + + ++ ++ 3 ++ + + + +@@ -378,15 +406,15 @@ + + + +- +- 1 ++ ++ 0 + 0 + + + + +- 200 +- 200 ++ 0 ++ 0 + + + +@@ -468,15 +496,15 @@ + 1 + + +- KisMultiSensorsSelector ++ KisCurveWidget + QWidget +-
kis_multi_sensors_selector.h
++
widgets/kis_curve_widget.h
+ 1 +
+ +- KisCurveWidget ++ KisMultiSensorsSelector + QWidget +-
widgets/kis_curve_widget.h
++
kis_multi_sensors_selector.h
+ 1 +
+ +diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +index 53ef65852e..493bca02d6 100644 +--- a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp ++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +@@ -39,7 +39,7 @@ inline void setLabel(QLabel* label, const KisCurveLabel& curve_label) + } + } + +-KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider) ++KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider, const QString &minLabel_tooltip, const QString &maxLabel_tooltip) + : KisPaintOpOption(curveOption->category(), curveOption->isChecked()) + , m_widget(new QWidget) + , m_curveOptionWidget(new Ui_WdgCurveOption()) +@@ -78,7 +78,15 @@ KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QS + + + m_curveOptionWidget->label_ymin->setText(minLabel); ++ m_curveOptionWidget->label_ymin->setToolTip(minLabel_tooltip); + m_curveOptionWidget->label_ymax->setText(maxLabel); ++ m_curveOptionWidget->label_ymax->setToolTip(maxLabel_tooltip); ++ ++ //underline to the labels who have tooltip ++ if(minLabel_tooltip !="" || maxLabel_tooltip !=""){ ++ m_curveOptionWidget->label_ymin->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); ++ m_curveOptionWidget->label_ymax->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); ++ } + + // strength settings is shown as 0-100% + m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue()*100, curveOption->maxValue()*100, 0); +diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.h b/plugins/paintops/libpaintop/kis_curve_option_widget.h +index eae9d1be19..8b2319eae9 100644 +--- a/plugins/paintops/libpaintop/kis_curve_option_widget.h ++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.h +@@ -34,7 +34,7 @@ class PAINTOP_EXPORT KisCurveOptionWidget : public KisPaintOpOption + { + Q_OBJECT + public: +- KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false); ++ KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false, const QString &minLabel_tooltip="", const QString &maxLabel_tooltip=""); + ~KisCurveOptionWidget() override; + + void writeOptionSetting(KisPropertiesConfigurationSP setting) const override; +diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +index 62ba1be3af..e71229357b 100644 +--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp ++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +@@ -26,24 +26,34 @@ KisPressureHSVOption* KisPressureHSVOption::createHueOption() { + + QString KisPressureHSVOption::hueMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(0° is active color)"); +- QString br("
"); + QString fullPercent = i18n("+180°"); + QString zeroPercent = i18n("-180°"); + +- return QString(zeroPercent + br + i18n("CCW hue") + br + activeColorMsg); ++ return QString(zeroPercent); + } + +-QString KisPressureHSVOption::huemaxLabel() ++QString KisPressureHSVOption::hueMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(0° is active color)"); + QString br("
"); ++ return QString(i18n("CCW hue") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::huemaxLabel() ++{ + QString fullPercent = i18n("+180°"); + QString zeroPercent = i18n("-180°"); + +- return QString(fullPercent + br + i18n("CW hue")); ++ return QString(fullPercent); ++} ++ ++QString KisPressureHSVOption::hueMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(0° is active color)"); ++ QString br("
"); ++ return QString(i18n("CW hue") + br + activeColorMsg); + } + + KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { +@@ -52,25 +62,36 @@ KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { + + QString KisPressureHSVOption::saturationMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(50% is active color)"); +- QString br("
"); + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(zeroPercent + br + i18n("Less saturation ") + br + activeColorMsg); ++ return QString(zeroPercent); + + } + +-QString KisPressureHSVOption::saturationmaxLabel() ++QString KisPressureHSVOption::saturationMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); ++ ++ return QString(i18n("Less saturation ") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::saturationmaxLabel() ++{ + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(fullPercent + br + i18n("More saturation")); ++ return QString(fullPercent); ++} ++ ++QString KisPressureHSVOption::saturationMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); ++ return QString(i18n("More saturation") + br + activeColorMsg); + } + + KisPressureHSVOption* KisPressureHSVOption::createValueOption() { +@@ -79,29 +100,40 @@ KisPressureHSVOption* KisPressureHSVOption::createValueOption() { + + QString KisPressureHSVOption::valueMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(50% is active color)"); +- QString br("
"); + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(zeroPercent + br + i18n("Lower value ") + br + activeColorMsg); ++ return QString(zeroPercent);// + br + i18n("Lower value ") + br + activeColorMsg); + + } + +-QString KisPressureHSVOption::valuemaxLabel() ++QString KisPressureHSVOption::valueMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); ++ ++ return QString(i18n("Lower value ") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::valuemaxLabel() ++{ + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(fullPercent + br + i18n("Higher value")); ++ return QString(fullPercent);// + br + i18n("Higher value")); + + + } + ++QString KisPressureHSVOption::valueMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); ++ return QString(i18n("Higher value")+ br + activeColorMsg); ++} ++ + struct KisPressureHSVOption::Private + { + QString parameterName; +diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +index 93a9254c7a..9ec96e171f 100644 +--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h ++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +@@ -36,15 +36,21 @@ class PAINTOP_EXPORT KisPressureHSVOption : public KisCurveOption + public: + static KisPressureHSVOption* createHueOption(); + static QString hueMinLabel(); ++ static QString hueMinToolTip(); + static QString huemaxLabel(); ++ static QString hueMaxToolTip(); + + static KisPressureHSVOption* createSaturationOption(); + static QString saturationMinLabel(); ++ static QString saturationMinToolTip(); + static QString saturationmaxLabel(); ++ static QString saturationMaxToolTip(); + + static KisPressureHSVOption* createValueOption(); + static QString valueMinLabel(); ++ static QString valueMinToolTip(); + static QString valuemaxLabel(); ++ static QString valueMaxToolTip(); + public: + + KisPressureHSVOption(const QString& parameterName); +diff --git a/yourdiff.diff b/yourdiff.diff +new file mode 100644 +index 0000000000..3b2522ce67 +--- /dev/null ++++ b/yourdiff.diff +@@ -0,0 +1,499 @@ ++diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp ++index 3a7a0c9ddb..0affeadcac 100644 ++--- a/libs/ui/widgets/kis_curve_widget.cpp +++++ b/libs/ui/widgets/kis_curve_widget.cpp ++@@ -77,7 +77,7 @@ KisCurveWidget::KisCurveWidget(QWidget *parent, Qt::WindowFlags f) ++ setAutoFillBackground(false); ++ setAttribute(Qt::WA_OpaquePaintEvent); ++ setMinimumSize(150, 50); ++- setMaximumSize(250, 250); +++ setMaximumSize(16777215, 16777215); ++ ++ d->setCurveModified(); ++ ++diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp ++index 6ba0de794e..6504cc3e51 100644 ++--- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +++++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp ++@@ -63,9 +63,9 @@ KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* parent): ++ addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter")); ++ addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode")); ++ addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(),KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); ++ ++ addPaintOpOption(new KisTextureOption(), i18n("Pattern")); ++ addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength")); ++diff --git a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp ++index b0d7b31147..52eb9bce52 100644 ++--- a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +++++ b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp ++@@ -74,9 +74,9 @@ KisBrushOpSettingsWidget::KisBrushOpSettingsWidget(QWidget* parent) ++ addPaintOpOption(new KisColorSourceOptionWidget(), i18n("Source")); ++ addPaintOpOption(new KisCurveOptionWidget(new KisPressureDarkenOption(), i18n("0.0"), i18n("1.0")), i18n("Darken")); ++ addPaintOpOption(new KisCurveOptionWidget(new KisPressureMixOption(), i18n("Foreground"), i18n("Background")), i18n("Mix")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); ++- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(), KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); +++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); ++ addPaintOpOption(new KisAirbrushOptionWidget(false), i18n("Airbrush")); ++ addPaintOpOption(new KisCurveOptionWidget(new KisPressureRateOption(), i18n("0%"), i18n("100%")), i18n("Rate")); ++ ++diff --git a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui ++index a01ffd4d68..b2a1e81162 100644 ++--- a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +++++ b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui ++@@ -42,6 +42,9 @@ ++
++ ++ +++ +++ 6 +++ ++ ++ ++ ++@@ -57,10 +60,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -76,10 +85,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -95,10 +110,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -114,10 +135,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -133,10 +160,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -152,10 +185,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -171,10 +210,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -190,10 +235,16 @@ ++ ++ ++ +++ +++ +++ 0 +++ 0 +++ +++ ++ ++ ++- 24 ++- 24 +++ 32 +++ 32 ++ ++ ++ ++@@ -251,32 +302,6 @@ ++ ++ ++ ++- ++- ++- ++- Qt::Horizontal ++- ++- ++- ++- 2 ++- 2 ++- ++- ++- ++- ++- ++- ++- ++- Qt::Vertical ++- ++- ++- ++- 2 ++- 2 ++- ++- ++- ++- ++ ++ ++ ++@@ -289,6 +314,9 @@ ++ ++ ++ +++ +++ 3 +++ ++ ++ ++ ++@@ -378,15 +406,15 @@ ++ ++ ++ ++- ++- 1 +++ +++ 0 ++ 0 ++ ++ ++ ++ ++- 200 ++- 200 +++ 0 +++ 0 ++ ++ ++ ++@@ -468,15 +496,15 @@ ++ 1 ++ ++ ++- KisMultiSensorsSelector +++ KisCurveWidget ++ QWidget ++-
kis_multi_sensors_selector.h
+++
widgets/kis_curve_widget.h
++ 1 ++
++ ++- KisCurveWidget +++ KisMultiSensorsSelector ++ QWidget ++-
widgets/kis_curve_widget.h
+++
kis_multi_sensors_selector.h
++ 1 ++
++ ++diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp ++index 53ef65852e..493bca02d6 100644 ++--- a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp ++@@ -39,7 +39,7 @@ inline void setLabel(QLabel* label, const KisCurveLabel& curve_label) ++ } ++ } ++ ++-KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider) +++KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider, const QString &minLabel_tooltip, const QString &maxLabel_tooltip) ++ : KisPaintOpOption(curveOption->category(), curveOption->isChecked()) ++ , m_widget(new QWidget) ++ , m_curveOptionWidget(new Ui_WdgCurveOption()) ++@@ -78,7 +78,15 @@ KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QS ++ ++ ++ m_curveOptionWidget->label_ymin->setText(minLabel); +++ m_curveOptionWidget->label_ymin->setToolTip(minLabel_tooltip); ++ m_curveOptionWidget->label_ymax->setText(maxLabel); +++ m_curveOptionWidget->label_ymax->setToolTip(maxLabel_tooltip); +++ +++ //underline to the labels who have tooltip +++ if(minLabel_tooltip !="" || maxLabel_tooltip !=""){ +++ m_curveOptionWidget->label_ymin->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); +++ m_curveOptionWidget->label_ymax->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); +++ } ++ ++ // strength settings is shown as 0-100% ++ m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue()*100, curveOption->maxValue()*100, 0); ++diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.h b/plugins/paintops/libpaintop/kis_curve_option_widget.h ++index eae9d1be19..8b2319eae9 100644 ++--- a/plugins/paintops/libpaintop/kis_curve_option_widget.h +++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.h ++@@ -34,7 +34,7 @@ class PAINTOP_EXPORT KisCurveOptionWidget : public KisPaintOpOption ++ { ++ Q_OBJECT ++ public: ++- KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false); +++ KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false, const QString &minLabel_tooltip="", const QString &maxLabel_tooltip=""); ++ ~KisCurveOptionWidget() override; ++ ++ void writeOptionSetting(KisPropertiesConfigurationSP setting) const override; ++diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp ++index 62ba1be3af..e71229357b 100644 ++--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp ++@@ -26,24 +26,34 @@ KisPressureHSVOption* KisPressureHSVOption::createHueOption() { ++ ++ QString KisPressureHSVOption::hueMinLabel() ++ { ++- // xgettext: no-c-format ++- QString activeColorMsg = i18n("(0° is active color)"); ++- QString br("
"); ++ QString fullPercent = i18n("+180°"); ++ QString zeroPercent = i18n("-180°"); ++ ++- return QString(zeroPercent + br + i18n("CCW hue") + br + activeColorMsg); +++ return QString(zeroPercent); ++ } ++ ++-QString KisPressureHSVOption::huemaxLabel() +++QString KisPressureHSVOption::hueMinToolTip() ++ { ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(0° is active color)"); ++ QString br("
"); +++ return QString(i18n("CCW hue") + br + activeColorMsg); +++} +++ +++QString KisPressureHSVOption::huemaxLabel() +++{ ++ QString fullPercent = i18n("+180°"); ++ QString zeroPercent = i18n("-180°"); ++ ++- return QString(fullPercent + br + i18n("CW hue")); +++ return QString(fullPercent); +++} +++ +++QString KisPressureHSVOption::hueMaxToolTip() +++{ +++ // xgettext: no-c-format +++ QString activeColorMsg = i18n("(0° is active color)"); +++ QString br("
"); +++ return QString(i18n("CW hue") + br + activeColorMsg); ++ } ++ ++ KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { ++@@ -52,25 +62,36 @@ KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { ++ ++ QString KisPressureHSVOption::saturationMinLabel() ++ { ++- // xgettext: no-c-format ++- QString activeColorMsg = i18n("(50% is active color)"); ++- QString br("
"); ++ QString fullPercent = i18n("+100%"); ++ QString zeroPercent = i18n("-100%"); ++ ++- return QString(zeroPercent + br + i18n("Less saturation ") + br + activeColorMsg); +++ return QString(zeroPercent); ++ ++ } ++ ++-QString KisPressureHSVOption::saturationmaxLabel() +++QString KisPressureHSVOption::saturationMinToolTip() ++ { ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); +++ +++ return QString(i18n("Less saturation ") + br + activeColorMsg); +++} +++ +++QString KisPressureHSVOption::saturationmaxLabel() +++{ ++ QString fullPercent = i18n("+100%"); ++ QString zeroPercent = i18n("-100%"); ++ ++- return QString(fullPercent + br + i18n("More saturation")); +++ return QString(fullPercent); +++} +++ +++QString KisPressureHSVOption::saturationMaxToolTip() +++{ +++ // xgettext: no-c-format +++ QString activeColorMsg = i18n("(50% is active color)"); +++ QString br("
"); +++ return QString(i18n("More saturation") + br + activeColorMsg); ++ } ++ ++ KisPressureHSVOption* KisPressureHSVOption::createValueOption() { ++@@ -79,29 +100,40 @@ KisPressureHSVOption* KisPressureHSVOption::createValueOption() { ++ ++ QString KisPressureHSVOption::valueMinLabel() ++ { ++- // xgettext: no-c-format ++- QString activeColorMsg = i18n("(50% is active color)"); ++- QString br("
"); ++ QString fullPercent = i18n("+100%"); ++ QString zeroPercent = i18n("-100%"); ++ ++- return QString(zeroPercent + br + i18n("Lower value ") + br + activeColorMsg); +++ return QString(zeroPercent);// + br + i18n("Lower value ") + br + activeColorMsg); ++ ++ } ++ ++-QString KisPressureHSVOption::valuemaxLabel() +++QString KisPressureHSVOption::valueMinToolTip() ++ { ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); +++ +++ return QString(i18n("Lower value ") + br + activeColorMsg); +++} +++ +++QString KisPressureHSVOption::valuemaxLabel() +++{ ++ QString fullPercent = i18n("+100%"); ++ QString zeroPercent = i18n("-100%"); ++ ++- return QString(fullPercent + br + i18n("Higher value")); +++ return QString(fullPercent);// + br + i18n("Higher value")); ++ ++ ++ } ++ +++QString KisPressureHSVOption::valueMaxToolTip() +++{ +++ // xgettext: no-c-format +++ QString activeColorMsg = i18n("(50% is active color)"); +++ QString br("
"); +++ return QString(i18n("Higher value")+ br + activeColorMsg); +++} +++ ++ struct KisPressureHSVOption::Private ++ { ++ QString parameterName; ++diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h ++index 93a9254c7a..9ec96e171f 100644 ++--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h ++@@ -36,15 +36,21 @@ class PAINTOP_EXPORT KisPressureHSVOption : public KisCurveOption ++ public: ++ static KisPressureHSVOption* createHueOption(); ++ static QString hueMinLabel(); +++ static QString hueMinToolTip(); ++ static QString huemaxLabel(); +++ static QString hueMaxToolTip(); ++ ++ static KisPressureHSVOption* createSaturationOption(); ++ static QString saturationMinLabel(); +++ static QString saturationMinToolTip(); ++ static QString saturationmaxLabel(); +++ static QString saturationMaxToolTip(); ++ ++ static KisPressureHSVOption* createValueOption(); ++ static QString valueMinLabel(); +++ static QString valueMinToolTip(); ++ static QString valuemaxLabel(); +++ static QString valueMaxToolTip(); ++ public: ++ ++ KisPressureHSVOption(const QString& parameterName); diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp --- a/libs/ui/widgets/kis_curve_widget.cpp +++ b/libs/ui/widgets/kis_curve_widget.cpp @@ -77,7 +77,7 @@ setAutoFillBackground(false); setAttribute(Qt::WA_OpaquePaintEvent); setMinimumSize(150, 50); - setMaximumSize(250, 250); + setMaximumSize(16777215, 16777215); d->setCurveModified(); diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp --- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp @@ -63,9 +63,9 @@ addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter")); addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(),KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); addPaintOpOption(new KisTextureOption(), i18n("Pattern")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength")); diff --git a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp --- a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +++ b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp @@ -74,9 +74,9 @@ addPaintOpOption(new KisColorSourceOptionWidget(), i18n("Source")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureDarkenOption(), i18n("0.0"), i18n("1.0")), i18n("Darken")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureMixOption(), i18n("Foreground"), i18n("Background")), i18n("Mix")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(), KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); addPaintOpOption(new KisAirbrushOptionWidget(false), i18n("Airbrush")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureRateOption(), i18n("0%"), i18n("100%")), i18n("Rate")); diff --git a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui --- a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +++ b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui @@ -42,6 +42,9 @@
+ + 6 + @@ -57,10 +60,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -76,10 +85,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -95,10 +110,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -114,10 +135,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -133,10 +160,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -152,10 +185,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -171,10 +210,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -190,10 +235,16 @@ + + + 0 + 0 + + - 24 - 24 + 32 + 32 @@ -251,32 +302,6 @@ - - - - Qt::Horizontal - - - - 2 - 2 - - - - - - - - Qt::Vertical - - - - 2 - 2 - - - - @@ -289,6 +314,9 @@ + + 3 + @@ -299,6 +327,9 @@ 0 + + color:white; + TextLabel @@ -325,6 +356,9 @@ 0 + + color:white; + TextLabel @@ -342,6 +376,9 @@ 0 + + color:white; + TextLabel @@ -368,6 +405,9 @@ 0 + + color:white; + TextLabel @@ -378,15 +418,15 @@ - - 1 + + 0 0 - 200 - 200 + 0 + 0 @@ -468,15 +508,15 @@ 1 - KisMultiSensorsSelector + KisCurveWidget QWidget -
kis_multi_sensors_selector.h
+
widgets/kis_curve_widget.h
1
- KisCurveWidget + KisMultiSensorsSelector QWidget -
widgets/kis_curve_widget.h
+
kis_multi_sensors_selector.h
1
diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.h b/plugins/paintops/libpaintop/kis_curve_option_widget.h --- a/plugins/paintops/libpaintop/kis_curve_option_widget.h +++ b/plugins/paintops/libpaintop/kis_curve_option_widget.h @@ -34,7 +34,7 @@ { Q_OBJECT public: - KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false); + KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false, const QString &minLabel_tooltip="", const QString &maxLabel_tooltip=""); ~KisCurveOptionWidget() override; void writeOptionSetting(KisPropertiesConfigurationSP setting) const override; diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp --- a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +++ b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp @@ -28,7 +28,10 @@ #include "kis_curve_option.h" #include "kis_signals_blocker.h" #include "kis_icon_utils.h" - +#include +#include +#include +#include inline void setLabel(QLabel* label, const KisCurveLabel& curve_label) { if (curve_label.icon().isNull()) { @@ -38,8 +41,27 @@ label->setPixmap(QPixmap::fromImage(curve_label.icon())); } } - -KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider) +inline QPixmap mergeImageText( const QPixmap& pix, const QString txt ) + { + QPainter p; + + int strWidth = p.fontMetrics().width( txt ); + int strHeight = p.fontMetrics().height(); + int pixWidth = pix.width(); + int pixHeight = pix.height(); + QPixmap res( strWidth + 3 + pixWidth, std::max( strHeight, pixHeight ) ); + + res.fill(Qt::transparent); + + p.begin( &res ); + p.drawPixmap(0,0, pix ); + p.setPen(Qt::white); + p.drawText( QRect( pixWidth +3, 0, strWidth, strHeight), 0, txt); + p.end(); + + return res; + } +KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider, const QString &minLabel_tooltip, const QString &maxLabel_tooltip) : KisPaintOpOption(curveOption->category(), curveOption->isChecked()) , m_widget(new QWidget) , m_curveOptionWidget(new Ui_WdgCurveOption()) @@ -76,9 +98,37 @@ connect(m_curveOptionWidget->uCurveButton, SIGNAL(clicked(bool)), this, SLOT(changeCurveUShape())); connect(m_curveOptionWidget->revUCurveButton, SIGNAL(clicked(bool)), this, SLOT(changeCurveArchShape())); - - m_curveOptionWidget->label_ymin->setText(minLabel); - m_curveOptionWidget->label_ymax->setText(maxLabel); + QPixmap pix((KisIconUtils::loadIcon("help-contents")).pixmap(15, 15)); + void onClicked(){ + m_curveOptionWidget->label_ymin->setText("aanuj is great"); + } + connect(m_curveOptionWidget->label_ymin, SIGNAL(clicked()), this, SLOT(onClicked())); + m_curveOptionWidget->label_ymin->setStyleSheet("color:white;"); + m_curveOptionWidget->label_ymax->setStyleSheet("color:white;"); + if(minLabel_tooltip !="" || maxLabel_tooltip !=""){ + QPixmap minL = mergeImageText(pix,minLabel); + QPixmap maxL = mergeImageText(pix,maxLabel); + + m_curveOptionWidget->label_ymin->setPixmap(minL); + m_curveOptionWidget->label_ymax->setPixmap(maxL); + m_curveOptionWidget->label_ymin->setToolTip(minLabel_tooltip); + m_curveOptionWidget->label_ymax->setToolTip(maxLabel_tooltip); + /*m_curveOptionWidget->label_ymin->setTextFormat(Qt::RichText); + m_curveOptionWidget->label_ymax->setTextFormat(Qt::RichText); + m_curveOptionWidget->label_ymin->setText(" + minLabel"); + m_curveOptionWidget->label_ymax->setText(" + maxLabel"); + setText("Hello!"); + m_curveOptionWidget->label_ymax->setStyleSheet("background-image: url(images/welcome.png);")*/ + } + else{ + QPixmap minL = mergeImageText(QPixmap(0,0),minLabel); + QPixmap maxL = mergeImageText(QPixmap(0,0),maxLabel); + + m_curveOptionWidget->label_ymin->setPixmap(minL); + m_curveOptionWidget->label_ymax->setPixmap(maxL);/* + m_curveOptionWidget->label_ymin->setText(minLabel); + m_curveOptionWidget->label_ymax->setText(maxLabel);*/ + } // strength settings is shown as 0-100% m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue()*100, curveOption->maxValue()*100, 0); diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h --- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h @@ -36,15 +36,21 @@ public: static KisPressureHSVOption* createHueOption(); static QString hueMinLabel(); + static QString hueMinToolTip(); static QString huemaxLabel(); + static QString hueMaxToolTip(); static KisPressureHSVOption* createSaturationOption(); static QString saturationMinLabel(); + static QString saturationMinToolTip(); static QString saturationmaxLabel(); + static QString saturationMaxToolTip(); static KisPressureHSVOption* createValueOption(); static QString valueMinLabel(); + static QString valueMinToolTip(); static QString valuemaxLabel(); + static QString valueMaxToolTip(); public: KisPressureHSVOption(const QString& parameterName); diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp --- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp @@ -26,24 +26,34 @@ QString KisPressureHSVOption::hueMinLabel() { - // xgettext: no-c-format - QString activeColorMsg = i18n("(0° is active color)"); - QString br("
"); QString fullPercent = i18n("+180°"); QString zeroPercent = i18n("-180°"); - return QString(zeroPercent + br + i18n("CCW hue") + br + activeColorMsg); + return QString(zeroPercent); } -QString KisPressureHSVOption::huemaxLabel() +QString KisPressureHSVOption::hueMinToolTip() { // xgettext: no-c-format QString activeColorMsg = i18n("(0° is active color)"); QString br("
"); + return QString(i18n("CCW hue") + br + activeColorMsg); +} + +QString KisPressureHSVOption::huemaxLabel() +{ QString fullPercent = i18n("+180°"); QString zeroPercent = i18n("-180°"); - return QString(fullPercent + br + i18n("CW hue")); + return QString(fullPercent); +} + +QString KisPressureHSVOption::hueMaxToolTip() +{ + // xgettext: no-c-format + QString activeColorMsg = i18n("(0° is active color)"); + QString br("
"); + return QString(i18n("CW hue") + br + activeColorMsg); } KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { @@ -52,25 +62,36 @@ QString KisPressureHSVOption::saturationMinLabel() { - // xgettext: no-c-format - QString activeColorMsg = i18n("(50% is active color)"); - QString br("
"); QString fullPercent = i18n("+100%"); QString zeroPercent = i18n("-100%"); - return QString(zeroPercent + br + i18n("Less saturation ") + br + activeColorMsg); + return QString(zeroPercent); } -QString KisPressureHSVOption::saturationmaxLabel() +QString KisPressureHSVOption::saturationMinToolTip() { // xgettext: no-c-format QString activeColorMsg = i18n("(50% is active color)"); QString br("
"); + + return QString(i18n("Less saturation ") + br + activeColorMsg); +} + +QString KisPressureHSVOption::saturationmaxLabel() +{ QString fullPercent = i18n("+100%"); QString zeroPercent = i18n("-100%"); - return QString(fullPercent + br + i18n("More saturation")); + return QString(fullPercent); +} + +QString KisPressureHSVOption::saturationMaxToolTip() +{ + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); + return QString(i18n("More saturation") + br + activeColorMsg); } KisPressureHSVOption* KisPressureHSVOption::createValueOption() { @@ -79,29 +100,40 @@ QString KisPressureHSVOption::valueMinLabel() { - // xgettext: no-c-format - QString activeColorMsg = i18n("(50% is active color)"); - QString br("
"); QString fullPercent = i18n("+100%"); QString zeroPercent = i18n("-100%"); - return QString(zeroPercent + br + i18n("Lower value ") + br + activeColorMsg); + return QString(zeroPercent);// + br + i18n("Lower value ") + br + activeColorMsg); } -QString KisPressureHSVOption::valuemaxLabel() +QString KisPressureHSVOption::valueMinToolTip() { // xgettext: no-c-format QString activeColorMsg = i18n("(50% is active color)"); QString br("
"); + + return QString(i18n("Lower value ") + br + activeColorMsg); +} + +QString KisPressureHSVOption::valuemaxLabel() +{ QString fullPercent = i18n("+100%"); QString zeroPercent = i18n("-100%"); - return QString(fullPercent + br + i18n("Higher value")); + return QString(fullPercent);// + br + i18n("Higher value")); } +QString KisPressureHSVOption::valueMaxToolTip() +{ + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); + return QString(i18n("Higher value")+ br + activeColorMsg); +} + struct KisPressureHSVOption::Private { QString parameterName; diff --git a/yourdiff.diff b/yourdiff.diff new file mode 100644 --- /dev/null +++ b/yourdiff.diff @@ -0,0 +1,499 @@ +diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp +index 3a7a0c9ddb..0affeadcac 100644 +--- a/libs/ui/widgets/kis_curve_widget.cpp ++++ b/libs/ui/widgets/kis_curve_widget.cpp +@@ -77,7 +77,7 @@ KisCurveWidget::KisCurveWidget(QWidget *parent, Qt::WindowFlags f) + setAutoFillBackground(false); + setAttribute(Qt::WA_OpaquePaintEvent); + setMinimumSize(150, 50); +- setMaximumSize(250, 250); ++ setMaximumSize(16777215, 16777215); + + d->setCurveModified(); + +diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +index 6ba0de794e..6504cc3e51 100644 +--- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp ++++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp +@@ -63,9 +63,9 @@ KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* parent): + addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter")); + addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(),KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); + + addPaintOpOption(new KisTextureOption(), i18n("Pattern")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength")); +diff --git a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +index b0d7b31147..52eb9bce52 100644 +--- a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp ++++ b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp +@@ -74,9 +74,9 @@ KisBrushOpSettingsWidget::KisBrushOpSettingsWidget(QWidget* parent) + addPaintOpOption(new KisColorSourceOptionWidget(), i18n("Source")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureDarkenOption(), i18n("0.0"), i18n("1.0")), i18n("Darken")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureMixOption(), i18n("Foreground"), i18n("Background")), i18n("Mix")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); +- addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(), KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); ++ addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); + addPaintOpOption(new KisAirbrushOptionWidget(false), i18n("Airbrush")); + addPaintOpOption(new KisCurveOptionWidget(new KisPressureRateOption(), i18n("0%"), i18n("100%")), i18n("Rate")); + +diff --git a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +index a01ffd4d68..b2a1e81162 100644 +--- a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui ++++ b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui +@@ -42,6 +42,9 @@ +
+ + ++ ++ 6 ++ + + + +@@ -57,10 +60,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -76,10 +85,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -95,10 +110,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -114,10 +135,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -133,10 +160,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -152,10 +185,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -171,10 +210,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -190,10 +235,16 @@ + + + ++ ++ ++ 0 ++ 0 ++ ++ + + +- 24 +- 24 ++ 32 ++ 32 + + + +@@ -251,32 +302,6 @@ + + + +- +- +- +- Qt::Horizontal +- +- +- +- 2 +- 2 +- +- +- +- +- +- +- +- Qt::Vertical +- +- +- +- 2 +- 2 +- +- +- +- + + + +@@ -289,6 +314,9 @@ + + + ++ ++ 3 ++ + + + +@@ -378,15 +406,15 @@ + + + +- +- 1 ++ ++ 0 + 0 + + + + +- 200 +- 200 ++ 0 ++ 0 + + + +@@ -468,15 +496,15 @@ + 1 + + +- KisMultiSensorsSelector ++ KisCurveWidget + QWidget +-
kis_multi_sensors_selector.h
++
widgets/kis_curve_widget.h
+ 1 +
+ +- KisCurveWidget ++ KisMultiSensorsSelector + QWidget +-
widgets/kis_curve_widget.h
++
kis_multi_sensors_selector.h
+ 1 +
+ +diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +index 53ef65852e..493bca02d6 100644 +--- a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp ++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp +@@ -39,7 +39,7 @@ inline void setLabel(QLabel* label, const KisCurveLabel& curve_label) + } + } + +-KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider) ++KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider, const QString &minLabel_tooltip, const QString &maxLabel_tooltip) + : KisPaintOpOption(curveOption->category(), curveOption->isChecked()) + , m_widget(new QWidget) + , m_curveOptionWidget(new Ui_WdgCurveOption()) +@@ -78,7 +78,15 @@ KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QS + + + m_curveOptionWidget->label_ymin->setText(minLabel); ++ m_curveOptionWidget->label_ymin->setToolTip(minLabel_tooltip); + m_curveOptionWidget->label_ymax->setText(maxLabel); ++ m_curveOptionWidget->label_ymax->setToolTip(maxLabel_tooltip); ++ ++ //underline to the labels who have tooltip ++ if(minLabel_tooltip !="" || maxLabel_tooltip !=""){ ++ m_curveOptionWidget->label_ymin->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); ++ m_curveOptionWidget->label_ymax->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); ++ } + + // strength settings is shown as 0-100% + m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue()*100, curveOption->maxValue()*100, 0); +diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.h b/plugins/paintops/libpaintop/kis_curve_option_widget.h +index eae9d1be19..8b2319eae9 100644 +--- a/plugins/paintops/libpaintop/kis_curve_option_widget.h ++++ b/plugins/paintops/libpaintop/kis_curve_option_widget.h +@@ -34,7 +34,7 @@ class PAINTOP_EXPORT KisCurveOptionWidget : public KisPaintOpOption + { + Q_OBJECT + public: +- KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false); ++ KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false, const QString &minLabel_tooltip="", const QString &maxLabel_tooltip=""); + ~KisCurveOptionWidget() override; + + void writeOptionSetting(KisPropertiesConfigurationSP setting) const override; +diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +index 62ba1be3af..e71229357b 100644 +--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp ++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp +@@ -26,24 +26,34 @@ KisPressureHSVOption* KisPressureHSVOption::createHueOption() { + + QString KisPressureHSVOption::hueMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(0° is active color)"); +- QString br("
"); + QString fullPercent = i18n("+180°"); + QString zeroPercent = i18n("-180°"); + +- return QString(zeroPercent + br + i18n("CCW hue") + br + activeColorMsg); ++ return QString(zeroPercent); + } + +-QString KisPressureHSVOption::huemaxLabel() ++QString KisPressureHSVOption::hueMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(0° is active color)"); + QString br("
"); ++ return QString(i18n("CCW hue") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::huemaxLabel() ++{ + QString fullPercent = i18n("+180°"); + QString zeroPercent = i18n("-180°"); + +- return QString(fullPercent + br + i18n("CW hue")); ++ return QString(fullPercent); ++} ++ ++QString KisPressureHSVOption::hueMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(0° is active color)"); ++ QString br("
"); ++ return QString(i18n("CW hue") + br + activeColorMsg); + } + + KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { +@@ -52,25 +62,36 @@ KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { + + QString KisPressureHSVOption::saturationMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(50% is active color)"); +- QString br("
"); + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(zeroPercent + br + i18n("Less saturation ") + br + activeColorMsg); ++ return QString(zeroPercent); + + } + +-QString KisPressureHSVOption::saturationmaxLabel() ++QString KisPressureHSVOption::saturationMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); ++ ++ return QString(i18n("Less saturation ") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::saturationmaxLabel() ++{ + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(fullPercent + br + i18n("More saturation")); ++ return QString(fullPercent); ++} ++ ++QString KisPressureHSVOption::saturationMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); ++ return QString(i18n("More saturation") + br + activeColorMsg); + } + + KisPressureHSVOption* KisPressureHSVOption::createValueOption() { +@@ -79,29 +100,40 @@ KisPressureHSVOption* KisPressureHSVOption::createValueOption() { + + QString KisPressureHSVOption::valueMinLabel() + { +- // xgettext: no-c-format +- QString activeColorMsg = i18n("(50% is active color)"); +- QString br("
"); + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(zeroPercent + br + i18n("Lower value ") + br + activeColorMsg); ++ return QString(zeroPercent);// + br + i18n("Lower value ") + br + activeColorMsg); + + } + +-QString KisPressureHSVOption::valuemaxLabel() ++QString KisPressureHSVOption::valueMinToolTip() + { + // xgettext: no-c-format + QString activeColorMsg = i18n("(50% is active color)"); + QString br("
"); ++ ++ return QString(i18n("Lower value ") + br + activeColorMsg); ++} ++ ++QString KisPressureHSVOption::valuemaxLabel() ++{ + QString fullPercent = i18n("+100%"); + QString zeroPercent = i18n("-100%"); + +- return QString(fullPercent + br + i18n("Higher value")); ++ return QString(fullPercent);// + br + i18n("Higher value")); + + + } + ++QString KisPressureHSVOption::valueMaxToolTip() ++{ ++ // xgettext: no-c-format ++ QString activeColorMsg = i18n("(50% is active color)"); ++ QString br("
"); ++ return QString(i18n("Higher value")+ br + activeColorMsg); ++} ++ + struct KisPressureHSVOption::Private + { + QString parameterName; +diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +index 93a9254c7a..9ec96e171f 100644 +--- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h ++++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +@@ -36,15 +36,21 @@ class PAINTOP_EXPORT KisPressureHSVOption : public KisCurveOption + public: + static KisPressureHSVOption* createHueOption(); + static QString hueMinLabel(); ++ static QString hueMinToolTip(); + static QString huemaxLabel(); ++ static QString hueMaxToolTip(); + + static KisPressureHSVOption* createSaturationOption(); + static QString saturationMinLabel(); ++ static QString saturationMinToolTip(); + static QString saturationmaxLabel(); ++ static QString saturationMaxToolTip(); + + static KisPressureHSVOption* createValueOption(); + static QString valueMinLabel(); ++ static QString valueMinToolTip(); + static QString valuemaxLabel(); ++ static QString valueMaxToolTip(); + public: + + KisPressureHSVOption(const QString& parameterName);