[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-texturizer_option-rempt] krita: Move the gradients widget to krita/ui
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2012-03-29 17:09:47
Message-ID: 20120329170947.6B8C9A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit e7b2b5c2bd171986e49b2ee215cb6b796233d70f by Boudewijn Rempt.
Committed on 29/03/2012 at 19:09.
Pushed by rempt into branch 'krita-texturizer_option-rempt'.
Move the gradients widget to krita/ui
We can use this widget in other places than the levels filter.
M +0 -3 krita/plugins/filters/levelfilter/CMakeLists.txt
M +1 -1 krita/plugins/filters/levelfilter/kis_level_filter.cpp
M +6 -6 krita/plugins/filters/levelfilter/wdg_level.ui
M +1 -0 krita/ui/CMakeLists.txt
R +26 -16 krita/ui/widgets/kis_gradient_slider.cpp [from: \
krita/plugins/filters/levelfilter/kgradientslider.cpp - 090% similarity] R +11 -6 \
krita/ui/widgets/kis_gradient_slider.h [from: \
krita/plugins/filters/levelfilter/kgradientslider.h - 086% similarity]
http://commits.kde.org/calligra/e7b2b5c2bd171986e49b2ee215cb6b796233d70f
diff --git a/krita/plugins/filters/levelfilter/CMakeLists.txt \
b/krita/plugins/filters/levelfilter/CMakeLists.txt index b28ca2e..d4e2297 100644
--- a/krita/plugins/filters/levelfilter/CMakeLists.txt
+++ b/krita/plugins/filters/levelfilter/CMakeLists.txt
@@ -1,9 +1,6 @@
-
-
set(kritalevelfilter_PART_SRCS
levelfilter.cpp
kis_level_filter.cpp
- kgradientslider.cpp
)
kde4_add_ui_files(kritalevelfilter_PART_SRCS
diff --git a/krita/plugins/filters/levelfilter/kis_level_filter.cpp \
b/krita/plugins/filters/levelfilter/kis_level_filter.cpp index 498f9ad..9a41be0 \
100644
--- a/krita/plugins/filters/levelfilter/kis_level_filter.cpp
+++ b/krita/plugins/filters/levelfilter/kis_level_filter.cpp
@@ -40,7 +40,7 @@
#include "kis_iterator.h"
#include "kis_histogram.h"
#include "kis_painter.h"
-#include "kgradientslider.h"
+#include "kis_gradient_slider.h"
#include "kis_processing_information.h"
#include "kis_selection.h"
#include "kis_types.h"
diff --git a/krita/plugins/filters/levelfilter/wdg_level.ui \
b/krita/plugins/filters/levelfilter/wdg_level.ui index 4c9105c..cda6ffc 100644
--- a/krita/plugins/filters/levelfilter/wdg_level.ui
+++ b/krita/plugins/filters/levelfilter/wdg_level.ui
@@ -58,7 +58,7 @@
</widget>
</item>
<item row="3" column="0">
- <widget class="KGradientSlider" name="ingradient" native="true">
+ <widget class="KisGradientSlider" name="ingradient" native="true">
<property name="minimumSize">
<size>
<width>256</width>
@@ -153,7 +153,7 @@
</widget>
</item>
<item row="7" column="0">
- <widget class="KGradientSlider" name="outgradient" native="true">
+ <widget class="KisGradientSlider" name="outgradient" native="true">
<property name="minimumSize">
<size>
<width>256</width>
@@ -263,14 +263,14 @@
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
- <class>KGradientSlider</class>
+ <class>KisGradientSlider</class>
<extends>QWidget</extends>
- <header>kgradientslider.h</header>
+ <header>kis_gradient_slider.h</header>
</customwidget>
</customwidgets>
<includes>
- <include location="local">kgradientslider.h</include>
- <include location="local">kgradientslider.h</include>
+ <include location="local">kis_gradient_slider.h</include>
+ <include location="local">kis_gradient_slider.h</include>
</includes>
<resources/>
<connections/>
diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt
index 7b8b87a..4fcfc02 100644
--- a/krita/ui/CMakeLists.txt
+++ b/krita/ui/CMakeLists.txt
@@ -157,6 +157,7 @@ set(kritaui_LIB_SRCS
widgets/kis_filter_selector_widget.cc
widgets/kis_gradient_chooser.cc
widgets/kis_gradient_slider_widget.cc
+ widgets/kis_gradient_slider.cpp
widgets/kis_iconwidget.cc
widgets/kis_mask_widgets.cpp
widgets/kis_meta_data_merge_strategy_chooser_widget.cc
diff --git a/krita/plugins/filters/levelfilter/kgradientslider.cpp \
b/krita/ui/widgets/kis_gradient_slider.cpp similarity index 90%
rename from krita/plugins/filters/levelfilter/kgradientslider.cpp
rename to krita/ui/widgets/kis_gradient_slider.cpp
index d0290bc..1dd9e1b 100644
--- a/krita/plugins/filters/levelfilter/kgradientslider.cpp
+++ b/krita/ui/widgets/kis_gradient_slider.cpp
@@ -19,7 +19,7 @@
*/
// Local includes.
-#include "kgradientslider.h"
+#include "kis_gradient_slider.h"
// C++ includes.
@@ -37,7 +37,7 @@
-KGradientSlider::KGradientSlider(QWidget *parent)
+KisGradientSlider::KisGradientSlider(QWidget *parent)
: QWidget(parent), m_black(0), m_white(255), m_gamma(1.0), \
m_gammaEnabled(false) {
m_feedback = false;
@@ -47,11 +47,21 @@ KGradientSlider::KGradientSlider(QWidget *parent)
setFocusPolicy(Qt::StrongFocus);
}
-KGradientSlider::~KGradientSlider()
+KisGradientSlider::~KisGradientSlider()
{
}
-void KGradientSlider::paintEvent(QPaintEvent *)
+int KisGradientSlider::black() const
+{
+ return m_black;
+}
+
+int KisGradientSlider::white() const
+{
+ return m_white;
+}
+
+void KisGradientSlider::paintEvent(QPaintEvent *)
{
int x, y;
int wWidth = width();
@@ -112,14 +122,14 @@ void KGradientSlider::paintEvent(QPaintEvent *)
p1.drawPolygon(a, 3);
}
-void KGradientSlider::resizeEvent(QResizeEvent *)
+void KisGradientSlider::resizeEvent(QResizeEvent *)
{
m_scalingFactor = (double)width() / 255;
calculateCursorPositions();
update();
}
-void KGradientSlider::mousePressEvent(QMouseEvent * e)
+void KisGradientSlider::mousePressEvent(QMouseEvent * e)
{
eCursor closest_cursor;
int distance;
@@ -200,7 +210,7 @@ void KGradientSlider::mousePressEvent(QMouseEvent * e)
update();
}
-void KGradientSlider::mouseReleaseEvent(QMouseEvent * e)
+void KisGradientSlider::mouseReleaseEvent(QMouseEvent * e)
{
if (e->button() != Qt::LeftButton)
return;
@@ -229,7 +239,7 @@ void KGradientSlider::mouseReleaseEvent(QMouseEvent * e)
m_feedback = false;
}
-void KGradientSlider::mouseMoveEvent(QMouseEvent * e)
+void KisGradientSlider::mouseMoveEvent(QMouseEvent * e)
{
int x = e->pos().x();
@@ -274,14 +284,14 @@ void KGradientSlider::mouseMoveEvent(QMouseEvent * e)
update();
}
-void KGradientSlider::calculateCursorPositions()
+void KisGradientSlider::calculateCursorPositions()
{
m_blackCursor = (int)round(m_black * m_scalingFactor);
m_whiteCursor = (int)round(m_white * m_scalingFactor);
m_gammaCursor = calculateGammaCursor();
}
-unsigned int KGradientSlider::calculateGammaCursor()
+unsigned int KisGradientSlider::calculateGammaCursor()
{
double delta = (double)(m_whiteCursor - m_blackCursor) / 2.0;
double mid = (double)m_blackCursor + delta;
@@ -290,18 +300,18 @@ unsigned int KGradientSlider::calculateGammaCursor()
}
-void KGradientSlider::enableGamma(bool b)
+void KisGradientSlider::enableGamma(bool b)
{
m_gammaEnabled = b;
update();
}
-double KGradientSlider::getGamma(void)
+double KisGradientSlider::getGamma(void)
{
return m_gamma;
}
-void KGradientSlider::slotModifyBlack(int v)
+void KisGradientSlider::slotModifyBlack(int v)
{
if (v >= 0 && v <= (int)m_white && !m_feedback) {
m_black = v;
@@ -310,7 +320,7 @@ void KGradientSlider::slotModifyBlack(int v)
update();
}
}
-void KGradientSlider::slotModifyWhite(int v)
+void KisGradientSlider::slotModifyWhite(int v)
{
if (v >= (int)m_black && v <= width() && !m_feedback) {
m_white = v;
@@ -319,7 +329,7 @@ void KGradientSlider::slotModifyWhite(int v)
update();
}
}
-void KGradientSlider::slotModifyGamma(double v)
+void KisGradientSlider::slotModifyGamma(double v)
{
if (m_gamma != v) {
emit sigModifiedGamma(v);
@@ -329,4 +339,4 @@ void KGradientSlider::slotModifyGamma(double v)
update();
}
-#include "kgradientslider.moc"
+#include "kis_gradient_slider.moc"
diff --git a/krita/plugins/filters/levelfilter/kgradientslider.h \
b/krita/ui/widgets/kis_gradient_slider.h similarity index 86%
rename from krita/plugins/filters/levelfilter/kgradientslider.h
rename to krita/ui/widgets/kis_gradient_slider.h
index a49ffd7..e1eab64 100644
--- a/krita/plugins/filters/levelfilter/kgradientslider.h
+++ b/krita/ui/widgets/kis_gradient_slider.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KGRADIENTSLIDER_H
-#define KGRADIENTSLIDER_H
+#ifndef KIS_GRADIENT_SLIDER_H
+#define KIS_GRADIENT_SLIDER_H
// Qt includes.
@@ -28,7 +28,9 @@
#include <QList>
#include <QPair>
-class KGradientSlider : public QWidget
+#include <krita_export.h>
+
+class KRITAUI_EXPORT KisGradientSlider : public QWidget
{
Q_OBJECT
@@ -40,9 +42,12 @@ class KGradientSlider : public QWidget
} eCursor;
public:
- KGradientSlider(QWidget *parent = 0);
+ KisGradientSlider(QWidget *parent = 0);
+
+ virtual ~KisGradientSlider();
- virtual ~KGradientSlider();
+ int black() const;
+ int white() const;
public slots:
void slotModifyBlack(int);
@@ -90,4 +95,4 @@ private:
};
-#endif /* KGRADIENTSLIDER_H */
+#endif /* KIS_GRADIENT_SLIDER_H */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic