[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [krita/kazakov/shift-gesture-slowdown] /: Merge remote-tracking branch 'origin/master' into kazakov/
From: Dmitry Kazakov <dimula73 () gmail ! com>
Date: 2016-09-15 14:33:13
Message-ID: E1bkXiz-0003zG-2g () code ! kde ! org
[Download RAW message or body]
Git commit 77fc478669bec1db301fe20d63f28ae87fdc0f40 by Dmitry Kazakov.
Committed on 15/09/2016 at 08:14.
Pushed by dkazakov into branch 'kazakov/shift-gesture-slowdown'.
Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown
Just merge and resonve the conflicts. It doesn't compile.
# Conflicts:
# libs/image/brushengine/kis_paintop_settings.cpp
# libs/image/brushengine/kis_paintop_settings.h
# plugins/paintops/deform/kis_deform_paintop_settings.h
# plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
# plugins/paintops/deform/kis_deform_paintop_settings_widget.h
# plugins/paintops/gridbrush/kis_grid_paintop.cpp
# plugins/paintops/gridbrush/kis_grid_paintop.h
# plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
# plugins/paintops/gridbrush/kis_grid_paintop_settings.h
# plugins/paintops/gridbrush/kis_gridop_option.h
# plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
# plugins/paintops/spray/kis_spray_paintop_settings.h
# plugins/paintops/spray/kis_spray_paintop_settings_widget.h
M +8 -0 libs/image/CMakeLists.txt
M +6 -4 libs/image/brushengine/kis_paintop_config_widget.cpp
M +7 -4 libs/image/brushengine/kis_paintop_config_widget.h
M +42 -12 libs/image/brushengine/kis_paintop_settings.cpp
M +17 -11 libs/image/brushengine/kis_paintop_settings.h
M +39 -7 libs/ui/kis_paintop_box.cc
M +4 -0 libs/ui/widgets/kis_paintop_presets_popup.cpp
M +1 -0 libs/ui/widgets/kis_paintop_presets_popup.h
M +1 -1 plugins/paintops/chalk/kis_chalk_paintop_settings.cpp
M +1 -1 plugins/paintops/chalk/kis_chalk_paintop_settings.h
M +1 -1 plugins/paintops/chalk/kis_chalk_paintop_settings_widget.cpp
M +1 -1 plugins/paintops/chalk/kis_chalk_paintop_settings_widget.h
M +3 -3 plugins/paintops/chalk/kis_chalkop_option.h
M +0 -1 plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
M +13 -3 plugins/paintops/deform/kis_deform_paintop_settings.cpp
M +1 -1 plugins/paintops/deform/kis_deform_paintop_settings.h
M +1 -1 plugins/paintops/deform/kis_deform_paintop_settings_widget.h
M +0 -3 plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
M +3 -2 plugins/paintops/experiment/kis_experiment_paintop_settings.h
M +1 -1 plugins/paintops/experiment/kis_experiment_paintop_settings_widget.cpp
M +1 -1 plugins/paintops/experiment/kis_experiment_paintop_settings_widget.h
M +3 -3 plugins/paintops/gridbrush/kis_grid_paintop.cpp
M +4 -4 plugins/paintops/gridbrush/kis_grid_paintop.h
M +17 -4 plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
M +7 -2 plugins/paintops/gridbrush/kis_grid_paintop_settings.h
M +1 -1 plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
M +1 -1 plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.h
M +4 -4 plugins/paintops/gridbrush/kis_gridop_option.h
M +8 -10 plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
M +18 -7 plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
M +2 -2 plugins/paintops/libpaintop/kis_brush_option_widget.cpp
M +2 -2 plugins/paintops/libpaintop/kis_brush_option_widget.h
M +2 -2 plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
M +7 -3 plugins/paintops/libpaintop/kis_brush_selection_widget.h
M +12 -2 plugins/paintops/spray/kis_spray_paintop_settings.cpp
M +9 -3 plugins/paintops/spray/kis_spray_paintop_settings.h
M +1 -1 plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
M +1 -1 plugins/paintops/spray/kis_spray_paintop_settings_widget.h
http://commits.kde.org/krita/77fc478669bec1db301fe20d63f28ae87fdc0f40
diff --cc libs/image/brushengine/kis_paintop_settings.h
index 925b588,fba951f..6ad323f
--- a/libs/image/brushengine/kis_paintop_settings.h
+++ b/libs/image/brushengine/kis_paintop_settings.h
@@@ -198,10 -197,10 +197,10 @@@ public
/**
* @return size saved in the properties
*/
- virtual qreal paintOpSize() const;
+ virtual qreal paintOpSize() const = 0;
void setEraserMode(bool value);
- bool eraserMode() const;
+ bool eraserMode();
qreal savedEraserSize() const;
void setSavedEraserSize(qreal value);
diff --cc libs/ui/widgets/kis_paintop_presets_popup.h
index bf291bc,e0332d1..d18d261
--- a/libs/ui/widgets/kis_paintop_presets_popup.h
+++ b/libs/ui/widgets/kis_paintop_presets_popup.h
@@@ -94,9 -94,9 +94,10 @@@ Q_SIGNALS
void reloadPresetClicked();
void dirtyPresetToggled(bool value);
void eraserBrushSizeToggled(bool value);
+ void eraserBrushOpacityToggled(bool value);
void sizeChanged();
+ void brushEditorShown();
private Q_SLOTS:
void slotSwitchPresetStrip(bool visible);
diff --cc plugins/paintops/chalk/kis_chalk_paintop_settings.h
index 9cbf4aa,9be8192..38bb3e6
--- a/plugins/paintops/chalk/kis_chalk_paintop_settings.h
+++ b/plugins/paintops/chalk/kis_chalk_paintop_settings.h
@@@ -34,11 -34,8 +34,11 @@@ public
KisChalkPaintOpSettings();
virtual ~KisChalkPaintOpSettings() {}
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
+ QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode);
+ void setPaintOpSize(qreal value) Q_DECL_OVERRIDE;
+ qreal paintOpSize() const Q_DECL_OVERRIDE;
+
bool paintIncremental();
bool isAirbrushing() const;
int rate() const;
diff --cc plugins/paintops/chalk/kis_chalk_paintop_settings_widget.h
index 0d4f9c5,e637ddf..aa0a318
--- a/plugins/paintops/chalk/kis_chalk_paintop_settings_widget.h
+++ b/plugins/paintops/chalk/kis_chalk_paintop_settings_widget.h
@@@ -33,8 -33,12 +33,8 @@@ public
KisChalkPaintOpSettingsWidget(QWidget* parent = 0);
virtual ~KisChalkPaintOpSettingsWidget();
- KisPropertiesConfiguration* configuration() const;
+ KisPropertiesConfigurationSP configuration() const;
- ///Reimplemented
- void changePaintOpSize(qreal x, qreal y);
- virtual QSizeF paintOpSize() const;
-
public:
KisChalkOpOption* m_chalkOption;
};
diff --cc plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
index dd9401f,c5fe2fe..9c0433e
--- a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
+++ b/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
@@@ -57,8 -41,8 +57,7 @@@ bool KisCurvePaintOpSettings::paintIncr
#include <brushengine/kis_slider_based_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
-#include "kis_curve_line_option.h"
#include "kis_standard_uniform_properties_factory.h"
- typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties()
diff --cc plugins/paintops/deform/kis_deform_paintop_settings.h
index 0ab27ce,a132962..d68e583
--- a/plugins/paintops/deform/kis_deform_paintop_settings.h
+++ b/plugins/paintops/deform/kis_deform_paintop_settings.h
@@@ -31,10 -31,7 +31,10 @@@ public
KisDeformPaintOpSettings();
~KisDeformPaintOpSettings();
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode);
+ void setPaintOpSize(qreal value) Q_DECL_OVERRIDE;
+ qreal paintOpSize() const Q_DECL_OVERRIDE;
+
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
++ QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) Q_DECL_OVERRIDE;
bool paintIncremental();
bool isAirbrushing() const;
diff --cc plugins/paintops/deform/kis_deform_paintop_settings_widget.h
index a87fb29,56fcddd..02ef8dd
--- a/plugins/paintops/deform/kis_deform_paintop_settings_widget.h
+++ b/plugins/paintops/deform/kis_deform_paintop_settings_widget.h
@@@ -31,7 -31,9 +31,7 @@@ public
KisDeformPaintOpSettingsWidget(QWidget* parent = 0);
virtual ~KisDeformPaintOpSettingsWidget();
- virtual KisPropertiesConfiguration* configuration() const;
- virtual KisPropertiesConfigurationSP configuration() const;
- virtual void changePaintOpSize(qreal x, qreal y);
- virtual QSizeF paintOpSize() const;
++ virtual KisPropertiesConfigurationSP configuration() const Q_DECL_OVERRIDE;
private:
KisDeformOption * m_deformOption;
diff --cc plugins/paintops/experiment/kis_experiment_paintop_settings_widget.h
index 65422e7,b608680..0234ada
--- a/plugins/paintops/experiment/kis_experiment_paintop_settings_widget.h
+++ b/plugins/paintops/experiment/kis_experiment_paintop_settings_widget.h
@@@ -28,8 -28,9 +28,8 @@@ class KisExperimentPaintOpSettingsWidge
public:
KisExperimentPaintOpSettingsWidget(QWidget* parent = 0);
virtual ~KisExperimentPaintOpSettingsWidget();
- virtual void changePaintOpSize(qreal x, qreal y);
- KisPropertiesConfiguration* configuration() const;
+ KisPropertiesConfigurationSP configuration() const;
};
#endif
diff --cc plugins/paintops/gridbrush/kis_grid_paintop.cpp
index ad8db9e,dfd7dd5..b713410
--- a/plugins/paintops/gridbrush/kis_grid_paintop.cpp
+++ b/plugins/paintops/gridbrush/kis_grid_paintop.cpp
@@@ -240,7 -240,7 +240,7 @@@ KisSpacingInformation KisGridPaintOp::p
return KisSpacingInformation(m_spacing * additionalScale);
}
- void KisGridProperties::readOptionSetting(const KisPropertiesConfiguration* setting)
-void KisGridProperties::fillProperties(const KisPropertiesConfigurationSP setting)
++void KisGridProperties::readOptionSetting(const KisPropertiesConfigurationSP setting)
{
gridWidth = qMax(1, setting->getInt(GRID_WIDTH));
gridHeight = qMax(1, setting->getInt(GRID_HEIGHT));
diff --cc plugins/paintops/gridbrush/kis_grid_paintop.h
index 0e333c9,849efdb..52ba7e3
--- a/plugins/paintops/gridbrush/kis_grid_paintop.h
+++ b/plugins/paintops/gridbrush/kis_grid_paintop.h
@@@ -45,8 -45,7 +45,8 @@@ public
quint8 shape;
public:
- void readOptionSetting(const KisPropertiesConfiguration* setting);
- void writeOptionSetting(KisPropertiesConfiguration* setting);
- void fillProperties(const KisPropertiesConfigurationSP setting);
++ void readOptionSetting(const KisPropertiesConfigurationSP setting);
++ void writeOptionSetting(KisPropertiesConfigurationSP setting);
};
class KisGridPaintOp : public KisPaintOp
diff --cc plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
index a346d9c,bec9f64..af48438
--- a/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
+++ b/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
@@@ -36,23 -36,10 +36,27 @@@ KisGridPaintOpSettings::KisGridPaintOpS
{
}
+void KisGridPaintOpSettings::setPaintOpSize(qreal value)
+{
+ GridOption option;
+ option.readOptionSetting(this);
+ option.grid_width = value;
+ option.grid_height = value;
+ option.writeOptionSetting(this);
+}
+
+qreal KisGridPaintOpSettings::paintOpSize() const
+{
+ GridOption option;
+ option.readOptionSetting(this);
+
+ return option.grid_width;
+}
+
+ KisGridPaintOpSettings::~KisGridPaintOpSettings()
+ {
+ }
+
bool KisGridPaintOpSettings::paintIncremental()
{
return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
@@@ -81,8 -79,8 +96,6 @@@ QPainterPath KisGridPaintOpSettings::br
#include <brushengine/kis_slider_based_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
- typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
-#include "kis_gridop_option.h"
--
QList<KisUniformPaintOpPropertySP> KisGridPaintOpSettings::uniformProperties()
{
diff --cc plugins/paintops/gridbrush/kis_grid_paintop_settings.h
index 6b24765,232e71e..0e155ef
--- a/plugins/paintops/gridbrush/kis_grid_paintop_settings.h
+++ b/plugins/paintops/gridbrush/kis_grid_paintop_settings.h
@@@ -33,12 -33,10 +33,13 @@@ class KisGridPaintOpSettings : public K
{
public:
KisGridPaintOpSettings();
+ ~KisGridPaintOpSettings();
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode);
- bool paintIncremental();
+ void setPaintOpSize(qreal value) Q_DECL_OVERRIDE;
+ qreal paintOpSize() const Q_DECL_OVERRIDE;
+
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
- bool paintIncremental();
++ QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) Q_DECL_OVERRIDE;
++ bool paintIncremental() Q_DECL_OVERRIDE;
QList<KisUniformPaintOpPropertySP> uniformProperties();
diff --cc plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.h
index da5e272,cf6f88f..ff427b5
--- a/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.h
+++ b/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.h
@@@ -32,8 -32,10 +32,8 @@@ class KisGridPaintOpSettingsWidget : pu
public:
KisGridPaintOpSettingsWidget(QWidget* parent = 0);
virtual ~KisGridPaintOpSettingsWidget();
- virtual void changePaintOpSize(qreal x, qreal y);
- virtual QSizeF paintOpSize() const;
- KisPropertiesConfiguration* configuration() const;
+ KisPropertiesConfigurationSP configuration() const;
public:
KisGridOpOption *m_gridOption;
diff --cc plugins/paintops/gridbrush/kis_gridop_option.h
index ddcf69b,98cbf5d..8b35450
--- a/plugins/paintops/gridbrush/kis_gridop_option.h
+++ b/plugins/paintops/gridbrush/kis_gridop_option.h
@@@ -74,9 -74,9 +74,9 @@@ struct GridOptio
bool grid_random_border;
- void readOptionSetting(const KisPropertiesConfiguration* setting) {
+ void readOptionSetting(const KisPropertiesConfigurationSP setting) {
- grid_width = setting->getInt(GRID_WIDTH);
- grid_height = setting->getInt(GRID_HEIGHT);
+ grid_width = qMax(1, setting->getInt(GRID_WIDTH));
+ grid_height = qMax(1, setting->getInt(GRID_HEIGHT));
grid_division_level = setting->getInt(GRID_DIVISION_LEVEL);
grid_pressure_division = setting->getBool(GRID_PRESSURE_DIVISION);
grid_scale = setting->getDouble(GRID_SCALE);
@@@ -85,9 -85,9 +85,9 @@@
grid_random_border = setting->getBool(GRID_RANDOM_BORDER);
}
- void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+ void writeOptionSetting(KisPropertiesConfigurationSP setting) const {
- setting->setProperty(GRID_WIDTH, grid_width);
- setting->setProperty(GRID_HEIGHT, grid_height);
+ setting->setProperty(GRID_WIDTH, qMax(1, grid_width));
+ setting->setProperty(GRID_HEIGHT, qMax(1, grid_height));
setting->setProperty(GRID_DIVISION_LEVEL, grid_division_level);
setting->setProperty(GRID_PRESSURE_DIVISION, grid_pressure_division);
setting->setProperty(GRID_SCALE, grid_scale);
diff --cc plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
index d065b61,947550c..91cae9c
--- a/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
+++ b/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
@@@ -60,11 -66,9 +66,11 @@@ public
void setAutoSpacing(bool active, qreal coeff);
- bool autoSpacingActive() const;
- qreal autoSpacingCoeff() const;
+ bool autoSpacingActive();
+ qreal autoSpacingCoeff();
+ void setPaintOpSize(qreal value);
+ qreal paintOpSize() const;
QList<KisUniformPaintOpPropertySP> uniformProperties();
diff --cc plugins/paintops/spray/kis_spray_paintop_settings.cpp
index 3b3f393,fea4319..8bde396
--- a/plugins/paintops/spray/kis_spray_paintop_settings.cpp
+++ b/plugins/paintops/spray/kis_spray_paintop_settings.cpp
@@@ -97,8 -91,8 +108,7 @@@ QPainterPath KisSprayPaintOpSettings::b
#include <brushengine/kis_slider_based_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
-#include "kis_sprayop_option.h"
#include "kis_standard_uniform_properties_factory.h"
- typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
QList<KisUniformPaintOpPropertySP> KisSprayPaintOpSettings::uniformProperties()
diff --cc plugins/paintops/spray/kis_spray_paintop_settings.h
index da75cd9,6320fb5..8524c88
--- a/plugins/paintops/spray/kis_spray_paintop_settings.h
+++ b/plugins/paintops/spray/kis_spray_paintop_settings.h
@@@ -32,13 -32,9 +32,12 @@@ class KisSprayPaintOpSettings : public
{
public:
KisSprayPaintOpSettings();
- ~KisSprayPaintOpSettings();
+ virtual ~KisSprayPaintOpSettings();
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode);
+ void setPaintOpSize(qreal value) Q_DECL_OVERRIDE;
+ qreal paintOpSize() const Q_DECL_OVERRIDE;
+
-
- QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
++ QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) Q_DECL_OVERRIDE;
QString modelName() const {
return "airbrush";
diff --cc plugins/paintops/spray/kis_spray_paintop_settings_widget.h
index 601c7a1,ba398fe..4dcff92
--- a/plugins/paintops/spray/kis_spray_paintop_settings_widget.h
+++ b/plugins/paintops/spray/kis_spray_paintop_settings_widget.h
@@@ -31,7 -31,10 +31,7 @@@ public
KisSprayPaintOpSettingsWidget(QWidget* parent = 0);
virtual ~KisSprayPaintOpSettingsWidget();
- KisPropertiesConfiguration* configuration() const;
-
- virtual void changePaintOpSize(qreal x, qreal y);
- virtual QSizeF paintOpSize() const;
+ KisPropertiesConfigurationSP configuration() const;
public:
KisSprayOpOption* m_sprayArea;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic