diff --git a/libs/basicflakes/CMakeLists.txt b/libs/basicflakes/CMakeLists.txt
index 245d7c5446..0682071a28 100644
--- a/libs/basicflakes/CMakeLists.txt
+++ b/libs/basicflakes/CMakeLists.txt
@@ -1,38 +1,37 @@
 add_subdirectory(plugin)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/tools
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin
 )
 
 set(kritabasicflakes_LIB_SRCS
     tools/KoCreatePathTool.cpp
     tools/KoPencilTool.cpp
 )
 
 ki18n_wrap_ui( kritabasicflakes_LIB_SRCS
 )
 
 
 add_library(kritabasicflakes SHARED ${kritabasicflakes_LIB_SRCS})
 generate_export_header(kritabasicflakes)
 
 target_include_directories(kritabasicflakes
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/plugin>
 )
 
 target_link_libraries(kritabasicflakes 
     PUBLIC
         kritawidgets 
         kritaflake 
-        kritapigment
-		kritaui
+		kritapigment
 )
 
 set_target_properties(kritabasicflakes PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritabasicflakes  ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/libs/basicflakes/tools/KoCreatePathTool.cpp b/libs/basicflakes/tools/KoCreatePathTool.cpp
index 5db452926b..e1856e8463 100644
--- a/libs/basicflakes/tools/KoCreatePathTool.cpp
+++ b/libs/basicflakes/tools/KoCreatePathTool.cpp
@@ -1,533 +1,533 @@
 /* This file is part of the KDE project
  *
  * Copyright (C) 2006 Thorsten Zachmann <zachmann@kde.org>
  * Copyright (C) 2008-2010 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "KoCreatePathTool.h"
 #include "KoCreatePathTool_p.h"
 
 #include "KoPointerEvent.h"
 #include "KoPathShape.h"
 #include "KoSelection.h"
 #include "KoDocumentResourceManager.h"
 #include "KoShapePaintingContext.h"
 #include "KoShapeStroke.h"
 #include "KoStrokeConfigWidget.h"
 #include "KoCanvasBase.h"
-#include "kis_intparsespinbox.h"
+#include "kis_int_parse_spin_box.h"
 #include <KoColor.h>
 
 #include <klocalizedstring.h>
 
 #include <QSpinBox>
 #include <QPainter>
 #include <QLabel>
 #include <QGridLayout>
 #include <QCheckBox>
 
 
 KoCreatePathTool::KoCreatePathTool(KoCanvasBase *canvas)
     : KoToolBase(*(new KoCreatePathToolPrivate(this, canvas)))
 {
 }
 
 KoCreatePathTool::~KoCreatePathTool()
 {
 }
 
 void KoCreatePathTool::paint(QPainter &painter, const KoViewConverter &converter)
 {
     Q_D(KoCreatePathTool);
 
     if (pathStarted()) {
 
         KoShapeStroke *stroke(createStroke());
 
         if (stroke) {
             d->shape->setStroke(stroke);
         }
 
         painter.save();
         paintPath(*(d->shape), painter, converter);
         painter.restore();
 
         painter.save();
 
         painter.setTransform(d->shape->absoluteTransformation(&converter) * painter.transform());
 
         KoShape::applyConversion(painter, converter);
 
         QPen pen(QBrush(Qt::blue), 1);
         pen.setCosmetic(true);
         painter.setPen(pen);
         painter.setBrush(Qt::white);
 
         const bool firstPoint = (d->firstPoint == d->activePoint);
 
         if (d->pointIsDragged || firstPoint) {
             const bool onlyPaintActivePoints = false;
             KoPathPoint::PointTypes paintFlags = KoPathPoint::ControlPoint2;
 
             if (d->activePoint->activeControlPoint1()) {
                 paintFlags |= KoPathPoint::ControlPoint1;
             }
             d->activePoint->paint(painter, d->handleRadius, paintFlags, onlyPaintActivePoints);
         }
 
 
         // check if we have to color the first point
         if (d->mouseOverFirstPoint) {
             painter.setBrush(Qt::red);
         } else {
             painter.setBrush(Qt::white);
         }
 
         d->firstPoint->paint(painter, d->handleRadius, KoPathPoint::Node);
 
         painter.restore();
     }
 
     if (d->hoveredPoint) {
         painter.save();
         painter.setTransform(d->hoveredPoint->parent()->absoluteTransformation(&converter), true);
         KoShape::applyConversion(painter, converter);
         QPen pen(QBrush(Qt::blue), 1);
         pen.setCosmetic(true);
         painter.setPen(pen);
         painter.setBrush(Qt::white);
         d->hoveredPoint->paint(painter, d->handleRadius, KoPathPoint::Node);
         painter.restore();
     }
 
     painter.save();
     KoShape::applyConversion(painter, converter);
     canvas()->snapGuide()->paint(painter, converter);
     painter.restore();
 }
 
 void KoCreatePathTool::paintPath(KoPathShape& pathShape, QPainter &painter, const KoViewConverter &converter)
 {
     Q_D(KoCreatePathTool);
     painter.setTransform(pathShape.absoluteTransformation(&converter) * painter.transform());
     painter.save();
 
     KoShapePaintingContext paintContext; //FIXME
     pathShape.paint(painter, converter, paintContext);
     painter.restore();
 
     if (pathShape.stroke()) {
         painter.save();
         pathShape.stroke()->paint(d->shape, painter, converter);
         painter.restore();
     }
 }
 
 void KoCreatePathTool::mousePressEvent(KoPointerEvent *event)
 {
     Q_D(KoCreatePathTool);
 
     //Right click removes last point
     if (event->button() == Qt::RightButton) {
         removeLastPoint();
         return;
     }
 
     const bool isOverFirstPoint = d->shape &&
                                   handleGrabRect(d->firstPoint->point()).contains(event->point);
     bool haveCloseModifier = (listeningToModifiers() && (event->modifiers() & Qt::ShiftModifier));
 
     if ((event->button() == Qt::LeftButton) && haveCloseModifier && !isOverFirstPoint) {
         endPathWithoutLastPoint();
         return;
     }
 
     d->finishAfterThisPoint = false;
 
     if (pathStarted()) {
         if (isOverFirstPoint) {
             d->activePoint->setPoint(d->firstPoint->point());
             canvas()->updateCanvas(d->shape->boundingRect());
             canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
 
             if (haveCloseModifier) {
                 d->shape->closeMerge();
                 // we are closing the path, so reset the existing start path point
                 d->existingStartPoint = 0;
                 // finish path
                 endPath();
             } else {
                 // the path shape will get closed when the user releases
                 // the mouse button
                 d->finishAfterThisPoint = true;
             }
         } else {
             canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
 
             QPointF point = canvas()->snapGuide()->snap(event->point, event->modifiers());
 
             // check whether we hit an start/end node of an existing path
             d->existingEndPoint = d->endPointAtPosition(point);
             if (d->existingEndPoint.isValid() && d->existingEndPoint != d->existingStartPoint) {
                 point = d->existingEndPoint.path->shapeToDocument(d->existingEndPoint.point->point());
                 d->activePoint->setPoint(point);
                 // finish path
                 endPath();
             } else {
                 d->activePoint->setPoint(point);
                 canvas()->updateCanvas(d->shape->boundingRect());
                 canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
             }
         }
     } else {
         KoPathShape *pathShape = new KoPathShape();
         d->shape = pathShape;
         pathShape->setShapeId(KoPathShapeId);
 
         KoShapeStroke *stroke = new KoShapeStroke(canvas()->resourceManager()->activeStroke());
         stroke->setColor(canvas()->resourceManager()->foregroundColor().toQColor());
 
         pathShape->setStroke(stroke);
         canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
         QPointF point = canvas()->snapGuide()->snap(event->point, event->modifiers());
 
         // check whether we hit an start/end node of an existing path
         d->existingStartPoint = d->endPointAtPosition(point);
 
         if (d->existingStartPoint.isValid()) {
             point = d->existingStartPoint.path->shapeToDocument(d->existingStartPoint.point->point());
         }
 
         d->activePoint = pathShape->moveTo(point);
         d->firstPoint = d->activePoint;
         canvas()->updateCanvas(handlePaintRect(point));
         canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
 
         canvas()->snapGuide()->setEditedShape(pathShape);
 
         d->angleSnapStrategy = new AngleSnapStrategy(d->angleSnappingDelta, d->angleSnapStatus);
         canvas()->snapGuide()->addCustomSnapStrategy(d->angleSnapStrategy);
     }
 
     if (d->angleSnapStrategy)
         d->angleSnapStrategy->setStartPoint(d->activePoint->point());
 }
 
 bool KoCreatePathTool::listeningToModifiers()
 {
     Q_D(KoCreatePathTool);
     return d->listeningToModifiers;
 }
 
 bool KoCreatePathTool::pathStarted()
 {
     Q_D(KoCreatePathTool);
     return ((bool) d->shape);
 }
 
 void KoCreatePathTool::mouseDoubleClickEvent(KoPointerEvent *event)
 {
     //remove handle
     canvas()->updateCanvas(handlePaintRect(event->point));
 
     endPathWithoutLastPoint();
 }
 
 void KoCreatePathTool::mouseMoveEvent(KoPointerEvent *event)
 {
     Q_D(KoCreatePathTool);
 
     KoPathPoint *endPoint = d->endPointAtPosition(event->point);
     if (d->hoveredPoint != endPoint) {
 
         if (d->hoveredPoint) {
             QPointF nodePos = d->hoveredPoint->parent()->shapeToDocument(d->hoveredPoint->point());
             canvas()->updateCanvas(handlePaintRect(nodePos));
         }
 
         d->hoveredPoint = endPoint;
 
         if (d->hoveredPoint) {
             QPointF nodePos = d->hoveredPoint->parent()->shapeToDocument(d->hoveredPoint->point());
             canvas()->updateCanvas(handlePaintRect(nodePos));
         }
     }
 
     if (!pathStarted()) {
 
         canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
         canvas()->snapGuide()->snap(event->point, event->modifiers());
         canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
 
         d->mouseOverFirstPoint = false;
         return;
     }
 
     d->mouseOverFirstPoint = handleGrabRect(d->firstPoint->point()).contains(event->point);
 
     canvas()->updateCanvas(d->shape->boundingRect());
     canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
     QPointF snappedPosition = canvas()->snapGuide()->snap(event->point, event->modifiers());
 
     d->repaintActivePoint();
 
     if (event->buttons() & Qt::LeftButton) {
 
         d->pointIsDragged = true;
         QPointF offset = snappedPosition - d->activePoint->point();
         d->activePoint->setControlPoint2(d->activePoint->point() + offset);
         // pressing <alt> stops controls points moving symmetrically
         if ((event->modifiers() & Qt::AltModifier) == 0) {
             d->activePoint->setControlPoint1(d->activePoint->point() - offset);
         }
         d->repaintActivePoint();
     } else {
         d->activePoint->setPoint(snappedPosition);
     }
 
     canvas()->updateCanvas(d->shape->boundingRect());
     canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
 }
 
 void KoCreatePathTool::mouseReleaseEvent(KoPointerEvent *event)
 {
     Q_D(KoCreatePathTool);
 
     if (! d->shape || (event->buttons() & Qt::RightButton)) return;
 
     d->listeningToModifiers = true; // After the first press-and-release
     d->repaintActivePoint();
     d->pointIsDragged = false;
     KoPathPoint *lastActivePoint = d->activePoint;
 
     if (!d->finishAfterThisPoint) {
         d->activePoint = d->shape->lineTo(event->point);
         canvas()->snapGuide()->setIgnoredPathPoints((QList<KoPathPoint*>() << d->activePoint));
     }
 
     // apply symmetric point property if applicable
     if (lastActivePoint->activeControlPoint1() && lastActivePoint->activeControlPoint2()) {
         QPointF diff1 = lastActivePoint->point() - lastActivePoint->controlPoint1();
         QPointF diff2 = lastActivePoint->controlPoint2() - lastActivePoint->point();
         if (qFuzzyCompare(diff1.x(), diff2.x()) && qFuzzyCompare(diff1.y(), diff2.y()))
             lastActivePoint->setProperty(KoPathPoint::IsSymmetric);
     }
 
     if (d->finishAfterThisPoint) {
 
         d->firstPoint->setControlPoint1(d->activePoint->controlPoint1());
         delete d->shape->removePoint(d->shape->pathPointIndex(d->activePoint));
         d->activePoint = d->firstPoint;
         d->shape->closeMerge();
 
         // we are closing the path, so reset the existing start path point
         d->existingStartPoint = 0;
         // finish path
         endPath();
     }
 
     if (d->angleSnapStrategy && lastActivePoint->activeControlPoint2()) {
         d->angleSnapStrategy->deactivate();
     }
 }
 
 void KoCreatePathTool::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Escape) {
         emit done();
     } else {
         event->ignore();
     }
 }
 
 void KoCreatePathTool::endPath()
 {
     Q_D(KoCreatePathTool);
 
     d->addPathShape();
 }
 
 void KoCreatePathTool::endPathWithoutLastPoint()
 {
     Q_D(KoCreatePathTool);
 
     if (d->shape) {
         QRectF dirtyRect = d->shape->boundingRect();
         delete d->shape->removePoint(d->shape->pathPointIndex(d->activePoint));
         canvas()->updateCanvas(dirtyRect);
 
         d->addPathShape();
     }
 }
 
 void KoCreatePathTool::cancelPath()
 {
     Q_D(KoCreatePathTool);
 
     if (d->shape) {
         canvas()->updateCanvas(handlePaintRect(d->firstPoint->point()));
         canvas()->updateCanvas(d->shape->boundingRect());
         d->firstPoint = 0;
         d->activePoint = 0;
     }
     d->cleanUp();
 }
 
 void KoCreatePathTool::removeLastPoint()
 {
     Q_D(KoCreatePathTool);
 
     if ((d->shape)) {
         KoPathPointIndex lastPointIndex = d->shape->pathPointIndex(d->activePoint);
 
         if (lastPointIndex.second > 1) {
             lastPointIndex.second--;
             delete d->shape->removePoint(lastPointIndex);
 
             d->hoveredPoint = 0;
 
             d->repaintActivePoint();
             canvas()->updateCanvas(d->shape->boundingRect());
         }
     }
 }
 
 void KoCreatePathTool::activate(ToolActivation, const QSet<KoShape*> &)
 {
     Q_D(KoCreatePathTool);
     useCursor(Qt::ArrowCursor);
 
     // retrieve the actual global handle radius
     d->handleRadius = handleRadius();
 
     // reset snap guide
     canvas()->updateCanvas(canvas()->snapGuide()->boundingRect());
     canvas()->snapGuide()->reset();
 }
 
 void KoCreatePathTool::deactivate()
 {
     cancelPath();
 }
 
 void KoCreatePathTool::documentResourceChanged(int key, const QVariant & res)
 {
     Q_D(KoCreatePathTool);
 
     switch (key) {
     case KoDocumentResourceManager::HandleRadius: {
         d->handleRadius = res.toUInt();
     }
     break;
     default:
         return;
     }
 }
 
 void KoCreatePathTool::addPathShape(KoPathShape *pathShape)
 {
     Q_D(KoCreatePathTool);
 
     KoPathShape *startShape = 0;
     KoPathShape *endShape = 0;
     pathShape->normalize();
 
     // check if existing start/end points are still valid
     d->existingStartPoint.validate(canvas());
     d->existingEndPoint.validate(canvas());
 
     pathShape->setStroke(createStroke());
     if (d->connectPaths(pathShape, d->existingStartPoint, d->existingEndPoint)) {
         if (d->existingStartPoint.isValid()) {
             startShape = d->existingStartPoint.path;
         }
         if (d->existingEndPoint.isValid() && d->existingEndPoint != d->existingStartPoint) {
             endShape = d->existingEndPoint.path;
         }
     }
 
     KUndo2Command *cmd = canvas()->shapeController()->addShape(pathShape);
     if (cmd) {
         KoSelection *selection = canvas()->shapeManager()->selection();
         selection->deselectAll();
         selection->select(pathShape);
         if (startShape) {
             canvas()->shapeController()->removeShape(startShape, cmd);
         }
         if (endShape && startShape != endShape) {
             canvas()->shapeController()->removeShape(endShape, cmd);
         }
         canvas()->addCommand(cmd);
     } else {
         canvas()->updateCanvas(pathShape->boundingRect());
         delete pathShape;
     }
 }
 
 QList<QPointer<QWidget> > KoCreatePathTool::createOptionWidgets()
 {
     Q_D(KoCreatePathTool);
 
     QList<QPointer<QWidget> > list;
 
     QWidget *angleWidget = new QWidget();
     angleWidget->setObjectName("Angle Constraints");
     QGridLayout *layout = new QGridLayout(angleWidget);
     layout->addWidget(new QLabel(i18n("Angle snapping delta:"), angleWidget), 0, 0);
 	QSpinBox *angleEdit = new KisIntParseSpinBox(angleWidget);
     angleEdit->setValue(d->angleSnappingDelta);
     angleEdit->setRange(1, 360);
     angleEdit->setSingleStep(1);
     angleEdit->setSuffix(QChar(Qt::Key_degree));
     layout->addWidget(angleEdit, 0, 1);
     layout->addWidget(new QLabel(i18n("Activate angle snap:"), angleWidget), 1, 0);
     QCheckBox *angleSnap = new QCheckBox(angleWidget);
     angleSnap->setChecked(false);
     angleSnap->setCheckable(true);
     layout->addWidget(angleSnap, 1, 1);
     QWidget *specialSpacer = new QWidget();
     specialSpacer->setObjectName("SpecialSpacer");
     layout->addWidget(specialSpacer, 2, 1);
     angleWidget->setWindowTitle(i18n("Angle Constraints"));
     list.append(angleWidget);
 
     d->strokeWidget = new KoStrokeConfigWidget(0);
     d->strokeWidget->setWindowTitle(i18n("Line"));
     d->strokeWidget->setCanvas(canvas());
     d->strokeWidget->setActive(false);
     list.append(d->strokeWidget);
 
     connect(angleEdit, SIGNAL(valueChanged(int)), this, SLOT(angleDeltaChanged(int)));
     connect(angleSnap, SIGNAL(stateChanged(int)), this, SLOT(angleSnapChanged(int)));
 
     return list;
 }
 
 KoShapeStroke *KoCreatePathTool::createStroke()
 {
     Q_D(KoCreatePathTool);
 
     KoShapeStroke *stroke = 0;
     if (d->strokeWidget) {
         stroke = d->strokeWidget->createShapeStroke();
     }
     return stroke;
 }
 
 //have to include this because of Q_PRIVATE_SLOT
 #include <moc_KoCreatePathTool.cpp>
diff --git a/libs/basicflakes/tools/KoPencilTool.cpp b/libs/basicflakes/tools/KoPencilTool.cpp
index 76fe5b3f98..0bf416dc95 100644
--- a/libs/basicflakes/tools/KoPencilTool.cpp
+++ b/libs/basicflakes/tools/KoPencilTool.cpp
@@ -1,559 +1,559 @@
 /* This file is part of the KDE project
  * Copyright (C) 2007,2009,2011 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "KoPencilTool.h"
 #include "KoCurveFit.h"
 
 #include <KoPathShape.h>
 #include <KoParameterShape.h>
 #include <KoShapeStroke.h>
 #include <KoPointerEvent.h>
 #include <KoCanvasBase.h>
 #include <KoShapeController.h>
 #include <KoShapeManager.h>
 #include <KoSelection.h>
 #include <KoCanvasResourceManager.h>
 #include <KoColor.h>
 #include <KoPathPoint.h>
 #include <KoPathPointData.h>
 #include <KoPathPointMergeCommand.h>
 #include <KoShapePaintingContext.h>
 #include <KoStrokeConfigWidget.h>
 
 #include <klocalizedstring.h>
 
 #include <QDoubleSpinBox>
 #include <QComboBox>
 #include <QStackedWidget>
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QVBoxLayout>
 #include <QPainter>
 #include <QLabel>
 
 #include <math.h>
 
 #include "KoCreatePathTool_p.h"
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 KoPencilTool::KoPencilTool(KoCanvasBase *canvas)
     : KoToolBase(canvas)
     , m_mode(ModeCurve)
     , m_optimizeRaw(false)
     , m_optimizeCurve(false)
     , m_combineAngle(15.0)
     , m_fittingError(5.0)
     , m_close(false)
     , m_shape(0)
     , m_existingStartPoint(0)
     , m_existingEndPoint(0)
     , m_hoveredPoint(0)
 {
 }
 
 KoPencilTool::~KoPencilTool()
 {
 }
 
 void KoPencilTool::paint(QPainter &painter, const KoViewConverter &converter)
 {
     if (m_shape) {
         painter.save();
 
         painter.setTransform(m_shape->absoluteTransformation(&converter) * painter.transform());
 
         painter.save();
         KoShapePaintingContext paintContext; //FIXME
         m_shape->paint(painter, converter, paintContext);
         painter.restore();
 
         if (m_shape->stroke()) {
             painter.save();
             m_shape->stroke()->paint(m_shape, painter, converter);
             painter.restore();
         }
 
         painter.restore();
     }
 
     if (m_hoveredPoint) {
         painter.save();
         painter.setTransform(m_hoveredPoint->parent()->absoluteTransformation(&converter), true);
         KoShape::applyConversion(painter, converter);
 
         painter.setPen(Qt::blue);      //TODO make configurable
         painter.setBrush(Qt::white);   //TODO make configurable
         m_hoveredPoint->paint(painter, handleRadius(), KoPathPoint::Node);
 
         painter.restore();
     }
 }
 
 void KoPencilTool::repaintDecorations()
 {
 }
 
 void KoPencilTool::mousePressEvent(KoPointerEvent *event)
 {
     if (! m_shape) {
         m_shape = new KoPathShape();
         m_shape->setShapeId(KoPathShapeId);
         m_shape->setStroke(createStroke());
         m_points.clear();
 
         QPointF point = event->point;
         m_existingStartPoint = endPointAtPosition(point);
         if (m_existingStartPoint)
             point = m_existingStartPoint->parent()->shapeToDocument(m_existingStartPoint->point());
 
         addPoint(point);
     }
 }
 
 void KoPencilTool::mouseMoveEvent(KoPointerEvent *event)
 {
     if (event->buttons() & Qt::LeftButton)
         addPoint(event->point);
 
     KoPathPoint * endPoint = endPointAtPosition(event->point);
     if (m_hoveredPoint != endPoint) {
         if (m_hoveredPoint) {
             QPointF nodePos = m_hoveredPoint->parent()->shapeToDocument(m_hoveredPoint->point());
             canvas()->updateCanvas(handlePaintRect(nodePos));
         }
         m_hoveredPoint = endPoint;
         if (m_hoveredPoint) {
             QPointF nodePos = m_hoveredPoint->parent()->shapeToDocument(m_hoveredPoint->point());
             canvas()->updateCanvas(handlePaintRect(nodePos));
         }
     }
 }
 
 void KoPencilTool::mouseReleaseEvent(KoPointerEvent *event)
 {
     if (! m_shape)
         return;
 
     QPointF point = event->point;
     m_existingEndPoint = endPointAtPosition(point);
     if (m_existingEndPoint)
         point = m_existingEndPoint->parent()->shapeToDocument(m_existingEndPoint->point());
 
     addPoint(point);
     finish(event->modifiers() & Qt::ShiftModifier);
 
     m_existingStartPoint = 0;
     m_existingEndPoint = 0;
     m_hoveredPoint = 0;
 
     // the original path may be different from the one added
     canvas()->updateCanvas(m_shape->boundingRect());
     delete m_shape;
     m_shape = 0;
     m_points.clear();
 }
 
 void KoPencilTool::keyPressEvent(QKeyEvent *event)
 {
     if (m_shape) {
         event->accept();
     } else {
         event->ignore();
     }
 }
 
 void KoPencilTool::activate(ToolActivation, const QSet<KoShape*> &)
 {
     m_points.clear();
     m_close = false;
     useCursor(Qt::ArrowCursor);
 }
 
 void KoPencilTool::deactivate()
 {
     m_points.clear();
     delete m_shape;
     m_shape = 0;
     m_existingStartPoint = 0;
     m_existingEndPoint = 0;
     m_hoveredPoint = 0;
 }
 
 void KoPencilTool::addPoint(const QPointF & point)
 {
     if (! m_shape)
         return;
 
     // do a moveTo for the first point added
     if (m_points.empty())
         m_shape->moveTo(point);
     // do not allow coincident points
     else if (point != m_points.last())
         m_shape->lineTo(point);
     else
         return;
 
     m_points.append(point);
     canvas()->updateCanvas(m_shape->boundingRect());
 }
 
 qreal KoPencilTool::lineAngle(const QPointF &p1, const QPointF &p2)
 {
     qreal angle = atan2(p2.y() - p1.y(), p2.x() - p1.x());
     if (angle < 0.0)
         angle += 2 * M_PI;
 
     return angle * 180.0 / M_PI;
 }
 
 void KoPencilTool::finish(bool closePath)
 {
     if (m_points.count() < 2)
         return;
 
     KoPathShape * path = 0;
     QList<QPointF> complete;
     QList<QPointF> *points = &m_points;
 
     if (m_mode == ModeStraight || m_optimizeRaw || m_optimizeCurve) {
         float combineAngle;
 
         if (m_mode == ModeStraight)
             combineAngle = m_combineAngle;
         else
             combineAngle = 0.50f;
 
         //Add the first two points
         complete.append(m_points[0]);
         complete.append(m_points[1]);
 
         //Now we need to get the angle of the first line
         float lastAngle = lineAngle(complete[0], complete[1]);
 
         uint pointCount = m_points.count();
         for (uint i = 2; i < pointCount; ++i) {
             float angle = lineAngle(complete.last(), m_points[i]);
             if (qAbs(angle - lastAngle) < combineAngle)
                 complete.removeLast();
             complete.append(m_points[i]);
             lastAngle = angle;
         }
 
         m_points.clear();
         points = &complete;
     }
 
     switch (m_mode) {
     case ModeCurve: {
         path = bezierFit(*points, m_fittingError);
     }
     break;
     case ModeStraight:
     case ModeRaw: {
         path = new KoPathShape();
         uint pointCount = points->count();
         path->moveTo(points->at(0));
         for (uint i = 1; i < pointCount; ++i)
             path->lineTo(points->at(i));
     }
     break;
     }
 
     if (! path)
         return;
 
     path->setShapeId(KoPathShapeId);
     path->setStroke(createStroke());
     addPathShape(path, closePath);
 }
 
 QList<QPointer<QWidget> > KoPencilTool::createOptionWidgets()
 {
     QList<QPointer<QWidget> > widgets;
     QWidget *optionWidget = new QWidget();
     QVBoxLayout * layout = new QVBoxLayout(optionWidget);
 
     QHBoxLayout *modeLayout = new QHBoxLayout;
     modeLayout->setSpacing(3);
     QLabel *modeLabel = new QLabel(i18n("Precision:"), optionWidget);
     QComboBox * modeBox = new QComboBox(optionWidget);
     modeBox->addItem(i18nc("The raw line data", "Raw"));
     modeBox->addItem(i18n("Curve"));
     modeBox->addItem(i18n("Straight"));
     modeLayout->addWidget(modeLabel);
     modeLayout->addWidget(modeBox, 1);
     layout->addLayout(modeLayout);
 
     QStackedWidget * stackedWidget = new QStackedWidget(optionWidget);
 
     QWidget * rawBox = new QWidget(stackedWidget);
     QVBoxLayout * rawLayout = new QVBoxLayout(rawBox);
     QCheckBox * optimizeRaw = new QCheckBox(i18n("Optimize"), rawBox);
     rawLayout->addWidget(optimizeRaw);
     rawLayout->setContentsMargins(0, 0, 0, 0);
 
     QWidget * curveBox = new QWidget(stackedWidget);
     QHBoxLayout * curveLayout = new QHBoxLayout(curveBox);
     QCheckBox * optimizeCurve = new QCheckBox(i18n("Optimize"), curveBox);
 	QDoubleSpinBox * fittingError = new KisDoubleParseSpinBox(curveBox);
     fittingError->setValue(0.50);
     fittingError->setMaximum(400.0);
     fittingError->setMinimum(0.0);
     fittingError->setSingleStep(m_fittingError);
     fittingError->setToolTip(i18n("Exactness:"));
     curveLayout->addWidget(optimizeCurve);
     curveLayout->addWidget(fittingError);
     curveLayout->setContentsMargins(0, 0, 0, 0);
 
     QWidget *straightBox = new QWidget(stackedWidget);
     QVBoxLayout *straightLayout = new QVBoxLayout(straightBox);
 	QDoubleSpinBox *combineAngle = new KisDoubleParseSpinBox(straightBox);
     combineAngle->setValue(0.50);
     combineAngle->setMaximum(360.0);
     combineAngle->setMinimum(0.0);
     combineAngle->setSingleStep(m_combineAngle);
     combineAngle->setSuffix(" deg");
     // QT5TODO
     //combineAngle->setLabel(i18n("Combine angle:"), Qt::AlignLeft | Qt::AlignVCenter);
     straightLayout->addWidget(combineAngle);
     straightLayout->setContentsMargins(0, 0, 0, 0);
 
     stackedWidget->addWidget(rawBox);
     stackedWidget->addWidget(curveBox);
     stackedWidget->addWidget(straightBox);
     layout->addWidget(stackedWidget);
     layout->addStretch(1);
 
     connect(modeBox, SIGNAL(activated(int)), stackedWidget, SLOT(setCurrentIndex(int)));
     connect(modeBox, SIGNAL(activated(int)), this, SLOT(selectMode(int)));
     connect(optimizeRaw, SIGNAL(stateChanged(int)), this, SLOT(setOptimize(int)));
     connect(optimizeCurve, SIGNAL(stateChanged(int)), this, SLOT(setOptimize(int)));
     connect(fittingError, SIGNAL(valueChanged(double)), this, SLOT(setDelta(double)));
     connect(combineAngle, SIGNAL(valueChanged(double)), this, SLOT(setDelta(double)));
 
     modeBox->setCurrentIndex(m_mode);
     stackedWidget->setCurrentIndex(m_mode);
     optionWidget->setObjectName(i18n("Pencil"));
     optionWidget->setWindowTitle(i18n("Pencil"));
     widgets.append(optionWidget);
 
     m_strokeWidget = new KoStrokeConfigWidget(0);
     m_strokeWidget->setWindowTitle(i18n("Line"));
     m_strokeWidget->setCanvas(canvas());
     widgets.append(m_strokeWidget);
     return widgets;
 }
 
 void KoPencilTool::addPathShape(KoPathShape* path, bool closePath)
 {
     KoShape * startShape = 0;
     KoShape * endShape = 0;
 
     if (closePath) {
         path->close();
         path->normalize();
     } else {
         path->normalize();
         if (connectPaths(path, m_existingStartPoint, m_existingEndPoint)) {
             if (m_existingStartPoint)
                 startShape = m_existingStartPoint->parent();
             if (m_existingEndPoint && m_existingEndPoint != m_existingStartPoint)
                 endShape = m_existingEndPoint->parent();
         }
     }
 
     KUndo2Command * cmd = canvas()->shapeController()->addShape(path);
     if (cmd) {
         KoSelection *selection = canvas()->shapeManager()->selection();
         selection->deselectAll();
         selection->select(path);
 
         if (startShape)
             canvas()->shapeController()->removeShape(startShape, cmd);
         if (endShape && startShape != endShape)
             canvas()->shapeController()->removeShape(endShape, cmd);
 
         canvas()->addCommand(cmd);
     } else {
         canvas()->updateCanvas(path->boundingRect());
         delete path;
     }
 }
 
 void KoPencilTool::selectMode(int mode)
 {
     m_mode = static_cast<PencilMode>(mode);
 }
 
 void KoPencilTool::setOptimize(int state)
 {
     if (m_mode == ModeRaw)
         m_optimizeRaw = state == Qt::Checked ? true : false;
     else
         m_optimizeCurve = state == Qt::Checked ? true : false;
 }
 
 void KoPencilTool::setDelta(double delta)
 {
     if (m_mode == ModeCurve)
         m_fittingError = delta;
     else if (m_mode == ModeStraight)
         m_combineAngle = delta;
 }
 
 KoShapeStroke* KoPencilTool::createStroke()
 {
     KoShapeStroke *stroke = 0;
     if (m_strokeWidget) {
         stroke = m_strokeWidget->createShapeStroke();
     }
     return stroke;
 }
 
 KoPathPoint* KoPencilTool::endPointAtPosition(const QPointF &position)
 {
     QRectF roi = handleGrabRect(position);
     QList<KoShape *> shapes = canvas()->shapeManager()->shapesAt(roi);
 
     KoPathPoint * nearestPoint = 0;
     qreal minDistance = HUGE_VAL;
     qreal maxDistance = canvas()->viewConverter()->viewToDocumentX(grabSensitivity());
 
     Q_FOREACH(KoShape * shape, shapes) {
         KoPathShape * path = dynamic_cast<KoPathShape*>(shape);
         if (!path)
             continue;
         KoParameterShape *paramShape = dynamic_cast<KoParameterShape*>(shape);
         if (paramShape && paramShape->isParametricShape())
             continue;
 
         KoPathPoint * p = 0;
         uint subpathCount = path->subpathCount();
         for (uint i = 0; i < subpathCount; ++i) {
             if (path->isClosedSubpath(i))
                 continue;
             p = path->pointByIndex(KoPathPointIndex(i, 0));
             // check start of subpath
             qreal d = squareDistance(position, path->shapeToDocument(p->point()));
             if (d < minDistance && d < maxDistance) {
                 nearestPoint = p;
                 minDistance = d;
             }
             // check end of subpath
             p = path->pointByIndex(KoPathPointIndex(i, path->subpathPointCount(i) - 1));
             d = squareDistance(position, path->shapeToDocument(p->point()));
             if (d < minDistance && d < maxDistance) {
                 nearestPoint = p;
                 minDistance = d;
             }
         }
     }
 
     return nearestPoint;
 }
 
 bool KoPencilTool::connectPaths(KoPathShape *pathShape, KoPathPoint *pointAtStart, KoPathPoint *pointAtEnd)
 {
     // at least one point must be valid
     if (!pointAtStart && !pointAtEnd)
         return false;
     // do not allow connecting to the same point twice
     if (pointAtStart == pointAtEnd)
         pointAtEnd = 0;
 
     // we have hit an existing path point on start/finish
     // what we now do is:
     // 1. combine the new created path with the ones we hit on start/finish
     // 2. merge the endpoints of the corresponding subpaths
 
     uint newPointCount = pathShape->subpathPointCount(0);
     KoPathPointIndex newStartPointIndex(0, 0);
     KoPathPointIndex newEndPointIndex(0, newPointCount - 1);
     KoPathPoint * newStartPoint = pathShape->pointByIndex(newStartPointIndex);
     KoPathPoint * newEndPoint = pathShape->pointByIndex(newEndPointIndex);
 
     KoPathShape * startShape = pointAtStart ? pointAtStart->parent() : 0;
     KoPathShape * endShape = pointAtEnd ? pointAtEnd->parent() : 0;
 
     // combine with the path we hit on start
     KoPathPointIndex startIndex(-1, -1);
     if (pointAtStart) {
         startIndex = startShape->pathPointIndex(pointAtStart);
         pathShape->combine(startShape);
         pathShape->moveSubpath(0, pathShape->subpathCount() - 1);
     }
     // combine with the path we hit on finish
     KoPathPointIndex endIndex(-1, -1);
     if (pointAtEnd) {
         endIndex = endShape->pathPointIndex(pointAtEnd);
         if (endShape != startShape) {
             endIndex.first += pathShape->subpathCount();
             pathShape->combine(endShape);
         }
     }
     // do we connect twice to a single subpath ?
     bool connectToSingleSubpath = (startShape == endShape && startIndex.first == endIndex.first);
 
     if (startIndex.second == 0 && !connectToSingleSubpath) {
         pathShape->reverseSubpath(startIndex.first);
         startIndex.second = pathShape->subpathPointCount(startIndex.first) - 1;
     }
     if (endIndex.second > 0 && !connectToSingleSubpath) {
         pathShape->reverseSubpath(endIndex.first);
         endIndex.second = 0;
     }
 
     // after combining we have a path where with the subpaths in the following
     // order:
     // 1. the subpaths of the pathshape we started the new path at
     // 2. the subpath we just created
     // 3. the subpaths of the pathshape we finished the new path at
 
     // get the path points we want to merge, as these are not going to
     // change while merging
     KoPathPoint * existingStartPoint = pathShape->pointByIndex(startIndex);
     KoPathPoint * existingEndPoint = pathShape->pointByIndex(endIndex);
 
     // merge first two points
     if (existingStartPoint) {
         KoPathPointData pd1(pathShape, pathShape->pathPointIndex(existingStartPoint));
         KoPathPointData pd2(pathShape, pathShape->pathPointIndex(newStartPoint));
         KoPathPointMergeCommand cmd1(pd1, pd2);
         cmd1.redo();
     }
     // merge last two points
     if (existingEndPoint) {
         KoPathPointData pd3(pathShape, pathShape->pathPointIndex(newEndPoint));
         KoPathPointData pd4(pathShape, pathShape->pathPointIndex(existingEndPoint));
         KoPathPointMergeCommand cmd2(pd3, pd4);
         cmd2.redo();
     }
 
     return true;
 }
 
 qreal KoPencilTool::getFittingError()
 {
     return this->m_fittingError;
 }
 
 void KoPencilTool::setFittingError(qreal fittingError)
 {
     this->m_fittingError = fittingError;
 }
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index 0aa24d79fd..56b40262d8 100644
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -1,549 +1,537 @@
 # Disable -Wswitch because of the extra definitions we here:
 # kis_input_manager.cpp: In member function ‘virtual bool KisInputManager::eventFilter(QObject*, QEvent*)’:
 # warning: case value ‘1001’ not in enumerated type ‘QEvent::Type’ [-Wswitch]
 # warning: case value ‘1002’ not in enumerated type ‘QEvent::Type’ [-Wswitch]
 if (CMAKE_COMPILER_IS_GNUCXX)
     add_definitions(${KDE4_ENABLE_EXCEPTIONS} -Wno-switch)
 endif ()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
 )
 
 include_directories(SYSTEM
     ${EXIV2_INCLUDE_DIR}
     ${EIGEN3_INCLUDE_DIR}
     ${OCIO_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
 )
 
 add_subdirectory( tests )
 
 if (APPLE)
     find_library(FOUNDATION_LIBRARY Foundation)
 endif ()
 
 set(kritaui_LIB_SRCS
     canvas/kis_canvas_widget_base.cpp
     canvas/kis_canvas2.cpp
     canvas/kis_canvas_updates_compressor.cpp
     canvas/kis_canvas_controller.cpp
     canvas/kis_paintop_transformation_connector.cpp
     canvas/kis_display_color_converter.cpp
     canvas/kis_display_filter.cpp
     canvas/kis_exposure_gamma_correction_interface.cpp
     canvas/kis_tool_proxy.cpp
     canvas/kis_canvas_decoration.cc
     canvas/kis_coordinates_converter.cpp
     canvas/kis_grid_manager.cpp
     canvas/kis_grid_decoration.cpp
     canvas/kis_grid_config.cpp
     canvas/kis_prescaled_projection.cpp
     canvas/kis_qpainter_canvas.cpp
     canvas/kis_projection_backend.cpp
     canvas/kis_update_info.cpp
     canvas/kis_image_patch.cpp
     canvas/kis_image_pyramid.cpp
     canvas/kis_infinity_manager.cpp
     canvas/kis_change_guides_command.cpp
     canvas/kis_guides_decoration.cpp
     canvas/kis_guides_manager.cpp
     canvas/kis_guides_config.cpp
     canvas/kis_snap_config.cpp
     canvas/kis_snap_line_strategy.cpp
     dialogs/kis_about_application.cpp
     dialogs/kis_dlg_adj_layer_props.cc
     dialogs/kis_dlg_adjustment_layer.cc
     dialogs/kis_dlg_filter.cpp
     dialogs/kis_dlg_generator_layer.cpp
     dialogs/kis_dlg_file_layer.cpp
     dialogs/kis_dlg_image_properties.cc
     dialogs/kis_dlg_layer_properties.cc
     dialogs/kis_dlg_preferences.cc
     dialogs/slider_and_spin_box_sync.cpp
     dialogs/kis_dlg_blacklist_cleanup.cpp
     dialogs/kis_dlg_layer_style.cpp
     dialogs/kis_dlg_png_import.cpp
     dialogs/kis_dlg_import_image_sequence.cpp
     dialogs/kis_delayed_save_dialog.cpp
     flake/kis_node_dummies_graph.cpp
     flake/kis_dummies_facade_base.cpp
     flake/kis_dummies_facade.cpp
     flake/kis_node_shapes_graph.cpp
     flake/kis_node_shape.cpp
     flake/kis_shape_controller.cpp
     flake/kis_shape_layer.cc
     flake/kis_shape_layer_canvas.cpp
     flake/kis_shape_selection.cpp
     flake/kis_shape_selection_canvas.cpp
     flake/kis_shape_selection_model.cpp
     flake/kis_take_all_shapes_command.cpp
     kis_aspect_ratio_locker.cpp
     kis_autogradient.cc
     kis_bookmarked_configurations_editor.cc
     kis_bookmarked_configurations_model.cc
     kis_bookmarked_filter_configurations_model.cc
     kis_canvas_resource_provider.cpp
     kis_derived_resources.cpp
     kis_categories_mapper.cpp
     kis_categorized_list_model.cpp
     kis_categorized_item_delegate.cpp
     kis_clipboard.cc
     kis_config.cc
     kis_config_notifier.cpp
     kis_control_frame.cpp
     kis_composite_ops_model.cc
     kis_paint_ops_model.cpp
     kis_cursor.cc
     kis_cursor_cache.cpp
     kis_custom_pattern.cc
     kis_file_layer.cpp
     kis_safe_document_loader.cpp
     kis_splash_screen.cpp
     kis_filter_manager.cc
     kis_filters_model.cc
     kis_histogram_view.cc
     kis_image_manager.cc
     kis_image_view_converter.cpp
     kis_import_catcher.cc
     kis_layer_manager.cc
     kis_mask_manager.cc
     kis_mimedata.cpp
     kis_node_commands_adapter.cpp
     kis_node_manager.cpp
     kis_node_juggler_compressed.cpp
     kis_node_selection_adapter.cpp
     kis_node_insertion_adapter.cpp
     kis_node_model.cpp
     kis_node_filter_proxy_model.cpp
     kis_model_index_converter_base.cpp
     kis_model_index_converter.cpp
     kis_model_index_converter_show_all.cpp
     kis_painting_assistant.cc
     kis_painting_assistants_decoration.cpp
     kis_painting_assistants_manager.cpp
     kis_paintop_box.cc
     kis_paintop_option.cpp
     kis_paintop_options_model.cpp
     kis_paintop_settings_widget.cpp
     kis_popup_palette.cpp
     kis_png_converter.cpp
     kis_preference_set_registry.cpp
     kis_resource_server_provider.cpp
     kis_selection_decoration.cc
     kis_selection_manager.cc
     kis_statusbar.cc
     kis_zoom_manager.cc
     kis_favorite_resource_manager.cpp
     kis_workspace_resource.cpp
     kis_action.cpp
     kis_action_manager.cpp
     kis_view_plugin.cpp
     kis_canvas_controls_manager.cpp
     kis_tooltip_manager.cpp
     kis_multinode_property.cpp
     kis_async_action_feedback.cpp
     kisexiv2/kis_exif_io.cpp
     kisexiv2/kis_exiv2.cpp
     kisexiv2/kis_iptc_io.cpp
     kisexiv2/kis_xmp_io.cpp
     kra/kis_kra_utils.cpp
     kra/kis_kra_load_visitor.cpp
     kra/kis_kra_loader.cpp
     kra/kis_kra_save_visitor.cpp
     kra/kis_kra_saver.cpp
     kra/kis_kra_savexml_visitor.cpp
     opengl/kis_opengl.cpp
     opengl/kis_opengl_canvas2.cpp
     opengl/kis_opengl_canvas_debugger.cpp
     opengl/kis_opengl_image_textures.cpp
     opengl/kis_texture_tile.cpp
     opengl/kis_texture_tile_update_info.cpp
     kis_fps_decoration.cpp
     ora/kis_open_raster_stack_load_visitor.cpp
     ora/kis_open_raster_stack_save_visitor.cpp
     ora/ora_load_context.cc
     ora/ora_save_context.cc
     recorder/kis_node_query_path_editor.cc
     recorder/kis_recorded_action_creator.cc
     recorder/kis_recorded_action_creator_factory.cc
     recorder/kis_recorded_action_creator_factory_registry.cc
     recorder/kis_recorded_action_editor_factory.cc
     recorder/kis_recorded_action_editor_factory_registry.cc
     recorder/kis_recorded_filter_action_editor.cc
     recorder/kis_recorded_filter_action_creator.cpp
     recorder/kis_recorded_paint_action_editor.cc
     tool/kis_selection_tool_helper.cpp
     tool/kis_selection_tool_config_widget_helper.cpp
     tool/kis_rectangle_constraint_widget.cpp
     tool/kis_shape_tool_helper.cpp
     tool/kis_tool.cc
     tool/kis_delegated_tool_policies.cpp
     tool/kis_tool_freehand.cc
     tool/kis_speed_smoother.cpp
     tool/kis_painting_information_builder.cpp
     tool/kis_stabilized_events_sampler.cpp
     tool/kis_tool_freehand_helper.cpp
     tool/kis_tool_multihand_helper.cpp
     tool/kis_figure_painting_tool_helper.cpp
     tool/kis_recording_adapter.cpp
     tool/kis_tool_paint.cc
     tool/kis_tool_shape.cc
     tool/kis_tool_ellipse_base.cpp
     tool/kis_tool_rectangle_base.cpp
     tool/kis_tool_polyline_base.cpp
     tool/kis_tool_utils.cpp
     tool/kis_resources_snapshot.cpp
     tool/kis_smoothing_options.cpp
     tool/strokes/freehand_stroke.cpp
     tool/strokes/kis_painter_based_stroke_strategy.cpp
     tool/strokes/kis_filter_stroke_strategy.cpp
     tool/strokes/kis_color_picker_stroke_strategy.cpp
     widgets/kis_cmb_composite.cc
     widgets/kis_cmb_contour.cpp
     widgets/kis_cmb_gradient.cpp
     widgets/kis_paintop_list_widget.cpp
     widgets/kis_cmb_idlist.cc
     widgets/kis_color_space_selector.cc
     widgets/kis_advanced_color_space_selector.cc
     widgets/kis_cie_tongue_widget.cpp
     widgets/kis_tone_curve_widget.cpp
     widgets/kis_curve_widget.cpp
     widgets/kis_custom_image_widget.cc
     widgets/kis_image_from_clipboard_widget.cpp
     widgets/kis_double_widget.cc
     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
     widgets/kis_multi_bool_filter_widget.cc
     widgets/kis_multi_double_filter_widget.cc
     widgets/kis_multi_integer_filter_widget.cc
     widgets/kis_multipliers_double_slider_spinbox.cpp
     widgets/kis_paintop_presets_popup.cpp
     widgets/kis_tool_options_popup.cpp
     widgets/kis_paintop_presets_chooser_popup.cpp
     widgets/kis_pattern_chooser.cc
     widgets/kis_popup_button.cc
     widgets/kis_preset_chooser.cpp
     widgets/kis_progress_widget.cpp
     widgets/kis_selection_options.cc
     widgets/kis_scratch_pad.cpp
     widgets/kis_scratch_pad_event_filter.cpp
     widgets/kis_preset_selector_strip.cpp
     widgets/kis_slider_spin_box.cpp
     widgets/kis_size_group.cpp
     widgets/kis_size_group_p.cpp
     widgets/kis_wdg_generator.cpp
     widgets/kis_workspace_chooser.cpp
     widgets/squeezedcombobox.cpp
     widgets/kis_categorized_list_view.cpp
     widgets/kis_widget_chooser.cpp
     widgets/kis_tool_button.cpp
     widgets/kis_floating_message.cpp
     widgets/kis_lod_availability_widget.cpp
     widgets/kis_color_label_selector_widget.cpp
-    widgets/kis_color_filter_combo.cpp
-    widgets/kis_doubleparsespinbox.cpp
-	widgets/kis_doubleparseunitspinbox.cpp
-    widgets/kis_intparsespinbox.cpp
-	widgets/KoPageLayoutWidget.cpp
-	widgets/KoPageLayoutDialog.cpp
-	widgets/KoShadowConfigWidget.cpp
-	widgets/KoStrokeConfigWidget.cpp
-	widgets/KoMarkerSelector.cpp
-	widgets/KoMarkerModel.cpp
-	widgets/KoMarkerItemDelegate.cpp
+	widgets/kis_color_filter_combo.cpp
     input/kis_input_manager.cpp
     input/kis_input_manager_p.cpp
     input/kis_extended_modifiers_mapper.cpp
     input/kis_abstract_input_action.cpp
     input/kis_tool_invocation_action.cpp
     input/kis_pan_action.cpp
     input/kis_alternate_invocation_action.cpp
     input/kis_rotate_canvas_action.cpp
     input/kis_zoom_action.cpp
     input/kis_change_frame_action.cpp
     input/kis_gamma_exposure_action.cpp
     input/kis_show_palette_action.cpp
     input/kis_change_primary_setting_action.cpp
     input/kis_abstract_shortcut.cpp
     input/kis_single_action_shortcut.cpp
     input/kis_stroke_shortcut.cpp
     input/kis_shortcut_matcher.cpp
     input/kis_select_layer_action.cpp
 
     operations/kis_operation.cpp
     operations/kis_operation_configuration.cpp
     operations/kis_operation_registry.cpp
     operations/kis_operation_ui_factory.cpp
     operations/kis_operation_ui_widget.cpp
     operations/kis_filter_selection_operation.cpp
     actions/kis_selection_action_factories.cpp
     input/kis_touch_shortcut.cpp
     kis_document_undo_store.cpp
     kis_transaction_based_command.cpp
     kis_gui_context_command.cpp
     kis_gui_context_command_p.cpp
     input/kis_tablet_debugger.cpp
     input/kis_input_profile_manager.cpp
     input/kis_input_profile.cpp
     input/kis_shortcut_configuration.cpp
     input/config/kis_input_configuration_page.cpp
     input/config/kis_edit_profiles_dialog.cpp
     input/config/kis_input_profile_model.cpp
     input/config/kis_input_configuration_page_item.cpp
     input/config/kis_action_shortcuts_model.cpp
     input/config/kis_input_type_delegate.cpp
     input/config/kis_input_mode_delegate.cpp
     input/config/kis_input_button.cpp
     input/config/kis_input_editor_delegate.cpp
     input/config/kis_mouse_input_editor.cpp
     input/config/kis_wheel_input_editor.cpp
     input/config/kis_key_input_editor.cpp
     processing/fill_processing_visitor.cpp
     kis_asl_layer_style_serializer.cpp
     kis_psd_layer_style_resource.cpp
     canvas/kis_mirror_axis.cpp
 
     kis_abstract_perspective_grid.cpp
 
     KisApplication.cpp
     KisAutoSaveRecoveryDialog.cpp
     KisDetailsPane.cpp
     KisDocument.cpp
     KisNodeDelegate.cpp
     kis_node_view_visibility_delegate.cpp
     KisNodeToolTip.cpp
     KisNodeView.cpp
     kis_node_view_color_scheme.cpp
     KisFilterChain.cpp
     KisFilterChainLink.cpp
     KisFilterChainLinkList.cpp
     KisImportExportFilter.cpp
     KisFilterEdge.cpp
     KisFilterEntry.cpp
     KisFilterGraph.cpp
     KisImportExportManager.cpp
     KisFilterVertex.cpp
     KisMainWindow.cpp
     KisOpenPane.cpp
     KisPart.cpp
     KisPrintJob.cpp
     KisTemplate.cpp
     KisTemplateCreateDia.cpp
     KisTemplateGroup.cpp
     KisTemplates.cpp
     KisTemplatesPane.cpp
     KisTemplateTree.cpp
     KisUndoStackAction.cpp
     KisView.cpp
 
     thememanager.cpp
 
     kis_mainwindow_observer.cpp
     KisViewManager.cpp
     kis_mirror_manager.cpp
 
     qtlockedfile/qtlockedfile.cpp
 
     qtsingleapplication/qtlocalpeer.cpp
     qtsingleapplication/qtsingleapplication.cpp
 
     KisResourceBundle.cpp
     KisResourceBundleManifest.cpp
 
     kis_md5_generator.cpp
     KisApplicationArguments.cpp
 
     KisNetworkAccessManager.cpp
     KisMultiFeedRSSModel.cpp
     KisRemoteFileFetcher.cpp
 
     KisPaletteModel.cpp
     KisColorsetChooser.cpp
-    KisSaveGroupVisitor.cpp
-
-    utils/kis_numparser.cpp
+	KisSaveGroupVisitor.cpp
 )
 
 if(WIN32)
     if (NOT Qt5Gui_PRIVATE_INCLUDE_DIRS)
         message(FATAL_ERROR "Qt5Gui Private header are missing!")
     endif()
     set(kritaui_LIB_SRCS
         ${kritaui_LIB_SRCS}
         input/kis_tablet_event.cpp
         input/wintab/kis_tablet_support_win.cpp
         input/wintab/kis_screen_size_choice_dialog.cpp
         qtlockedfile/qtlockedfile_win.cpp
         )
       include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()
     set(kritaui_LIB_SRCS
         ${kritaui_LIB_SRCS}
         kis_animation_frame_cache.cpp
         kis_animation_cache_populator.cpp
         canvas/kis_animation_player.cpp
         kis_animation_exporter.cpp
         kis_animation_importer.cpp
     )
 
 if(UNIX)
     set(kritaui_LIB_SRCS
         ${kritaui_LIB_SRCS}
         input/kis_tablet_event.cpp
         input/wintab/kis_tablet_support.cpp
         qtlockedfile/qtlockedfile_unix.cpp
         )
     if(NOT APPLE)
         set(kritaui_LIB_SRCS
             ${kritaui_LIB_SRCS}
             input/wintab/kis_tablet_support_x11.cpp
             input/wintab/qxcbconnection_xi2.cpp
             input/wintab/qxcbconnection.cpp
             input/wintab/kis_xi2_event_filter.cpp
             )
     endif()
 endif()
 
 if(WIN32)
     #ki18n_wrap_ui(
     #    input/wintab/kis_screen_size_choice_dialog.ui
     #)
 endif()
 
 
 
 ki18n_wrap_ui(kritaui_LIB_SRCS
     forms/wdgdlgpngimport.ui
     forms/wdgfullscreensettings.ui
     forms/wdgautogradient.ui
     forms/wdggeneralsettings.ui
     forms/wdgperformancesettings.ui
     forms/wdggenerators.ui
     forms/wdgcustompalette.ui
     forms/wdgbookmarkedconfigurationseditor.ui
     forms/wdgapplyprofile.ui
     forms/wdgcustompattern.ui
     forms/wdglayerproperties.ui
     forms/wdgcolorsettings.ui
     forms/wdgtabletsettings.ui
     forms/wdgcolorspaceselector.ui
     forms/wdgcolorspaceselectoradvanced.ui
     forms/wdgdisplaysettings.ui
     forms/kis_previewwidgetbase.ui
     forms/kis_matrix_widget.ui
     forms/wdgselectionoptions.ui
     forms/wdggeometryoptions.ui
     forms/wdgnewimage.ui
     forms/wdgimageproperties.ui
     forms/wdgmaskfromselection.ui
     forms/wdgmasksource.ui
     forms/wdgfilterdialog.ui
     forms/wdgmetadatamergestrategychooser.ui
     forms/wdgpaintoppresets.ui
     forms/wdgpaintopsettings.ui
     forms/wdgdlggeneratorlayer.ui
     forms/wdgdlgfilelayer.ui
     forms/wdgfilterselector.ui
     forms/wdgfilternodecreation.ui
     forms/wdgpaintactioneditor.ui
     forms/wdgmultipliersdoublesliderspinbox.ui
     forms/wdgnodequerypatheditor.ui
     forms/wdgpresetselectorstrip.ui
     forms/wdgdlgblacklistcleanup.ui
     forms/wdgrectangleconstraints.ui
     forms/wdgimportimagesequence.ui
     forms/KisDetailsPaneBase.ui
     forms/KisOpenPaneBase.ui
 	forms/KoPageLayoutWidget.ui
 	forms/KoShadowConfigWidget.ui
     dialogs/kis_delayed_save_dialog.ui
     input/config/kis_input_configuration_page.ui
     input/config/kis_edit_profiles_dialog.ui
     input/config/kis_input_configuration_page_item.ui
     input/config/kis_mouse_input_editor.ui
     input/config/kis_wheel_input_editor.ui
     input/config/kis_key_input_editor.ui
 
     layerstyles/wdgBevelAndEmboss.ui
     layerstyles/wdgblendingoptions.ui
     layerstyles/WdgColorOverlay.ui
     layerstyles/wdgContour.ui
     layerstyles/wdgdropshadow.ui
     layerstyles/WdgGradientOverlay.ui
     layerstyles/wdgInnerGlow.ui
     layerstyles/wdglayerstyles.ui
     layerstyles/WdgPatternOverlay.ui
     layerstyles/WdgSatin.ui
     layerstyles/WdgStroke.ui
     layerstyles/wdgstylesselector.ui
     layerstyles/wdgTexture.ui
 
     wdgsplash.ui
     input/wintab/kis_screen_size_choice_dialog.ui
 
 )
 
 
 QT5_WRAP_CPP(kritaui_HEADERS_MOC KisNodePropertyAction_p.h)
 
 add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
 generate_export_header(kritaui BASE_NAME kritaui)
 
 target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
                       kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
 )
 
 if (HAVE_KIO)
     target_link_libraries(kritaui KF5::KIOCore)
 endif() 
 
 if (NOT WIN32 AND NOT APPLE)
   target_link_libraries(kritaui ${X11_X11_LIB}
                                 ${X11_Xinput_LIB}
                                 ${XCB_LIBRARIES})
 endif()
 
 if(APPLE)
     target_link_libraries(kritaui ${FOUNDATION_LIBRARY})
 endif ()
 
 
 target_link_libraries(kritaui ${OPENEXR_LIBRARIES})
 
 # Add VSync disable workaround
 if(NOT WIN32 AND NOT APPLE)
     target_link_libraries(kritaui ${CMAKE_DL_LIBS} Qt5::X11Extras)
 endif()
 
 if(X11_FOUND)
     target_link_libraries(kritaui Qt5::X11Extras ${X11_LIBRARIES})
 endif()
 
 target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage kritalibbrush kritapigment KF5::Completion KF5::I18n ${GL_INTERFACE_LIBRARIES})
 
 target_include_directories(kritaui
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/canvas>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/flake>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ora>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tool>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/input/wintab>
 )
 
 set_target_properties(kritaui
     PROPERTIES VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 install(TARGETS kritaui  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 if (APPLE)
     install(FILES osx.stylesheet DESTINATION ${DATA_INSTALL_DIR}/krita)
 endif ()
diff --git a/libs/ui/KisColorsetChooser.cpp b/libs/ui/KisColorsetChooser.cpp
index 1d77f06c00..cb501dedda 100644
--- a/libs/ui/KisColorsetChooser.cpp
+++ b/libs/ui/KisColorsetChooser.cpp
@@ -1,159 +1,159 @@
 /* This file is part of the KDE project
  * Copyright (C) 2013 Sven Langkamp <sven.langkamp@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "KisColorsetChooser.h"
 
 #include <QVBoxLayout>
 #include <QAbstractItemDelegate>
 #include <QPainter>
 #include <QPushButton>
 #include <QSpinBox>
 
 #include <klocalizedstring.h>
 
 #include <KoResourceItemChooser.h>
 #include <KoResourceServerAdapter.h>
 #include <KoResourceServerProvider.h>
 #include <resources/KoResource.h>
 #include <resources/KoColorSet.h>
 
 #include <resources/KoPattern.h>
 #include "kis_resource_server_provider.h"
 #include "KisViewManager.h"
 #include <QGridLayout>
 #include <QLabel>
 #include <QSpinBox>
 #include <QLineEdit>
 #include <kis_canvas_resource_provider.h>
 
-#include "kis_intparsespinbox.h"
+#include "kis_int_parse_spin_box.h"
 
 class ColorSetDelegate : public QAbstractItemDelegate
 {
 public:
     ColorSetDelegate(QObject * parent = 0) : QAbstractItemDelegate(parent) {}
     virtual ~ColorSetDelegate() {}
     /// reimplemented
     virtual void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const;
     /// reimplemented
     QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex &) const {
         return option.decorationSize;
     }
 };
 
 void ColorSetDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
     painter->save();
     if (! index.isValid())
         return;
 
     KoResource* resource = static_cast<KoResource*>(index.internalPointer());
     KoColorSet* colorSet = static_cast<KoColorSet*>(resource);
 
     if (option.state & QStyle::State_Selected) {
         painter->fillRect(option.rect, option.palette.highlight());
         painter->setPen(option.palette.highlightedText().color());
     }
     else {
         painter->setBrush(option.palette.text().color());
     }
     painter->drawText(option.rect.x() + 5, option.rect.y() + painter->fontMetrics().ascent() + 5, colorSet->name());
 
     int size = 7;
     for (int i = 0; i < colorSet->nColors() && i*size < option.rect.width(); i++) {
         QRect rect(option.rect.x() + i*size, option.rect.y() + option.rect.height() - size, size, size);
         painter->fillRect(rect, colorSet->getColor(i).color.toQColor());
     }
     
     painter->restore();
 }
 
 KisColorsetChooser::KisColorsetChooser(QWidget* parent): QWidget(parent)
 {
     KoResourceServer<KoColorSet> * rserver = KoResourceServerProvider::instance()->paletteServer(false);
     QSharedPointer<KoAbstractResourceServerAdapter> adapter(new KoResourceServerAdapter<KoColorSet>(rserver));
     m_itemChooser = new KoResourceItemChooser(adapter, this);
     m_itemChooser->setItemDelegate(new ColorSetDelegate(this));
     m_itemChooser->setFixedSize(250, 250);
     m_itemChooser->setRowHeight(30);
     m_itemChooser->setColumnCount(1);
     connect(m_itemChooser, SIGNAL(resourceSelected(KoResource*)),
             this, SLOT(resourceSelected(KoResource*)));
     
     QPushButton* saveButton = new QPushButton(i18n("Save"));
     connect(saveButton, SIGNAL(clicked(bool)), this, SLOT(slotSave()));
 
     m_nameEdit = new QLineEdit(this);
     m_nameEdit->setPlaceholderText(i18n("Insert name"));
     m_nameEdit->setClearButtonEnabled(true);
 
 	m_columnEdit = new KisIntParseSpinBox(this);
     m_columnEdit->setRange(1, 30);
     m_columnEdit->setValue(10);
 
     QGridLayout* layout = new QGridLayout(this);
     layout->addWidget(m_itemChooser, 0, 0, 1, 3);
     layout->addWidget(new QLabel(i18n("Name:"), this), 1, 0, 1, 1);
     layout->addWidget(m_nameEdit, 1, 1, 1, 2);
     layout->addWidget(new QLabel(i18n("Columns:"), this), 2, 0, 1, 1);
     layout->addWidget(m_columnEdit, 2, 1, 1, 1);
     layout->addWidget(saveButton, 2, 2, 1, 1);
     layout->setColumnStretch(1, 1);
 }
 
 KisColorsetChooser::~KisColorsetChooser()
 {
 }
 
 void KisColorsetChooser::resourceSelected(KoResource* resource)
 {
     emit paletteSelected(static_cast<KoColorSet*>(resource));
 }
 
 void KisColorsetChooser::slotSave()
 {
     KoResourceServer<KoColorSet> * rserver = KoResourceServerProvider::instance()->paletteServer();
 
     KoColorSet* colorset = new KoColorSet();
     colorset->setValid(true);
 
     QString saveLocation = rserver->saveLocation();
     QString name = m_nameEdit->text();
     int columns = m_columnEdit->value();
 
     bool newName = false;
     if(name.isEmpty()) {
         newName = true;
         name = i18n("Palette");
     }
     QFileInfo fileInfo(saveLocation + name + colorset->defaultFileExtension());
 
     int i = 1;
     while (fileInfo.exists()) {
         fileInfo.setFile(saveLocation + name + QString("%1").arg(i) + colorset->defaultFileExtension());
         i++;
     }
     colorset->setFilename(fileInfo.filePath());
     if(newName) {
         name = i18n("Palette %1", i);
     }
     colorset->setName(name);
     colorset->setColumnCount(columns);
     rserver->addResource(colorset);
 }
diff --git a/libs/ui/forms/KoPageLayoutWidget.ui b/libs/ui/forms/KoPageLayoutWidget.ui
index 00aeb1ba97..a20ef5debc 100644
--- a/libs/ui/forms/KoPageLayoutWidget.ui
+++ b/libs/ui/forms/KoPageLayoutWidget.ui
@@ -1,365 +1,365 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KoPageLayoutWidget</class>
  <widget class="QWidget" name="KoPageLayoutWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>341</width>
     <height>417</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,1">
      <property name="leftMargin">
       <number>0</number>
      </property>
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
      </property>
      <property name="bottomMargin">
       <number>0</number>
      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="unitsLabel">
        <property name="text">
         <string>&amp;Unit:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
         <cstring>units</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1" colspan="2">
       <widget class="QComboBox" name="units">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="stylesLabel">
        <property name="text">
         <string>&amp;Follow style:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
         <cstring>pageStyle</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1" colspan="2">
       <widget class="QComboBox" name="pageStyle"/>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>S&amp;ize:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
         <cstring>sizes</cstring>
        </property>
       </widget>
      </item>
      <item row="2" column="1" colspan="2">
       <widget class="QComboBox" name="sizes"/>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Width:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
         <cstring>width</cstring>
        </property>
       </widget>
      </item>
      <item row="3" column="1" colspan="2">
       <layout class="QHBoxLayout">
        <property name="leftMargin">
         <number>0</number>
        </property>
        <property name="topMargin">
         <number>0</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
         <widget class="KisDoubleParseUnitSpinBox" name="width"/>
        </item>
        <item>
         <widget class="QLabel" name="label">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="text">
           <string>&amp;Height:</string>
          </property>
          <property name="buddy">
           <cstring>height</cstring>
          </property>
         </widget>
        </item>
        <item>
         <widget class="KisDoubleParseUnitSpinBox" name="height"/>
        </item>
       </layout>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Orientation:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="QRadioButton" name="portrait">
        <property name="text">
         <string>Po&amp;rtrait</string>
        </property>
       </widget>
      </item>
      <item row="4" column="2">
       <widget class="QRadioButton" name="landscape">
        <property name="text">
         <string>Landscape</string>
        </property>
       </widget>
      </item>
      <item row="5" column="0">
       <widget class="QLabel" name="facingPageLabel">
        <property name="text">
         <string>Facing pages:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="5" column="1">
       <widget class="QRadioButton" name="singleSided">
        <property name="text">
         <string>Single sided</string>
        </property>
       </widget>
      </item>
      <item row="5" column="2">
       <widget class="QRadioButton" name="facingPages">
        <property name="text">
         <string>Facing pages</string>
        </property>
       </widget>
      </item>
      <item row="6" column="0">
       <widget class="QLabel" name="directionLabel">
        <property name="text">
         <string>&amp;Text direction:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
         <cstring>textDirection</cstring>
        </property>
       </widget>
      </item>
      <item row="6" column="1" colspan="2">
       <widget class="QComboBox" name="textDirection">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <item>
         <property name="text">
          <string>Automatic</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Left to right</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Right to left</string>
         </property>
        </item>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="margins">
      <property name="title">
       <string>Margins</string>
      </property>
      <layout class="QFormLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Top:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>topMargin</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KisDoubleParseUnitSpinBox" name="topMargin">
         <property name="maximum">
          <double>999.990000000000009</double>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="leftLabel">
         <property name="text">
          <string>&amp;Binding edge:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>bindingEdgeMargin</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KisDoubleParseUnitSpinBox" name="bindingEdgeMargin">
         <property name="maximum">
          <double>999.990000000000009</double>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="rightLabel">
         <property name="text">
          <string>Pa&amp;ge edge:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>pageEdgeMargin</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KisDoubleParseUnitSpinBox" name="pageEdgeMargin">
         <property name="maximum">
          <double>999.990000000000009</double>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_12">
         <property name="text">
          <string>Botto&amp;m:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>bottomMargin</cstring>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="KisDoubleParseUnitSpinBox" name="bottomMargin">
         <property name="maximum">
          <double>999.990000000000009</double>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>units</tabstop>
   <tabstop>sizes</tabstop>
   <tabstop>width</tabstop>
   <tabstop>height</tabstop>
   <tabstop>portrait</tabstop>
   <tabstop>landscape</tabstop>
   <tabstop>singleSided</tabstop>
   <tabstop>facingPages</tabstop>
   <tabstop>textDirection</tabstop>
   <tabstop>topMargin</tabstop>
   <tabstop>bindingEdgeMargin</tabstop>
   <tabstop>pageEdgeMargin</tabstop>
   <tabstop>bottomMargin</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/KoShadowConfigWidget.ui b/libs/ui/forms/KoShadowConfigWidget.ui
index 894f8f3766..72cb42e8e6 100644
--- a/libs/ui/forms/KoShadowConfigWidget.ui
+++ b/libs/ui/forms/KoShadowConfigWidget.ui
@@ -1,117 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KoShadowConfigWidget</class>
  <widget class="QWidget" name="KoShadowConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>238</width>
     <height>98</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0,1">
    <item row="0" column="0">
     <widget class="QCheckBox" name="shadowVisible">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="1" rowspan="2">
     <widget class="QDial" name="shadowAngle">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="maximumSize">
       <size>
        <width>48</width>
        <height>48</height>
       </size>
      </property>
      <property name="maximum">
       <number>359</number>
      </property>
      <property name="wrapping">
       <bool>true</bool>
      </property>
      <property name="notchTarget">
       <double>3.700000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,1">
      <item row="0" column="0">
       <widget class="QToolButton" name="shadowColor">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Blur:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="KisDoubleParseUnitSpinBox" name="shadowBlur"/>
      </item>
     </layout>
    </item>
    <item row="1" column="2">
     <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Distance:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KisDoubleParseUnitSpinBox" name="shadowOffset"/>
      </item>
     </layout>
    </item>
    <item row="2" column="1">
     <widget class="QWidget" name="SpecialSpacer" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/kis_matrix_widget.ui b/libs/ui/forms/kis_matrix_widget.ui
index 1882728e78..d7e7aca22c 100644
--- a/libs/ui/forms/kis_matrix_widget.ui
+++ b/libs/ui/forms/kis_matrix_widget.ui
@@ -1,137 +1,137 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KisMatrixWidget</class>
  <widget class="QWidget" name="KisMatrixWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>195</width>
     <height>117</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Matrix Widget</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="KisIntParseSpinBox" name="m11">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
     <widget class="KisIntParseSpinBox" name="m13">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="m12">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="m23">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="KisIntParseSpinBox" name="m21">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisIntParseSpinBox" name="m22">
      <property name="minimum">
       <number>-99</number>
      </property>
      <property name="value">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="KisIntParseSpinBox" name="m31">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KisIntParseSpinBox" name="m32">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
     <widget class="KisIntParseSpinBox" name="m33">
      <property name="minimum">
       <number>-99</number>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <spacer name="spacer4">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>41</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="3">
     <spacer name="spacer5">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>21</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m11</tabstop>
   <tabstop>m12</tabstop>
   <tabstop>m13</tabstop>
   <tabstop>m21</tabstop>
   <tabstop>m22</tabstop>
   <tabstop>m23</tabstop>
   <tabstop>m31</tabstop>
   <tabstop>m32</tabstop>
   <tabstop>m33</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgautogradient.ui b/libs/ui/forms/wdgautogradient.ui
index 787879e8ee..e6c2ee7608 100644
--- a/libs/ui/forms/wdgautogradient.ui
+++ b/libs/ui/forms/wdgautogradient.ui
@@ -1,390 +1,390 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KisWdgAutogradient</class>
  <widget class="QWidget" name="KisWdgAutogradient">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>500</width>
     <height>250</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>500</width>
     <height>250</height>
    </size>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Name:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="nameedit"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="KisGradientSliderWidget" name="gradientSlider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0" colspan="2">
       <widget class="QLabel" name="textLabel1">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
         <string>Segment Color</string>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="QLabel" name="textLabel2">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
         <string>Opacity:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="labelLeftColor">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
         <string>Left:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="KColorButton" name="leftColorButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>30</height>
         </size>
        </property>
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="KisIntParseSpinBox" name="intNumInputLeftOpacity">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
        <property name="value">
         <number>100</number>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="labelRightColor">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
         <string>Right:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="KColorButton" name="rightColorButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>30</height>
         </size>
        </property>
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
        <property name="color" stdset="0">
         <color>
          <red>255</red>
          <green>255</green>
          <blue>255</blue>
         </color>
        </property>
        <property name="defaultColor" stdset="0">
         <color>
          <red>255</red>
          <green>255</green>
          <blue>255</blue>
         </color>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <widget class="KisIntParseSpinBox" name="intNumInputRightOpacity">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Ignored">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
        <property name="value">
         <number>100</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <property name="leftMargin">
       <number>0</number>
      </property>
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
      </property>
      <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QComboBox" name="comboBoxInterpolationType">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
        <item>
         <property name="text">
          <string>Linear</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Curved</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Sine</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Sphere Inc.</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Sphere Dec.</string>
         </property>
        </item>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="comboBoxColorInterpolationType">
        <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
          <strikeout>false</strikeout>
         </font>
        </property>
        <property name="focusPolicy">
         <enum>Qt::ClickFocus</enum>
        </property>
        <item>
         <property name="text">
          <string>RGB</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>HSV CW</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>HSV CCW</string>
         </property>
        </item>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisGradientSliderWidget</class>
    <extends></extends>
    <header>widgets/kis_gradient_slider_widget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgdisplaysettings.ui b/libs/ui/forms/wdgdisplaysettings.ui
index 852eb1362a..0bbd7ed23a 100644
--- a/libs/ui/forms/wdgdisplaysettings.ui
+++ b/libs/ui/forms/wdgdisplaysettings.ui
@@ -1,360 +1,360 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDisplaySettings</class>
  <widget class="QWidget" name="WdgDisplaySettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>504</width>
     <height>685</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Display</string>
   </property>
   <layout class="QGridLayout">
    <item row="4" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Miscellaneous</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="chkChannelsAsColor">
         <property name="text">
          <string>Color channels in color</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkCurveAntialiasing">
         <property name="text">
          <string>Enable curve anti-aliasing</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkSelectionOutlineAntialiasing">
         <property name="text">
          <string>Enable selection outline anti-aliasing</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkHidePopups">
         <property name="text">
          <string>Hide layer thumbnail popup</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QGroupBox" name="grpCheckers">
      <property name="title">
       <string>Transparency Checkerboard Pattern</string>
      </property>
      <layout class="QGridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="lblCheckSize">
         <property name="text">
          <string>S&amp;ize:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>intCheckSize</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KisIntParseSpinBox" name="intCheckSize">
         <property name="suffix">
          <string> px</string>
         </property>
         <property name="maximum">
          <number>256</number>
         </property>
         <property name="value">
          <number>32</number>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="3">
        <widget class="QLabel" name="lblColor">
         <property name="text">
          <string>Colors:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="4">
        <widget class="KColorButton" name="colorChecks1"/>
       </item>
       <item row="0" column="5">
        <widget class="KColorButton" name="colorChecks2"/>
       </item>
       <item row="0" column="6">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="1" column="0" colspan="3">
        <widget class="QCheckBox" name="chkMoving">
         <property name="toolTip">
          <string>If checked, the checkers will move when scrolling the canvas.</string>
         </property>
         <property name="whatsThis">
          <string>Determines whether the checks will stay put or whether they will scroll together with the canvas</string>
         </property>
         <property name="text">
          <string>&amp;Move checkers when scrolling</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="5" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="grpOpenGL">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Open&amp;GL</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout">
       <item row="0" column="1">
        <widget class="QComboBox" name="cmbFilterMode">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="currentIndex">
          <number>0</number>
         </property>
         <item>
          <property name="text">
           <string>Nearest Neighbour</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Bilinear Filtering</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Trilinear Filtering</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>High Quality Filtering</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QCheckBox" name="chkDisableVsync">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Try to disable vsync for Krita. This makes painting more responsive. Uncheck only when experiencing crashes with some GPU/driver combinations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Disable vsync (needs restart)</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="chkUseTextureBuffer">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use Texture Buffering. This can be faster on some GPU/Driver combinations (like Intel) or broken on some others (like AMD/Radeon).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Use texture buffer</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="text">
          <string>Scaling Mode:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="grpCanvasBorder">
      <property name="title">
       <string>Canvas border</string>
      </property>
      <layout class="QGridLayout">
       <item row="1" column="0">
        <widget class="QLabel" name="lblCanvasBorderColor">
         <property name="text">
          <string>Color:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KColorButton" name="canvasBorder"/>
       </item>
       <item row="1" column="2">
        <spacer name="horizontalSpacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="2" column="0" colspan="3">
        <widget class="QCheckBox" name="hideScrollbars">
         <property name="text">
          <string>Hide Scrollbars</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Selection Overlay</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Color:</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QToolButton" name="btnSelectionOverlayColor">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
       <item>
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>358</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdggeneralsettings.ui b/libs/ui/forms/wdggeneralsettings.ui
index 83357ca787..d38056e557 100644
--- a/libs/ui/forms/wdggeneralsettings.ui
+++ b/libs/ui/forms/wdggeneralsettings.ui
@@ -1,715 +1,715 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgGeneralSettings</class>
  <widget class="QWidget" name="WdgGeneralSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>552</width>
     <height>295</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>552</width>
     <height>295</height>
    </size>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>3</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Cursor</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="1" column="0">
         <layout class="QFormLayout" name="formLayout_2">
          <property name="horizontalSpacing">
           <number>10</number>
          </property>
          <property name="verticalSpacing">
           <number>10</number>
          </property>
          <property name="leftMargin">
           <number>10</number>
          </property>
          <property name="topMargin">
           <number>10</number>
          </property>
          <property name="rightMargin">
           <number>10</number>
          </property>
          <property name="bottomMargin">
           <number>10</number>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="textLabel1">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Cursor Shape:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="m_cmbCursorShape"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="textLabel1_2">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Outline Shape:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="m_cmbOutlineShape"/>
          </item>
          <item row="2" column="1">
           <widget class="QCheckBox" name="m_showOutlinePainting">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>200</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>Show brush outline while painting</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item row="1" column="1">
         <spacer name="horizontalSpacer_5">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="2" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
        <string>Window</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="2" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="1" column="0">
         <layout class="QGridLayout" name="gridLayout_6">
          <property name="leftMargin">
           <number>10</number>
          </property>
          <property name="topMargin">
           <number>10</number>
          </property>
          <property name="rightMargin">
           <number>10</number>
          </property>
          <property name="bottomMargin">
           <number>10</number>
          </property>
          <property name="spacing">
           <number>10</number>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="label_2">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Multiple Document Mode:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Window Background:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0">
            <item>
             <widget class="QLabel" name="m_backgroundimage">
              <property name="minimumSize">
               <size>
                <width>200</width>
                <height>0</height>
               </size>
              </property>
              <property name="frameShape">
               <enum>QFrame::StyledPanel</enum>
              </property>
              <property name="frameShadow">
               <enum>QFrame::Sunken</enum>
              </property>
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QToolButton" name="m_bnFileName">
              <property name="text">
               <string>...</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QPushButton" name="clearBgImageButton">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
               <string>Clear</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="2" column="1">
           <widget class="KColorButton" name="m_mdiColor">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="color" stdset="0">
             <color>
              <red>0</red>
              <green>0</green>
              <blue>0</blue>
             </color>
            </property>
            <property name="defaultColor" stdset="0">
             <color>
              <red>0</red>
              <green>0</green>
              <blue>0</blue>
             </color>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Background Image (overrides color):</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="m_cmbMDIType">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="currentIndex">
             <number>1</number>
            </property>
            <item>
             <property name="text">
              <string>Subwindows</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Tabs</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="3" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QCheckBox" name="m_chkRubberBand">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="label_6">
              <property name="text">
               <string>Don't show contents when moving sub-windows</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer_3">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item row="4" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="QCheckBox" name="m_chkCanvasMessages">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>Show on-canvas popup messages:</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer_2">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item row="1" column="1">
         <spacer name="horizontalSpacer_4">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Tools">
       <attribute name="title">
        <string>Tools</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="1" column="1">
         <layout class="QVBoxLayout" name="verticalLayout">
          <property name="spacing">
           <number>10</number>
          </property>
          <property name="leftMargin">
           <number>10</number>
          </property>
          <property name="topMargin">
           <number>10</number>
          </property>
          <property name="rightMargin">
           <number>10</number>
          </property>
          <property name="bottomMargin">
           <number>10</number>
          </property>
          <item>
           <widget class="QGroupBox" name="groupBox_4">
            <property name="title">
             <string>Tool Options Location (needs restart)</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
              <widget class="QRadioButton" name="m_radioToolOptionsInDocker">
               <property name="text">
                <string>In Doc&amp;ker</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QRadioButton" name="m_radioToolOptionsInToolbar">
               <property name="text">
                <string>In Tool&amp;bar</string>
               </property>
               <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="m_chkSwitchSelectionCtrlAlt">
            <property name="text">
             <string>Switch Control/Alt Selection Modifiers</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>40</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item row="1" column="2">
         <spacer name="horizontalSpacer_6">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Miscellaneous">
       <attribute name="title">
        <string>Miscellaneous</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <item row="0" column="0">
         <layout class="QGridLayout" name="gridLayout_7">
          <property name="leftMargin">
           <number>10</number>
          </property>
          <property name="topMargin">
           <number>10</number>
          </property>
          <property name="rightMargin">
           <number>10</number>
          </property>
          <property name="bottomMargin">
           <number>10</number>
          </property>
          <property name="spacing">
           <number>10</number>
          </property>
          <item row="0" column="0">
           <widget class="QCheckBox" name="m_autosaveCheckBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="layoutDirection">
             <enum>Qt::RightToLeft</enum>
            </property>
            <property name="text">
             <string>Autosave every:</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Undo stack size:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QCheckBox" name="m_chkCompressKra">
            <property name="text">
             <string>Compress .kra files more (slows loading/saving)</string>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QCheckBox" name="m_backupFileCheckBox">
            <property name="text">
             <string>Create backup file </string>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="KisIntParseSpinBox" name="m_favoritePresetsSpinBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>75</width>
              <height>0</height>
             </size>
            </property>
            <property name="minimum">
             <number>10</number>
            </property>
            <property name="maximum">
             <number>30</number>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_3">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Favorite presets:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisIntParseSpinBox" name="m_autosaveSpinBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>75</width>
              <height>0</height>
             </size>
            </property>
            <property name="suffix">
             <string> min</string>
            </property>
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>1440</number>
            </property>
            <property name="singleStep">
             <number>5</number>
            </property>
            <property name="value">
             <number>15</number>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="KisIntParseSpinBox" name="m_undoStackSize">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>75</width>
              <height>0</height>
             </size>
            </property>
            <property name="minimum">
             <number>0</number>
            </property>
            <property name="maximum">
             <number>1000</number>
            </property>
            <property name="singleStep">
             <number>5</number>
            </property>
            <property name="value">
             <number>30</number>
            </property>
           </widget>
          </item>
          <item row="6" column="1">
           <widget class="QCheckBox" name="chkShowRootLayer">
            <property name="text">
             <string>Show root layer</string>
            </property>
           </widget>
          </item>
          <item row="7" column="1">
           <widget class="QCheckBox" name="m_hideSplashScreen">
            <property name="text">
             <string>Hide splash screen on startup</string>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QCheckBox" name="m_chkConvertOnImport">
            <property name="text">
             <string>On importing images as layers, convert to the image colorspace</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item row="1" column="0">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item row="1" column="0">
     <spacer name="verticalSpacer_5">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgimportimagesequence.ui b/libs/ui/forms/wdgimportimagesequence.ui
index 0a69f7e77e..7526c61bec 100644
--- a/libs/ui/forms/wdgimportimagesequence.ui
+++ b/libs/ui/forms/wdgimportimagesequence.ui
@@ -1,129 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgImportImageSequence</class>
  <widget class="QWidget" name="WdgImportImageSequence">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>575</width>
     <height>428</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QListWidget" name="lstFiles"/>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QPushButton" name="btnAddImages">
            <property name="text">
             <string>Add images...</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="btnRemove">
            <property name="text">
             <string>Remove</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
       </layout>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Order</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <widget class="QComboBox" name="cmbOrder"/>
           </item>
           <item>
            <widget class="QComboBox" name="cmbSortMode"/>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Timing</string>
          </property>
          <layout class="QFormLayout" name="formLayout">
           <item row="1" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Start at</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KisIntParseSpinBox" name="spinFirstFrame">
             <property name="toolTip">
              <string>The frame number for the first image</string>
             </property>
             <property name="maximum">
              <number>9999</number>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
              <string>Step</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="KisIntParseSpinBox" name="spinStep">
             <property name="toolTip">
              <string>Number of frames between images</string>
             </property>
             <property name="minimum">
              <number>1</number>
             </property>
             <property name="maximum">
              <number>999</number>
             </property>
            </widget>
           </item>
           <item row="3" column="0" colspan="2">
            <widget class="QLabel" name="lblFramerate">
             <property name="text">
              <string>Source FPS:</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgnewimage.ui b/libs/ui/forms/wdgnewimage.ui
index a5b58664d1..4d5ee82786 100644
--- a/libs/ui/forms/wdgnewimage.ui
+++ b/libs/ui/forms/wdgnewimage.ui
@@ -1,698 +1,698 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgNewImage</class>
  <widget class="QWidget" name="WdgNewImage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>600</width>
     <height>422</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>600</width>
     <height>0</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
     <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>New Image</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <attribute name="title">
        <string>Dimensions</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="1" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QGroupBox" name="grpImage">
            <property name="minimumSize">
             <size>
              <width>0</width>
              <height>140</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>16777215</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="title">
             <string>Image Size</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
            <property name="flat">
             <bool>false</bool>
            </property>
            <property name="checkable">
             <bool>false</bool>
            </property>
            <layout class="QGridLayout" name="gridLayout">
             <item row="1" column="0">
              <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
                <widget class="QLabel" name="label_2">
                 <property name="text">
                  <string>P&amp;redefined:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                 </property>
                 <property name="buddy">
                  <cstring>cmbPredefined</cstring>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QComboBox" name="cmbPredefined">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QLabel" name="label_3">
                 <property name="text">
                  <string>Save As:</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QLineEdit" name="txtPredefinedName">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QPushButton" name="bnSaveAsPredefined">
                 <property name="toolTip">
                  <string>Save the current dimensions</string>
                 </property>
                 <property name="text">
                  <string>&amp;Save</string>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
             <item row="2" column="0">
              <layout class="QHBoxLayout">
               <item>
                <layout class="QGridLayout" name="gridLayout_4">
                 <item row="0" column="3">
                  <widget class="QToolButton" name="bnLandscape">
                   <property name="toolTip">
                    <string>Landscape</string>
                   </property>
                   <property name="text">
                    <string>...</string>
                   </property>
                   <property name="checkable">
                    <bool>true</bool>
                   </property>
                   <property name="autoExclusive">
                    <bool>true</bool>
                   </property>
                   <property name="autoRaise">
                    <bool>true</bool>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="KisDoubleParseSpinBox" name="doubleWidth">
                   <property name="decimals">
                    <number>2</number>
                   </property>
                   <property name="minimum">
                    <double>1.000000000000000</double>
                   </property>
                   <property name="maximum">
                    <double>100000000.000000000000000</double>
                   </property>
                  </widget>
                 </item>
                 <item row="1" column="0">
                  <widget class="QLabel" name="lblHeight">
                   <property name="text">
                    <string>&amp;Height:</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                   <property name="buddy">
                    <cstring>doubleHeight</cstring>
                   </property>
                  </widget>
                 </item>
                 <item row="2" column="1">
                  <widget class="KisDoubleParseSpinBox" name="doubleResolution">
                   <property name="decimals">
                    <number>0</number>
                   </property>
                   <property name="minimum">
                    <double>1.000000000000000</double>
                   </property>
                   <property name="maximum">
                    <double>9999.000000000000000</double>
                   </property>
                  </widget>
                 </item>
                 <item row="2" column="0">
                  <widget class="QLabel" name="lblResolution">
                   <property name="text">
                    <string>Resolution:</string>
                   </property>
                  </widget>
                 </item>
                 <item row="1" column="1">
                  <widget class="KisDoubleParseSpinBox" name="doubleHeight">
                   <property name="minimum">
                    <double>1.000000000000000</double>
                   </property>
                   <property name="maximum">
                    <double>100000000.000000000000000</double>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QComboBox" name="cmbWidthUnit"/>
                 </item>
                 <item row="1" column="2">
                  <widget class="QComboBox" name="cmbHeightUnit"/>
                 </item>
                 <item row="2" column="2">
                  <widget class="QLabel" name="label">
                   <property name="toolTip">
                    <string>pixels-per-inch</string>
                   </property>
                   <property name="text">
                    <string>ppi</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="0">
                  <widget class="QLabel" name="lblWidth">
                   <property name="text">
                    <string>W&amp;idth:</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                   <property name="buddy">
                    <cstring>doubleWidth</cstring>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="4">
                  <widget class="QToolButton" name="bnPortrait">
                   <property name="toolTip">
                    <string>Portrait</string>
                   </property>
                   <property name="text">
                    <string>...</string>
                   </property>
                   <property name="checkable">
                    <bool>true</bool>
                   </property>
                   <property name="checked">
                    <bool>true</bool>
                   </property>
                   <property name="autoExclusive">
                    <bool>true</bool>
                   </property>
                   <property name="autoRaise">
                    <bool>true</bool>
                   </property>
                  </widget>
                 </item>
                </layout>
               </item>
               <item>
                <layout class="QVBoxLayout" name="orientationLayout"/>
               </item>
               <item>
                <spacer>
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeType">
                  <enum>QSizePolicy::Expanding</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>191</width>
                   <height>61</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <widget class="QGroupBox" name="grpClipboard">
            <property name="title">
             <string>Clipboard</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_2">
             <item>
              <widget class="QLabel" name="lblPreview">
               <property name="maximumSize">
                <size>
                 <width>75</width>
                 <height>75</height>
                </size>
               </property>
               <property name="baseSize">
                <size>
                 <width>250</width>
                 <height>250</height>
                </size>
               </property>
               <property name="frameShape">
                <enum>QFrame::StyledPanel</enum>
               </property>
               <property name="text">
                <string>TextLabel</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer name="imageGroupSpacer">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
                 <height>40</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </item>
        <item row="0" column="0">
         <layout class="QHBoxLayout">
          <item>
           <widget class="QLabel" name="lblName">
            <property name="text">
             <string>&amp;Name:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>txtName</cstring>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="txtName">
            <property name="text">
             <string>untitled-1</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="grpMode">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Color</string>
          </property>
          <layout class="QVBoxLayout">
           <item>
            <widget class="KisColorSpaceSelector" name="colorSpaceSelector" native="true"/>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <attribute name="title">
        <string>Content</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="1" column="1">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Layers:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <widget class="QLabel" name="lblOpacity">
          <property name="text">
           <string>Ima&amp;ge Background Opacity:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>sliderOpacity</cstring>
          </property>
         </widget>
        </item>
        <item row="1" column="2">
         <widget class="KisIntParseSpinBox" name="intNumLayers">
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="minimum">
           <number>1</number>
          </property>
          <property name="maximum">
           <number>200</number>
          </property>
          <property name="value">
           <number>2</number>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QLabel" name="lblColor">
          <property name="text">
           <string>&amp;Image Background Color:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>cmbColor</cstring>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QLabel" name="lblBackgroundStyle">
          <property name="text">
           <string>Background:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
          </property>
         </widget>
        </item>
        <item row="5" column="1">
         <widget class="QLabel" name="lblDescription">
          <property name="text">
           <string>&amp;Description:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
          </property>
          <property name="buddy">
           <cstring>txtDescription</cstring>
          </property>
         </widget>
        </item>
        <item row="5" column="2">
         <widget class="QTextEdit" name="txtDescription">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>100</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="4" column="2">
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
           <widget class="QRadioButton" name="radioBackgroundAsLayer">
            <property name="text">
             <string>As fi&amp;rst layer</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="radioBackgroundAsProjection">
            <property name="text">
             <string>As ca&amp;nvas color</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item row="2" column="2">
         <widget class="KColorButton" name="cmbColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>50</width>
            <height>0</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Reset the image background color in the Image Properties dialog</string>
          </property>
          <property name="color" stdset="0">
           <color>
            <red>255</red>
            <green>255</green>
            <blue>255</blue>
           </color>
          </property>
          <property name="defaultColor" stdset="0">
           <color>
            <red>255</red>
            <green>255</green>
            <blue>255</blue>
           </color>
          </property>
         </widget>
        </item>
        <item row="3" column="2">
         <widget class="QFrame" name="opacityPanel">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Plain</enum>
          </property>
          <layout class="QHBoxLayout" name="_2">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="KisDoubleSliderSpinBox" name="sliderOpacity" native="true"/>
           </item>
          </layout>
         </widget>
        </item>
        <item row="6" column="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
       <zorder>label_4</zorder>
       <zorder>lblBackgroundStyle</zorder>
       <zorder>txtDescription</zorder>
       <zorder>lblDescription</zorder>
       <zorder>intNumLayers</zorder>
       <zorder>opacityPanel</zorder>
       <zorder>lblColor</zorder>
       <zorder>cmbColor</zorder>
       <zorder>lblOpacity</zorder>
      </widget>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>10</width>
        <height>10</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>480</width>
          <height>10</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="createButton">
        <property name="text">
         <string>&amp;Create</string>
        </property>
        <property name="autoDefault">
         <bool>true</bool>
        </property>
        <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisColorSpaceSelector</class>
    <extends>QWidget</extends>
    <header>widgets/kis_color_space_selector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>txtName</tabstop>
   <tabstop>cmbPredefined</tabstop>
   <tabstop>txtPredefinedName</tabstop>
   <tabstop>bnSaveAsPredefined</tabstop>
   <tabstop>doubleWidth</tabstop>
   <tabstop>doubleHeight</tabstop>
   <tabstop>doubleResolution</tabstop>
   <tabstop>cmbWidthUnit</tabstop>
   <tabstop>cmbHeightUnit</tabstop>
   <tabstop>bnLandscape</tabstop>
   <tabstop>bnPortrait</tabstop>
   <tabstop>createButton</tabstop>
   <tabstop>intNumLayers</tabstop>
   <tabstop>cmbColor</tabstop>
   <tabstop>radioBackgroundAsLayer</tabstop>
   <tabstop>radioBackgroundAsProjection</tabstop>
   <tabstop>txtDescription</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgpaintactioneditor.ui b/libs/ui/forms/wdgpaintactioneditor.ui
index 0a8342be0b..5e82cc60a0 100644
--- a/libs/ui/forms/wdgpaintactioneditor.ui
+++ b/libs/ui/forms/wdgpaintactioneditor.ui
@@ -1,202 +1,202 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgPaintActionEditor</class>
  <widget class="QWidget" name="WdgPaintActionEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>405</width>
     <height>376</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="KisNodeQueryPathEditor" name="nodeQueryPathEditor" native="true"/>
    </item>
    <item row="1" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Options</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Paint color:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QToolButton" name="paintColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="text">
           <string>...</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>Background color:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QToolButton" name="backgroundColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="text">
           <string>...</string>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>236</width>
            <height>147</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Opacity:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="KisIntParseSpinBox" name="opacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="sliderEnabled" stdset="0">
           <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Current preset</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="0" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Paint op:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QComboBox" name="paintOps">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="1" column="0" colspan="2">
         <widget class="QFrame" name="frmOptionWidgetContainer">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>4</verstretch>
           </sizepolicy>
          </property>
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
        <string>Preset Collection</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="KisPresetChooser" name="wdgPresetChooser" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>4</horstretch>
            <verstretch>4</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisPresetChooser</class>
    <extends>QWidget</extends>
    <header>widgets/kis_preset_chooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisNodeQueryPathEditor</class>
    <extends>QWidget</extends>
    <header>recorder/kis_node_query_path_editor.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgperformancesettings.ui b/libs/ui/forms/wdgperformancesettings.ui
index d7c8688b40..93111dbe4c 100644
--- a/libs/ui/forms/wdgperformancesettings.ui
+++ b/libs/ui/forms/wdgperformancesettings.ui
@@ -1,305 +1,305 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgPerformanceSettings</class>
  <widget class="QWidget" name="WdgPerformanceSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>753</width>
     <height>554</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>RAM (needs restarting Krita)</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Memory available:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblTotalMemory">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="text">
          <string>XXX MiB</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label">
         <property name="toolTip">
          <string>Krita will not use more memory than this limit.</string>
         </property>
         <property name="text">
          <string>Memory Limit:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KisDoubleSliderSpinBox" name="sliderMemoryLimit" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Krita will not use more memory than this limit.</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="intMemoryLimit">
           <property name="suffix">
            <string> MiB</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Internal Pool:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="KisDoubleSliderSpinBox" name="sliderPoolLimit" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="intPoolLimit">
           <property name="suffix">
            <string> MiB</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_4">
         <property name="toolTip">
          <string>When undo information reaches this limit, it will be stored in a temporary file and memory will be freed. Undo will be slower.</string>
         </property>
         <property name="text">
          <string>Swap Undo After:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="KisDoubleSliderSpinBox" name="sliderUndoLimit" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>When undo information reaches this limit, it will be stored in a temporary file and memory will be freed. Undo will be slower.</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="intUndoLimit">
           <property name="suffix">
            <string> MiB</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Swap File Size (needs restarting Krita)</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="label_6">
         <property name="toolTip">
          <string>The swap file will not be bigger than this limit.</string>
         </property>
         <property name="text">
          <string>File Size Limit:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <widget class="KisSliderSpinBox" name="sliderSwapSize" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>The swap file will not be bigger than this limit.</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="intSwapSize">
           <property name="suffix">
            <string> GiB</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Swap File Location:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
          <widget class="QLabel" name="lblSwapFileLocation">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="bnSwapFile">
           <property name="toolTip">
            <string>Select the location where Krita writes its swap files.</string>
           </property>
           <property name="text">
            <string>...</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Advanced (needs restarting Krita)</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="chkProgressReporting">
         <property name="text">
          <string>Enable progress reporting (might affect performance)</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkPerformanceLogging">
         <property name="text">
          <string>Enable performance logging</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="label_7">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When performance logging is enabled Krita saves timing information into the '&amp;lt;working_dir&amp;gt;/log' folder. If you experience performance problems and want to help us, enable this option and add the contents of the directory to a bug report.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkOpenGLLogging">
         <property name="text">
          <string>Enable OpenGL logging</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkDisableVectorOptimizations">
         <property name="text">
          <string>Disable vector optimizations (for AMD CPUs)</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/forms/wdgrectangleconstraints.ui b/libs/ui/forms/wdgrectangleconstraints.ui
index d5d3a0a8f5..c232202b2f 100644
--- a/libs/ui/forms/wdgrectangleconstraints.ui
+++ b/libs/ui/forms/wdgrectangleconstraints.ui
@@ -1,198 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgRectangleConstraints</class>
  <widget class="QWidget" name="WdgRectangleConstraints">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>230</width>
     <height>149</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Size</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
      <property name="leftMargin">
       <number>7</number>
      </property>
      <property name="topMargin">
       <number>7</number>
      </property>
      <property name="rightMargin">
       <number>7</number>
      </property>
      <property name="bottomMargin">
       <number>7</number>
      </property>
      <property name="spacing">
       <number>7</number>
      </property>
      <item row="1" column="3">
       <widget class="QPushButton" name="lockHeightButton">
        <property name="text">
         <string/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="2" column="3">
       <widget class="QPushButton" name="lockRatioButton">
        <property name="text">
         <string/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="0" column="3">
       <widget class="QPushButton" name="lockWidthButton">
        <property name="text">
         <string/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="KisIntParseSpinBox" name="intHeight">
        <property name="toolTip">
         <string>Height</string>
        </property>
        <property name="suffix">
         <string> px</string>
        </property>
        <property name="maximum">
         <number>99999</number>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Width:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <widget class="KisDoubleParseSpinBox" name="doubleRatio">
        <property name="toolTip">
         <string>Aspect ratio</string>
        </property>
        <property name="maximum">
         <double>10000.000000000000000</double>
        </property>
        <property name="singleStep">
         <double>0.100000000000000</double>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="KisIntParseSpinBox" name="intWidth">
        <property name="toolTip">
         <string>Width</string>
        </property>
        <property name="suffix">
         <string> px</string>
        </property>
        <property name="maximum">
         <number>99999</number>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Ratio:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Height:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="0" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/WdgGradientOverlay.ui b/libs/ui/layerstyles/WdgGradientOverlay.ui
index b0dd7bac4c..5fb0c6e772 100644
--- a/libs/ui/layerstyles/WdgGradientOverlay.ui
+++ b/libs/ui/layerstyles/WdgGradientOverlay.ui
@@ -1,286 +1,286 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgGradientOverlay</class>
  <widget class="QWidget" name="WdgGradientOverlay">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>411</width>
     <height>294</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Gradient Overlay</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>Gradient</string>
         </property>
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
             <string>Ble&amp;nd Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbCompositeOp</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisCompositeOpComboBox" name="cmbCompositeOp">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
             <string>Set the blend mode for the layer</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>Opac&amp;ity:</string>
            </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>10</width>
              <height>15</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Set the master opacity for the layer</string>
            </property>
            <property name="whatsThis">
             <string>Adjust the transparency of the layer</string>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_7">
            <property name="text">
             <string>&amp;Gradient:</string>
            </property>
            <property name="buddy">
             <cstring>cmbGradient</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="KisCmbGradient" name="cmbGradient">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                <horstretch>11</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="chkReverse">
              <property name="text">
               <string>&amp;Reverse</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>St&amp;yle:</string>
            </property>
            <property name="buddy">
             <cstring>cmbStyle</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
             <widget class="QComboBox" name="cmbStyle">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <item>
               <property name="text">
                <string>Linear</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Radial</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string comment="@item:inlistbox Gradient style">Angle</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Reflected</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Diamond</string>
               </property>
              </item>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="chkAlignWithLayer">
              <property name="text">
               <string>Ali&amp;gn with Layer</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_9">
            <property name="text">
             <string>&amp;Angle:</string>
            </property>
            <property name="buddy">
             <cstring>dialAngle</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QDial" name="dialAngle">
              <property name="toolTip">
               <string>Set the angle of the light source</string>
              </property>
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
              <property name="wrapping">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KisIntParseSpinBox" name="intAngle">
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>S&amp;cale:</string>
            </property>
            <property name="buddy">
             <cstring>intScale</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="KisSliderSpinBox" name="intScale" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
             <string>Set size of gradation</string>
            </property>
           </widget>
          </item>
         </layout>
         <zorder>label_6</zorder>
         <zorder>intScale</zorder>
         <zorder>label_9</zorder>
         <zorder>label_7</zorder>
         <zorder>label_8</zorder>
         <zorder>cmbCompositeOp</zorder>
         <zorder>intOpacity</zorder>
         <zorder>label_13</zorder>
         <zorder>label_14</zorder>
        </widget>
       </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header location="global">kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCompositeOpComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
   <customwidget>
    <class>KisCmbGradient</class>
    <extends>QToolButton</extends>
    <header>kis_cmb_gradient.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/WdgSatin.ui b/libs/ui/layerstyles/WdgSatin.ui
index 5b4e9df7ae..d40f0c8632 100644
--- a/libs/ui/layerstyles/WdgSatin.ui
+++ b/libs/ui/layerstyles/WdgSatin.ui
@@ -1,279 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgSatin</class>
  <widget class="QWidget" name="WdgSatin">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>345</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Satin</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>Structure</string>
         </property>
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
             <string>Ble&amp;nd Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbCompositeOp</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="KisCompositeOpComboBox" name="cmbCompositeOp">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="toolTip">
               <string>Set the blend mode for the layer</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="bnColor">
              <property name="text">
               <string>...</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>Opaci&amp;ty:</string>
            </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>10</width>
              <height>15</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Set the master opacity for the layer</string>
            </property>
            <property name="whatsThis">
             <string>Adjust the transparency of the layer</string>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_2"/>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>An&amp;gle:</string>
            </property>
            <property name="buddy">
             <cstring>dialAngle</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="QDial" name="dialAngle">
              <property name="toolTip">
               <string>Set the angle of the light source</string>
              </property>
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
              <property name="wrapping">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KisIntParseSpinBox" name="intAngle">
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>&amp;Distance:</string>
            </property>
            <property name="buddy">
             <cstring>intDistance</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="KisSliderSpinBox" name="intDistance" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>S&amp;ize:</string>
            </property>
            <property name="buddy">
             <cstring>intSize</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="KisSliderSpinBox" name="intSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="6" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>Contour:</string>
            </property>
           </widget>
          </item>
          <item row="6" column="1">
           <widget class="KisCmbContour" name="cmbContour" native="true"/>
          </item>
          <item row="7" column="1">
           <widget class="QCheckBox" name="chkAntiAliased">
            <property name="toolTip">
             <string>Smooth the contour</string>
            </property>
            <property name="text">
             <string>Anti-aliased</string>
            </property>
           </widget>
          </item>
          <item row="8" column="1">
           <widget class="QCheckBox" name="chkInvert">
            <property name="text">
             <string comment="@option:check In Layer Style">&amp;Invert</string>
            </property>
           </widget>
          </item>
         </layout>
         <zorder>cmbContour</zorder>
         <zorder>chkAntiAliased</zorder>
         <zorder>intOpacity</zorder>
         <zorder>label_13</zorder>
         <zorder>label_14</zorder>
         <zorder>label_4</zorder>
         <zorder>intDistance</zorder>
         <zorder>intSize</zorder>
         <zorder>label</zorder>
         <zorder>label_2</zorder>
         <zorder>label_6</zorder>
         <zorder>chkInvert</zorder>
        </widget>
       </item>
       <item row="2" column="0">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="1" column="0">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header location="global">kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCompositeOpComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
   <customwidget>
    <class>KisCmbContour</class>
    <extends>QWidget</extends>
    <header>kis_cmb_contour.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/WdgStroke.ui b/libs/ui/layerstyles/WdgStroke.ui
index a172f62699..513eff70e9 100644
--- a/libs/ui/layerstyles/WdgStroke.ui
+++ b/libs/ui/layerstyles/WdgStroke.ui
@@ -1,441 +1,441 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgStroke</class>
  <widget class="QWidget" name="WdgStroke">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>401</width>
     <height>642</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Stroke</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>Structure</string>
         </property>
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>S&amp;ize:</string>
            </property>
            <property name="buddy">
             <cstring>intSize</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisSliderSpinBox" name="intSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Positio&amp;n:</string>
            </property>
            <property name="buddy">
             <cstring>cmbPosition</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="cmbPosition">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Layer Style: Stroke position">Outside</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Layer Style: Stroke position">Inside</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Layer Style: Stroke position">Center</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>&amp;Blend Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbCompositeOp</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="KisCompositeOpComboBox" name="cmbCompositeOp">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Opacit&amp;y:</string>
            </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QGroupBox" name="groupBox_3">
         <property name="title">
          <string comment="@title:group In Layer Style">Fill</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <widget class="QComboBox" name="cmbFillType">
            <item>
             <property name="text">
              <string>Color</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Gradient</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@title:group In Layer Style">Pattern</string>
             </property>
            </item>
           </widget>
          </item>
          <item>
           <widget class="QStackedWidget" name="fillStack">
            <property name="currentIndex">
             <number>1</number>
            </property>
            <widget class="QWidget" name="page_3">
             <layout class="QFormLayout" name="formLayout_2">
              <item row="0" column="0">
               <widget class="QLabel" name="label_5">
                <property name="text">
                 <string>Color:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="KColorButton" name="bnColor">
                <property name="text">
                 <string>...</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
            <widget class="QWidget" name="page_4">
             <layout class="QFormLayout" name="formLayout_3">
              <item row="0" column="0">
               <widget class="QLabel" name="label_7">
                <property name="text">
                 <string>&amp;Gradient:</string>
                </property>
                <property name="buddy">
                 <cstring>cmbGradient</cstring>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <layout class="QHBoxLayout" name="horizontalLayout_3">
                <item>
                 <widget class="KisCmbGradient" name="cmbGradient">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QCheckBox" name="chkReverse">
                  <property name="text">
                   <string>&amp;Reverse</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="label_6">
                <property name="text">
                 <string>St&amp;yle:</string>
                </property>
                <property name="buddy">
                 <cstring>cmbStyle</cstring>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <layout class="QHBoxLayout" name="horizontalLayout_4">
                <item>
                 <widget class="QComboBox" name="cmbStyle">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <item>
                   <property name="text">
                    <string>Linear</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>Radial</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string comment="@item:inlistbox Gradient style">Angle</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>Reflected</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>Diamond</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item>
                 <widget class="QCheckBox" name="chkAlignWithLayer">
                  <property name="text">
                   <string>Ali&amp;gn with Layer</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
              <item row="2" column="0">
               <widget class="QLabel" name="label_9">
                <property name="text">
                 <string>&amp;Angle:</string>
                </property>
                <property name="buddy">
                 <cstring>dialAngle</cstring>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QDial" name="dialAngle">
                  <property name="toolTip">
                   <string>Set the angle of the light source</string>
                  </property>
                  <property name="minimum">
                   <number>-179</number>
                  </property>
                  <property name="maximum">
                   <number>180</number>
                  </property>
                  <property name="wrapping">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="KisIntParseSpinBox" name="intAngle">
                  <property name="minimum">
                   <number>-179</number>
                  </property>
                  <property name="maximum">
                   <number>180</number>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
              <item row="3" column="0">
               <widget class="QLabel" name="label_8">
                <property name="text">
                 <string>S&amp;cale:</string>
                </property>
                <property name="buddy">
                 <cstring>intScale</cstring>
                </property>
               </widget>
              </item>
              <item row="3" column="1">
               <widget class="KisSliderSpinBox" name="intScale" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="toolTip">
                 <string>Set size of gradation</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
            <widget class="QWidget" name="page_2">
             <layout class="QFormLayout" name="formLayout_4">
              <item row="0" column="0">
               <widget class="QLabel" name="label_11">
                <property name="text">
                 <string>Pattern:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <layout class="QVBoxLayout" name="verticalLayout_2">
                <item>
                 <widget class="KisPatternChooser" name="patternChooser">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="minimumSize">
                   <size>
                    <width>250</width>
                    <height>250</height>
                   </size>
                  </property>
                  <property name="frameShape">
                   <enum>QFrame::StyledPanel</enum>
                  </property>
                  <property name="frameShadow">
                   <enum>QFrame::Raised</enum>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QPushButton" name="bnSnapToOrigin">
                  <property name="text">
                   <string>Sn&amp;ap to Origin</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="label_10">
                <property name="text">
                 <string>S&amp;cale:</string>
                </property>
                <property name="buddy">
                 <cstring>intScale</cstring>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="KisSliderSpinBox" name="intScale_2" native="true">
                <property name="toolTip">
                 <string>Set size of gradation</string>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <widget class="QCheckBox" name="chkLinkWithLayer">
                <property name="text">
                 <string>Lin&amp;k with Layer</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCompositeOpComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header location="global">kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCmbGradient</class>
    <extends>QToolButton</extends>
    <header>kis_cmb_gradient.h</header>
   </customwidget>
   <customwidget>
    <class>KisPatternChooser</class>
    <extends>QFrame</extends>
    <header location="global">kis_pattern_chooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/wdgBevelAndEmboss.ui b/libs/ui/layerstyles/wdgBevelAndEmboss.ui
index 94b34b37f0..1f918c085f 100644
--- a/libs/ui/layerstyles/wdgBevelAndEmboss.ui
+++ b/libs/ui/layerstyles/wdgBevelAndEmboss.ui
@@ -1,482 +1,482 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgBevelAndEmboss</class>
  <widget class="QWidget" name="WdgBevelAndEmboss">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>399</width>
     <height>541</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Bevel and Emboss</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>Structure</string>
         </property>
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>St&amp;yle:</string>
            </property>
            <property name="buddy">
             <cstring>cmbStyle</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="cmbStyle">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string>Outer Bevel</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Inner Bevel</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Bevel/emboss style">Emboss</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Pillow Emboss</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Stroke Emboss</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>&amp;Technique:</string>
            </property>
            <property name="buddy">
             <cstring>cmbTechnique</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="cmbTechnique">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string>Smooth</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Chisel Hard</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Chisel Soft</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>&amp;Depth:</string>
            </property>
            <property name="buddy">
             <cstring>intDepth</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="KisSliderSpinBox" name="intDepth" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string comment="@label:listbox Bevel direction">Direction:</string>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QComboBox" name="cmbDirection">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Bevel direction">Up</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@item:inlistbox Bevel direction">Down</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Si&amp;ze:</string>
            </property>
            <property name="buddy">
             <cstring>intSize</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="KisSliderSpinBox" name="intSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>So&amp;ften:</string>
            </property>
            <property name="buddy">
             <cstring>intSoften</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="KisSliderSpinBox" name="intSoften" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupBox_3">
         <property name="title">
          <string>Shading</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <item row="0" column="0" colspan="3">
           <layout class="QGridLayout" name="gridLayout">
            <item row="0" column="0">
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>&amp;Angle:</string>
              </property>
              <property name="buddy">
               <cstring>dialAngle</cstring>
              </property>
             </widget>
            </item>
            <item row="0" column="1" rowspan="2">
             <widget class="QDial" name="dialAngle">
              <property name="toolTip">
               <string>Set the angle of the light source</string>
              </property>
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
              <property name="wrapping">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item row="0" column="2">
             <widget class="KisIntParseSpinBox" name="intAngle">
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
             <spacer name="verticalSpacer">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
                <height>18</height>
               </size>
              </property>
             </spacer>
            </item>
            <item row="1" column="2">
             <widget class="QCheckBox" name="chkUseGlobalLight">
              <property name="text">
               <string>Use &amp;Global Light</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="1" column="2">
           <widget class="KisIntParseSpinBox" name="intAltitude">
            <property name="minimum">
             <number>-179</number>
            </property>
            <property name="maximum">
             <number>180</number>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QLabel" name="label_9">
            <property name="text">
             <string>&amp;Gloss Contour:</string>
            </property>
            <property name="buddy">
             <cstring>cmbContour</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QComboBox" name="cmbContour"/>
            </item>
            <item>
             <widget class="QCheckBox" name="chkAntiAliased">
              <property name="text">
               <string>Anti-aliased</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="3" column="0" colspan="2">
           <widget class="QLabel" name="label_10">
            <property name="text">
             <string>H&amp;ighlight Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbHighlightMode</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="KisCompositeOpComboBox" name="cmbHighlightMode">
              <property name="toolTip">
               <string>Set the blend mode for the layer</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="bnHighlightColor">
              <property name="text">
               <string>...</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="4" column="0" colspan="2">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>&amp;Opacity:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="2">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>10</width>
              <height>15</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Set the master opacity for the layer</string>
            </property>
            <property name="whatsThis">
             <string>Adjust the transparency of the layer</string>
            </property>
           </widget>
          </item>
          <item row="5" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="KisCompositeOpComboBox" name="cmbShadowMode">
              <property name="toolTip">
               <string>Set the blend mode for the layer</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="bnShadowColor">
              <property name="text">
               <string>...</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="6" column="0" colspan="2">
           <widget class="QLabel" name="label_15">
            <property name="text">
             <string>&amp;Opacity:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>intOpacity2</cstring>
            </property>
           </widget>
          </item>
          <item row="6" column="2">
           <widget class="KisSliderSpinBox" name="intOpacity2" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>10</width>
              <height>15</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Set the master opacity for the layer</string>
            </property>
            <property name="whatsThis">
             <string>Adjust the transparency of the layer</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0" colspan="2">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>Altitude:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>dialAngle</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="0" colspan="2">
           <widget class="QLabel" name="label_11">
            <property name="text">
             <string>Sh&amp;adow Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbShadowMode</cstring>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header location="global">kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCompositeOpComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/wdgdropshadow.ui b/libs/ui/layerstyles/wdgdropshadow.ui
index e2da0169b3..d1f81dc6cd 100644
--- a/libs/ui/layerstyles/wdgdropshadow.ui
+++ b/libs/ui/layerstyles/wdgdropshadow.ui
@@ -1,319 +1,319 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDropShadow</class>
  <widget class="QWidget" name="WdgDropShadow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>435</width>
     <height>390</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="grpMain">
      <property name="title">
       <string>Drop Shadow</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="2" column="0">
        <widget class="QCheckBox" name="chkLayerKnocksOutDropShadow">
         <property name="toolTip">
          <string>Use to obscure the shadow when fill is transparent</string>
         </property>
         <property name="text">
          <string>Layer knocks O&amp;ut Drop Shadow</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>Quality</string>
         </property>
         <layout class="QFormLayout" name="formLayout_2">
          <item row="0" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Contour:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="KisCmbContour" name="cmbContour" native="true">
              <property name="sizePolicy">
               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="chkAntiAliased">
              <property name="toolTip">
               <string>Smooth the contour</string>
              </property>
              <property name="text">
               <string>Anti-aliased</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>&amp;Noise:</string>
            </property>
            <property name="buddy">
             <cstring>intNoise</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisSliderSpinBox" name="intNoise" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
             <string>Add noise to shadow</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QGroupBox" name="groupBox_3">
         <property name="title">
          <string>Structure</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <item row="0" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
             <string>&amp;Blend Mode:</string>
            </property>
            <property name="buddy">
             <cstring>cmbCompositeOp</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisCompositeOpComboBox" name="cmbCompositeOp">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
             <string>Set the blend mode for the layer</string>
            </property>
           </widget>
          </item>
          <item row="0" column="2">
           <widget class="KColorButton" name="bnColor"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>Opaci&amp;ty:</string>
            </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
              <width>10</width>
              <height>15</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Set the master opacity for the layer</string>
            </property>
            <property name="whatsThis">
             <string>Adjust the transparency of the layer</string>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>An&amp;gle:</string>
            </property>
            <property name="buddy">
             <cstring>dialAngle</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1" colspan="2">
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="QDial" name="dialAngle">
              <property name="toolTip">
               <string>Set the angle of the light source</string>
              </property>
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
              <property name="wrapping">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KisIntParseSpinBox" name="intAngle">
              <property name="minimum">
               <number>-179</number>
              </property>
              <property name="maximum">
               <number>180</number>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="chkUseGlobalLight">
              <property name="toolTip">
               <string>Use current setting for global light source</string>
              </property>
              <property name="text">
               <string>Use &amp;Global light</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>&amp;Distance:</string>
            </property>
            <property name="buddy">
             <cstring>intDistance</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intDistance" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="lblSpread">
            <property name="text">
             <string>Sp&amp;read:</string>
            </property>
            <property name="buddy">
             <cstring>intSpread</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intSpread" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>S&amp;ize:</string>
            </property>
            <property name="buddy">
             <cstring>intSize</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="3" column="0">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header location="global">kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCompositeOpComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
   <customwidget>
    <class>KisCmbContour</class>
    <extends>QWidget</extends>
    <header>kis_cmb_contour.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/tests/CMakeLists.txt b/libs/ui/tests/CMakeLists.txt
index c485bef769..7219220ac3 100644
--- a/libs/ui/tests/CMakeLists.txt
+++ b/libs/ui/tests/CMakeLists.txt
@@ -1,273 +1,261 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 #add_subdirectory(scratchpad)
 include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata 
                     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 
 macro_add_unittest_definitions()
 
 ########### next target ###############
 
 set(kis_node_model_test_SRCS kis_node_model_test.cpp modeltest.cpp )
 kde4_add_broken_unit_test(kis_node_model_test TESTNAME krita-ui-kis_node_model_test  ${kis_node_model_test_SRCS})
 target_link_libraries(kis_node_model_test    kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_image_view_converter_test_SRCS kis_image_view_converter_test.cpp )
 kde4_add_unit_test(KisImageViewConverterTest TESTNAME krita-ui-KisImageViewConverterTest  ${kis_image_view_converter_test_SRCS})
 target_link_libraries(KisImageViewConverterTest    kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_shape_controller_test_SRCS kis_shape_controller_test.cpp kis_dummies_facade_base_test.cpp)
 kde4_add_broken_unit_test(kis_shape_controller_test TESTNAME krita-ui-kis_shape_controller_test  ${kis_shape_controller_test_SRCS})
 target_link_libraries(kis_shape_controller_test    kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(squeezedcombobox_test_SRCS squeezedcombobox_test.cpp )
 kde4_add_unit_test(squeezedcombobox_test TESTNAME krita-ui-squeezedcombobox_test  ${squeezedcombobox_test_SRCS})
 target_link_libraries(squeezedcombobox_test   kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_prescaled_projection_test_SRCS kis_prescaled_projection_test.cpp )
 kde4_add_broken_unit_test(KisPrescaledProjectionTest TESTNAME krita-ui-kis_prescaled_projection_test ${kis_prescaled_projection_test_SRCS})
 target_link_libraries(KisPrescaledProjectionTest   kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_kra_loader_test_SRCS kis_kra_loader_test.cpp )
 kde4_add_broken_unit_test(KisKraLoaderTest TESTNAME krita-ui-KisKraLoaderTest ${kis_kra_loader_test_SRCS})
 target_link_libraries(KisKraLoaderTest   kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_kra_saver_test_SRCS kis_kra_saver_test.cpp )
 kde4_add_broken_unit_test(KisKraSaverTest TESTNAME krita-ui-KisKraSaverTest ${kis_kra_saver_test_SRCS})
 target_link_libraries(KisKraSaverTest   kritaimage kritaui Qt5::Test)
 
 
 ########### next target ###############
 
 set(kis_kra_savexml_visitor_test_SRCS kis_kra_savexml_visitor_test.cpp )
 kde4_add_unit_test(KisKraSaveXmlVisitorTest TESTNAME krita-ui-KisKraSaveXmlVisitorTest ${kis_kra_savexml_visitor_test_SRCS})
 target_link_libraries(KisKraSaveXmlVisitorTest   kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_shape_selection_test_SRCS kis_shape_selection_test.cpp )
 
 kde4_add_unit_test(KisShapeSelectionTest TESTNAME krita-ui-ShapeSelectionTest ${kis_shape_selection_test_SRCS})
 
 target_link_libraries(KisShapeSelectionTest   kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_exiv2_test_SRCS kis_exiv2_test.cpp )
 kde4_add_broken_unit_test(KisExiv2Test TESTNAME krita-ui-KisExiv2Test ${kis_exiv2_test_SRCS})
 target_link_libraries(KisExiv2Test   kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_recorded_action_editor_test_SRCS kis_recorded_action_editor_test.cpp )
 kde4_add_unit_test(KisRecordedActionEditorTest TESTNAME krita-ui-KisRecordedActionEditor ${kis_recorded_action_editor_test_SRCS})
 target_link_libraries(KisRecordedActionEditorTest   kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_doc2_test_SRCS kis_doc2_test.cpp )
 kde4_add_unit_test(KisDoc2Test TESTNAME krita-ui-KisDoc2Test  ${kis_doc2_test_SRCS})
 target_link_libraries(KisDoc2Test    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_coordinates_converter_test_SRCS kis_coordinates_converter_test.cpp )
 kde4_add_unit_test(KisCoordinatesConverterTest TESTNAME krita-ui-KisCoordinatesConverterTest  ${kis_coordinates_converter_test_SRCS})
 target_link_libraries(KisCoordinatesConverterTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_clipboard_test_SRCS kis_clipboard_test.cpp )
 kde4_add_broken_unit_test(KisClipboardTest TESTNAME krita-ui-KisClipboardTest  ${kis_clipboard_test_SRCS})
 target_link_libraries(KisClipboardTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(freehand_stroke_test_SRCS freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp)
 kde4_add_broken_unit_test(FreehandStrokeTest TESTNAME krita-ui-FreehandStrokeTest  ${freehand_stroke_test_SRCS})
 target_link_libraries(FreehandStrokeTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(fill_processing_visitor_test_SRCS fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp)
 kde4_add_broken_unit_test(FillProcessingVisitorTest TESTNAME krita-ui-FillProcessingVisitorTest  ${fill_processing_visitor_test_SRCS})
 target_link_libraries(FillProcessingVisitorTest kritaui kritaimage Qt5::Test)
 
 
 ########### next target ###############
 
 set(filter_stroke_test_SRCS filter_stroke_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp)
 kde4_add_broken_unit_test(FilterStrokeTest TESTNAME krita-ui-FilterStrokeTest  ${filter_stroke_test_SRCS})
 target_link_libraries(FilterStrokeTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_selection_manager_test_SRCS kis_selection_manager_test.cpp)
 kde4_add_broken_unit_test(KisSelectionManagerTest TESTNAME krita-ui-KisSelectionManagerTest  ${kis_selection_manager_test_SRCS})
 target_link_libraries(KisSelectionManagerTest    kritaui kritaimage Qt5::Test)
 #set_tests_properties(krita-ui-KisSelectionManagerTest PROPERTIES TIMEOUT 300)
 
 ########### next target ###############
 
 set(kis_selection_decoration_test_SRCS kis_selection_decoration_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp)
 kde4_add_unit_test(KisSelectionDecorationTest TESTNAME krita-ui-KisSelectionDecorationTest  ${kis_selection_decoration_test_SRCS})
 target_link_libraries(KisSelectionDecorationTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_node_manager_test_SRCS kis_node_manager_test.cpp)
 kde4_add_broken_unit_test(KisNodeManagerTest TESTNAME krita-ui-KisNodeManagerTest  ${kis_node_manager_test_SRCS})
 target_link_libraries(KisNodeManagerTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_node_dummies_graph_test_SRCS kis_node_dummies_graph_test.cpp ../../../sdk/tests/testutil.cpp)
 kde4_add_unit_test(KisNodeDummiesGraphTest TESTNAME krita-ui-KisNodeDummiesGraphTest  ${kis_node_dummies_graph_test_SRCS})
 target_link_libraries(KisNodeDummiesGraphTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_node_shapes_graph_test_SRCS kis_node_shapes_graph_test.cpp ../../../sdk/tests/testutil.cpp)
 kde4_add_unit_test(KisNodeShapesGraphTest TESTNAME krita-ui-KisNodeShapesGraphTest  ${kis_node_shapes_graph_test_SRCS})
 target_link_libraries(KisNodeShapesGraphTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_dummies_facade_test_SRCS kis_dummies_facade_test.cpp kis_dummies_facade_base_test.cpp ../../../sdk/tests/testutil.cpp)
 kde4_add_broken_unit_test(KisDummiesFacadeTest TESTNAME krita-ui-KisDummiesFacadeTest  ${kis_dummies_facade_test_SRCS})
 target_link_libraries(KisDummiesFacadeTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_model_index_converter_test_SRCS kis_model_index_converter_test.cpp ../../../sdk/tests/testutil.cpp)
 kde4_add_unit_test(KisModelIndexConverterTest TESTNAME krita-ui-KisModelIndexConverterTest  ${kis_model_index_converter_test_SRCS})
 target_link_libraries(KisModelIndexConverterTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_zoom_and_pan_test_SRCS kis_zoom_and_pan_test.cpp ../../../sdk/tests/testutil.cpp)
 kde4_add_broken_unit_test(KisZoomAndPanTest TESTNAME krita-ui-KisZoomAndPanTest  ${kis_zoom_and_pan_test_SRCS})
 target_link_libraries(KisZoomAndPanTest    kritaui kritaimage Qt5::Test)
 #set_tests_properties(krita-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300)
 
 ########### next target ###############
 
 # set(kis_input_manager_test_SRCS kis_input_manager_test.cpp ../../sdk/tests/testutil.cpp)
 # kde4_add_unit_test(KisInputManagerTest TESTNAME krita-ui-KisInputManagerTest  ${kis_input_manager_test_SRCS})
 # target_link_libraries(KisInputManagerTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_action_manager_test_SRCS kis_action_manager_test.cpp )
 kde4_add_broken_unit_test(KisActionManagerTest TESTNAME krita-ui-KisActionManagerTest  ${kis_action_manager_test_SRCS})
 target_link_libraries(KisActionManagerTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_categories_mapper_test_SRCS kis_categories_mapper_test.cpp testing_categories_mapper.cpp)
 kde4_add_broken_unit_test(KisCategoriesMapperTest TESTNAME krita-ui-KisCategoriesMapperTest  ${kis_categories_mapper_test_SRCS})
 target_link_libraries(KisCategoriesMapperTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_categorized_list_model_test_SRCS kis_categorized_list_model_test.cpp modeltest.cpp)
 kde4_add_unit_test(KisCategorizedListModelTest TESTNAME krita-ui-KisCategorizedListModelTest  ${kis_categorized_list_model_test_SRCS})
 target_link_libraries(KisCategorizedListModelTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_resource_server_provider_test_SRCS kis_resource_server_provider_test.cpp modeltest.cpp)
 kde4_add_unit_test(KisResourceServerProviderTest TESTNAME krita-ui-KisResourceServerProviderTest  ${kis_resource_server_provider_test_SRCS})
 target_link_libraries(KisResourceServerProviderTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_file_layer_test_SRCS kis_file_layer_test.cpp )
 kde4_add_unit_test(KisFileLayerTest TESTNAME krita-ui-KisFileLayerTest  ${kis_file_layer_test_SRCS})
 target_link_libraries(KisFileLayerTest    kritaui kritaimage Qt5::Test)
 
 ########### next target ###############
 
 set(kis_asl_layer_style_serializer_test_SRCS kis_asl_layer_style_serializer_test.cpp )
 kde4_add_broken_unit_test(KisAslLayerStyleSerializerTest TESTNAME krita-ui-KisAslLayerStyleSerializerTest ${kis_asl_layer_style_serializer_test_SRCS})
 target_link_libraries(KisAslLayerStyleSerializerTest kritaui kritaimage ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(kis_node_juggler_compressed_test_SRCS kis_node_juggler_compressed_test.cpp  ../../../sdk/tests/testutil.cpp)
 kde4_add_unit_test(KisNodeJugglerCompressedTest TESTNAME krita-image-BaseNodeTest ${kis_node_juggler_compressed_test_SRCS})
 target_link_libraries(KisNodeJugglerCompressedTest kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_node_view_test_SRCS kis_node_view_test.cpp  ../../../sdk/tests/testutil.cpp)
 qt5_add_resources(kis_node_view_test_SRCS ${krita_QRCS})
 kde4_add_unit_test(KisNodeViewTest TESTNAME krita-image-BaseNodeTest ${kis_node_view_test_SRCS})
 target_link_libraries(KisNodeViewTest kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_multinode_property_test_SRCS kis_multinode_property_test.cpp)
 kde4_add_unit_test(KisMultinodePropertyTest TESTNAME krita-image-BaseNodeTest ${kis_multinode_property_test_SRCS})
 target_link_libraries(KisMultinodePropertyTest kritaimage kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_grid_config_test_SRCS kis_grid_config_test.cpp)
 kde4_add_unit_test(KisGridConfigTest TESTNAME krita-image-BaseNodeTest ${kis_grid_config_test_SRCS})
 target_link_libraries(KisGridConfigTest kritaui Qt5::Test)
 
 ########### next target ###############
 
 set(kis_animation_exporter_test_SRCS kis_animation_exporter_test.cpp )
 kde4_add_broken_unit_test(KisAnimationExporterTest TESTNAME kritaui-animation_exporter_test ${kis_animation_exporter_test_SRCS})
 target_link_libraries(KisAnimationExporterTest kritaui kritaimage ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(kis_animation_importer_test_SRCS kis_animation_importer_test.cpp )
 kde4_add_broken_unit_test(KisAnimationImporterTest TESTNAME kritaui-animation_importer_test ${kis_animation_importer_test_SRCS})
 target_link_libraries(KisAnimationImporterTest kritaui kritaimage ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(kis_animation_frame_cache_test_SRCS kis_animation_frame_cache_test.cpp )
 kde4_add_broken_unit_test(KisAnimationFrameCacheTest TESTNAME kritaui-animation_frame_cache_test ${kis_animation_frame_cache_test_SRCS})
 target_link_libraries(KisAnimationFrameCacheTest kritaui kritaimage ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(ResourceBundleTest_SRCS ResourceBundleTest.cpp)
 kde4_add_broken_unit_test(ResourceBundleTest TESTNAME krita-resourcemanager-ResourceBundleTest ${ResourceBundleTest_SRCS})
 target_link_libraries(ResourceBundleTest kritaui kritalibbrush kritalibpaintop Qt5::Test )
 
 ########### next target ###############
 
 set(kis_stabilized_events_sampler_test_SRCS kis_stabilized_events_sampler_test.cpp)
 kde4_add_unit_test(KisStabilizedEventsSamplerTest TESTNAME krita-ui-StabilizedEventsSamplerTest ${kis_stabilized_events_sampler_test_SRCS})
 target_link_libraries(KisStabilizedEventsSamplerTest kritaui Qt5::Test)
-
-########### next target ###############
-
-set(kis_simplemathparsertest_SRCS kis_simplemathparsertest.cpp)
-kde4_add_unit_test(KisSimpleMathParserTest TESTNAME krita-ui-KisSimpleMathParserTest ${kis_simplemathparsertest_SRCS})
-target_link_libraries(KisSimpleMathParserTest kritaui Qt5::Test)
-
-########### next target ###############
-
-set(kis_parsespinboxestest_SRCS kis_parsespinboxestest.cpp)
-kde4_add_unit_test(KisParseSpinBoxesTest TESTNAME krita-ui-KisParseSpinBoxesTest ${kis_parsespinboxestest_SRCS})
-target_link_libraries(KisParseSpinBoxesTest kritaui Qt5::Test)
diff --git a/libs/ui/utils/kis_numparser.cpp b/libs/ui/utils/kis_numparser.cpp
deleted file mode 100644
index 69e3d120ce..0000000000
--- a/libs/ui/utils/kis_numparser.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_numparser.h"
-
-//#include <QtMath>
-#include <qmath.h>
-#include <QVector>
-#include <QRegExp>
-#include <QStringList>
-#include <QVariant>
-
-#include <iostream>
-
-using namespace std;
-
-const QVector<char> opLevel1 = {'+', '-'};
-const QVector<char> opLevel2 = {'*', '/'};
-
-const QStringList supportedFuncs = {"", "cos", "sin", "tan", "acos", "asin", "atan", "exp", "ln", "log10", "abs"};
-
-const QRegExp funcExpr("(-)?([a-zA-Z]*)?\\((.+)\\)");
-const QRegExp numberExpr("(-)?([0-9]+\\.?[0-9]*(e[0-9]*)?)");
-
-const QRegExp funcExprInteger("(-)?\\((.+)\\)");
-const QRegExp integerExpr("(-)?([0-9]+)");
-
-//double functions
-double treatFuncs(QString const& expr, bool & noProblem);
-double treatLevel1(QString const& expr, bool & noProblem);
-double treatLevel2(QString const& expr, bool & noProblem);
-double treatLevel3(QString const& expr, bool & noProblem);
-
-//int functions
-double treatLevel1Int(QString const& expr, bool & noProblem);
-double treatLevel2Int(QString const& expr, bool & noProblem);
-double treatFuncsInt(QString const& expr, bool & noProblem);
-
-namespace KisNumericParser {
-
-/*!
- * \param expr the expression to parse
- * \param noProblem if provided, the value pointed to will be se to true is no problem appeared, false otherwise.
- * \return the numerical value the expression eval to (or 0 in case of error).
- */
-double parseSimpleMathExpr(const QString &expr, bool *noProblem)
-{
-
-		bool ok = true; //intermediate variable to pass by reference to the sublevel parser (if no pointer is provided).
-
-        //then go down each 3 levels of operation priority.
-		if (noProblem != nullptr) {
-				return treatLevel1(expr, *noProblem);
-        }
-
-		return treatLevel1(expr, ok);
-
-}
-
-/*!
- * \param expr the expression to parse
- * \param noProblem if provided, the value pointed to will be se to true is no problem appeared, false otherwise.
- * \return the numerical value the expression eval to (or 0 in case of error).
- */
-int parseIntegerMathExpr(QString const& expr, bool* noProblem)
-{
-
-		bool ok = true; //intermediate variable to pass by reference to the sublevel parser (if no pointer is provided).
-
-		if (noProblem != nullptr) {
-				return qRound(treatLevel1Int(expr, *noProblem));
-        }
-
-		return qRound(treatLevel1Int(expr, ok));
-
-}
-
-} //namespace KisNumericParser.
-
-
-//intermediate functions
-
-/*!
- * \brief extractSubExprLevel1 extract from an expression the part of an expression that need to be treated recursivly before computing level 1 operations (+, -).
- * \param expr The expression to treat, the part returned will be removed.
- * \param nextOp This reference, in case of sucess, will hold the first level operation identified as separator ('+' or '-')
- * \param noProblem A reference to a bool, set to true if there was no problem, false otherwise.
- * \return The first part of the expression that doesn't contain first level operations not nested within parenthesis.
- */
-inline QString extractSubExprLevel1(QString & expr, char & nextOp, bool & noProblem){
-
-	QString ret;
-
-	int subCount = 0;
-
-	bool lastMetIsNumber = false;
-
-	for(int i = 0; i < expr.size(); i++){
-
-		if (expr.at(i) == '(') {
-				subCount++;
-		}
-
-		if (expr.at(i) == ')') {
-				subCount--;
-		}
-
-		if (subCount < 0) {
-				noProblem = false;
-				return ret;
-		}
-
-		if(i == expr.size()-1 && subCount == 0){
-			ret = expr;
-			expr.clear();
-			break;
-		}
-
-		if( (expr.at(i) == '+' || expr.at(i) == '-') &&
-						subCount == 0) {
-
-				if (expr.at(i) == '-' &&
-								i < expr.size()-1) {
-
-						bool cond = !expr.at(i+1).isSpace();
-
-						if (cond && !lastMetIsNumber) {
-								continue;
-						}
-
-				}
-
-				ret = expr.mid(0, i).trimmed();
-				nextOp = expr.at(i).toLatin1();
-				expr = expr.mid(i+1);
-				break;
-
-		}
-
-		if (expr.at(i).isDigit()) {
-				lastMetIsNumber = true;
-		} else if (expr.at(i) != '.' &&
-						  !expr.at(i).isSpace()) {
-				lastMetIsNumber = false;
-		}
-
-	}
-
-	noProblem = true;
-	return ret;
-}
-
-
-/*!
- * \brief extractSubExprLevel2 extract from an expression the part of an expression that need to be treated recursivly before computing level 2 operations (*, /).
- * \param expr The expression to treat, the part returned will be removed.
- * \param nextOp This reference, in case of sucess, will hold the first level operation identified as separator ('*' or '/')
- * \param noProblem A reference to a bool, set to true if there was no problem, false otherwise.
- * \return The first part of the expression that doesn't contain second level operations not nested within parenthesis.
- */
-inline QString extractSubExprLevel2(QString & expr, char & nextOp, bool & noProblem){
-
-	QString ret;
-
-	int subCount = 0;
-
-	for(int i = 0; i < expr.size(); i++){
-
-		if (expr.at(i) == '(') {
-				subCount++;
-		}
-
-		if (expr.at(i) == ')') {
-				subCount--;
-		}
-
-		if (subCount < 0) {
-				noProblem = false;
-				return ret;
-		}
-
-		if(i == expr.size()-1 && subCount == 0){
-			ret = expr;
-			expr.clear();
-			break;
-		}
-
-		if( (expr.at(i) == '*' || expr.at(i) == '/') &&
-						subCount == 0) {
-
-				ret = expr.mid(0, i).trimmed();
-				nextOp = expr.at(i).toLatin1();
-				expr = expr.mid(i+1);
-				break;
-
-		}
-
-	}
-
-	noProblem = true;
-	return ret;
-}
-
-/*!
- * \brief treatLevel1 treat an expression at the first level of recursion.
- * \param expr The expression to treat.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed expression or subexpression or 0 in case of error.
- */
-double treatLevel1(const QString &expr, bool & noProblem)
-{
-
-        noProblem = true;
-
-		QString exprDestructable = expr;
-
-		char nextOp = '+';
-		double result = 0.0;
-
-		while (!exprDestructable.isEmpty()) {
-
-			double sign = (nextOp == '-') ? -1 : 1;
-			QString part = extractSubExprLevel1(exprDestructable, nextOp, noProblem);
-
-			if (!noProblem) {
-				return 0.0;
-			}
-
-			if (sign > 0) {
-				result += treatLevel2(part, noProblem);
-			} else {
-				result -= treatLevel2(part, noProblem);
-			}
-
-			if(!noProblem){
-				return 0.0;
-			}
-		}
-
-        return result;
-
-}
-
-/*!
- * \brief treatLevel2 treat a subexpression at the second level of recursion.
- * \param expr The subexpression to treat.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed subexpression or 0 in case of error.
- *
- * The expression should not contain first level operations not nested in parenthesis.
- */
-double treatLevel2(QString const& expr, bool & noProblem)
-{
-
-        noProblem = true;
-
-		QString exprDestructable = expr;
-
-		char nextOp = '*';
-
-		QString part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
-
-		double result = treatLevel3(part, noProblem);
-
-		while (!exprDestructable.isEmpty()) {
-
-			if (!noProblem) {
-				return 0.0;
-			}
-
-			bool needToMultiply = (nextOp == '*');
-			part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
-
-			if (!noProblem) {
-				return 0.0;
-			}
-
-			if (needToMultiply) {
-				result *= treatLevel3(part, noProblem);
-			} else {
-				result /= treatLevel3(part, noProblem);
-			}
-		}
-
-		return result;
-}
-
-/*!
- * \brief treatLevel3 treat a subexpression at the third level of recursion.
- * \param expr The subexpression to treat.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed subexpression or 0 in case of error.
- *
- * The expression should not contain first or second level operations not nested in parenthesis.
- */
-double treatLevel3(const QString &expr, bool & noProblem)
-{
-
-        noProblem = true;
-
-        int indexPower = -1;
-        int indexCount = 0;
-        int subLevels = 0;
-
-		for (int i = 0; i < expr.size(); i++) {
-				if (expr.at(i) == '(') {
-                        subLevels++;
-				} else if(expr.at(i) == ')') {
-                        subLevels--;
-						if (subLevels < 0) {
-                                noProblem = false;
-                                return 0.0;
-                        }
-				} else if (expr.at(i) == '^') {
-						if (subLevels == 0) {
-                                indexPower = i;
-                                indexCount++;
-                        }
-                }
-        }
-
-		if (indexCount > 1 || indexPower + 1 >= expr.size()) {
-                noProblem = false;
-                return 0.0;
-        }
-
-		if (indexPower > -1) {
-
-				QStringList subExprs;
-				subExprs << expr.mid(0,indexPower);
-				subExprs << expr.mid(indexPower+1);
-
-                bool noProb1 = true;
-                bool noProb2 = true;
-
-                double base = treatFuncs(subExprs[0], noProb1);
-                double power = treatFuncs(subExprs[1], noProb2);
-
-                return qPow(base, power);
-
-		} else {
-                return treatFuncs(expr, noProblem);
-        }
-
-        noProblem = false;
-        return 0.0;
-
-}
-
-/*!
- * \brief treatFuncs treat the last level of recursion: parenthesis and functions.
- * \param expr The expression to parse.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed subexpression or 0 in case of error.
- *
- * The expression should not contain operators not nested anymore. The subexpressions within parenthesis will be treated by recalling the level 1 function.
- */
-double treatFuncs(QString const& expr, bool & noProblem)
-{
-
-        noProblem = true;
-
-        QRegExp funcExp = funcExpr; //copy the expression in the current execution stack, to avoid errors for example when multiple thread call this function.
-        QRegExp numExp = numberExpr;
-
-		if (funcExp.exactMatch(expr.trimmed())) {
-
-                int sign = funcExp.capturedTexts()[1].isEmpty() ? 1 : -1;
-                QString func = funcExp.capturedTexts()[2].toLower();
-                QString subExpr = funcExp.capturedTexts()[3];
-
-                double val = treatLevel1(subExpr, noProblem);
-
-				if (!noProblem) {
-                        return 0.0;
-                }
-
-				if (func.isEmpty()) {
-                        return sign*val;
-                }
-
-				if (!supportedFuncs.contains(func)) {
-                        noProblem = false;
-                        return 0.0;
-                }
-
-                //trigonometry is done in degree
-				if (func == "cos") {
-                        val = qCos(val/180*qAcos(-1));
-				} else if (func == "sin") {
-                        val = qSin(val/180*qAcos(-1));
-				} else if (func == "tan") {
-                        val = qTan(val/180*qAcos(-1));
-				} else if(func == "acos") {
-                        val = qAcos(val)*180/qAcos(-1);
-				} else if (func == "asin") {
-                        val = qAsin(val)*180/qAcos(-1);
-				} else if (func == "atan") {
-                        val = qAtan(val)*180/qAcos(-1);
-				} else if (func == "exp") {
-                        val = qExp(val);
-				} else if (func == "ln") {
-                        val = qLn(val);
-				} else if (func == "log10") {
-                        val = qLn(val)/qLn(10.0);
-				} else if (func == "abs") {
-                        val = qAbs(val);
-                }
-
-                return sign*val;
-		} else if(numExp.exactMatch(expr.trimmed())) {
-                return expr.toDouble(&noProblem);
-        }
-
-        noProblem = false;
-        return 0.0;
-
-}
-
-//int functions
-/*!
- * \brief treatLevel1 treat an expression at the first level of recursion.
- * \param expr The expression to treat.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed expression or subexpression or 0 in case of error.
- */
-double treatLevel1Int(QString const& expr, bool & noProblem)
-{
-
-	noProblem = true;
-
-	QString exprDestructable = expr;
-
-	char nextOp = '+';
-	double result = 0.0;
-
-	while (!exprDestructable.isEmpty()) {
-
-		double sign = (nextOp == '-') ? -1 : 1;
-		QString part = extractSubExprLevel1(exprDestructable, nextOp, noProblem);
-
-		if( !noProblem) {
-			return 0.0;
-		}
-
-		if (sign > 0) {
-			result += treatLevel2Int(part, noProblem);
-		} else {
-			result -= treatLevel2Int(part, noProblem);
-		}
-
-		if(!noProblem){
-			return 0.0;
-		}
-	}
-
-	return result;
-
-}
-
-/*!
- * \brief treatLevel2 treat a subexpression at the second level of recursion.
- * \param expr The subexpression to treat.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed subexpression or 0 in case of error.
- *
- * The expression should not contain first level operations not nested in parenthesis.
- */
-double treatLevel2Int(const QString &expr, bool &noProblem)
-{
-
-	noProblem = true;
-
-	QString exprDestructable = expr;
-
-	char nextOp = '*';
-
-	QString part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
-
-	double result = treatFuncsInt(part, noProblem);
-
-	while (!exprDestructable.isEmpty()) {
-
-		if (!noProblem) {
-			return 0.0;
-		}
-
-		bool needToMultiply = (nextOp == '*');
-		part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
-
-		if (!noProblem) {
-			return 0.0;
-		}
-
-		if (needToMultiply) {
-			result *= treatFuncsInt(part, noProblem);
-		} else {
-
-			double val = treatFuncsInt(part, noProblem);
-
-			if(std::isinf(result/val) || std::isnan(result/val)){
-				noProblem = false;
-				return 0.0;
-			}
-
-			result /= val;
-		}
-	}
-
-	return result;
-
-}
-
-/*!
- * \brief treatFuncs treat the last level of recursion: parenthesis
- * \param expr The expression to parse.
- * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
- * \return The value of the parsed subexpression or 0 in case of error.
- *
- * The expression should not contain operators not nested anymore. The subexpressions within parenthesis will be treated by recalling the level 1 function.
- */
-double treatFuncsInt(QString const& expr, bool & noProblem)
-{
-
-        noProblem = true;
-
-        QRegExp funcExpInteger = funcExprInteger;
-        QRegExp integerExp = integerExpr;
-        QRegExp numberExp = numberExpr;
-
-		if (funcExpInteger.exactMatch(expr.trimmed())) {
-
-                int sign = funcExpInteger.capturedTexts()[1].isEmpty() ? 1 : -1;
-                QString subExpr = funcExpInteger.capturedTexts()[2];
-
-				double val = treatLevel1Int(subExpr, noProblem);
-
-				if (!noProblem) {
-                        return 0;
-                }
-
-                return sign*val;
-
-		} else if(numberExp.exactMatch(expr.trimmed())) {
-				double value = QVariant(expr).toDouble(&noProblem);
-				return value;
-        }
-
-        noProblem = false;
-        return 0;
-
-}
diff --git a/libs/ui/widgets/kis_double_widget.cc b/libs/ui/widgets/kis_double_widget.cc
index c0d573403a..c6a2800c95 100644
--- a/libs/ui/widgets/kis_double_widget.cc
+++ b/libs/ui/widgets/kis_double_widget.cc
@@ -1,163 +1,163 @@
 /*
  *  kis_double_widget.cc - part of Krita
  *
  *  Copyright (c) 1999 Carsten Pfeiffer <pfeiffer@kde.org>
  *  Copyright (c) 2004 Adrian Page <adrian@pagenet.plus.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "widgets/kis_double_widget.h"
 
 #include <QLayout>
 #include <QSlider>
 #include <QHBoxLayout>
 #include <QDoubleSpinBox>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 KisDoubleWidget::KisDoubleWidget(QWidget* parent, const char* name)
         : QWidget(parent)
 {
     setObjectName(name);
     init(0, 1);
 }
 
 KisDoubleWidget::KisDoubleWidget(double min, double max, QWidget* parent, const char* name)
         : QWidget(parent)
 {
     setObjectName(name);
     init(min, max);
 }
 
 KisDoubleWidget::~KisDoubleWidget()
 {
 }
 
 void KisDoubleWidget::init(double min, double max)
 {
 	m_spinBox = new KisDoubleParseSpinBox(this);
     m_spinBox->setMinimum(min);
     m_spinBox->setMaximum(max);
     m_spinBox->setSingleStep(0.05);
     m_spinBox->setValue(0);
     m_spinBox->setObjectName("spinbox");
     connect(m_spinBox, SIGNAL(valueChanged(double)), this, SLOT(setSliderValue(double)));
 
     m_slider = new QSlider(Qt::Horizontal, this);
     m_slider->setMinimum(static_cast<int>(min * 100 + 0.5));
     m_slider->setMaximum(static_cast<int>(max * 100 + 0.5));
     m_slider->setPageStep(1);
     m_slider->setValue(0);
     m_slider->setObjectName("slider");
 
     connect(m_slider, SIGNAL(valueChanged(int)), this, SLOT(sliderValueChanged(int)));
     connect(m_slider, SIGNAL(sliderPressed()), SIGNAL(sliderPressed()));
     connect(m_slider, SIGNAL(sliderReleased()), SIGNAL(sliderReleased()));
 
     m_layout = new QHBoxLayout(this);
     m_layout->setObjectName("hbox layout");
     m_layout->setMargin(0);
     m_layout->setSpacing(0);
 
     m_layout->addWidget(m_slider);
     m_layout->addSpacing(5);
     m_layout->addWidget(m_spinBox);
     m_layout->addItem(new QSpacerItem(5, 1, QSizePolicy::Expanding, QSizePolicy::Minimum));
 }
 
 double KisDoubleWidget::value() const
 {
     return m_spinBox->value();
 }
 
 void KisDoubleWidget::setValue(double value)
 {
     int intValue;
 
     if (value < 0) {
         intValue = static_cast<int>(value * 100 - 0.5);
     } else {
         intValue = static_cast<int>(value * 100 + 0.5);
     }
     m_slider->setValue(intValue);
 }
 
 void KisDoubleWidget::setRange(double min, double max)
 {
     m_spinBox->setRange(min, max);
     m_slider->setRange(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5));
 }
 
 void KisDoubleWidget::setTickPosition(QSlider::TickPosition tickPosition)
 {
     m_slider->setTickPosition(tickPosition);
 }
 
 void KisDoubleWidget::setTickInterval(double value)
 {
     m_slider->setTickInterval(static_cast<int>(value * 100 + 0.5));
 }
 
 double KisDoubleWidget::tickInterval() const
 {
     return m_slider->tickInterval() / 100.0;
 }
 
 void KisDoubleWidget::setSliderValue(double value)
 {
     int intValue;
 
     if (value < 0) {
         intValue = static_cast<int>(value * 100 - 0.5);
     } else {
         intValue = static_cast<int>(value * 100 + 0.5);
     }
     m_slider->setValue(intValue);
     emit valueChanged(value);
 }
 
 void KisDoubleWidget::sliderValueChanged(int value)
 {
     m_spinBox->setValue(value / 100.0);
 }
 
 void KisDoubleWidget::setPrecision(int precision)
 {
     m_spinBox->setDecimals(precision);
 }
 
 void KisDoubleWidget::setSingleStep(double step)
 {
     m_spinBox->setSingleStep(step);
     m_slider->setSingleStep(static_cast<int>(step * 100));
 }
 
 void KisDoubleWidget::setPageStep(double step)
 {
     m_slider->setPageStep(static_cast<int>(step * 100));
 }
 
 void KisDoubleWidget::setTracking(bool tracking)
 {
     m_slider->setTracking(tracking);
 }
 
 bool KisDoubleWidget::hasTracking() const
 {
     return m_slider->hasTracking();
 }
 
 
diff --git a/libs/ui/widgets/kis_doubleparsespinbox.cpp b/libs/ui/widgets/kis_doubleparsespinbox.cpp
deleted file mode 100644
index 5f529f8a5e..0000000000
--- a/libs/ui/widgets/kis_doubleparsespinbox.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_doubleparsespinbox.h"
-
-#include "kis_numparser.h"
-
-#include <QLabel>
-#include <QPixmap>
-#include <QIcon>
-#include <QFile>
-#include <QLineEdit>
-
-KisDoubleParseSpinBox::KisDoubleParseSpinBox(QWidget *parent) :
-	QDoubleSpinBox(parent),
-	_isLastValid(true)
-{
-
-	_lastExprParsed = new QString("0.0");
-
-	connect(this, SIGNAL(noMoreParsingError()),
-					this, SLOT(clearErrorStyle()));
-
-	//hack to let the clearError be called, even if the value changed method is the one from QDoubleSpinBox.
-	connect(this, SIGNAL(valueChanged(double)),
-					this, SLOT(clearError()));
-
-	connect(this, SIGNAL(errorWhileParsing(QString)),
-					this, SLOT(setErrorStyle()));
-
-	_oldValue = value();
-
-	_warningIcon = new QLabel(this);
-
-	if (QFile(":/./16_light_warning.svg").exists()) {
-		_warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(16, 16));
-	} else {
-		_warningIcon->setText("!");
-	}
-
-	_warningIcon->setStyleSheet("background:transparent;");
-	_warningIcon->move(1, 1);
-	_warningIcon->setVisible(false);
-
-	_isOldPaletteSaved = false;
-	_areOldMarginsSaved = false;
-
-}
-
-KisDoubleParseSpinBox::~KisDoubleParseSpinBox()
-{
-
-	//needed to avoid a segfault during destruction.
-	delete _lastExprParsed;
-
-}
-
-double KisDoubleParseSpinBox::valueFromText(const QString & text) const
-{
-
-	*_lastExprParsed = text;
-
-	bool ok;
-
-	double ret;
-
-	if ( (suffix().isEmpty() || !text.endsWith(suffix())) &&
-		 (prefix().isEmpty() || !text.startsWith(prefix())) ) {
-
-		ret = KisNumericParser::parseSimpleMathExpr(text, &ok);
-
-	} else {
-
-		QString expr = text;
-
-		if (text.endsWith(suffix())) {
-			expr.remove(text.size()-suffix().size(), suffix().size());
-		}
-
-		if(text.startsWith(prefix())){
-			expr.remove(0, prefix().size());
-		}
-
-		*_lastExprParsed = expr;
-
-		ret = KisNumericParser::parseSimpleMathExpr(expr, &ok);
-
-	}
-
-	if(isnan(ret) || isinf(ret)){
-		ok = false;
-	}
-
-	if (!ok) {
-		if (_isLastValid) {
-			_oldValue = value();
-		}
-
-		_isLastValid = false;
-		ret = _oldValue; //in case of error set to minimum.
-	} else {
-
-		if (!_isLastValid) {
-			_oldValue = ret;
-		}
-
-		_isLastValid = true;
-	}
-
-	return ret;
-
-}
-QString KisDoubleParseSpinBox::textFromValue(double val) const
-{
-
-	if (!_isLastValid) {
-			emit errorWhileParsing(*_lastExprParsed);
-			return *_lastExprParsed;
-	}
-
-	emit noMoreParsingError();
-
-	double v = KisNumericParser::parseSimpleMathExpr(cleanText());
-	v = QString("%1").arg(v, 0, 'f', decimals()).toDouble();
-	if (hasFocus() && (v == value() || (v >= maximum() && value() == maximum()) || (v <= minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
-		return cleanText();
-	}
-
-	return QDoubleSpinBox::textFromValue(val);
-}
-
-QValidator::State KisDoubleParseSpinBox::validate ( QString & input, int & pos ) const
-{
-
-	Q_UNUSED(input);
-	Q_UNUSED(pos);
-
-	return QValidator::Acceptable;
-
-}
-
-void KisDoubleParseSpinBox::stepBy(int steps)
-{
-
-	_isLastValid = true; //reset to valid state so we can use the up and down buttons.
-	emit noMoreParsingError();
-
-	QDoubleSpinBox::stepBy(steps);
-
-}
-
-void KisDoubleParseSpinBox::setValue(double value)
-{
-	if(value == _oldValue && hasFocus()){ //avoid to reset the button when it set the value of something that will recall this slot.
-		return;
-	}
-
-	if (!hasFocus()) {
-		clearError();
-	}
-
-	QDoubleSpinBox::setValue(value);
-}
-
-void KisDoubleParseSpinBox::setErrorStyle()
-{
-
-	if (!_isLastValid) {
-		//setStyleSheet(_oldStyleSheet + "Background: red; color: white; padding-left: 18px;");
-
-		if (!_isOldPaletteSaved) {
-			_oldPalette = palette();
-		}
-		_isOldPaletteSaved = true;
-
-		QPalette nP = _oldPalette;
-		nP.setColor(QPalette::Background, Qt::red);
-		nP.setColor(QPalette::Base, Qt::red);
-		nP.setColor(QPalette::Text, Qt::white);
-		setPalette(nP);
-
-		if (!_areOldMarginsSaved) {
-			_oldMargins = lineEdit()->textMargins();
-		}
-		_areOldMarginsSaved = true;
-
-		if (width() - height() >= 3*height()) { //if we have twice as much place as needed by the warning icon then display it.
-			QMargins newMargins = _oldMargins;
-			newMargins.setLeft( newMargins.left() + height() - 4 );
-			lineEdit()->setTextMargins(newMargins);
-
-			int h = _warningIcon->height();
-			int hp = height()-2;
-
-			if (h != hp) {
-				_warningIcon->resize(hp, hp);
-
-				if (QFile(":/./16_light_warning.svg").exists()) {
-					_warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(hp-7, hp-7));
-				}
-			}
-
-			_warningIcon->move(_oldMargins.left()+4, 1);
-			_warningIcon->setVisible(true);
-		}
-	}
-}
-
-void KisDoubleParseSpinBox::clearErrorStyle()
-{
-	if (_isLastValid) {
-		_warningIcon->setVisible(false);
-
-		//setStyleSheet("");
-
-		setPalette(_oldPalette);
-		_isOldPaletteSaved = false;
-
-		lineEdit()->setTextMargins(_oldMargins);
-		_areOldMarginsSaved = false;
-	}
-}
-void KisDoubleParseSpinBox::clearError()
-{
-	_isLastValid = true;
-	emit noMoreParsingError();
-	_oldValue = value();
-	clearErrorStyle();
-}
diff --git a/libs/ui/widgets/kis_doubleparsespinbox.h b/libs/ui/widgets/kis_doubleparsespinbox.h
deleted file mode 100644
index 2d7d03ac4f..0000000000
--- a/libs/ui/widgets/kis_doubleparsespinbox.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef KISDOUBLEPARSESPINBOX_H
-#define KISDOUBLEPARSESPINBOX_H
-
-#include <QDoubleSpinBox>
-
-#include <kritaui_export.h>
-
-class QLabel;
-
-/*!
- * \brief The KisDoubleParseSpinBox class is a cleverer doubleSpinBox, able to parse arithmetic expressions.
- *
- * Use this spinbox instead of the basic one from Qt if you want it to be able to parse arithmetic expressions.
- */
-class KRITAUI_EXPORT KisDoubleParseSpinBox : public QDoubleSpinBox
-{
-
-	Q_OBJECT
-public:
-		KisDoubleParseSpinBox(QWidget* parent = 0);
-		~KisDoubleParseSpinBox();
-
-		virtual double valueFromText(const QString & text) const;
-		virtual QString textFromValue(double val) const;
-		virtual QValidator::State validate ( QString & input, int & pos ) const;
-
-		virtual void stepBy(int steps);
-
-		void setValue(double value); //polymorphism won't work directly, we use a signal/slot hack to do so but if signals are disabled this function will still be useful.
-
-		bool isLastValid() const{ return _isLastValid; }
-
-Q_SIGNALS:
-
-		//! \brief signal emmitted when the last parsed expression create an error.
-		void errorWhileParsing(QString expr) const;
-		//! \brief signal emmitted when the last parsed expression is valid.
-		void noMoreParsingError() const;
-
-public Q_SLOTS:
-
-		//! \brief useful to let the widget change it's stylesheet when an error occured in the last expression.
-		void setErrorStyle();
-		//! \brief useful to let the widget reset it's stylesheet when there's no more error.
-		void clearErrorStyle();
-		//! \brief say the widget to return to an error free state.
-		void clearError();
-
-protected:
-
-		mutable QString* _lastExprParsed;
-		mutable bool _isLastValid;
-		mutable double _oldValue;
-
-		QLabel* _warningIcon;
-
-		QPalette _oldPalette;
-		bool _isOldPaletteSaved;
-
-		QMargins _oldMargins;
-		bool _areOldMarginsSaved;
-};
-
-#endif // KISDOUBLEPARSESPINBOX_H
diff --git a/libs/ui/widgets/kis_doubleparseunitspinbox.cpp b/libs/ui/widgets/kis_doubleparseunitspinbox.cpp
deleted file mode 100644
index e07f1955b0..0000000000
--- a/libs/ui/widgets/kis_doubleparseunitspinbox.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_doubleparseunitspinbox.h"
-
-
-class Q_DECL_HIDDEN KisDoubleParseUnitSpinBox::Private
-{
-public:
-	Private(double low, double up, double step)
-		: lowerInPoints(low),
-		upperInPoints(up),
-		stepInPoints(step),
-		unit(KoUnit(KoUnit::Point))
-	{
-	}
-
-	double lowerInPoints; ///< lowest value in points
-	double upperInPoints; ///< highest value in points
-	double stepInPoints;  ///< step in points
-	KoUnit unit;
-};
-
-KisDoubleParseUnitSpinBox::KisDoubleParseUnitSpinBox(QWidget *parent) :
-	KisDoubleParseSpinBox(parent),
-	d(new Private(-9999, 9999, 1))
-{
-	setUnit( KoUnit(KoUnit::Point) );
-	setAlignment( Qt::AlignRight );
-
-	connect(this, SIGNAL(valueChanged( double )), SLOT(privateValueChanged()));
-}
-
-KisDoubleParseUnitSpinBox::~KisDoubleParseUnitSpinBox()
-{
-	delete d;
-}
-
-void KisDoubleParseUnitSpinBox::changeValue( double newValue )
-{
-	if (d->unit.toUserValue(newValue) == _oldValue) {
-		return;
-	}
-
-	KisDoubleParseSpinBox::setValue( d->unit.toUserValue(newValue) );
-}
-
-void KisDoubleParseUnitSpinBox::setUnit( const KoUnit & unit)
-{
-	if( unit == d->unit) return;
-	double oldValue = d->unit.fromUserValue( KisDoubleParseSpinBox::value() );
-
-	KisDoubleParseSpinBox::setMinimum( unit.toUserValue( d->lowerInPoints ) );
-	KisDoubleParseSpinBox::setMaximum( unit.toUserValue( d->upperInPoints ) );
-
-	qreal step = unit.toUserValue( d->stepInPoints );
-
-	if (unit.type() == KoUnit::Pixel) {
-		// limit the pixel step by 1.0
-		step = qMax(qreal(1.0), step);
-	}
-
-	KisDoubleParseSpinBox::setSingleStep( step );
-	d->unit = unit;
-	KisDoubleParseSpinBox::setValue( KoUnit::ptToUnit( oldValue, unit ) );
-	setSuffix( unit.symbol().prepend(QLatin1Char(' ')) );
-}
-
-double KisDoubleParseUnitSpinBox::value( ) const
-{
-	return d->unit.fromUserValue( KisDoubleParseSpinBox::value() );
-}
-
-void KisDoubleParseUnitSpinBox::setMinimum(double min)
-{
-	d->lowerInPoints = min;
-	KisDoubleParseSpinBox::setMinimum( d->unit.toUserValue( min ) );
-}
-
-void KisDoubleParseUnitSpinBox::setMaximum(double max)
-{
-	d->upperInPoints = max;
-	KisDoubleParseSpinBox::setMaximum( d->unit.toUserValue( max ) );
-}
-
-void KisDoubleParseUnitSpinBox::setLineStep(double step)
-{
-	d->stepInPoints = KoUnit(KoUnit::Point).toUserValue(step);
-	KisDoubleParseSpinBox::setSingleStep( step );
-}
-
-void KisDoubleParseUnitSpinBox::setLineStepPt(double step)
-{
-	d->stepInPoints = step;
-	KisDoubleParseSpinBox::setSingleStep( d->unit.toUserValue( step ) );
-}
-
-
-void KisDoubleParseUnitSpinBox::setMinMaxStep( double min, double max, double step )
-{
-	setMinimum( min );
-	setMaximum( max );
-	setLineStepPt( step );
-}
-
-
-QValidator::State KisDoubleParseUnitSpinBox::validate(QString &input, int &pos) const
-{
-	Q_UNUSED(pos);
-
-	QRegExp regexp ("([ a-zA-Z]+)$"); // Letters or spaces at end
-	const int res = input.indexOf( regexp );
-
-	if ( res == -1 ) {
-		// Nothing like an unit? The user is probably editing the unit
-		return QValidator::Intermediate;
-	}
-
-	QString expr ( input.left( res ) );
-	const QString unitName ( regexp.cap( 1 ).trimmed().toLower() );
-
-	bool ok = true;
-	bool interm = false;
-
-	QValidator::State exprState = KisDoubleParseSpinBox::validate(expr, pos);
-
-	if (exprState == QValidator::Invalid) {
-		return exprState;
-	} else if (exprState == QValidator::Intermediate) {
-		interm = true;
-	}
-
-	//check if we can parse the unit.
-	KoUnit::fromSymbol(unitName, &ok);
-
-	if (!ok || interm) {
-		return QValidator::Intermediate;
-	}
-
-	return QValidator::Acceptable;
-}
-
-QString KisDoubleParseUnitSpinBox::textFromValue( double value ) const
-{
-	return KisDoubleParseSpinBox::textFromValue(value);
-}
-
-double KisDoubleParseUnitSpinBox::valueFromText( const QString& str ) const
-{
-	//KisDoubleParseSpinBox is supposed to remove the suffix and prefix by itself.
-	return KisDoubleParseSpinBox::valueFromText(str);
-}
-
-void KisDoubleParseUnitSpinBox::privateValueChanged()
-{
-	emit valueChangedPt( value() );
-}
diff --git a/libs/ui/widgets/kis_doubleparseunitspinbox.h b/libs/ui/widgets/kis_doubleparseunitspinbox.h
deleted file mode 100644
index eccc0558cc..0000000000
--- a/libs/ui/widgets/kis_doubleparseunitspinbox.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef KIS_DOUBLEPARSEUNITSPINBOX_H
-#define KIS_DOUBLEPARSEUNITSPINBOX_H
-
-#include <KoUnit.h>
-
-#include "kis_doubleparsespinbox.h"
-#include <kritaui_export.h>
-
-/*!
- * \brief The KisDoubleParseUnitSpinBox class is an evolution of the \see KoUnitDoubleSpinBox, but inherit from \see KisDoubleParseSpinBox to be able to parse math expressions.
- *
- * This class store the
- */
-class KRITAUI_EXPORT  KisDoubleParseUnitSpinBox : public KisDoubleParseSpinBox
-{
-
-	Q_OBJECT
-
-public:
-	KisDoubleParseUnitSpinBox(QWidget* parent = 0);
-	~KisDoubleParseUnitSpinBox();
-
-	/**
-	 * Set the new value in points which will then be converted to the current unit for display
-	 * @param newValue the new value
-	 * @see value()
-	 */
-	virtual void changeValue( double newValue );
-	/**
-	 * This spinbox shows the internal value after a conversion to the unit set here.
-	 */
-	virtual void setUnit(const KoUnit &unit);
-
-	/// @return the current value, converted in points
-	double value( ) const;
-
-	/// Set minimum value in points.
-	void setMinimum(double min);
-
-	/// Set maximum value in points.
-	void setMaximum(double max);
-
-	/// Set step size in the current unit.
-	void setLineStep(double step);
-
-	/// Set step size in points.
-	void setLineStepPt(double step);
-
-	/// Set minimum, maximum value and the step size (all in points)
-	void setMinMaxStep( double min, double max, double step );
-
-	/// reimplemented from superclass, will forward to KoUnitDoubleValidator
-	virtual QValidator::State validate(QString &input, int &pos) const;
-
-	/**
-	 * Transform the double in a nice text, using locale symbols
-	 * @param value the number as double
-	 * @return the resulting string
-	 */
-	virtual QString textFromValue( double value ) const;
-	/**
-	 * Transfrom a string into a double, while taking care of locale specific symbols.
-	 * @param str the string to transform into a number
-	 * @return the value as double
-	 */
-	virtual double valueFromText( const QString& str ) const;
-
-Q_SIGNALS:
-	/// emitted like valueChanged in the parent, but this one emits the point value
-	void valueChangedPt( qreal );
-
-
-private:
-	class Private;
-	Private * const d;
-
-private Q_SLOTS:
-	// exists to do emits for valueChangedPt
-	void privateValueChanged();
-};
-
-#endif // KIS_DOUBLEPARSEUNITSPINBOX_H
diff --git a/libs/ui/widgets/kis_intparsespinbox.cpp b/libs/ui/widgets/kis_intparsespinbox.cpp
deleted file mode 100644
index adf0ba14ec..0000000000
--- a/libs/ui/widgets/kis_intparsespinbox.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_intparsespinbox.h"
-
-#include "kis_numparser.h"
-
-#include <QLabel>
-#include <QPixmap>
-#include <QIcon>
-#include <QFile>
-#include <QLineEdit>
-
-KisIntParseSpinBox::KisIntParseSpinBox(QWidget *parent) :
-    QSpinBox(parent),
-    _isLastValid(true)
-{
-    _lastExprParsed = new QString("0");
-
-    connect(this, SIGNAL(noMoreParsingError()),
-					this, SLOT(clearErrorStyle()));
-
-	//hack to let the clearError be called, even if the value changed method is the one from QSpinBox.
-	connect(this, SIGNAL(valueChanged(int)),
-					this, SLOT(clearError()));
-
-	connect(this, SIGNAL(errorWhileParsing(QString)),
-					this, SLOT(setErrorStyle()));
-
-	_oldVal = value();
-
-	_warningIcon = new QLabel(this);
-
-	if (QFile(":/./16_light_warning.svg").exists()) {
-		_warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(16, 16));
-	} else {
-		_warningIcon->setText("!");
-	}
-
-	_warningIcon->setStyleSheet("background:transparent;");
-	_warningIcon->move(1, 1);
-	_warningIcon->setVisible(false);
-
-	_isOldPaletteSaved = false;
-	_areOldMarginsSaved = false;
-
-}
-
-KisIntParseSpinBox::~KisIntParseSpinBox()
-{
-
-    //needed to avoid a segfault during destruction.
-    delete _lastExprParsed;
-
-}
-
-int KisIntParseSpinBox::valueFromText(const QString & text) const
-{
-
-    *_lastExprParsed = text;
-
-    bool ok;
-
-	int val;
-
-	if ( (suffix().isEmpty() || !text.endsWith(suffix())) &&
-		 (prefix().isEmpty() || !text.startsWith(prefix())) ) {
-
-		val = KisNumericParser::parseIntegerMathExpr(text, &ok);
-
-	} else {
-
-		QString expr = text;
-
-		if (text.endsWith(suffix())) {
-			expr.remove(text.size()-suffix().size(), suffix().size());
-		}
-
-		if(text.startsWith(prefix())){
-			expr.remove(0, prefix().size());
-		}
-
-		*_lastExprParsed = expr;
-
-		val = KisNumericParser::parseIntegerMathExpr(expr, &ok);
-
-	}
-
-	if (text.trimmed().isEmpty()) { //an empty text is considered valid in this case.
-            ok = true;
-    }
-
-	if (!ok) {
-
-			if (_isLastValid == true) {
-				_oldVal = value();
-			}
-
-            _isLastValid = false;
-            //emit errorWhileParsing(text); //if uncommented become red everytime the string is wrong.
-			val = _oldVal;
-    } else {
-
-			if (_isLastValid == false) {
-				_oldVal = val;
-			}
-
-            _isLastValid = true;
-            //emit noMoreParsingError();
-    }
-
-    return val;
-
-}
-
-QString KisIntParseSpinBox::textFromValue(int val) const
-{
-
-	if (!_isLastValid) {
-		emit errorWhileParsing(*_lastExprParsed);
-		return *_lastExprParsed;
-	}
-
-    emit noMoreParsingError();
-
-	int v = KisNumericParser::parseIntegerMathExpr(cleanText());
-	if (hasFocus() && (v == value() || (v >= maximum() && value() == maximum()) || (v <= minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
-		return cleanText();
-	}
-
-    return QSpinBox::textFromValue(val);
-
-}
-
-QValidator::State KisIntParseSpinBox::validate ( QString & input, int & pos ) const
-{
-
-    Q_UNUSED(input);
-    Q_UNUSED(pos);
-
-	//this simple definition is sufficient for the moment
-	//TODO: see if needed to get something more complex.
-    return QValidator::Acceptable;
-
-}
-
-void KisIntParseSpinBox::stepBy(int steps)
-{
-
-    _isLastValid = true;
-    emit noMoreParsingError();
-
-    QSpinBox::stepBy(steps);
-
-}
-
-void KisIntParseSpinBox::setValue(int val)
-{
-
-	if(val == _oldVal && hasFocus()){ //avoid to reset the button when it set the value of something that will recall this slot.
-		return;
-	}
-
-	if (!hasFocus()) {
-		clearError();
-	}
-
-	QSpinBox::setValue(val);
-}
-
-void KisIntParseSpinBox::setErrorStyle()
-{
-
-	if (!_isLastValid) {
-		//setStyleSheet(_oldStyleSheet + "Background: red; color: white; padding-left: 18px;");
-
-		if (!_isOldPaletteSaved) {
-			_oldPalette = palette();
-		}
-		_isOldPaletteSaved = true;
-
-		QPalette nP = _oldPalette;
-		nP.setColor(QPalette::Background, Qt::red);
-		nP.setColor(QPalette::Base, Qt::red);
-		nP.setColor(QPalette::Text, Qt::white);
-		setPalette(nP);
-
-		if (!_areOldMarginsSaved) {
-			_oldMargins = lineEdit()->textMargins();
-		}
-		_areOldMarginsSaved = true;
-
-		if (width() - height() >= 3*height()) { //if we have twice as much place as needed by the warning icon then display it.
-			QMargins newMargins = _oldMargins;
-			newMargins.setLeft( newMargins.left() + height() - 4 );
-			lineEdit()->setTextMargins(newMargins);
-
-			int h = _warningIcon->height();
-			int hp = height()-2;
-
-			if (h != hp) {
-				_warningIcon->resize(hp, hp);
-
-				if (QFile(":/./16_light_warning.svg").exists()) {
-					_warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(hp-7, hp-7));
-				}
-			}
-
-			_warningIcon->move(_oldMargins.left()+4, 1);
-			_warningIcon->setVisible(true);
-		}
-	}
-}
-
-void KisIntParseSpinBox::clearErrorStyle()
-{
-	if (_isLastValid) {
-		_warningIcon->setVisible(false);
-
-		//setStyleSheet("");
-
-		setPalette(_oldPalette);
-		_isOldPaletteSaved = false;
-
-		lineEdit()->setTextMargins(_oldMargins);
-		_areOldMarginsSaved = false;
-    }
-}
-
-
-void KisIntParseSpinBox::clearError()
-{
-	_isLastValid = true;
-	emit noMoreParsingError();
-	_oldVal = value();
-	clearErrorStyle();
-}
diff --git a/libs/ui/widgets/kis_intparsespinbox.h b/libs/ui/widgets/kis_intparsespinbox.h
deleted file mode 100644
index df926e9e9b..0000000000
--- a/libs/ui/widgets/kis_intparsespinbox.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef KISINTPARSESPINBOX_H
-#define KISINTPARSESPINBOX_H
-
-#include <QSpinBox>
-
-#include "kritaui_export.h"
-
-class QLabel;
-
-/*!
- * \brief The KisDoubleParseSpinBox class is a cleverer doubleSpinBox, able to parse arithmetic expressions.
- *
- * Use this spinbox instead of the basic one from Qt if you want it to be able to parse arithmetic expressions.
- */
-class KRITAUI_EXPORT KisIntParseSpinBox : public QSpinBox
-{
-	Q_OBJECT
-
-public:
-		KisIntParseSpinBox(QWidget *parent = 0);
-		~KisIntParseSpinBox();
-
-		virtual int valueFromText(const QString & text) const;
-		virtual QString textFromValue(int val) const;
-		virtual QValidator::State validate ( QString & input, int & pos ) const;
-
-		virtual void stepBy(int steps);
-
-		void setValue(int val); //polymorphism won't work directly, we use a signal/slot hack to do so but if signals are disabled this function will still be useful.
-
-		bool isLastValid() const{ return _isLastValid; }
-
-Q_SIGNALS:
-
-		//! \brief signal emmitted when the last parsed expression create an error.
-		void errorWhileParsing(QString expr) const;
-		//! \brief signal emmitted when the last parsed expression is valid.
-		void noMoreParsingError() const;
-
-public Q_SLOTS:
-
-		//! \brief useful to let the widget change it's stylesheet when an error occured in the last expression.
-		void setErrorStyle();
-		//! \brief useful to let the widget reset it's stylesheet when there's no more error.
-		void clearErrorStyle();
-		//! \brief say the widget to return to an error free state.
-		void clearError();
-
-protected:
-
-		mutable QString* _lastExprParsed;
-		mutable bool _isLastValid;
-		mutable int _oldVal; //store the last correctly evaluated value.
-
-		QLabel* _warningIcon;
-
-		QPalette _oldPalette;
-		bool _isOldPaletteSaved;
-
-		QMargins _oldMargins;
-		bool _areOldMarginsSaved;
-};
-
-#endif // KISINTPARSESPINBOX_H
diff --git a/libs/ui/widgets/kis_multi_double_filter_widget.h b/libs/ui/widgets/kis_multi_double_filter_widget.h
index 763a8df583..88b63c2163 100644
--- a/libs/ui/widgets/kis_multi_double_filter_widget.h
+++ b/libs/ui/widgets/kis_multi_double_filter_widget.h
@@ -1,84 +1,84 @@
 /*
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef _KIS_MULTI_DOUBLE_FILTER_WIDGET_H_
 #define _KIS_MULTI_DOUBLE_FILTER_WIDGET_H_
 
 #include <vector>
 
 #include <QDoubleSpinBox>
 
 #include <kis_config_widget.h>
 #include "kritaui_export.h"
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 class KisDelayedActionDoubleInput : public KisDoubleParseSpinBox
 {
     Q_OBJECT
 
 public:
     KisDelayedActionDoubleInput(QWidget * parent, const QString & name);
 
     void cancelDelayedSignal();
 
 private Q_SLOTS:
     void slotValueChanged();
     void slotTimeToUpdate();
 
 Q_SIGNALS:
     void valueChangedDelayed(double value);
 
 private:
 
     QTimer * m_timer;
 };
 
 
 struct KRITAUI_EXPORT KisDoubleWidgetParam {
     KisDoubleWidgetParam(double nmin, double nmax, double ninitvalue, const QString & label, const QString & nname);
     double min;
     double max;
     double initvalue;
     QString label;
     QString name;
 };
 
 typedef std::vector<KisDoubleWidgetParam> vKisDoubleWidgetParam;
 
 class KRITAUI_EXPORT KisMultiDoubleFilterWidget : public KisConfigWidget
 {
     Q_OBJECT
 public:
     KisMultiDoubleFilterWidget(const QString & filterid, QWidget * parent, const QString & caption, vKisDoubleWidgetParam dwparam);
     virtual void setConfiguration(const KisPropertiesConfiguration * cfg);
     virtual KisPropertiesConfiguration* configuration() const;
 public:
     inline qint32 nbValues() const {
         return m_nbdoubleWidgets;
     }
     inline double valueAt(qint32 i) {
         return m_doubleWidgets[i]->value();
     }
 private:
     KisDelayedActionDoubleInput** m_doubleWidgets;
     qint32 m_nbdoubleWidgets;
     QString m_filterid;
 };
 
 #endif
diff --git a/libs/ui/widgets/kis_multi_integer_filter_widget.h b/libs/ui/widgets/kis_multi_integer_filter_widget.h
index 24e3dcddc1..81d1fc3d0d 100644
--- a/libs/ui/widgets/kis_multi_integer_filter_widget.h
+++ b/libs/ui/widgets/kis_multi_integer_filter_widget.h
@@ -1,85 +1,85 @@
 /*
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef _KIS_MULTI_INTEGER_FILTER_WIDGET_H_
 #define _KIS_MULTI_INTEGER_FILTER_WIDGET_H_
 
 #include <kis_config_widget.h>
 #include "kritaui_export.h"
 #include <kis_debug.h>
 #include <QVector>
 #include <QSpinBox>
 
-#include "kis_intparsespinbox.h"
+#include "kis_int_parse_spin_box.h"
 
 #include <vector>
 
 class KisDelayedActionIntegerInput : public KisIntParseSpinBox
 {
     Q_OBJECT
 
 public:
     KisDelayedActionIntegerInput(QWidget * parent, const QString & name);
     void cancelDelayedSignal();
 
 private Q_SLOTS:
     void slotValueChanged();
     void slotTimeToUpdate();
 
 Q_SIGNALS:
     void valueChangedDelayed(int value);
 
 private:
     QTimer * m_timer;
 };
 
 
 struct KRITAUI_EXPORT KisIntegerWidgetParam {
 
     KisIntegerWidgetParam(qint32 nmin, qint32 nmax, qint32 ninitvalue, const QString& label, const QString& nname);
 
     qint32 min;
     qint32 max;
     qint32 initvalue;
     QString label;
     QString name;
 };
 
 typedef std::vector<KisIntegerWidgetParam> vKisIntegerWidgetParam;
 
 class KRITAUI_EXPORT KisMultiIntegerFilterWidget : public KisConfigWidget
 {
     Q_OBJECT
 public:
     KisMultiIntegerFilterWidget(const QString& filterid, QWidget* parent, const QString& caption, vKisIntegerWidgetParam iwparam);
     ~KisMultiIntegerFilterWidget();
 
     virtual void setConfiguration(const KisPropertiesConfiguration* config);
     virtual KisPropertiesConfiguration* configuration() const;
 
 private:
 
     qint32 nbValues() const;
     qint32 valueAt(qint32 i);
 
     QVector<KisDelayedActionIntegerInput*> m_integerWidgets;
     QString m_filterid;
     KisPropertiesConfiguration* m_config;
 };
 
 #endif
diff --git a/libs/ui/widgets/kis_slider_spin_box.cpp b/libs/ui/widgets/kis_slider_spin_box.cpp
index bb3f0f1032..1f96baf90d 100644
--- a/libs/ui/widgets/kis_slider_spin_box.cpp
+++ b/libs/ui/widgets/kis_slider_spin_box.cpp
@@ -1,1019 +1,1019 @@
 /* This file is part of the KDE project
  * Copyright (c) 2010 Justin Noel <justin@ics.com>
  * Copyright (c) 2010 Cyrille Berger <cberger@cberger.net>
  * Copyright (c) 2015 Moritz Molch <kde@moritzmolch.de>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 #include "kis_slider_spin_box.h"
 
 #include <math.h>
 
 #include <QPainter>
 #include <QStyle>
 #include <QLineEdit>
 #include <QApplication>
 #include <QKeyEvent>
 #include <QMouseEvent>
 #include <QIntValidator>
 #include <QTimer>
 #include <QtDebug>
 #include <QDoubleSpinBox>
 
 #include "KisPart.h"
 #include "input/kis_input_manager.h"
 
-#include "kis_numparser.h"
+#include "kis_num_parser.h"
 
 class KisAbstractSliderSpinBoxPrivate {
 public:
     enum Style {
         STYLE_NOQUIRK,
         STYLE_PLASTIQUE,
         STYLE_BREEZE,
         STYLE_FUSION,
     };
 
     QLineEdit* edit;
     QDoubleValidator* validator;
     bool upButtonDown;
     bool downButtonDown;
     int factor;
     int fastSliderStep;
     qreal slowFactor;
     qreal shiftPercent;
     bool shiftMode;
     QString prefix;
     QString suffix;
     qreal exponentRatio;
     int value;
     int maximum;
     int minimum;
     int singleStep;
     QSpinBox* dummySpinBox;
     Style style;
     bool blockUpdateSignalOnDrag;
 	bool parseInt;
 };
 
 KisAbstractSliderSpinBox::KisAbstractSliderSpinBox(QWidget* parent, KisAbstractSliderSpinBoxPrivate* _d)
     : QWidget(parent)
     , d_ptr(_d)
 {
     Q_D(KisAbstractSliderSpinBox);
     QEvent e(QEvent::StyleChange);
     changeEvent(&e);
 
     d->upButtonDown = false;
     d->downButtonDown = false;
     d->edit = new QLineEdit(this);
     d->edit->setFrame(false);
     d->edit->setAlignment(Qt::AlignCenter);
     d->edit->hide();
     d->edit->setContentsMargins(0,0,0,0);
     d->edit->installEventFilter(this);
 
     //Make edit transparent
     d->edit->setAutoFillBackground(false);
     QPalette pal = d->edit->palette();
     pal.setColor(QPalette::Base, Qt::transparent);
     d->edit->setPalette(pal);
 
     connect(d->edit, SIGNAL(editingFinished()), this, SLOT(editLostFocus()));
 
 	d->validator = new QDoubleValidator(d->edit);
 	//d->edit->setValidator(d->validator);
 
     d->value = 0;
     d->minimum = 0;
     d->maximum = 100;
     d->factor = 1.0;
     d->singleStep = 1;
     d->fastSliderStep = 5;
     d->slowFactor = 0.1;
     d->shiftMode = false;
     d->blockUpdateSignalOnDrag = false;
 
 	d->parseInt = false;
 
     setExponentRatio(1.0);
 
     //Set sane defaults
     setFocusPolicy(Qt::StrongFocus);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     //dummy needed to fix a bug in the polyester theme
     d->dummySpinBox = new QSpinBox(this);
     d->dummySpinBox->hide();
 }
 
 KisAbstractSliderSpinBox::~KisAbstractSliderSpinBox()
 {
     Q_D(KisAbstractSliderSpinBox);
     delete d;
 }
 
 void KisAbstractSliderSpinBox::showEdit()
 {
     Q_D(KisAbstractSliderSpinBox);
     if (d->edit->isVisible()) return;
     if (d->style == KisAbstractSliderSpinBoxPrivate::STYLE_PLASTIQUE) {
         d->edit->setGeometry(progressRect(spinBoxOptions()).adjusted(0,0,-2,0));
     }
     else {
         d->edit->setGeometry(progressRect(spinBoxOptions()));
     }
     d->edit->setText(valueString());
     d->edit->selectAll();
     d->edit->show();
     d->edit->setFocus(Qt::OtherFocusReason);
     update();
     KisPart::currentInputManager()->slotFocusOnEnter(false);
 }
 
 void KisAbstractSliderSpinBox::hideEdit()
 {
     Q_D(KisAbstractSliderSpinBox);
     d->edit->hide();
     update();
     KisPart::currentInputManager()->slotFocusOnEnter(true);
 }
 
 void KisAbstractSliderSpinBox::paintEvent(QPaintEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
     Q_UNUSED(e)
 
     QPainter painter(this);
 
     switch (d->style) {
     case KisAbstractSliderSpinBoxPrivate::STYLE_FUSION:
         paintFusion(painter);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_PLASTIQUE:
         paintPlastique(painter);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_BREEZE:
         paintBreeze(painter);
         break;
     default:
         paint(painter);
         break;
     }
 
     painter.end();
 }
 
 void KisAbstractSliderSpinBox::paint(QPainter &painter)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     //Create options to draw spin box parts
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
     spinOpts.rect.adjust(0, 2, 0, -2);
 
     //Draw "SpinBox".Clip off the area of the lineEdit to avoid double
     //borders being drawn
     painter.save();
     painter.setClipping(true);
 
     QRect eraseRect(QPoint(rect().x(), rect().y()),
                     QPoint(progressRect(spinOpts).right(), rect().bottom()));
 
     painter.setClipRegion(QRegion(rect()).subtracted(eraseRect));
     style()->drawComplexControl(QStyle::CC_SpinBox, &spinOpts, &painter, d->dummySpinBox);
     painter.setClipping(false);
     painter.restore();
 
 
     QStyleOptionProgressBar progressOpts = progressBarOptions();
     progressOpts.rect.adjust(0, 2, 0, -2);
     style()->drawControl(QStyle::CE_ProgressBar, &progressOpts, &painter, 0);
 
     //Draw focus if necessary
     if (hasFocus() &&
             d->edit->hasFocus()) {
         QStyleOptionFocusRect focusOpts;
         focusOpts.initFrom(this);
         focusOpts.rect = progressOpts.rect;
         focusOpts.backgroundColor = palette().color(QPalette::Window);
         style()->drawPrimitive(QStyle::PE_FrameFocusRect, &focusOpts, &painter, this);
     }
 }
 
 void KisAbstractSliderSpinBox::paintFusion(QPainter &painter)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
     spinOpts.frame = true;
     spinOpts.rect.adjust(0, -1, 0, 1);
     //spinOpts.palette().setBrush(QPalette::Base, palette().highlight());
     QStyleOptionProgressBar progressOpts = progressBarOptions();
 
     style()->drawComplexControl(QStyle::CC_SpinBox, &spinOpts, &painter, d->dummySpinBox);
 
     painter.save();
 
     QRect rect = progressOpts.rect.adjusted(1,2,-4,-2);
     QRect leftRect;
 
     int progressIndicatorPos = (progressOpts.progress - qreal(progressOpts.minimum)) / qMax(qreal(1.0),
                                qreal(progressOpts.maximum) - progressOpts.minimum) * rect.width();
 
     if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width() && (progressOpts.progress != 0)) {
         leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height());
     } else if (progressIndicatorPos > rect.width()) {
         painter.setPen(palette().highlightedText().color());
     } else {
         painter.setPen(palette().buttonText().color());
     }
 
     QRegion rightRect = rect;
     rightRect = rightRect.subtracted(leftRect);
 
     QTextOption textOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter);
     textOption.setWrapMode(QTextOption::NoWrap);
 
     if (!(d->edit && d->edit->isVisible())) {
         painter.setClipRegion(rightRect);
         painter.setClipping(true);
         painter.drawText(rect.adjusted(-2,0,2,0), progressOpts.text, textOption);
         painter.setClipping(false);
     }
 
     if (!leftRect.isNull()) {
         painter.setClipRect(leftRect.adjusted(0, -1, 1, 1));
         painter.setPen(palette().highlight().color());
         painter.setBrush(palette().highlight());
 
         spinOpts.palette.setBrush(QPalette::Base, palette().highlight());
         style()->drawComplexControl(QStyle::CC_SpinBox, &spinOpts, &painter, d->dummySpinBox);
 
         if (!(d->edit && d->edit->isVisible())) {
             painter.setPen(palette().highlightedText().color());
             painter.setClipping(true);
             painter.drawText(rect.adjusted(-2,0,2,0), progressOpts.text, textOption);
         }
         painter.setClipping(false);
     }
 
     painter.restore();
 }
 
 void KisAbstractSliderSpinBox::paintPlastique(QPainter &painter)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
     QStyleOptionProgressBar progressOpts = progressBarOptions();
 
     style()->drawComplexControl(QStyle::CC_SpinBox, &spinOpts, &painter, d->dummySpinBox);
 
     painter.save();
 
     QRect rect = progressOpts.rect.adjusted(2,0,-2,0);
     QRect leftRect;
 
     int progressIndicatorPos = (progressOpts.progress - qreal(progressOpts.minimum)) / qMax(qreal(1.0),
                                qreal(progressOpts.maximum) - progressOpts.minimum) * rect.width();
 
     if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width() && (progressOpts.progress != 0)) {
         leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height());
     } else if (progressIndicatorPos > rect.width()) {
         painter.setPen(palette().highlightedText().color());
     } else {
         painter.setPen(palette().buttonText().color());
     }
 
     QRegion rightRect = rect;
     rightRect = rightRect.subtracted(leftRect);
 
     QTextOption textOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter);
     textOption.setWrapMode(QTextOption::NoWrap);
 
     if (!(d->edit && d->edit->isVisible())) {
         painter.setClipRegion(rightRect);
         painter.setClipping(true);
         painter.drawText(rect.adjusted(-2,0,2,0), progressOpts.text, textOption);
         painter.setClipping(false);
     }
 
     if (!leftRect.isNull()) {
         painter.setPen(palette().highlight().color());
         painter.setBrush(palette().highlight());
         painter.drawRect(leftRect.adjusted(0,0,0,-1));
         if (!(d->edit && d->edit->isVisible())) {
             painter.setPen(palette().highlightedText().color());
             painter.setClipRect(leftRect.adjusted(0,0,1,0));
             painter.setClipping(true);
             painter.drawText(rect.adjusted(-2,0,2,0), progressOpts.text, textOption);
             painter.setClipping(false);
         }
     }
 
     painter.restore();
 }
 
 void KisAbstractSliderSpinBox::paintBreeze(QPainter &painter)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
     QStyleOptionProgressBar progressOpts = progressBarOptions();
     QString valueText = progressOpts.text;
     progressOpts.text = "";
     progressOpts.rect.adjust(0, 1, 0, -1);
 
     style()->drawComplexControl(QStyle::CC_SpinBox, &spinOpts, &painter, this);
     style()->drawControl(QStyle::CE_ProgressBarGroove, &progressOpts, &painter, this);
 
     painter.save();
 
     QRect leftRect;
 
     int progressIndicatorPos = (progressOpts.progress - qreal(progressOpts.minimum)) / qMax(qreal(1.0),
                                qreal(progressOpts.maximum) - progressOpts.minimum) * progressOpts.rect.width();
 
     if (progressIndicatorPos >= 0 && progressIndicatorPos <= progressOpts.rect.width()) {
         leftRect = QRect(progressOpts.rect.left(), progressOpts.rect.top(), progressIndicatorPos, progressOpts.rect.height());
     } else if (progressIndicatorPos > progressOpts.rect.width()) {
         painter.setPen(palette().highlightedText().color());
     } else {
         painter.setPen(palette().buttonText().color());
     }
 
     QRegion rightRect = progressOpts.rect;
     rightRect = rightRect.subtracted(leftRect);
     painter.setClipRegion(rightRect);
 
     QTextOption textOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter);
     textOption.setWrapMode(QTextOption::NoWrap);
 
     if (!(d->edit && d->edit->isVisible())) {
         painter.drawText(progressOpts.rect, valueText, textOption);
     }
 
     if (!leftRect.isNull()) {
         painter.setPen(palette().highlightedText().color());
         painter.setClipRect(leftRect);
         style()->drawControl(QStyle::CE_ProgressBarContents, &progressOpts, &painter, this);
         if (!(d->edit && d->edit->isVisible())) {
             painter.drawText(progressOpts.rect, valueText, textOption);
         }
     }
 
     painter.restore();
 
 }
 
 void KisAbstractSliderSpinBox::mousePressEvent(QMouseEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
 
     //Depress buttons or highlight slider
     //Also used to emulate mouse grab...
     if (e->buttons() & Qt::LeftButton) {
         if (upButtonRect(spinOpts).contains(e->pos())) {
             d->upButtonDown = true;
         } else if (downButtonRect(spinOpts).contains(e->pos())) {
             d->downButtonDown = true;
         }
     } else if (e->buttons() & Qt::RightButton) {
         showEdit();
     }
 
 
     update();
 }
 
 void KisAbstractSliderSpinBox::mouseReleaseEvent(QMouseEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
 
     //Step up/down for buttons
     //Emualting mouse grab too
     if (upButtonRect(spinOpts).contains(e->pos()) && d->upButtonDown) {
         setInternalValue(d->value + d->singleStep);
     } else if (downButtonRect(spinOpts).contains(e->pos()) && d->downButtonDown) {
         setInternalValue(d->value - d->singleStep);
     } else if (progressRect(spinOpts).contains(e->pos()) &&
                !(d->edit->isVisible()) &&
                !(d->upButtonDown || d->downButtonDown)) {
         //Snap to percentage for progress area
         setInternalValue(valueForX(e->pos().x(),e->modifiers()));
     } else { // Confirm the last known value, since we might be ignoring move events
         setInternalValue(d->value);
     }
 
     d->upButtonDown = false;
     d->downButtonDown = false;
     update();
 }
 
 void KisAbstractSliderSpinBox::mouseMoveEvent(QMouseEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     if( e->modifiers() & Qt::ShiftModifier ) {
         if( !d->shiftMode ) {
             d->shiftPercent = pow( qreal(d->value - d->minimum)/qreal(d->maximum - d->minimum), 1/qreal(d->exponentRatio) );
             d->shiftMode = true;
         }
     } else {
         d->shiftMode = false;
     }
 
     //Respect emulated mouse grab.
     if (e->buttons() & Qt::LeftButton &&
             !(d->downButtonDown || d->upButtonDown)) {
         setInternalValue(valueForX(e->pos().x(),e->modifiers()), d->blockUpdateSignalOnDrag);
         update();
     }
 }
 
 void KisAbstractSliderSpinBox::keyPressEvent(QKeyEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
     switch (e->key()) {
     case Qt::Key_Up:
     case Qt::Key_Right:
         setInternalValue(d->value + d->singleStep);
         break;
     case Qt::Key_Down:
     case Qt::Key_Left:
         setInternalValue(d->value - d->singleStep);
         break;
     case Qt::Key_Shift:
         d->shiftPercent = pow( qreal(d->value - d->minimum)/qreal(d->maximum - d->minimum), 1/qreal(d->exponentRatio) );
         d->shiftMode = true;
         break;
     case Qt::Key_Enter: //Line edit isn't "accepting" key strokes...
     case Qt::Key_Return:
     case Qt::Key_Escape:
     case Qt::Key_Control:
     case Qt::Key_Alt:
     case Qt::Key_AltGr:
     case Qt::Key_Super_L:
     case Qt::Key_Super_R:
         break;
     default:
         showEdit();
         d->edit->event(e);
         break;
     }
 }
 
 void KisAbstractSliderSpinBox::wheelEvent(QWheelEvent *e)
 {
 
     Q_D(KisAbstractSliderSpinBox);
     if ( e->delta() > 0) {
         setInternalValue(d->value + d->singleStep);
     } else {
         setInternalValue(d->value - d->singleStep);
     }
     update();
     e->accept();
 }
 
 void KisAbstractSliderSpinBox::commitEnteredValue()
 {
     Q_D(KisAbstractSliderSpinBox);
 
 	//QLocale locale;
     bool ok = false;
 
 	//qreal value = locale.toDouble(d->edit->text(), &ok) * d->factor;
 	qreal value;
 
 	if (d->parseInt) {
 		value = KisNumericParser::parseIntegerMathExpr(d->edit->text(), &ok) * d->factor;
 	} else {
 		value = KisNumericParser::parseSimpleMathExpr(d->edit->text(), &ok) * d->factor;
 	}
 
     if (ok) {
         setInternalValue(value);
     }
 }
 
 bool KisAbstractSliderSpinBox::eventFilter(QObject* recv, QEvent* e)
 {
     Q_D(KisAbstractSliderSpinBox);
     if (recv == static_cast<QObject*>(d->edit) &&
             e->type() == QEvent::KeyRelease) {
         QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
 
         switch (keyEvent->key()) {
         case Qt::Key_Enter:
         case Qt::Key_Return: {
             commitEnteredValue();
             hideEdit();
             return true;
         }
         case Qt::Key_Escape:
             d->edit->setText(valueString());
             hideEdit();
             return true;
         default:
             break;
         }
     }
 
     return false;
 }
 
 QSize KisAbstractSliderSpinBox::sizeHint() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
 
     QFont ft(font());
     if (d->style == KisAbstractSliderSpinBoxPrivate::STYLE_NOQUIRK) {
         // Some styles use bold font in progressbars
         // unfortunately there is no reliable way to check for that
         ft.setBold(true);
     }
 
     QFontMetrics fm(ft);
     QSize hint(fm.boundingRect(d->prefix + QString::number(d->maximum) + d->suffix).size());
     hint += QSize(0, 2);
 
     switch (d->style) {
     case KisAbstractSliderSpinBoxPrivate::STYLE_FUSION:
         hint += QSize(8, 8);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_PLASTIQUE:
         hint += QSize(8, 0);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_BREEZE:
         hint += QSize(2, 0);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_NOQUIRK:
         // almost all "modern" styles have a margin around controls
         hint += QSize(6, 6);
         break;
     default:
         break;
     }
 
     //Getting the size of the buttons is a pain as the calcs require a rect
     //that is "big enough". We run the calc twice to get the "smallest" buttons
     //This code was inspired by QAbstractSpinBox
     QSize extra(1000, 0);
     spinOpts.rect.setSize(hint + extra);
     extra += hint - style()->subControlRect(QStyle::CC_SpinBox, &spinOpts,
                                             QStyle::SC_SpinBoxEditField, this).size();
     spinOpts.rect.setSize(hint + extra);
     extra += hint - style()->subControlRect(QStyle::CC_SpinBox, &spinOpts,
                                             QStyle::SC_SpinBoxEditField, this).size();
     hint += extra;
 
 
     spinOpts.rect.setSize(hint);
     return style()->sizeFromContents(QStyle::CT_SpinBox, &spinOpts, hint)
             .expandedTo(QApplication::globalStrut());
 
 }
 
 QSize KisAbstractSliderSpinBox::minimumSizeHint() const
 {
     return sizeHint();
 }
 
 QSize KisAbstractSliderSpinBox::minimumSize() const
 {
     return QWidget::minimumSize().expandedTo(minimumSizeHint());
 }
 
 QStyleOptionSpinBox KisAbstractSliderSpinBox::spinBoxOptions() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox opts;
     opts.initFrom(this);
     opts.frame = false;
     opts.buttonSymbols = QAbstractSpinBox::UpDownArrows;
     opts.subControls = QStyle::SC_SpinBoxUp | QStyle::SC_SpinBoxDown;
 
     //Disable non-logical buttons
     if (d->value == d->minimum) {
         opts.stepEnabled = QAbstractSpinBox::StepUpEnabled;
     } else if (d->value == d->maximum) {
         opts.stepEnabled = QAbstractSpinBox::StepDownEnabled;
     } else {
         opts.stepEnabled = QAbstractSpinBox::StepUpEnabled | QAbstractSpinBox::StepDownEnabled;
     }
 
     //Deal with depressed buttons
     if (d->upButtonDown) {
         opts.activeSubControls = QStyle::SC_SpinBoxUp;
     } else if (d->downButtonDown) {
         opts.activeSubControls = QStyle::SC_SpinBoxDown;
     } else {
         opts.activeSubControls = 0;
     }
 
     return opts;
 }
 
 QStyleOptionProgressBar KisAbstractSliderSpinBox::progressBarOptions() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
 
     //Create opts for drawing the progress portion
     QStyleOptionProgressBar progressOpts;
     progressOpts.initFrom(this);
     progressOpts.maximum = d->maximum;
     progressOpts.minimum = d->minimum;
 
     qreal minDbl = d->minimum;
 
     qreal dValues = (d->maximum - minDbl);
 
     progressOpts.progress = dValues * pow((d->value - minDbl) / dValues, 1.0 / d->exponentRatio) + minDbl;
     progressOpts.text = d->prefix + valueString() + d->suffix;
     progressOpts.textAlignment = Qt::AlignCenter;
     progressOpts.textVisible = !(d->edit->isVisible());
 
     //Change opts rect to be only the ComboBox's text area
     progressOpts.rect = progressRect(spinOpts);
 
     return progressOpts;
 }
 
 QRect KisAbstractSliderSpinBox::progressRect(const QStyleOptionSpinBox& spinBoxOptions) const
 {
     const Q_D(KisAbstractSliderSpinBox);
     QRect ret = style()->subControlRect(QStyle::CC_SpinBox, &spinBoxOptions,
                                         QStyle::SC_SpinBoxEditField);
 
     switch (d->style) {
     case KisAbstractSliderSpinBoxPrivate::STYLE_PLASTIQUE:
         ret.adjust(-2, 0, 1, 0);
         break;
     case KisAbstractSliderSpinBoxPrivate::STYLE_BREEZE:
         ret.adjust(1, 0, 0, 0);
         break;
     default:
         break;
     }
 
     return ret;
 }
 
 QRect KisAbstractSliderSpinBox::upButtonRect(const QStyleOptionSpinBox& spinBoxOptions) const
 {
     return style()->subControlRect(QStyle::CC_SpinBox, &spinBoxOptions,
                                    QStyle::SC_SpinBoxUp);
 }
 
 QRect KisAbstractSliderSpinBox::downButtonRect(const QStyleOptionSpinBox& spinBoxOptions) const
 {
     return style()->subControlRect(QStyle::CC_SpinBox, &spinBoxOptions,
                                    QStyle::SC_SpinBoxDown);
 }
 
 int KisAbstractSliderSpinBox::valueForX(int x, Qt::KeyboardModifiers modifiers) const
 {
     const Q_D(KisAbstractSliderSpinBox);
     QStyleOptionSpinBox spinOpts = spinBoxOptions();
 
     QRect correctedProgRect;
     if (d->style == KisAbstractSliderSpinBoxPrivate::STYLE_FUSION) {
         correctedProgRect = progressRect(spinOpts).adjusted(2, 0, -2, 0);
     }
     else if (d->style == KisAbstractSliderSpinBoxPrivate::STYLE_BREEZE) {
         correctedProgRect = progressRect(spinOpts);
     }
     else {
         //Adjust for magic number in style code (margins)
         correctedProgRect = progressRect(spinOpts).adjusted(2, 2, -2, -2);
     }
 
     //Compute the distance of the progress bar, in pixel
     qreal leftDbl = correctedProgRect.left();
     qreal xDbl = x - leftDbl;
 
     //Compute the ration of the progress bar used, linearly (ignoring the exponent)
     qreal rightDbl = correctedProgRect.right();
     qreal minDbl = d->minimum;
     qreal maxDbl = d->maximum;
 
     qreal dValues = (maxDbl - minDbl);
     qreal percent = (xDbl / (rightDbl - leftDbl));
 
     //If SHIFT is pressed, movement should be slowed.
     if( modifiers & Qt::ShiftModifier ) {
         percent = d->shiftPercent + ( percent - d->shiftPercent ) * d->slowFactor;
     }
 
     //Final value
     qreal realvalue = ((dValues * pow(percent, d->exponentRatio)) + minDbl);
     //If key CTRL is pressed, round to the closest step.
     if( modifiers & Qt::ControlModifier ) {
         qreal fstep = d->fastSliderStep;
         if( modifiers & Qt::ShiftModifier ) {
             fstep*=d->slowFactor;
         }
         realvalue = floor( (realvalue+fstep/2) / fstep ) * fstep;
     }
     //Return the value
     return int(realvalue);
 }
 
 void KisAbstractSliderSpinBox::setPrefix(const QString& prefix)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->prefix = prefix;
 }
 
 void KisAbstractSliderSpinBox::setSuffix(const QString& suffix)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->suffix = suffix;
 }
 
 void KisAbstractSliderSpinBox::setExponentRatio(qreal dbl)
 {
     Q_D(KisAbstractSliderSpinBox);
     Q_ASSERT(dbl > 0);
     d->exponentRatio = dbl;
 }
 
 void KisAbstractSliderSpinBox::setBlockUpdateSignalOnDrag(bool blockUpdateSignal)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->blockUpdateSignalOnDrag = blockUpdateSignal;
 }
 
 void KisAbstractSliderSpinBox::contextMenuEvent(QContextMenuEvent* event)
 {
     event->accept();
 }
 
 void KisAbstractSliderSpinBox::editLostFocus()
 {
     Q_D(KisAbstractSliderSpinBox);
     if (!d->edit->hasFocus()) {
         commitEnteredValue();
         hideEdit();
     }
 }
 
 void KisAbstractSliderSpinBox::setInternalValue(int value)
 {
     setInternalValue(value, false);
 }
 
 class KisSliderSpinBoxPrivate : public KisAbstractSliderSpinBoxPrivate {
 };
 
 KisSliderSpinBox::KisSliderSpinBox(QWidget* parent) : KisAbstractSliderSpinBox(parent, new KisSliderSpinBoxPrivate)
 {
 	Q_D(KisSliderSpinBox);
 
 	d->parseInt = true;
 
     setRange(0,99);
 }
 
 KisSliderSpinBox::~KisSliderSpinBox()
 {
 }
 
 void KisSliderSpinBox::setRange(int minimum, int maximum)
 {
     Q_D(KisSliderSpinBox);
     d->minimum = minimum;
     d->maximum = maximum;
     d->fastSliderStep = (maximum-minimum+1)/20;
 	d->validator->setRange(minimum, maximum, 0);
     update();
 }
 
 int KisSliderSpinBox::minimum() const
 {
     const Q_D(KisSliderSpinBox);
     return d->minimum;
 }
 
 void KisSliderSpinBox::setMinimum(int minimum)
 {
     Q_D(KisSliderSpinBox);
     setRange(minimum, d->maximum);
 }
 
 int KisSliderSpinBox::maximum() const
 {
     const Q_D(KisSliderSpinBox);
     return d->maximum;
 }
 
 void KisSliderSpinBox::setMaximum(int maximum)
 {
     Q_D(KisSliderSpinBox);
     setRange(d->minimum, maximum);
 }
 
 int KisSliderSpinBox::fastSliderStep() const
 {
     const Q_D(KisSliderSpinBox);
     return d->fastSliderStep;
 }
 
 void KisSliderSpinBox::setFastSliderStep(int step)
 {
     Q_D(KisSliderSpinBox);
     d->fastSliderStep = step;
 }
 
 int KisSliderSpinBox::value()
 {
     Q_D(KisSliderSpinBox);
     return d->value;
 }
 
 void KisSliderSpinBox::setValue(int value)
 {
     setInternalValue(value, false);
     update();
 }
 
 QString KisSliderSpinBox::valueString() const
 {
     const Q_D(KisSliderSpinBox);
 
     QLocale locale;
     return locale.toString((qreal)d->value, 'f', d->validator->decimals());
 }
 
 void KisSliderSpinBox::setSingleStep(int value)
 {
     Q_D(KisSliderSpinBox);
     d->singleStep = value;
 }
 
 void KisSliderSpinBox::setPageStep(int value)
 {
     Q_UNUSED(value);
 }
 
 void KisSliderSpinBox::setInternalValue(int _value, bool blockUpdateSignal)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->value = qBound(d->minimum, _value, d->maximum);
 
     if(!blockUpdateSignal) {
         emit(valueChanged(value()));
     }
 }
 
 class KisDoubleSliderSpinBoxPrivate : public KisAbstractSliderSpinBoxPrivate {
 };
 
 KisDoubleSliderSpinBox::KisDoubleSliderSpinBox(QWidget* parent) : KisAbstractSliderSpinBox(parent, new KisDoubleSliderSpinBoxPrivate)
 {
 	Q_D(KisDoubleSliderSpinBox);
 	d->parseInt = false;
 }
 
 KisDoubleSliderSpinBox::~KisDoubleSliderSpinBox()
 {
 }
 
 void KisDoubleSliderSpinBox::setRange(qreal minimum, qreal maximum, int decimals)
 {
     Q_D(KisDoubleSliderSpinBox);
     d->factor = pow(10.0, decimals);
 
     d->minimum = minimum * d->factor;
     d->maximum = maximum * d->factor;
     //This code auto-compute a new step when pressing control.
     //A flag defaulting to "do not change the fast step" should be added, but it implies changing every call
     if(maximum - minimum >= 2.0 || decimals <= 0) {  //Quick step on integers
         d->fastSliderStep = int(pow(10.0, decimals));
     } else if(decimals == 1) {
         d->fastSliderStep = (maximum-minimum)*d->factor/10;
     } else {
         d->fastSliderStep = (maximum-minimum)*d->factor/20;
     }
     d->validator->setRange(minimum, maximum, decimals);
     update();
     setValue(value());
 }
 
 qreal KisDoubleSliderSpinBox::minimum() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     return d->minimum / d->factor;
 }
 
 void KisDoubleSliderSpinBox::setMinimum(qreal minimum)
 {
     Q_D(KisAbstractSliderSpinBox);
     setRange(minimum, d->maximum);
 }
 
 qreal KisDoubleSliderSpinBox::maximum() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     return d->maximum / d->factor;
 }
 
 void KisDoubleSliderSpinBox::setMaximum(qreal maximum)
 {
     Q_D(KisAbstractSliderSpinBox);
     setRange(d->minimum, maximum);
 }
 
 qreal KisDoubleSliderSpinBox::fastSliderStep() const
 {
     const Q_D(KisAbstractSliderSpinBox);
     return d->fastSliderStep;
 }
 void KisDoubleSliderSpinBox::setFastSliderStep(qreal step)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->fastSliderStep = step;
 }
 
 qreal KisDoubleSliderSpinBox::value()
 {
     Q_D(KisAbstractSliderSpinBox);
     return (qreal)d->value / d->factor;
 }
 
 void KisDoubleSliderSpinBox::setValue(qreal value)
 {
     Q_D(KisAbstractSliderSpinBox);
     setInternalValue(d->value = qRound(value * d->factor), false);
     update();
 }
 
 void KisDoubleSliderSpinBox::setSingleStep(qreal value)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->singleStep = value * d->factor;
 }
 
 QString KisDoubleSliderSpinBox::valueString() const
 {
     const Q_D(KisAbstractSliderSpinBox);
 
     QLocale locale;
     return locale.toString((qreal)d->value / d->factor, 'f', d->validator->decimals());
 }
 
 void KisDoubleSliderSpinBox::setInternalValue(int _value, bool blockUpdateSignal)
 {
     Q_D(KisAbstractSliderSpinBox);
     d->value = qBound(d->minimum, _value, d->maximum);
 
     if(!blockUpdateSignal) {
         emit(valueChanged(value()));
     }
 }
 
 
 void KisAbstractSliderSpinBox::changeEvent(QEvent *e)
 {
     Q_D(KisAbstractSliderSpinBox);
 
     QWidget::changeEvent(e);
 
     switch (e->type()) {
     case QEvent::StyleChange:
         if (style()->objectName() == "fusion") {
             d->style = KisAbstractSliderSpinBoxPrivate::STYLE_FUSION;
         }
         else if (style()->objectName() == "plastique") {
             d->style = KisAbstractSliderSpinBoxPrivate::STYLE_PLASTIQUE;
         }
         else if (style()->objectName() == "breeze") {
             d->style = KisAbstractSliderSpinBoxPrivate::STYLE_BREEZE;
         }
         else {
             d->style = KisAbstractSliderSpinBoxPrivate::STYLE_NOQUIRK;
         }
         break;
     default:
         break;
     }
 }
diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
index db4d594adf..f202051caa 100644
--- a/libs/widgets/CMakeLists.txt
+++ b/libs/widgets/CMakeLists.txt
@@ -1,98 +1,111 @@
 add_subdirectory( tests )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(kritawidgets_LIB_SRCS
     KoGradientEditWidget.cpp
     KoVBox.cpp
     KoDialog.cpp
     KoGlobal.cpp
     KoZoomWidget.cpp
     KoTagToolButton.cpp
     KoTagChooserWidget.cpp
     KoTagFilterWidget.cpp
     KoResourceTaggingManager.cpp
     KoResourceItemChooserContextMenu.cpp
 	KoAspectButton.cpp
     KoPagePreviewWidget.cpp
     KoPositionSelector.cpp
     KoSliderCombo.cpp
     KoColorPopupButton.cpp
     KoConfigAuthorPage.cpp
     KoUnitDoubleSpinBox.cpp
     KoZoomAction.cpp
     KoZoomController.cpp
     KoZoomInput.cpp
     KoZoomHandler.cpp
     KoZoomMode.cpp
     KoDpi.cpp
     KoGlobal.cpp
     KoColorPatch.cpp
     KoColorPopupAction.cpp
     KoColorSetWidget.cpp
     KoColorSlider.cpp
     KoDualColorButton.cpp
     KoEditColorSetDialog.cpp
     KoTriangleColorSelector.cpp
 	KoResourcePopupAction.cpp
 	KoFillConfigWidget.cpp
     KoIconToolTip.cpp
     KoResourceItemChooser.cpp
     KoResourceItemChooserSync.cpp
     KoResourceSelector.cpp
     KoResourceModel.cpp
     KoResourceItemDelegate.cpp
     KoResourceItemView.cpp
     KoResourceTagStore.cpp
     KoRuler.cpp
     #KoRulerController.cpp
     KoItemToolTip.cpp
     KoCheckerBoardPainter.cpp
     KoResourceServerAdapter.cpp
     KoResourceServerProvider.cpp
     KoLineStyleSelector.cpp
     KoLineStyleItemDelegate.cpp
 	KoLineStyleModel.cpp
     KoDockWidgetTitleBar.cpp
     KoDockWidgetTitleBarButton.cpp
     KoResourceFiltering.cpp
     KoResourceModelBase.cpp
 
     KoToolBoxButton.cpp
     KoToolBox.cpp
     KoToolBoxDocker.cpp
     KoToolBoxFactory.cpp
     KoToolDocker.cpp
     
+
+	KoPageLayoutWidget.cpp
+	KoPageLayoutDialog.cpp
+	KoShadowConfigWidget.cpp
+	KoStrokeConfigWidget.cpp
+	KoMarkerSelector.cpp
+	KoMarkerModel.cpp
+	KoMarkerItemDelegate.cpp
+
     KoDocumentInfoDlg.cpp
     KoGlobal.cpp
     KoTableView.cpp
     
     WidgetsDebug.cpp
 
     kis_file_name_requester.cpp
+
+	kis_double_parse_spin_box.cpp
+	kis_double_parse_unit_spin_box.cpp
+	kis_int_parse_spin_box.cpp
 )
 
 ki18n_wrap_ui( kritawidgets_LIB_SRCS
     KoConfigAuthorPage.ui
     koDocumentInfoAboutWidget.ui
     koDocumentInfoAuthorWidget.ui
 	KoEditColorSet.ui
     wdg_file_name_requester.ui
 )
 
 add_library(kritawidgets SHARED ${kritawidgets_LIB_SRCS})
 generate_export_header(kritawidgets BASE_NAME kritawidgets)
 target_link_libraries(kritawidgets kritaodf kritaflake kritapigment kritawidgetutils Qt5::PrintSupport KF5::CoreAddons KF5::ConfigGui KF5::GuiAddons KF5::WidgetsAddons KF5::ConfigCore KF5::Completion)
 
 if(X11_FOUND)
     target_link_libraries(kritawidgets Qt5::X11Extras ${X11_LIBRARIES})
 endif()
 
 target_link_libraries(kritawidgets LINK_INTERFACE_LIBRARIES  kritaodf kritaflake kritapigment kritawidgetutils Qt5::PrintSupport KF5::CoreAddons KF5::ConfigGui KF5::GuiAddons KF5::WidgetsAddons KF5::ConfigCore KF5::Completion)
 
 set_target_properties(kritawidgets PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritawidgets  ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/libs/ui/widgets/KoMarkerItemDelegate.cpp b/libs/widgets/KoMarkerItemDelegate.cpp
similarity index 100%
rename from libs/ui/widgets/KoMarkerItemDelegate.cpp
rename to libs/widgets/KoMarkerItemDelegate.cpp
diff --git a/libs/ui/widgets/KoMarkerItemDelegate.h b/libs/widgets/KoMarkerItemDelegate.h
similarity index 100%
rename from libs/ui/widgets/KoMarkerItemDelegate.h
rename to libs/widgets/KoMarkerItemDelegate.h
diff --git a/libs/ui/widgets/KoMarkerModel.cpp b/libs/widgets/KoMarkerModel.cpp
similarity index 100%
rename from libs/ui/widgets/KoMarkerModel.cpp
rename to libs/widgets/KoMarkerModel.cpp
diff --git a/libs/ui/widgets/KoMarkerModel.h b/libs/widgets/KoMarkerModel.h
similarity index 100%
rename from libs/ui/widgets/KoMarkerModel.h
rename to libs/widgets/KoMarkerModel.h
diff --git a/libs/ui/widgets/KoMarkerSelector.cpp b/libs/widgets/KoMarkerSelector.cpp
similarity index 100%
rename from libs/ui/widgets/KoMarkerSelector.cpp
rename to libs/widgets/KoMarkerSelector.cpp
diff --git a/libs/ui/widgets/KoMarkerSelector.h b/libs/widgets/KoMarkerSelector.h
similarity index 100%
rename from libs/ui/widgets/KoMarkerSelector.h
rename to libs/widgets/KoMarkerSelector.h
diff --git a/libs/ui/widgets/KoPageLayoutDialog.cpp b/libs/widgets/KoPageLayoutDialog.cpp
similarity index 100%
rename from libs/ui/widgets/KoPageLayoutDialog.cpp
rename to libs/widgets/KoPageLayoutDialog.cpp
diff --git a/libs/ui/widgets/KoPageLayoutDialog.h b/libs/widgets/KoPageLayoutDialog.h
similarity index 100%
rename from libs/ui/widgets/KoPageLayoutDialog.h
rename to libs/widgets/KoPageLayoutDialog.h
diff --git a/libs/ui/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
similarity index 100%
rename from libs/ui/widgets/KoPageLayoutWidget.cpp
rename to libs/widgets/KoPageLayoutWidget.cpp
diff --git a/libs/ui/widgets/KoPageLayoutWidget.h b/libs/widgets/KoPageLayoutWidget.h
similarity index 100%
rename from libs/ui/widgets/KoPageLayoutWidget.h
rename to libs/widgets/KoPageLayoutWidget.h
diff --git a/libs/ui/widgets/KoShadowConfigWidget.cpp b/libs/widgets/KoShadowConfigWidget.cpp
similarity index 100%
rename from libs/ui/widgets/KoShadowConfigWidget.cpp
rename to libs/widgets/KoShadowConfigWidget.cpp
diff --git a/libs/ui/widgets/KoShadowConfigWidget.h b/libs/widgets/KoShadowConfigWidget.h
similarity index 100%
rename from libs/ui/widgets/KoShadowConfigWidget.h
rename to libs/widgets/KoShadowConfigWidget.h
diff --git a/libs/ui/widgets/KoStrokeConfigWidget.cpp b/libs/widgets/KoStrokeConfigWidget.cpp
similarity index 99%
rename from libs/ui/widgets/KoStrokeConfigWidget.cpp
rename to libs/widgets/KoStrokeConfigWidget.cpp
index e0bf000724..f7d19981cb 100644
--- a/libs/ui/widgets/KoStrokeConfigWidget.cpp
+++ b/libs/widgets/KoStrokeConfigWidget.cpp
@@ -1,552 +1,552 @@
 /* This file is part of the KDE project
  * Made by Tomislav Lukman (tomislav.lukman@ck.tel.hr)
  * Copyright (C) 2002 Tomislav Lukman <tomislav.lukman@ck.t-com.hr>
  * Copyright (C) 2002-2003 Rob Buis <buis@kde.org>
  * Copyright (C) 2005-2006 Tim Beaulen <tbscope@gmail.com>
  * Copyright (C) 2005-2007 Thomas Zander <zander@kde.org>
  * Copyright (C) 2005-2006, 2011 Inge Wallin <inge@lysator.liu.se>
  * Copyright (C) 2005-2008 Jan Hambrecht <jaham@gmx.net>
  * Copyright (C) 2006 C. Boemann <cbo@boemann.dk>
  * Copyright (C) 2006 Peter Simonsson <psn@linux.se>
  * Copyright (C) 2006 Laurent Montel <montel@kde.org>
  * Copyright (C) 2007,2011 Thorsten Zachmann <t.zachmann@zagge.de>
  * Copyright (C) 2011 Jean-Nicolas Artaud <jeannicolasartaud@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 // Own
 #include "KoStrokeConfigWidget.h"
 
 // Qt
 #include <QMenu>
 #include <QLabel>
 #include <QToolButton>
 #include <QButtonGroup>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QSizePolicy>
 
 // KDE
 #include <klocalizedstring.h>
 
 // Calligra
 #include <KoIcon.h>
 #include <KoUnit.h>
 #include <KoLineStyleSelector.h>
 #include <KoUnitDoubleSpinBox.h>
 #include <KoMarkerSelector.h>
 #include <KoColorPopupAction.h>
 #include <KoMarker.h>
 #include <KoShapeStroke.h>
 #include <KoPathShape.h>
 #include <KoMarkerCollection.h>
 #include <KoPathShapeMarkerCommand.h>
 #include <KoCanvasBase.h>
 #include <KoCanvasController.h>
 #include <KoCanvasResourceManager.h>
 #include <KoDocumentResourceManager.h>
 #include <KoToolManager.h>
 #include <KoSelection.h>
 #include <KoShapeController.h>
 #include <KoShapeManager.h>
 #include <KoShapeStrokeCommand.h>
 #include <KoShapeStrokeModel.h>
 
 // Krita
-#include "kis_doubleparseunitspinbox.h"
+#include "kis_double_parse_unit_spin_box.h"
 
 class CapNJoinMenu : public QMenu
 {
 public:
     CapNJoinMenu(QWidget *parent = 0);
     virtual QSize sizeHint() const;
 
 	KisDoubleParseUnitSpinBox *miterLimit;
     QButtonGroup        *capGroup;
     QButtonGroup        *joinGroup;
 };
 
 CapNJoinMenu::CapNJoinMenu(QWidget *parent)
     : QMenu(parent)
 {
     QGridLayout *mainLayout = new QGridLayout();
     mainLayout->setMargin(2);
 
      // The cap group
     capGroup = new QButtonGroup(this);
     capGroup->setExclusive(true);
 
     QToolButton *button = 0;
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-cap-butt"));
     button->setCheckable(true);
     button->setToolTip(i18n("Butt cap"));
     capGroup->addButton(button, Qt::FlatCap);
     mainLayout->addWidget(button, 2, 0);
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-cap-round"));
     button->setCheckable(true);
     button->setToolTip(i18n("Round cap"));
     capGroup->addButton(button, Qt::RoundCap);
     mainLayout->addWidget(button, 2, 1);
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-cap-square"));
     button->setCheckable(true);
     button->setToolTip(i18n("Square cap"));
     capGroup->addButton(button, Qt::SquareCap);
     mainLayout->addWidget(button, 2, 2, Qt::AlignLeft);
 
     // The join group
     joinGroup = new QButtonGroup(this);
     joinGroup->setExclusive(true);
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-join-miter"));
     button->setCheckable(true);
     button->setToolTip(i18n("Miter join"));
     joinGroup->addButton(button, Qt::MiterJoin);
     mainLayout->addWidget(button, 3, 0);
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-join-round"));
     button->setCheckable(true);
     button->setToolTip(i18n("Round join"));
     joinGroup->addButton(button, Qt::RoundJoin);
     mainLayout->addWidget(button, 3, 1);
 
     button = new QToolButton(this);
     button->setIcon(koIcon("stroke-join-bevel"));
     button->setCheckable(true);
     button->setToolTip(i18n("Bevel join"));
     joinGroup->addButton(button, Qt::BevelJoin);
     mainLayout->addWidget(button, 3, 2, Qt::AlignLeft);
 
     // Miter limit
     // set min/max/step and value in points, then set actual unit
 	miterLimit = new KisDoubleParseUnitSpinBox(this);
     miterLimit->setMinMaxStep(0.0, 1000.0, 0.5);
     miterLimit->setDecimals(2);
     miterLimit->setUnit(KoUnit(KoUnit::Point));
     miterLimit->setToolTip(i18n("Miter limit"));
     mainLayout->addWidget(miterLimit, 4, 0, 1, 3);
 
     mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
     setLayout(mainLayout);
 }
 
 QSize CapNJoinMenu::sizeHint() const
 {
     return layout()->sizeHint();
 }
 
 
 class Q_DECL_HIDDEN KoStrokeConfigWidget::Private
 {
 public:
     Private()
         : canvas(0),
         active(true)
     {
     }
 
     KoLineStyleSelector *lineStyle;
 	KisDoubleParseUnitSpinBox *lineWidth;
     KoMarkerSelector    *startMarkerSelector;
     KoMarkerSelector    *endMarkerSelector;
 
     CapNJoinMenu *capNJoinMenu;
     QToolButton *colorButton;
     KoColorPopupAction *colorAction;
 
     QWidget *spacer;
 
     KoCanvasBase *canvas;
 
     bool active;
 };
 
 KoStrokeConfigWidget::KoStrokeConfigWidget(QWidget * parent)
     : QWidget(parent)
     , d(new Private())
 {
     setObjectName("Stroke widget");
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setMargin(0);
 
     QHBoxLayout *firstLineLayout = new QHBoxLayout();
 
     // Start marker
     QList<KoMarker*> markers;
 
     d->startMarkerSelector = new KoMarkerSelector(KoMarkerData::MarkerStart, this);
     d->startMarkerSelector->updateMarkers(markers);
     d->startMarkerSelector->setMaximumWidth(50);
     firstLineLayout->addWidget(d->startMarkerSelector);
 
     // Line style
     d->lineStyle = new KoLineStyleSelector(this);
     d->lineStyle->setMinimumWidth(70);
     firstLineLayout->addWidget(d->lineStyle);
 
     // End marker
     d->endMarkerSelector = new KoMarkerSelector(KoMarkerData::MarkerEnd, this);
     d->endMarkerSelector->updateMarkers(markers);
     d->endMarkerSelector->setMaximumWidth(50);
     firstLineLayout->addWidget(d->endMarkerSelector);
 
     QHBoxLayout *secondLineLayout = new QHBoxLayout();
 
     // Line width
     QLabel *l = new QLabel(this);
     l->setText(i18n("Thickness:"));
     l->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     secondLineLayout->addWidget(l);
 
     // set min/max/step and value in points, then set actual unit
 	d->lineWidth = new KisDoubleParseUnitSpinBox(this);
     d->lineWidth->setMinMaxStep(0.0, 1000.0, 0.5);
     d->lineWidth->setDecimals(2);
     d->lineWidth->setUnit(KoUnit(KoUnit::Point));
     d->lineWidth->setToolTip(i18n("Set line width of actual selection"));
     secondLineLayout->addWidget(d->lineWidth);
 
     QToolButton *capNJoinButton = new QToolButton(this);
     capNJoinButton->setMinimumHeight(25);
     d->capNJoinMenu = new CapNJoinMenu(this);
     capNJoinButton->setMenu(d->capNJoinMenu);
     capNJoinButton->setText("...");
     capNJoinButton->setPopupMode(QToolButton::InstantPopup);
 
     secondLineLayout->addWidget(capNJoinButton);
 
     d->colorButton = new QToolButton(this);
     secondLineLayout->addWidget(d->colorButton);
     d->colorAction = new KoColorPopupAction(this);
     d->colorAction->setIcon(koIcon("format-stroke-color"));
     d->colorAction->setToolTip(i18n("Change the color of the line/border"));
     d->colorButton->setDefaultAction(d->colorAction);
 
     mainLayout->addLayout(firstLineLayout);
     mainLayout->addLayout(secondLineLayout);
 
     // Spacer
     d->spacer = new QWidget();
     d->spacer->setObjectName("SpecialSpacer");
     mainLayout->addWidget(d->spacer);
 
 
     // set sensitive defaults
     d->lineStyle->setLineStyle(Qt::SolidLine);
     d->lineWidth->changeValue(1);
     d->colorAction->setCurrentColor(Qt::black);
 
     // Make the signals visible on the outside of this widget.
     connect(d->lineStyle,  SIGNAL(currentIndexChanged(int)), this, SLOT(applyChanges()));
     connect(d->lineWidth,  SIGNAL(valueChangedPt(qreal)),    this, SLOT(applyChanges()));
     connect(d->colorAction, SIGNAL(colorChanged(const KoColor &)), this, SLOT(applyChanges()));
     connect(d->capNJoinMenu->capGroup,   SIGNAL(buttonClicked(int)),       this, SLOT(applyChanges()));
     connect(d->capNJoinMenu->joinGroup,  SIGNAL(buttonClicked(int)),       this, SLOT(applyChanges()));
     connect(d->capNJoinMenu->miterLimit, SIGNAL(valueChangedPt(qreal)),    this, SLOT(applyChanges()));
     connect(d->startMarkerSelector,  SIGNAL(currentIndexChanged(int)), this, SLOT(startMarkerChanged()));
     connect(d->endMarkerSelector,  SIGNAL(currentIndexChanged(int)), this, SLOT(endMarkerChanged()));
 }
 
 KoStrokeConfigWidget::~KoStrokeConfigWidget()
 {
     delete d;
 }
 
 // ----------------------------------------------------------------
 //                         getters and setters
 
 
 Qt::PenStyle KoStrokeConfigWidget::lineStyle() const
 {
     return d->lineStyle->lineStyle();
 }
 
 QVector<qreal> KoStrokeConfigWidget::lineDashes() const
 {
     return d->lineStyle->lineDashes();
 }
 
 qreal KoStrokeConfigWidget::lineWidth() const
 {
     return d->lineWidth->value();
 }
 
 QColor KoStrokeConfigWidget::color() const
 {
     return d->colorAction->currentColor();
 }
 
 qreal KoStrokeConfigWidget::miterLimit() const
 {
     return d->capNJoinMenu->miterLimit->value();
 }
 
 KoMarker *KoStrokeConfigWidget::startMarker() const
 {
     return d->startMarkerSelector->marker();
 }
 
 KoMarker *KoStrokeConfigWidget::endMarker() const
 {
     return d->endMarkerSelector->marker();
 }
 
 Qt::PenCapStyle KoStrokeConfigWidget::capStyle() const
 {
     return static_cast<Qt::PenCapStyle>(d->capNJoinMenu->capGroup->checkedId());
 }
 
 Qt::PenJoinStyle KoStrokeConfigWidget::joinStyle() const
 {
     return static_cast<Qt::PenJoinStyle>(d->capNJoinMenu->joinGroup->checkedId());
 }
 
 KoShapeStroke* KoStrokeConfigWidget::createShapeStroke() const
 {
     KoShapeStroke *stroke = new KoShapeStroke();
 
     stroke->setColor(color());
     stroke->setLineWidth(lineWidth());
     stroke->setCapStyle(capStyle());
     stroke->setJoinStyle(joinStyle());
     stroke->setMiterLimit(miterLimit());
     stroke->setLineStyle(lineStyle(), lineDashes());
 
     return stroke;
 }
 
 // ----------------------------------------------------------------
 //                         Other public functions
 
 void KoStrokeConfigWidget::updateControls(KoShapeStrokeModel *stroke, KoMarker *startMarker, KoMarker *endMarker)
 {
     blockChildSignals(true);
 
     const KoShapeStroke *lineStroke = dynamic_cast<const KoShapeStroke*>(stroke);
     if (lineStroke) {
         d->lineWidth->changeValue(lineStroke->lineWidth());
         QAbstractButton *button = d->capNJoinMenu->capGroup->button(lineStroke->capStyle());
         if (button) {
             button->setChecked(true);
         }
         button = d->capNJoinMenu->joinGroup->button(lineStroke->joinStyle());
         if (button) {
             button->setChecked(true);
         }
         d->capNJoinMenu->miterLimit->changeValue(lineStroke->miterLimit());
         d->capNJoinMenu->miterLimit->setEnabled(lineStroke->joinStyle() == Qt::MiterJoin);
         d->lineStyle->setLineStyle(lineStroke->lineStyle(), lineStroke->lineDashes());
         d->colorAction->setCurrentColor(lineStroke->color());
     }
     else {
         d->lineWidth->changeValue(0.0);
         d->capNJoinMenu->capGroup->button(Qt::FlatCap)->setChecked(true);
         d->capNJoinMenu->joinGroup->button(Qt::MiterJoin)->setChecked(true);
         d->capNJoinMenu->miterLimit->changeValue(0.0);
         d->capNJoinMenu->miterLimit->setEnabled(true);
         d->lineStyle->setLineStyle(Qt::NoPen, QVector<qreal>());
     }
 
     d->startMarkerSelector->setMarker(startMarker);
     d->endMarkerSelector->setMarker(endMarker);
 
     blockChildSignals(false);
 }
 
 void KoStrokeConfigWidget::setUnit(const KoUnit &unit)
 {
     blockChildSignals(true);
 
     KoCanvasController* canvasController = KoToolManager::instance()->activeCanvasController();
     KoSelection *selection = canvasController->canvas()->shapeManager()->selection();
     KoShape * shape = selection->firstSelectedShape();
 
     /**
      * KoStrokeShape knows nothing about the transformations applied
      * to the shape, which doesn't prevent the shape to apply them and
      * display the stroke differently. So just take that into account
      * and show the user correct values using the multiplier in KoUnit.
      */
     KoUnit newUnit(unit);
     if (shape) {
         newUnit.adjustByPixelTransform(shape->absoluteTransformation(0));
     }
 
     d->lineWidth->setUnit(newUnit);
     d->capNJoinMenu->miterLimit->setUnit(newUnit);
 
     blockChildSignals(false);
 }
 
 void KoStrokeConfigWidget::updateMarkers(const QList<KoMarker*> &markers)
 {
     d->startMarkerSelector->updateMarkers(markers);
     d->endMarkerSelector->updateMarkers(markers);
 }
 
 void KoStrokeConfigWidget::blockChildSignals(bool block)
 {
     d->colorAction->blockSignals(block);
     d->lineWidth->blockSignals(block);
     d->capNJoinMenu->capGroup->blockSignals(block);
     d->capNJoinMenu->joinGroup->blockSignals(block);
     d->capNJoinMenu->miterLimit->blockSignals(block);
     d->lineStyle->blockSignals(block);
     d->startMarkerSelector->blockSignals(block);
     d->endMarkerSelector->blockSignals(block);
 }
 
 void KoStrokeConfigWidget::setActive(bool active)
 {
     d->active = active;
 }
 
 //------------------------
 void KoStrokeConfigWidget::applyChanges()
 {
     KoCanvasController* canvasController = KoToolManager::instance()->activeCanvasController();
     KoSelection *selection = canvasController->canvas()->shapeManager()->selection();
 
     //FIXME d->canvas->resourceManager()->setActiveStroke( d->stroke );
 
     if (!selection || !selection->count()) {
         return;
     }
 
     KoShapeStroke *newStroke = new KoShapeStroke();
     KoShapeStroke *oldStroke = dynamic_cast<KoShapeStroke*>( selection->firstSelectedShape()->stroke() );
     if (oldStroke) {
         newStroke->setLineBrush(oldStroke->lineBrush());
     }
     newStroke->setColor(color());
     newStroke->setLineWidth(lineWidth());
     newStroke->setCapStyle(static_cast<Qt::PenCapStyle>(d->capNJoinMenu->capGroup->checkedId()));
     newStroke->setJoinStyle(static_cast<Qt::PenJoinStyle>(d->capNJoinMenu->joinGroup->checkedId()));
     newStroke->setMiterLimit(miterLimit());
     newStroke->setLineStyle(lineStyle(), lineDashes());
 
     if (d->active) {
         KoShapeStrokeCommand *cmd = new KoShapeStrokeCommand(selection->selectedShapes(), newStroke);
         canvasController->canvas()->addCommand(cmd);
     }
 }
 
 void KoStrokeConfigWidget::applyMarkerChanges(KoMarkerData::MarkerPosition position)
 {
     KoMarker *marker = 0;
     if (position == KoMarkerData::MarkerStart) {
         marker = startMarker();
     }
     else if (position == KoMarkerData::MarkerEnd) {
         marker = endMarker();
     }
 
     KoCanvasController* canvasController = KoToolManager::instance()->activeCanvasController();
     KoSelection *selection = canvasController->canvas()->shapeManager()->selection();
 
     if (! selection || !selection->count()) {
         return;
     }
 
     QList<KoShape*> shapeList = selection->selectedShapes();
     QList<KoPathShape*> pathShapeList;
     for (QList<KoShape*>::iterator itShape = shapeList.begin(); itShape != shapeList.end(); ++itShape) {
         KoPathShape* pathShape = dynamic_cast<KoPathShape*>(*itShape);
         if (pathShape) {
             pathShapeList << pathShape;
         }
     }
 
     if (pathShapeList.size()) {
         KoPathShapeMarkerCommand* cmdMarker = new KoPathShapeMarkerCommand(pathShapeList, marker, position);
         canvasController->canvas()->addCommand(cmdMarker);
     }
 }
 
 void KoStrokeConfigWidget::startMarkerChanged()
 {
     applyMarkerChanges(KoMarkerData::MarkerStart);
 }
 
 void KoStrokeConfigWidget::endMarkerChanged()
 {
     applyMarkerChanges(KoMarkerData::MarkerEnd);
 }
 // ----------------------------------------------------------------
 
 
 
 void KoStrokeConfigWidget::selectionChanged()
 {
     // see a comment in setUnit()
     setUnit(d->canvas->unit());
 
 
     KoCanvasController* canvasController = KoToolManager::instance()->activeCanvasController();
     KoSelection *selection = canvasController->canvas()->shapeManager()->selection();
     KoShape * shape = selection->firstSelectedShape();
     if (shape && shape->stroke()) {
         KoPathShape *pathShape = dynamic_cast<KoPathShape *>(shape);
         if (pathShape) {
             updateControls(shape->stroke(), pathShape->marker(KoMarkerData::MarkerStart),
                                              pathShape->marker(KoMarkerData::MarkerEnd));
         }
         else {
             updateControls(shape->stroke(), 0 ,0);
         }
     }
 }
 
 void KoStrokeConfigWidget::setCanvas( KoCanvasBase *canvas )
 {
     if (canvas) {
         connect(canvas->shapeManager()->selection(), SIGNAL(selectionChanged()),
                 this, SLOT(selectionChanged()));
         connect(canvas->shapeManager(), SIGNAL(selectionContentChanged()),
                 this, SLOT(selectionChanged()));
         connect(canvas->resourceManager(), SIGNAL(canvasResourceChanged(int, const QVariant&)),
                 this, SLOT(canvasResourceChanged(int, const QVariant &)));
         setUnit(canvas->unit());
 
         KoDocumentResourceManager *resourceManager = canvas->shapeController()->resourceManager();
         if (resourceManager) {
             KoMarkerCollection *collection = resourceManager->resource(KoDocumentResourceManager::MarkerCollection).value<KoMarkerCollection*>();
             if (collection) {
                 updateMarkers(collection->markers());
             }
         }
     }
 
     d->canvas = canvas;
 }
 
 void KoStrokeConfigWidget::canvasResourceChanged(int key, const QVariant &value)
 {
     switch (key) {
     case KoCanvasResourceManager::Unit:
         setUnit(value.value<KoUnit>());
         break;
     }
 }
diff --git a/libs/ui/widgets/KoStrokeConfigWidget.h b/libs/widgets/KoStrokeConfigWidget.h
similarity index 100%
rename from libs/ui/widgets/KoStrokeConfigWidget.h
rename to libs/widgets/KoStrokeConfigWidget.h
diff --git a/libs/widgets/kis_double_parse_spin_box.cpp b/libs/widgets/kis_double_parse_spin_box.cpp
new file mode 100644
index 0000000000..c4cfaa8f48
--- /dev/null
+++ b/libs/widgets/kis_double_parse_spin_box.cpp
@@ -0,0 +1,244 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "kis_double_parse_spin_box.h"
+
+#include "kis_num_parser.h"
+
+#include <QLabel>
+#include <QPixmap>
+#include <QIcon>
+#include <QFile>
+#include <QLineEdit>
+
+KisDoubleParseSpinBox::KisDoubleParseSpinBox(QWidget *parent) :
+    QDoubleSpinBox(parent),
+    boolLastValid(true)
+{
+
+    lastExprParsed = new QString("0.0");
+
+    connect(this, SIGNAL(noMoreParsingError()),
+                    this, SLOT(clearErrorStyle()));
+
+    //hack to let the clearError be called, even if the value changed method is the one from QDoubleSpinBox.
+    connect(this, SIGNAL(valueChanged(double)),
+                    this, SLOT(clearError()));
+
+    connect(this, SIGNAL(errorWhileParsing(QString)),
+                    this, SLOT(setErrorStyle()));
+
+    oldValue = value();
+
+    warningIcon = new QLabel(this);
+
+    if (QFile(":/./16_light_warning.svg").exists()) {
+        warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(16, 16));
+    } else {
+        warningIcon->setText("!");
+    }
+
+    warningIcon->setStyleSheet("background:transparent;");
+    warningIcon->move(1, 1);
+    warningIcon->setVisible(false);
+
+    isOldPaletteSaved = false;
+    areOldMarginsSaved = false;
+
+}
+
+KisDoubleParseSpinBox::~KisDoubleParseSpinBox()
+{
+
+    //needed to avoid a segfault during destruction.
+    delete lastExprParsed;
+
+}
+
+double KisDoubleParseSpinBox::valueFromText(const QString & text) const
+{
+
+    *lastExprParsed = text;
+
+    bool ok;
+
+    double ret;
+
+    if ( (suffix().isEmpty() || !text.endsWith(suffix())) &&
+         (prefix().isEmpty() || !text.startsWith(prefix())) ) {
+
+        ret = KisNumericParser::parseSimpleMathExpr(text, &ok);
+
+    } else {
+
+        QString expr = text;
+
+        if (text.endsWith(suffix())) {
+            expr.remove(text.size()-suffix().size(), suffix().size());
+        }
+
+        if(text.startsWith(prefix())){
+            expr.remove(0, prefix().size());
+        }
+
+        *lastExprParsed = expr;
+
+        ret = KisNumericParser::parseSimpleMathExpr(expr, &ok);
+
+    }
+
+    if(std::isnan(ret) || std::isinf(ret)){
+        ok = false;
+    }
+
+    if (!ok) {
+        if (boolLastValid) {
+            oldValue = value();
+        }
+
+        boolLastValid = false;
+        ret = oldValue; //in case of error set to minimum.
+    } else {
+
+        if (!boolLastValid) {
+            oldValue = ret;
+        }
+
+        boolLastValid = true;
+    }
+
+    return ret;
+
+}
+QString KisDoubleParseSpinBox::textFromValue(double val) const
+{
+
+    if (!boolLastValid) {
+            emit errorWhileParsing(*lastExprParsed);
+            return *lastExprParsed;
+    }
+
+    emit noMoreParsingError();
+
+    double v = KisNumericParser::parseSimpleMathExpr(cleanText());
+    v = QString("%1").arg(v, 0, 'f', decimals()).toDouble();
+    if (hasFocus() && (v == value() || (v >= maximum() && value() == maximum()) || (v <= minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
+        return cleanText();
+    }
+
+    return QDoubleSpinBox::textFromValue(val);
+}
+
+QValidator::State KisDoubleParseSpinBox::validate ( QString & input, int & pos ) const
+{
+
+    Q_UNUSED(input);
+    Q_UNUSED(pos);
+
+    return QValidator::Acceptable;
+
+}
+
+void KisDoubleParseSpinBox::stepBy(int steps)
+{
+
+    boolLastValid = true; //reset to valid state so we can use the up and down buttons.
+    emit noMoreParsingError();
+
+    QDoubleSpinBox::stepBy(steps);
+
+}
+
+void KisDoubleParseSpinBox::setValue(double value)
+{
+    if(value == oldValue && hasFocus()){ //avoid to reset the button when it set the value of something that will recall this slot.
+        return;
+    }
+
+    if (!hasFocus()) {
+        clearError();
+    }
+
+    QDoubleSpinBox::setValue(value);
+}
+
+void KisDoubleParseSpinBox::setErrorStyle()
+{
+
+    if (!boolLastValid) {
+        //setStyleSheet(_oldStyleSheet + "Background: red; color: white; padding-left: 18px;");
+
+        if (!isOldPaletteSaved) {
+            oldPalette = palette();
+        }
+        isOldPaletteSaved = true;
+
+        QPalette nP = oldPalette;
+        nP.setColor(QPalette::Background, Qt::red);
+        nP.setColor(QPalette::Base, Qt::red);
+        nP.setColor(QPalette::Text, Qt::white);
+        setPalette(nP);
+
+        if (!areOldMarginsSaved) {
+            oldMargins = lineEdit()->textMargins();
+        }
+        areOldMarginsSaved = true;
+
+        if (width() - height() >= 3*height()) { //if we have twice as much place as needed by the warning icon then display it.
+            QMargins newMargins = oldMargins;
+            newMargins.setLeft( newMargins.left() + height() - 4 );
+            lineEdit()->setTextMargins(newMargins);
+
+            int h = warningIcon->height();
+            int hp = height()-2;
+
+            if (h != hp) {
+                warningIcon->resize(hp, hp);
+
+                if (QFile(":/./16_light_warning.svg").exists()) {
+                    warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(hp-7, hp-7));
+                }
+            }
+
+            warningIcon->move(oldMargins.left()+4, 1);
+            warningIcon->setVisible(true);
+        }
+    }
+}
+
+void KisDoubleParseSpinBox::clearErrorStyle()
+{
+    if (boolLastValid) {
+        warningIcon->setVisible(false);
+
+        //setStyleSheet("");
+
+        setPalette(oldPalette);
+        isOldPaletteSaved = false;
+
+        lineEdit()->setTextMargins(oldMargins);
+        areOldMarginsSaved = false;
+    }
+}
+void KisDoubleParseSpinBox::clearError()
+{
+    boolLastValid = true;
+    emit noMoreParsingError();
+    oldValue = value();
+    clearErrorStyle();
+}
diff --git a/libs/widgets/kis_double_parse_spin_box.h b/libs/widgets/kis_double_parse_spin_box.h
new file mode 100644
index 0000000000..4c2b920773
--- /dev/null
+++ b/libs/widgets/kis_double_parse_spin_box.h
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KISDOUBLEPARSESPINBOX_H
+#define KISDOUBLEPARSESPINBOX_H
+
+#include <QDoubleSpinBox>
+
+#include "kritawidgets_export.h"
+
+class QLabel;
+
+/*!
+ * \brief The KisDoubleParseSpinBox class is a cleverer doubleSpinBox, able to parse arithmetic expressions.
+ *
+ * Use this spinbox instead of the basic one from Qt if you want it to be able to parse arithmetic expressions.
+ */
+class KRITAWIDGETS_EXPORT KisDoubleParseSpinBox : public QDoubleSpinBox
+{
+
+    Q_OBJECT
+public:
+    KisDoubleParseSpinBox(QWidget* parent = 0);
+    ~KisDoubleParseSpinBox();
+
+    virtual double valueFromText(const QString & text) const;
+    virtual QString textFromValue(double val) const;
+    virtual QValidator::State validate ( QString & input, int & pos ) const;
+
+    virtual void stepBy(int steps);
+
+    void setValue(double value); //polymorphism won't work directly, we use a signal/slot hack to do so but if signals are disabled this function will still be useful.
+
+    bool isLastValid() const{ return boolLastValid; }
+
+Q_SIGNALS:
+
+    //! \brief signal emmitted when the last parsed expression create an error.
+    void errorWhileParsing(QString expr) const;
+    //! \brief signal emmitted when the last parsed expression is valid.
+    void noMoreParsingError() const;
+
+public Q_SLOTS:
+
+    //! \brief useful to let the widget change it's stylesheet when an error occured in the last expression.
+    void setErrorStyle();
+    //! \brief useful to let the widget reset it's stylesheet when there's no more error.
+    void clearErrorStyle();
+    //! \brief say the widget to return to an error free state.
+    void clearError();
+
+protected:
+
+    mutable QString* lastExprParsed;
+    mutable bool boolLastValid;
+    mutable double oldValue;
+
+    QLabel* warningIcon;
+
+    QPalette oldPalette;
+    bool isOldPaletteSaved;
+
+    QMargins oldMargins;
+    bool areOldMarginsSaved;
+};
+
+#endif // KISDOUBLEPARSESPINBOX_H
diff --git a/libs/widgets/kis_double_parse_unit_spin_box.cpp b/libs/widgets/kis_double_parse_unit_spin_box.cpp
new file mode 100644
index 0000000000..47c10515dc
--- /dev/null
+++ b/libs/widgets/kis_double_parse_unit_spin_box.cpp
@@ -0,0 +1,172 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "kis_double_parse_unit_spin_box.h"
+
+
+class Q_DECL_HIDDEN KisDoubleParseUnitSpinBox::Private
+{
+public:
+    Private(double low, double up, double step)
+        : lowerInPoints(low),
+        upperInPoints(up),
+        stepInPoints(step),
+        unit(KoUnit(KoUnit::Point))
+    {
+    }
+
+    double lowerInPoints; ///< lowest value in points
+    double upperInPoints; ///< highest value in points
+    double stepInPoints;  ///< step in points
+    KoUnit unit;
+};
+
+KisDoubleParseUnitSpinBox::KisDoubleParseUnitSpinBox(QWidget *parent) :
+    KisDoubleParseSpinBox(parent),
+    d(new Private(-9999, 9999, 1))
+{
+    setUnit( KoUnit(KoUnit::Point) );
+    setAlignment( Qt::AlignRight );
+
+    connect(this, SIGNAL(valueChanged( double )), SLOT(privateValueChanged()));
+}
+
+KisDoubleParseUnitSpinBox::~KisDoubleParseUnitSpinBox()
+{
+    delete d;
+}
+
+void KisDoubleParseUnitSpinBox::changeValue( double newValue )
+{
+    if (d->unit.toUserValue(newValue) == oldValue) {
+        return;
+    }
+
+    KisDoubleParseSpinBox::setValue( d->unit.toUserValue(newValue) );
+}
+
+void KisDoubleParseUnitSpinBox::setUnit( const KoUnit & unit)
+{
+    if( unit == d->unit) return;
+    double oldValue = d->unit.fromUserValue( KisDoubleParseSpinBox::value() );
+
+    KisDoubleParseSpinBox::setMinimum( unit.toUserValue( d->lowerInPoints ) );
+    KisDoubleParseSpinBox::setMaximum( unit.toUserValue( d->upperInPoints ) );
+
+    qreal step = unit.toUserValue( d->stepInPoints );
+
+    if (unit.type() == KoUnit::Pixel) {
+        // limit the pixel step by 1.0
+        step = qMax(qreal(1.0), step);
+    }
+
+    KisDoubleParseSpinBox::setSingleStep( step );
+    d->unit = unit;
+    KisDoubleParseSpinBox::setValue( KoUnit::ptToUnit( oldValue, unit ) );
+    setSuffix( unit.symbol().prepend(QLatin1Char(' ')) );
+}
+
+double KisDoubleParseUnitSpinBox::value( ) const
+{
+    return d->unit.fromUserValue( KisDoubleParseSpinBox::value() );
+}
+
+void KisDoubleParseUnitSpinBox::setMinimum(double min)
+{
+    d->lowerInPoints = min;
+    KisDoubleParseSpinBox::setMinimum( d->unit.toUserValue( min ) );
+}
+
+void KisDoubleParseUnitSpinBox::setMaximum(double max)
+{
+    d->upperInPoints = max;
+    KisDoubleParseSpinBox::setMaximum( d->unit.toUserValue( max ) );
+}
+
+void KisDoubleParseUnitSpinBox::setLineStep(double step)
+{
+    d->stepInPoints = KoUnit(KoUnit::Point).toUserValue(step);
+    KisDoubleParseSpinBox::setSingleStep( step );
+}
+
+void KisDoubleParseUnitSpinBox::setLineStepPt(double step)
+{
+    d->stepInPoints = step;
+    KisDoubleParseSpinBox::setSingleStep( d->unit.toUserValue( step ) );
+}
+
+
+void KisDoubleParseUnitSpinBox::setMinMaxStep( double min, double max, double step )
+{
+    setMinimum( min );
+    setMaximum( max );
+    setLineStepPt( step );
+}
+
+
+QValidator::State KisDoubleParseUnitSpinBox::validate(QString &input, int &pos) const
+{
+    Q_UNUSED(pos);
+
+    QRegExp regexp ("([ a-zA-Z]+)$"); // Letters or spaces at end
+    const int res = input.indexOf( regexp );
+
+    if ( res == -1 ) {
+        // Nothing like an unit? The user is probably editing the unit
+        return QValidator::Intermediate;
+    }
+
+    QString expr ( input.left( res ) );
+    const QString unitName ( regexp.cap( 1 ).trimmed().toLower() );
+
+    bool ok = true;
+    bool interm = false;
+
+    QValidator::State exprState = KisDoubleParseSpinBox::validate(expr, pos);
+
+    if (exprState == QValidator::Invalid) {
+        return exprState;
+    } else if (exprState == QValidator::Intermediate) {
+        interm = true;
+    }
+
+    //check if we can parse the unit.
+    KoUnit::fromSymbol(unitName, &ok);
+
+    if (!ok || interm) {
+        return QValidator::Intermediate;
+    }
+
+    return QValidator::Acceptable;
+}
+
+QString KisDoubleParseUnitSpinBox::textFromValue( double value ) const
+{
+    return KisDoubleParseSpinBox::textFromValue(value);
+}
+
+double KisDoubleParseUnitSpinBox::valueFromText( const QString& str ) const
+{
+    //KisDoubleParseSpinBox is supposed to remove the suffix and prefix by itself.
+    return KisDoubleParseSpinBox::valueFromText(str);
+}
+
+void KisDoubleParseUnitSpinBox::privateValueChanged()
+{
+    emit valueChangedPt( value() );
+}
diff --git a/libs/widgets/kis_double_parse_unit_spin_box.h b/libs/widgets/kis_double_parse_unit_spin_box.h
new file mode 100644
index 0000000000..83094f8e85
--- /dev/null
+++ b/libs/widgets/kis_double_parse_unit_spin_box.h
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KIS_DOUBLEPARSEUNITSPINBOX_H
+#define KIS_DOUBLEPARSEUNITSPINBOX_H
+
+#include <KoUnit.h>
+
+#include "kis_double_parse_spin_box.h"
+#include "kritawidgets_export.h"
+
+/*!
+ * \brief The KisDoubleParseUnitSpinBox class is an evolution of the \see KoUnitDoubleSpinBox, but inherit from \see KisDoubleParseSpinBox to be able to parse math expressions.
+ *
+ * This class store the
+ */
+class KRITAWIDGETS_EXPORT  KisDoubleParseUnitSpinBox : public KisDoubleParseSpinBox
+{
+
+    Q_OBJECT
+
+public:
+    KisDoubleParseUnitSpinBox(QWidget* parent = 0);
+    ~KisDoubleParseUnitSpinBox();
+
+    /**
+     * Set the new value in points which will then be converted to the current unit for display
+     * @param newValue the new value
+     * @see value()
+     */
+    virtual void changeValue( double newValue );
+    /**
+     * This spinbox shows the internal value after a conversion to the unit set here.
+     */
+    virtual void setUnit(const KoUnit &unit);
+
+    /// @return the current value, converted in points
+    double value( ) const;
+
+    /// Set minimum value in points.
+    void setMinimum(double min);
+
+    /// Set maximum value in points.
+    void setMaximum(double max);
+
+    /// Set step size in the current unit.
+    void setLineStep(double step);
+
+    /// Set step size in points.
+    void setLineStepPt(double step);
+
+    /// Set minimum, maximum value and the step size (all in points)
+    void setMinMaxStep( double min, double max, double step );
+
+    /// reimplemented from superclass, will forward to KoUnitDoubleValidator
+    virtual QValidator::State validate(QString &input, int &pos) const;
+
+    /**
+     * Transform the double in a nice text, using locale symbols
+     * @param value the number as double
+     * @return the resulting string
+     */
+    virtual QString textFromValue( double value ) const;
+    /**
+     * Transfrom a string into a double, while taking care of locale specific symbols.
+     * @param str the string to transform into a number
+     * @return the value as double
+     */
+    virtual double valueFromText( const QString& str ) const;
+
+Q_SIGNALS:
+    /// emitted like valueChanged in the parent, but this one emits the point value
+    void valueChangedPt( qreal );
+
+
+private:
+    class Private;
+    Private * const d;
+
+private Q_SLOTS:
+    // exists to do emits for valueChangedPt
+    void privateValueChanged();
+};
+
+#endif // KIS_DOUBLEPARSEUNITSPINBOX_H
diff --git a/libs/widgets/kis_int_parse_spin_box.cpp b/libs/widgets/kis_int_parse_spin_box.cpp
new file mode 100644
index 0000000000..376a4cfdc2
--- /dev/null
+++ b/libs/widgets/kis_int_parse_spin_box.cpp
@@ -0,0 +1,252 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "kis_int_parse_spin_box.h"
+
+#include "kis_num_parser.h"
+
+#include <QLabel>
+#include <QPixmap>
+#include <QIcon>
+#include <QFile>
+#include <QLineEdit>
+
+KisIntParseSpinBox::KisIntParseSpinBox(QWidget *parent) :
+    QSpinBox(parent),
+    boolLastValid(true)
+{
+    lastExprParsed = new QString("0");
+
+    connect(this, SIGNAL(noMoreParsingError()),
+                    this, SLOT(clearErrorStyle()));
+
+    //hack to let the clearError be called, even if the value changed method is the one from QSpinBox.
+    connect(this, SIGNAL(valueChanged(int)),
+                    this, SLOT(clearError()));
+
+    connect(this, SIGNAL(errorWhileParsing(QString)),
+                    this, SLOT(setErrorStyle()));
+
+    oldVal = value();
+
+    warningIcon = new QLabel(this);
+
+    if (QFile(":/./16_light_warning.svg").exists()) {
+        warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(16, 16));
+    } else {
+        warningIcon->setText("!");
+    }
+
+    warningIcon->setStyleSheet("background:transparent;");
+    warningIcon->move(1, 1);
+    warningIcon->setVisible(false);
+
+    isOldPaletteSaved = false;
+    areOldMarginsSaved = false;
+
+}
+
+KisIntParseSpinBox::~KisIntParseSpinBox()
+{
+
+    //needed to avoid a segfault during destruction.
+    delete lastExprParsed;
+
+}
+
+int KisIntParseSpinBox::valueFromText(const QString & text) const
+{
+
+    *lastExprParsed = text;
+
+    bool ok;
+
+    int val;
+
+    if ( (suffix().isEmpty() || !text.endsWith(suffix())) &&
+         (prefix().isEmpty() || !text.startsWith(prefix())) ) {
+
+        val = KisNumericParser::parseIntegerMathExpr(text, &ok);
+
+    } else {
+
+        QString expr = text;
+
+        if (text.endsWith(suffix())) {
+            expr.remove(text.size()-suffix().size(), suffix().size());
+        }
+
+        if(text.startsWith(prefix())){
+            expr.remove(0, prefix().size());
+        }
+
+        *lastExprParsed = expr;
+
+        val = KisNumericParser::parseIntegerMathExpr(expr, &ok);
+
+    }
+
+    if (text.trimmed().isEmpty()) { //an empty text is considered valid in this case.
+            ok = true;
+    }
+
+    if (!ok) {
+
+            if (boolLastValid == true) {
+                oldVal = value();
+            }
+
+            boolLastValid = false;
+            //emit errorWhileParsing(text); //if uncommented become red everytime the string is wrong.
+            val = oldVal;
+    } else {
+
+            if (boolLastValid == false) {
+                oldVal = val;
+            }
+
+            boolLastValid = true;
+            //emit noMoreParsingError();
+    }
+
+    return val;
+
+}
+
+QString KisIntParseSpinBox::textFromValue(int val) const
+{
+
+    if (!boolLastValid) {
+        emit errorWhileParsing(*lastExprParsed);
+        return *lastExprParsed;
+    }
+
+    emit noMoreParsingError();
+
+    int v = KisNumericParser::parseIntegerMathExpr(cleanText());
+    if (hasFocus() && (v == value() || (v >= maximum() && value() == maximum()) || (v <= minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
+        return cleanText();
+    }
+
+    return QSpinBox::textFromValue(val);
+
+}
+
+QValidator::State KisIntParseSpinBox::validate ( QString & input, int & pos ) const
+{
+
+    Q_UNUSED(input);
+    Q_UNUSED(pos);
+
+    //this simple definition is sufficient for the moment
+    //TODO: see if needed to get something more complex.
+    return QValidator::Acceptable;
+
+}
+
+void KisIntParseSpinBox::stepBy(int steps)
+{
+
+    boolLastValid = true;
+    emit noMoreParsingError();
+
+    QSpinBox::stepBy(steps);
+
+}
+
+void KisIntParseSpinBox::setValue(int val)
+{
+
+    if(val == oldVal && hasFocus()){ //avoid to reset the button when it set the value of something that will recall this slot.
+        return;
+    }
+
+    if (!hasFocus()) {
+        clearError();
+    }
+
+    QSpinBox::setValue(val);
+}
+
+void KisIntParseSpinBox::setErrorStyle()
+{
+
+    if (!boolLastValid) {
+        //setStyleSheet(_oldStyleSheet + "Background: red; color: white; padding-left: 18px;");
+
+        if (!isOldPaletteSaved) {
+            oldPalette = palette();
+        }
+        isOldPaletteSaved = true;
+
+        QPalette nP = oldPalette;
+        nP.setColor(QPalette::Background, Qt::red);
+        nP.setColor(QPalette::Base, Qt::red);
+        nP.setColor(QPalette::Text, Qt::white);
+        setPalette(nP);
+
+        if (!areOldMarginsSaved) {
+            oldMargins = lineEdit()->textMargins();
+        }
+        areOldMarginsSaved = true;
+
+        if (width() - height() >= 3*height()) { //if we have twice as much place as needed by the warning icon then display it.
+            QMargins newMargins = oldMargins;
+            newMargins.setLeft( newMargins.left() + height() - 4 );
+            lineEdit()->setTextMargins(newMargins);
+
+            int h = warningIcon->height();
+            int hp = height()-2;
+
+            if (h != hp) {
+                warningIcon->resize(hp, hp);
+
+                if (QFile(":/./16_light_warning.svg").exists()) {
+                    warningIcon->setPixmap(QIcon(":/./16_light_warning.svg").pixmap(hp-7, hp-7));
+                }
+            }
+
+            warningIcon->move(oldMargins.left()+4, 1);
+            warningIcon->setVisible(true);
+        }
+    }
+}
+
+void KisIntParseSpinBox::clearErrorStyle()
+{
+    if (boolLastValid) {
+        warningIcon->setVisible(false);
+
+        //setStyleSheet("");
+
+        setPalette(oldPalette);
+        isOldPaletteSaved = false;
+
+        lineEdit()->setTextMargins(oldMargins);
+        areOldMarginsSaved = false;
+    }
+}
+
+
+void KisIntParseSpinBox::clearError()
+{
+    boolLastValid = true;
+    emit noMoreParsingError();
+    oldVal = value();
+    clearErrorStyle();
+}
diff --git a/libs/widgets/kis_int_parse_spin_box.h b/libs/widgets/kis_int_parse_spin_box.h
new file mode 100644
index 0000000000..ffd3b5c2dc
--- /dev/null
+++ b/libs/widgets/kis_int_parse_spin_box.h
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KISINTPARSESPINBOX_H
+#define KISINTPARSESPINBOX_H
+
+#include <QSpinBox>
+
+#include "kritawidgets_export.h"
+
+class QLabel;
+
+/*!
+ * \brief The KisDoubleParseSpinBox class is a cleverer doubleSpinBox, able to parse arithmetic expressions.
+ *
+ * Use this spinbox instead of the basic one from Qt if you want it to be able to parse arithmetic expressions.
+ */
+class KRITAWIDGETS_EXPORT KisIntParseSpinBox : public QSpinBox
+{
+    Q_OBJECT
+
+public:
+    KisIntParseSpinBox(QWidget *parent = 0);
+    ~KisIntParseSpinBox();
+
+    virtual int valueFromText(const QString & text) const;
+    virtual QString textFromValue(int val) const;
+    virtual QValidator::State validate ( QString & input, int & pos ) const;
+
+    virtual void stepBy(int steps);
+
+    void setValue(int val); //polymorphism won't work directly, we use a signal/slot hack to do so but if signals are disabled this function will still be useful.
+
+    bool isLastValid() const{ return boolLastValid; }
+
+Q_SIGNALS:
+
+    //! \brief signal emmitted when the last parsed expression create an error.
+    void errorWhileParsing(QString expr) const;
+    //! \brief signal emmitted when the last parsed expression is valid.
+    void noMoreParsingError() const;
+
+public Q_SLOTS:
+
+    //! \brief useful to let the widget change it's stylesheet when an error occured in the last expression.
+    void setErrorStyle();
+    //! \brief useful to let the widget reset it's stylesheet when there's no more error.
+    void clearErrorStyle();
+    //! \brief say the widget to return to an error free state.
+    void clearError();
+
+protected:
+
+    mutable QString* lastExprParsed;
+    mutable bool boolLastValid;
+    mutable int oldVal; //store the last correctly evaluated value.
+
+    QLabel* warningIcon;
+
+    QPalette oldPalette;
+    bool isOldPaletteSaved;
+
+    QMargins oldMargins;
+    bool areOldMarginsSaved;
+};
+
+#endif // KISINTPARSESPINBOX_H
diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt
index 29bd019f40..019ec1fac0 100644
--- a/libs/widgets/tests/CMakeLists.txt
+++ b/libs/widgets/tests/CMakeLists.txt
@@ -1,26 +1,32 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
 add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 
 #add_subdirectory(filedialogtester)
 
 ########### next target ###############
 
 set(zoomhandler_test_SRCS zoomhandler_test.cpp )
 kde4_add_unit_test(zoomhandler_test TESTNAME libs-widgets-zoomhandler_test  ${zoomhandler_test_SRCS})
 target_link_libraries(zoomhandler_test kritawidgets Qt5::Test)
 
 ########### next target ###############
 
 set(zoomcontroller_test_SRCS zoomcontroller_test.cpp )
 kde4_add_unit_test(zoomcontroller_test TESTNAME libs-widgets-zoomcontroller_test  ${zoomcontroller_test_SRCS})
 target_link_libraries(zoomcontroller_test  kritawidgets Qt5::Test)
 
 ########### next target ###############
 
 set(KoResourceTaggingTest_SRCS KoResourceTaggingTest.cpp )
 kde4_add_broken_unit_test(KoResourceTaggingTest TESTNAME libs-widgets-KoResourceTaggingTest  ${KoResourceTaggingTest_SRCS})
 target_link_libraries(KoResourceTaggingTest  kritawidgets Qt5::Test)
 
+########### next target ###############
+
+set(kis_parse_spin_boxes_test_SRCS kis_parse_spin_boxes_test.cpp)
+kde4_add_unit_test(KisParseSpinBoxesTest TESTNAME krita-ui-KisParseSpinBoxesTest ${kis_parse_spin_boxes_test_SRCS})
+target_link_libraries(KisParseSpinBoxesTest kritaui Qt5::Test)
+
 ########### end ###############
diff --git a/libs/ui/tests/kis_parsespinboxestest.cpp b/libs/widgets/tests/kis_parse_spin_boxes_test.cpp
similarity index 98%
rename from libs/ui/tests/kis_parsespinboxestest.cpp
rename to libs/widgets/tests/kis_parse_spin_boxes_test.cpp
index da1c0980d5..0fe1359f10 100644
--- a/libs/ui/tests/kis_parsespinboxestest.cpp
+++ b/libs/widgets/tests/kis_parse_spin_boxes_test.cpp
@@ -1,365 +1,365 @@
 /*
  *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "kis_parsespinboxestest.h"
+#include "kis_parse_spin_boxes_test.h"
 
-#include "kis_numparser.h"
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_num_parser.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 #include <QString>
 #include <QtTest>
 
 const QStringList KisParseSpinBoxesTest::doubleExprs = {"1",
 														"-12",
 														"7.9 - 12",
 														"cos(90)*2",
 														"cos(acos(-1)+1*3^2.0)*2 + sin(3)/2"};
 
 const QStringList KisParseSpinBoxesTest::doubleWrongExprs = {"abc",
 															 "1/",
 															 "7.9 + 12*",
 															 "cos(90)*2 + ",
 															 "23.0/0",
 															 "0.0/0.0"};
 
 const QStringList KisParseSpinBoxesTest::intExprs = {"12",
 													 "-12",
 													 "-12.3",
 													 "12.7 - 25",
 													 "12.7",
 													 "12*1.5",
 													 "12/2.5",
 													 "518*2/3"};
 
 const QStringList KisParseSpinBoxesTest::intWrongExprs = {"abc",
 														  "12.5/2 +",
 														  "12*",
 														  "12/0"};
 
 KisParseSpinBoxesTest::KisParseSpinBoxesTest() : QObject()
 {
 
 }
 
 void KisParseSpinBoxesTest::testDoubleParseNormal()
 {
 
 	KisDoubleParseSpinBox spinBox;
 	spinBox.setDecimals(3);
 	spinBox.setMaximum(9999.0);
 	spinBox.setMinimum(-9999.0);
 
 	for (int i = 0; i < doubleExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleExprs[i]);
 		spinBox.clearFocus();
 
 		double resultParser = KisNumericParser::parseSimpleMathExpr(doubleExprs[i]);
 		double valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox || qAbs(resultParser - valueSpinBox) < 1e-2;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(doubleExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 
 	}
 
 
 }
 
 void KisParseSpinBoxesTest::testDoubleParseProblem()
 {
 
 	//error can happen with incomplete or incorrect expressions, inf or nan values.
 
 	KisDoubleParseSpinBox spinBox;
 	spinBox.setMaximum(9999.0);
 	spinBox.setMinimum(-9999.0);
 
 	for (int i = 0; i < doubleWrongExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.isLastValid(), QString("SpinBox is in a valid state with expression %1, but shouldn't.")
 				 .arg(doubleWrongExprs[i]).toStdString().c_str());
 
 		spinBox.setValue(0.0);
 
 		QVERIFY2(spinBox.isLastValid(), QString("SpinBox unsable to recover error free state after a value reset.")
 				 .toStdString().c_str());
 
 		spinBox.setValue(0);
 
 	}
 
 }
 void KisParseSpinBoxesTest::testDoubleParseWithSuffix(){
 
 	QString suff = "px";
 
 	KisDoubleParseSpinBox spinBox;
 	spinBox.setDecimals(3);
 	spinBox.setMaximum(9999.0);
 	spinBox.setMinimum(-9999.0);
 	spinBox.setSuffix(suff);
 
 	for (int i = 0; i < doubleExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleExprs[i]);
 		spinBox.clearFocus();
 
 		double resultParser = KisNumericParser::parseSimpleMathExpr(doubleExprs[i]);
 		double valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox || qAbs(resultParser - valueSpinBox) < 1e-2;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(doubleExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 
 	}
 
 	//verify that the suffix don't appear in the clean text in case of error.
 	for (int i = 0; i < doubleWrongExprs.size(); i++) {
 
 		if (doubleWrongExprs[i].endsWith(suff)) {
 			continue;
 		}
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.cleanText().endsWith(suff), "SpinBox failed to remove suffix from clean text in error state.");
 
 		spinBox.setValue(0.0);
 
 	}
 }
 void KisParseSpinBoxesTest::testDoubleParseWithPrefix()
 {
 
 	QString preff = "px";
 
 	KisDoubleParseSpinBox spinBox;
 	spinBox.setDecimals(3);
 	spinBox.setMaximum(9999.0);
 	spinBox.setMinimum(-9999.0);
 	spinBox.setPrefix(preff);
 
 	for (int i = 0; i < doubleExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleExprs[i]);
 		spinBox.clearFocus();
 
 		double resultParser = KisNumericParser::parseSimpleMathExpr(doubleExprs[i]);
 		double valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox || qAbs(resultParser - valueSpinBox) < 1e-2;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(doubleExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 
 	}
 
 	//verify that the prefix don't appear in the clean text in case of error.
 	for (int i = 0; i < doubleWrongExprs.size(); i++) {
 
 		if (doubleWrongExprs[i].endsWith(preff)) {
 			continue;
 		}
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, doubleWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.cleanText().startsWith(preff), "SpinBox failed to remove prefix from clean text in error state.");
 
 		spinBox.setValue(0.0);
 
 	}
 }
 
 void KisParseSpinBoxesTest::testIntParseNormal()
 {
 
 	KisIntParseSpinBox spinBox;
 	spinBox.setMaximum(999);
 	spinBox.setMinimum(-999);
 
 	for (int i = 0; i < intExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intExprs[i]);
 		spinBox.clearFocus();
 
 		int resultParser = KisNumericParser::parseIntegerMathExpr(intExprs[i]);
 		int valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(intExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 	}
 
 }
 
 void KisParseSpinBoxesTest::testIntParseProblem()
 {
 
 	//errors can happen with incorrect or incomplete expressions, or division by 0.
 
 	KisIntParseSpinBox spinBox;
 	spinBox.setMaximum(999);
 	spinBox.setMinimum(-999);
 
 	for (int i = 0; i < intWrongExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.isLastValid(), QString("SpinBox is in a valid state with expression %1, but shouldn't.")
 				 .arg(intWrongExprs[i]).toStdString().c_str());
 
 		spinBox.setValue(0);
 
 		QVERIFY2(spinBox.isLastValid(), QString("SpinBox unsable to recover error free state after a value reset.")
 				 .toStdString().c_str());
 
 		spinBox.setValue(0);
 
 	}
 
 }
 
 void KisParseSpinBoxesTest::testIntParseWithSuffix()
 {
 	QString suff = "px";
 
 	KisIntParseSpinBox spinBox;
 	spinBox.setMaximum(999);
 	spinBox.setMinimum(-999);
 	spinBox.setSuffix(suff);
 
 	for (int i = 0; i < intExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intExprs[i]);
 		spinBox.clearFocus();
 
 		int resultParser = KisNumericParser::parseIntegerMathExpr(intExprs[i]);
 		int valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(intExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 	}
 
 	//verify that the suffix don't appear in the clean text in case of error.
 	for (int i = 0; i < intWrongExprs.size(); i++) {
 
 		if (intWrongExprs[i].endsWith(suff)) {
 			continue;
 		}
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.cleanText().endsWith(suff), "SpinBox failed to remove suffix from clean text in error state.");
 
 		spinBox.setValue(0.0);
 
 	}
 
 }
 void KisParseSpinBoxesTest::testIntParseWithPrefix()
 {
 	QString preff = "px";
 
 	KisIntParseSpinBox spinBox;
 	spinBox.setMaximum(999);
 	spinBox.setMinimum(-999);
 	spinBox.setPrefix(preff);
 
 	for (int i = 0; i < intExprs.size(); i++) {
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intExprs[i]);
 		spinBox.clearFocus();
 
 		int resultParser = KisNumericParser::parseIntegerMathExpr(intExprs[i]);
 		int valueSpinBox = spinBox.value();
 
 		bool test = resultParser == valueSpinBox;
 
 		QVERIFY2(test, QString("Failed with expression %1, result is %2, value is %3")
 				 .arg(intExprs[i]).arg(resultParser).arg(valueSpinBox).toStdString().c_str());
 
 		spinBox.setValue(0);
 	}
 
 	//verify that the prefix don't appear in the clean text in case of error.
 	for (int i = 0; i < intWrongExprs.size(); i++) {
 
 		if (intWrongExprs[i].startsWith(preff)) {
 			continue;
 		}
 
 		spinBox.clearFocus();
 		spinBox.clear(); //clear all
 		QTest::keyClicks(&spinBox, intWrongExprs[i]);
 		spinBox.clearFocus();
 
 		QVERIFY2(!spinBox.cleanText().startsWith(preff), "SpinBox failed to remove prefix from clean text in error state.");
 
 		spinBox.setValue(0.0);
 
 	}
 
 }
 
 QTEST_MAIN(KisParseSpinBoxesTest)
diff --git a/libs/ui/tests/kis_parsespinboxestest.h b/libs/widgets/tests/kis_parse_spin_boxes_test.h
similarity index 100%
rename from libs/ui/tests/kis_parsespinboxestest.h
rename to libs/widgets/tests/kis_parse_spin_boxes_test.h
diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
index f54a46ee49..722971857e 100644
--- a/libs/widgetutils/CMakeLists.txt
+++ b/libs/widgetutils/CMakeLists.txt
@@ -1,125 +1,127 @@
 add_subdirectory(tests)
 
 configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/config)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/xmlgui)
 
 set(kritawidgetutils_LIB_SRCS
 
     WidgetUtilsDebug.cpp
 
     kis_icon_utils.cpp
     kis_action_registry.cpp
     KoGroupButton.cpp
     KoProgressBar.cpp
     KoProgressUpdater.cpp
     KoUpdater.cpp
     KoUpdaterPrivate_p.cpp
     KoProperties.cpp
     KoFileDialog.cpp
     KoResourcePaths.cpp
 
+	kis_num_parser.cpp
+
     config/kcolorscheme.cpp
     config/kcolorschememanager.cpp
     config/khelpclient.cpp
     config/klanguagebutton.cpp
     config/krecentfilesaction.cpp
     config/kstandardaction.cpp
 
     xmlgui/KisShortcutsEditorItem.cpp
     xmlgui/KisShortcutEditWidget.cpp
     xmlgui/KisShortcutsEditorDelegate.cpp
     xmlgui/KisShortcutsDialog.cpp
     xmlgui/KisShortcutsDialog_p.cpp
     xmlgui/KisShortcutsEditor.cpp
     xmlgui/KisShortcutsEditor_p.cpp
 
     xmlgui/kshortcutschemeseditor.cpp
     xmlgui/kshortcutschemeshelper.cpp
 
     xmlgui/kaboutkdedialog_p.cpp
     xmlgui/kactioncategory.cpp
     xmlgui/kactioncollection.cpp
     xmlgui/kactionconflictdetector.cpp
     xmlgui/kbugreport.cpp
     xmlgui/kcheckaccelerators.cpp
     xmlgui/kedittoolbar.cpp
     xmlgui/kgesture.cpp
     xmlgui/kgesturemap.cpp
     xmlgui/khelpmenu.cpp
     xmlgui/kkeysequencewidget.cpp
     xmlgui/kmainwindow.cpp
     xmlgui/kmenumenuhandler_p.cpp
     xmlgui/kshortcutwidget.cpp
     xmlgui/kswitchlanguagedialog_p.cpp
     xmlgui/ktoggletoolbaraction.cpp
     xmlgui/ktoolbar.cpp
     xmlgui/ktoolbarhandler.cpp
     xmlgui/kundoactions.cpp
     xmlgui/kxmlguibuilder.cpp
     xmlgui/kxmlguiclient.cpp
     xmlgui/kxmlguifactory.cpp
     xmlgui/kxmlguifactory_p.cpp
     xmlgui/kxmlguiversionhandler.cpp
     xmlgui/kxmlguiwindow.cpp
 )
 
 if (HAVE_DBUS)
     set(kritawidgetutils_LIB_SRCS ${kritawidgetutils_LIB_SRCS}
         xmlgui/kmainwindowiface.cpp
     )
 endif()
 
 ki18n_wrap_ui(kritawidgetutils_LIB_SRCS
     xmlgui/KisShortcutsDialog.ui
     xmlgui/kshortcutwidget.ui
 )
 
 qt5_add_resources(kritawidgetutils_LIB_SRCS xmlgui/kxmlgui.qrc)
 
 add_library(kritawidgetutils SHARED ${kritawidgetutils_LIB_SRCS})
 
 target_include_directories(kritawidgetutils
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/config>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/xmlgui>
 )
 
 generate_export_header(kritawidgetutils BASE_NAME kritawidgetutils)
 
 if (HAVE_DBUS)
    set (KRITA_WIDGET_UTILS_EXTRA_LIBS ${KRITA_WIDGET_UTILS_EXTRA_LIBS} Qt5::DBus)
 endif ()
 
 if (APPLE)
     find_library(FOUNDATION_LIBRARY Foundation)
     set(KRITA_WIDGET_UTILS_EXTRA_LIBS ${KRITA_WIDGET_UTILS_EXTRA_LIBS} ${FOUNDATION_LIBRARY})
 endif ()
 
 target_link_libraries(kritawidgetutils
     PUBLIC
         Qt5::Widgets
         Qt5::Gui
         Qt5::Xml
         Qt5::Core
         KF5::ItemViews
         kritaglobal
     PRIVATE
         Qt5::PrintSupport
         KF5::I18n
         KF5::ConfigCore
         KF5::CoreAddons
         KF5::ConfigGui
         KF5::GuiAddons
         KF5::WidgetsAddons
         KF5::WindowSystem
         kritaplugin
         ${KRITA_WIDGET_UTILS_EXTRA_LIBS}
 )
 
 set_target_properties(kritawidgetutils
     PROPERTIES VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritawidgetutils ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/libs/widgetutils/kis_num_parser.cpp b/libs/widgetutils/kis_num_parser.cpp
new file mode 100644
index 0000000000..06f8377907
--- /dev/null
+++ b/libs/widgetutils/kis_num_parser.cpp
@@ -0,0 +1,567 @@
+/*
+ *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "kis_num_parser.h"
+
+//#include <QtMath>
+#include <qmath.h>
+#include <QVector>
+#include <QRegExp>
+#include <QStringList>
+#include <QVariant>
+
+#include <iostream>
+
+using namespace std;
+
+const QVector<char> opLevel1 = {'+', '-'};
+const QVector<char> opLevel2 = {'*', '/'};
+
+const QStringList supportedFuncs = {"", "cos", "sin", "tan", "acos", "asin", "atan", "exp", "ln", "log10", "abs"};
+
+const QRegExp funcExpr("(-)?([a-zA-Z]*)?\\((.+)\\)");
+const QRegExp numberExpr("(-)?([0-9]+\\.?[0-9]*(e[0-9]*)?)");
+
+const QRegExp funcExprInteger("(-)?\\((.+)\\)");
+const QRegExp integerExpr("(-)?([0-9]+)");
+
+//double functions
+double treatFuncs(QString const& expr, bool & noProblem);
+double treatLevel1(QString const& expr, bool & noProblem);
+double treatLevel2(QString const& expr, bool & noProblem);
+double treatLevel3(QString const& expr, bool & noProblem);
+
+//int functions
+double treatLevel1Int(QString const& expr, bool & noProblem);
+double treatLevel2Int(QString const& expr, bool & noProblem);
+double treatFuncsInt(QString const& expr, bool & noProblem);
+
+namespace KisNumericParser {
+
+/*!
+ * \param expr the expression to parse
+ * \param noProblem if provided, the value pointed to will be se to true is no problem appeared, false otherwise.
+ * \return the numerical value the expression eval to (or 0 in case of error).
+ */
+double parseSimpleMathExpr(const QString &expr, bool *noProblem)
+{
+
+    bool ok = true; //intermediate variable to pass by reference to the sublevel parser (if no pointer is provided).
+
+    //then go down each 3 levels of operation priority.
+    if (noProblem != nullptr) {
+        return treatLevel1(expr, *noProblem);
+    }
+
+    return treatLevel1(expr, ok);
+
+}
+
+/*!
+ * \param expr the expression to parse
+ * \param noProblem if provided, the value pointed to will be se to true is no problem appeared, false otherwise.
+ * \return the numerical value the expression eval to (or 0 in case of error).
+ */
+int parseIntegerMathExpr(QString const& expr, bool* noProblem)
+{
+
+    bool ok = true; //intermediate variable to pass by reference to the sublevel parser (if no pointer is provided).
+
+    if (noProblem != nullptr) {
+        return qRound(treatLevel1Int(expr, *noProblem));
+    }
+
+    return qRound(treatLevel1Int(expr, ok));
+
+}
+
+} //namespace KisNumericParser.
+
+
+//intermediate functions
+
+/*!
+ * \brief extractSubExprLevel1 extract from an expression the part of an expression that need to be treated recursivly before computing level 1 operations (+, -).
+ * \param expr The expression to treat, the part returned will be removed.
+ * \param nextOp This reference, in case of sucess, will hold the first level operation identified as separator ('+' or '-')
+ * \param noProblem A reference to a bool, set to true if there was no problem, false otherwise.
+ * \return The first part of the expression that doesn't contain first level operations not nested within parenthesis.
+ */
+inline QString extractSubExprLevel1(QString & expr, char & nextOp, bool & noProblem){
+
+    QString ret;
+
+    int subCount = 0;
+
+    bool lastMetIsNumber = false;
+
+    for(int i = 0; i < expr.size(); i++){
+
+    if (expr.at(i) == '(') {
+        subCount++;
+    }
+
+    if (expr.at(i) == ')') {
+        subCount--;
+    }
+
+    if (subCount < 0) {
+        noProblem = false;
+        return ret;
+    }
+
+    if(i == expr.size()-1 && subCount == 0){
+        ret = expr;
+        expr.clear();
+        break;
+    }
+
+    if( (expr.at(i) == '+' || expr.at(i) == '-') &&
+            subCount == 0) {
+
+        if (expr.at(i) == '-' &&
+                i < expr.size()-1) {
+
+            bool cond = !expr.at(i+1).isSpace();
+
+            if (cond && !lastMetIsNumber) {
+                continue;
+            }
+
+        }
+
+        ret = expr.mid(0, i).trimmed();
+        nextOp = expr.at(i).toLatin1();
+        expr = expr.mid(i+1);
+        break;
+
+    }
+
+    if (expr.at(i).isDigit()) {
+        lastMetIsNumber = true;
+    } else if (expr.at(i) != '.' &&
+              !expr.at(i).isSpace()) {
+        lastMetIsNumber = false;
+    }
+
+    }
+
+    noProblem = true;
+    return ret;
+}
+
+
+/*!
+ * \brief extractSubExprLevel2 extract from an expression the part of an expression that need to be treated recursivly before computing level 2 operations (*, /).
+ * \param expr The expression to treat, the part returned will be removed.
+ * \param nextOp This reference, in case of sucess, will hold the first level operation identified as separator ('*' or '/')
+ * \param noProblem A reference to a bool, set to true if there was no problem, false otherwise.
+ * \return The first part of the expression that doesn't contain second level operations not nested within parenthesis.
+ */
+inline QString extractSubExprLevel2(QString & expr, char & nextOp, bool & noProblem){
+
+    QString ret;
+
+    int subCount = 0;
+
+    for(int i = 0; i < expr.size(); i++){
+
+    if (expr.at(i) == '(') {
+        subCount++;
+    }
+
+    if (expr.at(i) == ')') {
+        subCount--;
+    }
+
+    if (subCount < 0) {
+        noProblem = false;
+        return ret;
+    }
+
+    if(i == expr.size()-1 && subCount == 0){
+        ret = expr;
+        expr.clear();
+        break;
+    }
+
+    if( (expr.at(i) == '*' || expr.at(i) == '/') &&
+            subCount == 0) {
+
+        ret = expr.mid(0, i).trimmed();
+        nextOp = expr.at(i).toLatin1();
+        expr = expr.mid(i+1);
+        break;
+
+    }
+
+    }
+
+    noProblem = true;
+    return ret;
+}
+
+/*!
+ * \brief treatLevel1 treat an expression at the first level of recursion.
+ * \param expr The expression to treat.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed expression or subexpression or 0 in case of error.
+ */
+double treatLevel1(const QString &expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    QString exprDestructable = expr;
+
+    char nextOp = '+';
+    double result = 0.0;
+
+    while (!exprDestructable.isEmpty()) {
+
+        double sign = (nextOp == '-') ? -1 : 1;
+        QString part = extractSubExprLevel1(exprDestructable, nextOp, noProblem);
+
+        if (!noProblem) {
+        return 0.0;
+        }
+
+        if (sign > 0) {
+        result += treatLevel2(part, noProblem);
+        } else {
+        result -= treatLevel2(part, noProblem);
+        }
+
+        if(!noProblem){
+        return 0.0;
+        }
+    }
+
+    return result;
+
+}
+
+/*!
+ * \brief treatLevel2 treat a subexpression at the second level of recursion.
+ * \param expr The subexpression to treat.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed subexpression or 0 in case of error.
+ *
+ * The expression should not contain first level operations not nested in parenthesis.
+ */
+double treatLevel2(QString const& expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    QString exprDestructable = expr;
+
+    char nextOp = '*';
+
+    QString part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
+
+    double result = treatLevel3(part, noProblem);
+
+    while (!exprDestructable.isEmpty()) {
+
+        if (!noProblem) {
+        return 0.0;
+        }
+
+        bool needToMultiply = (nextOp == '*');
+        part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
+
+        if (!noProblem) {
+        return 0.0;
+        }
+
+        if (needToMultiply) {
+        result *= treatLevel3(part, noProblem);
+        } else {
+        result /= treatLevel3(part, noProblem);
+        }
+    }
+
+    return result;
+}
+
+/*!
+ * \brief treatLevel3 treat a subexpression at the third level of recursion.
+ * \param expr The subexpression to treat.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed subexpression or 0 in case of error.
+ *
+ * The expression should not contain first or second level operations not nested in parenthesis.
+ */
+double treatLevel3(const QString &expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    int indexPower = -1;
+    int indexCount = 0;
+    int subLevels = 0;
+
+    for (int i = 0; i < expr.size(); i++) {
+        if (expr.at(i) == '(') {
+            subLevels++;
+        } else if(expr.at(i) == ')') {
+            subLevels--;
+            if (subLevels < 0) {
+                noProblem = false;
+                return 0.0;
+            }
+        } else if (expr.at(i) == '^') {
+            if (subLevels == 0) {
+                indexPower = i;
+                indexCount++;
+            }
+        }
+    }
+
+    if (indexCount > 1 || indexPower + 1 >= expr.size()) {
+        noProblem = false;
+        return 0.0;
+    }
+
+    if (indexPower > -1) {
+
+        QStringList subExprs;
+        subExprs << expr.mid(0,indexPower);
+        subExprs << expr.mid(indexPower+1);
+
+        bool noProb1 = true;
+        bool noProb2 = true;
+
+        double base = treatFuncs(subExprs[0], noProb1);
+        double power = treatFuncs(subExprs[1], noProb2);
+
+        return qPow(base, power);
+
+    } else {
+        return treatFuncs(expr, noProblem);
+    }
+
+    noProblem = false;
+    return 0.0;
+
+}
+
+/*!
+ * \brief treatFuncs treat the last level of recursion: parenthesis and functions.
+ * \param expr The expression to parse.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed subexpression or 0 in case of error.
+ *
+ * The expression should not contain operators not nested anymore. The subexpressions within parenthesis will be treated by recalling the level 1 function.
+ */
+double treatFuncs(QString const& expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    QRegExp funcExp = funcExpr; //copy the expression in the current execution stack, to avoid errors for example when multiple thread call this function.
+    QRegExp numExp = numberExpr;
+
+    if (funcExp.exactMatch(expr.trimmed())) {
+
+        int sign = funcExp.capturedTexts()[1].isEmpty() ? 1 : -1;
+        QString func = funcExp.capturedTexts()[2].toLower();
+        QString subExpr = funcExp.capturedTexts()[3];
+
+        double val = treatLevel1(subExpr, noProblem);
+
+        if (!noProblem) {
+            return 0.0;
+        }
+
+        if (func.isEmpty()) {
+            return sign*val;
+        }
+
+        if (!supportedFuncs.contains(func)) {
+            noProblem = false;
+            return 0.0;
+        }
+
+        //trigonometry is done in degree
+        if (func == "cos") {
+            val = qCos(val/180*qAcos(-1));
+        } else if (func == "sin") {
+            val = qSin(val/180*qAcos(-1));
+        } else if (func == "tan") {
+            val = qTan(val/180*qAcos(-1));
+        } else if(func == "acos") {
+            val = qAcos(val)*180/qAcos(-1);
+        } else if (func == "asin") {
+            val = qAsin(val)*180/qAcos(-1);
+        } else if (func == "atan") {
+            val = qAtan(val)*180/qAcos(-1);
+        } else if (func == "exp") {
+            val = qExp(val);
+        } else if (func == "ln") {
+            val = qLn(val);
+        } else if (func == "log10") {
+            val = qLn(val)/qLn(10.0);
+        } else if (func == "abs") {
+            val = qAbs(val);
+        }
+
+        return sign*val;
+    } else if(numExp.exactMatch(expr.trimmed())) {
+        return expr.toDouble(&noProblem);
+    }
+
+    noProblem = false;
+    return 0.0;
+
+}
+
+//int functions
+/*!
+ * \brief treatLevel1 treat an expression at the first level of recursion.
+ * \param expr The expression to treat.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed expression or subexpression or 0 in case of error.
+ */
+double treatLevel1Int(QString const& expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    QString exprDestructable = expr;
+
+    char nextOp = '+';
+    double result = 0.0;
+
+    while (!exprDestructable.isEmpty()) {
+
+    double sign = (nextOp == '-') ? -1 : 1;
+    QString part = extractSubExprLevel1(exprDestructable, nextOp, noProblem);
+
+    if( !noProblem) {
+        return 0.0;
+    }
+
+    if (sign > 0) {
+        result += treatLevel2Int(part, noProblem);
+    } else {
+        result -= treatLevel2Int(part, noProblem);
+    }
+
+    if(!noProblem){
+        return 0.0;
+    }
+    }
+
+    return result;
+
+}
+
+/*!
+ * \brief treatLevel2 treat a subexpression at the second level of recursion.
+ * \param expr The subexpression to treat.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed subexpression or 0 in case of error.
+ *
+ * The expression should not contain first level operations not nested in parenthesis.
+ */
+double treatLevel2Int(const QString &expr, bool &noProblem)
+{
+
+    noProblem = true;
+
+    QString exprDestructable = expr;
+
+    char nextOp = '*';
+
+    QString part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
+
+    double result = treatFuncsInt(part, noProblem);
+
+    while (!exprDestructable.isEmpty()) {
+
+    if (!noProblem) {
+        return 0.0;
+    }
+
+    bool needToMultiply = (nextOp == '*');
+    part = extractSubExprLevel2(exprDestructable, nextOp, noProblem);
+
+    if (!noProblem) {
+        return 0.0;
+    }
+
+    if (needToMultiply) {
+        result *= treatFuncsInt(part, noProblem);
+    } else {
+
+        double val = treatFuncsInt(part, noProblem);
+
+        if(std::isinf(result/val) || std::isnan(result/val)){
+        noProblem = false;
+        return 0.0;
+        }
+
+        result /= val;
+    }
+    }
+
+    return result;
+
+}
+
+/*!
+ * \brief treatFuncs treat the last level of recursion: parenthesis
+ * \param expr The expression to parse.
+ * \param noProblem A reference to a bool set to true if no problem happened, false otherwise.
+ * \return The value of the parsed subexpression or 0 in case of error.
+ *
+ * The expression should not contain operators not nested anymore. The subexpressions within parenthesis will be treated by recalling the level 1 function.
+ */
+double treatFuncsInt(QString const& expr, bool & noProblem)
+{
+
+    noProblem = true;
+
+    QRegExp funcExpInteger = funcExprInteger;
+    QRegExp integerExp = integerExpr;
+    QRegExp numberExp = numberExpr;
+
+    if (funcExpInteger.exactMatch(expr.trimmed())) {
+
+        int sign = funcExpInteger.capturedTexts()[1].isEmpty() ? 1 : -1;
+        QString subExpr = funcExpInteger.capturedTexts()[2];
+
+        double val = treatLevel1Int(subExpr, noProblem);
+
+        if (!noProblem) {
+            return 0;
+        }
+
+        return sign*val;
+
+    } else if(numberExp.exactMatch(expr.trimmed())) {
+        double value = QVariant(expr).toDouble(&noProblem);
+        return value;
+    }
+
+    noProblem = false;
+    return 0;
+
+}
diff --git a/libs/ui/utils/kis_numparser.h b/libs/widgetutils/kis_num_parser.h
similarity index 79%
rename from libs/ui/utils/kis_numparser.h
rename to libs/widgetutils/kis_num_parser.h
index fbbd14efda..21080a5b47 100644
--- a/libs/ui/utils/kis_numparser.h
+++ b/libs/widgetutils/kis_num_parser.h
@@ -1,42 +1,42 @@
 /*
  *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_NUMPARSER_H
 #define KIS_NUMPARSER_H
 
 #include <QString>
 
-#include "kritaui_export.h"
+#include "kritawidgetutils_export.h"
 
 /*!
  * \brief the namespace contains functions to transform math expression written as QString in numbers.
  *
  * Computation is done in a recursive way, maybe not the most efficient way compared to infix to postfix conversion before parsing.
  * (TODO: look if it need to be changed).
  */
 namespace KisNumericParser {
 
-        //! \brief parse an expression to a double.
-		KRITAUI_EXPORT double parseSimpleMathExpr(QString const& expr, bool* noProblem = 0);
+    //! \brief parse an expression to a double.
+    KRITAWIDGETUTILS_EXPORT double parseSimpleMathExpr(QString const& expr, bool* noProblem = 0);
 
-        //! \brief parse an expression to an int.
-		KRITAUI_EXPORT int parseIntegerMathExpr(QString const& expr, bool* noProblem = 0);
+    //! \brief parse an expression to an int.
+    KRITAWIDGETUTILS_EXPORT int parseIntegerMathExpr(QString const& expr, bool* noProblem = 0);
 }
 
 #endif // KIS_NUMPARSER_H
 
diff --git a/libs/widgetutils/tests/CMakeLists.txt b/libs/widgetutils/tests/CMakeLists.txt
index b7d6923ad1..768241c245 100644
--- a/libs/widgetutils/tests/CMakeLists.txt
+++ b/libs/widgetutils/tests/CMakeLists.txt
@@ -1,9 +1,14 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/libs/widgetutils )
 
 ########### next target ###############
 
 set(kopropertiestest_SRCS KoPropertiesTest.cpp )
 kde4_add_unit_test(KoPropertiesTest TESTNAME libs-widgetutils-KoPropertiesTest ${kopropertiestest_SRCS})
 target_link_libraries(KoPropertiesTest  kritawidgetutils Qt5::Test)
 
+########### next target ###############
+
+set(kis_simple_math_parser_test_SRCS kis_simple_math_parser_test.cpp)
+kde4_add_unit_test(KisSimpleMathParserTest TESTNAME krita-ui-KisSimpleMathParserTest ${kis_simple_math_parser_test_SRCS})
+target_link_libraries(KisSimpleMathParserTest kritaui Qt5::Test)
diff --git a/libs/ui/tests/kis_simplemathparsertest.cpp b/libs/widgetutils/tests/kis_simple_math_parser_test.cpp
similarity index 96%
rename from libs/ui/tests/kis_simplemathparsertest.cpp
rename to libs/widgetutils/tests/kis_simple_math_parser_test.cpp
index 5459179792..1db41204dd 100644
--- a/libs/ui/tests/kis_simplemathparsertest.cpp
+++ b/libs/widgetutils/tests/kis_simple_math_parser_test.cpp
@@ -1,154 +1,154 @@
 /*
  *  Copyright (c) 2016 Laurent Valentin Jospin <laurent.valentin@famillejospin.ch>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "kis_simplemathparsertest.h"
+#include "kis_simple_math_parser_test.h"
 
-#include "kis_numparser.h"
+#include "kis_num_parser.h"
 
 #include <QString>
 #include <QtTest>
 
 KisSimpleMathParserTest::KisSimpleMathParserTest() : QObject()
 {
 
 }
 
 void KisSimpleMathParserTest::testDoubleComputation()
 {
 
 	QStringList exprs = {"1",
 					  "2 + 3.4",
 					  "2 + -3.4",
 					  "2 - -3.4",
 					  "5-2",
 					  "7 + 2 - 5",
 					  "4.6 * 2 + 13",
 					  "4.6 / 2 + 3*3",
 					  "4.6 / 0.0 + 3*3",
 					  "-4.6 / 0.0 + 3*3",
 					  "-4.6 / -0.0 + 3*3",
 					  "4.6 / -0.0 + 3*3",
 					  "0.0 / 0.0 + 3*3",
 					  "2^3 - 4 * 1.5",
 					  "2^3.0 - 4 * 1.5",
 					  "cos(1)*2",
 					  "-cos(1)*2",
 					  "cos(1)^3*2",
 					  "cos(1)^3.0*2",
 					  "cos(1)*2 + sin(3)/2",
 					  "cos(acos(-1)+1*3^2.0)*2 + sin(3)/2",
 					  "cos(acos(-1)+1*3^2.0)^2 + sin(3)/2"};
 
 	QVector<double> expected = {1,
 							 2 + 3.4,
 							 2 + -3.4,
 							 2 - -3.4,
 							 5-2,
 							 7 + 2 - 5,
 							 4.6 * 2 + 13,
 							 4.6 / 2 + 3*3,
 							 4.6 / 0.0 + 3*3,
 							 -4.6 / 0.0 + 3*3,
 							 -4.6 / -0.0 + 3*3,
 							 4.6 / -0.0 + 3*3,
 							 0.0 / 0.0 + 3*3,
 							 qPow(2,3) - 4 * 1.5,
 							 qPow(2,3.0) - 4 * 1.5,
 							 qCos(1.0/180*qAcos(-1))*2,
 							 -qCos(1.0/180*qAcos(-1))*2,
 							 qPow(qCos(1.0/180*qAcos(-1)),3)*2,
 							 qPow(qCos(1.0/180*qAcos(-1)),3.0)*2,
 							 qCos(1.0/180*qAcos(-1))*2 + qSin(3.0/180*qAcos(-1))/2,
 							 qCos((qAcos(-1.0)*180/qAcos(-1)+1*qPow(3,2.0))/180*qAcos(-1))*2 + qSin(3.0/180*qAcos(-1))/2,
 							 qPow(qCos((qAcos(-1.0)*180/qAcos(-1)+1*qPow(3,2.0))/180*qAcos(-1)),2) + qSin(3.0/180*qAcos(-1))/2};
 
 	for (int i = 0; i < expected.size(); i++) {
 
 		double result = KisNumericParser::parseSimpleMathExpr(exprs[i]);
 
-		bool test = result == expected[i] || qAbs(result - expected[i]) < 1e-12 || (isnan(result) && isnan(expected[i]));
+		bool test = result == expected[i] || qAbs(result - expected[i]) < 1e-12 || (std::isnan(result) && std::isnan(expected[i]));
 
 		QVERIFY2(test, QString("Failed when %1 should equal %2 but evaluated to %3.").arg(exprs[i]).arg(expected[i]).arg(result).toStdString().c_str());
 	}
 }
 
 void KisSimpleMathParserTest::testIntComputation()
 {
 
 	QStringList exprs = {"1",
 					  "2 + 3",
 					  "2 + -3",
 					  "2 - -3",
 					  "5-2",
 					  "7 + 2 - 5",
 					  "4/3",
 					  "12/3",
 					  "4*3",
 					  "581*2/3"};
 
 	QVector<int> expected = {1,
 							 2 + 3,
 							 2 + -3,
 							 2 - -3,
 							 5-2,
 							 7 + 2 - 5,
 							 qRound(4.0/3.0),
 							 qRound(12.0/3.0),
 							 4*3,
 							 581*2/3};
 
 	for (int i = 0; i < expected.size(); i++) {
 
 		int result = KisNumericParser::parseIntegerMathExpr(exprs[i]);
 
 		QCOMPARE(result, expected[i]);
 	}
 }
 
 void KisSimpleMathParserTest::testIntFlooring()
 {
 
 	QStringList exprs = {"4.5",
 					  "-4.5",
 					  "3.5 + 4.5",
 					  "2.8 - -3.5",
 					  "4.5/2.9",
 					  "7.6*3.2",
 					  "7.6*3.2 + 4.5"
 						};
 
 	QVector<int> expected = {qRound(4.5),
 							 qRound(-4.5),
 							 qRound(3.5 + 4.5),
 							 qRound(2.8 - -3.5),
 							 qRound(4.5/2.9),
 							 qRound(7.6*3.2),
 							 qRound(7.6*3.2 + 4.5)
 							};
 
 	for (int i = 0; i < expected.size(); i++) {
 
 		int result = KisNumericParser::parseIntegerMathExpr(exprs[i]);
 
 		QCOMPARE(result, expected[i]);
 	}
 
 }
 
 QTEST_APPLESS_MAIN(KisSimpleMathParserTest)
 
diff --git a/libs/ui/tests/kis_simplemathparsertest.h b/libs/widgetutils/tests/kis_simple_math_parser_test.h
similarity index 100%
rename from libs/ui/tests/kis_simplemathparsertest.h
rename to libs/widgetutils/tests/kis_simple_math_parser_test.h
diff --git a/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
index 8ead23960f..25ced85eb9 100644
--- a/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
@@ -1,102 +1,102 @@
 /*
  *  Copyright (c) 2010 Adam Celarek <kdedev at xibo dot at>
  *  Copyright (c) 2013 Dmitry Kazakov <dimula73@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_shade_selector_line_editor.h"
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 KisShadeSelectorLineEditor::KisShadeSelectorLineEditor(QWidget* parent)
     : KisShadeSelectorLineBase(parent)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
 
     QHBoxLayout* lineOne = new QHBoxLayout();
     layout->addLayout(lineOne);
     lineOne->addWidget(new QLabel(i18n("Delta: ")));
 
 	m_hueDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_hueDelta);
 	m_saturationDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_saturationDelta);
 	m_valueDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_valueDelta);
 
     QHBoxLayout* lineTwo = new QHBoxLayout();
     layout->addLayout(lineTwo);
     lineTwo->addWidget(new QLabel(i18n("Shift: ")));
 
 	m_hueShift = new KisDoubleParseSpinBox();
     lineTwo->addWidget(m_hueShift);
 	m_saturationShift = new KisDoubleParseSpinBox();
     lineTwo->addWidget(m_saturationShift);
 	m_valueShift = new KisDoubleParseSpinBox();
     lineTwo->addWidget(m_valueShift);
 
 
     m_hueDelta->setRange(-1, 1);
     m_saturationDelta->setRange(-1, 1);
     m_valueDelta->setRange(-1, 1);
     m_hueShift->setRange(-1, 1);
     m_saturationShift->setRange(-1, 1);
     m_valueShift->setRange(-1, 1);
 
     m_hueDelta->setSingleStep(0.1);
     m_saturationDelta->setSingleStep(0.1);
     m_valueDelta->setSingleStep(0.1);
     m_hueShift->setSingleStep(0.05);
     m_saturationShift->setSingleStep(0.05);
     m_valueShift->setSingleStep(0.05);
 
     connect(m_hueDelta, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
     connect(m_saturationDelta, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
     connect(m_valueDelta, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
     connect(m_hueShift, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
     connect(m_saturationShift, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
     connect(m_valueShift, SIGNAL(valueChanged(double)), SLOT(valueChanged()));
 
 }
 
 QString KisShadeSelectorLineEditor::toString() const
 {
     return QString("%1|%2|%3|%4|%5|%6|%7")
         .arg(m_lineNumber)
         .arg(m_hueDelta->value())
         .arg(m_saturationDelta->value())
         .arg(m_valueDelta->value())
         .arg(m_hueShift->value())
         .arg(m_saturationShift->value())
         .arg(m_valueShift->value());
 }
 
 void KisShadeSelectorLineEditor::fromString(const QString &string)
 {
     QStringList strili = string.split('|');
     m_lineNumber = strili.at(0).toInt();
     m_hueDelta->setValue(strili.at(1).toDouble());
     m_saturationDelta->setValue(strili.at(2).toDouble());
     m_valueDelta->setValue(strili.at(3).toDouble());
     if(strili.size()==4) return;            // don't crash, if reading old config files.
     m_hueShift->setValue(strili.at(4).toDouble());
     m_saturationShift->setValue(strili.at(5).toDouble());
     m_valueShift->setValue(strili.at(6).toDouble());
 }
 
 void KisShadeSelectorLineEditor::valueChanged() {
     emit requestActivateLine(this);
 }
diff --git a/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui b/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
index cf53c2faf9..a2fd23de57 100644
--- a/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
+++ b/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
@@ -1,1462 +1,1462 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KisColorSelectorSettings</class>
  <widget class="QWidget" name="KisColorSelectorSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>635</width>
     <height>982</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Color Selector Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QFormLayout" name="dockerSelectForm">
      <property name="labelAlignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
      <property name="verticalSpacing">
       <number>6</number>
      </property>
      <property name="bottomMargin">
       <number>20</number>
      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="dockerColorSettingsLabel">
        <property name="text">
         <string>Docker:</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QComboBox" name="dockerColorSettingsComboBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>30</height>
         </size>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTabWidget" name="advancedColorSelectorOptions">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>600</width>
        <height>421</height>
       </size>
      </property>
      <property name="currentIndex">
       <number>3</number>
      </property>
      <widget class="QWidget" name="tab_typeshape">
       <attribute name="title">
        <string>Color Selector</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_5">
            <item>
             <widget class="KisColorSelectorComboBox" name="colorSelectorConfiguration"/>
            </item>
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
                <height>40</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_2">
            <item>
             <widget class="QLabel" name="l_type">
              <property name="layoutDirection">
               <enum>Qt::LeftToRight</enum>
              </property>
              <property name="text">
               <string>Color &amp;Model Type: </string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
              </property>
              <property name="buddy">
               <cstring>colorSelectorConfiguration</cstring>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QComboBox" name="colorSelectorTypeComboBox"/>
            </item>
            <item>
             <widget class="QLabel" name="ACSTypeDescriptionLabel">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
               <string notr="true">Type Description goes here</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
              </property>
              <property name="wordWrap">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QGroupBox" name="lumaCoefficientGroupbox">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="title">
               <string>Luma Coefficients</string>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_15">
               <item>
                <layout class="QGridLayout" name="gridLayout_5">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="verticalSpacing">
                  <number>6</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QLabel" name="redlabel">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="text">
                    <string>Red': </string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="3">
                  <widget class="KisDoubleParseSpinBox" name="l_lumaG">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="minimumSize">
                    <size>
                     <width>50</width>
                     <height>0</height>
                    </size>
                   </property>
                   <property name="decimals">
                    <number>4</number>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="2">
                  <widget class="QLabel" name="greenlabel">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="text">
                    <string>Green':</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="4">
                  <widget class="QLabel" name="bluelabel">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="text">
                    <string>Blue':</string>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
                  <widget class="KisDoubleParseSpinBox" name="l_lumaR">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="minimumSize">
                    <size>
                     <width>50</width>
                     <height>0</height>
                    </size>
                   </property>
                   <property name="decimals">
                    <number>4</number>
                   </property>
                  </widget>
                 </item>
                 <item row="0" column="5">
                  <widget class="KisDoubleParseSpinBox" name="l_lumaB">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
                   <property name="minimumSize">
                    <size>
                     <width>50</width>
                     <height>0</height>
                    </size>
                   </property>
                   <property name="decimals">
                    <number>4</number>
                   </property>
                  </widget>
                 </item>
                 <item row="1" column="1">
                  <widget class="KisDoubleParseSpinBox" name="SP_Gamma">
                   <property name="toolTip">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This sets the gamma value that the linearised HSY Luminosity is crunched with. 1 makes the selector fully linear, 2.2 is a practical default value.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="decimals">
                    <number>1</number>
                   </property>
                   <property name="minimum">
                    <double>-3.000000000000000</double>
                   </property>
                   <property name="maximum">
                    <double>3.000000000000000</double>
                   </property>
                   <property name="singleStep">
                    <double>0.100000000000000</double>
                   </property>
                   <property name="value">
                    <double>2.200000000000000</double>
                   </property>
                  </widget>
                 </item>
                 <item row="1" column="0">
                  <widget class="QLabel" name="gamma_label">
                   <property name="text">
                    <string>Gamma:</string>
                   </property>
                  </widget>
                 </item>
                </layout>
               </item>
              </layout>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QGroupBox" name="useDifferentColorSpaceCheckbox">
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="title">
           <string>Color Selector Uses Different Color Space than Ima&amp;ge</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
            <widget class="KisColorSpaceSelector" name="colorSpace" native="true">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_general">
       <attribute name="title">
        <string>Behavior</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label_3">
          <property name="layoutDirection">
           <enum>Qt::LeftToRight</enum>
          </property>
          <property name="text">
           <string>When Docker Resizes: </string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QComboBox" name="dockerResizeOptionsComboBox">
          <property name="enabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Show Zoom Selector UI: </string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QComboBox" name="zoomSelectorOptionComboBox"/>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_11">
          <property name="text">
           <string>Zoom Selector Size: </string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="KisIntParseSpinBox" name="popupSize">
          <property name="suffix">
           <string> px</string>
          </property>
          <property name="minimum">
           <number>100</number>
          </property>
          <property name="maximum">
           <number>1000</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>260</number>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <widget class="QCheckBox" name="hidePopupOnClickCheck">
          <property name="text">
           <string>Hide Popup on click.</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabShadeSelector">
       <attribute name="title">
        <string>Shade Selector</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_11">
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_8">
            <item>
             <layout class="QGridLayout" name="gridLayout_3">
              <item row="0" column="0">
               <widget class="QLabel" name="label_16">
                <property name="text">
                 <string>Type:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QLabel" name="myPaintColorModelLabel">
                <property name="text">
                 <string>Color model:</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QComboBox" name="ACSshadeSelectorMyPaintColorModelComboBox"/>
              </item>
              <item row="1" column="0">
               <widget class="QComboBox" name="ACSShadeSelectorTypeComboBox"/>
              </item>
             </layout>
            </item>
            <item>
             <spacer name="verticalSpacer_4">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
                <height>10</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item>
           <spacer name="horizontalSpacer_5">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_7">
            <property name="spacing">
             <number>0</number>
            </property>
            <item>
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>Update Selector When:</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="verticalSpacer_3">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
                <height>6</height>
               </size>
              </property>
             </spacer>
            </item>
            <item>
             <widget class="QCheckBox" name="shadeSelectorUpdateOnRightClick">
              <property name="text">
               <string>Right clicking on shade selector</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="shadeSelectorUpdateOnLeftClick">
              <property name="text">
               <string>Left clicking on shade selector</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="shadeSelectorUpdateOnForeground">
              <property name="toolTip">
               <string>this doesn't include a color change by the shade selector</string>
              </property>
              <property name="text">
               <string>Foreground color changes</string>
              </property>
              <property name="checked">
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="shadeSelectorUpdateOnBackground">
              <property name="toolTip">
               <string>this doesn't include a color change by the shade selector</string>
              </property>
              <property name="text">
               <string>Background color change</string>
              </property>
              <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>109</height>
           </size>
          </property>
         </spacer>
        </item>
        <item>
         <widget class="QGroupBox" name="minimalShadeSelectorGroup">
          <property name="title">
           <string>Minimal Shade Selector</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_10">
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_6">
             <item>
              <layout class="QHBoxLayout" name="horizontalLayout_9">
               <item>
                <widget class="QLabel" name="label_15">
                 <property name="text">
                  <string>Display:</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="minimalShadeSelectorAsGradient">
                 <property name="text">
                  <string>&amp;Gradient</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="minimalShadeSelectorAsColorPatches">
                 <property name="text">
                  <string>Colo&amp;r Patches</string>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
             <item>
              <widget class="KisShadeSelectorLinesSettings" name="minimalShadeSelectorLineSettings">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <spacer name="horizontalSpacer_4">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>59</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
           <item>
            <layout class="QFormLayout" name="formLayout_3">
             <item row="0" column="0">
              <widget class="QLabel" name="label_2">
               <property name="text">
                <string>Line Count: </string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KisIntParseSpinBox" name="minimalShadeSelectorLineCount">
               <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum">
                <number>10</number>
               </property>
               <property name="value">
                <number>3</number>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label_6">
               <property name="text">
                <string>Line Height: </string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisIntParseSpinBox" name="minimalShadeSelectorLineHeight">
               <property name="suffix">
                <string> px</string>
               </property>
               <property name="minimum">
                <number>8</number>
               </property>
               <property name="maximum">
                <number>99</number>
               </property>
               <property name="value">
                <number>16</number>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="patchesPerLineLabel">
               <property name="text">
                <string>Patches Per Line: </string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="minimalShadeSelectorPatchesPerLine"/>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
       <zorder>minimalShadeSelectorGroup</zorder>
       <zorder></zorder>
       <zorder>verticalSpacer_5</zorder>
      </widget>
      <widget class="QWidget" name="tab_ColorHistory">
       <property name="enabled">
        <bool>true</bool>
       </property>
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <attribute name="title">
        <string>Color History</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_11">
        <item>
         <widget class="QGroupBox" name="lastUsedColorsShow">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Show Color Histor&amp;y</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_12">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
              <widget class="QGroupBox" name="groupBox">
               <property name="title">
                <string>Patch Options</string>
               </property>
               <layout class="QFormLayout" name="formLayout_4">
                <item row="0" column="0">
                 <widget class="QLabel" name="label_14">
                  <property name="text">
                   <string>Height:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="KisIntParseSpinBox" name="lastUsedColorsWidth">
                  <property name="suffix">
                   <string> px</string>
                  </property>
                  <property name="prefix">
                   <string/>
                  </property>
                  <property name="minimum">
                   <number>16</number>
                  </property>
                 </widget>
                </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="label">
                  <property name="text">
                   <string>Width: </string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="KisIntParseSpinBox" name="lastUsedColorsHeight">
                  <property name="suffix">
                   <string> px</string>
                  </property>
                  <property name="minimum">
                   <number>16</number>
                  </property>
                 </widget>
                </item>
                <item row="2" column="0">
                 <widget class="QLabel" name="label_10">
                  <property name="text">
                   <string>Max Patches: </string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="2" column="1">
                 <widget class="KisIntParseSpinBox" name="lastUsedColorsPatchCount">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="value">
                   <number>30</number>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer_6">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
             <item>
              <widget class="QGroupBox" name="groupBox_2">
               <property name="title">
                <string>Layout</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
                <property name="verticalSpacing">
                 <number>0</number>
                </property>
                <item row="0" column="0">
                 <widget class="QRadioButton" name="lastUsedColorsAlignVertical">
                  <property name="text">
                   <string>&amp;Vertical</string>
                  </property>
                  <property name="checked">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QLabel" name="lbl_lastUsedNumCols">
                  <property name="text">
                   <string>Colu&amp;mns:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                  <property name="buddy">
                   <cstring>lastUsedColorsNumCols</cstring>
                  </property>
                 </widget>
                </item>
                <item row="0" column="2">
                 <widget class="KisIntParseSpinBox" name="lastUsedColorsNumCols">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="maximum">
                   <number>20</number>
                  </property>
                  <property name="value">
                   <number>2</number>
                  </property>
                 </widget>
                </item>
                <item row="1" column="0">
                 <widget class="QRadioButton" name="lastUsedColorsAlignHorizontal">
                  <property name="text">
                   <string>&amp;Horizontal</string>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="QLabel" name="lbl_lastUsedNumRows">
                  <property name="text">
                   <string>&amp;Rows:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                  <property name="buddy">
                   <cstring>lastUsedColorsNumRows</cstring>
                  </property>
                 </widget>
                </item>
                <item row="1" column="2">
                 <widget class="KisIntParseSpinBox" name="lastUsedColorsNumRows">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="maximum">
                   <number>20</number>
                  </property>
                  <property name="value">
                   <number>3</number>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="lastUsedColorsAllowScrolling">
             <property name="text">
              <string>Allow scrolling</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_6">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_colorsFromImage">
       <attribute name="title">
        <string>Colors from Image</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_14">
        <item>
         <widget class="QGroupBox" name="commonColorsShow">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="title">
           <string>Show Colors from the ima&amp;ge</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_13">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
              <widget class="QGroupBox" name="groupBox_3">
               <property name="title">
                <string>Patch Options</string>
               </property>
               <layout class="QFormLayout" name="formLayout_2">
                <item row="0" column="0">
                 <widget class="QLabel" name="label_12">
                  <property name="text">
                   <string>Height:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="KisIntParseSpinBox" name="commonColorsWidth">
                  <property name="suffix">
                   <string> px</string>
                  </property>
                  <property name="prefix">
                   <string/>
                  </property>
                  <property name="minimum">
                   <number>16</number>
                  </property>
                 </widget>
                </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="label_4">
                  <property name="text">
                   <string>Width:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="KisIntParseSpinBox" name="commonColorsHeight">
                  <property name="suffix">
                   <string> px</string>
                  </property>
                  <property name="minimum">
                   <number>16</number>
                  </property>
                 </widget>
                </item>
                <item row="2" column="0">
                 <widget class="QLabel" name="label_9">
                  <property name="text">
                   <string>Max Patches: </string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                 </widget>
                </item>
                <item row="2" column="1">
                 <widget class="KisIntParseSpinBox" name="commonColorsPatchCount">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="value">
                   <number>30</number>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer_7">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
             <item>
              <widget class="QGroupBox" name="groupBox_4">
               <property name="title">
                <string>Layout</string>
               </property>
               <layout class="QGridLayout" name="gridLayout_2">
                <property name="horizontalSpacing">
                 <number>6</number>
                </property>
                <property name="verticalSpacing">
                 <number>0</number>
                </property>
                <item row="0" column="0">
                 <widget class="QRadioButton" name="commonColorsAlignVertical">
                  <property name="text">
                   <string>&amp;Vertical</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QLabel" name="lbl_commonColorsNumCols">
                  <property name="text">
                   <string>Colu&amp;mns:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                  <property name="buddy">
                   <cstring>commonColorsNumCols</cstring>
                  </property>
                 </widget>
                </item>
                <item row="0" column="2">
                 <widget class="KisIntParseSpinBox" name="commonColorsNumCols">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="maximum">
                   <number>20</number>
                  </property>
                  <property name="value">
                   <number>2</number>
                  </property>
                 </widget>
                </item>
                <item row="1" column="0">
                 <widget class="QRadioButton" name="commonColorsAlignHorizontal">
                  <property name="text">
                   <string>&amp;Horizontal</string>
                  </property>
                  <property name="checked">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="QLabel" name="lbl_commonColorsNumRows">
                  <property name="text">
                   <string>&amp;Rows:</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
                  <property name="buddy">
                   <cstring>commonColorsNumRows</cstring>
                  </property>
                 </widget>
                </item>
                <item row="1" column="2">
                 <widget class="KisIntParseSpinBox" name="commonColorsNumRows">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="maximum">
                   <number>20</number>
                  </property>
                  <property name="value">
                   <number>3</number>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="commonColorsAutoUpdate">
             <property name="toolTip">
              <string>this can be slow on big images</string>
             </property>
             <property name="text">
              <string>Update after every stroke</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="commonColorsAllowScrolling">
             <property name="text">
              <string>Allow scrolling</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>138</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="colorSliderOptions" native="true">
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QGroupBox" name="groupHsv">
         <property name="title">
          <string>HSV Sliders to Show</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QCheckBox" name="csl_hsvH">
            <property name="text">
             <string>Hue</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsvS">
            <property name="text">
             <string>Saturation</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsvV">
            <property name="text">
             <string>Value</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupHsl">
         <property name="title">
          <string>HSL Sliders to Show</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QCheckBox" name="csl_hslH">
            <property name="text">
             <string>Hue</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hslS">
            <property name="text">
             <string>Saturation</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hslL">
            <property name="text">
             <string>Lightness</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupHsi">
         <property name="title">
          <string>HSI Sliders to Show</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QCheckBox" name="csl_hsiH">
            <property name="text">
             <string>Hue</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsiS">
            <property name="text">
             <string>Saturation</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsiI">
            <property name="text">
             <string>Intensity</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupHsy">
         <property name="title">
          <string>HSY' Sliders to Show</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QCheckBox" name="csl_hsyH">
            <property name="text">
             <string>Hue</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsyS">
            <property name="text">
             <string>Saturation</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="csl_hsyY">
            <property name="text">
             <string>Luma</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="hotKeyOptions" native="true">
      <layout class="QVBoxLayout" name="hotkeyOptions">
       <item>
        <widget class="QGroupBox" name="hsy">
         <property name="title">
          <string>Lightness, Saturation and Hue hotkey steps</string>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>Lightness: </string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="sb_lightness">
            <property name="suffix">
             <string> steps</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLabel" name="label_13">
            <property name="text">
             <string>Saturation: </string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="sb_saturation">
            <property name="suffix">
             <string> steps</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLabel" name="label_17">
            <property name="text">
             <string>Hue: </string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="sb_hue">
            <property name="suffix">
             <string> steps</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="horizontalGroupBox_2">
         <property name="title">
          <string>YUV Redder/Greener/Bluer/Yellower hotkey steps</string>
         </property>
         <layout class="QHBoxLayout" name="yuv">
          <item>
           <widget class="QLabel" name="label_18">
            <property name="text">
             <string>Redder/Greener: </string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="sb_rg">
            <property name="suffix">
             <string> steps</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLabel" name="label_19">
            <property name="text">
             <string>Bluer/Yellower: </string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="sb_by">
            <property name="suffix">
             <string> steps</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisColorSpaceSelector</class>
    <extends>QWidget</extends>
    <header>widgets/kis_color_space_selector.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisColorSelectorComboBox</class>
    <extends>QComboBox</extends>
    <header>kis_color_selector_combo_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisShadeSelectorLinesSettings</class>
    <extends>QComboBox</extends>
    <header>kis_shade_selector_lines_settings.h</header>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>minimalShadeSelectorAsColorPatches</sender>
    <signal>toggled(bool)</signal>
    <receiver>minimalShadeSelectorPatchesPerLine</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>194</x>
      <y>393</y>
     </hint>
     <hint type="destinationlabel">
      <x>520</x>
      <y>463</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/dockers/animation/tests/timeline_model_test.cpp b/plugins/dockers/animation/tests/timeline_model_test.cpp
index 6dca70761a..c195d6d5c6 100644
--- a/plugins/dockers/animation/tests/timeline_model_test.cpp
+++ b/plugins/dockers/animation/tests/timeline_model_test.cpp
@@ -1,298 +1,298 @@
 /*
  *  Copyright (c) 2015 Dmitry Kazakov <dimula73@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "timeline_model_test.h"
 
 #include "kis_image.h"
 #include "kis_node.h"
 #include "kis_paint_device.h"
 
 #include <QDialog>
 #include <QDoubleSpinBox>
 #include <QSpinBox>
 #include <QVBoxLayout>
 
 #include "kis_image_animation_interface.h"
 #include "KisDocument.h"
 #include "KisPart.h"
 #include "kis_name_server.h"
 #include "flake/kis_shape_controller.h"
 #include "kis_undo_adapter.h"
 
 
 #include "timeline_frames_view.h"
 #include "timeline_frames_model.h"
 
 #include "kis_node_dummies_graph.h"
 
 #include "commands/kis_image_layer_add_command.h"
 #include "commands/kis_image_layer_remove_command.h"
 
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 void TimelineModelTest::init()
 {
     m_doc = KisPart::instance()->createDocument();
 
     m_nameServer = new KisNameServer();
     m_shapeController = new KisShapeController(m_doc, m_nameServer);
     //m_nodeModel = new KisNodeModel(0);
 
     initBase();
 }
 
 void TimelineModelTest::cleanup()
 {
     cleanupBase();
 
     //delete m_nodeModel;
     delete m_shapeController;
     delete m_nameServer;
     delete m_doc;
 }
 
 #include "timeline_frames_index_converter.h"
 
 void TimelineModelTest::testConverter()
 {
     constructImage();
     addSelectionMasks();
     m_shapeController->setImage(m_image);
 
     m_layer1->enableAnimation();
 
     m_layer1->setUseInTimeline(true);
     m_layer2->setUseInTimeline(true);
     m_sel3->setUseInTimeline(true);
 
     TimelineFramesIndexConverter converter(m_shapeController);
 
     QCOMPARE(converter.rowCount(), 3);
     QCOMPARE(converter.rowForDummy(m_shapeController->dummyForNode(m_layer1)), 2);
     QCOMPARE(converter.rowForDummy(m_shapeController->dummyForNode(m_layer2)), 1);
     QCOMPARE(converter.rowForDummy(m_shapeController->dummyForNode(m_sel3)), 0);
 
     QCOMPARE(converter.dummyFromRow(2), m_shapeController->dummyForNode(m_layer1));
     QCOMPARE(converter.dummyFromRow(1), m_shapeController->dummyForNode(m_layer2));
     QCOMPARE(converter.dummyFromRow(0), m_shapeController->dummyForNode(m_sel3));
 
     TimelineNodeListKeeper keeper(0, m_shapeController);
 
     QCOMPARE(keeper.rowCount(), 3);
     QCOMPARE(keeper.rowForDummy(m_shapeController->dummyForNode(m_layer1)), 2);
     QCOMPARE(keeper.rowForDummy(m_shapeController->dummyForNode(m_layer2)), 1);
     QCOMPARE(keeper.rowForDummy(m_shapeController->dummyForNode(m_sel3)), 0);
 
     QCOMPARE(keeper.dummyFromRow(2), m_shapeController->dummyForNode(m_layer1));
     QCOMPARE(keeper.dummyFromRow(1), m_shapeController->dummyForNode(m_layer2));
     QCOMPARE(keeper.dummyFromRow(0), m_shapeController->dummyForNode(m_sel3));
 
     TimelineNodeListKeeper::OtherLayersList list = keeper.otherLayersList();
 
     Q_FOREACH (const TimelineNodeListKeeper::OtherLayer &l, list) {
         qDebug() << ppVar(l.name) << ppVar(l.dummy->node()->name());
     }
 
 }
 
 void TimelineModelTest::testModel()
 {
     QScopedPointer<TimelineFramesModel> model(new TimelineFramesModel(0));
 }
 
 struct TestingInterface : TimelineFramesModel::NodeManipulationInterface
 {
     TestingInterface(KisImageSP image) : m_image(image) {}
 
     KisLayerSP addPaintLayer() const {
         KisNodeSP parent = m_image->root();
         KisNodeSP after = parent->lastChild();
 
 
         KisPaintLayerSP layer =
             new KisPaintLayer(const_cast<KisImage*>(m_image.data()),
                               m_image->nextLayerName(),
                               OPACITY_OPAQUE_U8,
                               m_image->colorSpace());
 
         m_image->undoAdapter()->addCommand(
             new KisImageLayerAddCommand(m_image, layer,
                                         parent,
                                         after,
                                         false, false));
 
         return layer;
     }
 
     void removeNode(KisNodeSP node) const {
         m_image->undoAdapter()->addCommand(
             new KisImageLayerRemoveCommand(m_image, node));
     }
 
 private:
     KisImageSP m_image;
 };
 
 void TimelineModelTest::testView()
 {
     QDialog dlg;
 
     QFont font;
     font.setPointSizeF(9);
     dlg.setFont(font);
 
 	QSpinBox *intFps = new KisIntParseSpinBox(&dlg);
     intFps->setValue(12);
 
 	QSpinBox *intTime = new KisIntParseSpinBox(&dlg);
     intTime->setValue(0);
     intTime->setMaximum(10000);
 
 	QSpinBox *intLayer = new KisIntParseSpinBox(&dlg);
     intLayer->setValue(0);
     intLayer->setMaximum(100);
 
     TimelineFramesView *framesTable = new TimelineFramesView(&dlg);
 
     TimelineFramesModel *model = new TimelineFramesModel(&dlg);
 
     constructImage();
     addSelectionMasks();
     m_shapeController->setImage(m_image);
 
     m_image->animationInterface()->requestTimeSwitchWithUndo(4);
 
     framesTable->setModel(model);
 
     model->setDummiesFacade(m_shapeController, m_image);
     model->setNodeManipulationInterface(new TestingInterface(m_image));
 
     m_layer1->enableAnimation();
     m_layer1->setUseInTimeline(true);
 
     connect(intFps, SIGNAL(valueChanged(int)),
             m_image->animationInterface(), SLOT(setFramerate(int)));
 
     connect(intTime, SIGNAL(valueChanged(int)),
             SLOT(setCurrentTime(int)));
 
     connect(m_image->animationInterface(), SIGNAL(sigTimeChanged(int)),
             intTime, SLOT(setValue(int)));
 
     connect(intLayer, SIGNAL(valueChanged(int)),
             SLOT(setCurrentLayer(int)));
 
     connect(this, SIGNAL(sigRequestNodeChange(KisNodeSP)),
             model, SLOT(slotCurrentNodeChanged(KisNodeSP)));
 
     connect(model, SIGNAL(requestCurrentNodeChanged(KisNodeSP)),
             this, SLOT(slotGuiChangedNode(KisNodeSP)));
 
     QVBoxLayout *layout = new QVBoxLayout(&dlg);
 
     layout->addWidget(intFps);
     layout->addWidget(intTime);
     layout->addWidget(intLayer);
     layout->addWidget(framesTable);
 
     layout->setStretch(0, 0);
     layout->setStretch(1, 0);
     layout->setStretch(2, 0);
     layout->setStretch(3, 1);
 
     dlg.resize(600, 400);
 
     dlg.exec();
 }
 
 void TimelineModelTest::setCurrentTime(int time)
 {
     m_image->animationInterface()->requestTimeSwitchWithUndo(time);
 }
 
 KisNodeDummy* findNodeFromRowAny(KisNodeDummy *root, int &startCount)
 {
     if (!startCount) {
         return root;
     }
     startCount--;
 
     KisNodeDummy *dummy = root->lastChild();
     while (dummy) {
         KisNodeDummy *found = findNodeFromRowAny(dummy, startCount);
         if (found) return found;
 
         dummy = dummy->prevSibling();
     }
 
     return 0;
 }
 
 
 void TimelineModelTest::setCurrentLayer(int row)
 {
     KisNodeDummy *root = m_shapeController->rootDummy();
     KisNodeDummy *dummy = findNodeFromRowAny(root, row);
     if (!dummy) {
         qDebug() << "WARNING: Cannot find a node at pos" << row;
         return;
     } else {
         qDebug() << "NonGUI changed active node: " << dummy->node()->name();
     }
 
     emit sigRequestNodeChange(dummy->node());
 }
 
 void TimelineModelTest::slotGuiChangedNode(KisNodeSP node)
 {
     qDebug() << "GUI changed active node:" << node->name();
 }
 
 #include "kis_equalizer_column.h"
 #include "kis_equalizer_slider.h"
 #include "kis_equalizer_widget.h"
 
 void TimelineModelTest::testOnionSkins()
 {
     QDialog dlg;
 
     QFont font;
     font.setPointSizeF(9);
     dlg.setFont(font);
 
     QHBoxLayout *layout = new QHBoxLayout(&dlg);
 
     KisEqualizerWidget *w = new KisEqualizerWidget(10, &dlg);
     connect(w, SIGNAL(sigConfigChanged()), SLOT(slotBang()));
 
     layout->addWidget(w);
 
     dlg.setLayout(layout);
 
     dlg.resize(600, 400);
     dlg.exec();
 
 }
 
 void TimelineModelTest::slotBang()
 {
     ENTER_FUNCTION() << "!!!!";
 }
 
 QTEST_MAIN(TimelineModelTest)
diff --git a/plugins/dockers/animation/wdg_animation.ui b/plugins/dockers/animation/wdg_animation.ui
index 6c5133eabe..00f3e3d618 100644
--- a/plugins/dockers/animation/wdg_animation.ui
+++ b/plugins/dockers/animation/wdg_animation.ui
@@ -1,531 +1,531 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgAnimation</class>
  <widget class="QWidget" name="WdgAnimation">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>535</width>
     <height>635</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="KisIntParseSpinBox" name="intCurrentTime">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
        <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <layout class="QFormLayout" name="formLayout">
        <property name="horizontalSpacing">
         <number>6</number>
        </property>
        <property name="verticalSpacing">
         <number>3</number>
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Start:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="KisIntParseSpinBox" name="spinFromFrame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximum">
           <number>10000</number>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>End:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="KisIntParseSpinBox" name="spinToFrame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximum">
           <number>10000</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="Line" name="line_7">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QToolButton" name="btnFirstFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnPreviousKeyFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line_2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnPreviousFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line_3">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnPlay">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line_4">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnNextFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line_5">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnNextKeyFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="Line" name="line_6">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QToolButton" name="btnLastFrame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>...</string>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="Line" name="line_8">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <property name="spacing">
         <number>0</number>
        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="spacing">
           <number>1</number>
          </property>
          <item>
           <widget class="QToolButton" name="btnAddKeyframe">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="btnAddDuplicateFrame">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="btnDeleteKeyframe">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <property name="spacing">
           <number>1</number>
          </property>
          <item>
           <widget class="QToolButton" name="btnOnionSkinOptions">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="btnLazyFrame">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="btnDropFrames">
            <property name="text">
             <string>...</string>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </item>
       </layout>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>10</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <layout class="QFormLayout" name="formLayout_2">
        <property name="horizontalSpacing">
         <number>3</number>
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="lblPlaySpeed">
          <property name="text">
           <string>Play Speed:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="KisDoubleParseSpinBox" name="doublePlaySpeed">
          <property name="minimum">
           <double>0.100000000000000</double>
          </property>
          <property name="maximum">
           <double>10.000000000000000</double>
          </property>
          <property name="singleStep">
           <double>0.050000000000000</double>
          </property>
          <property name="value">
           <double>1.000000000000000</double>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lblFramerate">
          <property name="text">
           <string>Frame Rate:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="KisIntParseSpinBox" name="intFramerate">
          <property name="minimum">
           <number>1</number>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/dockers/colorslider/kis_color_slider_input.cpp b/plugins/dockers/colorslider/kis_color_slider_input.cpp
index fbf1d5e726..f9b9e7f0c7 100644
--- a/plugins/dockers/colorslider/kis_color_slider_input.cpp
+++ b/plugins/dockers/colorslider/kis_color_slider_input.cpp
@@ -1,712 +1,712 @@
 /*
  *  Copyright (c) 2008 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2014 Wolthera van Hövell <griffinvalley@gmail.com>
  *  Copyright (c) 2015 Moritz Molch <kde@moritzmolch.de>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_color_slider_input.h"
 
 #include <KoConfig.h>
 #ifdef HAVE_OPENEXR
 #include <half.h>
 #endif
 
 #include <cmath>
 
 #include <kis_debug.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QFontMetrics>
 
 #include <klocalizedstring.h>
 #include <kconfiggroup.h>
 #include <ksharedconfig.h>
 
 #include <QDoubleSpinBox>
 
 #include <KoColor.h>
 #include <KoColorSpace.h>
 
 #include "kis_hsv_slider.h"
 #include "kis_display_color_converter.h"
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 KisColorSliderInput::KisColorSliderInput(QWidget* parent, KoColor* color, const int type, KoColorDisplayRendererInterface *displayRenderer, KisCanvas2* canvas)
     : QWidget(parent),
     m_type(type),
     m_color(color),
     m_displayRenderer(displayRenderer),
     m_canvas(canvas)
 {
     //init
 }
 
 void KisColorSliderInput::init()
 {
     QHBoxLayout* m_layout = new QHBoxLayout(this);
     m_layout->setContentsMargins(0, 0, 0, 0);
     m_layout->setSpacing(1);
 
     QString m_name;
     switch (m_type){
     case 0: m_name=i18n("Hue"); break;
     case 1: m_name=i18n("Saturation"); break;
     case 2: m_name=i18n("Value"); break;
     case 3: m_name=i18n("Hue"); break;
     case 4: m_name=i18n("Saturation"); break;
     case 5: m_name=i18n("Lightness"); break;
     case 6: m_name=i18n("Hue"); break;
     case 7: m_name=i18n("Saturation"); break;
     case 8: m_name=i18n("Intensity"); break;
     case 9: m_name=i18n("Hue"); break;
     case 10: m_name=i18n("Saturation"); break;
     case 11: m_name=i18n("Luma"); break;
     }
     
     QLabel* m_label = new QLabel(i18n("%1:", m_name), this);
     m_layout->addWidget(m_label);
 
     m_hsvSlider = new KisHSVSlider(Qt::Horizontal, this, m_displayRenderer, m_canvas);
     m_hsvSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     m_layout->addWidget(m_hsvSlider);
     connect (m_hsvSlider,  SIGNAL(sliderPressed()), SLOT(sliderIn()));
     connect (m_hsvSlider,  SIGNAL(sliderReleased()), SLOT(sliderOut()));
 
     QWidget* m_input = createInput();
     m_hsvSlider->setFixedHeight(m_input->sizeHint().height());
     m_layout->addWidget(m_input);
 }
 
 KisHSXColorSliderInput::KisHSXColorSliderInput(QWidget* parent, const int type, KoColor* color, KoColorDisplayRendererInterface *displayRenderer, KisCanvas2* canvas) : KisColorSliderInput(parent, color, type, displayRenderer, canvas),
     m_canvas(canvas),
     m_hue(0),
     m_sat(0),
     m_val(0),
     R(0),
     G(0),
     B(0),
     Gamma(0)
 {
     m_hueupdating = false;
     m_satupdating = false;
     m_toneupdating = false;
     m_sliderisupdating = false;
     init();
 }
 
 void KisHSXColorSliderInput::setValue(double v)
 {
 
     //This function returns the colour based on the type of the slider as well as the value//
 
     qreal h=0.0;
     qreal s=0.0;
     qreal l=0.0;
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     R = cfg.readEntry("lumaR", 0.2126);
     G = cfg.readEntry("lumaG", 0.7152);
     B = cfg.readEntry("lumaB", 0.0722);
     Gamma = cfg.readEntry("gamma", 2.2);
 
     switch (m_type) {
     case 0:
         m_hue = v;
         h=m_hue/360.0;
         s=m_sat/100.0;
         l=m_val/100.0;
         *m_color = this->converter()->fromHsvF(h, s, l);
         if (m_hueupdating==false) {
             emit(hueUpdated(static_cast<int>(m_hue)));
         }
         else {
             m_hueupdating=false;
         }
         break;
     case 3:
         m_hue = v;
         h=m_hue/360.0;
         s=m_sat/100.0;
         l=m_val/100.0;
         *m_color = this->converter()->fromHslF(h, s, l);
         if (m_hueupdating==false) {
             emit(hueUpdated(static_cast<int>(m_hue)));
         }
         else {
             m_hueupdating=false;
         }
         break;
     case 6:
         m_hue = v;
         h=m_hue/360.0;
         s=m_sat/100.0;
         l=m_val/100.0;
         *m_color = this->converter()->fromHsiF(h, s, l);
         if (m_hueupdating==false) {
             emit(hueUpdated(static_cast<int>(m_hue)));
         }
         else {
             m_hueupdating=false;
         }
         break;
     case 9:
         m_hue = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsyF(h, s, l, R, G, B, Gamma);
         if (m_hueupdating==false) {
             emit(hueUpdated(static_cast<int>(m_hue)));
         }
         else {
             m_hueupdating=false;
         }
         break;
     case 1:
         m_sat = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsvF(h, s, l);
         if (m_satupdating==false) {
             emit(satUpdated(static_cast<int>(m_sat), m_type));
         }
         else {
             m_satupdating=false;
         }
         break;
     case 2:
         m_val = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsvF(h, s, l);
         if (m_toneupdating==false) {
             emit(toneUpdated(static_cast<int>(m_val), m_type));
         }
         else {
             m_toneupdating=false;
         }
         break;
     case 4:
         m_sat = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHslF(h, s, l);
         if (m_satupdating==false) {
             emit(satUpdated(static_cast<int>(m_sat), m_type));
         }
         else {
             m_satupdating=false;
         }
         break;
     case 5:
         m_val = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHslF(h, s, l);
         if (m_toneupdating==false) {
             emit(toneUpdated(static_cast<int>(m_val), m_type));
         }
         else {
             m_toneupdating=false;
         }
         break;
     case 7:
         m_sat = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsiF(h, s, l);
         if (m_satupdating==false) {
             emit(satUpdated(static_cast<int>(m_sat), m_type));
         }
         else {
             m_satupdating=false;
         }
         break;
     case 8:
         m_val = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsiF(h, s, l);
         if (m_toneupdating==false) {
             emit(toneUpdated(static_cast<int>(m_val), m_type));
         }
         else {
             m_toneupdating=false;
         }
         break;
     case 10:
         m_sat = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsyF(h, s, l, R, G, B, Gamma);
         if (m_satupdating==false) {
             emit(satUpdated(static_cast<int>(m_sat), m_type));
         }
         else {
             m_satupdating=false;
         }
         break;
     case 11:
         m_val = v;
         h=m_hue/360.0f;
         s=m_sat/100.0f;
         l=m_val/100.0f;
         *m_color = this->converter()->fromHsyF(h, s, l, R, G, B, Gamma);
         if (m_toneupdating==false) {
             emit(toneUpdated(static_cast<int>(m_val), m_type));
         }
         else {
             m_toneupdating=false;
         }
         break;
     default:
         Q_ASSERT(false);
     }
     emit(updated());
 }
 //update
 void KisHSXColorSliderInput::update()
 {
     
     KoColor min = *m_color;
     KoColor max = *m_color;
     
     qreal hue, sat, val, hue_backup, sat_backup, val_backup;
     //gets the hsv for the appropriate type//
     hue_backup = m_hue;
     sat_backup = m_sat;
     val_backup = m_val;
     
     switch (m_type) {
     case 0:
         this->converter()->getHsvF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         break;
     case 1:
         this->converter()->getHsvF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if( (hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2 ) {
                 hue = (hue_backup/360.0);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
         }
         break;
     case 2:
         this->converter()->getHsvF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         else{
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
         }
         break;
     case 3:
         this->converter()->getHslF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         break;
     case 4:
         this->converter()->getHslF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
         }
         break;
     case 5:
         this->converter()->getHslF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         else{
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
         }
         break;
     case 6:
         this->converter()->getHsiF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         break;
     case 7:
         this->converter()->getHsiF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
         }
         break;
     case 8:
         this->converter()->getHsiF(*m_color, &hue, &sat, &val);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         else{
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
         }
         break;
     case 9:
         this->converter()->getHsyF(*m_color, &hue, &sat, &val, R, G, B, Gamma);
         if (m_sliderisupdating==true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         break;
     case 10:
         this->converter()->getHsyF(*m_color, &hue, &sat, &val, R, G, B, Gamma);
         if (m_sliderisupdating==true)
         {
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
             
             
         }
         else{
             
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
         }
         break;
     case 11:
         this->converter()->getHsyF(*m_color, &hue, &sat, &val, R, G, B, Gamma);
         if (m_sliderisupdating == true)
         {
             if((sat*100.0)<m_sat+2 && (sat*100.0)>m_sat-2) {
                 sat = (sat_backup*0.01);
             }
             if((hue*360.0)<m_hue+2 && (hue*360.0)>m_hue-2) {
                 hue = (hue_backup/360.0);
             }
         }
         else{
             if((val*100.0)<m_val+2 && (val*100.0)>m_val-2) {
                 val = (val_backup*0.01);
             }
         }
         break;
     }
     //this prevents the hue going to 0 when used with grey//
     
     if (sat<=0.0) {
         m_hue = hue_backup;
     }
     else{
         m_hue=(hue*360.0);
     }
     
     if (val==0 || val>0.999) {
         m_sat = sat_backup;
     }
     else{
         m_sat=(sat*100.0);
     }
     
     m_val=(val*100.0);
     
     if (m_hueupdating==true){m_val=val_backup; m_sat = sat_backup; m_hueupdating=false;}
     else if (m_satupdating==true){m_val=val_backup; m_hue = hue_backup; m_satupdating=false;}
     else if (m_toneupdating==true){m_sat=sat_backup; m_hue = hue_backup;m_toneupdating=false;}
     
     //sets slider and num-input according to type//
     switch (m_type) {
     case 0:
     case 3:
     case 6:
     case 9:
         m_NumInput->setValue(m_hue);
         m_hsvSlider->setValue(static_cast<int>(m_hue));
         break;
     case 1:
         m_NumInput->setValue(m_sat);
         m_hsvSlider->setValue(static_cast<int>(m_sat));
         break;
     case 2:
         m_NumInput->setValue(m_val);
         m_hsvSlider->setValue(static_cast<int>(m_val));
         break;
     case 4:
         m_NumInput->setValue(m_sat);
         m_hsvSlider->setValue(static_cast<int>(m_sat));
         break;
     case 5:
         m_NumInput->setValue(m_val);
         m_hsvSlider->setValue(static_cast<int>(m_val));
         break;
     case 7:
         m_NumInput->setValue(m_sat);
         m_hsvSlider->setValue(static_cast<int>(m_sat));
         break;
     case 8:
         m_NumInput->setValue(m_val);
         m_hsvSlider->setValue(static_cast<int>(m_val));
         break;
     case 10:
         m_NumInput->setValue(m_sat);
         m_hsvSlider->setValue(static_cast<int>(m_sat));
         break;
     case 11:
         m_NumInput->setValue(m_val);
         m_hsvSlider->setValue(static_cast<int>(m_val));
         break;
     default:
         Q_ASSERT(false);
     }
     m_hsvSlider->setColors(*m_color,m_type, m_hue, R, G, B, Gamma);
 }
 
 QWidget* KisHSXColorSliderInput::createInput()
 {
 	m_NumInput = new KisDoubleParseSpinBox(this);
     m_NumInput->setMinimum(0);
     m_NumInput->setMaximum(100.0);
     m_NumInput->setKeyboardTracking(false);//this makes sure that only full values are sent after loss of focus. Much more user friendly//
     m_hsvSlider->setMaximum(100);
     switch (m_type) {
     case 0:
     case 3:
     case 6:
     case 9:
         m_NumInput->setMaximum(360.0);
         m_NumInput->setWrapping(true);
         m_hsvSlider->setMaximum(360);
         m_NumInput->setSingleStep (5.0);
         break;
     case 1:
     case 2:
     case 4:
     case 5:
     case 7:
     case 8:
     case 10:
     case 11:
         m_NumInput->setMaximum(100.0);
         m_hsvSlider->setMaximum(100);
         m_NumInput->setSingleStep (10.0);
         break;
     default:
         Q_ASSERT(false);
     }
     connect(m_hsvSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
     connect(m_NumInput, SIGNAL(valueChanged(double)), this, SLOT(numInputChanged(double)));
     return m_NumInput;
 }
 
 void KisHSXColorSliderInput::sliderChanged(int i)
 {
     m_NumInput->setValue(i*1.0);
     setValue(i*1.0);
 }
 
 void KisHSXColorSliderInput::sliderIn(){
     m_sliderisupdating=true;
 }
 
 void KisHSXColorSliderInput::sliderOut(){
     m_sliderisupdating=false;
 }
 //attempt at getting rid of dancing sliders... #2859
 //The nminput should not be changing the sliders if the sliders are the one changing the input.
 //As numinpit rounds off at 2 decimals(and there's no point at letting it continue the signal circle).
 void KisHSXColorSliderInput::numInputChanged(double v)
 {
     if (m_sliderisupdating==true){
         return;
     }
     else {
         setValue(v);
     }
 }
 
 //this connects to the display converter. Important for OCIO, breaks on missing of m_canvas somehow.
 KisDisplayColorConverter* KisHSXColorSliderInput::converter() const
 {
     return m_canvas ?
                 m_canvas->displayColorConverter() :
                 KisDisplayColorConverter::dumbConverterInstance();
 }
 
 void KisHSXColorSliderInput::hueUpdate(int h)
 {
     if (h<=m_hue-2 || h>=m_hue+2) {
         m_hue=h;
         m_hueupdating=true;
         update();
     }
 }
 
 void KisHSXColorSliderInput::satUpdate(int s, int type)
 {
     if (m_type==type+1 || m_type==type-1)
     {
         if (s<=m_sat-3 || s>=m_sat+3) {
             m_sat=s;
             m_satupdating=true;
             update();
         }
     }
 }
 
 void KisHSXColorSliderInput::toneUpdate(int l, int type)
 {
     if (m_type==type-1 || m_type==type-2)
     {
         if (l<25 || l>75){
         
             if (l<=m_val-10 || l>=m_val+10) {
                 m_val=l;
                 m_toneupdating=true;
                 update();
             }
         }
         else {
             if (l<=m_val-3 || l>=m_val+3) {
                 m_val=l;
                 m_toneupdating=true;
                 update();
             }
         }
             
         
     }
 }
 
 #include "moc_kis_color_slider_input.cpp"
diff --git a/plugins/dockers/griddocker/grid_config_widget.ui b/plugins/dockers/griddocker/grid_config_widget.ui
index e969cf0f94..e1c884d440 100644
--- a/plugins/dockers/griddocker/grid_config_widget.ui
+++ b/plugins/dockers/griddocker/grid_config_widget.ui
@@ -1,499 +1,499 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>GridConfigWidget</class>
  <widget class="QWidget" name="GridConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>441</width>
     <height>342</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>30</width>
     <height>0</height>
    </size>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="minimumSize">
       <size>
        <width>187</width>
        <height>280</height>
       </size>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Grid</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QCheckBox" name="chkShowGrid">
            <property name="text">
             <string>Show grid</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="chkSnapToGrid">
            <property name="text">
             <string>Snap to grid</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
           <layout class="QFormLayout" name="formLayout">
            <item row="0" column="0">
             <widget class="QLabel" name="lblXSpacing">
              <property name="text">
               <string>X spacing:</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
             <widget class="KisIntParseSpinBox" name="intHSpacing">
              <property name="suffix">
               <string> px</string>
              </property>
              <property name="minimum">
               <number>1</number>
              </property>
              <property name="maximum">
               <number>500</number>
              </property>
              <property name="value">
               <number>10</number>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="lblYSpacing">
              <property name="text">
               <string>Y spacing:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
             <widget class="KisIntParseSpinBox" name="intVSpacing">
              <property name="suffix">
               <string> px</string>
              </property>
              <property name="minimum">
               <number>1</number>
              </property>
              <property name="maximum">
               <number>500</number>
              </property>
              <property name="value">
               <number>10</number>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <widget class="KoAspectButton" name="spacingAspectButton" native="true"/>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QFormLayout" name="formLayout_3">
          <item row="0" column="0">
           <widget class="QLabel" name="lblSubdivision">
            <property name="text">
             <string>Subdivision:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisIntParseSpinBox" name="intSubdivision">
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>10</number>
            </property>
            <property name="value">
             <number>2</number>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QCheckBox" name="chkOffset">
          <property name="text">
           <string>Grid Offset</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="KoAspectButton" name="offsetAspectButton" native="true"/>
        </item>
        <item>
         <layout class="QFormLayout" name="formLayout_2">
          <item row="0" column="0">
           <widget class="QLabel" name="lblXOffset">
            <property name="text">
             <string>X offset:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisIntParseSpinBox" name="intXOffset">
            <property name="suffix">
             <string> px</string>
            </property>
            <property name="maximum">
             <number>500</number>
            </property>
            <property name="value">
             <number>0</number>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="lblYOffset">
            <property name="text">
             <string>Y offset:</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisIntParseSpinBox" name="intYOffset">
            <property name="suffix">
             <string> px</string>
            </property>
            <property name="maximum">
             <number>500</number>
            </property>
            <property name="value">
             <number>0</number>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="lblMainStyle">
            <property name="text">
             <string>Main Style:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
             <widget class="KComboBox" name="selectMainStyle">
              <property name="currentIndex">
               <number>0</number>
              </property>
              <item>
               <property name="text">
                <string>Lines</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dashed</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dots</string>
               </property>
              </item>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="colorMain">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>30</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string/>
              </property>
              <property name="color" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
              <property name="defaultColor" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="lblSubdivisionStyle">
            <property name="text">
             <string>Div Style:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="KComboBox" name="selectSubdivisionStyle">
              <property name="currentIndex">
               <number>1</number>
              </property>
              <item>
               <property name="text">
                <string>Lines</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dashed</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dots</string>
               </property>
              </item>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="colorSubdivision">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>30</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string/>
              </property>
              <property name="color" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
              <property name="defaultColor" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>13</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Guides</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <layout class="QGridLayout" name="gridLayout_4">
            <item row="0" column="0">
             <widget class="QCheckBox" name="chkShowGuides">
              <property name="text">
               <string>Show guides</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
             <widget class="QCheckBox" name="chkSnapToGuides">
              <property name="text">
               <string>Snap to guides</string>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
             <widget class="QCheckBox" name="chkLockGuides">
              <property name="text">
               <string>Lock guides</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QLabel" name="lblGuidesStyle">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
               <string>Guides:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KComboBox" name="selectGuidesStyle">
              <property name="currentIndex">
               <number>0</number>
              </property>
              <item>
               <property name="text">
                <string>Lines</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dashed</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Dots</string>
               </property>
              </item>
             </widget>
            </item>
            <item>
             <widget class="KColorButton" name="colorGuides">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>30</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string/>
              </property>
              <property name="color" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
              <property name="defaultColor" stdset="0">
               <color>
                <red>0</red>
                <green>0</green>
                <blue>0</blue>
               </color>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/dockers/historydocker/KisUndoView.cpp b/plugins/dockers/historydocker/KisUndoView.cpp
index 4ba0647b3d..bb8caee721 100644
--- a/plugins/dockers/historydocker/KisUndoView.cpp
+++ b/plugins/dockers/historydocker/KisUndoView.cpp
@@ -1,392 +1,392 @@
 /* This file is part of the KDE project
  * Copyright (C) 2010 Matus Talcik <matus.talcik@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
 ** contained in the Technology Preview License Agreement accompanying
 ** this package.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 2.1 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights.  These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
 **
 **
 **
 **
 **
 **
 **
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 #include <kundo2qstack.h>
 #include "KisUndoView.h"
 #include "KisUndoModel.h"
 
 #ifndef QT_NO_UNDOVIEW
 
 #include <kundo2group.h>
 #include <QAbstractItemModel>
 #include <QPointer>
 #include <QIcon>
 #include <QLabel>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
 #include <QWidgetAction>
 #include <QGridLayout>
 #include <kis_config.h>
 
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 /*!
     \class KisUndoView
     \brief The KisUndoView class displays the contents of a KUndo2QStack.
     \since 4.2
 
     \ingroup advanced
 
     KisUndoView is a QListView which displays the list of commands pushed on an undo stack.
     The most recently executed command is always selected. Selecting a different command
     results in a call to KUndo2QStack::setIndex(), rolling the state of the document
     backwards or forward to the new command.
 
     The stack can be set explicitly with setStack(). Alternatively, a KUndo2Group object can
     be set with setGroup(). The view will then update itself automatically whenever the
     active stack of the group changes.
 
     \image KisUndoView.png
 */
 
 class KisUndoViewPrivate
 {
 public:
     KisUndoViewPrivate() :
 #ifndef QT_NO_UNDOGROUP
         group(0),
 #endif
         model(0) {}
 
 #ifndef QT_NO_UNDOGROUP
     QPointer<KUndo2Group> group;
 #endif
     KisUndoModel *model;
     KisUndoView* q;
 
     void init(KisUndoView* view);
 };
 
 void KisUndoViewPrivate::init(KisUndoView* view)
 {
     q = view;
     model = new KisUndoModel(q);
     q->setModel(model);
     q->setSelectionModel(model->selectionModel());
 }
 
 /*!
     Constructs a new view with parent \a parent.
 */
 
 KisUndoView::KisUndoView(QWidget *parent)
     : QListView(parent)
     , d(new KisUndoViewPrivate)
 {
     d->init(this);
 }
 
 /*!
     Constructs a new view with parent \a parent and sets the observed stack to \a stack.
 */
 
 KisUndoView::KisUndoView(KUndo2QStack *stack, QWidget *parent)
     : QListView(parent)
     , d(new KisUndoViewPrivate)
 {
     d->init(this);
     setStack(stack);
 }
 
 #ifndef QT_NO_UNDOGROUP
 
 /*!
     Constructs a new view with parent \a parent and sets the observed group to \a group.
 
     The view will update itself automatically whenever the active stack of the group changes.
 */
 
 KisUndoView::KisUndoView(KUndo2Group *group, QWidget *parent)
     : QListView(parent)
     , d(new KisUndoViewPrivate)
 {
     d->init(this);
     setGroup(group);
 }
 
 #endif // QT_NO_UNDOGROUP
 
 /*!
     Destroys this view.
 */
 
 KisUndoView::~KisUndoView()
 {
     delete d;
 
 }
 
 /*!
     Returns the stack currently displayed by this view. If the view is looking at a
     KUndo2Group, this the group's active stack.
 
     \sa setStack() setGroup()
 */
 
 KUndo2QStack *KisUndoView::stack() const
 {
 
     return d->model->stack();
 }
 
 /*!
     Sets the stack displayed by this view to \a stack. If \a stack is 0, the view
     will be empty.
 
     If the view was previously looking at a KUndo2Group, the group is set to 0.
 
     \sa stack() setGroup()
 */
 
 void KisUndoView::setStack(KUndo2QStack *stack)
 {
 
 #ifndef QT_NO_UNDOGROUP
     setGroup(0);
 #endif
     d->model->setStack(stack);
 }
 
 #ifndef QT_NO_UNDOGROUP
 
 /*!
     Sets the group displayed by this view to \a group. If \a group is 0, the view will
     be empty.
 
     The view will update itself autmiatically whenever the active stack of the group changes.
 
     \sa group() setStack()
 */
 
 void KisUndoView::setGroup(KUndo2Group *group)
 {
 
 
     if (d->group == group)
         return;
 
     if (d->group != 0) {
         disconnect(d->group, SIGNAL(activeStackChanged(KUndo2QStack*)),
                 d->model, SLOT(setStack(KUndo2QStack*)));
     }
 
     d->group = group;
 
     if (d->group != 0) {
         connect(d->group, SIGNAL(activeStackChanged(KUndo2QStack*)),
                 d->model, SLOT(setStack(KUndo2QStack*)));
         d->model->setStack(d->group->activeStack());
     } else {
         d->model->setStack(0);
     }
 }
 
 /*!
     Returns the group displayed by this view.
 
     If the view is not looking at group, this function returns 0.
 
     \sa setGroup() setStack()
 */
 
 KUndo2Group *KisUndoView::group() const
 {
 
     return d->group;
 }
 
 #endif // QT_NO_UNDOGROUP
 
 /*!
     \property KisUndoView::emptyLabel
     \brief the label used for the empty state.
 
     The empty label is the topmost element in the list of commands, which represents
     the state of the document before any commands were pushed on the stack. The default
     is the string "<empty>".
 */
 
 void KisUndoView::setEmptyLabel(const QString &label)
 {
 
     d->model->setEmptyLabel(label);
 }
 
 QString KisUndoView::emptyLabel() const
 {
 
     return d->model->emptyLabel();
 }
 
 /*!
     \property KisUndoView::cleanIcon
     \brief the icon used to represent the clean state.
 
     A stack may have a clean state set with KUndo2QStack::setClean(). This is usually
     the state of the document at the point it was saved. KisUndoView can display an
     icon in the list of commands to show the clean state. If this property is
     a null icon, no icon is shown. The default value is the null icon.
 */
 
 void KisUndoView::setCleanIcon(const QIcon &icon)
 {
 
     d->model->setCleanIcon(icon);
 
 }
 
 QIcon KisUndoView::cleanIcon() const
 {
 
     return d->model->cleanIcon();
 }
 
 void KisUndoView::setCanvas(KisCanvas2 *canvas) {
     d->model->setCanvas(canvas);
 }
 void KisUndoView::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::RightButton)
     {
         QMenu menu(this);
         QAction* action1 = menu.addAction(KisIconUtils::loadIcon("link"),stack()->useCumulativeUndoRedo()?i18n("Disable Cumulative Undo"):i18n("Enable Cumulative Undo"));
         connect(action1, SIGNAL(triggered()), this, SLOT(toggleCumulativeUndoRedo()));
         QLabel *l = new QLabel(i18n("Start merging time"));
 		QDoubleSpinBox *s = new KisDoubleParseSpinBox();
         s->setToolTip(i18nc("@info:tooltip", "The amount of time after a merged stroke before merging again"));
         s->setRange(3,10);
         s->setValue(stack()->timeT1());
         QGridLayout *g = new QGridLayout();
         g->addWidget(l);
         g->addWidget(s);
         QWidget *w = new QWidget();
         w->setLayout(g);
         w->setVisible(stack()->useCumulativeUndoRedo());
         QWidgetAction* action2 = new QWidgetAction(s);
         action2->setDefaultWidget(w);
         connect(s,SIGNAL(valueChanged(double)),SLOT(setStackT1(double)));
 
         QLabel *l1 = new QLabel(i18n("Group time"));
 		QDoubleSpinBox *s1 = new KisDoubleParseSpinBox();
         s1->setToolTip(i18nc("@info:tooltip", "The amount of time every stroke should be apart from its previous stroke to be classified in one group"));
         s1->setRange(0.3,s->value());
         s1->setValue(stack()->timeT2());
         QGridLayout *g1 = new QGridLayout();
         g1->addWidget(l1);
         g1->addWidget(s1);
         QWidget *w1 = new QWidget();
         w1->setLayout(g1);
         w1->setVisible(stack()->useCumulativeUndoRedo());
         QWidgetAction* action3 = new QWidgetAction(s1);
         action3->setDefaultWidget(w1);
         connect(s1,SIGNAL(valueChanged(double)),SLOT(setStackT2(double)));
 
         QLabel *l2 = new QLabel(i18n("Split Strokes"));
 		QSpinBox *s2 = new KisIntParseSpinBox();
         s2->setToolTip(i18nc("@info:tooltip", "The number of last strokes which Krita should store separately"));
         s2->setRange(1,stack()->undoLimit());
         s2->setValue(stack()->strokesN());
         QGridLayout *g2 = new QGridLayout();
         g1->addWidget(l2);
         g1->addWidget(s2);
         QWidget *w2 = new QWidget();
         w2->setLayout(g2);
         w2->setVisible(stack()->useCumulativeUndoRedo());
         QWidgetAction* action4 = new QWidgetAction(s2);
         action4->setDefaultWidget(w2);
         connect(s2,SIGNAL(valueChanged(int)),SLOT(setStackN(int)));
 
         menu.addAction(action2);
         menu.addAction(action3);
         menu.addAction(action4);
 
         menu.exec(event->globalPos());
 
     }
     else{
     QListView::mousePressEvent(event);
     }
 }
 void KisUndoView::toggleCumulativeUndoRedo()
 {
     stack()->setUseCumulativeUndoRedo(!stack()->useCumulativeUndoRedo() );
     KisConfig cfg;
     cfg.setCumulativeUndoRedo(stack()->useCumulativeUndoRedo());
 }
 void KisUndoView::setStackT1(double value)
 {
     stack()->setTimeT1(value);
     KisConfig cfg;
     cfg.setStackT1(value);
 }
 void KisUndoView::setStackT2(double value)
 {
     stack()->setTimeT2(value);
     KisConfig cfg;
     cfg.setStackT2(value);
 }
 void KisUndoView::setStackN(int value)
 {
     stack()->setStrokesN(value);
     KisConfig cfg;
     cfg.setStackN(value);
 }
 
 
 #endif // QT_NO_UNDOVIEW
diff --git a/plugins/dockers/specificcolorselector/kis_color_input.cc b/plugins/dockers/specificcolorselector/kis_color_input.cc
index 5f7d52e90d..251b32ebc1 100644
--- a/plugins/dockers/specificcolorselector/kis_color_input.cc
+++ b/plugins/dockers/specificcolorselector/kis_color_input.cc
@@ -1,305 +1,305 @@
 /*
  *  Copyright (c) 2008 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2011 Sven Langkamp <sven.langkamp@gmail.com>
  *  Copyright (c) 2015 Moritz Molch <kde@moritzmolch.de>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_color_input.h"
 
 #include <KoConfig.h>
 #ifdef HAVE_OPENEXR
 #include <half.h>
 #endif
 
 #include <cmath>
 
 #include <kis_debug.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
 
 #include <klocalizedstring.h>
 
 #include <KoChannelInfo.h>
 #include <KoColor.h>
 #include <KoColorSlider.h>
 #include <KoColorSpace.h>
 
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 KisColorInput::KisColorInput(QWidget* parent, const KoChannelInfo* channelInfo, KoColor* color, KoColorDisplayRendererInterface *displayRenderer) : QWidget(parent), m_channelInfo(channelInfo), m_color(color), m_displayRenderer(displayRenderer)
 {
 }
 
 void KisColorInput::init()
 {
     QHBoxLayout* m_layout = new QHBoxLayout(this);
     m_layout->setContentsMargins(0,0,0,0);
     m_layout->setSpacing(1);
 
     QLabel* m_label = new QLabel(i18n("%1:", m_channelInfo->name()), this);
     m_layout->addWidget(m_label);
 
     m_colorSlider = new KoColorSlider(Qt::Horizontal, this, m_displayRenderer);
 	m_colorSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     m_layout->addWidget(m_colorSlider);
 
     QWidget* m_input = createInput();
     m_colorSlider->setFixedHeight(m_input->sizeHint().height());
     m_layout->addWidget(m_input);
 }
 
 KisIntegerColorInput::KisIntegerColorInput(QWidget* parent, const KoChannelInfo* channelInfo, KoColor* color, KoColorDisplayRendererInterface *displayRenderer) : KisColorInput(parent, channelInfo, color, displayRenderer)
 {
     init();
 }
 
 void KisIntegerColorInput::setValue(int v)
 {
     quint8* data = m_color->data() + m_channelInfo->pos();
     switch (m_channelInfo->channelValueType()) {
     case KoChannelInfo::UINT8:
         *(reinterpret_cast<quint8*>(data)) = v;
         break;
     case KoChannelInfo::UINT16:
         *(reinterpret_cast<quint16*>(data)) = v;
         break;
     case KoChannelInfo::UINT32:
         *(reinterpret_cast<quint32*>(data)) = v;
         break;
     default:
         Q_ASSERT(false);
     }
     emit(updated());
 }
 
 void KisIntegerColorInput::update()
 {
     KoColor min = *m_color;
     KoColor max = *m_color;
     quint8* data = m_color->data() + m_channelInfo->pos();
     quint8* dataMin = min.data() + m_channelInfo->pos();
     quint8* dataMax = max.data() + m_channelInfo->pos();
     switch (m_channelInfo->channelValueType()) {
     case KoChannelInfo::UINT8:
         m_intNumInput->setValue(*(reinterpret_cast<quint8*>(data)));
         m_colorSlider->setValue(*(reinterpret_cast<quint8*>(data)));
         *(reinterpret_cast<quint8*>(dataMin)) = 0x0;
         *(reinterpret_cast<quint8*>(dataMax)) = 0xFF;
         break;
     case KoChannelInfo::UINT16:
         m_intNumInput->setValue(*(reinterpret_cast<quint16*>(data)));
         m_colorSlider->setValue(*(reinterpret_cast<quint16*>(data)));
         *(reinterpret_cast<quint16*>(dataMin)) = 0x0;
         *(reinterpret_cast<quint16*>(dataMax)) = 0xFFFF;
         break;
     case KoChannelInfo::UINT32:
         m_intNumInput->setValue(*(reinterpret_cast<quint32*>(data)));
         m_colorSlider->setValue(*(reinterpret_cast<quint32*>(data)));
         *(reinterpret_cast<quint32*>(dataMin)) = 0x0;
         *(reinterpret_cast<quint32*>(dataMax)) = 0xFFFFFFFF;
         break;
     default:
         Q_ASSERT(false);
     }
     m_colorSlider->setColors(min, max);
 }
 
 QWidget* KisIntegerColorInput::createInput()
 {
 	m_intNumInput = new KisIntParseSpinBox(this);
     m_intNumInput->setMinimum(0);
 	m_colorSlider->setMinimum(0);
     switch (m_channelInfo->channelValueType()) {
     case KoChannelInfo::UINT8:
         m_intNumInput->setMaximum(0xFF);
         m_colorSlider->setMaximum(0xFF);
         break;
     case KoChannelInfo::UINT16:
         m_intNumInput->setMaximum(0xFFFF);
         m_colorSlider->setMaximum(0xFFFF);
         break;
     case KoChannelInfo::UINT32:
         m_intNumInput->setMaximum(0xFFFFFFFF);
         m_colorSlider->setMaximum(0xFFFFFFFF);
         break;
     default:
         Q_ASSERT(false);
     }
     connect(m_colorSlider, SIGNAL(valueChanged(int)), m_intNumInput, SLOT(setValue(int)));
     connect(m_intNumInput, SIGNAL(valueChanged(int)), this, SLOT(setValue(int)));
     return m_intNumInput;
 }
 
 
 KisFloatColorInput::KisFloatColorInput(QWidget* parent, const KoChannelInfo* channelInfo, KoColor* color, KoColorDisplayRendererInterface *displayRenderer) : KisColorInput(parent, channelInfo, color, displayRenderer)
 {
     init();
 }
 
 void KisFloatColorInput::setValue(double v)
 {
     quint8* data = m_color->data() + m_channelInfo->pos();
     switch (m_channelInfo->channelValueType()) {
 #ifdef HAVE_OPENEXR
     case KoChannelInfo::FLOAT16:
         *(reinterpret_cast<half*>(data)) = v;
         break;
 #endif
     case KoChannelInfo::FLOAT32:
         *(reinterpret_cast<float*>(data)) = v;
         break;
     default:
         Q_ASSERT(false);
     }
     emit(updated());
 }
 
 QWidget* KisFloatColorInput::createInput()
 {
 	m_dblNumInput = new KisDoubleParseSpinBox(this);
     m_dblNumInput->setMinimum(0);
     m_dblNumInput->setMaximum(1.0);
     connect(m_colorSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
 	connect(m_dblNumInput, SIGNAL(valueChanged(double)), this, SLOT(setValue(double)));
 	m_dblNumInput->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
 	m_dblNumInput->setMinimumWidth(60);
 	m_dblNumInput->setMaximumWidth(60);
     return m_dblNumInput;
 }
 
 void KisFloatColorInput::sliderChanged(int i)
 {
     const qreal floatRange = m_maxValue - m_minValue;
     m_dblNumInput->setValue(m_minValue + (i / 255.0) * floatRange);
 }
 
 void KisFloatColorInput::update()
 {
     KoColor min = *m_color;
     KoColor max = *m_color;
     quint8* data = m_color->data() + m_channelInfo->pos();
     quint8* dataMin = min.data() + m_channelInfo->pos();
     quint8* dataMax = max.data() + m_channelInfo->pos();
 
     qreal value = 1.0;
     m_minValue = m_displayRenderer->minVisibleFloatValue(m_channelInfo);
     m_maxValue = m_displayRenderer->maxVisibleFloatValue(m_channelInfo);
 
     switch (m_channelInfo->channelValueType()) {
 #ifdef HAVE_OPENEXR
     case KoChannelInfo::FLOAT16:
         value = *(reinterpret_cast<half*>(data));
         m_minValue = qMin(value, m_minValue);
         m_maxValue = qMax(value, m_maxValue);
         *(reinterpret_cast<half*>(dataMin)) = m_minValue;
         *(reinterpret_cast<half*>(dataMax)) = m_maxValue;
         break;
 #endif
     case KoChannelInfo::FLOAT32:
         value = *(reinterpret_cast<float*>(data));
         m_minValue = qMin(value, m_minValue);
         m_maxValue = qMax(value, m_maxValue);
         *(reinterpret_cast<float*>(dataMin)) = m_minValue;
         *(reinterpret_cast<float*>(dataMax)) = m_maxValue;
         break;
     default:
         Q_ASSERT(false);
     }
 
     m_dblNumInput->setMinimum(m_minValue);
     m_dblNumInput->setMaximum(m_maxValue);
 
     // ensure at least 3 significant digits are always shown
 	int newPrecision = 2 + qMax(qreal(0.0), std::ceil(-std::log10(m_maxValue)));
 	if (newPrecision != m_dblNumInput->decimals()) {
 		m_dblNumInput->setDecimals(newPrecision);
 		m_dblNumInput->updateGeometry();
 	}
 
     m_colorSlider->setColors(min, max);
 
     const qreal floatRange = m_maxValue - m_minValue;
     m_dblNumInput->setValue(value);
     m_colorSlider->setValue((value - m_minValue) / floatRange * 255);
 }
 
 KisHexColorInput::KisHexColorInput(QWidget* parent, KoColor* color, KoColorDisplayRendererInterface *displayRenderer) : KisColorInput(parent, 0, color, displayRenderer)
 {
     QHBoxLayout* m_layout = new QHBoxLayout(this);
     m_layout->setContentsMargins(0,0,0,0);
     m_layout->setSpacing(1);
 
     QLabel* m_label = new QLabel(i18n("Color name:"), this);
     m_label->setMinimumWidth(50);
     m_layout->addWidget(m_label);
 
     QWidget* m_input = createInput();
 	m_input->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
     m_layout->addWidget(m_input);
 }
 
 void KisHexColorInput::setValue()
 {
     QString valueString = m_hexInput->text();
     valueString.remove(QChar('#'));
 
     QList<KoChannelInfo*> channels = m_color->colorSpace()->channels();
     channels = KoChannelInfo::displayOrderSorted(channels);
     Q_FOREACH (KoChannelInfo* channel, channels) {
         if (channel->channelType() == KoChannelInfo::COLOR) {
             Q_ASSERT(channel->channelValueType() == KoChannelInfo::UINT8);
             quint8* data = m_color->data() + channel->pos();
 
             int value = valueString.left(2).toInt(0, 16);
             *(reinterpret_cast<quint8*>(data)) = value;
             valueString.remove(0, 2);
         }
     }
     emit(updated());
 }
 
 void KisHexColorInput::update()
 {
     QString hexString("#");
 
     QList<KoChannelInfo*> channels = m_color->colorSpace()->channels();
     channels = KoChannelInfo::displayOrderSorted(channels);
     Q_FOREACH (KoChannelInfo* channel, channels) {
         if (channel->channelType() == KoChannelInfo::COLOR) {
             Q_ASSERT(channel->channelValueType() == KoChannelInfo::UINT8);
             quint8* data = m_color->data() + channel->pos();
             hexString.append(QString("%1").arg(*(reinterpret_cast<quint8*>(data)), 2, 16, QChar('0')));
         }
     }
     m_hexInput->setText(hexString);
 }
 
 QWidget* KisHexColorInput::createInput()
 {
     m_hexInput = new QLineEdit(this);
 
     int digits = 2*m_color->colorSpace()->colorChannelCount();
     QString pattern = QString("#?[a-fA-F0-9]{%1,%2}").arg(digits).arg(digits);
     m_hexInput->setValidator(new QRegExpValidator(QRegExp(pattern), this));
     connect(m_hexInput, SIGNAL(editingFinished()), this, SLOT(setValue()));
     return m_hexInput;
 }
 
diff --git a/plugins/extensions/clonesarray/wdg_clonesarray.ui b/plugins/extensions/clonesarray/wdg_clonesarray.ui
index 951d10d886..a932096279 100644
--- a/plugins/extensions/clonesarray/wdg_clonesarray.ui
+++ b/plugins/extensions/clonesarray/wdg_clonesarray.ui
@@ -1,380 +1,380 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgClonesArray</class>
  <widget class="QWidget" name="WdgClonesArray">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>710</width>
     <height>174</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rotate Image</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="2">
       <widget class="QLabel" name="label_6">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>- Elements</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="3">
       <widget class="QLabel" name="label_5">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>+ Elements</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="5">
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>X offset</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="6">
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Y offset</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="8">
       <widget class="QLabel" name="label_8">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Distance</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="9">
       <widget class="QLabel" name="label_7">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Angle</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Columns:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1" rowspan="2">
       <spacer name="horizontalSpacer_4">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>13</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item row="1" column="2">
       <widget class="KisIntParseSpinBox" name="numNegativeColumns"/>
      </item>
      <item row="1" column="3">
       <widget class="KisIntParseSpinBox" name="numPositiveColumns">
        <property name="minimum">
         <number>1</number>
        </property>
        <property name="value">
         <number>2</number>
        </property>
       </widget>
      </item>
      <item row="1" column="4" rowspan="2">
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>13</width>
          <height>17</height>
         </size>
        </property>
       </spacer>
      </item>
      <item row="1" column="5">
       <widget class="KisIntParseSpinBox" name="columnXOffset">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="minimum">
         <number>-10000</number>
        </property>
        <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
      <item row="1" column="6">
       <widget class="KisIntParseSpinBox" name="columnYOffset">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="minimum">
         <number>-10000</number>
        </property>
        <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
      <item row="1" column="7" rowspan="2">
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>13</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Rows:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <widget class="KisIntParseSpinBox" name="numNegativeRows"/>
      </item>
      <item row="2" column="3">
       <widget class="KisIntParseSpinBox" name="numPositiveRows">
        <property name="minimum">
         <number>1</number>
        </property>
        <property name="value">
         <number>2</number>
        </property>
       </widget>
      </item>
      <item row="2" column="5">
       <widget class="KisIntParseSpinBox" name="rowXOffset">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="minimum">
         <number>-10000</number>
        </property>
        <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
      <item row="2" column="6">
       <widget class="KisIntParseSpinBox" name="rowYOffset">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="minimum">
         <number>-10000</number>
        </property>
        <property name="maximum">
         <number>10000</number>
        </property>
       </widget>
      </item>
      <item row="1" column="9">
       <widget class="KisDoubleParseSpinBox" name="columnAngle">
        <property name="suffix">
         <string notr="true">°</string>
        </property>
        <property name="minimum">
         <double>-360.000000000000000</double>
        </property>
        <property name="maximum">
         <double>360.000000000000000</double>
        </property>
       </widget>
      </item>
      <item row="2" column="9">
       <widget class="KisDoubleParseSpinBox" name="rowAngle">
        <property name="suffix">
         <string notr="true">°</string>
        </property>
        <property name="minimum">
         <double>-360.000000000000000</double>
        </property>
        <property name="maximum">
         <double>360.000000000000000</double>
        </property>
       </widget>
      </item>
      <item row="1" column="8">
       <widget class="KisDoubleParseSpinBox" name="columnDistance">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="maximum">
         <double>10000.000000000000000</double>
        </property>
       </widget>
      </item>
      <item row="2" column="8">
       <widget class="KisDoubleParseSpinBox" name="rowDistance">
        <property name="suffix">
         <string>px</string>
        </property>
        <property name="maximum">
         <double>10000.000000000000000</double>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QCheckBox" name="columnPreference">
        <property name="text">
         <string>Column Preference</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>28</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>numNegativeColumns</tabstop>
   <tabstop>numNegativeRows</tabstop>
   <tabstop>numPositiveColumns</tabstop>
   <tabstop>numPositiveRows</tabstop>
   <tabstop>columnXOffset</tabstop>
   <tabstop>rowXOffset</tabstop>
   <tabstop>columnYOffset</tabstop>
   <tabstop>rowYOffset</tabstop>
   <tabstop>columnDistance</tabstop>
   <tabstop>rowDistance</tabstop>
   <tabstop>columnAngle</tabstop>
   <tabstop>rowAngle</tabstop>
   <tabstop>columnPreference</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/imagesize/wdg_canvassize.ui b/plugins/extensions/imagesize/wdg_canvassize.ui
index 11e59950da..858140b589 100644
--- a/plugins/extensions/imagesize/wdg_canvassize.ui
+++ b/plugins/extensions/imagesize/wdg_canvassize.ui
@@ -1,692 +1,692 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgCanvasSize</class>
  <widget class="QWidget" name="WdgCanvasSize">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>395</width>
     <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Canvas Size</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>New Size</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="2">
        <widget class="KisIntParseSpinBox" name="newWidth">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="lblNewHeight">
         <property name="text">
          <string>Height:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="QComboBox" name="heightUnit"/>
       </item>
       <item row="0" column="4" rowspan="2">
        <widget class="KoAspectButton" name="aspectRatioBtn" native="true"/>
       </item>
       <item row="1" column="2">
        <widget class="KisIntParseSpinBox" name="newHeight">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblNewWidth">
         <property name="text">
          <string>Width:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisDoubleParseSpinBox" name="newWidthDouble">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisDoubleParseSpinBox" name="newHeightDouble">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>25</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="widthUnit"/>
       </item>
       <item row="1" column="5">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="2" column="2" colspan="4">
        <widget class="QCheckBox" name="constrainProportionsCkb">
         <property name="toolTip">
          <string>Constrain aspect ratio</string>
         </property>
         <property name="text">
          <string>Constrain proportions</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Offset</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="4" column="2">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>30</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="2" column="2">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>16</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblXOff">
         <property name="text">
          <string>X:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisIntParseSpinBox" name="xOffset">
         <property name="minimum">
          <number>-100000</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisDoubleParseSpinBox" name="xOffsetDouble">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-10000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <spacer name="horizontalSpacer_6">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>25</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="lblAnchor">
         <property name="text">
          <string>Anchor:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="lblYOff">
         <property name="text">
          <string>Y:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisIntParseSpinBox" name="yOffset">
         <property name="minimum">
          <number>-100000</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisDoubleParseSpinBox" name="yOffsetDouble">
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>-10000.000000000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="QComboBox" name="yOffUnit"/>
       </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="xOffUnit"/>
       </item>
       <item row="3" column="3">
        <widget class="QFrame" name="previewCanvas">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="leftMargin">
           <number>2</number>
          </property>
          <property name="topMargin">
           <number>2</number>
          </property>
          <property name="rightMargin">
           <number>2</number>
          </property>
          <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
           <widget class="KCanvasPreview" name="canvasPreview" native="true"/>
          </item>
         </layout>
        </widget>
       </item>
       <item row="3" column="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <layout class="QGridLayout" name="gridLayout_3">
           <property name="spacing">
            <number>0</number>
           </property>
           <item row="0" column="0">
            <widget class="QPushButton" name="topLeft">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QPushButton" name="middleLeft">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QPushButton" name="bottomLeft">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QPushButton" name="middleCenter">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QPushButton" name="bottomCenter">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="2">
            <widget class="QPushButton" name="middleRight">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QPushButton" name="topCenter">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QPushButton" name="topRight">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="flat">
              <bool>false</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
            <widget class="QPushButton" name="bottomRight">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>25</width>
               <height>25</height>
              </size>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="iconSize">
              <size>
               <width>15</width>
               <height>15</height>
              </size>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Maximum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>16</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
       <item row="3" column="4">
        <spacer name="horizontalSpacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KCanvasPreview</class>
    <extends>QWidget</extends>
    <header>kcanvaspreview.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>newWidth</tabstop>
   <tabstop>newWidthDouble</tabstop>
   <tabstop>widthUnit</tabstop>
   <tabstop>newHeight</tabstop>
   <tabstop>newHeightDouble</tabstop>
   <tabstop>heightUnit</tabstop>
   <tabstop>constrainProportionsCkb</tabstop>
   <tabstop>xOffset</tabstop>
   <tabstop>xOffsetDouble</tabstop>
   <tabstop>xOffUnit</tabstop>
   <tabstop>yOffset</tabstop>
   <tabstop>yOffsetDouble</tabstop>
   <tabstop>yOffUnit</tabstop>
   <tabstop>topLeft</tabstop>
   <tabstop>topCenter</tabstop>
   <tabstop>topRight</tabstop>
   <tabstop>middleLeft</tabstop>
   <tabstop>middleCenter</tabstop>
   <tabstop>middleRight</tabstop>
   <tabstop>bottomLeft</tabstop>
   <tabstop>bottomCenter</tabstop>
   <tabstop>bottomRight</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/imagesize/wdg_imagesize.ui b/plugins/extensions/imagesize/wdg_imagesize.ui
index 6e9f54f071..8a45fdf251 100644
--- a/plugins/extensions/imagesize/wdg_imagesize.ui
+++ b/plugins/extensions/imagesize/wdg_imagesize.ui
@@ -1,447 +1,447 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgImageSize</class>
  <widget class="QWidget" name="WdgImageSize">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>391</width>
     <height>386</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Scale To New Size</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupImageSize">
      <property name="title">
       <string>Pixel Dimensions</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="1" column="2">
        <widget class="KisDoubleParseSpinBox" name="pixelHeightDouble">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisIntParseSpinBox" name="pixelHeight">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="pixelWidthUnit"/>
       </item>
       <item row="0" column="0">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>25</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblPixelWidth">
         <property name="text">
          <string>W&amp;idth:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>pixelWidth</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="lblPixelFilter">
         <property name="text">
          <string>&amp;Filter:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>printWidth</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="4" rowspan="2">
        <widget class="KoAspectButton" name="pixelAspectRatioBtn" native="true">
         <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="QComboBox" name="pixelHeightUnit"/>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="lblPixelHeight">
         <property name="text">
          <string>&amp;Height:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>pixelHeight</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisDoubleParseSpinBox" name="pixelWidthDouble">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisIntParseSpinBox" name="pixelWidth">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="1" column="5">
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="2" column="2" colspan="2">
        <widget class="KisCmbIDList" name="pixelFilterCmb" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupPrintSize">
      <property name="title">
       <string>Print Size</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="1" column="1">
        <widget class="QLabel" name="lblPrintHeight">
         <property name="text">
          <string>Hei&amp;ght:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>printHeight</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="QComboBox" name="printHeightUnit"/>
       </item>
       <item row="0" column="2">
        <widget class="KisDoubleParseSpinBox" name="printWidth">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblPrintWidth">
         <property name="text">
          <string>Wid&amp;th:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>printWidth</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisDoubleParseSpinBox" name="printHeight">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="4" rowspan="2">
        <widget class="KoAspectButton" name="printAspectRatioBtn" native="true">
         <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="printWidthUnit"/>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="lblResolution">
         <property name="text">
          <string>Resolution:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="KisDoubleParseSpinBox" name="printResolution">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>70</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="2" column="3">
        <widget class="QComboBox" name="printResolutionUnit"/>
       </item>
       <item row="1" column="0">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>25</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="5">
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QCheckBox" name="constrainProportionsCkb">
      <property name="toolTip">
       <string>Constrain aspect ratio</string>
      </property>
      <property name="text">
       <string>Constrain proportions</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="adjustPrintSizeSeparatelyCkb">
      <property name="text">
       <string>Adjust print size separately</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>30</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisCmbIDList</class>
    <extends></extends>
    <header>widgets/kis_cmb_idlist.h</header>
   </customwidget>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>pixelWidth</tabstop>
   <tabstop>pixelWidthDouble</tabstop>
   <tabstop>pixelWidthUnit</tabstop>
   <tabstop>pixelHeight</tabstop>
   <tabstop>pixelHeightDouble</tabstop>
   <tabstop>pixelHeightUnit</tabstop>
   <tabstop>pixelFilterCmb</tabstop>
   <tabstop>printWidth</tabstop>
   <tabstop>printWidthUnit</tabstop>
   <tabstop>printHeight</tabstop>
   <tabstop>printHeightUnit</tabstop>
   <tabstop>printResolution</tabstop>
   <tabstop>printResolutionUnit</tabstop>
   <tabstop>constrainProportionsCkb</tabstop>
   <tabstop>adjustPrintSizeSeparatelyCkb</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/imagesize/wdg_layersize.ui b/plugins/extensions/imagesize/wdg_layersize.ui
index 9c8c537be8..58170c58ad 100644
--- a/plugins/extensions/imagesize/wdg_layersize.ui
+++ b/plugins/extensions/imagesize/wdg_layersize.ui
@@ -1,248 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgLayerSize</class>
  <widget class="QWidget" name="WdgLayerSize">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>366</width>
     <height>201</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Layer Size</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupNewSize">
      <property name="title">
       <string>New Size</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="4" rowspan="2">
        <widget class="KoAspectButton" name="aspectRatioBtn" native="true">
         <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="5">
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="newWidthUnit"/>
       </item>
       <item row="1" column="3">
        <widget class="QComboBox" name="newHeightUnit"/>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="lblNewWidth">
         <property name="text">
          <string>W&amp;idth:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>newWidth</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisDoubleParseSpinBox" name="newWidthDouble">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisDoubleParseSpinBox" name="newHeightDouble">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="decimals">
          <number>4</number>
         </property>
         <property name="minimum">
          <double>0.000100000000000</double>
         </property>
         <property name="maximum">
          <double>10000.000000000000000</double>
         </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="KisIntParseSpinBox" name="newHeight">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="KisIntParseSpinBox" name="newWidth">
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>100000</number>
         </property>
        </widget>
       </item>
       <item row="2" column="2" colspan="2">
        <widget class="KisCmbIDList" name="filterCmb" native="true"/>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="lblFilter">
         <property name="text">
          <string>Filter:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="lblNewHeight">
         <property name="text">
          <string>&amp;Height:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>newHeight</cstring>
         </property>
        </widget>
       </item>
       <item row="3" column="2" colspan="4">
        <widget class="QCheckBox" name="constrainProportionsCkb">
         <property name="toolTip">
          <string>Constrain aspect ratio</string>
         </property>
         <property name="text">
          <string>Constrain proportions</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>25</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>30</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisCmbIDList</class>
    <extends></extends>
    <header>widgets/kis_cmb_idlist.h</header>
   </customwidget>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>newWidth</tabstop>
   <tabstop>newWidthDouble</tabstop>
   <tabstop>newWidthUnit</tabstop>
   <tabstop>newHeight</tabstop>
   <tabstop>newHeightDouble</tabstop>
   <tabstop>newHeightUnit</tabstop>
   <tabstop>filterCmb</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/imagesplit/wdg_imagesplit.ui b/plugins/extensions/imagesplit/wdg_imagesplit.ui
index 2ca392d6b7..4fd7708036 100644
--- a/plugins/extensions/imagesplit/wdg_imagesplit.ui
+++ b/plugins/extensions/imagesplit/wdg_imagesplit.ui
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgImagesplit</class>
  <widget class="QWidget" name="WdgImagesplit">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>236</width>
     <height>194</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Image Size</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="lblHorizontalSplitLines">
          <property name="text">
           <string>Horizontal Lines</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="KisIntParseSpinBox" name="intHorizontalSplitLines"/>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lblVerticalSplitLines">
          <property name="text">
           <string>Vertical Lines</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="KisIntParseSpinBox" name="intVerticalSplitLines"/>
        </item>
       </layout>
      </item>
      <item row="1" column="0">
       <widget class="QCheckBox" name="chkAutoSave">
        <property name="font">
         <font>
          <pointsize>10</pointsize>
         </font>
        </property>
        <property name="text">
         <string>Autosave on Split</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <layout class="QFormLayout" name="formLayout_2">
        <item row="0" column="0">
         <widget class="QLabel" name="lblSuffix">
          <property name="text">
           <string>Prefix</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QLineEdit" name="lineEdit">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lblFileType">
          <property name="text">
           <string>File Type</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QComboBox" name="cmbFileType"/>
        </item>
       </layout>
      </item>
      <item row="3" column="0">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>38</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/metadataeditor/editors/exif.ui b/plugins/extensions/metadataeditor/editors/exif.ui
index 12131186b3..2f12c4579e 100644
--- a/plugins/extensions/metadataeditor/editors/exif.ui
+++ b/plugins/extensions/metadataeditor/editors/exif.ui
@@ -1,1109 +1,1109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Exif</class>
  <widget class="QWidget" name="Exif">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>559</width>
     <height>483</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Exposure</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>&amp;Brightness value:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editBrightnessValue</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QLineEdit" name="editBrightnessValue"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>&amp;ISO:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editISO</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisIntParseSpinBox" name="editISO">
            <property name="maximum">
             <number>3600</number>
            </property>
            <property name="singleStep">
             <number>100</number>
            </property>
            <property name="value">
             <number>100</number>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_16">
            <property name="text">
             <string>Exposure &amp;time:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editExposureTime</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QLineEdit" name="editExposureTime"/>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>E&amp;xposure mode:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editExposureMode</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QComboBox" name="editExposureMode">
            <item>
             <property name="text">
              <string>Auto</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Manual</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Auto bracket</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>Exposure pro&amp;gram:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editExposureProgram</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="QComboBox" name="editExposureProgram">
            <item>
             <property name="text">
              <string>Not defined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Manual</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Normal program</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Aperture priority</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Shutter priority</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Creative program</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Action program</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Portrait mode</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Landscape mode</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_7">
            <property name="text">
             <string>Exposure index:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editExposureIndex</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="QLineEdit" name="editExposureIndex"/>
          </item>
          <item row="6" column="0">
           <widget class="QLabel" name="label_10">
            <property name="text">
             <string>Exposure bias:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editExposureBiasValue</cstring>
            </property>
           </widget>
          </item>
          <item row="6" column="1">
           <widget class="QLineEdit" name="editExposureBiasValue"/>
          </item>
          <item row="7" column="0">
           <widget class="QLabel" name="label_9">
            <property name="text">
             <string>Ape&amp;rture:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editApertureValue</cstring>
            </property>
           </widget>
          </item>
          <item row="7" column="1">
           <widget class="QLineEdit" name="editApertureValue"/>
          </item>
          <item row="8" column="0">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>Shutter speed:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editShutterSpeedValue</cstring>
            </property>
           </widget>
          </item>
          <item row="8" column="1">
           <widget class="QLineEdit" name="editShutterSpeedValue"/>
          </item>
          <item row="9" column="0">
           <widget class="QLabel" name="label_25">
            <property name="text">
             <string>&amp;F Number:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editFNumber</cstring>
            </property>
           </widget>
          </item>
          <item row="9" column="1">
           <widget class="QLineEdit" name="editFNumber"/>
          </item>
          <item row="10" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>51</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Lens</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>&amp;Focal length:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editFocalLength</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisIntParseSpinBox" name="editFocalLength">
            <property name="maximum">
             <number>1000</number>
            </property>
            <property name="singleStep">
             <number>1</number>
            </property>
            <property name="value">
             <number>35</number>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Focal length (&amp;35mm equivalent):</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editFocalLengthIn35mmFilm</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisIntParseSpinBox" name="editFocalLengthIn35mmFilm">
            <property name="maximum">
             <number>1000</number>
            </property>
            <property name="singleStep">
             <number>1</number>
            </property>
            <property name="value">
             <number>35</number>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_12">
            <property name="text">
             <string>Max aperture:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editMaxApertureValue</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QLineEdit" name="editMaxApertureValue"/>
          </item>
          <item row="3" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>101</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
        <string>Autofocus</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_17">
            <property name="text">
             <string>Su&amp;bject distance:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editSubjectDistance</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QLineEdit" name="editSubjectDistance"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_11">
            <property name="text">
             <string>Meterin&amp;g mode:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editMeteringMode</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="editMeteringMode">
            <item>
             <property name="text">
              <string>Unknown</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Average</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Center weighted average</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Spot</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Multi spot</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Pattern</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Partial</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Other</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_24">
            <property name="text">
             <string>D&amp;istance range:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editSubjectDistanceRange</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QComboBox" name="editSubjectDistanceRange">
            <item>
             <property name="text">
              <string>Unknown</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Macro</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Close view</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Distant view</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="3" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>151</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_6">
       <attribute name="title">
        <string>Flash</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0" colspan="2">
           <widget class="QCheckBox" name="editFlashFired">
            <property name="text">
             <string>Fired</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_22">
            <property name="text">
             <string>Stro&amp;be return:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editStrobeReturn</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="editStrobeReturn">
            <item>
             <property name="text">
              <string>No strobe return detection</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>No strobe return light detected</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Strobe return light detected</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_21">
            <property name="text">
             <string>Mode:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editFlashMode</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QComboBox" name="editFlashMode">
            <item>
             <property name="text">
              <string>Unknown</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Compulsory flash fired</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Compulsory flash suppression</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Auto mode</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="3" column="0" colspan="2">
           <widget class="QCheckBox" name="editFlashFunction">
            <property name="text">
             <string>Function</string>
            </property>
           </widget>
          </item>
          <item row="4" column="0" colspan="2">
           <widget class="QCheckBox" name="editFlashRedEyeMode">
            <property name="text">
             <string>Red-eye removal</string>
            </property>
           </widget>
          </item>
          <item row="5" column="0">
           <widget class="QLabel" name="label_23">
            <property name="text">
             <string>Flash ener&amp;gy:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editFlashEnergy</cstring>
            </property>
           </widget>
          </item>
          <item row="5" column="1">
           <widget class="QLineEdit" name="editFlashEnergy"/>
          </item>
          <item row="6" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>91</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_5">
       <attribute name="title">
        <string>Postprocessing</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
             <string>&amp;Gain control:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editGainControl</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="editGainControl">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>1</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string>None</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Low gain up</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>High gain up</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Low gain down</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>High gain down</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_15">
            <property name="text">
             <string>L&amp;ight source:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editLightSource</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="editLightSource">
            <item>
             <property name="text">
              <string>Unknown</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Daylight</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Fluorescent</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Tungsten</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Flash</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Fine weather</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Cloudy weather</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Shade</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Daylight fluorescent (D5700 - 7100K)</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Day white fluorescent (N4600 - 5400K)</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Cool white fluorescent (W3900 - 4500K)</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>White fluorescent (WW 3200 - 3700K)</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Undefined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Standard light A</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Standard light B</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Standard light C</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>D55</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>D65</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>D75</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>D50</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>ISO studio tungsten</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>other</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_18">
            <property name="text">
             <string>Sharpness:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editSharpness</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QComboBox" name="editSharpness">
            <item>
             <property name="text">
              <string>Normal</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Soft</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Hard</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_20">
            <property name="text">
             <string>Contrast:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editContrast</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QComboBox" name="editContrast">
            <item>
             <property name="text">
              <string>Normal</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Soft</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Hard</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_28">
            <property name="text">
             <string>White &amp;balance:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editWhiteBalance</cstring>
            </property>
           </widget>
          </item>
          <item row="4" column="1">
           <widget class="QComboBox" name="editWhiteBalance">
            <item>
             <property name="text">
              <string>Auto</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Custom</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="5" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>91</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
        <string>Misc</string>
       </attribute>
       <layout class="QHBoxLayout">
        <item>
         <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Scene capture t&amp;ype:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editSceneCaptureType</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QComboBox" name="editSceneCaptureType">
            <item>
             <property name="text">
              <string>Standard</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Landscape</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Portrait</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Night scene</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_19">
            <property name="text">
             <string>Ma&amp;ker:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editMake</cstring>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QLineEdit" name="editMake"/>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_26">
            <property name="text">
             <string>Model:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editModel</cstring>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QLineEdit" name="editModel"/>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_27">
            <property name="text">
             <string>Sens&amp;ing method type:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="buddy">
             <cstring>editSensingMethod</cstring>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QComboBox" name="editSensingMethod">
            <item>
             <property name="text">
              <string>Not Defined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Not Defined</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>One-chip color area sensor</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Two-chip color area sensor</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Three-chip color area sensor</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Color sequential area sensor</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Trilinear sensor</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Color sequential linear sensor</string>
             </property>
            </item>
           </widget>
          </item>
          <item row="4" column="0" colspan="2">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>517</width>
              <height>71</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/modify_selection/wdg_border_selection.ui b/plugins/extensions/modify_selection/wdg_border_selection.ui
index 4163622c58..f53f94bd8e 100644
--- a/plugins/extensions/modify_selection/wdg_border_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_border_selection.ui
@@ -1,136 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgBorderSelection</class>
  <widget class="QWidget" name="WdgBorderSelection">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>364</width>
     <height>89</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="spbWidth">
      <property name="minimum">
       <number>1</number>
      </property>
      <property name="maximum">
       <number>100000</number>
      </property>
      <property name="value">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisDoubleParseSpinBox" name="spbWidthDouble">
      <property name="decimals">
       <number>4</number>
      </property>
      <property name="minimum">
       <double>0.000100000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="5">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="lblWidth">
      <property name="text">
       <string>Border width:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="1" column="4">
     <widget class="QComboBox" name="cmbUnit"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/modify_selection/wdg_feather_selection.ui b/plugins/extensions/modify_selection/wdg_feather_selection.ui
index 42e2d73321..57f044f5c6 100644
--- a/plugins/extensions/modify_selection/wdg_feather_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_feather_selection.ui
@@ -1,144 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgFeatherSelection</class>
  <widget class="QWidget" name="WdgFeatherSelection">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>372</width>
     <height>89</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="1">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Feather radius:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="spbRadius">
      <property name="minimum">
       <number>1</number>
      </property>
      <property name="maximum">
       <number>100000</number>
      </property>
      <property name="value">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisDoubleParseSpinBox" name="spbRadiusDouble">
      <property name="decimals">
       <number>4</number>
      </property>
      <property name="minimum">
       <double>0.000100000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
      <property name="value">
       <double>5.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="4">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="3">
     <widget class="QComboBox" name="cmbUnit"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spbRadius</tabstop>
   <tabstop>spbRadiusDouble</tabstop>
   <tabstop>cmbUnit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/modify_selection/wdg_grow_selection.ui b/plugins/extensions/modify_selection/wdg_grow_selection.ui
index cb034228b6..b97777f2e3 100644
--- a/plugins/extensions/modify_selection/wdg_grow_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_grow_selection.ui
@@ -1,141 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgGrowSelection</class>
  <widget class="QWidget" name="WdgGrowSelection">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>327</width>
     <height>89</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="3">
     <widget class="QComboBox" name="cmbUnit"/>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Grow by</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="spbGrowValue">
      <property name="minimum">
       <number>1</number>
      </property>
      <property name="maximum">
       <number>100000</number>
      </property>
      <property name="value">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisDoubleParseSpinBox" name="spbGrowValueDouble">
      <property name="decimals">
       <number>4</number>
      </property>
      <property name="minimum">
       <double>0.000100000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="4">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spbGrowValue</tabstop>
   <tabstop>spbGrowValueDouble</tabstop>
   <tabstop>cmbUnit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/modify_selection/wdg_shrink_selection.ui b/plugins/extensions/modify_selection/wdg_shrink_selection.ui
index fd3c072e7f..b6a4707d1a 100644
--- a/plugins/extensions/modify_selection/wdg_shrink_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_shrink_selection.ui
@@ -1,152 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgShrinkSelection</class>
  <widget class="QWidget" name="WdgShrinkSelection">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>334</width>
     <height>117</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="3">
     <widget class="QComboBox" name="cmbUnit"/>
    </item>
    <item row="0" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="spbShrinkValue">
      <property name="minimum">
       <number>1</number>
      </property>
      <property name="maximum">
       <number>100000</number>
      </property>
      <property name="value">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisDoubleParseSpinBox" name="spbShrinkValueDouble">
      <property name="decimals">
       <number>4</number>
      </property>
      <property name="minimum">
       <double>0.000100000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Shrink by</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="3" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="4">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="2" column="2" colspan="3">
     <widget class="QCheckBox" name="ckbShrinkFromImageBorder">
      <property name="text">
       <string>Shrink from image border</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spbShrinkValue</tabstop>
   <tabstop>spbShrinkValueDouble</tabstop>
   <tabstop>cmbUnit</tabstop>
   <tabstop>ckbShrinkFromImageBorder</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/offsetimage/wdg_offsetimage.ui b/plugins/extensions/offsetimage/wdg_offsetimage.ui
index d96433b3ef..dbcf84b6bd 100644
--- a/plugins/extensions/offsetimage/wdg_offsetimage.ui
+++ b/plugins/extensions/offsetimage/wdg_offsetimage.ui
@@ -1,126 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgOffsetImage</class>
  <widget class="QWidget" name="WdgOffsetImage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>203</width>
     <height>157</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rotate Image</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="grpAngle">
      <property name="title">
       <string>Offset</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
        <layout class="QHBoxLayout" name="offsetRowX" stretch="0,1">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="xLabel">
           <property name="text">
            <string>X:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="offsetXspinBox">
           <property name="suffix">
            <string> px</string>
           </property>
           <property name="maximum">
            <number>999999999</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QHBoxLayout" name="offsetRowY" stretch="0,1">
         <item>
          <widget class="QLabel" name="yLabel">
           <property name="text">
            <string>Y:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisIntParseSpinBox" name="offsetYspinBox">
           <property name="suffix">
            <string> px</string>
           </property>
           <property name="maximum">
            <number>999999999</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QPushButton" name="middleOffsetBtn">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Offset by x/2, y/2</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <spacer name="spacer4">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Minimum</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/rotateimage/wdg_rotateimage.ui b/plugins/extensions/rotateimage/wdg_rotateimage.ui
index edab67c09e..4d6f38abbc 100644
--- a/plugins/extensions/rotateimage/wdg_rotateimage.ui
+++ b/plugins/extensions/rotateimage/wdg_rotateimage.ui
@@ -1,136 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgRotateImage</class>
  <widget class="QWidget" name="WdgRotateImage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>489</width>
     <height>447</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rotate Image</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="grpDirection">
      <property name="title">
       <string>Orientation</string>
      </property>
      <layout class="QGridLayout">
       <item row="0" column="1">
        <widget class="QRadioButton" name="radioCW">
         <property name="text">
          <string>&amp;Right</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QRadioButton" name="radioCCW">
         <property name="text">
          <string>&amp;Left</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="grpAngle">
      <property name="title">
       <string>Angle</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
        <widget class="QRadioButton" name="radio90">
         <property name="text">
          <string>90 &amp;degrees</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="radio180">
         <property name="text">
          <string>&amp;180 degrees</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="radio270">
         <property name="text">
          <string>270 de&amp;grees</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="QRadioButton" name="radioCustom">
           <property name="text">
            <string>&amp;Custom:</string>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KisDoubleParseSpinBox" name="doubleCustom">
           <property name="maximum">
            <double>360.000000000000000</double>
           </property>
           <property name="singleStep">
            <double>1.000000000000000</double>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item row="2" column="0">
     <spacer name="spacer4">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>91</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/extensions/shearimage/wdg_shearimage.ui b/plugins/extensions/shearimage/wdg_shearimage.ui
index f6ecbca2be..0ae5c5c422 100644
--- a/plugins/extensions/shearimage/wdg_shearimage.ui
+++ b/plugins/extensions/shearimage/wdg_shearimage.ui
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgShearImage</class>
  <widget class="QWidget" name="WdgShearImage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>323</width>
     <height>78</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Shear Image</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="lblShearAngleX">
      <property name="text">
       <string>Shear angle X:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="shearAngleX">
      <property name="suffix">
       <string>°</string>
      </property>
      <property name="minimum">
       <number>-45</number>
      </property>
      <property name="maximum">
       <number>45</number>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="lblShearAngelY">
      <property name="text">
       <string>Shear angle Y:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisIntParseSpinBox" name="shearAngleY">
      <property name="maximumSize">
       <size>
        <width>32767</width>
        <height>100</height>
       </size>
      </property>
      <property name="suffix">
       <string>°</string>
      </property>
      <property name="minimum">
       <number>-45</number>
      </property>
      <property name="maximum">
       <number>45</number>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/blur/wdg_lens_blur.ui b/plugins/filters/blur/wdg_lens_blur.ui
index 8333420597..dddf13e920 100644
--- a/plugins/filters/blur/wdg_lens_blur.ui
+++ b/plugins/filters/blur/wdg_lens_blur.ui
@@ -1,163 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgLensBlur</class>
  <widget class="QWidget" name="WdgLensBlur">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>255</width>
     <height>153</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Iris</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Shape:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="irisShapeCombo">
         <item>
          <property name="text">
           <string>Triangle</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Quadrilateral (4)</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Pentagon (5)</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Hexagon (6)</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Heptagon (7)</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Octagon (8)</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Radius:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KisIntParseSpinBox" name="irisRadiusSlider">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>256</number>
         </property>
         <property name="label" stdset="0">
          <string>Radius:</string>
         </property>
         <property name="sliderEnabled" stdset="0">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Rotation:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KisIntParseSpinBox" name="irisRotationSlider">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="suffix">
          <string>°</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>360</number>
         </property>
         <property name="label" stdset="0">
          <string>Rotation:</string>
         </property>
         <property name="sliderEnabled" stdset="0">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>18</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>irisShapeCombo</tabstop>
   <tabstop>irisRadiusSlider</tabstop>
   <tabstop>irisRotationSlider</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/blur/wdg_motion_blur.ui b/plugins/filters/blur/wdg_motion_blur.ui
index 099c0cad6c..5a31c8e4fa 100644
--- a/plugins/filters/blur/wdg_motion_blur.ui
+++ b/plugins/filters/blur/wdg_motion_blur.ui
@@ -1,166 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgMotionBlur</class>
  <widget class="QWidget" name="WdgMotionBlur">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>245</width>
     <height>256</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QDial" name="blurAngleDial">
        <property name="minimumSize">
         <size>
          <width>100</width>
          <height>100</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>100</width>
          <height>100</height>
         </size>
        </property>
        <property name="maximum">
         <number>360</number>
        </property>
        <property name="value">
         <number>274</number>
        </property>
        <property name="sliderPosition">
         <number>274</number>
        </property>
        <property name="invertedAppearance">
         <bool>false</bool>
        </property>
        <property name="wrapping">
         <bool>true</bool>
        </property>
        <property name="notchesVisible">
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Angle:</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KisIntParseSpinBox" name="blurAngleSlider">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="focusPolicy">
         <enum>Qt::StrongFocus</enum>
        </property>
        <property name="suffix">
         <string>°</string>
        </property>
        <property name="minimum">
         <number>0</number>
        </property>
        <property name="maximum">
         <number>360</number>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Length:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="KisIntParseSpinBox" name="blurLength">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimum">
         <number>0</number>
        </property>
        <property name="maximum">
         <number>256</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>18</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>blurAngleDial</tabstop>
   <tabstop>blurAngleSlider</tabstop>
   <tabstop>blurLength</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/blur/wdgblur.ui b/plugins/filters/blur/wdgblur.ui
index 7d3a0a6e1c..85f18312a5 100644
--- a/plugins/filters/blur/wdgblur.ui
+++ b/plugins/filters/blur/wdgblur.ui
@@ -1,215 +1,215 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgBlur</class>
  <widget class="QWidget" name="WdgBlur">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>280</width>
     <height>178</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Horizontal Radius:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="intHalfWidth">
      <property name="suffix">
       <string> px</string>
      </property>
     </widget>
    </item>
    <item row="0" column="3" rowspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="textLabel2">
      <property name="text">
       <string>Vertical Radius:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisIntParseSpinBox" name="intHalfHeight">
      <property name="suffix">
       <string> px</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="textLabel3">
      <property name="text">
       <string>Strength:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KisIntParseSpinBox" name="intStrength">
      <property name="maximum">
       <number>100</number>
      </property>
      <property name="value">
       <number>100</number>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="textLabel5">
      <property name="toolTip">
       <string/>
      </property>
      <property name="text">
       <string>Angle:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KisIntParseSpinBox" name="intAngle">
      <property name="suffix">
       <string>°</string>
      </property>
      <property name="maximum">
       <number>360</number>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="textLabel4">
      <property name="text">
       <string>Shape:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="KComboBox" name="cbShape">
      <item>
       <property name="text">
        <string>Circle</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Rectangle</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="4" column="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="5" column="0" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="2" rowspan="2">
     <widget class="KoAspectButton" name="aspectButton" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/colorsfilters/wdg_color_balance.ui b/plugins/filters/colorsfilters/wdg_color_balance.ui
index f8e80165f9..0f93f79c80 100644
--- a/plugins/filters/colorsfilters/wdg_color_balance.ui
+++ b/plugins/filters/colorsfilters/wdg_color_balance.ui
@@ -1,772 +1,772 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Form</class>
  <widget class="QWidget" name="Form">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>381</width>
     <height>458</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>3</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="topMargin">
       <number>0</number>
      </property>
      <item>
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="font">
         <font>
          <pointsize>11</pointsize>
          <weight>75</weight>
          <italic>true</italic>
          <bold>true</bold>
         </font>
        </property>
        <property name="text">
         <string>Shadows</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>1</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="pushResetShadows">
        <property name="text">
         <string>Reset Shadows  </string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <property name="verticalSpacing">
       <number>3</number>
      </property>
      <item row="0" column="2">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Red    </string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Magenta</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QSlider" name="yellowBlueShadowsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Green</string>
        </property>
       </widget>
      </item>
      <item row="1" column="3">
       <widget class="KisIntParseSpinBox" name="magentaGreenShadowsSpinbox"/>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_9">
        <property name="text">
         <string>Yellow</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <widget class="QLabel" name="label_8">
        <property name="text">
         <string>Blue  </string>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QSlider" name="magentaGreenShadowsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Cyan</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QSlider" name="cyanRedShadowsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="2" column="3">
       <widget class="KisIntParseSpinBox" name="yellowBlueShadowsSpinbox"/>
      </item>
      <item row="0" column="3">
       <widget class="KisIntParseSpinBox" name="cyanRedShadowsSpinbox"/>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <property name="topMargin">
       <number>18</number>
      </property>
      <item>
       <widget class="QLabel" name="label_2">
        <property name="font">
         <font>
          <pointsize>11</pointsize>
          <weight>75</weight>
          <italic>true</italic>
          <bold>true</bold>
         </font>
        </property>
        <property name="text">
         <string>Midtones</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="pushResetMidtones">
        <property name="text">
         <string>Reset Midtones  </string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_2">
      <property name="verticalSpacing">
       <number>3</number>
      </property>
      <item row="0" column="3">
       <widget class="KisIntParseSpinBox" name="cyanRedMidtonesSpinbox"/>
      </item>
      <item row="2" column="3">
       <widget class="KisIntParseSpinBox" name="yellowBlueMidtonesSpinbox"/>
      </item>
      <item row="1" column="3">
       <widget class="KisIntParseSpinBox" name="magentaGreenMidtonesSpinbox"/>
      </item>
      <item row="0" column="1">
       <widget class="QSlider" name="cyanRedMidtonesSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="QLabel" name="label_20">
        <property name="text">
         <string>Green</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QSlider" name="yellowBlueMidtonesSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label_17">
        <property name="text">
         <string>Cyan</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QSlider" name="magentaGreenMidtonesSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="QLabel" name="label_18">
        <property name="text">
         <string>Red    </string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_19">
        <property name="text">
         <string>Magenta</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_21">
        <property name="text">
         <string>Yellow</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <widget class="QLabel" name="label_22">
        <property name="text">
         <string>Blue  </string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <property name="topMargin">
       <number>18</number>
      </property>
      <item>
       <widget class="QLabel" name="label_16">
        <property name="font">
         <font>
          <pointsize>11</pointsize>
          <weight>75</weight>
          <italic>true</italic>
          <bold>true</bold>
         </font>
        </property>
        <property name="text">
         <string>Highlights</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="pushResetHighlights">
        <property name="text">
         <string>Reset Highlights</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_3">
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="verticalSpacing">
       <number>3</number>
      </property>
      <item row="2" column="2">
       <widget class="QLabel" name="label_15">
        <property name="text">
         <string>Blue</string>
        </property>
       </widget>
      </item>
      <item row="0" column="3">
       <widget class="KisIntParseSpinBox" name="cyanRedHighlightsSpinbox"/>
      </item>
      <item row="3" column="0" colspan="2">
       <widget class="QCheckBox" name="chkPreserveLuminosity">
        <property name="text">
         <string>Preserve Luminosity</string>
        </property>
       </widget>
      </item>
      <item row="1" column="3">
       <widget class="KisIntParseSpinBox" name="magentaGreenHighlightsSpinbox"/>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label_10">
        <property name="text">
         <string>Cyan</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_14">
        <property name="text">
         <string>Yellow</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QSlider" name="magentaGreenHighlightsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="QLabel" name="label_11">
        <property name="text">
         <string>Red    </string>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="QLabel" name="label_13">
        <property name="text">
         <string>Green</string>
        </property>
       </widget>
      </item>
      <item row="2" column="3">
       <widget class="KisIntParseSpinBox" name="yellowBlueHighlightsSpinbox"/>
      </item>
      <item row="0" column="1">
       <widget class="QSlider" name="cyanRedHighlightsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QSlider" name="yellowBlueHighlightsSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_12">
        <property name="text">
         <string>Magenta</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>cyanRedShadowsSpinbox</tabstop>
   <tabstop>magentaGreenShadowsSpinbox</tabstop>
   <tabstop>yellowBlueShadowsSpinbox</tabstop>
   <tabstop>cyanRedMidtonesSpinbox</tabstop>
   <tabstop>magentaGreenMidtonesSpinbox</tabstop>
   <tabstop>yellowBlueMidtonesSpinbox</tabstop>
   <tabstop>cyanRedHighlightsSpinbox</tabstop>
   <tabstop>magentaGreenHighlightsSpinbox</tabstop>
   <tabstop>yellowBlueHighlightsSpinbox</tabstop>
   <tabstop>chkPreserveLuminosity</tabstop>
   <tabstop>cyanRedShadowsSlider</tabstop>
   <tabstop>magentaGreenShadowsSlider</tabstop>
   <tabstop>yellowBlueShadowsSlider</tabstop>
   <tabstop>cyanRedMidtonesSlider</tabstop>
   <tabstop>magentaGreenMidtonesSlider</tabstop>
   <tabstop>yellowBlueMidtonesSlider</tabstop>
   <tabstop>cyanRedHighlightsSlider</tabstop>
   <tabstop>magentaGreenHighlightsSlider</tabstop>
   <tabstop>yellowBlueHighlightsSlider</tabstop>
   <tabstop>pushResetShadows</tabstop>
   <tabstop>pushResetMidtones</tabstop>
   <tabstop>pushResetHighlights</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>cyanRedShadowsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedShadowsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>47</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>39</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenShadowsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenShadowsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>76</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>68</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueShadowsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueShadowsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>175</x>
      <y>105</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>97</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cyanRedMidtonesSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedMidtonesSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>185</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>185</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenMidtonesSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenMidtonesSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>214</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>214</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueMidtonesSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueMidtonesSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>175</x>
      <y>243</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>243</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cyanRedHighlightsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedHighlightsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>323</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>323</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenHighlightsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenHighlightsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>352</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>352</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueHighlightsSlider</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueHighlightsSpinbox</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>175</x>
      <y>381</y>
     </hint>
     <hint type="destinationlabel">
      <x>351</x>
      <y>381</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cyanRedMidtonesSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedMidtonesSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>185</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>185</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenMidtonesSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenMidtonesSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>214</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>214</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueMidtonesSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueMidtonesSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>243</y>
     </hint>
     <hint type="destinationlabel">
      <x>175</x>
      <y>243</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueShadowsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueShadowsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>97</y>
     </hint>
     <hint type="destinationlabel">
      <x>175</x>
      <y>103</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenShadowsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenShadowsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>68</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>74</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cyanRedShadowsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedShadowsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>39</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>46</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>cyanRedHighlightsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>cyanRedHighlightsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>323</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>323</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>magentaGreenHighlightsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>magentaGreenHighlightsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>352</y>
     </hint>
     <hint type="destinationlabel">
      <x>173</x>
      <y>352</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>yellowBlueHighlightsSpinbox</sender>
    <signal>valueChanged(int)</signal>
    <receiver>yellowBlueHighlightsSlider</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>351</x>
      <y>381</y>
     </hint>
     <hint type="destinationlabel">
      <x>175</x>
      <y>381</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui b/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
index 3e1bb7d8a1..4c02b1243e 100644
--- a/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
+++ b/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
@@ -1,235 +1,235 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgHSVAdjustment</class>
  <widget class="QWidget" name="WdgHSVAdjustment">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>406</width>
     <height>188</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="verticalSpacing">
     <number>5</number>
    </property>
    <item row="13" column="0" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QLabel" name="lblType">
      <property name="text">
       <string>&amp;Type:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>cmbType</cstring>
      </property>
     </widget>
    </item>
    <item row="9" column="1">
     <widget class="QCheckBox" name="chkColorize">
      <property name="text">
       <string>&amp;Colorize</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="cmbType">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <item>
       <property name="text">
        <string>Hue/Saturation/Value</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Hue/Saturation/Lightness</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Hue/Saturation/Intensity</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Hue/Saturation/Luma</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Blue Chroma/Red Chroma/Luma</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QSlider" name="hueSlider">
      <property name="minimum">
       <number>-180</number>
      </property>
      <property name="maximum">
       <number>180</number>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item row="4" column="2">
     <widget class="KisIntParseSpinBox" name="saturationSpinBox">
      <property name="maximum">
       <number>100</number>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Value:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QSlider" name="saturationSlider">
      <property name="minimum">
       <number>0</number>
      </property>
      <property name="maximum">
       <number>100</number>
      </property>
      <property name="value">
       <number>50</number>
      </property>
      <property name="tracking">
       <bool>true</bool>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="invertedAppearance">
       <bool>false</bool>
      </property>
      <property name="invertedControls">
       <bool>false</bool>
      </property>
      <property name="tickPosition">
       <enum>QSlider::NoTicks</enum>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>&amp;Saturation:</string>
      </property>
      <property name="scaledContents">
       <bool>false</bool>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>&amp;Hue:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QSlider" name="valueSlider">
      <property name="minimum">
       <number>-100</number>
      </property>
      <property name="maximum">
       <number>100</number>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item row="5" column="2">
     <widget class="KisIntParseSpinBox" name="valueSpinBox">
      <property name="minimum">
       <number>-100</number>
      </property>
      <property name="maximum">
       <number>100</number>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
     <widget class="KisIntParseSpinBox" name="hueSpinBox">
      <property name="minimum">
       <number>-180</number>
      </property>
      <property name="maximum">
       <number>180</number>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>cmbType</tabstop>
   <tabstop>chkColorize</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/colorsfilters/wdg_perchannel.ui b/plugins/filters/colorsfilters/wdg_perchannel.ui
index 89ddccab02..f53aa0fd38 100644
--- a/plugins/filters/colorsfilters/wdg_perchannel.ui
+++ b/plugins/filters/colorsfilters/wdg_perchannel.ui
@@ -1,338 +1,338 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgPerChannel</class>
  <widget class="QWidget" name="WdgPerChannel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>317</width>
     <height>396</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>BrightnessCon</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="horizontalSpacing">
     <number>0</number>
    </property>
    <property name="verticalSpacing">
     <number>6</number>
    </property>
    <item row="3" column="1" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>9</width>
        <height>9</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="1" colspan="2">
     <layout class="QGridLayout" name="grid2">
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      <property name="spacing">
       <number>0</number>
      </property>
      <item row="0" column="1">
       <widget class="QFrame" name="frame3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>256</width>
          <height>256</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>256</width>
          <height>256</height>
         </size>
        </property>
        <property name="frameShape">
         <enum>QFrame::Panel</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QVBoxLayout">
         <property name="spacing">
          <number>0</number>
         </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="KisCurveWidget" name="curveWidget" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>256</width>
             <height>256</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>256</width>
             <height>256</height>
            </size>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLabel" name="hgradient">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>256</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>256</width>
          <height>20</height>
         </size>
        </property>
        <property name="frameShape">
         <enum>QFrame::Panel</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Sunken</enum>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="vgradient">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>20</width>
          <height>256</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>20</width>
          <height>256</height>
         </size>
        </property>
        <property name="frameShape">
         <enum>QFrame::Panel</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Sunken</enum>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="0" column="1" colspan="2">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="textLabel1">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Channel:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="cmbChannel"/>
      </item>
     </layout>
    </item>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>1</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="2" column="1" colspan="2">
     <layout class="QGridLayout" name="gridLayout">
      <item row="2" column="1">
       <widget class="KisIntParseSpinBox" name="intOut">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
       <spacer name="horizontalSpacer_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="labelOut">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Output:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KisIntParseSpinBox" name="intIn">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="labelIn">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Input:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="1" column="3">
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>1</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisCurveWidget</class>
    <extends></extends>
    <header>widgets/kis_curve_widget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>cmbChannel</tabstop>
   <tabstop>intIn</tabstop>
   <tabstop>intOut</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/indexcolors/kiswdgindexcolors.cpp b/plugins/filters/indexcolors/kiswdgindexcolors.cpp
index 35d02086b3..072323c611 100644
--- a/plugins/filters/indexcolors/kiswdgindexcolors.cpp
+++ b/plugins/filters/indexcolors/kiswdgindexcolors.cpp
@@ -1,190 +1,190 @@
 /*
  * Copyright 2014 Manuel Riecke <spell1337@gmail.com>
  *
  * Permission to use, copy, modify, and distribute this software
  * and its documentation for any purpose and without fee is hereby
  * granted, provided that the above copyright notice appear in all
  * copies and that both that the copyright notice and this
  * permission notice and warranty disclaimer appear in supporting
  * documentation, and that the name of the author not be used in
  * advertising or publicity pertaining to distribution of the
  * software without specific, written prior permission.
  *
  * The author disclaim all warranties with regard to this
  * software, including all implied warranties of merchantability
  * and fitness.  In no event shall the author be liable for any
  * special, indirect or consequential damages or any damages
  * whatsoever resulting from loss of use, data or profits, whether
  * in an action of contract, negligence or other tortious action,
  * arising out of or in connection with the use or performance of
  * this software.
  */
 
 #include "filter/kis_color_transformation_configuration.h"
 
 #include "kiswdgindexcolors.h"
 #include "palettegeneratorconfig.h"
 #include "ui_kiswdgindexcolors.h"
 
-#include "kis_intparsespinbox.h"
+#include "kis_int_parse_spin_box.h"
 
 #include <kcolorbutton.h>
 
 KisWdgIndexColors::KisWdgIndexColors(QWidget* parent, Qt::WFlags f, int delay): KisConfigWidget(parent, f, delay)
 {
     ui = new Ui::KisWdgIndexColors;
     ui->setupUi(this);
 
     connect(ui->diagCheck,  SIGNAL(toggled(bool)), SIGNAL(sigConfigurationItemChanged()));
     connect(ui->inbetweenSpinBox, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
     connect(ui->alphaStepsSpinBox, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
 
     connect(ui->colorLimit, SIGNAL(valueChanged(int)), SLOT(slotColorLimitChanged(int)));
     connect(ui->colorLimit, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
 
     connect(ui->colorLimitCheck, SIGNAL(toggled(bool)), SIGNAL(sigConfigurationItemChanged()));
 
     connect(ui->luminanceSlider, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
     connect(ui->aSlider, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
     connect(ui->bSlider, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
 }
 
 void KisWdgIndexColors::slotColorLimitChanged(int value)
 {
     ui->colorLimit->setSuffix(i18ncp("suffix for a spinbox",
                                      " color", " colors", value));
 }
 
 void KisWdgIndexColors::setup(QStringList shadesLabels, int ramps)
 {
     int rows     = shadesLabels.length();
     int collumns = ramps;
 
     m_colorSelectors.resize(rows);
     m_stepSpinners.resize(rows-1);
     // Labels for the shades
     for(int row = 0; row < rows; ++row)
     {
         QLabel* l = new QLabel(shadesLabels[row], ui->colorsBox);
         ui->layoutColors->addWidget(l, row+1, 0);
         m_colorSelectors[row].resize(collumns);
     }
     // Labels for the ramps
     /*for(int col = 0; col < collumns; ++col)
     {
     	QLabel* l = new QLabel(rampsLabels[col], ui->colorsBox);
     	l->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     	ui->layoutColors->addWidget(l, 0, col+1);
     }*/
     // Step selectors for the shade gradients
     for(int row = 0; row < (rows-1); ++row)
     {
         QLabel* l0 = new QLabel(shadesLabels[row+1]);
         QLabel* l1 = new QLabel(QString::fromUtf8("↔"));
         QLabel* l2 = new QLabel(shadesLabels[row]);
 
 		QSpinBox* s = new KisIntParseSpinBox();
         s->setMinimum(0);
         s->setMaximum(32);
         s->setValue(2);
 
         connect(s, SIGNAL(valueChanged(int)), this, SIGNAL(sigConfigurationItemChanged()));
         m_stepSpinners[row] = s;
 
         ui->layoutRowSteps->addWidget(l0, row, 0);
         ui->layoutRowSteps->addWidget(l1, row, 1);
         ui->layoutRowSteps->addWidget(l2, row, 2);
         ui->layoutRowSteps->addWidget(s,  row, 3);
     }
     // Color selectors
     for(int y = 0; y < rows; ++y)
         for(int x = 0; x < collumns; ++x)
         {
             KColorButton* b = new KColorButton;
             QCheckBox* c = new QCheckBox;
             c->setChecked(false);
             b->setEnabled(false);
             b->setMaximumWidth(50);
             c->setMaximumWidth(21); // Ugh. I hope this won't be causing any issues. Trying to get rid of the unnecessary spacing after it.
 
             connect(c, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool)));
             connect(c, SIGNAL(toggled(bool)), this, SIGNAL(sigConfigurationItemChanged()));
             connect(b, SIGNAL(changed(QColor)), this, SIGNAL(sigConfigurationItemChanged()));
 
             QHBoxLayout* cell = new QHBoxLayout();
             cell->setSpacing(0);
             cell->setContentsMargins(0, 0, 0, 0);
             cell->addWidget(c);
             cell->addWidget(b);
             ui->layoutColors->addLayout(cell, 1+y, 1+x);
 
             m_colorSelectors[y][x].button = b;
             m_colorSelectors[y][x].checkbox = c;
         }
 }
 
 
 KisPropertiesConfiguration* KisWdgIndexColors::configuration() const
 {
     KisColorTransformationConfiguration* config = new KisColorTransformationConfiguration("indexcolors", 1);
 
     PaletteGeneratorConfig palCfg;
 
     for(int y = 0; y < 4; ++y)
         for(int x = 0; x < 4; ++x)
         {
             palCfg.colors[y][x] = m_colorSelectors[y][x].button->color();
             palCfg.colorsEnabled[y][x] = m_colorSelectors[y][x].button->isEnabled();
         }
 
     for(int y = 0; y < 3; ++y)
         palCfg.gradientSteps[y] = m_stepSpinners[y]->value();
 
     palCfg.diagonalGradients = ui->diagCheck->isChecked();
     palCfg.inbetweenRampSteps = ui->inbetweenSpinBox->value();
     
     IndexColorPalette pal = palCfg.generate();
     ui->colorCount->setText(QString::number(pal.numColors()));
 
     config->setProperty("paletteGen", palCfg.toByteArray());
 
     config->setProperty("LFactor",   ui->luminanceSlider->value() / 100.f);
     config->setProperty("aFactor",   ui->aSlider->value() / 100.f);
     config->setProperty("bFactor",   ui->bSlider->value() / 100.f);
     
     config->setProperty("reduceColorsEnabled", ui->colorLimitCheck->isChecked());
     config->setProperty("colorLimit", ui->colorLimit->value());
 
     config->setProperty("alphaSteps", ui->alphaStepsSpinBox->value());
     return config;
 }
 
 void KisWdgIndexColors::setConfiguration(const KisPropertiesConfiguration* config)
 {
     PaletteGeneratorConfig palCfg;
     palCfg.fromByteArray(config->getProperty("paletteGen").toByteArray());
     
     ui->luminanceSlider->setValue(config->getFloat("LFactor")*100);
     ui->aSlider->setValue(config->getFloat("aFactor")*100);
     ui->bSlider->setValue(config->getFloat("bFactor")*100);
     ui->alphaStepsSpinBox->setValue(config->getInt("alphaSteps"));
     ui->colorLimitCheck->setChecked(config->getBool("reduceColorsEnabled"));
     ui->colorLimit->setEnabled(config->getBool("reduceColorsEnabled"));
     ui->colorLimit->setValue(config->getInt("colorLimit"));
     ui->diagCheck->setChecked(palCfg.diagonalGradients);
     ui->inbetweenSpinBox->setValue(palCfg.inbetweenRampSteps);
 
     for(int y = 0; y < 4; ++y)
         for(int x = 0; x < 4; ++x)
         {
             m_colorSelectors[y][x].checkbox->setChecked(palCfg.colorsEnabled[y][x]);
             m_colorSelectors[y][x].button->setEnabled(palCfg.colorsEnabled[y][x]);
             m_colorSelectors[y][x].button->setColor(palCfg.colors[y][x]);
         }
 
     for(int y = 0; y < 3; ++y)
         m_stepSpinners[y]->setValue(palCfg.gradientSteps[y]);
     
     IndexColorPalette pal = palCfg.generate();
     ui->colorCount->setText(QString::number(pal.numColors()));
 }
diff --git a/plugins/filters/indexcolors/kiswdgindexcolors.ui b/plugins/filters/indexcolors/kiswdgindexcolors.ui
index ebe3b0c145..b467fa3b77 100644
--- a/plugins/filters/indexcolors/kiswdgindexcolors.ui
+++ b/plugins/filters/indexcolors/kiswdgindexcolors.ui
@@ -1,350 +1,350 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KisWdgIndexColors</class>
  <widget class="QWidget" name="KisWdgIndexColors">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>383</width>
     <height>601</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Ramps</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="1" column="0">
        <widget class="QWidget" name="colorsBox" native="true">
         <property name="minimumSize">
          <size>
           <width>20</width>
           <height>20</height>
          </size>
         </property>
         <layout class="QGridLayout" name="layoutColors">
          <property name="sizeConstraint">
           <enum>QLayout::SetMinimumSize</enum>
          </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <property name="horizontalSpacing">
           <number>6</number>
          </property>
         </layout>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="diagCheck">
         <property name="text">
          <string>Diagonal Gradients</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QGroupBox" name="gradientStepsBox">
      <property name="title">
       <string>Gradient Steps</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="layoutGradientSteps">
       <item row="3" column="0">
        <widget class="QCheckBox" name="colorLimitCheck">
         <property name="text">
          <string>Limit to</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="KisIntParseSpinBox" name="colorLimit">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="minimum">
          <number>3</number>
         </property>
         <property name="maximum">
          <number>256</number>
         </property>
         <property name="value">
          <number>31</number>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KisIntParseSpinBox" name="inbetweenSpinBox">
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>8</number>
         </property>
         <property name="value">
          <number>0</number>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>In-between ramps</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2">
        <layout class="QGridLayout" name="layoutRowSteps">
         <property name="sizeConstraint">
          <enum>QLayout::SetMinimumSize</enum>
         </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
        </layout>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Color count:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="colorCount">
         <property name="text">
          <string>0</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QGroupBox" name="indexingBox">
      <property name="title">
       <string>Indexing Factors</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>L*</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QSlider" name="luminanceSlider">
         <property name="minimumSize">
          <size>
           <width>125</width>
           <height>0</height>
          </size>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>200</number>
         </property>
         <property name="value">
          <number>100</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::TicksAbove</enum>
         </property>
         <property name="tickInterval">
          <number>50</number>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>a*</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QSlider" name="aSlider">
         <property name="minimumSize">
          <size>
           <width>125</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximum">
          <number>200</number>
         </property>
         <property name="value">
          <number>100</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::TicksAbove</enum>
         </property>
         <property name="tickInterval">
          <number>50</number>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>b*</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QSlider" name="bSlider">
         <property name="minimumSize">
          <size>
           <width>125</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximum">
          <number>200</number>
         </property>
         <property name="value">
          <number>100</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="tickPosition">
          <enum>QSlider::TicksAbove</enum>
         </property>
         <property name="tickInterval">
          <number>50</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QGroupBox" name="otherBox">
      <property name="title">
       <string>Other</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Alpha Steps</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KisIntParseSpinBox" name="alphaStepsSpinBox">
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>32</number>
         </property>
         <property name="value">
          <number>1</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>colorLimitCheck</sender>
    <signal>toggled(bool)</signal>
    <receiver>colorLimit</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>79</x>
      <y>281</y>
     </hint>
     <hint type="destinationlabel">
      <x>158</x>
      <y>285</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/filters/levelfilter/wdg_level.ui b/plugins/filters/levelfilter/wdg_level.ui
index e63b1a59fc..6661c6655c 100644
--- a/plugins/filters/levelfilter/wdg_level.ui
+++ b/plugins/filters/levelfilter/wdg_level.ui
@@ -1,341 +1,341 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgLevel</class>
  <widget class="QWidget" name="WdgLevel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>259</width>
     <height>332</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>600</width>
     <height>32767</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Levels</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="textLabel2">
        <property name="text">
         <string>&lt;b&gt;Input Levels&lt;/b&gt;</string>
        </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QCheckBox" name="chkLogarithmic">
        <property name="layoutDirection">
         <enum>Qt::RightToLeft</enum>
        </property>
        <property name="text">
         <string>Logarithmic</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <property name="spacing">
       <number>0</number>
      </property>
      <property name="leftMargin">
       <number>5</number>
      </property>
      <property name="rightMargin">
       <number>5</number>
      </property>
      <item>
       <widget class="QLabel" name="histview">
        <property name="minimumSize">
         <size>
          <width>200</width>
          <height>100</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>300</height>
         </size>
        </property>
        <property name="lineWidth">
         <number>0</number>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
        </property>
        <property name="alignment">
         <set>Qt::AlignJustify|Qt::AlignVCenter</set>
        </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
        <property name="margin">
         <number>0</number>
        </property>
        <property name="indent">
         <number>-1</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="KisGradientSlider" name="ingradient" native="true">
      <property name="minimumSize">
       <size>
        <width>256</width>
        <height>24</height>
       </size>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="KisIntParseSpinBox" name="blackspin">
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
        <property name="maximum">
         <number>255</number>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="spacer5">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>25</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="KisDoubleParseSpinBox" name="gammaspin">
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
        <property name="minimum">
         <double>0.100000000000000</double>
        </property>
        <property name="maximum">
         <double>10.000000000000000</double>
        </property>
        <property name="singleStep">
         <double>0.010000000000000</double>
        </property>
        <property name="value">
         <double>1.000000000000000</double>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="spacer6">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>25</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="KisIntParseSpinBox" name="whitespin">
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
        <property name="maximum">
         <number>255</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QLabel" name="textLabel3">
      <property name="text">
       <string>&lt;b&gt;Output Levels&lt;/b&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KisGradientSlider" name="outgradient" native="true">
      <property name="minimumSize">
       <size>
        <width>256</width>
        <height>24</height>
       </size>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="KisIntParseSpinBox" name="outblackspin">
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
        <property name="maximum">
         <number>255</number>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="spacer3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>50</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="KisIntParseSpinBox" name="outwhitespin">
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
        <property name="maximum">
         <number>255</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
       <widget class="QPushButton" name="butauto">
        <property name="text">
         <string>&amp;Auto Levels</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisGradientSlider</class>
    <extends>QWidget</extends>
    <header>kis_gradient_slider.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <includes>
   <include location="local">kis_gradient_slider.h</include>
   <include location="local">kis_gradient_slider.h</include>
  </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/noisefilter/wdgnoiseoptions.ui b/plugins/filters/noisefilter/wdgnoiseoptions.ui
index a1c121a6b2..5432c8838f 100644
--- a/plugins/filters/noisefilter/wdgnoiseoptions.ui
+++ b/plugins/filters/noisefilter/wdgnoiseoptions.ui
@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgNoiseOptions</class>
  <widget class="QWidget" name="WdgNoiseOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>174</width>
     <height>66</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="1" column="0">
     <widget class="QLabel" name="textLabel2">
      <property name="text">
       <string>Opacity:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Level:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisIntParseSpinBox" name="intOpacity"/>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="intLevel"/>
    </item>
    <item row="1" column="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>21</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="2" column="1">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>21</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/phongbumpmap/wdgphongbumpmap.ui b/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
index 15ad546036..7c1e8438ff 100644
--- a/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
+++ b/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
@@ -1,1234 +1,1234 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgPhongBumpmap</class>
  <widget class="QWidget" name="WdgPhongBumpmap">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>670</width>
     <height>346</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>570</width>
     <height>323</height>
    </size>
   </property>
   <property name="baseSize">
    <size>
     <width>570</width>
     <height>323</height>
    </size>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="sizeConstraint">
     <enum>QLayout::SetDefaultConstraint</enum>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QTabWidget" name="settingsTabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="generalSettings">
       <attribute name="title">
        <string>General settings</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="2" column="0" colspan="2">
         <widget class="QGroupBox" name="materialParametersGroupBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Material properties</string>
          </property>
          <property name="flat">
           <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
           <item row="2" column="0">
            <widget class="QGroupBox" name="specularReflectivityGroup">
             <property name="title">
              <string>Specula&amp;r</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <layout class="QGridLayout" name="gridLayout_3">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>3</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="lblSpecularReflectivity">
                <property name="text">
                 <string>Reflectivity:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="KisDoubleSliderSpinBox" name="specularReflectivityKisDoubleSliderSpinBox" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                  <horstretch>1</horstretch>
                  <verstretch>1</verstretch>
                 </sizepolicy>
                </property>
                <property name="minimumSize">
                 <size>
                  <width>0</width>
                  <height>20</height>
                 </size>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>23</height>
                 </size>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="lblSpecularShinyExp">
                <property name="text">
                 <string>Shinyness exponent:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="KisSliderSpinBox" name="shinynessExponentKisSliderSpinBox" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                  <horstretch>1</horstretch>
                  <verstretch>1</verstretch>
                 </sizepolicy>
                </property>
                <property name="minimumSize">
                 <size>
                  <width>0</width>
                  <height>20</height>
                 </size>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>23</height>
                 </size>
                </property>
               </widget>
              </item>
              <item row="2" column="0">
               <spacer name="horizontalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeType">
                 <enum>QSizePolicy::Fixed</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>150</width>
                  <height>0</height>
                 </size>
                </property>
               </spacer>
              </item>
             </layout>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QGroupBox" name="diffuseReflectivityGroup">
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
             <property name="title">
              <string>Di&amp;ffuse</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <layout class="QGridLayout" name="gridLayout_2">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>3</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="lblDiffuseReflectivity">
                <property name="text">
                 <string>Reflectivity:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="KisDoubleSliderSpinBox" name="diffuseReflectivityKisDoubleSliderSpinBox" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                  <horstretch>1</horstretch>
                  <verstretch>1</verstretch>
                 </sizepolicy>
                </property>
                <property name="minimumSize">
                 <size>
                  <width>0</width>
                  <height>20</height>
                 </size>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>23</height>
                 </size>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <spacer name="horizontalSpacer_2">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeType">
                 <enum>QSizePolicy::Fixed</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>150</width>
                  <height>0</height>
                 </size>
                </property>
               </spacer>
              </item>
             </layout>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QGroupBox" name="AmbientGroup">
             <property name="title">
              <string>Ambient</string>
             </property>
             <property name="flat">
              <bool>true</bool>
             </property>
             <property name="checkable">
              <bool>false</bool>
             </property>
             <layout class="QGridLayout" name="gridLayout">
              <property name="leftMargin">
               <number>0</number>
              </property>
              <property name="topMargin">
               <number>3</number>
              </property>
              <property name="rightMargin">
               <number>0</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
               <number>6</number>
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="lblAmbientReflectivity">
                <property name="text">
                 <string>Reflectivity:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="KisDoubleSliderSpinBox" name="ambientReflectivityKisDoubleSliderSpinBox" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                  <horstretch>1</horstretch>
                  <verstretch>1</verstretch>
                 </sizepolicy>
                </property>
                <property name="minimumSize">
                 <size>
                  <width>0</width>
                  <height>20</height>
                 </size>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>23</height>
                 </size>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <spacer name="horizontalSpacer_4">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeType">
                 <enum>QSizePolicy::Fixed</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>150</width>
                  <height>0</height>
                 </size>
                </property>
               </spacer>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="lblHeightmapChannel">
          <property name="text">
           <string>Heightmap channel:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QComboBox" name="heightChannelComboBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>16</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="3" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::MinimumExpanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>9</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="1" column="1">
         <widget class="QCheckBox" name="useNormalMap">
          <property name="text">
           <string extracomment="Whether or not this filter should only use a given channel or use all channels and treat them as a normal map">Use Normalmap</string>
          </property>
          <property name="tristate">
           <bool>false</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="lightSources">
       <attribute name="title">
        <string>Light Sources</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_9">
        <item row="1" column="1">
         <widget class="QGroupBox" name="lightSourceGroupBox4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Light Source &amp;4</string>
          </property>
          <property name="flat">
           <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QFormLayout" name="formLayout_8">
           <property name="fieldGrowthPolicy">
            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>3</number>
           </property>
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout_4">
             <item row="0" column="0">
              <widget class="QLabel" name="colorLabel4">
               <property name="text">
                <string>Color:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KColorCombo" name="lightKColorCombo4">
               <property name="color" stdset="0">
                <color>
                 <red>255</red>
                 <green>255</green>
                 <blue>0</blue>
                </color>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="azimuthLabel4">
               <property name="toolTip">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="text">
                <string>Azimuth:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisIntParseSpinBox" name="azimuthSpinBox4">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="whatsThis">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="wrapping">
                <bool>true</bool>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>359</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>180</number>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="inclinationLabel4">
               <property name="toolTip">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="text">
                <string>Inclination:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="inclinationSpinBox4">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="whatsThis">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>90</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>45</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item row="0" column="1">
            <widget class="QDial" name="azimuthDial4">
             <property name="toolTip">
              <string>Azimuth</string>
             </property>
             <property name="maximum">
              <number>359</number>
             </property>
             <property name="singleStep">
              <number>5</number>
             </property>
             <property name="pageStep">
              <number>45</number>
             </property>
             <property name="value">
              <number>180</number>
             </property>
             <property name="sliderPosition">
              <number>180</number>
             </property>
             <property name="tracking">
              <bool>true</bool>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="invertedAppearance">
              <bool>false</bool>
             </property>
             <property name="invertedControls">
              <bool>false</bool>
             </property>
             <property name="wrapping">
              <bool>true</bool>
             </property>
             <property name="notchTarget">
              <double>45.000000000000000</double>
             </property>
             <property name="notchesVisible">
              <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="lightSourceGroupBox2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Light Source &amp;2</string>
          </property>
          <property name="flat">
           <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <layout class="QFormLayout" name="formLayout_6">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>3</number>
           </property>
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout_2">
             <item row="0" column="0">
              <widget class="QLabel" name="colorLabel2">
               <property name="text">
                <string>Color:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KColorCombo" name="lightKColorCombo2">
               <property name="color" stdset="0">
                <color>
                 <red>255</red>
                 <green>0</green>
                 <blue>0</blue>
                </color>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="azimuthLabel2">
               <property name="toolTip">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="text">
                <string>Azimuth:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisIntParseSpinBox" name="azimuthSpinBox2">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string/>
               </property>
               <property name="whatsThis">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="wrapping">
                <bool>true</bool>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>359</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>33</number>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="inclinationLabel2">
               <property name="toolTip">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="text">
                <string>Inclination:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="inclinationSpinBox2">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string/>
               </property>
               <property name="whatsThis">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>90</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>45</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item row="0" column="1">
            <widget class="QDial" name="azimuthDial2">
             <property name="toolTip">
              <string>Azimuth</string>
             </property>
             <property name="maximum">
              <number>359</number>
             </property>
             <property name="singleStep">
              <number>5</number>
             </property>
             <property name="pageStep">
              <number>45</number>
             </property>
             <property name="value">
              <number>33</number>
             </property>
             <property name="sliderPosition">
              <number>33</number>
             </property>
             <property name="tracking">
              <bool>true</bool>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="invertedAppearance">
              <bool>false</bool>
             </property>
             <property name="invertedControls">
              <bool>false</bool>
             </property>
             <property name="wrapping">
              <bool>true</bool>
             </property>
             <property name="notchTarget">
              <double>45.000000000000000</double>
             </property>
             <property name="notchesVisible">
              <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="lightSourceGroupBox1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Light Source &amp;1</string>
          </property>
          <property name="flat">
           <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <layout class="QFormLayout" name="formLayout_5">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>3</number>
           </property>
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout">
             <property name="horizontalSpacing">
              <number>6</number>
             </property>
             <property name="verticalSpacing">
              <number>6</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="colorLabel1">
               <property name="text">
                <string>Color:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KColorCombo" name="lightKColorCombo1">
               <property name="color" stdset="0">
                <color>
                 <red>255</red>
                 <green>255</green>
                 <blue>0</blue>
                </color>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="azimuthLabel1">
               <property name="toolTip">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="text">
                <string>Azimuth:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisIntParseSpinBox" name="azimuthSpinBox1">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string/>
               </property>
               <property name="whatsThis">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="wrapping">
                <bool>true</bool>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>359</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>127</number>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="inclinationLabel1">
               <property name="toolTip">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="text">
                <string>Inclination:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="inclinationSpinBox1">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="whatsThis">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>90</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>45</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item row="0" column="1">
            <widget class="QDial" name="azimuthDial1">
             <property name="toolTip">
              <string>Azimuth</string>
             </property>
             <property name="maximum">
              <number>359</number>
             </property>
             <property name="singleStep">
              <number>5</number>
             </property>
             <property name="pageStep">
              <number>45</number>
             </property>
             <property name="value">
              <number>127</number>
             </property>
             <property name="sliderPosition">
              <number>127</number>
             </property>
             <property name="tracking">
              <bool>true</bool>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="invertedAppearance">
              <bool>false</bool>
             </property>
             <property name="invertedControls">
              <bool>false</bool>
             </property>
             <property name="wrapping">
              <bool>true</bool>
             </property>
             <property name="notchTarget">
              <double>45.000000000000000</double>
             </property>
             <property name="notchesVisible">
              <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QGroupBox" name="lightSourceGroupBox3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Light Source &amp;3</string>
          </property>
          <property name="flat">
           <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QFormLayout" name="formLayout_7">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>3</number>
           </property>
           <item row="0" column="0">
            <layout class="QFormLayout" name="formLayout_3">
             <item row="0" column="0">
              <widget class="QLabel" name="colorLabel3">
               <property name="text">
                <string>Color:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KColorCombo" name="lightKColorCombo3">
               <property name="color" stdset="0">
                <color>
                 <red>0</red>
                 <green>255</green>
                 <blue>0</blue>
                </color>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="azimuthLabel3">
               <property name="toolTip">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="text">
                <string>Azimuth:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisIntParseSpinBox" name="azimuthSpinBox3">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="whatsThis">
                <string>Direction of the light, the dial tip represents where the light comes from.</string>
               </property>
               <property name="wrapping">
                <bool>true</bool>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>359</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>180</number>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="inclinationLabel3">
               <property name="toolTip">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="text">
                <string>Inclination:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="inclinationSpinBox3">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="whatsThis">
                <string>Vertical tilt of the light. 90° is perpendicular to the canvas, 0° is parallel.</string>
               </property>
               <property name="suffix">
                <string>°</string>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="maximum">
                <number>90</number>
               </property>
               <property name="singleStep">
                <number>15</number>
               </property>
               <property name="value">
                <number>45</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item row="0" column="1">
            <widget class="QDial" name="azimuthDial3">
             <property name="toolTip">
              <string>Azimuth</string>
             </property>
             <property name="maximum">
              <number>359</number>
             </property>
             <property name="singleStep">
              <number>5</number>
             </property>
             <property name="pageStep">
              <number>45</number>
             </property>
             <property name="value">
              <number>180</number>
             </property>
             <property name="sliderPosition">
              <number>180</number>
             </property>
             <property name="tracking">
              <bool>true</bool>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="invertedAppearance">
              <bool>false</bool>
             </property>
             <property name="invertedControls">
              <bool>false</bool>
             </property>
             <property name="wrapping">
              <bool>true</bool>
             </property>
             <property name="notchTarget">
              <double>45.000000000000000</double>
             </property>
             <property name="notchesVisible">
              <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>0</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KColorCombo</class>
    <extends>QComboBox</extends>
    <header>kcolorcombo.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>settingsTabWidget</tabstop>
   <tabstop>heightChannelComboBox</tabstop>
   <tabstop>diffuseReflectivityGroup</tabstop>
   <tabstop>specularReflectivityGroup</tabstop>
   <tabstop>lightSourceGroupBox1</tabstop>
   <tabstop>lightKColorCombo1</tabstop>
   <tabstop>azimuthSpinBox1</tabstop>
   <tabstop>inclinationSpinBox1</tabstop>
   <tabstop>azimuthDial1</tabstop>
   <tabstop>lightSourceGroupBox2</tabstop>
   <tabstop>lightKColorCombo2</tabstop>
   <tabstop>azimuthSpinBox2</tabstop>
   <tabstop>inclinationSpinBox2</tabstop>
   <tabstop>azimuthDial2</tabstop>
   <tabstop>lightSourceGroupBox3</tabstop>
   <tabstop>lightKColorCombo3</tabstop>
   <tabstop>azimuthSpinBox3</tabstop>
   <tabstop>inclinationSpinBox3</tabstop>
   <tabstop>azimuthDial3</tabstop>
   <tabstop>lightSourceGroupBox4</tabstop>
   <tabstop>lightKColorCombo4</tabstop>
   <tabstop>azimuthSpinBox4</tabstop>
   <tabstop>inclinationSpinBox4</tabstop>
   <tabstop>azimuthDial4</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/plugins/filters/randompickfilter/wdgrandompickoptions.ui
index 53e604973e..4fb0469491 100644
--- a/plugins/filters/randompickfilter/wdgrandompickoptions.ui
+++ b/plugins/filters/randompickfilter/wdgrandompickoptions.ui
@@ -1,105 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgRandomPickOptions</class>
  <widget class="QWidget" name="WdgRandomPickOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>293</width>
     <height>154</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="2,0,1">
    <item row="0" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>16</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="1">
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Level:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
     <widget class="KisIntParseSpinBox" name="intLevel"/>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="textLabel1_2">
      <property name="text">
       <string>Size of the window:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisIntParseSpinBox" name="intWindowSize"/>
    </item>
    <item row="2" column="1">
     <widget class="QLabel" name="textLabel2">
      <property name="text">
       <string>Opacity:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
     <widget class="KisIntParseSpinBox" name="intOpacity"/>
    </item>
    <item row="3" column="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>1</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/unsharp/wdgunsharp.ui b/plugins/filters/unsharp/wdgunsharp.ui
index 055eecfc52..bc3ad24aaf 100644
--- a/plugins/filters/unsharp/wdgunsharp.ui
+++ b/plugins/filters/unsharp/wdgunsharp.ui
@@ -1,175 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgUnsharp</class>
  <widget class="QWidget" name="WdgUnsharp">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>331</width>
     <height>167</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel1">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Radius:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisDoubleParseSpinBox" name="doubleHalfSize">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="value">
       <double>1.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="2" rowspan="4">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="textLabel3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Amount:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisDoubleParseSpinBox" name="doubleAmount">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
      <property name="value">
       <double>25.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="textLabel2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Threshold:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KisIntParseSpinBox" name="intThreshold">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Lightness Only:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QCheckBox" name="chkLightnessOnly">
      <property name="text">
       <string notr="true"/>
      </property>
     </widget>
    </item>
    <item row="4" column="0" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>21</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/wavefilter/wdgwaveoptions.ui b/plugins/filters/wavefilter/wdgwaveoptions.ui
index eceadb2509..2ca31c5e87 100644
--- a/plugins/filters/wavefilter/wdgwaveoptions.ui
+++ b/plugins/filters/wavefilter/wdgwaveoptions.ui
@@ -1,313 +1,313 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgWaveOptions</class>
  <widget class="QWidget" name="WdgWaveOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>379</width>
     <height>475</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="verticalSpacing">
     <number>6</number>
    </property>
    <item row="2" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>60</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox1">
      <property name="title">
       <string>Horizontal Wave</string>
      </property>
      <layout class="QGridLayout">
       <property name="leftMargin">
        <number>9</number>
       </property>
       <property name="topMargin">
        <number>9</number>
       </property>
       <property name="rightMargin">
        <number>9</number>
       </property>
       <property name="bottomMargin">
        <number>9</number>
       </property>
       <item row="2" column="3">
        <widget class="KisIntParseSpinBox" name="intHAmplitude"/>
       </item>
       <item row="1" column="3">
        <widget class="KisIntParseSpinBox" name="intHShift"/>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="textLabel1_2">
         <property name="text">
          <string>Shape:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="2" column="1" colspan="2">
        <widget class="QLabel" name="textLabel2_2">
         <property name="text">
          <string>Amplitude:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="1" colspan="2">
        <widget class="QLabel" name="textLabel1">
         <property name="text">
          <string>Wavelength:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="3" column="2" colspan="2">
        <widget class="KComboBox" name="cbHShape">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>130</width>
           <height>0</height>
          </size>
         </property>
         <item>
          <property name="text">
           <string>Sinusoidale</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Triangle</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="1" colspan="2">
        <widget class="QLabel" name="textLabel2">
         <property name="text">
          <string>Shift:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="KisIntParseSpinBox" name="intHWavelength"/>
       </item>
       <item row="3" column="0">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="Vertical_wave">
      <property name="title">
       <string>Vertical Wave</string>
      </property>
      <layout class="QGridLayout">
       <property name="leftMargin">
        <number>9</number>
       </property>
       <property name="topMargin">
        <number>9</number>
       </property>
       <property name="rightMargin">
        <number>9</number>
       </property>
       <property name="bottomMargin">
        <number>9</number>
       </property>
       <item row="0" column="1" colspan="2">
        <widget class="QLabel" name="textLabel1_3">
         <property name="text">
          <string>Wavelength:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="3" column="2" colspan="2">
        <widget class="KComboBox" name="cbVShape">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>130</width>
           <height>0</height>
          </size>
         </property>
         <item>
          <property name="text">
           <string>Sinusoidale</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Triangle</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="1" colspan="2">
        <widget class="QLabel" name="textLabel2_3">
         <property name="text">
          <string>Shift:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="KisIntParseSpinBox" name="intVShift"/>
       </item>
       <item row="2" column="1" colspan="2">
        <widget class="QLabel" name="textLabel2_2_2">
         <property name="text">
          <string>Amplitude:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="textLabel1_2_2">
         <property name="text">
          <string>Shape:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="KisIntParseSpinBox" name="intVWavelength"/>
       </item>
       <item row="2" column="3">
        <widget class="KisIntParseSpinBox" name="intVAmplitude"/>
       </item>
       <item row="3" column="0">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>intHWavelength</tabstop>
   <tabstop>intHShift</tabstop>
   <tabstop>intHAmplitude</tabstop>
   <tabstop>cbHShape</tabstop>
   <tabstop>intVWavelength</tabstop>
   <tabstop>intVShift</tabstop>
   <tabstop>intVAmplitude</tabstop>
   <tabstop>cbVShape</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui b/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
index 0222958725..b081e19102 100644
--- a/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
+++ b/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
@@ -1,161 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ArtisticTextShapeConfigWidget</class>
  <widget class="QWidget" name="ArtisticTextShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>259</width>
     <height>73</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="KoFontComboBox" name="fontFamily">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="fontSize">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QToolButton" name="anchorStart">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="anchorMiddle">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="anchorEnd">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="Line" name="line">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bold">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="italic">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="Line" name="line_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="superScript">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="subScript">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item row="2" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KoFontComboBox</class>
    <extends>QComboBox</extends>
    <header>KoFontComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui b/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
index 139a7174ea..22ae46b850 100644
--- a/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
@@ -1,92 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>EllipseShapeConfigWidget</class>
  <widget class="QWidget" name="EllipseShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>188</width>
     <height>173</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Ellipse Shape</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Type:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="ellipseType"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Start angle:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisDoubleParseSpinBox" name="startAngle">
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string>°</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>End angle:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KisDoubleParseSpinBox" name="endAngle">
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string>°</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QPushButton" name="closeEllipse">
      <property name="text">
       <string>Close ellipse</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui b/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
index 67e515265a..88af5754e4 100644
--- a/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RectangleShapeConfigWidget</class>
  <widget class="QWidget" name="RectangleShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>200</width>
     <height>108</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rectangle Shape</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Corner radius x:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisDoubleParseUnitSpinBox" name="cornerRadiusX"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Corner radius y:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisDoubleParseUnitSpinBox" name="cornerRadiusY"/>
    </item>
    <item row="2" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui b/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
index 73bb477d66..bf26673702 100644
--- a/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SpiralShapeConfigWidget</class>
  <widget class="QWidget" name="SpiralShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>187</width>
     <height>173</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Spiral Shape</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Type:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="spiralType"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Fade:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisDoubleParseSpinBox" name="fade">
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string/>
      </property>
      <property name="maximum">
       <double>1.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
      <property name="value">
       <double>0.500000000000000</double>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Direction:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QComboBox" name="clockWise"/>
    </item>
    <item row="3" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui b/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
index c6af0d9759..6301134967 100644
--- a/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>StarShapeConfigWidget</class>
  <widget class="QWidget" name="StarShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>189</width>
     <height>175</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Star shape</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Polygon:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QCheckBox" name="convex">
      <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Corners:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KisIntParseSpinBox" name="corners"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Inner radius:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KisDoubleParseUnitSpinBox" name="innerRadius">
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Outer radius:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KisDoubleParseUnitSpinBox" name="outerRadius">
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/impex/heightmap/kis_wdg_options_heightmap.ui b/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
index 211025b49a..958c117f94 100644
--- a/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
+++ b/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgOptionsHeightMap</class>
  <widget class="QWidget" name="WdgOptionsHeightMap">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>191</width>
     <height>145</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Size:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KisIntParseSpinBox" name="intSize"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Endianness:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QGroupBox" name="groupBox_2">
        <property name="title">
         <string/>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QRadioButton" name="radioMac">
           <property name="toolTip">
            <string>Big Endian</string>
           </property>
           <property name="text">
            <string>&amp;Mac</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="radioPC">
           <property name="toolTip">
            <string>Little Endian</string>
           </property>
           <property name="text">
            <string>PC</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/impex/jp2/kis_wdg_options_jp2.ui b/plugins/impex/jp2/kis_wdg_options_jp2.ui
index c20f27ba29..93d57afbde 100644
--- a/plugins/impex/jp2/kis_wdg_options_jp2.ui
+++ b/plugins/impex/jp2/kis_wdg_options_jp2.ui
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgOptionsJP2</class>
  <widget class="QWidget" name="WdgOptionsJP2">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Compression</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QSlider" name="qualityLevel">
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These settings determine how much information is lost during compression. Low: small files, bad quality. High: big files, good quality.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="minimum">
         <number>0</number>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
        <property name="singleStep">
         <number>10</number>
        </property>
        <property name="pageStep">
         <number>1</number>
        </property>
        <property name="value">
         <number>100</number>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="tickPosition">
         <enum>QSlider::TicksBelow</enum>
        </property>
        <property name="tickInterval">
         <number>10</number>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisIntParseSpinBox" name="intQuality">
        <property name="minimum">
         <number>0</number>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
        <property name="value">
         <number>99</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Number of resolutions:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisIntParseSpinBox" name="numberResolutions">
        <property name="minimum">
         <number>1</number>
        </property>
        <property name="maximum">
         <number>20</number>
        </property>
        <property name="value">
         <number>6</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>qualityLevel</sender>
    <signal>valueChanged(int)</signal>
    <receiver>intQuality</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>322</x>
      <y>22</y>
     </hint>
     <hint type="destinationlabel">
      <x>367</x>
      <y>19</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>intQuality</sender>
    <signal>valueChanged(int)</signal>
    <receiver>qualityLevel</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>373</x>
      <y>21</y>
     </hint>
     <hint type="destinationlabel">
      <x>328</x>
      <y>18</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/impex/pdf/pdfimportwidgetbase.ui b/plugins/impex/pdf/pdfimportwidgetbase.ui
index 1390fba92f..63eda628ac 100644
--- a/plugins/impex/pdf/pdfimportwidgetbase.ui
+++ b/plugins/impex/pdf/pdfimportwidgetbase.ui
@@ -1,372 +1,372 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PDFImportWidgetBase</class>
  <widget class="QWidget" name="PDFImportWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>523</width>
     <height>246</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>PDFImportWidget</string>
   </property>
   <layout class="QHBoxLayout">
    <item>
     <widget class="QGroupBox" name="buttonGroup1">
      <property name="title">
       <string>Pages</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
        <widget class="QRadioButton" name="boolAllPages">
         <property name="text">
          <string>All pa&amp;ges</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="boolFirstPage">
         <property name="text">
          <string>&amp;First page</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="boolSelectionPage">
         <property name="text">
          <string>Selec&amp;tion of page</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QListWidget" name="listPages">
         <property name="selectionMode">
          <enum>QAbstractItemView::MultiSelection</enum>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox1">
      <property name="title">
       <string>Dimensions</string>
      </property>
      <property name="flat">
       <bool>false</bool>
      </property>
      <layout class="QGridLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <property name="spacing">
        <number>0</number>
       </property>
       <item row="3" column="0">
        <spacer>
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="1" column="0">
        <layout class="QHBoxLayout">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Fixed</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>44</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <layout class="QGridLayout">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="1" column="1">
            <widget class="KisIntParseSpinBox" name="intHeight">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>85</width>
               <height>0</height>
              </size>
             </property>
             <property name="suffix">
              <string>px</string>
             </property>
             <property name="maximum">
              <number>99999</number>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="intWidthzqffs">
             <property name="text">
              <string>Width:</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KisIntParseSpinBox" name="intWidth">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>85</width>
               <height>0</height>
              </size>
             </property>
             <property name="suffix">
              <string>px</string>
             </property>
             <property name="maximum">
              <number>99999</number>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="intHeightqsdfq">
             <property name="text">
              <string>Height:</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
          <widget class="KoAspectButton" name="pixelAspectRatioBtn" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>0</width>
             <height>0</height>
            </size>
           </property>
           <property name="text" stdset="0">
            <string/>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>51</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
       <item row="2" column="0">
        <layout class="QHBoxLayout">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Fixed</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>21</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <layout class="QGridLayout">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item row="0" column="1">
            <widget class="KisIntParseSpinBox" name="intResolution">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>85</width>
               <height>0</height>
              </size>
             </property>
             <property name="suffix">
              <string>dpi</string>
             </property>
             <property name="minimum">
              <number>1</number>
             </property>
             <property name="maximum">
              <number>3200</number>
             </property>
             <property name="value">
              <number>100</number>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="textLabel5">
             <property name="text">
              <string comment="horizontal resolution">Resolution:</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeType">
              <enum>QSizePolicy::Expanding</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>51</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>boolAllPages</tabstop>
   <tabstop>boolFirstPage</tabstop>
   <tabstop>boolSelectionPage</tabstop>
   <tabstop>listPages</tabstop>
   <tabstop>intResolution</tabstop>
   <tabstop>intWidth</tabstop>
   <tabstop>intHeight</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/dynadraw/wdgdynaoptions.ui b/plugins/paintops/dynadraw/wdgdynaoptions.ui
index 6d0ab7b037..6934f1a51e 100644
--- a/plugins/paintops/dynadraw/wdgdynaoptions.ui
+++ b/plugins/paintops/dynadraw/wdgdynaoptions.ui
@@ -1,344 +1,344 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDynaOptions</class>
  <widget class="QWidget" name="WdgDynaOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>337</width>
     <height>359</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>210</horstretch>
     <verstretch>60</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>337</width>
     <height>359</height>
    </size>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Dynamics settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="initWidthLbl">
            <property name="text">
             <string>Initial width:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisDoubleParseSpinBox" name="initWidthSPBox">
            <property name="minimum">
             <double>-99.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.050000000000000</double>
            </property>
            <property name="value">
             <double>1.500000000000000</double>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Mass:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisDoubleParseSpinBox" name="massSPBox">
            <property name="minimum">
             <double>-99.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.050000000000000</double>
            </property>
            <property name="value">
             <double>0.500000000000000</double>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
             <string>Drag:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="KisDoubleParseSpinBox" name="dragSPBox">
            <property name="minimum">
             <double>-99.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.050000000000000</double>
            </property>
            <property name="value">
             <double>0.150000000000000</double>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>Width range:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="KisDoubleParseSpinBox" name="widthRangeSPBox">
            <property name="minimum">
             <double>-99.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.050000000000000</double>
            </property>
            <property name="value">
             <double>0.050000000000000</double>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>153</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="ShapeTab">
       <attribute name="title">
        <string>Shape</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
          <item row="0" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Diameter:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisDoubleSliderSpinBox" name="diameterDSSB" native="true"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="text">
             <string>Angle:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisDoubleSliderSpinBox" name="angleSlider" native="true">
            <property name="enabled">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QCheckBox" name="fixedAngleChBox">
            <property name="text">
             <string>Fixed angle</string>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::MinimumExpanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>15</height>
           </size>
          </property>
         </spacer>
        </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="QRadioButton" name="circleRBox">
              <property name="text">
               <string>C&amp;ircle</string>
              </property>
              <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="twoCBox">
              <property name="text">
               <string>Two</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QRadioButton" name="linesRBox">
              <property name="text">
               <string>Lines</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KisDoubleParseSpinBox" name="lineSpacingSPBox">
              <property name="toolTip">
               <string>Line spacing</string>
              </property>
              <property name="value">
               <double>20.000000000000000</double>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KisIntParseSpinBox" name="lineCountSPBox">
              <property name="toolTip">
               <string>Line count</string>
              </property>
              <property name="value">
               <number>10</number>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <widget class="QRadioButton" name="polygonRBox">
            <property name="text">
             <string>Poly&amp;gon</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="wireRBox">
            <property name="text">
             <string>Wi&amp;re</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="LineCBox">
            <property name="text">
             <string>Paint connection</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/hairy/wdgInkOptions.ui b/plugins/paintops/hairy/wdgInkOptions.ui
index 86ccb06d0c..b78e49925e 100644
--- a/plugins/paintops/hairy/wdgInkOptions.ui
+++ b/plugins/paintops/hairy/wdgInkOptions.ui
@@ -1,256 +1,256 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgInkOptions</class>
  <widget class="QWidget" name="WdgInkOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>405</width>
     <height>436</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>405</width>
     <height>400</height>
    </size>
   </property>
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>300</x>
      <y>0</y>
      <width>113</width>
      <height>391</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <property name="leftMargin">
      <number>10</number>
     </property>
     <item>
      <widget class="QLabel" name="inkLabel">
       <property name="text">
        <string>Ink Amount</string>
       </property>
      </widget>
     </item>
     <item>
      <widget class="KisIntParseSpinBox" name="inkAmountSpinBox">
       <property name="maximum">
        <number>10000</number>
       </property>
       <property name="value">
        <number>1024</number>
       </property>
      </widget>
     </item>
     <item>
      <widget class="QCheckBox" name="opacityCBox">
       <property name="text">
        <string>Opacity</string>
       </property>
       <property name="checked">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item>
      <widget class="QCheckBox" name="saturationCBox">
       <property name="enabled">
        <bool>true</bool>
       </property>
       <property name="text">
        <string>Saturation</string>
       </property>
       <property name="checked">
        <bool>false</bool>
       </property>
      </widget>
     </item>
     <item>
      <widget class="QCheckBox" name="soakInkCBox">
       <property name="enabled">
        <bool>true</bool>
       </property>
       <property name="toolTip">
        <string>Soak ink from the initial position of the stroke</string>
       </property>
       <property name="text">
        <string>Soak ink</string>
       </property>
       <property name="checked">
        <bool>false</bool>
       </property>
      </widget>
     </item>
     <item>
      <spacer name="verticalSpacer">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>20</width>
         <height>288</height>
        </size>
       </property>
      </spacer>
     </item>
    </layout>
   </widget>
   <widget class="QGroupBox" name="groupBox">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>301</width>
      <height>270</height>
     </rect>
    </property>
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
    <property name="minimumSize">
     <size>
      <width>0</width>
      <height>0</height>
     </size>
    </property>
    <property name="title">
     <string>Ink Depletion Curve</string>
    </property>
    <widget class="KisCurveWidget" name="inkCurve" native="true">
     <property name="geometry">
      <rect>
       <x>9</x>
       <y>33</y>
       <width>271</width>
       <height>228</height>
      </rect>
     </property>
    </widget>
   </widget>
   <widget class="QGroupBox" name="weightGroup">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>270</y>
      <width>281</width>
      <height>161</height>
     </rect>
    </property>
    <property name="title">
     <string>Saturation Weights</string>
    </property>
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
      <widget class="QCheckBox" name="useWeightCHBox">
       <property name="text">
        <string>weighted saturation</string>
       </property>
      </widget>
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Bristle Ink Weight:</string>
       </property>
      </widget>
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Pressure Weight:</string>
       </property>
      </widget>
     </item>
     <item row="2" column="2">
      <widget class="KisDoubleSliderSpinBox" name="bristleInkAmountSlider" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
     <item row="3" column="0">
      <widget class="QLabel" name="label_3">
       <property name="text">
        <string>Bristle Length Weight:</string>
       </property>
      </widget>
     </item>
     <item row="3" column="2">
      <widget class="KisDoubleSliderSpinBox" name="bristleLengthSlider" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
     <item row="1" column="2">
      <widget class="KisDoubleSliderSpinBox" name="pressureSlider" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
     <item row="4" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>Ink Depletion Curve Weight:</string>
       </property>
      </widget>
     </item>
     <item row="4" column="2">
      <widget class="KisDoubleSliderSpinBox" name="inkDepletionSlider" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
    </layout>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisCurveWidget</class>
    <extends>QWidget</extends>
    <header>widgets/kis_curve_widget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/hairy/wdghairyshapeoptions.ui b/plugins/paintops/hairy/wdghairyshapeoptions.ui
index 188958bf1e..ac63aef4ff 100644
--- a/plugins/paintops/hairy/wdghairyshapeoptions.ui
+++ b/plugins/paintops/hairy/wdghairyshapeoptions.ui
@@ -1,140 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgHairyShapeOptions</class>
  <widget class="QWidget" name="WdgHairyShapeOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>425</width>
     <height>285</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>425</width>
     <height>285</height>
    </size>
   </property>
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>50</x>
      <y>20</y>
      <width>331</width>
      <height>89</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
      <widget class="QLabel" name="radiusLabel">
       <property name="text">
        <string>radius</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
      </widget>
     </item>
     <item row="0" column="1">
      <widget class="KisIntParseSpinBox" name="radiusSpinBox">
       <property name="value">
        <number>5</number>
       </property>
      </widget>
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="sigmaLabel">
       <property name="text">
        <string>sigma</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
      </widget>
     </item>
     <item row="1" column="1">
      <widget class="KisDoubleParseSpinBox" name="sigmaSpinBox">
       <property name="value">
        <double>20.000000000000000</double>
       </property>
      </widget>
     </item>
    </layout>
   </widget>
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>50</x>
      <y>120</y>
      <width>331</width>
      <height>138</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0">
      <widget class="QGroupBox" name="shapeGroup">
       <property name="title">
        <string>Shape</string>
       </property>
       <layout class="QGridLayout" name="gridLayout_5">
        <item row="0" column="0">
         <widget class="QRadioButton" name="oneDimBrushBtn">
          <property name="text">
           <string>&amp;1D</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QRadioButton" name="twoDimBrushBtn">
          <property name="text">
           <string>&amp;2D</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </item>
    </layout>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/hatching/wdghatchingoptions.ui b/plugins/paintops/hatching/wdghatchingoptions.ui
index 50603dfea7..d0467c8098 100644
--- a/plugins/paintops/hatching/wdghatchingoptions.ui
+++ b/plugins/paintops/hatching/wdghatchingoptions.ui
@@ -1,443 +1,443 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgHatchingOptions</class>
  <widget class="QWidget" name="WdgHatchingOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>588</width>
     <height>450</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_14">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="layoutDirection">
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
         <string>Angle:</string>
        </property>
        <property name="scaledContents">
         <bool>false</bool>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KisDoubleSliderSpinBox" name="angleKisDoubleSliderSpinBox" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>23</height>
         </size>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_18">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Separation:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="KisDoubleSliderSpinBox" name="separationKisDoubleSliderSpinBox" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>23</height>
         </size>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_20">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Thickness:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="KisDoubleSliderSpinBox" name="thicknessKisDoubleSliderSpinBox" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>23</height>
         </size>
        </property>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_22">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Origin X:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="KisDoubleSliderSpinBox" name="originXKisDoubleSliderSpinBox" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>23</height>
         </size>
        </property>
       </widget>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label_24">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Origin Y:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="KisDoubleSliderSpinBox" name="originYKisDoubleSliderSpinBox" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>23</height>
         </size>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="minimumSize">
       <size>
        <width>301</width>
        <height>161</height>
       </size>
      </property>
      <property name="title">
       <string>Crosshatching style</string>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
      <property name="checked">
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QRadioButton" name="noCrosshatchingRadioButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>210</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>No crosshatch&amp;ing</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="perpendicularRadioButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>210</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>Pe&amp;rpendicular plane only</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="minusThenPlusRadioButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>210</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>-&amp;45° plane then +45° plane</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="plusThenMinusRadioButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>210</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>+45° plane &amp;then -45° plane</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="moirePatternRadioButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>210</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>&amp;Moiré pattern</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="minimumSize">
       <size>
        <width>301</width>
        <height>95</height>
       </size>
      </property>
      <property name="title">
       <string>Separation Style</string>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
      <property name="checked">
       <bool>false</bool>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Input-based intervals:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KisIntParseSpinBox" name="separationIntervalSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="accelerated">
          <bool>false</bool>
         </property>
         <property name="keyboardTracking">
          <bool>false</bool>
         </property>
         <property name="minimum">
          <number>2</number>
         </property>
         <property name="maximum">
          <number>7</number>
         </property>
         <property name="value">
          <number>5</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui b/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
index 746ad34040..fecb0fa2dd 100644
--- a/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
+++ b/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
@@ -1,184 +1,184 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgBrushChooser</class>
  <widget class="QWidget" name="WdgBrushChooser">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>537</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QFrame" name="frame">
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Plain</enum>
        </property>
        <layout class="QHBoxLayout" name="brushChooserButtonLayout">
         <property name="spacing">
          <number>0</number>
         </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
        </layout>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QFrame" name="settingsFrame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QCheckBox" name="autoPrecisionCheckBox">
        <property name="text">
         <string>Auto</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="toolTip">
         <string>Use to set the size from which the Automatic Precision Setting should begin. The Precision will remain 5 before this value.</string>
        </property>
        <property name="text">
         <string>Starting Brush Size:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisDoubleParseSpinBox" name="sizeToStartFromSpinBox">
        <property name="suffix">
         <string> px</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">
         <string>This determines every interval after which the precision should change. For example: if the delta value is set to be 15.00, after every 15 pts change in the size of brush, the precision will change.</string>
        </property>
        <property name="text">
         <string>Delta :</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisDoubleParseSpinBox" name="deltaValueSpinBox">
        <property name="suffix">
         <string> px</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="lblPrecisionValue">
        <property name="text">
         <string>0</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="lblPrecision">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Precision:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisSliderSpinBox" name="sliderPrecision" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/basictools/wdgcolorpicker.ui b/plugins/tools/basictools/wdgcolorpicker.ui
index 7c3697494a..c213ba02fe 100644
--- a/plugins/tools/basictools/wdgcolorpicker.ui
+++ b/plugins/tools/basictools/wdgcolorpicker.ui
@@ -1,167 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ColorPickerOptionsWidget</class>
  <widget class="QWidget" name="ColorPickerOptionsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>263</width>
     <height>307</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Color Picker</string>
   </property>
   <layout class="QGridLayout">
    <item row="5" column="0">
     <widget class="QTreeWidget" name="listViewChannels">
      <property name="columnCount">
       <number>2</number>
      </property>
      <column>
       <property name="text">
        <string>Channel</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Value</string>
       </property>
      </column>
     </widget>
    </item>
    <item row="4" column="0">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>1</number>
      </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
      </property>
      <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
       <widget class="QLabel" name="textLabel1">
        <property name="text">
         <string>Sample radius:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KisIntParseSpinBox" name="radius">
        <property name="suffix">
         <string> px</string>
        </property>
        <property name="minimum">
         <number>1</number>
        </property>
        <property name="maximum">
         <number>900</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="3" column="0">
     <widget class="QCheckBox" name="cbNormaliseValues">
      <property name="text">
       <string>Show colors as percentages</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>1</number>
      </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
      </property>
      <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
       <widget class="QCheckBox" name="cbPalette">
        <property name="text">
         <string>Add to palette:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="SqueezedComboBox" name="cmbPalette"/>
      </item>
     </layout>
    </item>
    <item row="1" column="0">
     <widget class="QCheckBox" name="cbUpdateCurrentColor">
      <property name="text">
       <string>Update current color</string>
      </property>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="QComboBox" name="cmbSources">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>200</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>200</width>
        <height>32767</height>
       </size>
      </property>
      <item>
       <property name="text">
        <string>Sample All Visible Layers</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>Current Layer</string>
       </property>
      </item>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>SqueezedComboBox</class>
    <extends>QComboBox</extends>
    <header>squeezedcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/basictools/wdgmovetool.ui b/plugins/tools/basictools/wdgmovetool.ui
index be69f135a2..806ff77002 100644
--- a/plugins/tools/basictools/wdgmovetool.ui
+++ b/plugins/tools/basictools/wdgmovetool.ui
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgMoveTool</class>
  <widget class="QWidget" name="WdgMoveTool">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>271</width>
     <height>250</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="grpSelectionMethod">
      <property name="title">
       <string>Selection Mode</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QRadioButton" name="radioSelectedLayer">
         <property name="toolTip">
          <string>Move the layer that you have currently selected in the layerbox with its masks. Shortcut: ctrl-click.</string>
         </property>
         <property name="text">
          <string>&amp;Move current layer</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QRadioButton" name="radioFirstLayer">
         <property name="toolTip">
          <string>Move the first layer with visible content at the place where you click. This will also select that layer in the layerbox.</string>
         </property>
         <property name="text">
          <string>Mo&amp;ve layer with content</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QRadioButton" name="radioGroup">
         <property name="toolTip">
          <string>Move the group containing the first layer that contains visible content. Shortcut: ctrl-shift-click.</string>
         </property>
         <property name="text">
          <string>Move &amp;the whole group</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QWidget" name="SpecialSpacer" native="true"/>
    </item>
    <item row="2" column="0">
     <widget class="QGroupBox" name="grpMoveStep">
      <property name="title">
       <string>Shortcut Move Distance</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="0">
        <widget class="KisDoubleParseSpinBox" name="spinMoveStep">
         <property name="toolTip">
          <string>Number of pixels to move after move shortcut keypress.</string>
         </property>
         <property name="minimum">
          <double>1.000000000000000</double>
         </property>
         <property name="maximum">
          <double>100000.000000000000000</double>
         </property>
         <property name="value">
          <double>1.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="cmbUnit"/>
       </item>
       <item row="1" column="0">
        <widget class="KisDoubleParseSpinBox" name="spinMoveScale">
         <property name="toolTip">
          <string>When holding shift, move keyboard shortcuts scale up by this amount.</string>
         </property>
         <property name="minimum">
          <double>1.000000000000000</double>
         </property>
         <property name="maximum">
          <double>1000.000000000000000</double>
         </property>
         <property name="value">
          <double>10.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="scaleLabel">
         <property name="text">
          <string>Large Move Scale</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui b/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
index 10a4b4daca..9a35520290 100644
--- a/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
+++ b/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DefaultToolTransformWidget</class>
  <widget class="QMenu" name="DefaultToolTransformWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>222</width>
     <height>293</height>
    </rect>
   </property>
   <property name="title">
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="KisDoubleParseSpinBox" name="rotateSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>2</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string>°</string>
      </property>
      <property name="minimum">
       <double>-360.000000000000000</double>
      </property>
      <property name="maximum">
       <double>360.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QPushButton" name="rotateButton">
      <property name="text">
       <string>Rotate</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="KisDoubleParseUnitSpinBox" name="shearXSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>2</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-100.000000000000000</double>
      </property>
      <property name="maximum">
       <double>100.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="shearXButton">
      <property name="text">
       <string>Shear X</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="KisDoubleParseUnitSpinBox" name="shearYSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>2</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-100.000000000000000</double>
      </property>
      <property name="maximum">
       <double>100.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QPushButton" name="shearYButton">
      <property name="text">
       <string>Shear Y</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="KisDoubleParseSpinBox" name="scaleXSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>2</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string>%</string>
      </property>
      <property name="minimum">
       <double>-1000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>1000.000000000000000</double>
      </property>
      <property name="value">
       <double>100.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QPushButton" name="scaleXButton">
      <property name="text">
       <string>Scale X</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="KisDoubleParseSpinBox" name="scaleYSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>2</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="suffix">
       <string>%</string>
      </property>
      <property name="minimum">
       <double>-1000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>1000.000000000000000</double>
      </property>
      <property name="value">
       <double>100.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QPushButton" name="scaleYButton">
      <property name="text">
       <string>Scale Y</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QCheckBox" name="scaleAspectCheckBox">
      <property name="text">
       <string>Keep aspect ratio</string>
      </property>
     </widget>
    </item>
    <item row="6" column="0" colspan="2">
     <widget class="QPushButton" name="resetButton">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Reset Transformations</string>
      </property>
     </widget>
    </item>
    <item row="7" column="0" colspan="2">
     <spacer name="spacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>191</width>
        <height>58</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui b/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
index 482c86568a..c5efcee49c 100644
--- a/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
+++ b/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
@@ -1,175 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DefaultToolWidget</class>
  <widget class="QWidget" name="DefaultToolWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>256</width>
     <height>76</height>
    </rect>
   </property>
   <property name="focusPolicy">
    <enum>Qt::NoFocus</enum>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="1">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>X:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
     <widget class="KisDoubleParseUnitSpinBox" name="positionXSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-10000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="3">
     <widget class="KisDoubleParseUnitSpinBox" name="widthSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-10000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="0" column="4" rowspan="2">
     <widget class="KoAspectButton" name="aspectButton" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" stdset="0">
       <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="0" rowspan="2">
     <widget class="KoPositionSelector" name="positionSelector" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Y:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="KisDoubleParseUnitSpinBox" name="positionYSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-10000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="1" column="3">
     <widget class="KisDoubleParseUnitSpinBox" name="heightSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimum">
       <double>-10000.000000000000000</double>
      </property>
      <property name="maximum">
       <double>10000.000000000000000</double>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
     <widget class="QWidget" name="SpecialSpacer" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparseunitspinbox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KoPositionSelector</class>
    <extends>QWidget</extends>
    <header>KoPositionSelector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>positionXSpinBox</tabstop>
   <tabstop>positionYSpinBox</tabstop>
   <tabstop>widthSpinBox</tabstop>
   <tabstop>heightSpinBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
index 5657abd999..cc60d77f06 100644
--- a/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
@@ -1,67 +1,67 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "BlurEffectConfigWidget.h"
 #include "BlurEffect.h"
 #include "KoFilterEffect.h"
 
 #include <QSpinBox>
 #include <klocalizedstring.h>
 
 #include <QGridLayout>
 #include <QLabel>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 BlurEffectConfigWidget::BlurEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent), m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     g->addWidget(new QLabel(i18n("Radius"), this), 0, 0);
 	m_stdDeviation = new KisDoubleParseSpinBox(this);
     m_stdDeviation->setRange(0.0, 100);
     m_stdDeviation->setSingleStep(0.5);
     g->addWidget(m_stdDeviation, 0, 1);
     setLayout(g);
 
     connect(m_stdDeviation, SIGNAL(valueChanged(double)), this, SLOT(stdDeviationChanged(double)));
 }
 
 bool BlurEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<BlurEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_stdDeviation->setValue(m_effect->deviation().x() * 100.0);
     return true;
 }
 
 void BlurEffectConfigWidget::stdDeviationChanged(double stdDeviation)
 {
     if (!m_effect) {
         return;
     }
 
     qreal newDev = 0.01 * stdDeviation;
     m_effect->setDeviation(QPointF(newDev, newDev));
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
index 9b4ef1e7dc..8b3412a7e7 100644
--- a/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
@@ -1,181 +1,181 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009-2010 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "ColorMatrixEffectConfigWidget.h"
 #include "ColorMatrixEffect.h"
 #include "KoFilterEffect.h"
 #include "MatrixDataModel.h"
 
 #include <QSpinBox>
 #include <kcombobox.h>
 #include <klocalizedstring.h>
 
 #include <QGridLayout>
 #include <QLabel>
 #include <QStackedWidget>
 #include <QTableView>
 #include <QHeaderView>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 ColorMatrixEffectConfigWidget::ColorMatrixEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     m_type = new KComboBox(this);
     m_type->addItem(i18n("Apply color matrix"));
     m_type->addItem(i18n("Saturate colors"));
     m_type->addItem(i18n("Rotate hue"));
     m_type->addItem(i18n("Luminance to alpha"));
     g->addWidget(m_type, 0, 0);
 
     m_stack = new QStackedWidget(this);
     m_stack->setContentsMargins(0, 0, 0, 0);
     g->addWidget(m_stack, 1, 0);
 
     m_matrixModel = new MatrixDataModel(this);
 
     QTableView *matrixWidget = new QTableView(m_stack);
     matrixWidget->setModel(m_matrixModel);
     matrixWidget->horizontalHeader()->hide();
     matrixWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
     matrixWidget->verticalHeader()->hide();
     matrixWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
     m_stack->addWidget(matrixWidget);
 
     QWidget *saturateWidget = new QWidget(m_stack);
     QGridLayout *saturateLayout = new QGridLayout(saturateWidget);
     saturateLayout->addWidget(new QLabel(i18n("Saturate value"), saturateWidget), 0, 0);
 	m_saturate = new KisDoubleParseSpinBox(saturateWidget);
     m_saturate->setRange(0.0, 1.0);
     m_saturate->setSingleStep(0.05);
     saturateLayout->addWidget(m_saturate, 0, 1);
     saturateLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 0);
     saturateWidget->setLayout(saturateLayout);
     m_stack->addWidget(saturateWidget);
 
     QWidget *hueRotateWidget = new QWidget(m_stack);
     QGridLayout *hueRotateLayout = new QGridLayout(hueRotateWidget);
     hueRotateLayout->addWidget(new QLabel(i18n("Angle"), hueRotateWidget), 0, 0);
 	m_hueRotate = new KisDoubleParseSpinBox(hueRotateWidget);
     m_hueRotate->setRange(0.0, 360.0);
     m_hueRotate->setSingleStep(1.0);
     hueRotateLayout->addWidget(m_hueRotate, 0, 1);
     hueRotateLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 0);
     hueRotateWidget->setLayout(hueRotateLayout);
     m_stack->addWidget(hueRotateWidget);
 
     QWidget *luminanceWidget = new QWidget(m_stack);
     m_stack->addWidget(luminanceWidget);
 
     setLayout(g);
 
     connect(m_type, SIGNAL(currentIndexChanged(int)), m_stack, SLOT(setCurrentIndex(int)));
     connect(m_type, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)));
     connect(m_saturate, SIGNAL(valueChanged(double)), this, SLOT(saturateChanged(double)));
     connect(m_hueRotate, SIGNAL(valueChanged(double)), this, SLOT(hueRotateChanged(double)));
     connect(m_matrixModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(matrixChanged()));
 }
 
 bool ColorMatrixEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<ColorMatrixEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_type->blockSignals(true);
 
     switch (m_effect->type()) {
     case ColorMatrixEffect::Matrix:
         m_type->setCurrentIndex(0);
         m_matrixModel->setMatrix(m_effect->colorMatrix(), m_effect->colorMatrixRowCount(), m_effect->colorMatrixColumnCount());
         break;
     case ColorMatrixEffect::Saturate:
         m_type->setCurrentIndex(1);
         m_saturate->blockSignals(true);
         m_saturate->setValue(m_effect->saturate());
         m_saturate->blockSignals(false);
         break;
     case ColorMatrixEffect::HueRotate:
         m_type->setCurrentIndex(2);
         m_hueRotate->blockSignals(true);
         m_hueRotate->setValue(m_effect->hueRotate());
         m_hueRotate->blockSignals(false);
         break;
     case ColorMatrixEffect::LuminanceAlpha:
         m_type->setCurrentIndex(3);
         break;
     }
 
     m_type->blockSignals(false);
     m_stack->setCurrentIndex(m_type->currentIndex());
 
     return true;
 }
 
 void ColorMatrixEffectConfigWidget::matrixChanged()
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setColorMatrix(m_matrixModel->matrix());
     emit filterChanged();
 }
 
 void ColorMatrixEffectConfigWidget::saturateChanged(double saturate)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setSaturate(saturate);
     emit filterChanged();
 }
 
 void ColorMatrixEffectConfigWidget::hueRotateChanged(double angle)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setHueRotate(angle);
     emit filterChanged();
 }
 
 void ColorMatrixEffectConfigWidget::typeChanged(int index)
 {
     if (!m_effect) {
         return;
     }
 
     if (index == ColorMatrixEffect::Matrix) {
         m_effect->setColorMatrix(m_matrixModel->matrix());
     } else if (index == ColorMatrixEffect::Saturate) {
         m_effect->setSaturate(m_saturate->value());
     } else if (index == ColorMatrixEffect::HueRotate) {
         m_effect->setHueRotate(m_hueRotate->value());
     } else {
         m_effect->setLuminanceAlpha();
     }
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
index d28df1534b..ccf184adbd 100644
--- a/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
@@ -1,305 +1,305 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "ComponentTransferEffectConfigWidget.h"
 #include "KoFilterEffect.h"
 
 #include <QSpinBox>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <klocalizedstring.h>
 
 #include <QGridLayout>
 #include <QLabel>
 #include <QStackedWidget>
 #include <QRadioButton>
 #include <QButtonGroup>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 const qreal ValueStep = 0.1;
 
 ComponentTransferEffectConfigWidget::ComponentTransferEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
     , m_currentChannel(ComponentTransferEffect::ChannelR)
 {
     QGridLayout *g = new QGridLayout(this);
 
     QButtonGroup *group = new QButtonGroup(this);
 
     QRadioButton *butR = new QRadioButton("R", this);
     QRadioButton *butG = new QRadioButton("G", this);
     QRadioButton *butB = new QRadioButton("B", this);
     QRadioButton *butA = new QRadioButton("A", this);
     g->addWidget(butR, 0, 0);
     g->addWidget(butG, 0, 1);
     g->addWidget(butB, 0, 2);
     g->addWidget(butA, 0, 3);
     group->addButton(butR, ComponentTransferEffect::ChannelR);
     group->addButton(butG, ComponentTransferEffect::ChannelG);
     group->addButton(butB, ComponentTransferEffect::ChannelB);
     group->addButton(butA, ComponentTransferEffect::ChannelA);
     butR->setChecked(true);
 
     g->addWidget(new QLabel(i18n("Function"), this), 1, 0, 1, 2);
     m_function = new KComboBox(this);
     m_function->addItem(i18n("Identity"));
     m_function->addItem(i18n("Table"));
     m_function->addItem(i18n("Discrete"));
     m_function->addItem(i18n("Linear"));
     m_function->addItem(i18n("Gamma"));
     g->addWidget(m_function, 1, 2, 1, 2);
 
     m_stack = new QStackedWidget(this);
     m_stack->setContentsMargins(0, 0, 0, 0);
     g->addWidget(m_stack, 2, 0, 1, 4);
 
     // Identity widget
     m_stack->addWidget(new QWidget(this));
 
     // Table widget
     QWidget *tableWidget = new QWidget(m_stack);
     QGridLayout *tableLayout = new QGridLayout(tableWidget);
     tableLayout->addWidget(new QLabel(i18n("Values"), tableWidget), 0, 0);
     m_tableValues = new KLineEdit(tableWidget);
     tableLayout->addWidget(m_tableValues, 0, 1);
     tableLayout->setContentsMargins(0, 0, 0, 0);
     tableLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 0);
     m_stack->addWidget(tableWidget);
 
     // Discrete widget
     QWidget *discreteWidget = new QWidget(m_stack);
     QGridLayout *discreteLayout = new QGridLayout(discreteWidget);
     discreteLayout->addWidget(new QLabel(i18n("Values"), discreteWidget), 0, 0);
     m_discreteValues = new KLineEdit(discreteWidget);
     discreteLayout->addWidget(m_discreteValues, 0, 1);
     discreteLayout->setContentsMargins(0, 0, 0, 0);
     discreteLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 0);
     m_stack->addWidget(discreteWidget);
 
     // Linear widget
     QWidget *linearWidget = new QWidget(m_stack);
     QGridLayout *linearLayout = new QGridLayout(linearWidget);
     linearLayout->addWidget(new QLabel(i18n("Slope"), linearWidget), 0, 0);
 	m_slope = new KisDoubleParseSpinBox(linearWidget);
     m_slope->setRange(m_slope->minimum(), m_slope->maximum());
     m_slope->setSingleStep(ValueStep);
     linearLayout->addWidget(m_slope, 0, 1);
     linearLayout->addWidget(new QLabel(i18n("Intercept")), 1, 0);
 	m_intercept = new KisDoubleParseSpinBox(linearWidget);
     m_intercept->setRange(m_intercept->minimum(), m_intercept->maximum());
     m_intercept->setSingleStep(ValueStep);
     linearLayout->addWidget(m_intercept, 1, 1);
     linearLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 2, 0);
     linearLayout->setContentsMargins(0, 0, 0, 0);
     linearWidget->setLayout(linearLayout);
     m_stack->addWidget(linearWidget);
 
     QWidget *gammaWidget = new QWidget(m_stack);
     QGridLayout *gammaLayout = new QGridLayout(gammaWidget);
     gammaLayout->addWidget(new QLabel(i18n("Amplitude"), gammaWidget), 0, 0);
 	m_amplitude = new KisDoubleParseSpinBox(gammaWidget);
     m_amplitude->setRange(m_amplitude->minimum(), m_amplitude->maximum());
     m_amplitude->setSingleStep(ValueStep);
     gammaLayout->addWidget(m_amplitude, 0, 1);
     gammaLayout->addWidget(new QLabel(i18n("Exponent"), gammaWidget), 1, 0);
 	m_exponent = new KisDoubleParseSpinBox(gammaWidget);
     m_exponent->setRange(m_exponent->minimum(), m_exponent->maximum());
     m_exponent->setSingleStep(ValueStep);
     gammaLayout->addWidget(m_exponent, 1, 1);
     gammaLayout->addWidget(new QLabel(i18n("Offset"), gammaWidget), 2, 0);
 	m_offset = new KisDoubleParseSpinBox(gammaWidget);
     m_offset->setRange(m_offset->minimum(), m_offset->maximum());
     m_offset->setSingleStep(ValueStep);
     gammaLayout->addWidget(m_offset, 2, 1);
     gammaLayout->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 3, 0);
     gammaLayout->setContentsMargins(0, 0, 0, 0);
     gammaWidget->setLayout(gammaLayout);
     m_stack->addWidget(gammaWidget);
 
     setLayout(g);
 
     connect(m_function, SIGNAL(currentIndexChanged(int)), m_stack, SLOT(setCurrentIndex(int)));
     connect(m_function, SIGNAL(currentIndexChanged(int)), this, SLOT(functionChanged(int)));
     connect(m_tableValues, SIGNAL(editingFinished()), this, SLOT(tableValuesChanged()));
     connect(m_discreteValues, SIGNAL(editingFinished()), this, SLOT(discreteValuesChanged()));
     connect(m_slope, SIGNAL(valueChanged(double)), this, SLOT(slopeChanged(double)));
     connect(m_intercept, SIGNAL(valueChanged(double)), this, SLOT(interceptChanged(double)));
     connect(m_amplitude, SIGNAL(valueChanged(double)), this, SLOT(amplitudeChanged(double)));
     connect(m_exponent, SIGNAL(valueChanged(double)), this, SLOT(exponentChanged(double)));
     connect(m_offset, SIGNAL(valueChanged(double)), this, SLOT(offsetChanged(double)));
     connect(group, SIGNAL(buttonClicked(int)), this, SLOT(channelSelected(int)));
 }
 
 void ComponentTransferEffectConfigWidget::updateControls()
 {
     m_function->blockSignals(true);
 
     QString values;
 
     switch (m_effect->function(m_currentChannel)) {
     case ComponentTransferEffect::Identity:
         m_function->setCurrentIndex(0);
         break;
     case ComponentTransferEffect::Table:
         m_function->setCurrentIndex(1);
         m_tableValues->blockSignals(true);
         Q_FOREACH (qreal v, m_effect->tableValues(m_currentChannel)) {
             values += QString("%1;").arg(v);
         }
         m_tableValues->setText(values);
         m_tableValues->blockSignals(false);
         break;
     case ComponentTransferEffect::Discrete:
         m_function->setCurrentIndex(2);
         m_discreteValues->blockSignals(true);
         Q_FOREACH (qreal v, m_effect->tableValues(m_currentChannel)) {
             values += QString("%1;").arg(v);
         }
         m_discreteValues->setText(values);
         m_discreteValues->blockSignals(false);
         break;
     case ComponentTransferEffect::Linear:
         m_function->setCurrentIndex(3);
         m_slope->blockSignals(true);
         m_slope->setValue(m_effect->slope(m_currentChannel));
         m_slope->blockSignals(false);
         m_intercept->blockSignals(true);
         m_intercept->setValue(m_effect->intercept(m_currentChannel));
         m_intercept->blockSignals(false);
         break;
     case ComponentTransferEffect::Gamma:
         m_function->setCurrentIndex(4);
         m_amplitude->blockSignals(true);
         m_amplitude->setValue(m_effect->amplitude(m_currentChannel));
         m_amplitude->blockSignals(false);
         m_exponent->blockSignals(true);
         m_exponent->setValue(m_effect->exponent(m_currentChannel));
         m_exponent->blockSignals(false);
         m_offset->blockSignals(true);
         m_offset->setValue(m_effect->offset(m_currentChannel));
         m_offset->blockSignals(false);
         break;
     }
 
     m_function->blockSignals(false);
     m_stack->setCurrentIndex(m_function->currentIndex());
 }
 
 bool ComponentTransferEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<ComponentTransferEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     updateControls();
 
     return true;
 }
 
 void ComponentTransferEffectConfigWidget::slopeChanged(double slope)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setSlope(m_currentChannel, slope);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::interceptChanged(double intercept)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setIntercept(m_currentChannel, intercept);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::amplitudeChanged(double amplitude)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setAmplitude(m_currentChannel, amplitude);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::exponentChanged(double exponent)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setExponent(m_currentChannel, exponent);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::offsetChanged(double offset)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setOffset(m_currentChannel, offset);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::tableValuesChanged()
 {
     QStringList values = m_tableValues->text().split(';', QString::SkipEmptyParts);
     QList<qreal> tableValues;
     Q_FOREACH (const QString &v, values) {
         tableValues.append(v.toDouble());
     }
     m_effect->setTableValues(m_currentChannel, tableValues);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::discreteValuesChanged()
 {
     QStringList values = m_discreteValues->text().split(';', QString::SkipEmptyParts);
     QList<qreal> tableValues;
     Q_FOREACH (const QString &v, values) {
         tableValues.append(v.toDouble());
     }
     m_effect->setTableValues(m_currentChannel, tableValues);
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::functionChanged(int index)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setFunction(m_currentChannel, static_cast<ComponentTransferEffect::Function>(index));
 
     emit filterChanged();
 }
 
 void ComponentTransferEffectConfigWidget::channelSelected(int channel)
 {
     m_currentChannel = static_cast<ComponentTransferEffect::Channel>(channel);
     updateControls();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
index 8144e9fe9c..6451cffba6 100644
--- a/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
@@ -1,109 +1,109 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "CompositeEffectConfigWidget.h"
 #include "CompositeEffect.h"
 #include "KoFilterEffect.h"
 
 #include <QSpinBox>
 #include <kcombobox.h>
 #include <klocalizedstring.h>
 
 #include <QGridLayout>
 #include <QLabel>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 CompositeEffectConfigWidget::CompositeEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     g->addWidget(new QLabel(i18n("Operation"), this), 0, 0);
 
     m_operation = new KComboBox(this);
     m_operation->addItem(i18nc("blending mode", "Over"));
     m_operation->addItem(i18nc("blending mode", "In"));
     m_operation->addItem(i18nc("blending mode", "Out"));
     m_operation->addItem(i18nc("blending mode", "Atop"));
     m_operation->addItem(i18nc("blending mode", "Xor"));
     m_operation->addItem(i18nc("blending mode", "Arithmetic"));
     g->addWidget(m_operation, 0, 1);
 
     m_arithmeticWidget = new QWidget(this);
     QGridLayout *arithmeticLayout = new QGridLayout(m_arithmeticWidget);
     for (int i = 0; i < 4; ++i) {
 		m_k[i] = new KisDoubleParseSpinBox(m_arithmeticWidget);
         arithmeticLayout->addWidget(new QLabel(QString("k%1").arg(i + 1)), i / 2, (2 * i) % 4);
         arithmeticLayout->addWidget(m_k[i], i / 2, (2 * i + 1) % 4);
         connect(m_k[i], SIGNAL(valueChanged(double)), this, SLOT(valueChanged()));
     }
     m_arithmeticWidget->setContentsMargins(0, 0, 0, 0);
     g->addWidget(m_arithmeticWidget, 1, 0, 1, 2);
     g->addItem(new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 2, 0);
 
     connect(m_operation, SIGNAL(currentIndexChanged(int)), this, SLOT(operationChanged(int)));
 }
 
 bool CompositeEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<CompositeEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_operation->blockSignals(true);
     m_operation->setCurrentIndex(m_effect->operation());
     m_operation->blockSignals(false);
 
     const qreal *k = m_effect->arithmeticValues();
     for (int i = 0; i < 4; ++i) {
         m_k[i]->blockSignals(true);
         m_k[i]->setValue(k[i]);
         m_k[i]->blockSignals(false);
     }
     m_arithmeticWidget->setVisible(m_effect->operation() == CompositeEffect::Arithmetic);
 
     return true;
 }
 
 void CompositeEffectConfigWidget::operationChanged(int index)
 {
     m_arithmeticWidget->setVisible(index == 6);
     if (m_effect) {
         m_effect->setOperation(static_cast<CompositeEffect::Operation>(index));
         emit filterChanged();
     }
 }
 
 void CompositeEffectConfigWidget::valueChanged()
 {
     if (!m_effect) {
         return;
     }
 
     qreal k[4] = {0};
     for (int i = 0; i < 4; ++i) {
         k[i] = m_k[i]->value();
     }
 
     m_effect->setArithmeticValues(k);
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
index 134173ad60..52550da679 100644
--- a/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
@@ -1,262 +1,262 @@
 /* This file is part of the KDE project
  * Copyright (c) 2010 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "ConvolveMatrixEffectConfigWidget.h"
 #include "ConvolveMatrixEffect.h"
 #include "KoFilterEffect.h"
 #include "MatrixDataModel.h"
 
 #include <klocalizedstring.h>
 #include <kcombobox.h>
 #include <QDialog>
 
 #include <QGridLayout>
 #include <QLabel>
 #include <QDoubleSpinBox>
 #include <QPushButton>
 #include <QCheckBox>
 #include <QTableView>
 #include <QHeaderView>
 #include <KConfigGroup>
 
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 ConvolveMatrixEffectConfigWidget::ConvolveMatrixEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     m_edgeMode = new KComboBox(this);
     m_edgeMode->addItem(i18n("Duplicate"));
     m_edgeMode->addItem(i18n("Wrap"));
     m_edgeMode->addItem(i18n("None"));
     g->addWidget(new QLabel(i18n("Edge mode:"), this), 0, 0);
     g->addWidget(m_edgeMode, 0, 1, 1, 3);
 
 	m_orderX = new KisIntParseSpinBox(this);
     m_orderX->setRange(1, 30);
 	m_orderY = new KisIntParseSpinBox(this);
     m_orderY->setRange(1, 30);
     g->addWidget(new QLabel(i18n("Kernel size:"), this), 1, 0);
     g->addWidget(m_orderX, 1, 1);
     g->addWidget(new QLabel("X", this), 1, 2, Qt::AlignHCenter);
     g->addWidget(m_orderY, 1, 3);
 
 	m_targetX = new KisIntParseSpinBox(this);
     m_targetX->setRange(0, 30);
 	m_targetY = new KisIntParseSpinBox(this);
     m_targetY->setRange(0, 30);
     g->addWidget(new QLabel(i18n("Target point:"), this), 2, 0);
     g->addWidget(m_targetX, 2, 1);
     g->addWidget(new QLabel("X", this), 2, 2, Qt::AlignHCenter);
     g->addWidget(m_targetY, 2, 3);
 
 	m_divisor = new KisDoubleParseSpinBox(this);
 	m_bias = new KisDoubleParseSpinBox(this);
     g->addWidget(new QLabel(i18n("Divisor:"), this), 3, 0);
     g->addWidget(m_divisor, 3, 1);
     g->addWidget(new QLabel(i18n("Bias:"), this), 3, 2);
     g->addWidget(m_bias, 3, 3);
 
     m_preserveAlpha = new QCheckBox(i18n("Preserve alpha"), this);
     g->addWidget(m_preserveAlpha, 4, 1, 1, 3);
 
     QPushButton *kernelButton = new QPushButton(i18n("Edit kernel"), this);
     g->addWidget(kernelButton, 5, 0, 1, 4);
 
     setLayout(g);
 
     connect(m_edgeMode, SIGNAL(currentIndexChanged(int)), this, SLOT(edgeModeChanged(int)));
     connect(m_orderX, SIGNAL(valueChanged(int)), this, SLOT(orderChanged(int)));
     connect(m_orderY, SIGNAL(valueChanged(int)), this, SLOT(orderChanged(int)));
     connect(m_targetX, SIGNAL(valueChanged(int)), this, SLOT(targetChanged(int)));
     connect(m_targetY, SIGNAL(valueChanged(int)), this, SLOT(targetChanged(int)));
     connect(m_divisor, SIGNAL(valueChanged(double)), this, SLOT(divisorChanged(double)));
     connect(m_bias, SIGNAL(valueChanged(double)), this, SLOT(biasChanged(double)));
     connect(kernelButton, SIGNAL(clicked(bool)), this, SLOT(editKernel()));
     connect(m_preserveAlpha, SIGNAL(toggled(bool)), this, SLOT(preserveAlphaChanged(bool)));
 
     m_matrixModel = new MatrixDataModel(this);
 }
 
 bool ConvolveMatrixEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<ConvolveMatrixEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_edgeMode->blockSignals(true);
     m_edgeMode->setCurrentIndex(m_effect->edgeMode());
     m_edgeMode->blockSignals(false);
     m_orderX->blockSignals(true);
     m_orderX->setValue(m_effect->order().x());
     m_orderX->blockSignals(false);
     m_orderY->blockSignals(true);
     m_orderY->setValue(m_effect->order().y());
     m_orderY->blockSignals(false);
     m_targetX->blockSignals(true);
     m_targetX->setMaximum(m_orderX->value());
     m_targetX->setValue(m_effect->target().x() + 1);
     m_targetX->blockSignals(false);
     m_targetY->blockSignals(true);
     m_targetY->setMaximum(m_orderY->value());
     m_targetY->setValue(m_effect->target().y() + 1);
     m_targetY->blockSignals(false);
     m_divisor->blockSignals(true);
     m_divisor->setValue(m_effect->divisor());
     m_divisor->blockSignals(false);
     m_bias->blockSignals(true);
     m_bias->setValue(m_effect->bias());
     m_bias->blockSignals(false);
     m_preserveAlpha->blockSignals(true);
     m_preserveAlpha->setChecked(m_effect->isPreserveAlphaEnabled());
     m_preserveAlpha->blockSignals(false);
 
     return true;
 }
 
 void ConvolveMatrixEffectConfigWidget::edgeModeChanged(int id)
 {
     if (!m_effect) {
         return;
     }
 
     switch (id) {
     case ConvolveMatrixEffect::Duplicate:
         m_effect->setEdgeMode(ConvolveMatrixEffect::Duplicate);
         break;
     case ConvolveMatrixEffect::Wrap:
         m_effect->setEdgeMode(ConvolveMatrixEffect::Wrap);
         break;
     case ConvolveMatrixEffect::None:
         m_effect->setEdgeMode(ConvolveMatrixEffect::None);
         break;
     }
     emit filterChanged();
 }
 
 void ConvolveMatrixEffectConfigWidget::orderChanged(int)
 {
     if (!m_effect) {
         return;
     }
 
     QPoint newOrder(m_orderX->value(), m_orderY->value());
     QPoint oldOrder = m_effect->order();
     if (newOrder != oldOrder) {
         m_effect->setOrder(newOrder);
         emit filterChanged();
     }
 
     m_targetX->setMaximum(newOrder.x());
     m_targetY->setMaximum(newOrder.y());
 }
 
 void ConvolveMatrixEffectConfigWidget::targetChanged(int)
 {
     if (!m_effect) {
         return;
     }
 
     QPoint newTarget(m_targetX->value() - 1, m_targetY->value() - 1);
     QPoint oldTarget = m_effect->target();
     if (newTarget != oldTarget) {
         m_effect->setTarget(newTarget);
         emit filterChanged();
     }
 }
 
 void ConvolveMatrixEffectConfigWidget::divisorChanged(double divisor)
 {
     if (!m_effect) {
         return;
     }
 
     if (divisor != m_effect->divisor()) {
         m_effect->setDivisor(divisor);
         emit filterChanged();
     }
 }
 
 void ConvolveMatrixEffectConfigWidget::biasChanged(double bias)
 {
     if (!m_effect) {
         return;
     }
 
     if (bias != m_effect->bias()) {
         m_effect->setBias(bias);
         emit filterChanged();
     }
 }
 
 void ConvolveMatrixEffectConfigWidget::preserveAlphaChanged(bool checked)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->enablePreserveAlpha(checked);
     emit filterChanged();
 }
 
 void ConvolveMatrixEffectConfigWidget::editKernel()
 {
     if (!m_effect) {
         return;
     }
 
     QVector<qreal> oldKernel = m_effect->kernel();
     QPoint kernelSize = m_effect->order();
     m_matrixModel->setMatrix(oldKernel, kernelSize.y(), kernelSize.x());
     connect(m_matrixModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(kernelChanged()));
 
     QPointer<QDialog> dlg = new QDialog(this);
     QTableView *table = new QTableView(dlg);
     table->setModel(m_matrixModel);
     table->horizontalHeader()->hide();
     table->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
     table->verticalHeader()->hide();
     table->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
     QVBoxLayout *mainLayout = new QVBoxLayout;
     dlg->setLayout(mainLayout);
     mainLayout->addWidget(table);
     if (dlg->exec() == QDialog::Accepted) {
         m_effect->setKernel(m_matrixModel->matrix());
         emit filterChanged();
     } else {
         m_effect->setKernel(oldKernel);
     }
     delete dlg;
 
     disconnect(m_matrixModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(kernelChanged()));
 }
 
 void ConvolveMatrixEffectConfigWidget::kernelChanged()
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setKernel(m_matrixModel->matrix());
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp b/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
index b50fb0c300..79e3676b16 100644
--- a/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
@@ -1,86 +1,86 @@
 /* This file is part of the KDE project
 * Copyright (c) 2010 Jan Hambrecht <jaham@gmx.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this library; see the file COPYING.LIB.  If not, write to
 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301, USA.
 */
 
 #include "MatrixDataModel.h"
 
-#include "kis_numparser.h"
+#include "kis_num_parser.h"
 
 MatrixDataModel::MatrixDataModel(QObject *parent)
     : QAbstractTableModel(parent)
     , m_rows(0)
     , m_cols(0)
 {
 }
 
 void MatrixDataModel::setMatrix(const QVector<qreal> &matrix, int rows, int cols)
 {
     m_matrix = matrix;
     m_rows = rows;
     m_cols = cols;
     Q_ASSERT(m_rows);
     Q_ASSERT(m_cols);
     Q_ASSERT(m_matrix.count() == m_rows * m_cols);
     reset();
 }
 
 QVector<qreal> MatrixDataModel::matrix() const
 {
     return m_matrix;
 }
 
 int MatrixDataModel::rowCount(const QModelIndex &/*parent*/) const
 {
     return m_rows;
 }
 
 int MatrixDataModel::columnCount(const QModelIndex &/*parent*/) const
 {
     return m_cols;
 }
 
 QVariant MatrixDataModel::data(const QModelIndex &index, int role) const
 {
     int element = index.row() * m_cols + index.column();
     switch (role) {
     case Qt::DisplayRole:
     case Qt::EditRole:
         return QVariant(QString("%1").arg(m_matrix[element], 2));
         break;
     default:
         return QVariant();
     }
 }
 
 bool MatrixDataModel::setData(const QModelIndex &index, const QVariant &value, int /*role*/)
 {
     int element = index.row() * m_cols + index.column();
     bool valid = false;
 	qreal elementValue = KisNumericParser::parseSimpleMathExpr(value.toString(), &valid);
     if (!valid) {
         return false;
     }
     m_matrix[element] = elementValue;
     emit dataChanged(index, index);
     return true;
 }
 
 Qt::ItemFlags MatrixDataModel::flags(const QModelIndex &/*index*/) const
 {
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
index 16a0fb7304..0b85e4f08d 100644
--- a/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
@@ -1,131 +1,131 @@
 /* This file is part of the KDE project
  * Copyright (c) 2010 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "MorphologyEffectConfigWidget.h"
 #include "MorphologyEffect.h"
 #include "KoFilterEffect.h"
 
 #include <QSpinBox>
 #include <klocalizedstring.h>
 
 #include <QGridLayout>
 #include <QLabel>
 #include <QRadioButton>
 #include <QButtonGroup>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 MorphologyEffectConfigWidget::MorphologyEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     m_operator = new QButtonGroup(this);
     QRadioButton *erode = new QRadioButton(i18n("Erode"), this);
     QRadioButton *dilate = new QRadioButton(i18n("Dilate"), this);
     m_operator->addButton(erode, MorphologyEffect::Erode);
     m_operator->addButton(dilate, MorphologyEffect::Dilate);
     g->addWidget(new QLabel(i18n("Operator:"), this), 0, 0);
     g->addWidget(erode, 0, 1);
     g->addWidget(dilate, 0, 2);
 
     g->addWidget(new QLabel(i18n("Radius x:"), this), 1, 0);
 	m_radiusX = new KisDoubleParseSpinBox(this);
     m_radiusX->setRange(0.0, 100);
     m_radiusX->setSingleStep(0.5);
     g->addWidget(m_radiusX, 1, 1, 1, 2);
 
     g->addWidget(new QLabel(i18n("Radius y:"), this), 2, 0);
 	m_radiusY = new KisDoubleParseSpinBox(this);
     m_radiusY->setRange(0.0, 100);
     m_radiusY->setSingleStep(0.5);
     g->addWidget(m_radiusY, 2, 1, 1, 2);
 
     setLayout(g);
 
     connect(m_operator, SIGNAL(buttonClicked(int)), this, SLOT(operatorChanged(int)));
     connect(m_radiusX, SIGNAL(valueChanged(double)), this, SLOT(radiusXChanged(double)));
     connect(m_radiusY, SIGNAL(valueChanged(double)), this, SLOT(radiusYChanged(double)));
 }
 
 bool MorphologyEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<MorphologyEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_operator->blockSignals(true);
     m_operator->button(m_effect->morphologyOperator())->setChecked(true);
     m_operator->blockSignals(false);
     m_radiusX->blockSignals(true);
     m_radiusX->setValue(m_effect->morphologyRadius().x() * 100);
     m_radiusX->blockSignals(false);
     m_radiusY->blockSignals(true);
     m_radiusY->setValue(m_effect->morphologyRadius().y() * 100);
     m_radiusY->blockSignals(false);
 
     return true;
 }
 
 void MorphologyEffectConfigWidget::operatorChanged(int id)
 {
     if (!m_effect) {
         return;
     }
 
     switch (id) {
     case MorphologyEffect::Erode:
         m_effect->setMorphologyOperator(MorphologyEffect::Erode);
         break;
     case MorphologyEffect::Dilate:
         m_effect->setMorphologyOperator(MorphologyEffect::Dilate);
         break;
     }
     emit filterChanged();
 }
 
 void MorphologyEffectConfigWidget::radiusXChanged(double x)
 {
     if (!m_effect) {
         return;
     }
 
     QPointF radius = m_effect->morphologyRadius();
     if (radius.x() != x) {
         m_effect->setMorphologyRadius(QPointF(x * 0.01, radius.y()));
     }
 
     emit filterChanged();
 }
 
 void MorphologyEffectConfigWidget::radiusYChanged(double y)
 {
     if (!m_effect) {
         return;
     }
 
     QPointF radius = m_effect->morphologyRadius();
     if (radius.y() != y) {
         m_effect->setMorphologyRadius(QPointF(radius.x(), y * 0.01));
     }
 
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
index 32950af694..f1f8dc4d74 100644
--- a/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
@@ -1,80 +1,80 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "OffsetEffectConfigWidget.h"
 #include "OffsetEffect.h"
 #include "KoFilterEffect.h"
 #include <QSpinBox>
 #include <klocalizedstring.h>
 #include <QGridLayout>
 #include <QLabel>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 const qreal OffsetLimit = 100.0;
 
 OffsetEffectConfigWidget::OffsetEffectConfigWidget(QWidget *parent)
     : KoFilterEffectConfigWidgetBase(parent)
     , m_effect(0)
 {
     QGridLayout *g = new QGridLayout(this);
 
     g->addWidget(new QLabel(i18n("dx"), this), 0, 0);
 	m_offsetX = new KisDoubleParseSpinBox(this);
     m_offsetX->setRange(-OffsetLimit, OffsetLimit);
     m_offsetX->setSingleStep(1.0);
     g->addWidget(m_offsetX, 0, 1);
 
     g->addWidget(new QLabel(i18n("dy"), this), 0, 2);
 	m_offsetY = new KisDoubleParseSpinBox(this);
     m_offsetY->setRange(-OffsetLimit, OffsetLimit);
     m_offsetY->setSingleStep(1.0);
     g->addWidget(m_offsetY, 0, 3);
     setLayout(g);
 
     connect(m_offsetX, SIGNAL(valueChanged(double)), this, SLOT(offsetChanged(double)));
     connect(m_offsetY, SIGNAL(valueChanged(double)), this, SLOT(offsetChanged(double)));
 }
 
 bool OffsetEffectConfigWidget::editFilterEffect(KoFilterEffect *filterEffect)
 {
     m_effect = dynamic_cast<OffsetEffect *>(filterEffect);
     if (!m_effect) {
         return false;
     }
 
     m_offsetX->blockSignals(true);
     m_offsetY->blockSignals(true);
     m_offsetX->setValue(m_effect->offset().x() * 100.0);
     m_offsetY->setValue(m_effect->offset().y() * 100.0);
     m_offsetX->blockSignals(false);
     m_offsetY->blockSignals(false);
 
     return true;
 }
 
 void OffsetEffectConfigWidget::offsetChanged(double /*offset*/)
 {
     if (!m_effect) {
         return;
     }
 
     m_effect->setOffset(0.01 * QPointF(m_offsetX->value(), m_offsetY->value()));
     emit filterChanged();
 }
diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
index a3ee219bfc..0ddb6e54a4 100644
--- a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
+++ b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
@@ -1,632 +1,632 @@
 /* This file is part of the KDE project
    Copyright (C) 2008 Fela Winkelmolen <fela.kde@gmail.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "KarbonCalligraphyOptionWidget.h"
 
 #include <KoIcon.h>
 
 #include <klocalizedstring.h>
 #include <kcombobox.h>
 #include <kconfiggroup.h>
 #include <ksharedconfig.h>
 #include <kconfig.h>
 #include <QDebug>
 #include <kmessagebox.h>
 
 #include <QInputDialog>
 #include <QSpinBox>
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 #include <QLabel>
 #include <QGridLayout>
 #include <QToolButton>
 
-#include "kis_doubleparsespinbox.h"
-#include "kis_intparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
+#include "kis_int_parse_spin_box.h"
 
 /*
 Profiles are saved in karboncalligraphyrc
 
 In the group "General", profile is the name of profile used
 
 Every profile is described in a group, the name of which is "ProfileN"
 Starting to count from 0 onwards
 (NOTE: the index in profiles is different from the N)
 
 Default profiles are added by the function addDefaultProfiles(), once they
 have been added, the entry defaultProfilesAdded in the "General" group is
 set to true
 
 TODO: add a reset defaults option?
 */
 
 // name of the configuration file
 const QString RCFILENAME = "karboncalligraphyrc";
 
 KarbonCalligraphyOptionWidget::KarbonCalligraphyOptionWidget()
     : m_changingProfile(false)
 {
     QGridLayout *layout = new QGridLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
 
     m_comboBox = new KComboBox(this);
     layout->addWidget(m_comboBox, 0, 0);
 
     m_saveButton = new QToolButton(this);
     m_saveButton->setToolTip(i18n("Save profile as..."));
     m_saveButton->setIcon(koIcon("document-save-as"));
     layout->addWidget(m_saveButton, 0, 1);
 
     m_removeButton = new QToolButton(this);
     m_removeButton->setToolTip(i18n("Remove profile"));
     m_removeButton->setIcon(koIcon("list-remove"));
     layout->addWidget(m_removeButton, 0, 2);
 
     QGridLayout *detailsLayout = new QGridLayout();
     detailsLayout->setContentsMargins(0, 0, 0, 0);
     detailsLayout->setVerticalSpacing(0);
 
     m_usePath = new QCheckBox(i18n("&Follow selected path"), this);
     detailsLayout->addWidget(m_usePath, 0, 0, 1, 4);
 
     m_usePressure = new QCheckBox(i18n("Use tablet &pressure"), this);
     detailsLayout->addWidget(m_usePressure, 1, 0, 1, 4);
 
     QLabel *widthLabel = new QLabel(i18n("Width:"), this);
     widthLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_widthBox = new KisDoubleParseSpinBox(this);
     m_widthBox->setRange(0.0, 999.0);
     widthLabel->setBuddy(m_widthBox);
     detailsLayout->addWidget(widthLabel, 2, 2);
     detailsLayout->addWidget(m_widthBox, 2, 3);
 
     QLabel *thinningLabel = new QLabel(i18n("Thinning:"), this);
     thinningLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_thinningBox = new KisDoubleParseSpinBox(this);
     m_thinningBox->setRange(-1.0, 1.0);
     m_thinningBox->setSingleStep(0.1);
     thinningLabel->setBuddy(m_thinningBox);
     detailsLayout->addWidget(thinningLabel, 2, 0);
     detailsLayout->addWidget(m_thinningBox, 2, 1);
 
     m_useAngle = new QCheckBox(i18n("Use tablet &angle"), this);
     detailsLayout->addWidget(m_useAngle, 3, 0, 1, 4);
 
     QLabel *angleLabel = new QLabel(i18n("Angle:"), this);
     angleLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_angleBox = new KisIntParseSpinBox(this);
     m_angleBox->setRange(0, 179);
     m_angleBox->setWrapping(true);
     angleLabel->setBuddy(m_angleBox);
     detailsLayout->addWidget(angleLabel, 4, 0);
     detailsLayout->addWidget(m_angleBox, 4, 1);
 
     QLabel *fixationLabel = new QLabel(i18n("Fixation:"), this);
     fixationLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_fixationBox = new KisDoubleParseSpinBox(this);
     m_fixationBox->setRange(0.0, 1.0);
     m_fixationBox->setSingleStep(0.1);
     fixationLabel->setBuddy(m_fixationBox);
     detailsLayout->addWidget(fixationLabel, 5, 0);
     detailsLayout->addWidget(m_fixationBox, 5, 1);
 
     QLabel *capsLabel = new QLabel(i18n("Caps:"), this);
     capsLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_capsBox = new KisDoubleParseSpinBox(this);
     m_capsBox->setRange(0.0, 2.0);
     m_capsBox->setSingleStep(0.03);
     capsLabel->setBuddy(m_capsBox);
     detailsLayout->addWidget(capsLabel, 5, 2);
     detailsLayout->addWidget(m_capsBox, 5, 3);
 
     QLabel *massLabel = new QLabel(i18n("Mass:"), this);
     massLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_massBox = new KisDoubleParseSpinBox(this);
     m_massBox->setRange(0.0, 20.0);
     m_massBox->setDecimals(1);
     massLabel->setBuddy(m_massBox);
     detailsLayout->addWidget(massLabel, 6, 0);
     detailsLayout->addWidget(m_massBox, 6, 1);
 
     QLabel *dragLabel = new QLabel(i18n("Drag:"), this);
     dragLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	m_dragBox = new KisDoubleParseSpinBox(this);
     m_dragBox->setRange(0.0, 1.0);
     m_dragBox->setSingleStep(0.1);
     dragLabel->setBuddy(m_dragBox);
     detailsLayout->addWidget(dragLabel, 6, 2);
     detailsLayout->addWidget(m_dragBox, 6, 3);
 
     layout->addLayout(detailsLayout, 1, 0, 1, 3);
     layout->setRowStretch(2, 1);
 
     createConnections();
     addDefaultProfiles(); // if they are already added does nothing
     loadProfiles();
 }
 
 KarbonCalligraphyOptionWidget::~KarbonCalligraphyOptionWidget()
 {
     qDeleteAll(m_profiles);
     qDebug() << "dtor!!!!";
 }
 
 void KarbonCalligraphyOptionWidget::emitAll()
 {
     emit usePathChanged(m_usePath->isChecked());
     emit usePressureChanged(m_usePressure->isChecked());
     emit useAngleChanged(m_useAngle->isChecked());
     emit widthChanged(m_widthBox->value());
     emit thinningChanged(m_thinningBox->value());
     emit angleChanged(m_angleBox->value());
     emit fixationChanged(m_fixationBox->value());
     emit capsChanged(m_capsBox->value());
     emit massChanged(m_massBox->value());
     emit dragChanged(m_dragBox->value());
 }
 
 void KarbonCalligraphyOptionWidget::loadProfile(const QString &name)
 {
     if (m_changingProfile) {
         return;
     }
     qDebug() << "trying profile" << name;
     // write the new profile in the config file
     KConfig config(RCFILENAME);
     KConfigGroup generalGroup(&config, "General");
     generalGroup.writeEntry("profile", name);
     config.sync();
 
     // and load it
     loadCurrentProfile();
 
     // don't show Current if it isn't selected
     if (name != i18n("Current")) {
         removeProfile(i18n("Current"));
     }
 }
 
 void KarbonCalligraphyOptionWidget::updateCurrentProfile()
 {
     if (!m_changingProfile) {
         saveProfile("Current");
     }
 }
 
 void KarbonCalligraphyOptionWidget::saveProfileAs()
 {
     QString name;
 
     // loop until a valid name is entered or the user cancelled
     while (1) {
         bool ok;
         name = QInputDialog::getText(this,
                                      i18n("Profile name"),
                                      i18n("Please insert the name by which "
                                           "you want to save this profile:"),
                                      QLineEdit::Normal, QString(), &ok);
         if (!ok) {
             return;
         }
 
         if (name.isEmpty() || name == i18n("Current")) {
             KMessageBox::sorry(this,
                                i18n("Sorry, the name you entered is invalid."),
                                i18nc("invalid profile name", "Invalid name."));
             // try again
             saveProfileAs();
             continue; // ask again
         }
 
         if (m_profiles.contains(name)) {
             int ret = KMessageBox::warningYesNo(this,
                                                 i18n("A profile with that name already exists.\n"
                                                         "Do you want to overwrite it?"));
 
             if (ret == KMessageBox::Yes) {
                 break;    // exit while loop (save profile)
             }
             // else ask again
         } else {
             // the name is valid
             break; // exit while loop (save profile)
         }
     }
 
     saveProfile(name);
 }
 
 void KarbonCalligraphyOptionWidget::removeProfile()
 {
     removeProfile(m_comboBox->currentText());
 }
 
 void KarbonCalligraphyOptionWidget::toggleUseAngle(bool checked)
 {
     m_angleBox->setEnabled(! checked);
 }
 
 void KarbonCalligraphyOptionWidget::increaseWidth()
 {
     m_widthBox->setValue(m_widthBox->value() + 1);
 }
 
 void KarbonCalligraphyOptionWidget::decreaseWidth()
 {
     m_widthBox->setValue(m_widthBox->value() - 1);
 }
 
 void KarbonCalligraphyOptionWidget::increaseAngle()
 {
     m_angleBox->setValue((m_angleBox->value() + 3) % 180);
 }
 
 void KarbonCalligraphyOptionWidget::decreaseAngle()
 {
     m_angleBox->setValue((m_angleBox->value() - 3) % 180);
 }
 
 /******************************************************************************
  ************************* Convenience Functions ******************************
  ******************************************************************************/
 
 void KarbonCalligraphyOptionWidget::createConnections()
 {
     connect(m_comboBox, SIGNAL(currentIndexChanged(QString)),
             SLOT(loadProfile(QString)));
 
     // propagate changes
     connect(m_usePath, SIGNAL(toggled(bool)),
             SIGNAL(usePathChanged(bool)));
 
     connect(m_usePressure, SIGNAL(toggled(bool)),
             SIGNAL(usePressureChanged(bool)));
 
     connect(m_useAngle, SIGNAL(toggled(bool)),
             SIGNAL(useAngleChanged(bool)));
 
     connect(m_widthBox, SIGNAL(valueChanged(double)),
             SIGNAL(widthChanged(double)));
 
     connect(m_thinningBox, SIGNAL(valueChanged(double)),
             SIGNAL(thinningChanged(double)));
 
     connect(m_angleBox, SIGNAL(valueChanged(int)),
             SIGNAL(angleChanged(int)));
 
     connect(m_fixationBox, SIGNAL(valueChanged(double)),
             SIGNAL(fixationChanged(double)));
 
     connect(m_capsBox, SIGNAL(valueChanged(double)),
             SIGNAL(capsChanged(double)));
 
     connect(m_massBox, SIGNAL(valueChanged(double)),
             SIGNAL(massChanged(double)));
 
     connect(m_dragBox, SIGNAL(valueChanged(double)),
             SIGNAL(dragChanged(double)));
 
     // update profile
     connect(m_usePath, SIGNAL(toggled(bool)),
             SLOT(updateCurrentProfile()));
 
     connect(m_usePressure, SIGNAL(toggled(bool)),
             SLOT(updateCurrentProfile()));
 
     connect(m_useAngle, SIGNAL(toggled(bool)),
             SLOT(updateCurrentProfile()));
 
     connect(m_widthBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_thinningBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_angleBox, SIGNAL(valueChanged(int)),
             SLOT(updateCurrentProfile()));
 
     connect(m_fixationBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_capsBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_massBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_dragBox, SIGNAL(valueChanged(double)),
             SLOT(updateCurrentProfile()));
 
     connect(m_saveButton, SIGNAL(clicked()), SLOT(saveProfileAs()));
     connect(m_removeButton, SIGNAL(clicked()), SLOT(removeProfile()));
 
     // visualization
     connect(m_useAngle, SIGNAL(toggled(bool)), SLOT(toggleUseAngle(bool)));
 }
 
 void KarbonCalligraphyOptionWidget::addDefaultProfiles()
 {
     // check if the profiles where already added
     KConfig config(RCFILENAME);
     KConfigGroup generalGroup(&config, "General");
 
     if (generalGroup.readEntry("defaultProfilesAdded", false)) {
         return;
     }
 
     KConfigGroup profile0(&config, "Profile0");
     profile0.writeEntry("name", i18n("Mouse"));
     profile0.writeEntry("usePath", false);
     profile0.writeEntry("usePressure", false);
     profile0.writeEntry("useAngle", false);
     profile0.writeEntry("width", 30.0);
     profile0.writeEntry("thinning", 0.2);
     profile0.writeEntry("angle", 30);
     profile0.writeEntry("fixation", 1.0);
     profile0.writeEntry("caps", 0.0);
     profile0.writeEntry("mass", 3.0);
     profile0.writeEntry("drag", 0.7);
 
     KConfigGroup profile1(&config, "Profile1");
     profile1.writeEntry("name", i18n("Graphics Pen"));
     profile1.writeEntry("width", 50.0);
     profile1.writeEntry("usePath", false);
     profile1.writeEntry("usePressure", false);
     profile1.writeEntry("useAngle", false);
     profile1.writeEntry("thinning", 0.2);
     profile1.writeEntry("angle", 30);
     profile1.writeEntry("fixation", 1.0);
     profile1.writeEntry("caps", 0.0);
     profile1.writeEntry("mass", 1.0);
     profile1.writeEntry("drag", 0.9);
 
     generalGroup.writeEntry("profile", i18n("Mouse"));
     generalGroup.writeEntry("defaultProfilesAdded", true);
 
     config.sync();
 }
 
 void KarbonCalligraphyOptionWidget::loadProfiles()
 {
     KConfig config(RCFILENAME);
 
     // load profiles as long as they are present
     int i = 0;
     while (1) { // forever
         KConfigGroup profileGroup(&config, "Profile" + QString::number(i));
         // invalid profile, assume we reached the last one
         if (!profileGroup.hasKey("name")) {
             break;
         }
 
         Profile *profile = new Profile;
         profile->index = i;
         profile->name =         profileGroup.readEntry("name", QString());
         profile->usePath =      profileGroup.readEntry("usePath", false);
         profile->usePressure =  profileGroup.readEntry("usePressure", false);
         profile->useAngle =     profileGroup.readEntry("useAngle", false);
         profile->width =        profileGroup.readEntry("width", 30.0);
         profile->thinning =     profileGroup.readEntry("thinning", 0.2);
         profile->angle =        profileGroup.readEntry("angle", 30);
         profile->fixation =     profileGroup.readEntry("fixation", 0.0);
         profile->caps =         profileGroup.readEntry("caps", 0.0);
         profile->mass =         profileGroup.readEntry("mass", 3.0);
         profile->drag =         profileGroup.readEntry("drag", 0.7);
 
         m_profiles.insert(profile->name, profile);
         ++i;
     }
 
     m_changingProfile = true;
     ProfileMap::const_iterator it = m_profiles.constBegin();
     ProfileMap::const_iterator lastIt = m_profiles.constEnd();
     for (; it != lastIt; ++it) {
         m_comboBox->addItem(it.key());
     }
     m_changingProfile = false;
 
     loadCurrentProfile();
 }
 
 void KarbonCalligraphyOptionWidget::loadCurrentProfile()
 {
     KConfig config(RCFILENAME);
     KConfigGroup generalGroup(&config, "General");
     QString currentProfile = generalGroup.readEntry("profile", QString());
     qDebug() << currentProfile;
     // find the index needed by the comboBox
     int index = profilePosition(currentProfile);
 
     if (currentProfile.isEmpty() || index < 0) {
         qDebug() << "invalid karboncalligraphyrc!!" << currentProfile << index;
         return;
     }
 
     qDebug() << m_comboBox->currentIndex() << index;
     m_comboBox->setCurrentIndex(index);
 
     Profile *profile = m_profiles[currentProfile];
 
     m_changingProfile = true;
     m_usePath->setChecked(profile->usePath);
     m_usePressure->setChecked(profile->usePressure);
     m_useAngle->setChecked(profile->useAngle);
     m_widthBox->setValue(profile->width);
     m_thinningBox->setValue(profile->thinning);
     m_angleBox->setValue(profile->angle);
     m_fixationBox->setValue(profile->fixation);
     m_capsBox->setValue(profile->caps);
     m_massBox->setValue(profile->mass);
     m_dragBox->setValue(profile->drag);
     m_changingProfile = false;
 }
 
 void KarbonCalligraphyOptionWidget::saveProfile(const QString &name)
 {
     qDebug() << name;
     Profile *profile = new Profile;
     profile->name = name;
     profile->usePath = m_usePath->isChecked();
     profile->usePressure = m_usePressure->isChecked();
     profile->useAngle = m_useAngle->isChecked();
     profile->width = m_widthBox->value();
     profile->thinning = m_thinningBox->value();
     profile->angle = m_angleBox->value();
     profile->fixation = m_fixationBox->value();
     profile->caps = m_capsBox->value();
     profile->mass = m_massBox->value();
     profile->drag = m_dragBox->value();
 
     if (m_profiles.contains(name)) {
         // there is already a profile with the same name, overwrite
         profile->index = m_profiles[name]->index;
         m_profiles.insert(name, profile);
     } else {
         // it is a new profile
         profile->index = m_profiles.count();
         m_profiles.insert(name, profile);
         // add the profile to the combobox
         qDebug() << "BEFORE:";
         QString dbg;
         for (int i = 0; i < m_comboBox->count(); ++i) {
             dbg += m_comboBox->itemText(i) + ' ';
         }
         qDebug() << dbg;
         int pos = profilePosition(name);
         m_changingProfile = true;
         m_comboBox->insertItem(pos, name);
         m_changingProfile = false;
         qDebug() << "AFTER:";
         for (int i = 0; i < m_comboBox->count(); ++i) {
             dbg += m_comboBox->itemText(i) + ' ';
         }
         qDebug() << dbg;
         qDebug() << "new at" << pos << m_comboBox->itemText(pos) << name;
     }
 
     KConfig config(RCFILENAME);
     QString str = "Profile" + QString::number(profile->index);
     KConfigGroup profileGroup(&config, str);
 
     profileGroup.writeEntry("name", name);
     profileGroup.writeEntry("usePath", profile->usePath);
     profileGroup.writeEntry("usePressure", profile->usePressure);
     profileGroup.writeEntry("useAngle", profile->useAngle);
     profileGroup.writeEntry("width", profile->width);
     profileGroup.writeEntry("thinning", profile->thinning);
     profileGroup.writeEntry("angle", profile->angle);
     profileGroup.writeEntry("fixation", profile->fixation);
     profileGroup.writeEntry("caps", profile->caps);
     profileGroup.writeEntry("mass", profile->mass);
     profileGroup.writeEntry("drag", profile->drag);
 
     KConfigGroup generalGroup(&config, "General");
     generalGroup.writeEntry("profile", name);
 
     config.sync();
     qDebug() << name;
 
     int pos = profilePosition(name);
     qDebug() << "adding in" << pos << m_comboBox->itemText(pos);
     m_comboBox->setCurrentIndex(profilePosition(name));
     qDebug() << m_comboBox->currentText();
 }
 
 void KarbonCalligraphyOptionWidget::removeProfile(const QString &name)
 {
     qDebug() << "removing profile" << name;
 
     int index = profilePosition(name);
     if (index < 0) {
         return;    // no such profile
     }
 
     // remove the file from the config file
     KConfig config(RCFILENAME);
     int deletedIndex = m_profiles[name]->index;
     QString deletedGroup = "Profile" + QString::number(deletedIndex);
     qDebug() << deletedGroup;
     config.deleteGroup(deletedGroup);
     config.sync();
 
     // and from profiles
     m_profiles.remove(name);
 
     m_comboBox->removeItem(index);
 
     // now in the config file there is value ProfileN missing,
     // where N = configIndex, so put the last one there
     if (m_profiles.isEmpty()) {
         return;
     }
 
     int lastN = -1;
     Profile *profile = 0; // profile to be moved, will be the last one
     Q_FOREACH (Profile *p, m_profiles) {
         if (p->index > lastN) {
             lastN = p->index;
             profile = p;
         }
     }
 
     Q_ASSERT(profile != 0);
 
     // do nothing if the deleted group was the last one
     if (deletedIndex > lastN) {
         return;
     }
 
     QString lastGroup = "Profile" + QString::number(lastN);
     config.deleteGroup(lastGroup);
 
     KConfigGroup profileGroup(&config, deletedGroup);
     profileGroup.writeEntry("name", profile->name);
     profileGroup.writeEntry("usePath", profile->usePath);
     profileGroup.writeEntry("usePressure", profile->usePressure);
     profileGroup.writeEntry("useAngle", profile->useAngle);
     profileGroup.writeEntry("width", profile->width);
     profileGroup.writeEntry("thinning", profile->thinning);
     profileGroup.writeEntry("angle", profile->angle);
     profileGroup.writeEntry("fixation", profile->fixation);
     profileGroup.writeEntry("caps", profile->caps);
     profileGroup.writeEntry("mass", profile->mass);
     profileGroup.writeEntry("drag", profile->drag);
     config.sync();
 
     profile->index = deletedIndex;
 }
 
 int KarbonCalligraphyOptionWidget::profilePosition(const QString &profileName)
 {
     int res = 0;
     ProfileMap::const_iterator it = m_profiles.constBegin();
     ProfileMap::const_iterator lastIt = m_profiles.constEnd();
     for (; it != lastIt; ++it) {
         if (it.key() == profileName) {
             return res;
         }
         ++res;
     }
     return -1;
 }
 
 void KarbonCalligraphyOptionWidget::setUsePathEnabled(bool enabled)
 {
     m_usePath->setEnabled(enabled);
 }
diff --git a/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui b/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
index 53e5e87402..ddd78a06cc 100644
--- a/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
+++ b/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
@@ -1,161 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PatternOptionsWidget</class>
  <widget class="QWidget" name="PatternOptionsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>240</width>
     <height>253</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0" colspan="3">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Repeat:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="3" colspan="2">
     <widget class="KComboBox" name="patternRepeat"/>
    </item>
    <item row="1" column="0" colspan="3">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Reference Point:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="3" colspan="2">
     <widget class="KComboBox" name="referencePoint"/>
    </item>
    <item row="2" column="0" colspan="5">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>Reference Point Offset</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>X:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KisDoubleParseSpinBox" name="refPointOffsetX"/>
    </item>
    <item row="3" column="2" colspan="2">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Y:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="4">
     <widget class="KisDoubleParseSpinBox" name="refPointOffsetY"/>
    </item>
    <item row="4" column="0" colspan="4">
     <widget class="QLabel" name="label_10">
      <property name="text">
       <string>Tile Offset</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>X:</string>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="KisDoubleParseSpinBox" name="tileOffsetX"/>
    </item>
    <item row="5" column="2" colspan="2">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>Y:</string>
      </property>
     </widget>
    </item>
    <item row="5" column="4">
     <widget class="KisDoubleParseSpinBox" name="tileOffsetY"/>
    </item>
    <item row="6" column="0" colspan="4">
     <widget class="QLabel" name="label_11">
      <property name="text">
       <string>Pattern Size</string>
      </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>W:</string>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="KisIntParseSpinBox" name="patternWidth"/>
    </item>
    <item row="7" column="2" colspan="2">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>H:</string>
      </property>
     </widget>
    </item>
    <item row="7" column="4">
     <widget class="KisIntParseSpinBox" name="patternHeight"/>
    </item>
    <item row="8" column="1" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>94</width>
        <height>121</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp b/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
index 7906e6fd28..b081c2ea42 100644
--- a/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
+++ b/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
@@ -1,554 +1,554 @@
 /* This file is part of the KDE project
  * Copyright (c) 2009-2011 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "KarbonFilterEffectsTool.h"
 
 #include "KoFilterEffect.h"
 #include "KoFilterEffectStack.h"
 #include "KoFilterEffectFactoryBase.h"
 #include "KoFilterEffectRegistry.h"
 #include "KoFilterEffectConfigWidgetBase.h"
 #include "KoCanvasBase.h"
 #include "KoDocumentResourceManager.h"
 #include "KoShapeManager.h"
 #include "KoViewConverter.h"
 #include "KoSelection.h"
 #include "FilterEffectEditWidget.h"
 #include "FilterEffectResource.h"
 #include "FilterResourceServerProvider.h"
 #include "FilterStackSetCommand.h"
 #include "FilterRegionChangeCommand.h"
 #include "FilterRegionEditStrategy.h"
 #include "KoResourceServerAdapter.h"
 #include "KoResourceSelector.h"
 #include <KoPointerEvent.h>
 
 #include <KoIcon.h>
 
 #include <kcombobox.h>
 #include <klocalizedstring.h>
 #include <QDialog>
 #include <QSpinBox>
 
 #include <QWidget>
 #include <QGridLayout>
 #include <QToolButton>
 #include <QStackedWidget>
 #include <QLabel>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "kis_doubleparsespinbox.h"
+#include "kis_double_parse_spin_box.h"
 
 class KarbonFilterEffectsTool::Private
 {
 public:
     Private()
         : filterSelector(0)
         , configSelector(0)
         , configStack(0)
         , posX(0)
         , posY(0)
         , posW(0)
         , posH(0)
         , clearButton(0)
         , currentEffect(0)
         , currentPanel(0)
         , currentShape(0)
     {
     }
 
     void fillConfigSelector(KoShape *shape, KarbonFilterEffectsTool *tool)
     {
         if (!configSelector) {
             return;
         }
 
         configSelector->clear();
         clearButton->setEnabled(false);
 
         if (!shape || !shape->filterEffectStack()) {
             addWidgetForEffect(0, tool);
             return;
         }
 
         configSelector->blockSignals(true);
 
         int index = 0;
         Q_FOREACH (KoFilterEffect *effect, shape->filterEffectStack()->filterEffects()) {
             configSelector->addItem(QString("%1 - ").arg(index) + effect->name());
             index++;
         }
 
         configSelector->blockSignals(false);
 
         KoFilterEffect *effect = index > 0 ? shape->filterEffectStack()->filterEffects().first() : 0;
 
         addWidgetForEffect(effect, tool);
         clearButton->setEnabled(shape->filterEffectStack() != 0);
     }
 
     void addWidgetForEffect(KoFilterEffect *filterEffect, KarbonFilterEffectsTool *tool)
     {
         // remove current widget if new effect is zero or effect type has changed
         if (!filterEffect || (currentEffect && filterEffect->id() != currentEffect->id())) {
             while (configStack->count()) {
                 configStack->removeWidget(configStack->widget(0));
             }
         }
 
         if (!filterEffect) {
             currentEffect = 0;
             currentPanel = 0;
         } else if (!currentEffect || currentEffect->id() != filterEffect->id()) {
             // when a effect is set and is differs from the previous one
             // get the config widget and insert it into the option widget
             currentEffect = filterEffect;
 
             KoFilterEffectRegistry *registry = KoFilterEffectRegistry::instance();
             KoFilterEffectFactoryBase *factory = registry->value(currentEffect->id());
             if (!factory) {
                 return;
             }
 
             currentPanel = factory->createConfigWidget();
             if (!currentPanel) {
                 return;
             }
 
             currentPanel->layout()->setContentsMargins(0, 0, 0, 0);
             configStack->insertWidget(0, currentPanel);
             configStack->layout()->setContentsMargins(0, 0, 0, 0);
             connect(currentPanel, SIGNAL(filterChanged()), tool, SLOT(filterChanged()));
         }
 
         if (currentPanel) {
             currentPanel->editFilterEffect(filterEffect);
         }
 
         updateFilterRegion();
     }
 
     void updateFilterRegion()
     {
         QRectF region = currentEffect ? currentEffect->filterRect() : QRectF(0, 0, 0, 0);
 
         posX->blockSignals(true);
         posX->setValue(100.0 * region.x());
         posX->blockSignals(false);
         posX->setEnabled(currentEffect != 0);
         posY->blockSignals(true);
         posY->setValue(100.0 * region.y());
         posY->blockSignals(false);
         posY->setEnabled(currentEffect != 0);
         posW->blockSignals(true);
         posW->setValue(100.0 * region.width());
         posW->blockSignals(false);
         posW->setEnabled(currentEffect != 0);
         posH->blockSignals(true);
         posH->setValue(100.0 * region.height());
         posH->blockSignals(false);
         posH->setEnabled(currentEffect != 0);
     }
 
     EditMode editModeFromMousePosition(const QPointF &mousePosition, KarbonFilterEffectsTool *tool)
     {
         if (currentShape && currentShape->filterEffectStack() && currentEffect) {
             // get the size rect of the shape
             QRectF sizeRect(QPointF(), currentShape->size());
             // get the filter rectangle in shape coordinates
             QRectF filterRect = currentEffect->filterRectForBoundingRect(sizeRect);
             // get the transformation from document to shape coordinates
             QTransform transform = currentShape->absoluteTransformation(0).inverted();
             // adjust filter rectangle by grab sensitivity
             const int grabDistance = tool->grabSensitivity();
             QPointF border = tool->canvas()->viewConverter()->viewToDocument(QPointF(grabDistance, grabDistance));
             filterRect.adjust(-border.x(), -border.y(), border.x(), border.y());
             // map event point from document to shape coordinates
             QPointF shapePoint = transform.map(mousePosition);
             // check if the mouse is inside/near our filter rect
             if (filterRect.contains(shapePoint)) {
                 if (qAbs(shapePoint.x() - filterRect.left()) <= border.x()) {
                     return MoveLeft;
                 } else if (qAbs(shapePoint.x() - filterRect.right()) <= border.x()) {
                     return MoveRight;
                 } else if (qAbs(shapePoint.y() - filterRect.top()) <= border.y()) {
                     return MoveTop;
                 } else if (qAbs(shapePoint.y() - filterRect.bottom()) <= border.y()) {
                     return MoveBottom;
                 } else {
                     return MoveAll;
                 }
             } else {
                 return None;
             }
         }
         return None;
     }
 
     KoResourceSelector *filterSelector;
     KComboBox *configSelector;
     QStackedWidget *configStack;
     QDoubleSpinBox *posX;
     QDoubleSpinBox *posY;
     QDoubleSpinBox *posW;
     QDoubleSpinBox *posH;
     QToolButton *clearButton;
     KoFilterEffect *currentEffect;
     KoFilterEffectConfigWidgetBase *currentPanel;
     KoShape *currentShape;
 };
 
 KarbonFilterEffectsTool::KarbonFilterEffectsTool(KoCanvasBase *canvas)
     : KoInteractionTool(canvas)
     , d(new Private())
 {
     connect(canvas->shapeManager(), SIGNAL(selectionChanged()),
             this, SLOT(selectionChanged()));
     connect(canvas->shapeManager(), SIGNAL(selectionContentChanged()),
             this, SLOT(selectionChanged()));
 }
 
 KarbonFilterEffectsTool::~KarbonFilterEffectsTool()
 {
     delete d;
 }
 
 void KarbonFilterEffectsTool::paint(QPainter &painter, const KoViewConverter &converter)
 {
     if (d->currentShape && d->currentShape->filterEffectStack()) {
         painter.save();
         // apply the shape transformation
         QTransform transform = d->currentShape->absoluteTransformation(&converter);
         painter.setTransform(transform, true);
         // apply the zoom transformation
         KoShape::applyConversion(painter, converter);
         // get the size rect of the shape
         QRectF sizeRect(QPointF(), d->currentShape->size());
         // get the clipping rect of the filter stack
         KoFilterEffectStack *filterStack = d->currentShape->filterEffectStack();
         QRectF clipRect = filterStack->clipRectForBoundingRect(sizeRect);
         // finally paint the clipping rect
         painter.setBrush(Qt::NoBrush);
         painter.setPen(Qt::blue);
         painter.drawRect(clipRect);
 
         if (currentStrategy()) {
             currentStrategy()->paint(painter, converter);
         } else if (d->currentEffect) {
             QRectF filterRect = d->currentEffect->filterRectForBoundingRect(sizeRect);
             // paint the filter subregion rect
             painter.setBrush(Qt::NoBrush);
             painter.setPen(Qt::red);
             painter.drawRect(filterRect);
         }
 
         painter.restore();
     }
 }
 
 void KarbonFilterEffectsTool::repaintDecorations()
 {
     if (d->currentShape && d->currentShape->filterEffectStack()) {
         QRectF bb = d->currentShape->boundingRect();
         const int radius = handleRadius();
         canvas()->updateCanvas(bb.adjusted(-radius, -radius, radius, radius));
     }
 }
 
 void KarbonFilterEffectsTool::activate(ToolActivation toolActivation, const QSet<KoShape *> &shapes)
 {
     Q_UNUSED(toolActivation);
     if (shapes.isEmpty()) {
         emit done();
         return;
     }
 
     d->currentShape = canvas()->shapeManager()->selection()->firstSelectedShape(KoFlake::TopLevelSelection);
     d->fillConfigSelector(d->currentShape, this);
 }
 
 void KarbonFilterEffectsTool::mouseMoveEvent(KoPointerEvent *event)
 {
     if (currentStrategy()) {
         KoInteractionTool::mouseMoveEvent(event);
     } else {
         EditMode mode = d->editModeFromMousePosition(event->point, this);
         switch (mode) {
         case MoveAll:
             useCursor(Qt::SizeAllCursor);
             break;
         case MoveLeft:
         case MoveRight:
             useCursor(Qt::SizeHorCursor);
             break;
         case MoveTop:
         case MoveBottom:
             useCursor(Qt::SizeVerCursor);
             break;
         case None:
             useCursor(Qt::ArrowCursor);
             break;
         }
     }
 }
 
 KoInteractionStrategy *KarbonFilterEffectsTool::createStrategy(KoPointerEvent *event)
 {
     EditMode mode = d->editModeFromMousePosition(event->point, this);
     if (mode == None) {
         return 0;
     }
 
     return new FilterRegionEditStrategy(this, d->currentShape, d->currentEffect, mode);
 }
 
 void KarbonFilterEffectsTool::presetSelected(KoResource *resource)
 {
     if (!d->currentShape) {
         return;
     }
 
     FilterEffectResource *effectResource = dynamic_cast<FilterEffectResource *>(resource);
     if (!effectResource) {
         return;
     }
 
     KoFilterEffectStack *filterStack = effectResource->toFilterStack();
     if (!filterStack) {
         return;
     }
 
     canvas()->addCommand(new FilterStackSetCommand(filterStack, d->currentShape));
     d->fillConfigSelector(d->currentShape, this);
 }
 
 void KarbonFilterEffectsTool::editFilter()
 {
     QPointer<QDialog> dlg = new QDialog();
     dlg->setWindowTitle(i18n("Filter Effect Editor"));
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
     QWidget *mainWidget = new QWidget(0);
     QVBoxLayout *mainLayout = new QVBoxLayout;
     dlg->setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     connect(buttonBox->button(QDialogButtonBox::Close), SIGNAL(clicked()), dlg, SLOT(close()));
 
     FilterEffectEditWidget *editor = new FilterEffectEditWidget(dlg);
     editor->editShape(d->currentShape, canvas());
 
     mainLayout->addWidget(editor);
     mainLayout->addWidget(buttonBox);
     dlg->exec();
     delete dlg;
 
     d->fillConfigSelector(d->currentShape, this);
 }
 
 void KarbonFilterEffectsTool::clearFilter()
 {
     if (!d->currentShape) {
         return;
     }
     if (!d->currentShape->filterEffectStack()) {
         return;
     }
 
     canvas()->addCommand(new FilterStackSetCommand(0, d->currentShape));
 
     d->fillConfigSelector(d->currentShape, this);
 }
 
 void KarbonFilterEffectsTool::filterChanged()
 {
     if (!d->currentShape) {
         return;
     }
 
     d->currentShape->update();
 }
 
 void KarbonFilterEffectsTool::filterSelected(int index)
 {
     if (!d->currentShape || ! d->currentShape->filterEffectStack()) {
         return;
     }
 
     KoFilterEffect *effect = 0;
     QList<KoFilterEffect *> filterEffects = d->currentShape->filterEffectStack()->filterEffects();
     if (index >= 0 && index < filterEffects.count()) {
         effect = filterEffects[index];
     }
 
     d->addWidgetForEffect(effect, this);
 
     repaintDecorations();
 }
 
 void KarbonFilterEffectsTool::selectionChanged()
 {
     d->currentShape = canvas()->shapeManager()->selection()->firstSelectedShape(KoFlake::TopLevelSelection);
     d->fillConfigSelector(d->currentShape, this);
 }
 
 void KarbonFilterEffectsTool::regionXChanged(double x)
 {
     if (!d->currentEffect) {
         return;
     }
 
     QRectF region = d->currentEffect->filterRect();
     region.setX(x / 100.0);
     canvas()->addCommand(new FilterRegionChangeCommand(d->currentEffect, region, d->currentShape));
 }
 
 void KarbonFilterEffectsTool::regionYChanged(double y)
 {
     if (!d->currentEffect) {
         return;
     }
 
     QRectF region = d->currentEffect->filterRect();
     region.setY(y / 100.0);
     canvas()->addCommand(new FilterRegionChangeCommand(d->currentEffect, region, d->currentShape));
 }
 
 void KarbonFilterEffectsTool::regionWidthChanged(double width)
 {
     if (!d->currentEffect) {
         return;
     }
 
     QRectF region = d->currentEffect->filterRect();
     region.setWidth(width / 100.0);
     canvas()->addCommand(new FilterRegionChangeCommand(d->currentEffect, region, d->currentShape));
 }
 
 void KarbonFilterEffectsTool::regionHeightChanged(double height)
 {
     if (!d->currentEffect) {
         return;
     }
 
     QRectF region = d->currentEffect->filterRect();
     region.setHeight(height / 100.0);
     canvas()->addCommand(new FilterRegionChangeCommand(d->currentEffect, region, d->currentShape));
 }
 
 QList<QPointer<QWidget> > KarbonFilterEffectsTool::createOptionWidgets()
 {
     QList<QPointer<QWidget> > widgets;
 
     FilterResourceServerProvider *serverProvider = FilterResourceServerProvider::instance();
     KoResourceServer<FilterEffectResource> *server = serverProvider->filterEffectServer();
     QSharedPointer<KoAbstractResourceServerAdapter> adapter(new KoResourceServerAdapter<FilterEffectResource>(server));
 
     //---------------------------------------------------------------------
 
     QWidget *addFilterWidget = new QWidget();
     addFilterWidget->setObjectName("AddEffect");
     QGridLayout *addFilterLayout = new QGridLayout(addFilterWidget);
 
     d->filterSelector = new KoResourceSelector(addFilterWidget);
     d->filterSelector->setResourceAdapter(adapter);
     d->filterSelector->setDisplayMode(KoResourceSelector::TextMode);
     d->filterSelector->setColumnCount(1);
     addFilterLayout->addWidget(new QLabel(i18n("Effects"), addFilterWidget), 0, 0);
     addFilterLayout->addWidget(d->filterSelector, 0, 1);
     connect(d->filterSelector, SIGNAL(resourceSelected(KoResource*)),
             this, SLOT(presetSelected(KoResource*)));
 
     connect(d->filterSelector, SIGNAL(resourceApplied(KoResource*)),
             this, SLOT(presetSelected(KoResource*)));
 
     QToolButton *editButton = new QToolButton(addFilterWidget);
     editButton->setIcon(koIcon("view-filter"));
     editButton->setToolTip(i18n("View and edit filter"));
     addFilterLayout->addWidget(editButton, 0, 2);
     connect(editButton, SIGNAL(clicked()), this, SLOT(editFilter()));
 
     d->clearButton = new QToolButton(addFilterWidget);
     d->clearButton->setIcon(koIcon("edit-delete"));
     d->clearButton->setToolTip(i18n("Remove filter from object"));
     addFilterLayout->addWidget(d->clearButton, 0, 3);
     connect(d->clearButton, SIGNAL(clicked()), this, SLOT(clearFilter()));
 
     addFilterWidget->setWindowTitle(i18n("Add Filter"));
     widgets.append(addFilterWidget);
 
     //---------------------------------------------------------------------
 
     QWidget *configFilterWidget = new QWidget();
     configFilterWidget->setObjectName("ConfigEffect");
     QGridLayout *configFilterLayout = new QGridLayout(configFilterWidget);
 
     d->configSelector = new KComboBox(configFilterWidget);
     configFilterLayout->addWidget(d->configSelector, 0, 0);
     connect(d->configSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(filterSelected(int)));
 
     d->configStack = new QStackedWidget(configFilterWidget);
     configFilterLayout->addWidget(d->configStack, 1, 0);
     configFilterLayout->setContentsMargins(0, 0, 0, 0);
 
     configFilterWidget->setWindowTitle(i18n("Effect Properties"));
     widgets.append(configFilterWidget);
 
     //---------------------------------------------------------------------
 
     QWidget *filterRegionWidget = new QWidget();
     filterRegionWidget->setObjectName("EffectRegion");
     QGridLayout *filterRegionLayout = new QGridLayout(filterRegionWidget);
 
 	d->posX = new KisDoubleParseSpinBox(filterRegionWidget);
     d->posX->setSuffix("%");
     connect(d->posX, SIGNAL(valueChanged(double)), this, SLOT(regionXChanged(double)));
     filterRegionLayout->addWidget(new QLabel(i18n("X:")), 0, 0);
     filterRegionLayout->addWidget(d->posX, 0, 1);
 
 	d->posY = new KisDoubleParseSpinBox(filterRegionWidget);
     d->posY->setSuffix("%");
     connect(d->posY, SIGNAL(valueChanged(double)), this, SLOT(regionYChanged(double)));
     filterRegionLayout->addWidget(new QLabel(i18n("Y:")), 1, 0);
     filterRegionLayout->addWidget(d->posY, 1, 1);
 
 	d->posW = new KisDoubleParseSpinBox(filterRegionWidget);
     d->posW->setSuffix("%");
     connect(d->posW, SIGNAL(valueChanged(double)), this, SLOT(regionWidthChanged(double)));
     filterRegionLayout->addWidget(new QLabel(i18n("W:")), 0, 2);
     filterRegionLayout->addWidget(d->posW, 0, 3);
 
 	d->posH = new KisDoubleParseSpinBox(filterRegionWidget);
     d->posH->setSuffix("%");
     connect(d->posH, SIGNAL(valueChanged(double)), this, SLOT(regionHeightChanged(double)));
     filterRegionLayout->addWidget(new QLabel(i18n("H:")), 1, 2);
     filterRegionLayout->addWidget(d->posH, 1, 3);
     filterRegionLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), 2, 0);
     filterRegionLayout->setContentsMargins(0, 0, 0, 0);
 
     filterRegionWidget->setWindowTitle(i18n("Effect Region"));
     widgets.append(filterRegionWidget);
 
     //---------------------------------------------------------------------
 
     d->fillConfigSelector(d->currentShape, this);
 
     return widgets;
 }
 
diff --git a/plugins/tools/tool_crop/wdg_tool_crop.ui b/plugins/tools/tool_crop/wdg_tool_crop.ui
index bc633093b5..962cde2a92 100644
--- a/plugins/tools/tool_crop/wdg_tool_crop.ui
+++ b/plugins/tools/tool_crop/wdg_tool_crop.ui
@@ -1,497 +1,497 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgToolCrop</class>
  <widget class="QWidget" name="WdgToolCrop">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>288</width>
     <height>242</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Crop</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
     <number>0</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
       <number>0</number>
      </property>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <property name="spacing">
         <number>0</number>
        </property>
        <item>
         <layout class="QGridLayout" name="gridLayout">
          <property name="leftMargin">
           <number>5</number>
          </property>
          <property name="topMargin">
           <number>5</number>
          </property>
          <property name="rightMargin">
           <number>5</number>
          </property>
          <property name="bottomMargin">
           <number>5</number>
          </property>
          <property name="spacing">
           <number>5</number>
          </property>
          <item row="2" column="1">
           <widget class="QCheckBox" name="boolCenter">
            <property name="toolTip">
             <string>Resize keeping center fixed</string>
            </property>
            <property name="text">
             <string>Center</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_vertiPos">
            <property name="toolTip">
             <string>Vertical Position</string>
            </property>
            <property name="text">
             <string>&amp;Y:</string>
            </property>
            <property name="buddy">
             <cstring>intY</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label_horizPos">
            <property name="toolTip">
             <string>Horizontal Position</string>
            </property>
            <property name="text">
             <string>&amp;X:</string>
            </property>
            <property name="buddy">
             <cstring>intX</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KisIntParseSpinBox" name="intX">
            <property name="minimumSize">
             <size>
              <width>60</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>16777215</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Horizontal Position</string>
            </property>
            <property name="suffix">
             <string> px</string>
            </property>
            <property name="maximum">
             <number>30000</number>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="KisIntParseSpinBox" name="intY">
            <property name="minimumSize">
             <size>
              <width>60</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>16777215</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="toolTip">
             <string>Vertical Position</string>
            </property>
            <property name="suffix">
             <string> px</string>
            </property>
            <property name="maximum">
             <number>30000</number>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QCheckBox" name="boolGrow">
            <property name="toolTip">
             <string>Allow growing the image by dragging outside bounds of the image</string>
            </property>
            <property name="text">
             <string>Grow</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>0</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>0</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
         <number>5</number>
        </property>
        <property name="topMargin">
         <number>5</number>
        </property>
        <property name="rightMargin">
         <number>5</number>
        </property>
        <property name="bottomMargin">
         <number>5</number>
        </property>
        <property name="spacing">
         <number>5</number>
        </property>
        <item row="3" column="2">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="1" column="2">
         <widget class="QLabel" name="heightLabel">
          <property name="toolTip">
           <string>Height</string>
          </property>
          <property name="text">
           <string>H:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="4">
         <widget class="KisIntParseSpinBox" name="intHeight">
          <property name="minimumSize">
           <size>
            <width>60</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Height</string>
          </property>
          <property name="suffix">
           <string> px</string>
          </property>
          <property name="maximum">
           <number>30000</number>
          </property>
         </widget>
        </item>
        <item row="0" column="4">
         <widget class="KisIntParseSpinBox" name="intWidth">
          <property name="minimumSize">
           <size>
            <width>60</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Width</string>
          </property>
          <property name="suffix">
           <string> px</string>
          </property>
          <property name="maximum">
           <number>30000</number>
          </property>
         </widget>
        </item>
        <item row="2" column="4">
         <widget class="KisDoubleParseSpinBox" name="doubleRatio">
          <property name="minimumSize">
           <size>
            <width>60</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Ratio</string>
          </property>
          <property name="precision" stdset="0">
           <number>2</number>
          </property>
         </widget>
        </item>
        <item row="2" column="2">
         <widget class="QLabel" name="aspectLabel">
          <property name="text">
           <string>Ratio:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="2">
         <widget class="QLabel" name="widthLabel">
          <property name="toolTip">
           <string>Width</string>
          </property>
          <property name="text">
           <string>W:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="0" column="5">
         <widget class="QPushButton" name="lockWidthButton">
          <property name="toolTip">
           <string>Lock the width</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="5">
         <widget class="QPushButton" name="lockHeightButton">
          <property name="toolTip">
           <string>Lock the height</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="2" column="5">
         <widget class="QPushButton" name="lockRatioButton">
          <property name="toolTip">
           <string>Lock the aspect ratio</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <property name="flat">
           <bool>false</bool>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_3">
      <property name="leftMargin">
       <number>5</number>
      </property>
      <property name="topMargin">
       <number>0</number>
      </property>
      <property name="rightMargin">
       <number>5</number>
      </property>
      <property name="bottomMargin">
       <number>5</number>
      </property>
      <item row="2" column="1">
       <widget class="QComboBox" name="cmbType">
        <property name="currentIndex">
         <number>1</number>
        </property>
        <item>
         <property name="text">
          <string>Layer</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Image</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="QPushButton" name="bnCrop">
        <property name="text">
         <string>&amp;Crop</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Applies to:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="QComboBox" name="cmbDecor">
        <item>
         <property name="text">
          <string>None</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Thirds</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Fifths</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Passport photo</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Crosshair</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Decoration:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="5" column="1">
       <spacer name="verticalSpacer_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QWidget" name="SpecialSpacer" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>kis_doubleparsespinbox.h</header>
+   <header>kis_double_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>intX</tabstop>
   <tabstop>intY</tabstop>
   <tabstop>intWidth</tabstop>
   <tabstop>intHeight</tabstop>
   <tabstop>cmbType</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/tool_transform2/wdg_tool_transform.ui b/plugins/tools/tool_transform2/wdg_tool_transform.ui
index cc269ee965..ffb18069e2 100755
--- a/plugins/tools/tool_transform2/wdg_tool_transform.ui
+++ b/plugins/tools/tool_transform2/wdg_tool_transform.ui
@@ -1,2050 +1,2050 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgToolTransform</class>
  <widget class="QWidget" name="WdgToolTransform">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>479</width>
     <height>591</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
     <height>16777215</height>
    </size>
   </property>
   <property name="baseSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <property name="spacing">
     <number>0</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="bottomMargin">
       <number>4</number>
      </property>
      <item>
       <widget class="QFrame" name="frame">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Plain</enum>
        </property>
        <property name="lineWidth">
         <number>0</number>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_7">
         <property name="leftMargin">
          <number>1</number>
         </property>
         <property name="topMargin">
          <number>1</number>
         </property>
         <property name="rightMargin">
          <number>1</number>
         </property>
         <property name="bottomMargin">
          <number>1</number>
         </property>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <property name="spacing">
            <number>0</number>
           </property>
           <item>
            <widget class="QToolButton" name="freeTransformButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Free</string>
             </property>
             <property name="text">
              <string>Free Transform</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
             <property name="autoExclusive">
              <bool>true</bool>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QToolButton" name="perspectiveTransformButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Perspective</string>
             </property>
             <property name="text">
              <string>Perspective</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="autoExclusive">
              <bool>true</bool>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QToolButton" name="warpButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Warp</string>
             </property>
             <property name="text">
              <string>Warp</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="checked">
              <bool>false</bool>
             </property>
             <property name="autoExclusive">
              <bool>true</bool>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QToolButton" name="cageButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Cage</string>
             </property>
             <property name="text">
              <string>Cage</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="autoExclusive">
              <bool>true</bool>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QToolButton" name="liquifyButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Liquify</string>
             </property>
             <property name="text">
              <string>Liquify</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="autoExclusive">
              <bool>true</bool>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="lblTransformType">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Free Transform</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="freeTransformWidget">
       <layout class="QVBoxLayout" name="verticalLayout">
        <property name="spacing">
         <number>0</number>
        </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
        <property name="topMargin">
         <number>0</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>12</number>
          </property>
          <item>
           <layout class="QGridLayout" name="freeMainOptions">
            <property name="sizeConstraint">
             <enum>QLayout::SetFixedSize</enum>
            </property>
            <property name="leftMargin">
             <number>10</number>
            </property>
            <property name="topMargin">
             <number>10</number>
            </property>
            <property name="rightMargin">
             <number>20</number>
            </property>
            <property name="horizontalSpacing">
             <number>10</number>
            </property>
            <property name="verticalSpacing">
             <number>15</number>
            </property>
            <item row="0" column="0">
             <widget class="QLabel" name="label_10">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="layoutDirection">
               <enum>Qt::RightToLeft</enum>
              </property>
              <property name="text">
               <string>&amp;Filter:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
              </property>
              <property name="buddy">
               <cstring>cmbFilter</cstring>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
             <layout class="QGridLayout" name="freeAnchorOriginGroup" rowstretch="0,0,0,0" columnstretch="0,0,0">
              <property name="sizeConstraint">
               <enum>QLayout::SetDefaultConstraint</enum>
              </property>
              <property name="spacing">
               <number>0</number>
              </property>
              <item row="1" column="0">
               <widget class="QToolButton" name="topLeftButton">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="2">
               <widget class="QToolButton" name="topRightButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="0">
               <widget class="QToolButton" name="bottomLeftButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <widget class="QToolButton" name="centerButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="2" column="2">
               <widget class="QToolButton" name="middleRightButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="1">
               <widget class="QToolButton" name="middleBottomButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="2">
               <widget class="QToolButton" name="bottomRightButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QToolButton" name="middleTopButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="2" column="0">
               <widget class="QToolButton" name="middleLeftButton">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
                 <string/>
                </property>
                <property name="checkable">
                 <bool>true</bool>
                </property>
                <property name="autoExclusive">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
             </layout>
            </item>
            <item row="0" column="1">
             <widget class="KisCmbIDList" name="cmbFilter" native="true">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_4">
            <item>
             <widget class="QRadioButton" name="freeMoveRadioButton">
              <property name="text">
               <string>Posi&amp;tion</string>
              </property>
              <property name="checked">
               <bool>true</bool>
              </property>
              <attribute name="buttonGroup">
               <string notr="true">freeTransformRadioGroup</string>
              </attribute>
             </widget>
            </item>
            <item>
             <widget class="QRadioButton" name="freeRotationRadioButton">
              <property name="text">
               <string>&amp;Rotate</string>
              </property>
              <attribute name="buttonGroup">
               <string notr="true">freeTransformRadioGroup</string>
              </attribute>
             </widget>
            </item>
            <item>
             <widget class="QRadioButton" name="freeScaleRadioButton">
              <property name="text">
               <string>Scale</string>
              </property>
              <attribute name="buttonGroup">
               <string notr="true">freeTransformRadioGroup</string>
              </attribute>
             </widget>
            </item>
            <item>
             <widget class="QRadioButton" name="freeShearRadioButton">
              <property name="text">
               <string>Shear</string>
              </property>
              <attribute name="buttonGroup">
               <string notr="true">freeTransformRadioGroup</string>
              </attribute>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="tooBigLabelWidget">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>0</width>
                <height>0</height>
               </size>
              </property>
              <property name="font">
               <font>
                <weight>75</weight>
                <bold>true</bold>
               </font>
              </property>
              <property name="toolTip">
               <string extracomment="warning: this string shouldn' be wider, as otherwise the widget would resize and flicker"/>
              </property>
              <property name="layoutDirection">
               <enum>Qt::LeftToRight</enum>
              </property>
              <property name="autoFillBackground">
               <bool>false</bool>
              </property>
              <property name="text">
               <string>off canvas</string>
              </property>
              <property name="textFormat">
               <enum>Qt::RichText</enum>
              </property>
              <property name="scaledContents">
               <bool>false</bool>
              </property>
              <property name="wordWrap">
               <bool>true</bool>
              </property>
              <property name="textInteractionFlags">
               <set>Qt::NoTextInteraction</set>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QGroupBox" name="rotationGroup">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>240</width>
            <height>100</height>
           </size>
          </property>
          <property name="title">
           <string>Rotation</string>
          </property>
          <property name="flat">
           <bool>false</bool>
          </property>
          <property name="checkable">
           <bool>false</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0">
           <property name="spacing">
            <number>2</number>
           </property>
           <property name="leftMargin">
            <number>5</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>7</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
            <layout class="QFormLayout" name="formLayout">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
             </property>
             <property name="horizontalSpacing">
              <number>5</number>
             </property>
             <property name="verticalSpacing">
              <number>5</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_rotateX">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
                 <width>0</width>
                 <height>0</height>
                </size>
               </property>
               <property name="toolTip">
                <string>Rotate around X-Axis</string>
               </property>
               <property name="layoutDirection">
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
                <string>&amp;x:</string>
               </property>
               <property name="buddy">
                <cstring>aXBox</cstring>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KisDoubleSliderSpinBox" name="aXBox" native="true">
               <property name="toolTip">
                <string>Rotate around X-Axis</string>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_rotateY">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
                 <width>0</width>
                 <height>0</height>
                </size>
               </property>
               <property name="toolTip">
                <string>Rotate around Y-Axis</string>
               </property>
               <property name="layoutDirection">
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
                <string>&amp;y:</string>
               </property>
               <property name="buddy">
                <cstring>aYBox</cstring>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisDoubleSliderSpinBox" name="aYBox" native="true">
               <property name="toolTip">
                <string>Rotate around Y-Axis</string>
               </property>
              </widget>
             </item>
             <item row="3" column="1">
              <widget class="KisDoubleSliderSpinBox" name="aZBox" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Rotate around Z-Axis</string>
               </property>
              </widget>
             </item>
             <item row="3" column="0">
              <widget class="QLabel" name="label_rotateZ">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
                 <width>0</width>
                 <height>0</height>
                </size>
               </property>
               <property name="toolTip">
                <string>Rotate around Z-Axis</string>
               </property>
               <property name="layoutDirection">
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
                <string>&amp;z:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
               <property name="buddy">
                <cstring>aZBox</cstring>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="scaleGroup">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>240</width>
            <height>70</height>
           </size>
          </property>
          <property name="title">
           <string>Scale</string>
          </property>
          <property name="flat">
           <bool>false</bool>
          </property>
          <property name="checkable">
           <bool>false</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <property name="spacing">
            <number>2</number>
           </property>
           <property name="leftMargin">
            <number>5</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_10">
             <item>
              <layout class="QFormLayout" name="formLayout_6">
               <property name="verticalSpacing">
                <number>5</number>
               </property>
               <item row="0" column="0">
                <widget class="QLabel" name="label_width">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
                   <height>0</height>
                  </size>
                 </property>
                 <property name="toolTip">
                  <string>Horizontal Scale</string>
                 </property>
                 <property name="text">
                  <string>w&amp;idth:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                 </property>
                 <property name="buddy">
                  <cstring>scaleXBox</cstring>
                 </property>
                </widget>
               </item>
               <item row="0" column="1">
                <widget class="KisIntParseSpinBox" name="scaleXBox">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="toolTip">
                  <string>Horizontal Scale</string>
                 </property>
                 <property name="suffix">
                  <string> %</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="1">
                <widget class="KisIntParseSpinBox" name="scaleYBox">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="toolTip">
                  <string>Vertical Scale</string>
                 </property>
                 <property name="suffix">
                  <string> %</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="0">
                <widget class="QLabel" name="label_height">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
                   <height>0</height>
                  </size>
                 </property>
                 <property name="toolTip">
                  <string>Vertical Scale</string>
                 </property>
                 <property name="text">
                  <string>&amp;height:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                 </property>
                 <property name="buddy">
                  <cstring>scaleYBox</cstring>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
             <item>
              <widget class="KoAspectButton" name="aspectButton" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
                 <width>20</width>
                 <height>25</height>
                </size>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="moveGroup">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>240</width>
            <height>70</height>
           </size>
          </property>
          <property name="title">
           <string>Position</string>
          </property>
          <property name="flat">
           <bool>false</bool>
          </property>
          <property name="checkable">
           <bool>false</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_11">
           <property name="spacing">
            <number>2</number>
           </property>
           <property name="leftMargin">
            <number>5</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
            <layout class="QFormLayout" name="formLayout_3">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_offsetX">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Horizontal Translation</string>
               </property>
               <property name="layoutDirection">
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
                <string>x:</string>
               </property>
               <property name="buddy">
                <cstring>translateXBox</cstring>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KisIntParseSpinBox" name="translateXBox">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Horizontal Translation</string>
               </property>
               <property name="layoutDirection">
                <enum>Qt::LeftToRight</enum>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="KisIntParseSpinBox" name="translateYBox">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Vertical Translation</string>
               </property>
              </widget>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_offsetY">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Vertical Translation</string>
               </property>
               <property name="text">
                <string>y:</string>
               </property>
               <property name="buddy">
                <cstring>translateYBox</cstring>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="shearGroup">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>240</width>
            <height>80</height>
           </size>
          </property>
          <property name="autoFillBackground">
           <bool>false</bool>
          </property>
          <property name="title">
           <string>Shear</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="flat">
           <bool>false</bool>
          </property>
          <property name="checkable">
           <bool>false</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_12">
           <property name="spacing">
            <number>2</number>
           </property>
           <property name="leftMargin">
            <number>5</number>
           </property>
           <property name="topMargin">
            <number>0</number>
           </property>
           <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
            <layout class="QFormLayout" name="formLayout_4">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
             </property>
             <property name="verticalSpacing">
              <number>8</number>
             </property>
             <property name="leftMargin">
              <number>20</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_shearX">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Horizontal Shear</string>
               </property>
               <property name="text">
                <string>x:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
               <property name="buddy">
                <cstring>shearXBox</cstring>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="KisDoubleSliderSpinBox" name="shearYBox" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Vertical Shear</string>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label_shearY">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="minimumSize">
                <size>
                 <width>0</width>
                 <height>0</height>
                </size>
               </property>
               <property name="toolTip">
                <string>Vertical Shear</string>
               </property>
               <property name="text">
                <string>y:</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
               <property name="buddy">
                <cstring>shearYBox</cstring>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KisDoubleSliderSpinBox" name="shearXBox" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="toolTip">
                <string>Horizontal Shear</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Preferred</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="warpTransformWidget">
       <widget class="QWidget" name="gridLayoutWidget">
        <property name="geometry">
         <rect>
          <x>10</x>
          <y>0</y>
          <width>251</width>
          <height>51</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_4">
         <property name="horizontalSpacing">
          <number>10</number>
         </property>
         <property name="verticalSpacing">
          <number>0</number>
         </property>
         <item row="1" column="1">
          <widget class="KisDoubleSliderSpinBox" name="alphaBox" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QLabel" name="flexibilityLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>2</width>
             <height>0</height>
            </size>
           </property>
           <property name="text">
            <string>&amp;Flexibility:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>alphaBox</cstring>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QComboBox" name="cmbWarpType">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
         <item row="0" column="0">
          <widget class="QLabel" name="warpTypeLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>Anc&amp;hor Strength:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>cmbWarpType</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
       <widget class="QGroupBox" name="groupBox">
        <property name="geometry">
         <rect>
          <x>10</x>
          <y>70</y>
          <width>260</width>
          <height>111</height>
         </rect>
        </property>
        <property name="autoFillBackground">
         <bool>false</bool>
        </property>
        <property name="title">
         <string>Anchor Points</string>
        </property>
        <property name="flat">
         <bool>false</bool>
        </property>
        <property name="checkable">
         <bool>false</bool>
        </property>
        <widget class="QWidget" name="defaultWarpWidget">
         <property name="geometry">
          <rect>
           <x>10</x>
           <y>30</y>
           <width>241</width>
           <height>29</height>
          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_7">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
           <widget class="QRadioButton" name="defaultRadioButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Subd&amp;ivide</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
            <property name="autoExclusive">
             <bool>true</bool>
            </property>
            <attribute name="buttonGroup">
             <string notr="true">buttonGroup</string>
            </attribute>
           </widget>
          </item>
          <item>
           <widget class="KisIntParseSpinBox" name="densityBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="minimum">
             <number>0</number>
            </property>
            <property name="value">
             <number>3</number>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
        <widget class="QWidget" name="drawWarpWidget">
         <property name="geometry">
          <rect>
           <x>10</x>
           <y>60</y>
           <width>290</width>
           <height>47</height>
          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
           <number>0</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
           <widget class="QRadioButton" name="customRadioButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Draw</string>
            </property>
            <property name="autoExclusive">
             <bool>true</bool>
            </property>
            <attribute name="buttonGroup">
             <string notr="true">buttonGroup</string>
            </attribute>
           </widget>
          </item>
          <item>
           <widget class="QWidget" name="customWarpWidget" native="true">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_9">
             <property name="spacing">
              <number>0</number>
             </property>
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>0</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
              <widget class="QPushButton" name="resetPointsButton">
               <property name="text">
                <string>Clear Points</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="lockUnlockPointsButton">
               <property name="text">
                <string>Lock Points</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </widget>
      </widget>
      <widget class="QWidget" name="cageTransformPage">
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
         <widget class="QLabel" name="cageTransformDirections">
          <property name="text">
           <string>Create 3 points on the canvas to begin</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="cageAddEditRadio">
          <property name="text">
           <string>Add/Ed&amp;it Anchor Points</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
          <attribute name="buttonGroup">
           <string notr="true">cageTransformButtonGroup</string>
          </attribute>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="cageDeformRadio">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="text">
           <string>De&amp;form Layer</string>
          </property>
          <attribute name="buttonGroup">
           <string notr="true">cageTransformButtonGroup</string>
          </attribute>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="liquifyTransformPage">
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0">
          <property name="spacing">
           <number>0</number>
          </property>
          <item>
           <widget class="QFrame" name="liquifyOptionsLayout">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="whatsThis">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Plain</enum>
            </property>
            <property name="lineWidth">
             <number>0</number>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_9">
             <property name="leftMargin">
              <number>2</number>
             </property>
             <property name="topMargin">
              <number>2</number>
             </property>
             <property name="rightMargin">
              <number>15</number>
             </property>
             <item>
              <widget class="QToolButton" name="liquifyMove">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Move</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="checked">
                <bool>true</bool>
               </property>
               <property name="autoExclusive">
                <bool>true</bool>
               </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QToolButton" name="liquifyScale">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Scale</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="autoExclusive">
                <bool>true</bool>
               </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QToolButton" name="liquifyRotate">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Rotate</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="autoExclusive">
                <bool>true</bool>
               </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QToolButton" name="liquifyOffset">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Offset</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="autoExclusive">
                <bool>true</bool>
               </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QToolButton" name="liquifyUndo">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Undo</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="autoExclusive">
                <bool>true</bool>
               </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <layout class="QGridLayout" name="gridLayout_3">
            <property name="horizontalSpacing">
             <number>3</number>
            </property>
            <property name="verticalSpacing">
             <number>5</number>
            </property>
            <item row="5" column="0">
             <widget class="QLabel" name="label">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>51</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Reverse:</string>
              </property>
             </widget>
            </item>
            <item row="4" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifySpacingSlider" native="true"/>
            </item>
            <item row="4" column="0">
             <widget class="QLabel" name="lblSpacing">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>49</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Spacing:</string>
              </property>
             </widget>
            </item>
            <item row="3" column="0">
             <widget class="QLabel" name="lblFlow">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>32</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Flow:</string>
              </property>
             </widget>
            </item>
            <item row="3" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifyFlowSlider" native="true"/>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="lblSize">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>27</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Size:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifySizeSlider" native="true"/>
            </item>
            <item row="2" column="0">
             <widget class="QLabel" name="lblAmount">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>51</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Amount:</string>
              </property>
             </widget>
            </item>
            <item row="2" column="1">
             <widget class="KisDoubleSliderSpinBox" name="liquifyAmountSlider" native="true"/>
            </item>
            <item row="0" column="0">
             <widget class="QLabel" name="label_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>38</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Mode:</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
             <widget class="QComboBox" name="buidupModeComboBox">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="currentIndex">
               <number>0</number>
              </property>
              <item>
               <property name="text">
                <string>Build Up</string>
               </property>
              </item>
              <item>
               <property name="text">
                <string>Wash</string>
               </property>
              </item>
             </widget>
            </item>
            <item row="5" column="1">
             <widget class="QCheckBox" name="liquifyReverseDirectionChk">
              <property name="enabled">
               <bool>true</bool>
              </property>
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item row="1" column="2">
             <widget class="QToolButton" name="liquifySizePressureBox">
              <property name="enabled">
               <bool>true</bool>
              </property>
              <property name="text">
               <string>Pressure</string>
              </property>
              <property name="checkable">
               <bool>true</bool>
              </property>
              <property name="autoExclusive">
               <bool>true</bool>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item row="2" column="2">
             <widget class="QToolButton" name="liquifyAmountPressureBox">
              <property name="text">
               <string>Pressure</string>
              </property>
              <property name="checkable">
               <bool>true</bool>
              </property>
              <property name="autoExclusive">
               <bool>true</bool>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <property name="spacing">
       <number>6</number>
      </property>
      <property name="topMargin">
       <number>6</number>
      </property>
      <item>
       <widget class="QPushButton" name="showDecorationsBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>32</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Show Decorations</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
        <property name="checked">
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="chkWorkRecursively">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>32</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Work Recursively</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_5">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>13</width>
          <height>13</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="layoutDirection">
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Apply|QDialogButtonBox::Reset</set>
        </property>
        <property name="centerButtons">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QWidget" name="SpecialSpacer" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisCmbIDList</class>
    <extends></extends>
    <header>widgets/kis_cmb_idlist.h</header>
   </customwidget>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>kis_intparsespinbox.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
  <buttongroups>
   <buttongroup name="cageTransformButtonGroup"/>
   <buttongroup name="buttonGroup"/>
   <buttongroup name="freeTransformRadioGroup"/>
  </buttongroups>
 </ui>