Changeset View
Changeset View
Standalone View
Standalone View
yourdiff.diff
- This file was added.
1 | diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp | ||||
---|---|---|---|---|---|
2 | index 3a7a0c9ddb..0affeadcac 100644 | ||||
3 | --- a/libs/ui/widgets/kis_curve_widget.cpp | ||||
4 | +++ b/libs/ui/widgets/kis_curve_widget.cpp | ||||
5 | @@ -77,7 +77,7 @@ KisCurveWidget::KisCurveWidget(QWidget *parent, Qt::WindowFlags f) | ||||
6 | setAutoFillBackground(false); | ||||
7 | setAttribute(Qt::WA_OpaquePaintEvent); | ||||
8 | setMinimumSize(150, 50); | ||||
9 | - setMaximumSize(250, 250); | ||||
10 | + setMaximumSize(16777215, 16777215); | ||||
11 | | ||||
12 | d->setCurveModified(); | ||||
13 | | ||||
14 | diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp | ||||
15 | index 6ba0de794e..6504cc3e51 100644 | ||||
16 | --- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp | ||||
17 | +++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp | ||||
18 | @@ -63,9 +63,9 @@ KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* parent): | ||||
19 | addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter")); | ||||
20 | addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode")); | ||||
21 | addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient")); | ||||
22 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); | ||||
23 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); | ||||
24 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); | ||||
25 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); | ||||
26 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(),KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); | ||||
27 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); | ||||
28 | | ||||
29 | addPaintOpOption(new KisTextureOption(), i18n("Pattern")); | ||||
30 | addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength")); | ||||
31 | diff --git a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp | ||||
32 | index b0d7b31147..52eb9bce52 100644 | ||||
33 | --- a/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp | ||||
34 | +++ b/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp | ||||
35 | @@ -74,9 +74,9 @@ KisBrushOpSettingsWidget::KisBrushOpSettingsWidget(QWidget* parent) | ||||
36 | addPaintOpOption(new KisColorSourceOptionWidget(), i18n("Source")); | ||||
37 | addPaintOpOption(new KisCurveOptionWidget(new KisPressureDarkenOption(), i18n("0.0"), i18n("1.0")), i18n("Darken")); | ||||
38 | addPaintOpOption(new KisCurveOptionWidget(new KisPressureMixOption(), i18n("Foreground"), i18n("Background")), i18n("Mix")); | ||||
39 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel()), i18n("Hue")); | ||||
40 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel()), i18n("Saturation")); | ||||
41 | - addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel()), i18nc("HSV Value", "Value")); | ||||
42 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createHueOption(), KisPressureHSVOption::hueMinLabel(), KisPressureHSVOption::huemaxLabel(),false,KisPressureHSVOption::hueMinToolTip(),KisPressureHSVOption::hueMaxToolTip()), i18n("Hue")); | ||||
43 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createSaturationOption(), KisPressureHSVOption::saturationMinLabel(), KisPressureHSVOption::saturationmaxLabel(),false,KisPressureHSVOption::saturationMinToolTip(), KisPressureHSVOption::saturationMaxToolTip()), i18n("Saturation")); | ||||
44 | + addPaintOpOption(new KisCurveOptionWidget(KisPressureHSVOption::createValueOption(), KisPressureHSVOption::valueMinLabel(), KisPressureHSVOption::valuemaxLabel(),false,KisPressureHSVOption::valueMinToolTip(),KisPressureHSVOption::valueMaxToolTip()), i18nc("HSV Value", "Value")); | ||||
45 | addPaintOpOption(new KisAirbrushOptionWidget(false), i18n("Airbrush")); | ||||
46 | addPaintOpOption(new KisCurveOptionWidget(new KisPressureRateOption(), i18n("0%"), i18n("100%")), i18n("Rate")); | ||||
47 | | ||||
48 | diff --git a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui | ||||
49 | index a01ffd4d68..b2a1e81162 100644 | ||||
50 | --- a/plugins/paintops/libpaintop/forms/wdgcurveoption.ui | ||||
51 | +++ b/plugins/paintops/libpaintop/forms/wdgcurveoption.ui | ||||
52 | @@ -42,6 +42,9 @@ | ||||
53 | </item> | ||||
54 | <item> | ||||
55 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | ||||
56 | + <property name="spacing"> | ||||
57 | + <number>6</number> | ||||
58 | + </property> | ||||
59 | <item> | ||||
60 | <widget class="QCheckBox" name="checkBoxUseCurve"> | ||||
61 | <property name="minimumSize"> | ||||
62 | @@ -57,10 +60,16 @@ | ||||
63 | </item> | ||||
64 | <item> | ||||
65 | <widget class="QPushButton" name="linearCurveButton"> | ||||
66 | + <property name="sizePolicy"> | ||||
67 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
68 | + <horstretch>0</horstretch> | ||||
69 | + <verstretch>0</verstretch> | ||||
70 | + </sizepolicy> | ||||
71 | + </property> | ||||
72 | <property name="maximumSize"> | ||||
73 | <size> | ||||
74 | - <width>24</width> | ||||
75 | - <height>24</height> | ||||
76 | + <width>32</width> | ||||
77 | + <height>32</height> | ||||
78 | </size> | ||||
79 | </property> | ||||
80 | <property name="text"> | ||||
81 | @@ -76,10 +85,16 @@ | ||||
82 | </item> | ||||
83 | <item> | ||||
84 | <widget class="QPushButton" name="revLinearButton"> | ||||
85 | + <property name="sizePolicy"> | ||||
86 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
87 | + <horstretch>0</horstretch> | ||||
88 | + <verstretch>0</verstretch> | ||||
89 | + </sizepolicy> | ||||
90 | + </property> | ||||
91 | <property name="maximumSize"> | ||||
92 | <size> | ||||
93 | - <width>24</width> | ||||
94 | - <height>24</height> | ||||
95 | + <width>32</width> | ||||
96 | + <height>32</height> | ||||
97 | </size> | ||||
98 | </property> | ||||
99 | <property name="text"> | ||||
100 | @@ -95,10 +110,16 @@ | ||||
101 | </item> | ||||
102 | <item> | ||||
103 | <widget class="QPushButton" name="sCurveButton"> | ||||
104 | + <property name="sizePolicy"> | ||||
105 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
106 | + <horstretch>0</horstretch> | ||||
107 | + <verstretch>0</verstretch> | ||||
108 | + </sizepolicy> | ||||
109 | + </property> | ||||
110 | <property name="maximumSize"> | ||||
111 | <size> | ||||
112 | - <width>24</width> | ||||
113 | - <height>24</height> | ||||
114 | + <width>32</width> | ||||
115 | + <height>32</height> | ||||
116 | </size> | ||||
117 | </property> | ||||
118 | <property name="text"> | ||||
119 | @@ -114,10 +135,16 @@ | ||||
120 | </item> | ||||
121 | <item> | ||||
122 | <widget class="QPushButton" name="reverseSCurveButton"> | ||||
123 | + <property name="sizePolicy"> | ||||
124 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
125 | + <horstretch>0</horstretch> | ||||
126 | + <verstretch>0</verstretch> | ||||
127 | + </sizepolicy> | ||||
128 | + </property> | ||||
129 | <property name="maximumSize"> | ||||
130 | <size> | ||||
131 | - <width>24</width> | ||||
132 | - <height>24</height> | ||||
133 | + <width>32</width> | ||||
134 | + <height>32</height> | ||||
135 | </size> | ||||
136 | </property> | ||||
137 | <property name="text"> | ||||
138 | @@ -133,10 +160,16 @@ | ||||
139 | </item> | ||||
140 | <item> | ||||
141 | <widget class="QPushButton" name="uCurveButton"> | ||||
142 | + <property name="sizePolicy"> | ||||
143 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
144 | + <horstretch>0</horstretch> | ||||
145 | + <verstretch>0</verstretch> | ||||
146 | + </sizepolicy> | ||||
147 | + </property> | ||||
148 | <property name="maximumSize"> | ||||
149 | <size> | ||||
150 | - <width>24</width> | ||||
151 | - <height>24</height> | ||||
152 | + <width>32</width> | ||||
153 | + <height>32</height> | ||||
154 | </size> | ||||
155 | </property> | ||||
156 | <property name="text"> | ||||
157 | @@ -152,10 +185,16 @@ | ||||
158 | </item> | ||||
159 | <item> | ||||
160 | <widget class="QPushButton" name="revUCurveButton"> | ||||
161 | + <property name="sizePolicy"> | ||||
162 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
163 | + <horstretch>0</horstretch> | ||||
164 | + <verstretch>0</verstretch> | ||||
165 | + </sizepolicy> | ||||
166 | + </property> | ||||
167 | <property name="maximumSize"> | ||||
168 | <size> | ||||
169 | - <width>24</width> | ||||
170 | - <height>24</height> | ||||
171 | + <width>32</width> | ||||
172 | + <height>32</height> | ||||
173 | </size> | ||||
174 | </property> | ||||
175 | <property name="text"> | ||||
176 | @@ -171,10 +210,16 @@ | ||||
177 | </item> | ||||
178 | <item> | ||||
179 | <widget class="QPushButton" name="jCurveButton"> | ||||
180 | + <property name="sizePolicy"> | ||||
181 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
182 | + <horstretch>0</horstretch> | ||||
183 | + <verstretch>0</verstretch> | ||||
184 | + </sizepolicy> | ||||
185 | + </property> | ||||
186 | <property name="maximumSize"> | ||||
187 | <size> | ||||
188 | - <width>24</width> | ||||
189 | - <height>24</height> | ||||
190 | + <width>32</width> | ||||
191 | + <height>32</height> | ||||
192 | </size> | ||||
193 | </property> | ||||
194 | <property name="text"> | ||||
195 | @@ -190,10 +235,16 @@ | ||||
196 | </item> | ||||
197 | <item> | ||||
198 | <widget class="QPushButton" name="lCurveButton"> | ||||
199 | + <property name="sizePolicy"> | ||||
200 | + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> | ||||
201 | + <horstretch>0</horstretch> | ||||
202 | + <verstretch>0</verstretch> | ||||
203 | + </sizepolicy> | ||||
204 | + </property> | ||||
205 | <property name="maximumSize"> | ||||
206 | <size> | ||||
207 | - <width>24</width> | ||||
208 | - <height>24</height> | ||||
209 | + <width>32</width> | ||||
210 | + <height>32</height> | ||||
211 | </size> | ||||
212 | </property> | ||||
213 | <property name="text"> | ||||
214 | @@ -251,32 +302,6 @@ | ||||
215 | </item> | ||||
216 | <item> | ||||
217 | <layout class="QGridLayout" name="gridLayout_2"> | ||||
218 | - <item row="0" column="3"> | ||||
219 | - <spacer name="horizontalSpacer_2"> | ||||
220 | - <property name="orientation"> | ||||
221 | - <enum>Qt::Horizontal</enum> | ||||
222 | - </property> | ||||
223 | - <property name="sizeHint" stdset="0"> | ||||
224 | - <size> | ||||
225 | - <width>2</width> | ||||
226 | - <height>2</height> | ||||
227 | - </size> | ||||
228 | - </property> | ||||
229 | - </spacer> | ||||
230 | - </item> | ||||
231 | - <item row="3" column="1"> | ||||
232 | - <spacer name="verticalSpacer"> | ||||
233 | - <property name="orientation"> | ||||
234 | - <enum>Qt::Vertical</enum> | ||||
235 | - </property> | ||||
236 | - <property name="sizeHint" stdset="0"> | ||||
237 | - <size> | ||||
238 | - <width>2</width> | ||||
239 | - <height>2</height> | ||||
240 | - </size> | ||||
241 | - </property> | ||||
242 | - </spacer> | ||||
243 | - </item> | ||||
244 | <item row="1" column="1"> | ||||
245 | <widget class="QCheckBox" name="checkBoxUseSameCurve"> | ||||
246 | <property name="text"> | ||||
247 | @@ -289,6 +314,9 @@ | ||||
248 | </item> | ||||
249 | <item row="0" column="1"> | ||||
250 | <layout class="QGridLayout" name="gridLayout"> | ||||
251 | + <property name="spacing"> | ||||
252 | + <number>3</number> | ||||
253 | + </property> | ||||
254 | <item row="3" column="2"> | ||||
255 | <layout class="QVBoxLayout" name="verticalLayout"> | ||||
256 | <item> | ||||
257 | @@ -378,15 +406,15 @@ | ||||
258 | <item row="3" column="1"> | ||||
259 | <widget class="KisCurveWidget" name="curveWidget" native="true"> | ||||
260 | <property name="sizePolicy"> | ||||
261 | - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> | ||||
262 | - <horstretch>1</horstretch> | ||||
263 | + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> | ||||
264 | + <horstretch>0</horstretch> | ||||
265 | <verstretch>0</verstretch> | ||||
266 | </sizepolicy> | ||||
267 | </property> | ||||
268 | <property name="minimumSize"> | ||||
269 | <size> | ||||
270 | - <width>200</width> | ||||
271 | - <height>200</height> | ||||
272 | + <width>0</width> | ||||
273 | + <height>0</height> | ||||
274 | </size> | ||||
275 | </property> | ||||
276 | </widget> | ||||
277 | @@ -468,15 +496,15 @@ | ||||
278 | <container>1</container> | ||||
279 | </customwidget> | ||||
280 | <customwidget> | ||||
281 | - <class>KisMultiSensorsSelector</class> | ||||
282 | + <class>KisCurveWidget</class> | ||||
283 | <extends>QWidget</extends> | ||||
284 | - <header>kis_multi_sensors_selector.h</header> | ||||
285 | + <header>widgets/kis_curve_widget.h</header> | ||||
286 | <container>1</container> | ||||
287 | </customwidget> | ||||
288 | <customwidget> | ||||
289 | - <class>KisCurveWidget</class> | ||||
290 | + <class>KisMultiSensorsSelector</class> | ||||
291 | <extends>QWidget</extends> | ||||
292 | - <header location="global">widgets/kis_curve_widget.h</header> | ||||
293 | + <header>kis_multi_sensors_selector.h</header> | ||||
294 | <container>1</container> | ||||
295 | </customwidget> | ||||
296 | </customwidgets> | ||||
297 | diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp | ||||
298 | index 53ef65852e..493bca02d6 100644 | ||||
299 | --- a/plugins/paintops/libpaintop/kis_curve_option_widget.cpp | ||||
300 | +++ b/plugins/paintops/libpaintop/kis_curve_option_widget.cpp | ||||
301 | @@ -39,7 +39,7 @@ inline void setLabel(QLabel* label, const KisCurveLabel& curve_label) | ||||
302 | } | ||||
303 | } | ||||
304 | | ||||
305 | -KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider) | ||||
306 | +KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider, const QString &minLabel_tooltip, const QString &maxLabel_tooltip) | ||||
307 | : KisPaintOpOption(curveOption->category(), curveOption->isChecked()) | ||||
308 | , m_widget(new QWidget) | ||||
309 | , m_curveOptionWidget(new Ui_WdgCurveOption()) | ||||
310 | @@ -78,7 +78,15 @@ KisCurveOptionWidget::KisCurveOptionWidget(KisCurveOption* curveOption, const QS | ||||
311 | | ||||
312 | | ||||
313 | m_curveOptionWidget->label_ymin->setText(minLabel); | ||||
314 | + m_curveOptionWidget->label_ymin->setToolTip(minLabel_tooltip); | ||||
315 | m_curveOptionWidget->label_ymax->setText(maxLabel); | ||||
316 | + m_curveOptionWidget->label_ymax->setToolTip(maxLabel_tooltip); | ||||
317 | + | ||||
318 | + //underline to the labels who have tooltip | ||||
319 | + if(minLabel_tooltip !="" || maxLabel_tooltip !=""){ | ||||
320 | + m_curveOptionWidget->label_ymin->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); | ||||
321 | + m_curveOptionWidget->label_ymax->setStyleSheet("border-bottom-width: 1px; border-bottom-style: solid; border-radius: 0px;border-color: #53728E;"); | ||||
322 | + } | ||||
323 | | ||||
324 | // strength settings is shown as 0-100% | ||||
325 | m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue()*100, curveOption->maxValue()*100, 0); | ||||
326 | diff --git a/plugins/paintops/libpaintop/kis_curve_option_widget.h b/plugins/paintops/libpaintop/kis_curve_option_widget.h | ||||
327 | index eae9d1be19..8b2319eae9 100644 | ||||
328 | --- a/plugins/paintops/libpaintop/kis_curve_option_widget.h | ||||
329 | +++ b/plugins/paintops/libpaintop/kis_curve_option_widget.h | ||||
330 | @@ -34,7 +34,7 @@ class PAINTOP_EXPORT KisCurveOptionWidget : public KisPaintOpOption | ||||
331 | { | ||||
332 | Q_OBJECT | ||||
333 | public: | ||||
334 | - KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false); | ||||
335 | + KisCurveOptionWidget(KisCurveOption* curveOption, const QString &minLabel, const QString &maxLabel, bool hideSlider = false, const QString &minLabel_tooltip="", const QString &maxLabel_tooltip=""); | ||||
336 | ~KisCurveOptionWidget() override; | ||||
337 | | ||||
338 | void writeOptionSetting(KisPropertiesConfigurationSP setting) const override; | ||||
339 | diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp | ||||
340 | index 62ba1be3af..e71229357b 100644 | ||||
341 | --- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp | ||||
342 | +++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp | ||||
343 | @@ -26,24 +26,34 @@ KisPressureHSVOption* KisPressureHSVOption::createHueOption() { | ||||
344 | | ||||
345 | QString KisPressureHSVOption::hueMinLabel() | ||||
346 | { | ||||
347 | - // xgettext: no-c-format | ||||
348 | - QString activeColorMsg = i18n("(0° is active color)"); | ||||
349 | - QString br("<br />"); | ||||
350 | QString fullPercent = i18n("+180°"); | ||||
351 | QString zeroPercent = i18n("-180°"); | ||||
352 | | ||||
353 | - return QString(zeroPercent + br + i18n("CCW hue") + br + activeColorMsg); | ||||
354 | + return QString(zeroPercent); | ||||
355 | } | ||||
356 | | ||||
357 | -QString KisPressureHSVOption::huemaxLabel() | ||||
358 | +QString KisPressureHSVOption::hueMinToolTip() | ||||
359 | { | ||||
360 | // xgettext: no-c-format | ||||
361 | QString activeColorMsg = i18n("(0° is active color)"); | ||||
362 | QString br("<br />"); | ||||
363 | + return QString(i18n("CCW hue") + br + activeColorMsg); | ||||
364 | +} | ||||
365 | + | ||||
366 | +QString KisPressureHSVOption::huemaxLabel() | ||||
367 | +{ | ||||
368 | QString fullPercent = i18n("+180°"); | ||||
369 | QString zeroPercent = i18n("-180°"); | ||||
370 | | ||||
371 | - return QString(fullPercent + br + i18n("CW hue")); | ||||
372 | + return QString(fullPercent); | ||||
373 | +} | ||||
374 | + | ||||
375 | +QString KisPressureHSVOption::hueMaxToolTip() | ||||
376 | +{ | ||||
377 | + // xgettext: no-c-format | ||||
378 | + QString activeColorMsg = i18n("(0° is active color)"); | ||||
379 | + QString br("<br />"); | ||||
380 | + return QString(i18n("CW hue") + br + activeColorMsg); | ||||
381 | } | ||||
382 | | ||||
383 | KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { | ||||
384 | @@ -52,25 +62,36 @@ KisPressureHSVOption* KisPressureHSVOption::createSaturationOption() { | ||||
385 | | ||||
386 | QString KisPressureHSVOption::saturationMinLabel() | ||||
387 | { | ||||
388 | - // xgettext: no-c-format | ||||
389 | - QString activeColorMsg = i18n("(50% is active color)"); | ||||
390 | - QString br("<br />"); | ||||
391 | QString fullPercent = i18n("+100%"); | ||||
392 | QString zeroPercent = i18n("-100%"); | ||||
393 | | ||||
394 | - return QString(zeroPercent + br + i18n("Less saturation ") + br + activeColorMsg); | ||||
395 | + return QString(zeroPercent); | ||||
396 | | ||||
397 | } | ||||
398 | | ||||
399 | -QString KisPressureHSVOption::saturationmaxLabel() | ||||
400 | +QString KisPressureHSVOption::saturationMinToolTip() | ||||
401 | { | ||||
402 | // xgettext: no-c-format | ||||
403 | QString activeColorMsg = i18n("(50% is active color)"); | ||||
404 | QString br("<br />"); | ||||
405 | + | ||||
406 | + return QString(i18n("Less saturation ") + br + activeColorMsg); | ||||
407 | +} | ||||
408 | + | ||||
409 | +QString KisPressureHSVOption::saturationmaxLabel() | ||||
410 | +{ | ||||
411 | QString fullPercent = i18n("+100%"); | ||||
412 | QString zeroPercent = i18n("-100%"); | ||||
413 | | ||||
414 | - return QString(fullPercent + br + i18n("More saturation")); | ||||
415 | + return QString(fullPercent); | ||||
416 | +} | ||||
417 | + | ||||
418 | +QString KisPressureHSVOption::saturationMaxToolTip() | ||||
419 | +{ | ||||
420 | + // xgettext: no-c-format | ||||
421 | + QString activeColorMsg = i18n("(50% is active color)"); | ||||
422 | + QString br("<br />"); | ||||
423 | + return QString(i18n("More saturation") + br + activeColorMsg); | ||||
424 | } | ||||
425 | | ||||
426 | KisPressureHSVOption* KisPressureHSVOption::createValueOption() { | ||||
427 | @@ -79,29 +100,40 @@ KisPressureHSVOption* KisPressureHSVOption::createValueOption() { | ||||
428 | | ||||
429 | QString KisPressureHSVOption::valueMinLabel() | ||||
430 | { | ||||
431 | - // xgettext: no-c-format | ||||
432 | - QString activeColorMsg = i18n("(50% is active color)"); | ||||
433 | - QString br("<br />"); | ||||
434 | QString fullPercent = i18n("+100%"); | ||||
435 | QString zeroPercent = i18n("-100%"); | ||||
436 | | ||||
437 | - return QString(zeroPercent + br + i18n("Lower value ") + br + activeColorMsg); | ||||
438 | + return QString(zeroPercent);// + br + i18n("Lower value ") + br + activeColorMsg); | ||||
439 | | ||||
440 | } | ||||
441 | | ||||
442 | -QString KisPressureHSVOption::valuemaxLabel() | ||||
443 | +QString KisPressureHSVOption::valueMinToolTip() | ||||
444 | { | ||||
445 | // xgettext: no-c-format | ||||
446 | QString activeColorMsg = i18n("(50% is active color)"); | ||||
447 | QString br("<br />"); | ||||
448 | + | ||||
449 | + return QString(i18n("Lower value ") + br + activeColorMsg); | ||||
450 | +} | ||||
451 | + | ||||
452 | +QString KisPressureHSVOption::valuemaxLabel() | ||||
453 | +{ | ||||
454 | QString fullPercent = i18n("+100%"); | ||||
455 | QString zeroPercent = i18n("-100%"); | ||||
456 | | ||||
457 | - return QString(fullPercent + br + i18n("Higher value")); | ||||
458 | + return QString(fullPercent);// + br + i18n("Higher value")); | ||||
459 | | ||||
460 | | ||||
461 | } | ||||
462 | | ||||
463 | +QString KisPressureHSVOption::valueMaxToolTip() | ||||
464 | +{ | ||||
465 | + // xgettext: no-c-format | ||||
466 | + QString activeColorMsg = i18n("(50% is active color)"); | ||||
467 | + QString br("<br />"); | ||||
468 | + return QString(i18n("Higher value")+ br + activeColorMsg); | ||||
469 | +} | ||||
470 | + | ||||
471 | struct KisPressureHSVOption::Private | ||||
472 | { | ||||
473 | QString parameterName; | ||||
474 | diff --git a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h | ||||
475 | index 93a9254c7a..9ec96e171f 100644 | ||||
476 | --- a/plugins/paintops/libpaintop/kis_pressure_hsv_option.h | ||||
477 | +++ b/plugins/paintops/libpaintop/kis_pressure_hsv_option.h | ||||
478 | @@ -36,15 +36,21 @@ class PAINTOP_EXPORT KisPressureHSVOption : public KisCurveOption | ||||
479 | public: | ||||
480 | static KisPressureHSVOption* createHueOption(); | ||||
481 | static QString hueMinLabel(); | ||||
482 | + static QString hueMinToolTip(); | ||||
483 | static QString huemaxLabel(); | ||||
484 | + static QString hueMaxToolTip(); | ||||
485 | | ||||
486 | static KisPressureHSVOption* createSaturationOption(); | ||||
487 | static QString saturationMinLabel(); | ||||
488 | + static QString saturationMinToolTip(); | ||||
489 | static QString saturationmaxLabel(); | ||||
490 | + static QString saturationMaxToolTip(); | ||||
491 | | ||||
492 | static KisPressureHSVOption* createValueOption(); | ||||
493 | static QString valueMinLabel(); | ||||
494 | + static QString valueMinToolTip(); | ||||
495 | static QString valuemaxLabel(); | ||||
496 | + static QString valueMaxToolTip(); | ||||
497 | public: | ||||
498 | | ||||
499 | KisPressureHSVOption(const QString& parameterName); |