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 + @@ -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.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 @@ -39,7 +39,7 @@ } } -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 @@ 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_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;