diff --git a/.gitignore b/.gitignore
index 12aaec21d3..bd300c1e51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,26 @@
 *.trace
 build
 qtcreator-build
 *.kdev4
 *~
 .kateconfig
 CMakeLists.txt.user*
 .directory
-*.rej
-*.orig
 *.autosave
 *.swp
 .gdb_history
 .kdev_include_paths
 *.config
 *.creator
 *.creator.user
 *.files
 *.includes
 .DS_Store
 *.kate-swap
 .idea
 GTAGS
 GPATH
 GRTAGS
 GSYMS
 BROWSE
 *.kate-swp
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 9327a5db4f..34d916a31d 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -1,116 +1,121 @@
 project (krita-and-all-its-deps)
 
 #
 # Build all dependencies for Krita and finally Krita itself.
 # Parameters: EXTERNALS_DOWNLOAD_DIR place to download all packages
 #             INSTALL_ROOT place to install everything to
 #             MXE_TOOLCHAIN: the toolchain file to cross-compile using MXE
 # 
 # Example usage: cmake ..\kritadeposx -DEXTERNALS_DOWNLOAD_DIR=/dev2/d -DINSTALL_ROOT=/dev2/i -DWIN64_BUILD=TRUE  -DBOOST_LIBRARYDIR=/dev2/i/lib   -G "Visual Studio 11 Win64"
 
 
 cmake_minimum_required(VERSION 2.8.6)
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "Compiling in the source directory is not supported. Use for example 'mkdir build; cd build; cmake ..'.")
 endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 
 # Tools must be obtained to work with:
 include (ExternalProject)
 
 # allow specification of a directory with pre-downloaded
 # requirements
 if(NOT IS_DIRECTORY ${EXTERNALS_DOWNLOAD_DIR})
     message(FATAL_ERROR "No externals download dir set. Use -DEXTERNALS_DOWNLOAD_DIR")
 endif()
 
 if(NOT IS_DIRECTORY ${INSTALL_ROOT})
     message(FATAL_ERROR "No install dir set. Use -DINSTALL_ROOT")
 endif()
 
 set(TOP_INST_DIR ${INSTALL_ROOT})
 set(EXTPREFIX "${TOP_INST_DIR}")
 set(CMAKE_PREFIX_PATH "${EXTPREFIX}")
 
 if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
     SET(GLOBAL_PROFILE 
         -DCMAKE_MODULE_LINKER_FLAGS=/machine:x64 
         -DCMAKE_EXE_LINKER_FLAGS=/machine:x64 
         -DCMAKE_SHARED_LINKER_FLAGS=/machine:x64 
         -DCMAKE_STATIC_LINKER_FLAGS=/machine:x64 
     )
 endif ()
 
 message( STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
 message( STATUS "CMAKE_CL_64: ${CMAKE_CL_64}")
 
 set(GLOBAL_BUILD_TYPE RelWithDebInfo)
 set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DBUILD_TESTING=false)
 
 if (MSVC)
         set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DCMAKE_EXE_LINKER_FLAGS=/PROFILE -DCMAKE_SHARED_LINKER_FLAGS=/PROFILE)
 	set(PATCH_COMMAND myptch)
 endif()
 
+if (MINGW)
+   set(PATCH_COMMAND myptch)
+endif()
+
 if (MSYS)
 	set(PATCH_COMMAND patch)
     set(GLOBAL_PROFILE ${GLOBAL_PROFILE} 
                            -DCMAKE_TOOLCHAIN_FILE=${MXE_TOOLCHAIN}
                            -DCMAKE_FIND_PREFIX_PATH=${CMAKE_PREFIX_PATH}
                            -DCMAKE_SYSTEM_INCLUDE_PATH=${CMAKE_PREFIX_PATH}/include
                            -DCMAKE_INCLUDE_PATH=${CMAKE_PREFIX_PATH}/include 
                            -DCMAKE_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib
                            -DZLIB_ROOT=${CMAKE_PREFIX_PATH}
     )
     set(GLOBAL_AUTOMAKE_PROFILE  --host=i686-pc-mingw32 )
 endif() 
 
 if (APPLE)
     set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DCMAKE_MACOSX_RPATH=ON -DKDE_SKIP_RPATH_SETTINGS=ON -DBUILD_WITH_INSTALL_RPATH=ON -DAPPLE_SUPPRESS_X11_WARNING=ON)
     set(PATCH_COMMAND patch)
 endif ()
 
 if (UNIX AND NOT APPLE)
 	set(LINUX true)
     set(PATCH_COMMAND patch)
 endif ()
 
 # this list must be dependency-ordered
 if (MSVC)
     add_subdirectory( ext_patch )
     add_subdirectory( ext_png2ico )
 endif (MSVC)
+if (MINGW)
+    add_subdirectory( ext_patch )
+    add_subdirectory( ext_png2ico )
+endif (MINGW)
 add_subdirectory( ext_iconv )
 add_subdirectory( ext_gettext )
 add_subdirectory( ext_zlib )
 add_subdirectory( ext_libxml2 )
 add_subdirectory( ext_libxslt )
 add_subdirectory( ext_boost )
 add_subdirectory( ext_jpeg )
 add_subdirectory( ext_tiff )
 add_subdirectory( ext_png )
 add_subdirectory( ext_eigen3 )
 add_subdirectory( ext_expat ) # for exiv2
 add_subdirectory( ext_exiv2 )
 add_subdirectory( ext_ilmbase )
 add_subdirectory( ext_lcms2 )
 add_subdirectory( ext_openexr )
 add_subdirectory( ext_vc )
 add_subdirectory( ext_gsl )
 add_subdirectory( ext_fftw3 )
 add_subdirectory( ext_ocio )
-add_subdirectory( ext_openjpeg )
 if (MSVC)
     add_subdirectory( ext_pthreads )
 endif (MSVC)
-add_subdirectory( ext_freetype)
-if (LINUX)
 add_subdirectory( ext_fontconfig)
-endif()
+add_subdirectory( ext_freetype)
 add_subdirectory( ext_qt )
 add_subdirectory( ext_poppler )
 add_subdirectory( ext_libraw )
 add_subdirectory( ext_frameworks )
 if (MSVC)
     add_subdirectory( google-breakpad )
 endif()
diff --git a/3rdparty/README.md b/3rdparty/README.md
index 0567b67876..b6513b08c1 100644
--- a/3rdparty/README.md
+++ b/3rdparty/README.md
@@ -1,305 +1,215 @@
 = CMake external projects to build krita's dependencies on Linux, Windows or OSX =
 
 If you need to build Krita's dependencies for the following reasons:
 
 * you develop on Windows and aren't using Emerge
 * you develop on OSX and aren't using Homebrew
 * you want to build a generic, distro-agnostic version of Krita for Linux
 * you develop on Linux, but some dependencies aren't available for your distribution
 
 and you know what you're doing, you can use the following guide to build
 the dependencies that Krita needs.
 
 If you develop on Linux and your distribution has the dependencies available,
 
 YOU DO NOT NEED THIS GUIDE AND YOU SHOULD STOP READING NOW
 
 Otherwise you risk major confusion.
 
 == Prerequisites ==
 
 Note: on all operating systems the entire procedure is done in a terminal window.
 
 1. git: https://git-scm.com/downloads. Make sure git is in your path
 2. cmake 3.3.2: https://cmake.org/download/. Make sure cmake is in your path.
 3. Make sure you have a compiler:
     * Linux: gcc, minimum version 4.8
     * OSX: clang, you need to install xcode for this
-    * Windows: MSVC 2015 Community Edition: https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx
-4. If you compile Qt on Windows, you will also need Python 2.7: https://www.python.org/download/releases/2.7/. Make sure to have python.exe in you path.
+    * Windows: (http://tdm-gcc.tdragon.net/, version 5.1). MSVC cannot build G'Mic correctly. For some reason, cmake wants to use nmake even when using mingw, so copy mingw32-make.exe to nmake.exe. And remember to install the OpenMP plugin in tdm-gcc.
+4. If you compile Qt on Windows, you will also need Python 2.7: https://www.python.org/download/releases/2.7/. Make sure to have python.exe in your path.
 
 == Setup your environment ==
 
 Windows Only:
     When launching the commands from the console, run first "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" in it (include the quotes). This way all the environment variables for the compiler will be ready.
 
 == Prepare your directory layout ==
 
 1. Make a toplevel build directory, say $HOME/dev or c:\dev. We'll refer to this directory as BUILDROOT. You can use a variable for this, on WINDOWS %BUILDROOT%, on OSX and Linux $BUILDROOT. You will have to replace BUILDROOT with $BUILDROOT or %BUILDROOT whenever you copy and paste a command, depending on your operating system.
 
 2. Checkout krita in BUILDROOT
     cd BUILDROOT
     git clone git://anongit.kde.org/krita.git
 3. Create the build directory
     mkdir BUILDROOT/b
 4. Create the downloads directory
     mkdir BUILDROOT/d
 5. Create the install directory
     mkdir BUILDROOT/i
 
-== Qt ==
-
-Install Qt. You have three options:
-
-* build from source yourself
-* install with the qt.io installer. 
-* build using the krita/3rdparty/ext_qt project as detailed in the next section.
-
-Either way, make sure qmake is in your environment path. If you are using Qt 5.6 for example, this is the default location for Windows:
-C:\Qt\Qt5.6.0\5.6\msvc2015_64\bin, when using the qt.io installer.
-
-When building from source, you need the following modules:
- 
-* qtbase
-* qtdeclarative
-* qtimageformats
-* qtscript
-* qtscript
-* qtsvg
-* qttools
-* qttranslations
-
- On Windows, you also need qtwinextras, on Linux qtx11extras, on OSX qtmacextras.
-
-When installing from source, you can use these example configure commands:
- 
-* Linux:
-
-    ./configure \
-        -skip qt3d \
-        -skip qtactiveqt \
-        -skip qtcanvas3d \
-        -skip qtconnectivity \
-        -skip qtdoc \
-        -skip qtenginio \
-        -skip qtgraphicaleffects \
-        -skip qtlocation \
-        -skip qtmultimedia \
-        -skip qtsensors \
-        -skip qtserialport \
-        -skip qtwayland \
-        -skip qtwebchannel \
-        -skip qtwebengine \
-        -skip qtwebkit \
-        -skip qtwebkit-examples \
-        -skip qtwebsockets \
-        -skip qtxmlpatterns \
-        -opensource -confirm-license -release \
-        -no-qml-debug -no-mtdev -no-journald \
-        -no-openssl -no-libproxy \
-        -no-pulseaudio -no-alsa -no-nis \
-        -no-cups -no-tslib -no-pch \
-        -no-dbus  -no-gstreamer -no-system-proxies \
-        -no-openssl -no-libproxy -no-pulseaudio \
-        -qt-xcb  -xcb -qt-freetype -qt-harfbuzz \
-        -qt-pcre -qt-xkbcommon-x11 -xcb-xlib  \
-        -prefix BUILDROOT/i
-    make -j8
-
-* OSX
-
-./configure \
-    -skip qt3d \
-    -skip qtactiveqt \
-    -skip qtcanvas3d \
-    -skip qtconnectivity \
-    -skip qtdoc \
-    -skip qtenginio \
-    -skip qtgraphicaleffects \
-    -skip qtlocation \
-    -skip qtmultimedia \
-    -skip qtsensors \
-    -skip qtserialport \
-    -skip qtwayland \
-    -skip qtwebchannel \
-    -skip qtwebengine \
-    -skip qtwebsockets \
-    -skip qtxmlpatterns \
-    -opensource -confirm-license -release \
-    -no-qml-debug -no-mtdev -no-journald \
-    -no-openssl -no-libproxy \
-    -no-pulseaudio -no-alsa -no-nis \
-    -no-cups -no-tslib -no-pch \
-    -no-dbus  -no-gstreamer -no-system-proxies \
-    -no-openssl -no-libproxy -no-pulseaudio \
-    -nomake examples -nomake tests \
-    -prefix $BUILDROOT/i
-
-* Windows
-
-    To do a normal release build use:
-
-    configure -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix %BUILDROOT%\i
-
-    If a release with debug info for developing purposes is needed, add the -force-debug-info to the configure options above, so that the pdb files will be generated.
-
-    N.B.: if you don't have the Qt 5.6 pre-built binaries already
-    installed, you will need to copy Qt5Core.dll, coming from those
-    binaries inside the Qt build directory, under the path qtbase\bin,
-    otherwise you'll get an error about it missing when using jom
-    and a more cryptic error with nmake. The same has to be done with
-    Qt5Xml.dll, to be copied under qttools\bin.  Don't use the dlls
-    coming from the QtCreator folder, they won't work.
-
 == Prepare the externals build ==
 
 1. enter the BUILDROOT/b directory
 2. run cmake:
+
     * Linux:
-    cmake ../krita/3rdparty -DINSTALL_ROOT=BUILDROOT/i -DEXTERNALS_DOWNLOAD_DIR=BUILDROOT/d -DCMAKE_INSTALL_PREFIX=BUILDROOT/i
-:
+    export PATH=$BUILDROOT/i/bin
+    cmake ../krita/3rdparty \
+        -DINSTALL_ROOT=$BUILDROOT/i \
+        -DEXTERNALS_DOWNLOAD_DIR=$BUILDROOT/d \
+        -DCMAKE_INSTALL_PREFIX=BUILDROOT/i
+
     * OSX:
+    
+    export PATH=$BUILDROOT/i/bin
+    cmake ../krita/3rdparty/  \
+        -DCMAKE_INSTALL_PREFIX=$BUILDROOT/i \
+        -DEXTERNALS_DOWNLOAD_DIR=$BUILDROOT/d  \
+        -DINSTALL_ROOT=$BUILDROOT/i 
+
+
     * Windows 32 bits:
+    
+    TODO
 
     * Windows 64 bits:
 
 Note that the cmake command needs to point to your BUILDROOT like /dev/d, not c:\dev\d.
 
     set PATH=BUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH%
-    cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i   -G "Visual Studio 14 Win64" 
-    
+    cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i   -G "MinGW Makefiles"
 
 3. build the packages:
 
-With a judicious application of DEPENDS statements, it's possible to build it all in one go, but in my experience that fails anyway, so it's better to build the dependencies indepdendently.
+With a judicious application of DEPENDS statements, it's possible to build it all in one go, but in my experience that fails always, so it's better to build the dependencies independently.
 
 On Windows:
 
     cmake --build . --config RelWithDebInfo --target ext_patch
     cmake --build . --config RelWithDebInfo --target ext_png2ico
-    cmake --build . --config RelWithDebInfo --target ext_pthreads
-
-On all operation systems, if you have decided to build Qt using the ext_qt project:
-
-    cmake --build . --config RelWithDebInfo --target ext_qt
-
+    cmake --build . --config RelWithDebInfo --target ext_gettext
     
 On all operating systems:
 
+    cmake --build . --config RelWithDebInfo --target ext_qt
+    cmake --build . --config RelWithDebInfo --target ext_zlib
     cmake --build . --config RelWithDebInfo --target ext_boost
     cmake --build . --config RelWithDebInfo --target ext_eigen3
     cmake --build . --config RelWithDebInfo --target ext_exiv2
     cmake --build . --config RelWithDebInfo --target ext_fftw3
     cmake --build . --config RelWithDebInfo --target ext_ilmbase
     cmake --build . --config RelWithDebInfo --target ext_jpeg
     cmake --build . --config RelWithDebInfo --target ext_lcms2
     cmake --build . --config RelWithDebInfo --target ext_ocio
     cmake --build . --config RelWithDebInfo --target ext_openexr
 
 Note for OSX:
 
 On OSX, you need to first build openexr; that will fail; then you need to set the rpath for the two utilities correctly, then try to build openexr again.
 
     install_name_tool -add_rpath $BUILD_ROOT/i/lib $BUILD_ROOT/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./b44ExpLogTable
     install_name_tool -add_rpath $BUILD_ROOT/i/lib $BUILD_ROOT/b/ext_openexr/ext_openexr-prefix/src/ext_openexr-build/IlmImf/./dwaLookups
 
 On All operating systems:
 
     cmake --build . --config RelWithDebInfo --target ext_png
     cmake --build . --config RelWithDebInfo --target ext_tiff
     cmake --build . --config RelWithDebInfo --target ext_gsl
     cmake --build . --config RelWithDebInfo --target ext_vc
     cmake --build . --config RelWithDebInfo --target ext_libraw
-    cmake --build . --config RelWithDebInfo --target ext_openjpeg
 
 On Windows and OSX
 
-    cmake --build . --config RelWithDebInfo --target ext_kwindowsystem
+    cmake --build . --config RelWithDebInfo --target ext_kcrash
 
 On Windows
 
 (Note: skip this for now if you're using msvc 2015, poppler isn't compatible
 with that compiler yet)
 
     cmake --build . --config RelWithDebInfo --target ext_freetype
     cmake --build . --config RelWithDebInfo --target ext_poppler
 
 On Linux
 
     cmake --build . --config RelWithDebInfo --target ext_kcrash
 
 
 Note: poppler should be buildable on Linux as well with a home-built freetype
 and fontconfig, but I don't know how to make fontconfig find freetype, and on
 Linux, fontconfig is needed for poppler. Poppler is needed for PDF import.
 
 Note 2: libcurl still isn't available.
 
 == Build Krita ==
  
 1. Make a krita build directory: 
     mkdir BUILDROOT/build
 2. Enter the BUILDROOT/build
 3. Run 
 
 On Windows
 
-    Depending on what you want to use, run this command for MSBuild: 
+Depending on what you want to use, run this command for MSBuild: 
 
     cmake ..\krita -G "Visual Studio 14 Win64" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
 
-    Or this to later use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
+Or this to use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
 
     cmake ..\krita -G "NMake Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
 
 On Linux
 
-    cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DPACKAGERS_BUILD=ON -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
+    cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DPACKAGERS_BUILD=ON -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfobg
 
 On OSX
 
     cmake ../krita -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/i -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DPACKAGERS_BUILD=ON  -DBUNDLE_INSTALL_DIR=$HOME/dev/i/bin -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 
 4. Run 
 
 On Linux and OSX
+
     make
     make install
 
 On Windows
+
     Either use MSBuild to build (-- /m tells msbuild to use all your cores):
 
     cmake --build . --config RelWithDebInfo --target INSTALL -- /m
 
     Or use jom which should be in a path similar to C:\Qt\Qt5.6.0\Tools\QtCreator\bin\jom.exe.
     So, from the same folder, instead of running cmake run:
 
     "C:\Qt\Qt5.6.0\Tools\QtCreator\bin\jom.exe" install
 
 6. Run krita:
 
 On Linux
 
     BUILDROOT/i/bin/krita
 
 On Windows
 
     BUILDROOT\i\bin\krita.exe
 
 On OSX
 
     BUILDROOT/i/bin/krita.app/Contents/MacOS/krita
 
 == Packaging a Windows Build ==
+
 If you want to create a stripped down version of Krita to distribute, after building everything just copy the makepkg.bat file from the "windows" folder inside krita root source folder to BUILDROOT and run it.
 
-That will copy the Krita necessary files into the specified folder and leave behind developer related files, so the resulting folder will be a smaller install folder.
+That will copy the necessary files into the specified folder and leave behind developer related files, so the resulting folder will be a smaller install folder.
 
 == Common Issues ==
+
 - On Windows, if you get a 'mspdb140.dll' missing alert window, it means you did not run the bat file. Make sure to include the quotes in the command:
   "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
 
 - On Windows, if you get an error about Qt5Core.dll missing/not found or nmake exit with an error that mention QT_PLUGIN_PATH, you have to copy a couple of dlls in the Qt build directory, look for the N.B. in the Qt instructions at the start of the Readme.
 
 - If you receive an error while compiling about "missing QtCore5.cmake", or something similar, check to make sure qmake is in your PATH. Restart your command line after any changes are made.
diff --git a/3rdparty/ext_boost/CMakeLists.txt b/3rdparty/ext_boost/CMakeLists.txt
index 277780cef8..759e6cd761 100755
--- a/3rdparty/ext_boost/CMakeLists.txt
+++ b/3rdparty/ext_boost/CMakeLists.txt
@@ -1,64 +1,88 @@
 SET(PREFIX_ext_boost "${EXTPREFIX}" )
 if (MSVC)
 	if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
 		ExternalProject_Add(
 			ext_boost
 			DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-			URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
-			URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
+			URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
+			URL_MD5 015ae4afa6f3e597232bfe1dab949ace
 
 			CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
 			BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared  threading=multi architecture=x86 address-model=64 variant=release install
 			INSTALL_COMMAND ""
 			INSTALL_DIR ${EXTPREFIX_boost}
 
 			UPDATE_COMMAND ""
 			ALWAYS 0
 			BUILD_IN_SOURCE 1
 		)
 		ExternalProject_Add_Step(
 			ext_boost
 			post_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/boost_system-vc140-mt-1_55.dll ${PREFIX_ext_boost}/bin/boost_system-vc140-mt-1_55.dll
 			DEPENDEES install
 		)
+		
 	else()
 		ExternalProject_Add(
 			ext_boost
 
 			DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-			URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
-			URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
+			URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
+			URL_MD5 015ae4afa6f3e597232bfe1dab949ace
 
 			CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
 			BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared  threading=multi architecture=x86 variant=release install
 			INSTALL_COMMAND ""
 			INSTALL_DIR ${EXTPREFIX_boost}
 
 			UPDATE_COMMAND ""
 			ALWAYS 0
 			BUILD_IN_SOURCE 1
         )
         ExternalProject_Add_Step(
 			ext_boost
 			post_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/boost_system-vc140-mt-1_55.dll ${PREFIX_ext_boost}/bin/boost_system-vc140-mt-1_55.dll
 			DEPENDEES install
 		)
 	endif()
+elseif(MINGW)
+   ExternalProject_Add(
+       ext_boost
+
+       DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+       URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
+       URL_MD5 015ae4afa6f3e597232bfe1dab949ace
+
+       CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat mingw --prefix=${PREFIX_ext_boost}
+       BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=gcc variant=release link=shared  threading=multi architecture=x86 variant=release install
+       INSTALL_COMMAND ""
+       INSTALL_DIR ${EXTPREFIX_boost}
+
+       UPDATE_COMMAND ""
+       ALWAYS 0
+       BUILD_IN_SOURCE 1
+   )
+   ExternalProject_Add_Step(
+       ext_boost
+       post_install
+       COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/libboost_system-mgw51-mt-1_55.dll ${PREFIX_ext_boost}/bin/
+       DEPENDEES install
+   )
 else()
 	ExternalProject_Add( ext_boost
         	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	        URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.tar.bz2
-        	URL_MD5 d6eef4b4cacb2183f2bf265a5a03a354
+	        URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.tar.bz2
+        	URL_MD5 6095876341956f65f9d35939ccea1a9f
 
         	CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} --with-libraries=system
 	        BUILD_COMMAND <SOURCE_DIR>/b2 install
 	        INSTALL_COMMAND ""
         	INSTALL_DIR ${PREFIX_ext_boost}
 
 	        UPDATE_COMMAND ""
         	ALWAYS 0
 	        BUILD_IN_SOURCE 1
 )
 endif()
diff --git a/3rdparty/ext_eigen3/CMakeLists.txt b/3rdparty/ext_eigen3/CMakeLists.txt
index 5b5a448f12..6e49a85622 100644
--- a/3rdparty/ext_eigen3/CMakeLists.txt
+++ b/3rdparty/ext_eigen3/CMakeLists.txt
@@ -1,13 +1,13 @@
 SET(EXTPREFIX_eigen3 "${EXTPREFIX}" )
 ExternalProject_Add( ext_eigen3
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/eigen3-3.2.6.tar.gz
-    URL_MD5 9f93bfc14ba0816220c9674e99b8c418
+    URL http://files.kde.org/krita/build/dependencies/eigen-eigen-07105f7124f9.tar.gz
+    URL_MD5 135d8d43aaee5fb54cf5f3e981b1a6db
 
     INSTALL_DIR ${EXTPREFIX_eigen3}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/dart.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_eigen3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
     UPDATE_COMMAND ""
     ALWAYS 0
 )
diff --git a/3rdparty/ext_eigen3/dart.diff b/3rdparty/ext_eigen3/dart.diff
index 1d140454db..15770fbe18 100644
--- a/3rdparty/ext_eigen3/dart.diff
+++ b/3rdparty/ext_eigen3/dart.diff
@@ -1,13 +1,24 @@
 diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake
-index 11ecc95..f7f8b34 100644
+index 2b11d83..8cf56ff 100644
 --- a/cmake/EigenConfigureTesting.cmake
 +++ b/cmake/EigenConfigureTesting.cmake
-@@ -41,7 +41,7 @@ endif()
+@@ -26,19 +26,6 @@ include(CTest)
  
- # copy ctest properties, which currently
- # o raise the warning levels
--configure_file(${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl ${CMAKE_BINARY_DIR}/DartConfiguration.tcl)
-+#configure_file(${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl ${CMAKE_BINARY_DIR}/DartConfiguration.tcl)
+ set(EIGEN_TEST_BUILD_FLAGS " " CACHE STRING "Options passed to the build command of unit tests")
  
- # restore default CMAKE_MAKE_PROGRAM
- set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM_SAVE})
+-# Overwrite default DartConfiguration.tcl such that ctest can build our unit tests.
+-# Recall that our unit tests are not in the "all" target, so we have to explicitely ask ctest to build our custom 'buildtests' target.
+-# At this stage, we can also add custom flags to the build tool through the user defined EIGEN_TEST_BUILD_FLAGS variable.
+-file(READ  "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" EIGEN_DART_CONFIG_FILE)
+-# try to grab the default flags
+-string(REGEX MATCH "MakeCommand:.*-- (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
+-if(NOT CMAKE_MATCH_1)
+-string(REGEX MATCH "MakeCommand:.*[^c]make (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
+-endif()
+-string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target buildtests --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType"
+-       EIGEN_DART_CONFIG_FILE2 ${EIGEN_DART_CONFIG_FILE})
+-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" ${EIGEN_DART_CONFIG_FILE2})
+-
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
+ 
+ # some documentation of this function would be nice
diff --git a/3rdparty/ext_exiv2/CMakeLists.txt b/3rdparty/ext_exiv2/CMakeLists.txt
index c9b3fdc9b8..5c3838dfd0 100755
--- a/3rdparty/ext_exiv2/CMakeLists.txt
+++ b/3rdparty/ext_exiv2/CMakeLists.txt
@@ -1,16 +1,17 @@
 SET(PREFIX_ext_exiv2  "${EXTPREFIX}" )
 
 ExternalProject_Add( ext_exiv2
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/exiv2-0.25.tar.gz
 	URL_MD5 258d4831b30f75a01e0234065c6c2806
 
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tzname.patch
+    COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
 
 	INSTALL_DIR ${PREFIX_ext_exiv2}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_exiv2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_NLS=OFF -DICONV_INCLUDE_DIR=${PREFIX_ext_exiv2}/include
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 	DEPENDS ext_iconv ext_zlib ext_expat
 )
diff --git a/3rdparty/ext_exiv2/patch_mingw.patch b/3rdparty/ext_exiv2/patch_mingw.patch
new file mode 100644
index 0000000000..e9cf1c8252
--- /dev/null
+++ b/3rdparty/ext_exiv2/patch_mingw.patch
@@ -0,0 +1,25 @@
+diff a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -291,6 +291,9 @@ IF (CYGWIN OR MINGW)
+     TARGET_LINK_LIBRARIES( exiv2lib psapi )
+ ENDIF(CYGWIN OR MINGW)
+ 
++IF (MINGW)
++    TARGET_LINK_LIBRARIES( exiv2lib ws2_32 )
++ENDIF(MINGW)
+ 
+ INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
+ 
+diff a/src/http.cpp b/src/http.cpp
+--- a/src/http.cpp
++++ b/src/http.cpp
+@@ -53,7 +53,7 @@ 
+ #include <string.h>
+ #include <windows.h>
+ #include <io.h>
+-#ifndef  __MINGW__
++#if !defined(__MINGW__) && !defined(__MINGW32__) && !defined(__MINGW64__)
+ #define  snprintf sprintf_s
+ #define  write    _write
+ #define  read     _read
diff --git a/3rdparty/ext_expat/CMakeLists.txt b/3rdparty/ext_expat/CMakeLists.txt
index 2a10474e9a..8d297addd1 100755
--- a/3rdparty/ext_expat/CMakeLists.txt
+++ b/3rdparty/ext_expat/CMakeLists.txt
@@ -1,35 +1,35 @@
 SET(PREFIX_ext_expat "${EXTPREFIX}" )
 
-if (MSVC)
+if (WIN32)
 ExternalProject_Add( ext_expat
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
 	URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
 
 	PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/expat-2.1.0-20130311.diff
 	INSTALL_DIR ${PREFIX_ext_expat}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DBUILD_tests=OFF -DBUILD_examples=OFF -DBUILD_tools=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 	UPDATE_COMMAND ""
 
 	ALWAYS 0
 	DEPENDS ext_patch
 )
 
 else()
 
 ExternalProject_Add( ext_expat
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
 	URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
 
 	INSTALL_DIR ${PREFIX_ext_expat}
     CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat}  ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 
 )
 
 endif()
diff --git a/3rdparty/ext_fftw3/CMakeLists.txt b/3rdparty/ext_fftw3/CMakeLists.txt
index 474363952a..76a92661b4 100755
--- a/3rdparty/ext_fftw3/CMakeLists.txt
+++ b/3rdparty/ext_fftw3/CMakeLists.txt
@@ -1,50 +1,66 @@
 SET(PREFIX_ext_fftw3 "${EXTPREFIX}" )
 if (MSVC)
     if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
         ExternalProject_Add( ext_fftw3
             DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
             URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll64.zip
             URL_MD5 c4ec1e6d84e7a8b1cd61121d11d44ee4
 
             INSTALL_DIR ${PREFIX_ext_fftw3}
             CONFIGURE_COMMAND ""
             BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 64 binary
             INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
                     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
                     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
 
             UPDATE_COMMAND ""
             ALWAYS 0
         )
     else()
          ExternalProject_Add( ext_fftw3
             DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
             URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll32.zip
             URL_MD5 03754fe2a7fbaf983b0cc9a728e0a5b3
 
             INSTALL_DIR ${PREFIX_ext_fftw3}
             CONFIGURE_COMMAND ""
             BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 32 binary
             INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
                     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
                     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
 
             UPDATE_COMMAND ""
             ALWAYS 0
         )
     endif()
-else (MSVC)
+elseif (MINGW)
+        ExternalProject_Add( ext_fftw3
+            DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+            URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll64.zip
+            URL_MD5 c4ec1e6d84e7a8b1cd61121d11d44ee4
+
+            INSTALL_DIR ${PREFIX_ext_fftw3}
+            CONFIGURE_COMMAND ""
+            BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 64 binary
+            INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
+
+            UPDATE_COMMAND ""
+            ALWAYS 0
+        )
+else ()
 ExternalProject_Add( ext_fftw3
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4.tar.gz
         URL_MD5 2edab8c06b24feeb3b82bbb3ebf3e7b3
         INSTALL_DIR ${PREFIX_ext_fftw3}
         
         CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_fftw3} ${GLOBAL_AUTOMAKE_PROFILE} --enable-static=false --enable-shared=yes
         BUILD_COMMAND make
         INSTALL_COMMAND make install
 
         UPDATE_COMMAND ""
         ALWAYS 0
 )
-endif (MSVC)
+endif ()
diff --git a/3rdparty/ext_fontconfig/CMakeLists.txt b/3rdparty/ext_fontconfig/CMakeLists.txt
index 1f385d3cd8..9bd9075895 100755
--- a/3rdparty/ext_fontconfig/CMakeLists.txt
+++ b/3rdparty/ext_fontconfig/CMakeLists.txt
@@ -1,13 +1,13 @@
 SET(PREFIX_ext_fontconfig "${EXTPREFIX}" )
 ExternalProject_Add( ext_fontconfig
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/fontconfig-2.11.94.tar.gz
-    URL_MD5 479be870c7f83f15f87bac085b61d641
+    URL http://files.kde.org/krita/build/dependencies/fontconfig-2.12.0.tar.gz
+    URL_MD5 d8b056231abcb6257db6dc6d745360b2
   
     CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_fontconfig}  ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install      
 
     UPDATE_COMMAND ""
     ALWAYS 0
 )
diff --git a/3rdparty/ext_frameworks/CMakeLists.txt b/3rdparty/ext_frameworks/CMakeLists.txt
index 0f7278813e..d1074cee57 100755
--- a/3rdparty/ext_frameworks/CMakeLists.txt
+++ b/3rdparty/ext_frameworks/CMakeLists.txt
@@ -1,241 +1,239 @@
 SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
 #
 # All needed frameworks:
 #
 #        Archive 
 #        Config 
 #        WidgetsAddons 
 #        Completion
 #        CoreAddons
 #        GuiAddons 
 #        I18n 
 #        ItemModels 
 #        ItemViews
 #        WindowSystem
 # On Linux:
 #        KCrash
 
 ExternalProject_Add(
     ext_extra_cmake_modules
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/extra-cmake-modules-5.17.0.zip
-    URL_MD5 c302bb1771b7c366c6eeebf3742b2f54
+    URL http://download.kde.org/stable/frameworks/5.24/extra-cmake-modules-5.24.0.zip
+    URL_MD5 e0c19ba97ebd964f9bdc9110c64ce96a
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
 )
 
 
 ExternalProject_Add(
     ext_karchive
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/karchive-5.17.0.zip
-    URL_MD5 d6bf0fcb6dbcffe1328b75f427593fd0
+    URL http://download.kde.org/stable/frameworks/5.24/karchive-5.24.0.zip
+    URL_MD5 739843accfe9bd85ab2f1582722cf01e
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_extra_cmake_modules
 )
 
 
 ExternalProject_Add(
     ext_kconfig
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kconfig-5.17.0.zip
-    URL_MD5 f321e98ce591fdb3632e04c770a5b0c6
+    URL http://download.kde.org/stable/frameworks/5.24/kconfig-5.24.0.zip
+    URL_MD5 f87ecff795eb76e4ec6561758a5baf87
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_karchive
 )
 
 
 ExternalProject_Add(
     ext_kwidgetsaddons
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kwidgetsaddons-5.17.0.zip
-    URL_MD5 bd32206b1973a3a13e7c405f135479c7
+    URL http://download.kde.org/stable/frameworks/5.24/kwidgetsaddons-5.24.0.zip
+    URL_MD5 0e399b427814a4814c65a3cf407f9d79
     INSTALL_DIR ${EXTPREFIX_frameworks}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kconfig
 )
 
 
 ExternalProject_Add(
     ext_kcompletion
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kcompletion-5.17.0.zip
-    URL_MD5 f853f34a8bb8433ced2d7c46148361ce
+    URL http://download.kde.org/stable/frameworks/5.24/kcompletion-5.24.0.zip
+    URL_MD5 e8764251ab45005aa81dba242852300c
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kwidgetsaddons
 )
 
 
 ExternalProject_Add(
     ext_kcoreaddons
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kcoreaddons-5.17.0.zip
-    URL_MD5 75145cb1bc3a78fe4f13ce4383e76947
+    URL http://download.kde.org/stable/frameworks/5.24/kcoreaddons-5.24.0.zip
+    URL_MD5 2885878625b19ad0300ef3770b897112
     INSTALL_DIR ${EXTPREFIX_frameworks}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kcompletion
 )
 
 
 ExternalProject_Add(
     ext_kguiaddons
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kguiaddons-5.17.0.zip
-    URL_MD5 43b49b25d3ee9025d7172033d255e3b5
+    URL http://download.kde.org/stable/frameworks/5.24/kguiaddons-5.24.0.zip
+    URL_MD5 9bdadbc57d0634816ef80ee9798c3d6c
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kcoreaddons
 )
 
 
 ExternalProject_Add(
     ext_ki18n
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/ki18n-5.17.0.zip
-    URL_MD5 7d60380d09f98defbf878ea9daba0fbb
+    URL http://download.kde.org/stable/frameworks/5.24/ki18n-5.24.0.zip
+    URL_MD5 5724e8af1c1edc9ad24a17a0d94d80c8
     INSTALL_DIR ${EXTPREFIX_frameworks}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n.diff
           COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kguiaddons
 )
 
 
 ExternalProject_Add(
     ext_kitemmodels
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kitemmodels-5.17.0.zip
-    URL_MD5 708504fd52db768093baac3666503bc3
+    URL http://download.kde.org/stable/frameworks/5.24/kitemmodels-5.24.0.zip
+    URL_MD5 ff41589f48395fc01d5fc7887593779d
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_ki18n
 )
 
 ExternalProject_Add(
     ext_kitemviews
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kitemviews-5.17.0.zip
-    URL_MD5 9280c5e7e669cd6241b62c5a6958202d
+    URL http://download.kde.org/stable/frameworks/5.24/kitemviews-5.24.0.zip
+    URL_MD5 33f638d027a3011a6a69f7484eee3287
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kitemmodels
 )
 
 ExternalProject_Add(
     ext_kimageformats
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kimageformats-02-02-2016.tgz
-    URL_MD5 09a923703832181455bc61d67c692040
+    URL http://download.kde.org/stable/frameworks/5.24/kimageformats-5.24.0.zip
+    URL_MD5 c1964516bcb2bfe882858f0c0913deb5
     INSTALL_DIR ${EXTPREFIX_frameworks}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kitemviews
 )
 
 ExternalProject_Add(
     ext_kwindowsystem
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kwindowsystem-5.17.0.zip
-    URL_MD5 990c241d7fa88774ccd5176ec6bdcbdc
+    URL http://download.kde.org/stable/frameworks/5.24/kwindowsystem-5.24.0.zip
+    URL_MD5 5915e4f63ded983af6db7db3a6cbae1a
     INSTALL_DIR ${EXTPREFIX_frameworks}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kimageformats
 )
 
-
-if (LINUX)
 ExternalProject_Add(
     ext_kcrash
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/kcrash-5.17.0.zip
-    URL_MD5 b6b865aff352d697928a9165c6564f8f
+    URL http://download.kde.org/stable/frameworks/5.24/kcrash-5.24.0.zip
+    URL_MD5 a2e41e6650105fc3ac8fbd44afbae4fe
     INSTALL_DIR ${EXTPREFIX_frameworks}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
             -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} 
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} 
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_kwindowsystem
 )
-endif()
diff --git a/3rdparty/ext_frameworks/ecm_install_to_share.diff b/3rdparty/ext_frameworks/ecm_install_to_share.diff
new file mode 100644
index 0000000000..b38eabbd88
--- /dev/null
+++ b/3rdparty/ext_frameworks/ecm_install_to_share.diff
@@ -0,0 +1,32 @@
+commit a4170399404bf32e874e35d35f8a66703b2fff92
+Author: Boudewijn Rempt <boud@valdyas.org>
+Date:   Sat Jul 30 14:33:10 2016 +0200
+
+    Revert "Use "${BIN_INSTALL_DIR}/data" for DATAROOTDIR on Windows."
+    
+    This reverts commit 2503481e4537b88d76b4a596f519cb3311e1ca2a.
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index e84c0b3..1773706 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -489,15 +489,10 @@ _define_absolute(SHAREDSTATEDIR "com"
+ 
+ 
+ 
+-if (WIN32)
+-    _define_relative(DATAROOTDIR BINDIR "data"
+-        "read-only architecture-independent data root"
+-        SHARE_INSTALL_PREFIX)
+-else()
+-    _define_absolute(DATAROOTDIR "share"
+-        "read-only architecture-independent data root"
+-        SHARE_INSTALL_PREFIX)
+-endif()
++
++_define_absolute(DATAROOTDIR "share"
++    "read-only architecture-independent data root"
++    SHARE_INSTALL_PREFIX)
+ 
+ _define_relative(DATADIR DATAROOTDIR ""
+     "read-only architecture-independent data"
diff --git a/3rdparty/ext_frameworks/kconfig.diff b/3rdparty/ext_frameworks/kconfig.diff
index 78ec89c164..75df9fd9d3 100644
--- a/3rdparty/ext_frameworks/kconfig.diff
+++ b/3rdparty/ext_frameworks/kconfig.diff
@@ -1,271 +1,133 @@
-diff --git a/autotests/kconfig_compiler/test4main.cpp b/autotests/kconfig_compiler/test4main.cpp
-index b4569ba..1e1f017 100644
---- a/autotests/kconfig_compiler/test4main.cpp
-+++ b/autotests/kconfig_compiler/test4main.cpp
-@@ -34,7 +34,7 @@ int main(int argc, char **argv)
-         group.writeEntry(QLatin1String("foo bar"), QStringLiteral("Value"));
-     }
-     Test4 *t = Test4::self();
--    bool ok = QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/test4rc");
-+    bool ok = QFile::exists(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/test4rc");
-     if (!ok) {
-         qWarning() << "config file was not created!";
-     }
-diff --git a/autotests/kconfignokdehometest.cpp b/autotests/kconfignokdehometest.cpp
-index d9712ee..b393361 100644
---- a/autotests/kconfignokdehometest.cpp
-+++ b/autotests/kconfignokdehometest.cpp
-@@ -37,7 +37,7 @@ private Q_SLOTS:
- void KConfigNoKdeHomeTest::testNoKdeHome()
- {
-     QStandardPaths::setTestModeEnabled(true);
--    QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
-+    QString configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
-     QDir configDir(configPath);
-     QVERIFY(configDir.removeRecursively());
-     QVERIFY(!QFile::exists(configPath));
-diff --git a/autotests/kconfigskeletontest.cpp b/autotests/kconfigskeletontest.cpp
-index 898366c..e39b488 100644
---- a/autotests/kconfigskeletontest.cpp
-+++ b/autotests/kconfigskeletontest.cpp
-@@ -37,7 +37,7 @@ QTEST_MAIN(KConfigSkeletonTest)
- 
- void KConfigSkeletonTest::init()
- {
--    QFile::remove(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/kconfigskeletontestrc");
-+    QFile::remove(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/kconfigskeletontestrc");
-     s = new KConfigSkeleton("kconfigskeletontestrc");
-     s->setCurrentGroup("MyGroup");
-     itemBool = s->addItemBool("MySetting1", mMyBool, DEFAULT_SETTING1);
 diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
-index e92197f..b64535a 100644
+index 2b905b5..8c72d58 100644
 --- a/autotests/kconfigtest.cpp
 +++ b/autotests/kconfigtest.cpp
-@@ -80,7 +80,7 @@ QTEST_MAIN(KConfigTest)
- #define TEST_SUBDIR "kconfigtest_subdir/"
- 
- static inline QString testConfigDir() {
--    return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/" TEST_SUBDIR;
-+    return QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/" TEST_SUBDIR;
- }
- 
- static inline QString kdeGlobalsPath() {
-@@ -263,7 +263,7 @@ static QList<QByteArray> readLinesFrom(const QString &path)
- 
- static QList<QByteArray> readLines(const char *fileName = TEST_SUBDIR "kconfigtest")
- {
--    const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
-+    const QString path = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
-     Q_ASSERT(!path.isEmpty());
-     return readLinesFrom(path + '/' + fileName);
- }
-@@ -315,7 +315,7 @@ void KConfigTest::testRevertAllEntries()
- void KConfigTest::testSimple()
- {
-     // kdeglobals (which was created in initTestCase) must be found this way:
--    const QStringList kdeglobals = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QLatin1String("kdeglobals"));
-+    const QStringList kdeglobals = QStandardPaths::locateAll(QStandardPaths::AppConfigLocation, QLatin1String("kdeglobals"));
-     QVERIFY(!kdeglobals.isEmpty());
- 
-     KConfig sc2(TEST_SUBDIR "kconfigtest");
-@@ -383,7 +383,7 @@ void KConfigTest::testDefaults()
-     group.writeEntry("entry2", Value2);
-     QVERIFY(group.sync());
- 
--    config.addConfigSources(QStringList() << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + '/' + defaultsFile);
-+    config.addConfigSources(QStringList() << QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + '/' + defaultsFile);
- 
-     config.setReadDefaults(true);
-     QCOMPARE(group.readEntry("entry1", QString()), Default);
-@@ -405,7 +405,7 @@ void KConfigTest::testDefaults()
- 
-     // Check that everything is OK on disk, too
-     KConfig reader(TEST_SUBDIR "defaulttest", KConfig::NoGlobals);
--    reader.addConfigSources(QStringList() << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + '/' + defaultsFile);
-+    reader.addConfigSources(QStringList() << QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + '/' + defaultsFile);
-     KConfigGroup readerGroup = reader.group("any group");
-     QCOMPARE(readerGroup.readEntry("entry1", QString()), Default);
-     QCOMPARE(readerGroup.readEntry("entry2", QString()), QString());
+@@ -570,7 +570,7 @@ void KConfigTest::testPathQtHome()
+     qunsetenv("QT_CACHE_HOME");
+     qunsetenv("QT_CONFIG_HOME");
+     QVERIFY(group.hasKey("dataDir"));
+-    QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation).append(QStringLiteral("/kconfigtest")));
++    QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).append(QStringLiteral("/kconfigtest")));
+     QVERIFY(group.hasKey("cacheDir"));
+     QCOMPARE(group.readEntry("cacheDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation).append(QStringLiteral("/kconfigtest")));
+     QVERIFY(group.hasKey("configDir"));
 diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
-index a90faf3..f752960 100644
+index 393a6a0..083626d 100644
 --- a/autotests/kdesktopfiletest.cpp
 +++ b/autotests/kdesktopfiletest.cpp
-@@ -199,7 +199,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
-         qWarning("Skipping test for http_cache_cleaner.desktop, not found. kio not installed?");
-     }
- 
--    const QString autostartFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart/plasma-desktop.desktop"));
-+    const QString autostartFile = QStandardPaths::locate(QStandardPaths::AppConfigLocation, QStringLiteral("autostart/plasma-desktop.desktop"));
-     if (!autostartFile.isEmpty()) {
-         QVERIFY(KDesktopFile::isAuthorizedDesktopFile(autostartFile));
+@@ -201,7 +201,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
+     QVERIFY(QFile::exists(fileName));
+     QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
+ 
+-    const QString installedFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
++    const QString installedFile = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
+     if (!installedFile.isEmpty()) {
+         QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile));
      } else {
-diff --git a/autotests/ksharedconfigtest.cpp b/autotests/ksharedconfigtest.cpp
-index ae3d40a..7228629 100644
---- a/autotests/ksharedconfigtest.cpp
-+++ b/autotests/ksharedconfigtest.cpp
-@@ -39,7 +39,7 @@ void KSharedConfigTest::initTestCase()
- {
-     QStandardPaths::enableTestMode(true);
- 
--    m_path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
-+    m_path = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)
-             + QLatin1Char('/') + QCoreApplication::applicationName() + QStringLiteral("rc");
-     QFile::remove(m_path);
- }
 diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
-index 4180619..40d2f41 100644
+index 4180619..32cd88a 100644
 --- a/autotests/test_kconf_update.cpp
 +++ b/autotests/test_kconf_update.cpp
-@@ -330,8 +330,8 @@ void TestKConfUpdate::test()
-     if (useVersion5)
-         updContent.prepend("Version=5\n");
+@@ -625,7 +625,7 @@ void TestKConfUpdate::testScript()
  
--    QString oldConfPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + oldConfName;
--    QString newConfPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + newConfName;
-+    QString oldConfPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1Char('/') + oldConfName;
-+    QString newConfPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1Char('/') + newConfName;
+     QSharedPointer<QTemporaryFile> updFile(writeUpdFile(updContent));
  
-     QFile::remove(oldConfPath);
-     QFile::remove(newConfPath);
-@@ -631,7 +631,7 @@ void TestKConfUpdate::testScript()
+-    const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kconf_update";
++    const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/kconf_update";
+     QVERIFY(QDir().mkpath(scriptDir));
+     QString scriptPath = scriptDir + "/test.sh";
      writeFile(scriptPath, updScript);
-     QCOMPARE(readFile(scriptPath), updScript);
- 
--    QString confPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + "testrc";
-+    QString confPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1Char('/') + "testrc";
-     writeFile(confPath, oldConfContent);
-     QCOMPARE(readFile(confPath), oldConfContent);
- 
+diff --git a/docs/options.md b/docs/options.md
+index ba7e2d8..a960a7d 100644
+--- a/docs/options.md
++++ b/docs/options.md
+@@ -96,4 +96,4 @@ They are:
+ 
+     `$QT_CACHE_HOME` - QStandardPaths::GenericConfigLocation
+     `$QT_CONFIG_HOME` - QStandardPaths::GenericConfigLocation
+-    `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
++    `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
 diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
-index 07fa6f5..c3fc16d 100644
+index ad52da9..0401ced 100644
 --- a/src/core/kconfig.cpp
 +++ b/src/core/kconfig.cpp
-@@ -66,7 +66,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
-       bFileImmutable(false), bForceGlobal(false), bSuppressGlobal(false),
-       configState(KConfigBase::NoAccess)
- {
--    sGlobalFileName = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdeglobals");
-+    sGlobalFileName = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1String("/kdeglobals");
- 
-     static QBasicAtomicInt use_etc_kderc = Q_BASIC_ATOMIC_INITIALIZER(-1);
-     if (use_etc_kderc.load() < 0) {
-@@ -582,7 +582,7 @@ void KConfigPrivate::changeFileName(const QString &name)
-             fileName = KConfig::mainConfigName();
-             file = QStandardPaths::writableLocation(resourceType) + QLatin1Char('/') + fileName;
-         } else if (wantGlobals()) { // accessing "kdeglobals" by specifying no filename and NoCascade - XXX used anywhere?
--            resourceType = QStandardPaths::GenericConfigLocation;
-+            resourceType = QStandardPaths::AppConfigLocation;
-             fileName = QStringLiteral("kdeglobals");
-             file = sGlobalFileName;
-         } else {
-@@ -650,8 +650,8 @@ QStringList KConfigPrivate::getGlobalFiles() const
- {
-     QMutexLocker locker(&s_globalFilesMutex);
-     if (s_globalFiles()->isEmpty()) {
--        const QStringList paths1 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("kdeglobals"));
--        const QStringList paths2 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("system.kdeglobals"));
-+        const QStringList paths1 = QStandardPaths::locateAll(QStandardPaths::AppConfigLocation, QStringLiteral("kdeglobals"));
-+        const QStringList paths2 = QStandardPaths::locateAll(QStandardPaths::AppConfigLocation, QStringLiteral("system.kdeglobals"));
- 
-         const bool useEtcKderc = !etc_kderc.isEmpty();
-         s_globalFiles()->reserve(paths1.size() + paths2.size() + (useEtcKderc ? 1 : 0));
-diff --git a/src/core/kconfig.h b/src/core/kconfig.h
-index 6cc7323..30a1e52 100644
---- a/src/core/kconfig.h
-+++ b/src/core/kconfig.h
-@@ -128,7 +128,7 @@ public:
-      * @sa KSharedConfig::openConfig(const QString&, OpenFlags, QStandardPaths::StandardLocation)
-      */
-     explicit KConfig(const QString &file = QString(), OpenFlags mode = FullConfig,
--                     QStandardPaths::StandardLocation type = QStandardPaths::GenericConfigLocation);
-+                     QStandardPaths::StandardLocation type = QStandardPaths::AppConfigLocation);
- 
-     /**
-      * @internal
-@@ -142,7 +142,7 @@ public:
-      *
-      * @since 4.1
-      */
--    KConfig(const QString &file, const QString &backend, QStandardPaths::StandardLocation type = QStandardPaths::GenericConfigLocation);
-+    KConfig(const QString &file, const QString &backend, QStandardPaths::StandardLocation type = QStandardPaths::AppConfigLocation);
- 
-     virtual ~KConfig();
- 
+@@ -228,7 +228,7 @@ QString KConfigPrivate::expandString(const QString &value)
+                         env = QString::fromLocal8Bit(pEnv.constData());
+                     } else {
+                         if (aVarName == QStringLiteral("QT_DATA_HOME")) {
+-                            env = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
++                            env = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+                         } else if (aVarName == QStringLiteral("QT_CONFIG_HOME")) {
+                             env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
+                         } else if (aVarName == QStringLiteral("QT_CACHE_HOME")) {
 diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
-index eda7c29..8d14189 100644
+index 4a55030..e28e5df 100644
 --- a/src/core/kdesktopfile.cpp
 +++ b/src/core/kdesktopfile.cpp
-@@ -81,10 +81,10 @@ QString KDesktopFile::locateLocal(const QString &path)
-     QString relativePath;
-     QChar plus(QLatin1Char('/'));
-     // Relative to config? (e.g. for autostart)
--    Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
-+    Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppConfigLocation)) {
+@@ -88,7 +88,7 @@ QString KDesktopFile::locateLocal(const QString &path)
+         }
+     }
+     // Relative to xdg data dir? (much more common)
+-    Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
++    Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
          if (path.startsWith(dir + plus)) {
              relativePath = dir.mid(path.length() + 1);
--            return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + relativePath;
-+            return QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1Char('/') + relativePath;
          }
+@@ -97,7 +97,7 @@ QString KDesktopFile::locateLocal(const QString &path)
+         // What now? The desktop file doesn't come from XDG_DATA_DIRS. Use filename only and hope for the best.
+         relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1);
      }
-     // Relative to xdg data dir? (much more common)
-@@ -143,7 +143,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
+-    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + relativePath;
++    return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + relativePath;
+ }
+ 
+ bool KDesktopFile::isDesktopFile(const QString &path)
+@@ -134,7 +134,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
          }
      }
-     const QString autostartDir = QStringLiteral("autostart/");
--    Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
-+    Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::AppConfigLocation)) {
+     const QString servicesDir = QStringLiteral("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services")
+-    Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
++    Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
          if (QDir(xdgDataPrefix).exists()) {
              const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
-             if (realPath.startsWith(prefix + QLatin1Char('/') + autostartDir, sensitivity)) {
-diff --git a/src/core/kdesktopfile.h b/src/core/kdesktopfile.h
-index f3b293f..990465a 100644
---- a/src/core/kdesktopfile.h
-+++ b/src/core/kdesktopfile.h
-@@ -45,7 +45,7 @@ public:
-      *
-      * @param resourceType   Allows you to change what sort of resource
-      *                       to search for if @p fileName is not absolute.
--     *                       For instance, you might want to specify GenericConfigLocation.
-+     *                       For instance, you might want to specify AppConfigLocation.
-      * @param fileName       The name or path of the desktop file. If it
-      *                       is not absolute, it will be located
-      *                       using the resource type @p resType.
-diff --git a/src/core/ksharedconfig.cpp b/src/core/ksharedconfig.cpp
-index 8eb1308..b0e3c1c 100644
---- a/src/core/ksharedconfig.cpp
-+++ b/src/core/ksharedconfig.cpp
-@@ -102,7 +102,7 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString &_fileName,
- 
-     KSharedConfigPtr ptr(new KSharedConfig(fileName, flags, resType));
- 
--    if (_fileName.isEmpty() && flags == FullConfig && resType == QStandardPaths::GenericConfigLocation) {
-+    if (_fileName.isEmpty() && flags == FullConfig && resType == QStandardPaths::AppConfigLocation) {
-         list->mainConfig = ptr;
- 
-         const bool isMainThread = !qApp || QThread::currentThread() == qApp->thread();
-diff --git a/src/core/ksharedconfig.h b/src/core/ksharedconfig.h
-index 2d08379..804d4b8 100644
---- a/src/core/ksharedconfig.h
-+++ b/src/core/ksharedconfig.h
-@@ -73,7 +73,7 @@ public:
-      */
-     static KSharedConfig::Ptr openConfig(const QString &fileName = QString(),
-                                          OpenFlags mode = FullConfig,
--                                         QStandardPaths::StandardLocation type = QStandardPaths::GenericConfigLocation);
-+                                         QStandardPaths::StandardLocation type = QStandardPaths::AppConfigLocation);
- 
-     virtual ~KSharedConfig();
- 
+             if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, sensitivity)) {
 diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
-index 9567c2d..ca5f824 100644
+index 2acd720..d89ae3d 100644
 --- a/src/kconf_update/kconf_update.cpp
 +++ b/src/kconf_update/kconf_update.cpp
-@@ -447,7 +447,7 @@ void KonfUpdate::gotFile(const QString &_file)
-         delete m_oldConfig2;
-         m_oldConfig2 = Q_NULLPTR;
+@@ -125,7 +125,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
+     m_bUseConfigInfo = false;
+     if (parser->isSet(QStringLiteral("check"))) {
+         m_bUseConfigInfo = true;
+-        const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kconf_update/" + parser->value(QStringLiteral("check")));
++        const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + parser->value(QStringLiteral("check")));
+         if (file.isEmpty()) {
+             qWarning("File '%s' not found.", parser->value(QStringLiteral("check")).toLocal8Bit().data());
+             log() << "File '" << parser->value(QStringLiteral("check")) << "' passed on command line not found" << endl;
+@@ -177,7 +177,7 @@ KonfUpdate::log()
+ {
+     if (!m_textStream) {
+ #if 0
+-        QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kconf_update/log";
++        QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + "kconf_update/log";
+         QDir().mkpath(dir);
+         QString file = dir + "/update.log";
+         m_file = new QFile(file);
+@@ -206,7 +206,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
+ {
+     QStringList result;
+ 
+-    const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
++    const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &d, dirs) {
+         const QDir dir(d);
+ 
+@@ -760,7 +760,7 @@ void KonfUpdate::gotScript(const QString &_script)
+         return;
+     }
  
--        QString file = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + m_oldFile;
-+        QString file = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + QLatin1Char('/') + m_oldFile;
-         QFileInfo info(file);
-         if (info.exists() && info.size() == 0) {
-             // Delete empty file.
+-    QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update/") + script);
++    QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update/") + script);
+     if (path.isEmpty()) {
+         if (interpreter.isEmpty()) {
+             path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + script;
diff --git a/3rdparty/ext_frameworks/ki18n-appdatalocation.diff b/3rdparty/ext_frameworks/ki18n-appdatalocation.diff
index 098a38d991..b55c02155f 100644
--- a/3rdparty/ext_frameworks/ki18n-appdatalocation.diff
+++ b/3rdparty/ext_frameworks/ki18n-appdatalocation.diff
@@ -1,22 +1,22 @@
 diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
-index 7711e9b..b6280ed 100644
+index 6682d62..d975c57 100644
 --- a/src/kcatalog.cpp
 +++ b/src/kcatalog.cpp
-@@ -112,7 +112,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
+@@ -118,7 +118,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
  {
-     QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo")
+     QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo")
                        .arg(language, QFile::decodeName(domain));
 -    QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
 +    QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
-                                           QString::fromLatin1("locale/") + relpath);
+                                           QStringLiteral("locale/") + relpath);
      QString localeDir;
      if (file.isEmpty()) {
-@@ -127,7 +127,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
+@@ -133,7 +133,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
  QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
  {
      QString domain = QFile::decodeName(domain_);
 -    QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
 +    QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
-                                  QString::fromLatin1("locale"),
+                                  QStringLiteral("locale"),
                                   QStandardPaths::LocateDirectory);
      QSet<QString> availableLanguages;
diff --git a/3rdparty/ext_freetype/CMakeLists.txt b/3rdparty/ext_freetype/CMakeLists.txt
index 0e651f08f3..e53643a284 100755
--- a/3rdparty/ext_freetype/CMakeLists.txt
+++ b/3rdparty/ext_freetype/CMakeLists.txt
@@ -1,12 +1,12 @@
 SET(PREFIX_ext_freetype "${EXTPREFIX}" )
 ExternalProject_Add( ext_freetype
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/freetype-2.6.tar.gz
-    URL_MD5 1d733ea6c1b7b3df38169fbdbec47d2b
+	URL http://files.kde.org/krita/build/dependencies/freetype-2.6.5.tar.gz
+    URL_MD5 31b2276515d9ee1c7f37d9c9f4f3145a
         
     INSTALL_DIR ${PREFIX_ext_freetype}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_freetype} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}        
 
     UPDATE_COMMAND ""
 	ALWAYS 0
 )
diff --git a/3rdparty/ext_gettext/CMakeLists.txt b/3rdparty/ext_gettext/CMakeLists.txt
index e2bd0d58ba..b72178076b 100644
--- a/3rdparty/ext_gettext/CMakeLists.txt
+++ b/3rdparty/ext_gettext/CMakeLists.txt
@@ -1,32 +1,32 @@
 SET(PREFIX_ext_gettext "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add(
     ext_gettext
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL http://files.kde.org/krita/build/dependencies/gettext-0.18.tar.gz
     URL_MD5 d52a3e061032a1ed13856d42fc86f0fd
 
     PATCH_COMMAND ${PATCH_COMMAND} --binary -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gettext-0.18-20130319.diff
     INSTALL_DIR ${PREFIX_ext_gettext}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_patch ext_iconv
 )
-else (MSVC)
+else (MSVC OR MINGW)
 ExternalProject_Add( ext_gettext
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/gettext-0.19.6.tar.gz
-    URL_MD5 6d1447f8c5c45c329371ef4bfe7d79a5
+    URL http://files.kde.org/krita/build/dependencies/gettext-0.19.8.tar.gz
+    URL_MD5 e4fffc004f21596becd1055cf36be31d
 	
 	INSTALL_DIR ${PREFIX_ext_gettext}
-	CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java   ${GLOBAL_AUTOMAKE_PROFILE}
+	CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java   ${GLOBAL_AUTOMAKE_PROFILE} --disable-native-java 
         BUILD_COMMAND make
         INSTALL_COMMAND make install
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 	DEPENDS ext_iconv
 )
-endif (MSVC)
+endif (MSVC OR MINGW)
diff --git a/3rdparty/ext_gsl/CMakeLists.txt b/3rdparty/ext_gsl/CMakeLists.txt
index ff3a62155a..38f32cefd6 100644
--- a/3rdparty/ext_gsl/CMakeLists.txt
+++ b/3rdparty/ext_gsl/CMakeLists.txt
@@ -1,28 +1,28 @@
 #
 # From https://github.com/ampl/gsl. which adds CMake support to gsl
 #
 SET(EXTPREFIX_gsl "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add(
     ext_gsl
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     GIT_REPOSITORY https://github.com/ampl/gsl.git
     GIT_TAG 709cc572279e4a56b0e218b834f202c1b3f757af
     INSTALL_DIR ${EXTPREFIX_gsl}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_gsl} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
     UPDATE_COMMAND ""
     ALWAYS 0
 )
 else()
 ExternalProject_Add( ext_gsl
 
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL http://files.kde.org/krita/build/dependencies/gsl-2.1.tar.gz
     URL_MD5 625f4105fcf653822a96294c1b801ad4
 
     INSTALL_DIR ${EXTPREFIX_gsl}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_gsl} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DGSL_SHARED=ON
     UPDATE_COMMAND ""
     ALWAYS 0
 )
 endif()
diff --git a/3rdparty/ext_iconv/CMakeLists.txt b/3rdparty/ext_iconv/CMakeLists.txt
index 4fc37fa762..4087a298af 100755
--- a/3rdparty/ext_iconv/CMakeLists.txt
+++ b/3rdparty/ext_iconv/CMakeLists.txt
@@ -1,31 +1,31 @@
 SET(PREFIX_ext_iconv "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_iconv
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/win-iconv-0.0.6.tar.bz2
 	URL_MD5 1e97ed4d9e7379ff0ee22077256e8c58
 	
     INSTALL_DIR ${PREFIX_ext_iconv}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_iconv} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 )
 else ()
 ExternalProject_Add( ext_iconv
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
 	URL http://files.kde.org/krita/build/dependencies/libiconv-1.14.tar.gz
 	URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
 	
     INSTALL_DIR ${PREFIX_ext_iconv}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/iconv.diff
 	CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_iconv}  ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 	
     UPDATE_COMMAND ""
 	BUILD_IN_SOURCE 1
 	ALWAYS 0
 )
 
 endif ()
diff --git a/3rdparty/ext_ilmbase/CMakeLists.txt b/3rdparty/ext_ilmbase/CMakeLists.txt
index ebf00e8404..0ca9f2d2ef 100755
--- a/3rdparty/ext_ilmbase/CMakeLists.txt
+++ b/3rdparty/ext_ilmbase/CMakeLists.txt
@@ -1,24 +1,37 @@
 SET(PREFIX_ext_ilmbase "${EXTPREFIX}" )
 ExternalProject_Add( ext_ilmbase
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
         URL http://files.kde.org/krita/build/dependencies/ilmbase-2.2.0.tar.gz
         URL_MD5 b540db502c5fa42078249f43d18a4652
 
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_ilmbase} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
 
         UPDATE_COMMAND ""
         ALWAYS 0
 )
 
 if (MSVC)
 	ExternalProject_Add_Step(
 			ext_ilmbase
 			post_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/Half.dll ${PREFIX_ext_ilmbase}/bin/Half.dll
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/Iex.dll ${PREFIX_ext_ilmbase}/bin/Iex.dll
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/Imath.dll ${PREFIX_ext_ilmbase}/bin/Imath.dll
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/IlmThread.dll ${PREFIX_ext_ilmbase}/bin/IlmThread.dll
 			COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/IexMath.dll ${PREFIX_ext_ilmbase}/bin/IexMath.dll
 			DEPENDEES install
 	)
 endif()
+
+if (MINGW)
+   ExternalProject_Add_Step(
+           ext_ilmbase
+           post_install
+           COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libHalf.dll ${PREFIX_ext_ilmbase}/bin/libHalf.dll
+           COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIex.dll ${PREFIX_ext_ilmbase}/bin/libIex.dll
+           COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libImath.dll ${PREFIX_ext_ilmbase}/bin/libImath.dll
+           COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIlmThread.dll ${PREFIX_ext_ilmbase}/bin/libIlmThread.dll
+           COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIexMath.dll ${PREFIX_ext_ilmbase}/bin/libIexMath.dll
+           DEPENDEES install
+   )
+endif()
diff --git a/3rdparty/ext_jpeg/CMakeLists.txt b/3rdparty/ext_jpeg/CMakeLists.txt
index b33122d53a..168603644c 100755
--- a/3rdparty/ext_jpeg/CMakeLists.txt
+++ b/3rdparty/ext_jpeg/CMakeLists.txt
@@ -1,27 +1,27 @@
 SET(PREFIX_ext_jpeg "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_jpeg
-	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
-    URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
+    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+    URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
+    URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
         
     INSTALL_DIR ${PREFIX_ext_jpeg}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
     UPDATE_COMMAND ""
 	ALWAYS 0
 )
 else()
 ExternalProject_Add( ext_jpeg
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
-    URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
+    URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
+    URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
   
     CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_jpeg}  ${GLOBAL_AUTOMAKE_PROFILE} --without-simd
     BUILD_COMMAND make
     INSTALL_COMMAND make install      
 
     UPDATE_COMMAND ""
     ALWAYS 0
 )
 endif()
diff --git a/3rdparty/ext_lcms2/CMakeLists.txt b/3rdparty/ext_lcms2/CMakeLists.txt
index 5945813953..032e759376 100755
--- a/3rdparty/ext_lcms2/CMakeLists.txt
+++ b/3rdparty/ext_lcms2/CMakeLists.txt
@@ -1,29 +1,29 @@
 SET(PREFIX_ext_lcms2 "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_lcms2
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/lcms2-2.7.tar.gz
-    URL_MD5 06c1626f625424a811fb4b5eb070839d
+	URL http://files.kde.org/krita/build/dependencies/lcms2-2.8.tar.gz
+    URL_MD5 87a5913f1a52464190bb655ad230539c
 		
-    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/lcms2-2.4-20130124.diff
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/lcms2-2.8-20160725.diff
 	INSTALL_DIR ${PREFIX_ext_lcms2}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_lcms2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_lcms2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_TESTS=FALSE -DBUILD_UTILS=FALSE -DBUILD_STATIC=FALSE
 	
     UPDATE_COMMAND ""
 	ALWAYS 0
 	DEPENDS ext_patch
 )
-else (MSVC)
+else (MSVC OR MINGW)
 ExternalProject_Add( ext_lcms2
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/lcms2-2.7.tar.gz
-    URL_MD5 06c1626f625424a811fb4b5eb070839d
+	URL http://files.kde.org/krita/build/dependencies/lcms2-2.8.tar.gz
+    URL_MD5 87a5913f1a52464190bb655ad230539c
 
     CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_lcms2} ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 
     UPDATE_COMMAND ""
     ALWAYS 0
 )
-endif (MSVC)
+endif (MSVC OR MINGW)
diff --git a/3rdparty/ext_lcms2/lcms2-2.4-20130124.diff b/3rdparty/ext_lcms2/lcms2-2.8-20160725.diff
old mode 100755
new mode 100644
similarity index 68%
rename from 3rdparty/ext_lcms2/lcms2-2.4-20130124.diff
rename to 3rdparty/ext_lcms2/lcms2-2.8-20160725.diff
index f1b1a44184..f97f06b881
--- a/3rdparty/ext_lcms2/lcms2-2.4-20130124.diff
+++ b/3rdparty/ext_lcms2/lcms2-2.8-20160725.diff
@@ -1,242 +1,250 @@
-diff -Nru -x '*~' lcms2-2.4.orig/CMakeLists.txt lcms2-2.4/CMakeLists.txt
---- lcms2-2.4.orig/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ lcms2-2.4/CMakeLists.txt	2013-01-24 11:35:17.013861600 +0100
+commit fa73cd1733b3cf122489d2c757485db0ac7b5cd3
+Author: Boudewijn Rempt <boud@valdyas.org>
+Date:   Tue Jul 26 10:12:27 2016 +0200
+
+    ...
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..90cee70
+--- /dev/null
++++ b/CMakeLists.txt
 @@ -0,0 +1,22 @@
 +project(lcms2)
 +
-+option(BUILD_TESTS "build the test executable" OFF)
-+option(BUILD_STATIC "build the static library" OFF)
++option(BUILD_TESTS "build the test executable" ON)
++option(BUILD_STATIC "build the static library" ON)
 +option(BUILD_UTILS "build the utilities executables" ON)
 +
 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 +
 +cmake_minimum_required(VERSION 2.6)
 +
 +include_directories(
 +${CMAKE_BINARY_DIR}/include 
 +${CMAKE_SOURCE_DIR}/include
 +)
 +
 +add_subdirectory(src)
 +if(BUILD_TESTS)
 +    add_subdirectory(testbed)
 +endif(BUILD_TESTS)
 +if(BUILD_UTILS)
 +    add_subdirectory(utils)
 +endif(BUILD_UTILS)
-diff -Nru -x '*~' lcms2-2.4.orig/include/lcms2.h lcms2-2.4/include/lcms2.h
---- lcms2-2.4.orig/include/lcms2.h	2012-09-10 18:01:51.000000000 +0200
-+++ lcms2-2.4/include/lcms2.h	2013-01-24 11:35:17.022862100 +0100
-@@ -199,25 +199,25 @@
+diff --git a/include/lcms2.h b/include/lcms2.h
+index 739e6e1..969bc3a 100644
+--- a/include/lcms2.h
++++ b/include/lcms2.h
+@@ -212,15 +212,14 @@ typedef int                  cmsBool;
  
+ #endif  // CMS_USE_BIG_ENDIAN
+ 
+-
  // Calling convention -- this is hardly platform and compiler dependent
  #ifdef CMS_IS_WINDOWS_
 -#  if defined(CMS_DLL) || defined(CMS_DLL_BUILD)
--#     ifdef __BORLANDC__
--#        define CMSEXPORT       __stdcall _export
--#        define CMSAPI
--#     else
--#        define CMSEXPORT      _stdcall
--#        ifdef CMS_DLL_BUILD
 +#   if !defined(CMS_STATIC)
-+#      ifdef __BORLANDC__
-+#         define CMSEXPORT       __stdcall _export
-+#         define CMSAPI
-+#      else
+ #     ifdef __BORLANDC__
+ #        define CMSEXPORT       __stdcall _export
+ #        define CMSAPI
+ #     else
+-#        define CMSEXPORT      __stdcall
 +#         define CMSEXPORT
-+#         ifdef CMS_DLL_BUILD
+ #        ifdef CMS_DLL_BUILD
  #            define CMSAPI    __declspec(dllexport)
--#        else
--#           define CMSAPI     __declspec(dllimport)
--#       endif
--#     endif
--#  else
--#       define CMSEXPORT
--#       define CMSAPI
--#  endif
-+#         else
-+#            define CMSAPI     __declspec(dllimport)
-+#         endif
-+#      endif
-+#   else
-+#      define CMSEXPORT
-+#      define CMSAPI
-+#   endif
- #else
--# define CMSEXPORT
--# define CMSAPI
-+#   define CMSEXPORT
-+#   define CMSAPI
- #endif
- 
- // Some common definitions
-diff -Nru -x '*~' lcms2-2.4.orig/src/CMakeLists.txt lcms2-2.4/src/CMakeLists.txt
---- lcms2-2.4.orig/src/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ lcms2-2.4/src/CMakeLists.txt	2013-01-24 11:42:39.515171300 +0100
-@@ -0,0 +1,63 @@
+ #        else
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+new file mode 100644
+index 0000000..ac575c7
+--- /dev/null
++++ b/src/CMakeLists.txt
+@@ -0,0 +1,64 @@
 +# some configure checks:
 +if(WIN32)
 +    if(MSVC)
 +        set(UINT8_T "unsigned char")
 +        set(UINT16_T "unsigned short")
 +        set(UINT32_T "unsigned long")
 +        set(INT8_T "char")
 +        set(INT16_T "short")
 +        set(INT32_T "long")
 +    else(MSVC)
 +        set(UINT8_T "uint8_t")
 +        set(UINT16_T "uint16_t")
 +        set(UINT32_T "uint32_t")
 +        set(INT8_T "int8_t")
 +        set(INT16_T "int16_t")
 +        set(INT32_T "int32_t")
 +    endif(MSVC)
 +endif(WIN32)
 +
 +set(lcms_SRCS
 +    cmscnvrt.c
 +    cmserr.c
 +    cmsgamma.c
 +    cmsgmt.c
 +    cmsintrp.c
 +    cmsio0.c
 +    cmsio1.c
 +    cmslut.c
 +    cmsplugin.c
 +    cmssm.c
 +    cmsmd5.c
 +    cmsmtrx.c
 +    cmspack.c
 +    cmspcs.c
 +    cmswtpnt.c
 +    cmsxform.c
 +    cmssamp.c
 +    cmsnamed.c
 +    cmscam02.c
 +    cmsvirt.c
 +    cmstypes.c
 +    cmscgats.c
 +    cmsps2.c
 +    cmsopt.c
 +    cmshalf.c
++    cmsalpha.c
 +)
 +
 +include_directories(${CMAKE_BINARY_DIR})
 +
 +add_library(lcms SHARED ${lcms_SRCS})
 +set_target_properties(lcms PROPERTIES OUTPUT_NAME "lcms2"
 +                                      DEFINE_SYMBOL CMS_DLL_BUILD)
 +
 +if(BUILD_TESTS OR BUILD_UTILS OR BUILD_STATIC)
 +    add_library(lcms_static ${lcms_SRCS})
 +	set_target_properties(lcms_static PROPERTIES COMPILE_FLAGS -DCMS_STATIC)
 +    set(LCMS_STATIC lcms_static)
 +endif(BUILD_TESTS OR BUILD_UTILS OR BUILD_STATIC)
 +
 +install(TARGETS lcms ${LCMS_STATIC} RUNTIME DESTINATION bin
 +                                    LIBRARY DESTINATION lib
 +                                    ARCHIVE DESTINATION lib)
 +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/lcms2.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/lcms2_plugin.h DESTINATION include)
-diff -Nru -x '*~' lcms2-2.4.orig/testbed/CMakeLists.txt lcms2-2.4/testbed/CMakeLists.txt
---- lcms2-2.4.orig/testbed/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ lcms2-2.4/testbed/CMakeLists.txt	2013-01-24 11:35:17.033862800 +0100
+diff --git a/testbed/CMakeLists.txt b/testbed/CMakeLists.txt
+new file mode 100644
+index 0000000..ca9008b
+--- /dev/null
++++ b/testbed/CMakeLists.txt
 @@ -0,0 +1,5 @@
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../src)
 +
-+add_executable(testcms testcms2.c)
++add_executable(testcms testcms2.c testplugin.c zoo_icc.c)
 +target_link_libraries(testcms lcms_static)
 +set_target_properties(testcms PROPERTIES COMPILE_FLAGS -DCMS_STATIC)
-diff -Nru -x '*~' lcms2-2.4.orig/testbed/testcms2.c lcms2-2.4/testbed/testcms2.c
---- lcms2-2.4.orig/testbed/testcms2.c	2012-09-10 18:01:51.000000000 +0200
-+++ lcms2-2.4/testbed/testcms2.c	2013-01-24 11:35:17.043863300 +0100
-@@ -31,7 +31,7 @@
- #include "lcms2_internal.h"
+diff --git a/testbed/testcms2.c b/testbed/testcms2.c
+index 203e53c..9b37774 100644
+--- a/testbed/testcms2.c
++++ b/testbed/testcms2.c
+@@ -28,7 +28,7 @@
+ #include "testcms2.h"
  
  // On Visual Studio, use debug CRT
 -#ifdef _MSC_VER
 +#ifdef _WIN32
  #     include "crtdbg.h"
  #     include <io.h>
  #endif
-diff -Nru -x '*~' lcms2-2.4.orig/utils/CMakeLists.txt lcms2-2.4/utils/CMakeLists.txt
---- lcms2-2.4.orig/utils/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ lcms2-2.4/utils/CMakeLists.txt	2013-01-24 11:35:17.050863800 +0100
+diff --git a/testbed/zoo_icc.c b/testbed/zoo_icc.c
+index b9e1efe..97e3294 100755
+--- a/testbed/zoo_icc.c
++++ b/testbed/zoo_icc.c
+@@ -27,6 +27,11 @@
+ 
+ #include "testcms2.h"
+ 
++#ifdef _WIN32
++#     include "crtdbg.h"
++#     include <io.h>
++#endif
++
+ 
+ // ZOO checks ------------------------------------------------------------------------------------------------------------
+ 
+diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+new file mode 100644
+index 0000000..c3be5bf
+--- /dev/null
++++ b/utils/CMakeLists.txt
 @@ -0,0 +1,78 @@
 +include_directories(
 +    ${CMAKE_CURRENT_SOURCE_DIR}/../include
 +    ${CMAKE_CURRENT_SOURCE_DIR}/../src
 +    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/common
 +)
 +
 +find_package(JPEG)
 +find_package(TIFF)
 +
 +set(UTILS_EXECUTABLES )
 +set(UTILS_MANPAGES )
 +
 +###############################################################################
 +if(JPEG_FOUND)
 +    include_directories(${JPEG_INCLUDE_DIR})
 +    set(JPGICC_SRCS
 +        jpgicc/jpgicc.c
 +        jpgicc/iccjpeg.c
 +        common/xgetopt.c
 +        common/vprf.c
 +    )
 +    add_executable(jpgicc ${JPGICC_SRCS})
 +    target_link_libraries(jpgicc lcms ${JPEG_LIBRARIES})
 +    list(APPEND UTILS_EXECUTABLES jpgicc)
 +    list(APPEND UTILS_MANPAGES jpgicc/jpgicc.1)
 +endif(JPEG_FOUND)
 +
 +###############################################################################
 +set(LINKICC_SRCS
 +    linkicc/linkicc.c
 +    common/xgetopt.c
 +    common/vprf.c
 +)
 +add_executable(linkicc ${LINKICC_SRCS})
 +target_link_libraries(linkicc lcms)
 +list(APPEND UTILS_EXECUTABLES linkicc)
 +list(APPEND UTILS_MANPAGES linkicc/linkicc.1)
 +
 +###############################################################################
 +set(PSICC_SRCS
 +    psicc/psicc.c
 +    common/xgetopt.c
 +    common/vprf.c
 +)
 +add_executable(psicc ${PSICC_SRCS})
 +target_link_libraries(psicc lcms)
 +list(APPEND UTILS_EXECUTABLES psicc)
 +list(APPEND UTILS_MANPAGES psicc/psicc.1)
 +
 +###############################################################################
 +if(TIFF_FOUND)
 +    include_directories(${TIFF_INCLUDE_DIR})
 +    set(JPGICC_SRCS
 +        tificc/tificc.c
 +        common/xgetopt.c
 +        common/vprf.c
 +    )
 +    add_executable(tificc ${JPGICC_SRCS})
 +    target_link_libraries(tificc lcms ${TIFF_LIBRARIES})
 +    list(APPEND UTILS_EXECUTABLES tificc)
 +    list(APPEND UTILS_MANPAGES tificc/tificc.1)
 +endif(TIFF_FOUND)
 +
 +###############################################################################
 +set(TRANSICC_SRCS
 +    transicc/transicc.c
 +    common/xgetopt.c
 +    common/vprf.c
 +)
 +add_executable(transicc ${TRANSICC_SRCS})
 +target_link_libraries(transicc lcms)
 +list(APPEND UTILS_EXECUTABLES transicc)
 +list(APPEND UTILS_MANPAGES transicc/transicc.1)
 +
 +install(TARGETS ${UTILS_EXECUTABLES} RUNTIME DESTINATION bin
 +                                     LIBRARY DESTINATION lib
 +                                     ARCHIVE DESTINATION lib)
 +install(FILES ${UTILS_MANPAGES} DESTINATION share/man/man1)
diff --git a/3rdparty/ext_libxml2/CMakeLists.txt b/3rdparty/ext_libxml2/CMakeLists.txt
index 9e05a22970..f5c023e0c6 100755
--- a/3rdparty/ext_libxml2/CMakeLists.txt
+++ b/3rdparty/ext_libxml2/CMakeLists.txt
@@ -1,31 +1,31 @@
 SET(PREFIX_ext_libxml2 "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
     ExternalProject_Add( ext_libxml2
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL http://files.kde.org/krita/build/dependencies/libxml2-2.8.0.tar.gz
-        URL_MD5 c62106f02ee00b6437f0fb9d370c1093
+        URL http://files.kde.org/krita/build/dependencies/libxml2-sources-2.9.3.tar.gz
+        URL_MD5 817ee2f5297e9763097074575903682d
 
         INSTALL_DIR ${PREFIX_ext_libxml2}
         PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libxml2-2.8.0-20110105.diff
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libxml2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
         UPDATE_COMMAND ""
         ALWAYS 0
         DEPENDS ext_patch ext_iconv ext_zlib
     )
-else (MSVC)
+else (MSVC OR MINGW)
     ExternalProject_Add( ext_libxml2
             DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-            URL http://files.kde.org/krita/build/dependencies/libxml2-2.8.0.tar.gz
-            URL_MD5 c62106f02ee00b6437f0fb9d370c1093
+            URL http://files.kde.org/krita/build/dependencies/libxml2-sources-2.9.3.tar.gz
+            URL_MD5 817ee2f5297e9763097074575903682d
 
             INSTALL_DIR ${PREFIX_ext_libxml2}
-            CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_libxml2}   ${GLOBAL_AUTOMAKE_PROFILE}
+            CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_libxml2}   ${GLOBAL_AUTOMAKE_PROFILE} --with-python-install-dir=${PREFIX_ext_libxml2}
             BUILD_COMMAND make
             INSTALL_COMMAND make install
 
             UPDATE_COMMAND ""
             ALWAYS 0
             DEPENDS ext_iconv ext_zlib
     )
-endif (MSVC)
+endif (MSVC OR MINGW)
diff --git a/3rdparty/ext_libxslt/CMakeLists.txt b/3rdparty/ext_libxslt/CMakeLists.txt
index 770e8b7711..d31d2b5aed 100755
--- a/3rdparty/ext_libxslt/CMakeLists.txt
+++ b/3rdparty/ext_libxslt/CMakeLists.txt
@@ -1,30 +1,30 @@
 SET(PREFIX_ext_libxslt "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_libxslt
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.26.tar.gz
-        URL_MD5 e61d0364a30146aaa3001296f853b2b9
+        URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.29.tar.gz
+        URL_MD5 a129d3c44c022de3b9dcf6d6f288d72e
 
         PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libxslt-1.1.26-20101102.diff
         INSTALL_DIR ${PREFIX_ext_libxslt}
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libxslt} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
         UPDATE_COMMAND ""
         ALWAYS 0
         DEPENDS ext_patch ext_libxml2
 )
-else (MSVC)
+else (MSVC OR MINGW)
 ExternalProject_Add( ext_libxslt
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.26.tar.gz
-        URL_MD5 e61d0364a30146aaa3001296f853b2b9
+        URL http://files.kde.org/krita/build/dependencies/libxslt-1.1.29.tar.gz
+        URL_MD5 a129d3c44c022de3b9dcf6d6f288d72e
 
         CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_libxslt}  ${GLOBAL_AUTOMAKE_PROFILE}
         BUILD_COMMAND make
         INSTALL_COMMAND make install
 
         UPDATE_COMMAND ""
         ALWAYS 0
         DEPENDS ext_libxml2
 )
-endif (MSVC)
+endif (MSVC OR MINGW)
diff --git a/3rdparty/ext_ocio/CMakeLists.txt b/3rdparty/ext_ocio/CMakeLists.txt
index eb72328eb3..2b2e6703dd 100644
--- a/3rdparty/ext_ocio/CMakeLists.txt
+++ b/3rdparty/ext_ocio/CMakeLists.txt
@@ -1,35 +1,37 @@
 #
 # The latest opencolorio doesn't build on Windows without using boost::ptr, but if you build
 # it with boost::ptr, you cannot link to it because of missing dll exports, so build an older
 # ocio on Windows.
 #
 SET(EXTPREFIX_ocio "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add(
     ext_ocio
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/ext_ocio.zip
-    URL_MD5 e0bc2c7177dc02bdc82e8f38f52b1058
+    URL http://files.kde.org/krita/build/dependencies/OpenColorIO-master.zip
+    URL_MD5 7065faa41103ed27f5ea9b01b9e14c91
 
     INSTALL_DIR ${EXTPREFIX_ocio}
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch.diff
+
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF 
 
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_boost
 )
 else()
 ExternalProject_Add(
     ext_ocio
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/opencolorio-a557a85454ee1ffa8cb66f8a96238e079c452f08.tgz
-    URL_MD5 c7db4cdcac40ab12870cdeb6bbd0b875
+    URL http://files.kde.org/krita/build/dependencies/OpenColorIO-master.zip
+    URL_MD5 7065faa41103ed27f5ea9b01b9e14c91
 
     INSTALL_DIR ${EXTPREFIX_ocio}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
 
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_boost
 )
 endif()
diff --git a/3rdparty/ext_ocio/patch.diff b/3rdparty/ext_ocio/patch.diff
index a35798733c..62ad94dc9c 100644
--- a/3rdparty/ext_ocio/patch.diff
+++ b/3rdparty/ext_ocio/patch.diff
@@ -1,48 +1,83 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b539ea1..ab47729 100644
+index b539ea1..2fc1034 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -9,6 +9,12 @@ if(NOT DEFINED CMAKE_FIRST_RUN)
      SET(CMAKE_FIRST_RUN 1 CACHE INTERNAL "")
  endif()
  
-+if (MSVC)
++if (WIN32)
 +    set(PATCH myptch)
 +else()
 +    set(PATCH patch)
 +endif ()
 +
  ###############################################################################
  ### GLOBAL ###
  
-@@ -183,7 +189,7 @@ else(USE_EXTERNAL_TINYXML)
+@@ -183,12 +189,12 @@ else(USE_EXTERNAL_TINYXML)
      endif()
      ExternalProject_Add(tinyxml
          URL ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.tar.gz
 -        PATCH_COMMAND patch -f -p1 < ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch
 +        PATCH_COMMAND ${PATCH} --binary -f -p1 < ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch
          BINARY_DIR ext/build/tinyxml
          INSTALL_DIR ext/dist
          CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
-@@ -252,7 +258,7 @@ else(USE_EXTERNAL_YAML)
+     )
+-    if(WIN32)
++    if(MSVC)
+         set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
+     else()
+         set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libtinyxml.a)
+@@ -252,13 +258,13 @@ else(USE_EXTERNAL_YAML)
      ExternalProject_Add(YAML_CPP_LOCAL
          URL ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.tar.gz
          BINARY_DIR ext/build/yaml-cpp
 -        PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch
 +        PATCH_COMMAND ${PATCH} --binary -p1 < ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch
          INSTALL_DIR ext/dist
          CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
      )
+     set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
+     set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
+-    if(WIN32)
++    if(MSVC)
+         set(YAML_CPP_STATIC_DEBUG_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmdd.lib)
+         set(YAML_CPP_STATIC_OPTIMIZED_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmd.lib)
+     else()
+@@ -304,7 +310,7 @@ endif()
+ messageonce("SSE Optimizations: ${OCIO_USE_SSE}")
+ 
+ if(OCIO_USE_SSE)
+-    if(WIN32)
++    if(MSVC)
+         # SSE instructions are automatically compiled into 64-bit applications so enabling the option is redundant and
+         # actually produces an unknown option warning in Visual Studio.
+         if(NOT CMAKE_CL_64)
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index db42c2f..538b3a7 100644
+index db42c2f..dffb19e 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
 @@ -55,7 +55,7 @@ set(SPHINX_VERSION 1.2b3)
  ExternalProject_Add(Sphinx
      DEPENDS setuptools docutils Jinja2 Pygments
      URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
 -    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
-+    PATCH_COMMAND patch --binary -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
++    PATCH_COMMAND ${PATCH} --binary -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
      BUILD_IN_SOURCE 1
      CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
      BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+diff --git a/src/core/Platform.h b/src/core/Platform.h
+index d2d3f30..e3afa19 100644
+--- a/src/core/Platform.h
++++ b/src/core/Platform.h
+@@ -75,7 +75,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ #define NOMINMAX 1
+ 
+ // windows - defined for both Win32 and Win64
+-#include <Windows.h>
++#include <windows.h>
+ #include <malloc.h>
+ #include <io.h>
+ #include <tchar.h> 
diff --git a/3rdparty/ext_ocio/patch_mingw.patch b/3rdparty/ext_ocio/patch_mingw.patch
new file mode 100644
index 0000000000..fb6147fa69
--- /dev/null
+++ b/3rdparty/ext_ocio/patch_mingw.patch
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e2d64..47b5297 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,7 +171,7 @@ else(USE_EXTERNAL_TINYXML)
+         INSTALL_DIR ext/dist
+         CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
+     )
+-    if(WIN32)
++    if(MSVC)
+         set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
+     else()
+         set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libtinyxml.a)
+@@ -211,7 +211,7 @@ else(USE_EXTERNAL_YAML)
+     )
+     set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
+     set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
+-    if(WIN32)
++    if(MSVC)
+         set(YAML_CPP_STATIC_DEBUG_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmdd.lib)
+         set(YAML_CPP_STATIC_OPTIMIZED_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmd.lib)
+     else()
+@@ -271,7 +271,7 @@ endif()
+ messageonce("SSE Optimizations: ${OCIO_USE_SSE}")
+ 
+ if(OCIO_USE_SSE)
+-    if(WIN32)
++    if(MSVC)
+         # SSE instructions are automatically compiled into 64-bit applications so enabling the option is redundant and
+         # actually produces an unknown option warning in Visual Studio.
+         if(NOT CMAKE_CL_64)
+diff --git a/src/core/Platform.h b/src/core/Platform.h
+index d2d3f30..e3afa19 100644
+--- a/src/core/Platform.h
++++ b/src/core/Platform.h
+@@ -75,7 +75,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ #define NOMINMAX 1
+ 
+ // windows - defined for both Win32 and Win64
+-#include <Windows.h>
++#include <windows.h>
+ #include <malloc.h>
+ #include <io.h>
+ #include <tchar.h> 
\ No newline at end of file
diff --git a/3rdparty/ext_openexr/CMakeLists.txt b/3rdparty/ext_openexr/CMakeLists.txt
index 8877773ec9..7b4f5c45a4 100755
--- a/3rdparty/ext_openexr/CMakeLists.txt
+++ b/3rdparty/ext_openexr/CMakeLists.txt
@@ -1,16 +1,33 @@
-SET(PREFIX_ext_openexr "${EXTPREFIX}" )
+SET(EXTPREFIX_openexr "${EXTPREFIX}" )
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_openexr
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
         URL http://files.kde.org/krita/build/dependencies/openexr-2.2.0.tar.gz
         URL_MD5 b64e931c82aa3790329c21418373db4e
-        
+
         PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/openexr.diff
+        COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
+
+        INSTALL_DIR ${EXTPREFIX_openexr}
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
 
-        INSTALL_DIR ${PREFIX_ext_openexr}
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_openexr} -DILMBASE_PACKAGE_PREFIX=${PREFIX_ext_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
-            
         UPDATE_COMMAND ""
         ALWAYS 0
-        DEPENDS ext_ilmbase
+        DEPENDS ext_ilmbase ext_zlib
 )
+else()
+ExternalProject_Add(ext_openexr
+        DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+        URL http://files.kde.org/krita/build/dependencies/openexr-2.2.0.tar.gz
+        URL_MD5 b64e931c82aa3790329c21418373db4e
 
+        PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/openexr.diff
+
+        INSTALL_DIR ${EXTPREFIX_openexr}
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
+
+        UPDATE_COMMAND ""
+        ALWAYS 0
+        DEPENDS ext_ilmbase ext_zlib
+)
+endif()
diff --git a/3rdparty/ext_openexr/patch_mingw.patch b/3rdparty/ext_openexr/patch_mingw.patch
new file mode 100644
index 0000000000..fd4d8f3c09
--- /dev/null
+++ b/3rdparty/ext_openexr/patch_mingw.patch
@@ -0,0 +1,31 @@
+--- a/IlmImf/ImfSystemSpecific.h
++++ b/IlmImf/ImfSystemSpecific.h
+@@ -54,7 +54,7 @@
+ 
+ #ifdef IMF_HAVE_SSE2
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__MINGW__) && !defined(__MINGW32__) && !defined(__MINGW64__)
+ // Causes issues on certain gcc versions
+ //#define EXR_FORCEINLINE inline __attribute__((always_inline))
+ #define EXR_FORCEINLINE inline
+@@ -73,7 +73,7 @@
+     free(ptr);
+ }
+ 
+-#elif defined _MSC_VER
++#elif defined(_MSC_VER) || defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
+ 
+ #define EXR_FORCEINLINE __forceinline
+ #define EXR_RESTRICT __restrict
+--- a/IlmImf/ImfOptimizedPixelReading.h
++++ b/IlmImf/ImfOptimizedPixelReading.h
+@@ -70,7 +70,7 @@
+ bool
+ isPointerSSEAligned (const void* EXR_RESTRICT pPointer)
+ {
+-    unsigned long trailingBits = ((unsigned long)pPointer) & 15;
++    unsigned long trailingBits = ((unsigned size_t)pPointer) & 15;
+     return trailingBits == 0;
+ }
+ 
diff --git a/3rdparty/ext_openjpeg/CMakeLists.txt b/3rdparty/ext_openjpeg/CMakeLists.txt
deleted file mode 100755
index 3e34540089..0000000000
--- a/3rdparty/ext_openjpeg/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-SET(PREFIX_ext_openjpeg "${EXTPREFIX}" )
-ExternalProject_Add( ext_openjpeg
-	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/openjpeg-version.2.1.tar.gz
-	URL_MD5 3e1c451c087f8462955426da38aa3b3d
-	
-    INSTALL_DIR ${PREFIX_ext_openjpeg}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_openjpeg} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
-	
-    UPDATE_COMMAND ""
-	ALWAYS 0
-    DEPENDS ext_png ext_tiff ext_lcms2 ext_zlib
-)
-
diff --git a/3rdparty/ext_png/CMakeLists.txt b/3rdparty/ext_png/CMakeLists.txt
index 2b1a2d9397..bf67d146e3 100755
--- a/3rdparty/ext_png/CMakeLists.txt
+++ b/3rdparty/ext_png/CMakeLists.txt
@@ -1,13 +1,13 @@
 SET(PREFIX_ext_png "${EXTPREFIX}" )
 ExternalProject_Add( ext_png
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/libpng-1.6.19.tar.gz
-	URL_MD5 f852029626d399bea8e20008af377ee5
+	URL http://files.kde.org/krita/build/dependencies/libpng-1.6.23.tar.gz
+	URL_MD5 3a8fb380b0fb39cb69efe47901917e38
 
 	INSTALL_DIR ${PREFIX_ext_png}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_png} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
         
 	UPDATE_COMMAND ""
 	ALWAYS 0
 	DEPENDS ext_zlib
 )
diff --git a/3rdparty/ext_poppler/CMakeLists.txt b/3rdparty/ext_poppler/CMakeLists.txt
index 1badd51caf..444319b9c5 100755
--- a/3rdparty/ext_poppler/CMakeLists.txt
+++ b/3rdparty/ext_poppler/CMakeLists.txt
@@ -1,12 +1,12 @@
 SET(PREFIX_ext_poppler "${EXTPREFIX}" )
 ExternalProject_Add( ext_poppler
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/poppler-0.38.0.tar.gz
-	URL_MD5 4554b04eedfd56c3a65be9f108e306f5
+	URL http://files.kde.org/krita/build/dependencies/poppler-0.45.0.tar.gz
+	URL_MD5 02a81a20e24849feb1a2af4db1aca865
 	
 	INSTALL_DIR ${PREFIX_ext_poppler}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_poppler} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=FALSE -BUILD_CPP_TESTS=FALSE  -DENABLE_UTILS=FALSE -DENABLE_GLIB=FALSE 
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_poppler} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=FALSE -BUILD_CPP_TESTS=FALSE  -DENABLE_UTILS=FALSE -DENABLE_GLIB=FALSE  -DENABLE_LIBOPENJPEG=FALSE
 	
     UPDATE_COMMAND ""
 	ALWAYS 0
 )
diff --git a/3rdparty/ext_pthreads/CMakeLists.txt b/3rdparty/ext_pthreads/CMakeLists.txt
index b565fe787d..b80490d507 100755
--- a/3rdparty/ext_pthreads/CMakeLists.txt
+++ b/3rdparty/ext_pthreads/CMakeLists.txt
@@ -1,14 +1,14 @@
 SET(PREFIX_ext_pthreads "${EXTPREFIX}" )
 ExternalProject_Add( ext_pthreads
-	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/pthreads-w32-2-8-0-release.tar.gz
-	URL_MD5 6d30c693233b1464ef8983fedd8ccb22
+    DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+    URL http://files.kde.org/krita/build/dependencies/pthreads-w32-2-9-1-release.tar.gz
+    URL_MD5 36ba827d6aa0fa9f9ae740a35626e2e3
 
-	INSTALL_DIR ${PREFIX_ext_pthreads}
+    INSTALL_DIR ${PREFIX_ext_pthreads}
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pthreads-w32-2-8-0-release-20110729.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_pthreads} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_pthreads} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
-	UPDATE_COMMAND ""
-	ALWAYS 0
-	DEPENDS ext_patch
+    UPDATE_COMMAND ""
+    ALWAYS 0
+    DEPENDS ext_patch
 )
diff --git a/3rdparty/ext_pthreads/pthreads-w32-2-8-0-release-20110729.diff b/3rdparty/ext_pthreads/pthreads-w32-2-9-1-release-20130901.diff
similarity index 80%
rename from 3rdparty/ext_pthreads/pthreads-w32-2-8-0-release-20110729.diff
rename to 3rdparty/ext_pthreads/pthreads-w32-2-9-1-release-20130901.diff
index 8d09ee3dec..432f236c1a 100644
--- a/3rdparty/ext_pthreads/pthreads-w32-2-8-0-release-20110729.diff
+++ b/3rdparty/ext_pthreads/pthreads-w32-2-9-1-release-20130901.diff
@@ -1,560 +1,593 @@
-diff -Nru pthreads-w32-2-8-0-release.orig/CMakeLists.txt pthreads-w32-2-8-0-release/CMakeLists.txt
---- pthreads-w32-2-8-0-release.orig/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ pthreads-w32-2-8-0-release/CMakeLists.txt	2011-07-29 13:36:02.199191000 +0200
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/CMakeLists.txt pthreads-w32-2-9-1-release/CMakeLists.txt
+--- pthreads-w32-2-9-1-release.orig/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ pthreads-w32-2-9-1-release/CMakeLists.txt	2013-09-01 13:00:26.055970400 +0200
 @@ -0,0 +1,224 @@
 +project(pthreads)
 +
 +cmake_minimum_required(VERSION 2.8)
 +
 +option(BUILD_STATIC "build pthreads as a static library" OFF)
 +option(BUILD_INLINED "build pthreads as with inlined functions" ON)
-+option(BUILD_TESTS "build test executables for pthreads" OFF)
++option(BUILD_TESTS "build test executables for pthreads" ON)
 +
 +if(BUILD_TESTS)
 +    enable_testing()
 +endif(BUILD_TESTS)
 +
 +if(MSVC)
 +    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 +endif(MSVC)
 +
 +include(ConfigureChecks.cmake)
 +
 +set(pthreads_SRCS
 +    attr.c
 +    barrier.c
 +    cancel.c
 +    cleanup.c
 +    condvar.c
 +    create.c
 +    dll.c
 +    exit.c
 +    global.c
 +    misc.c
 +    mutex.c
 +    nonportable.c
 +    private.c
 +    rwlock.c
 +    sched.c
 +    semaphore.c
 +    spin.c
 +    sync.c
 +    tsd.c
 +)
 +
 +if(MSVC)
 +    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/version.rc COMMAND cl /EP ${CMAKE_SOURCE_DIR}/version.rc > ${CMAKE_BINARY_DIR}/version.rc)
 +    list(APPEND ${pthreads_SRCS} ${CMAKE_BINARY_DIR}/version.rc)
 +endif(MSVC)
 +set(pthreads_HDRS
 +    sched.h
 +    pthread.h
 +    semaphore.h
 +)
 +include_directories(${CMAKE_SOURCE_DIR})
 +
 +if(BUILD_STATIC)
 +    set(_SHARED STATIC)
 +    add_definitions(-DPTW32_STATIC_LIB)
 +else(BUILD_STATIC)
 +    set(_SHARED SHARED)
 +endif(BUILD_STATIC)
 +
 +add_library(pthreads ${_SHARED} ${pthreads_SRCS})
 +if(BUILD_INLINED)
 +    set_target_properties(pthreads PROPERTIES COMPILE_FLAGS -DPTW32_BUILD_INLINED)
 +endif(BUILD_INLINED)
 +target_link_libraries(pthreads ws2_32)
 +
 +###############################################################################
 +if(BUILD_TESTS)
 +set(pthreads_TESTS
 +    loadfree
 +    self1
 +    mutex5
 +    mutex1
 +    mutex1n
 +    mutex1e
 +    mutex1r
 +    semaphore1
 +    semaphore2
 +    semaphore3
 +    mutex2
 +    mutex3
 +    mutex2r
 +    mutex2e
 +    mutex3r
 +    mutex3e
 +    condvar1
 +    condvar1_1
 +    condvar1_2
 +    condvar2
 +    condvar2_1
 +    exit1
 +    create1
 +    create2
 +    reuse1
 +    reuse2
 +    equal1
 +    kill1
 +    valid1
 +    valid2
 +    exit2
 +    exit3
 +    exit4
 +    exit5
 +    join0
 +    join1
 +    detach1
 +    join2
 +    join3
 +    mutex4
 +    mutex6
 +    mutex6n
 +    mutex6e
 +    mutex6r
 +    mutex6s
 +    mutex6es
 +    mutex6rs
 +    mutex7
 +    mutex7n
 +    mutex7e
 +    mutex7r
 +    mutex8
 +    mutex8n
 +    mutex8e
 +    mutex8r
 +    count1
 +    once1
 +    once2
 +    once3
 +    once4
 +    self2
 +    cancel1
 +    cancel2
 +    semaphore4
 +    semaphore4t
 +#    semaphore5
 +    barrier1
 +    barrier2
 +    barrier3
 +    barrier4
 +    barrier5
 +    tsd1
 +    tsd2
 +    delay1
 +    delay2
 +    eyal1
 +    condvar3
 +    condvar3_1
 +    condvar3_2
 +    condvar3_3
 +    condvar4
 +    condvar5
 +    condvar6
 +    condvar7
 +    condvar8
 +    condvar9
 +    errno1
 +    rwlock1
 +    rwlock2
 +    rwlock3
 +    rwlock4
 +    rwlock5
 +    rwlock6
 +    rwlock7
 +    rwlock8
 +    rwlock2_t
 +    rwlock3_t
 +    rwlock4_t
 +    rwlock5_t
 +    rwlock6_t
 +    rwlock6_t2
 +    context1
 +    cancel3
 +    cancel4
 +    cancel5
 +    cancel6a
 +    cancel6d
 +    cancel7
 +    cancel8
 +    cleanup0
 +    cleanup1
 +    cleanup2
 +    cleanup3
 +    priority1
 +    priority2
 +    inherit1
 +    spin1
 +    spin2
 +    spin3
 +    spin4
 +    exception1
 +    exception2
 +    exception3
 +    cancel9
 +    create3
 +    stress1
 +)
 +
 +foreach(_test ${pthreads_TESTS})
 +    add_executable(${_test} tests/${_test}.c)
 +    target_link_libraries(${_test} pthreads)
 +    add_test(${_test} ${_test})
 +endforeach(_test ${pthreads_TESTS})
 +
 +set(pthreads_ADD_TESTS
 +    benchtest1
 +    benchtest2
 +    benchtest3
 +    benchtest4
 +    benchtest5
 +)
 +
 +add_library(bench STATIC tests/benchlib.c)
 +foreach(_test ${pthreads_ADD_TESTS})
 +    add_executable(${_test} tests/${_test}.c)
 +    target_link_libraries(${_test} pthreads bench)
 +    add_test(${_test} ${_test})
 +endforeach(_test ${pthreads_ADD_TESTS})
 +
 +endif(BUILD_TESTS)
 +
 +###############################################################################
 +install(TARGETS pthreads RUNTIME DESTINATION bin
 +                         LIBRARY DESTINATION lib
 +                         ARCHIVE DESTINATION lib)
 +
 +install(FILES ${pthreads_HDRS} DESTINATION include)
-\ No newline at end of file
-diff -Nru pthreads-w32-2-8-0-release.orig/config.h pthreads-w32-2-8-0-release/config.h
---- pthreads-w32-2-8-0-release.orig/config.h	2005-04-25 04:18:00.000000000 +0200
-+++ pthreads-w32-2-8-0-release/config.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,134 +0,0 @@
+\ Kein Zeilenumbruch am Dateiende.
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/config.h pthreads-w32-2-9-1-release/config.h
+--- pthreads-w32-2-9-1-release.orig/config.h	2011-05-30 02:31:00.000000000 +0200
++++ pthreads-w32-2-9-1-release/config.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,153 +0,0 @@
 -/* config.h  */
 -
 -#ifndef PTW32_CONFIG_H
 -#define PTW32_CONFIG_H
 -
 -/*********************************************************************
 - * Defaults: see target specific redefinitions below.
 - *********************************************************************/
 -
 -/* We're building the pthreads-win32 library */
 -#define PTW32_BUILD
 -
 -/* Do we know about the C type sigset_t? */
 -#undef HAVE_SIGSET_T
 -
 -/* Define if you have the <signal.h> header file.  */
 -#undef HAVE_SIGNAL_H
 -
 -/* Define if you have the Borland TASM32 or compatible assembler.  */
 -#undef HAVE_TASM32
 -
 -/* Define if you don't have Win32 DuplicateHandle. (eg. WinCE) */
 -#undef NEED_DUPLICATEHANDLE
 -
 -/* Define if you don't have Win32 _beginthreadex. (eg. WinCE) */
 -#undef NEED_CREATETHREAD
 -
 -/* Define if you don't have Win32 errno. (eg. WinCE) */
 -#undef NEED_ERRNO
 -
 -/* Define if you don't have Win32 calloc. (eg. WinCE)  */
 -#undef NEED_CALLOC
 -
 -/* Define if you don't have Win32 ftime. (eg. WinCE)  */
 -#undef NEED_FTIME
 -
 -/* Define if you don't have Win32 semaphores. (eg. WinCE 2.1 or earlier)  */
 -#undef NEED_SEM
 -
 -/* Define if you need to convert string parameters to unicode. (eg. WinCE)  */
 -#undef NEED_UNICODE_CONSTS
 -
 -/* Define if your C (not C++) compiler supports "inline" functions. */
 -#undef HAVE_C_INLINE
 -
 -/* Do we know about type mode_t? */
 -#undef HAVE_MODE_T
 -
+-/* 
+- * Define if GCC has atomic builtins, i.e. __sync_* intrinsics
+- * __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least
+- * so this define does not turn those on or off. If you get an
+- * error from __sync_lock* then consider upgrading your gcc.
+- */
+-#undef HAVE_GCC_ATOMIC_BUILTINS
+-
 -/* Define if you have the timespec struct */
 -#undef HAVE_STRUCT_TIMESPEC
 -
 -/* Define if you don't have the GetProcessAffinityMask() */
 -#undef NEED_PROCESS_AFFINITY_MASK
 -
+-/* Define if your version of Windows TLSGetValue() clears WSALastError
+- * and calling SetLastError() isn't enough restore it. You'll also need to
+- * link against wsock32.lib (or libwsock32.a for MinGW).
+- */
+-#undef RETAIN_WSALASTERROR
+-
 -/*
 -# ----------------------------------------------------------------------
 -# The library can be built with some alternative behaviour to better
 -# facilitate development of applications on Win32 that will be ported
 -# to other POSIX systems.
 -#
 -# Nothing described here will make the library non-compliant and strictly
 -# compliant applications will not be affected in any way, but
 -# applications that make assumptions that POSIX does not guarantee are
 -# not strictly compliant and may fail or misbehave with some settings.
 -#
 -# PTW32_THREAD_ID_REUSE_INCREMENT
 -# Purpose:
 -# POSIX says that applications should assume that thread IDs can be
 -# recycled. However, Solaris (and some other systems) use a [very large]
 -# sequence number as the thread ID, which provides virtual uniqueness.
 -# This provides a very high but finite level of safety for applications
 -# that are not meticulous in tracking thread lifecycles e.g. applications
 -# that call functions which target detached threads without some form of
 -# thread exit synchronisation.
 -#
 -# Usage:
 -# Set to any value in the range: 0 <= value < 2^wordsize.
 -# Set to 0 to emulate reusable thread ID behaviour like Linux or *BSD.
 -# Set to 1 for unique thread IDs like Solaris (this is the default).
 -# Set to some factor of 2^wordsize to emulate smaller word size types
 -# (i.e. will wrap sooner). This might be useful to emulate some embedded
 -# systems.
 -#
 -# define PTW32_THREAD_ID_REUSE_INCREMENT 0
 -#
 -# ----------------------------------------------------------------------
 - */
 -#undef PTW32_THREAD_ID_REUSE_INCREMENT
 -
 -
 -/*********************************************************************
 - * Target specific groups
 - *
 - * If you find that these are incorrect or incomplete please report it
 - * to the pthreads-win32 maintainer. Thanks.
 - *********************************************************************/
--#ifdef WINCE
+-#if defined(WINCE)
 -#define NEED_DUPLICATEHANDLE
 -#define NEED_CREATETHREAD
 -#define NEED_ERRNO
 -#define NEED_CALLOC
 -#define NEED_FTIME
--//#define NEED_SEM
+-/* #define NEED_SEM */
 -#define NEED_UNICODE_CONSTS
 -#define NEED_PROCESS_AFFINITY_MASK
+-/* This may not be needed */
+-#define RETAIN_WSALASTERROR
 -#endif
 -
--#ifdef _UWIN
+-#if defined(_UWIN)
 -#define HAVE_MODE_T
 -#define HAVE_STRUCT_TIMESPEC
 -#endif
 -
--#ifdef __GNUC__
+-#if defined(__GNUC__)
 -#define HAVE_C_INLINE
 -#endif
 -
--#ifdef __MINGW32__
+-#if defined(__MINGW64__)
+-#define HAVE_MODE_T
+-#define HAVE_STRUCT_TIMESPEC
+-#elif defined(__MINGW32__)
 -#define HAVE_MODE_T
 -#endif
 -
--#ifdef __BORLANDC__
+-#if defined(__BORLANDC__)
 -#endif
 -
--#ifdef __WATCOMC__
+-#if defined(__WATCOMC__)
 -#endif
 -
--#ifdef __DMC__
+-#if defined(__DMC__)
 -#define HAVE_SIGNAL_H
 -#define HAVE_C_INLINE
 -#endif
 -
 -
 -
 -#endif
-diff -Nru pthreads-w32-2-8-0-release.orig/config.h.cmake pthreads-w32-2-8-0-release/config.h.cmake
---- pthreads-w32-2-8-0-release.orig/config.h.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ pthreads-w32-2-8-0-release/config.h.cmake	2011-07-29 13:30:02.140596800 +0200
-@@ -0,0 +1,134 @@
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/config.h.cmake pthreads-w32-2-9-1-release/config.h.cmake
+--- pthreads-w32-2-9-1-release.orig/config.h.cmake	1970-01-01 01:00:00.000000000 +0100
++++ pthreads-w32-2-9-1-release/config.h.cmake	2013-09-01 13:19:57.134952300 +0200
+@@ -0,0 +1,148 @@
 +/* config.h  */
 +
 +#ifndef PTW32_CONFIG_H
 +#define PTW32_CONFIG_H
 +
 +/*********************************************************************
 + * Defaults: see target specific redefinitions below.
 + *********************************************************************/
 +
 +/* We're building the pthreads-win32 library */
 +#define PTW32_BUILD
 +
 +/* Do we know about the C type sigset_t? */
 +#undef HAVE_SIGSET_T
 +
 +/* Define if you have the <signal.h> header file.  */
 +#undef HAVE_SIGNAL_H
 +
 +/* Define if you have the Borland TASM32 or compatible assembler.  */
 +#undef HAVE_TASM32
 +
 +/* Define if you don't have Win32 DuplicateHandle. (eg. WinCE) */
 +#undef NEED_DUPLICATEHANDLE
 +
 +/* Define if you don't have Win32 _beginthreadex. (eg. WinCE) */
 +#undef NEED_CREATETHREAD
 +
 +/* Define if you don't have Win32 errno. (eg. WinCE) */
 +#undef NEED_ERRNO
 +
 +/* Define if you don't have Win32 calloc. (eg. WinCE)  */
 +#undef NEED_CALLOC
 +
 +/* Define if you don't have Win32 ftime. (eg. WinCE)  */
 +#undef NEED_FTIME
 +
 +/* Define if you don't have Win32 semaphores. (eg. WinCE 2.1 or earlier)  */
 +#undef NEED_SEM
 +
 +/* Define if you need to convert string parameters to unicode. (eg. WinCE)  */
 +#undef NEED_UNICODE_CONSTS
 +
 +/* Define if your C (not C++) compiler supports "inline" functions. */
 +#undef HAVE_C_INLINE
 +
 +/* Do we know about type mode_t? */
 +#undef HAVE_MODE_T
 +
++/*
++ * Define if GCC has atomic builtins, i.e. __sync_* intrinsics
++ * __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least
++ * so this define does not turn those on or off. If you get an
++ * error from __sync_lock* then consider upgrading your gcc.
++ */
++#undef HAVE_GCC_ATOMIC_BUILTINS
++
 +/* Define if you have the timespec struct */
 +#cmakedefine HAVE_STRUCT_TIMESPEC
 +
 +/* Define if you don't have the GetProcessAffinityMask() */
 +#undef NEED_PROCESS_AFFINITY_MASK
 +
++/* Define if your version of Windows TLSGetValue() clears WSALastError
++ * and calling SetLastError() isn't enough restore it. You'll also need to
++ * link against wsock32.lib (or libwsock32.a for MinGW).
++ */
++#undef RETAIN_WSALASTERROR
++
 +/*
 +# ----------------------------------------------------------------------
 +# The library can be built with some alternative behaviour to better
 +# facilitate development of applications on Win32 that will be ported
 +# to other POSIX systems.
 +#
 +# Nothing described here will make the library non-compliant and strictly
 +# compliant applications will not be affected in any way, but
 +# applications that make assumptions that POSIX does not guarantee are
 +# not strictly compliant and may fail or misbehave with some settings.
 +#
 +# PTW32_THREAD_ID_REUSE_INCREMENT
 +# Purpose:
 +# POSIX says that applications should assume that thread IDs can be
 +# recycled. However, Solaris (and some other systems) use a [very large]
 +# sequence number as the thread ID, which provides virtual uniqueness.
 +# This provides a very high but finite level of safety for applications
 +# that are not meticulous in tracking thread lifecycles e.g. applications
 +# that call functions which target detached threads without some form of
 +# thread exit synchronisation.
 +#
 +# Usage:
 +# Set to any value in the range: 0 <= value < 2^wordsize.
 +# Set to 0 to emulate reusable thread ID behaviour like Linux or *BSD.
 +# Set to 1 for unique thread IDs like Solaris (this is the default).
 +# Set to some factor of 2^wordsize to emulate smaller word size types
 +# (i.e. will wrap sooner). This might be useful to emulate some embedded
 +# systems.
 +#
 +# define PTW32_THREAD_ID_REUSE_INCREMENT 0
 +#
 +# ----------------------------------------------------------------------
 + */
 +#undef PTW32_THREAD_ID_REUSE_INCREMENT
 +
 +
 +/*********************************************************************
 + * Target specific groups
 + *
 + * If you find that these are incorrect or incomplete please report it
 + * to the pthreads-win32 maintainer. Thanks.
 + *********************************************************************/
 +#ifdef WINCE
 +#define NEED_DUPLICATEHANDLE
 +#define NEED_CREATETHREAD
 +#define NEED_ERRNO
 +#define NEED_CALLOC
 +#define NEED_FTIME
 +//#define NEED_SEM
 +#define NEED_UNICODE_CONSTS
 +#define NEED_PROCESS_AFFINITY_MASK
 +#endif
 +
 +#ifdef _UWIN
 +#define HAVE_MODE_T
 +#define HAVE_STRUCT_TIMESPEC
 +#endif
 +
 +#ifdef __GNUC__
 +#define HAVE_C_INLINE
 +#endif
 +
 +#ifdef __MINGW32__
 +#define HAVE_MODE_T
 +#endif
 +
 +#ifdef __BORLANDC__
 +#endif
 +
 +#ifdef __WATCOMC__
 +#endif
 +
 +#ifdef __DMC__
 +#define HAVE_SIGNAL_H
 +#define HAVE_C_INLINE
 +#endif
 +
 +
 +
 +#endif
-diff -Nru pthreads-w32-2-8-0-release.orig/ConfigureChecks.cmake pthreads-w32-2-8-0-release/ConfigureChecks.cmake
---- pthreads-w32-2-8-0-release.orig/ConfigureChecks.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ pthreads-w32-2-8-0-release/ConfigureChecks.cmake	2011-07-29 13:35:12.121326700 +0200
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/ConfigureChecks.cmake pthreads-w32-2-9-1-release/ConfigureChecks.cmake
+--- pthreads-w32-2-9-1-release.orig/ConfigureChecks.cmake	1970-01-01 01:00:00.000000000 +0100
++++ pthreads-w32-2-9-1-release/ConfigureChecks.cmake	2013-09-01 13:39:02.982491000 +0200
 @@ -0,0 +1,16 @@
 +# Configure checks for the config.h
 +
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +include(CheckSymbolExists)
 +INCLUDE (CheckTypeSize)
 +
 +SET(CMAKE_EXTRA_INCLUDE_FILES time.h)
 +CHECK_TYPE_SIZE("struct timespec" STRUCT_TIMESPEC)
 +SET(CMAKE_EXTRA_INCLUDE_FILES)
 +
 +
-+add_definitions(-DHAVE_CONFIG_H)
++add_definitions(-DHAVE_PTW32_CONFIG_H)
 +
 +configure_file(config.h.cmake ${CMAKE_SOURCE_DIR}/config.h)
 +
-diff -Nru pthreads-w32-2-8-0-release.orig/create.c pthreads-w32-2-8-0-release/create.c
---- pthreads-w32-2-8-0-release.orig/create.c	2005-05-06 09:31:31.000000000 +0200
-+++ pthreads-w32-2-8-0-release/create.c	2011-07-29 13:23:37.214580300 +0200
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/create.c pthreads-w32-2-9-1-release/create.c
+--- pthreads-w32-2-9-1-release.orig/create.c	2012-03-18 06:11:43.000000000 +0100
++++ pthreads-w32-2-9-1-release/create.c	2013-09-01 13:00:26.086972100 +0200
 @@ -94,6 +94,11 @@
    int priority;
    pthread_t self;
  
 +  if(!tid)
 +    {
 +      result = EINVAL;
 +      goto FAIL0;
 +    }
    /*
     * Before doing anything, check that tid can be stored through
     * without invoking a memory protection error (segfault).
-diff -Nru pthreads-w32-2-8-0-release.orig/implement.h pthreads-w32-2-8-0-release/implement.h
---- pthreads-w32-2-8-0-release.orig/implement.h	2005-06-03 10:36:27.000000000 +0200
-+++ pthreads-w32-2-8-0-release/implement.h	2011-07-29 13:23:37.224580900 +0200
-@@ -56,6 +56,7 @@
+diff -Nru -x '*~' pthreads-w32-2-9-1-release.orig/implement.h pthreads-w32-2-9-1-release/implement.h
+--- pthreads-w32-2-9-1-release.orig/implement.h	2012-03-18 06:11:43.000000000 +0100
++++ pthreads-w32-2-9-1-release/implement.h	2013-09-01 13:00:26.098972800 +0200
+@@ -55,6 +55,7 @@
   * note: ETIMEDOUT is correctly defined in winsock.h
   */
  #include <winsock.h>
 +#include <errno.h>
  
  /*
   * In case ETIMEDOUT hasn't been defined above somehow.
-@@ -75,6 +76,8 @@
+@@ -78,6 +79,8 @@
  /* use local include files during development */
  #include "semaphore.h"
  #include "sched.h"
 +#include "pthread.h"
 +
  
  #if defined(HAVE_C_INLINE) || defined(__cplusplus)
  #define INLINE inline
diff --git a/3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch b/3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
index dcefedc992..b85a007d33 100644
--- a/3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
+++ b/3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
@@ -1,37 +1,37 @@
 From 674cfce97c4972176d2bcb55d7013c0ac2190029 Mon Sep 17 00:00:00 2001
 From: Dmitry Kazakov <dimula73@gmail.com>
 Date: Tue, 21 Jun 2016 14:50:07 +0300
 Subject: [PATCH 1/2] Don't request the MIME image every time Windows asks for
  the list of supported types
 
 Change-Id: I05516d83dc4e0f192bc94f92cefc722f25dae4d4
 ---
- src/plugins/platforms/windows/qwindowsmime.cpp | 9 ++++++---
+ qtbase/src/plugins/platforms/windows/qwindowsmime.cpp | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
+diff --git a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
 index a8264b5..90d646b 100644
---- a/src/plugins/platforms/windows/qwindowsmime.cpp
-+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
+--- a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
++++ b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
 @@ -1081,12 +1081,15 @@ bool QWindowsMimeImage::canConvertToMime(const QString &mimeType, IDataObject *p
  bool QWindowsMimeImage::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
  {
      int cf = getCf(formatetc);
 +
 +    if (cf != CF_DIBV5 && cf != CF_DIB && cf != CF_PNG)
 +        return false;
 +
      if (!mimeData->hasImage())
          return false;
 +
      const QImage image = qvariant_cast<QImage>(mimeData->imageData());
 -    if (image.isNull())
 -        return false;
 -    return cf == CF_DIBV5 || (cf == CF_DIB) || cf == int(CF_PNG);
 +    return !image.isNull();
  }
  
  bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM * pmedium) const
 -- 
 2.6.4
 
diff --git a/3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch b/3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch
index 669cdc7a8e..77e57028bd 100644
--- a/3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch
+++ b/3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch
@@ -1,30 +1,30 @@
 From 5e5026beb420018266d3d00fdb530bb714a841a6 Mon Sep 17 00:00:00 2001
 From: Dmitry Kazakov <dimula73@gmail.com>
 Date: Tue, 21 Jun 2016 14:50:47 +0300
 Subject: [PATCH 2/2] Hack: always return we support DIBV5
 
 Asking for the entire image may be too expensive
 
 Change-Id: I44c38fad73f1bb5859eb58b941054eeb6c3c6b66
 ---
- src/plugins/platforms/windows/qwindowsmime.cpp | 4 +---
+ qtbase/src/plugins/platforms/windows/qwindowsmime.cpp | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
+diff --git a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
 index 90d646b..ef97db7 100644
---- a/src/plugins/platforms/windows/qwindowsmime.cpp
-+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
+--- a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
++++ b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp
 @@ -1052,9 +1052,7 @@ QVector<FORMATETC> QWindowsMimeImage::formatsForMime(const QString &mimeType, co
      QVector<FORMATETC> formatetcs;
      if (mimeData->hasImage() && mimeType == QLatin1String("application/x-qt-image")) {
          //add DIBV5 if image has alpha channel. Do not add CF_PNG here as it will confuse MS Office (QTBUG47656).
 -        QImage image = qvariant_cast<QImage>(mimeData->imageData());
 -        if (!image.isNull() && image.hasAlphaChannel())
 -            formatetcs += setCf(CF_DIBV5);
 +        formatetcs += setCf(CF_DIBV5);
          formatetcs += setCf(CF_DIB);
      }
      if (!formatetcs.isEmpty())
 -- 
 2.6.4
 
diff --git a/3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch b/3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch
index bd8e7cfc66..d7c8bfb7ae 100644
--- a/3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch
+++ b/3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch
@@ -1,26 +1,26 @@
 From 84a774e00e9d2535fdb8c798d7789130a9a008f6 Mon Sep 17 00:00:00 2001
 From: Michael Abrahams <miabraha@gmail.com>
 Date: Wed, 22 Jun 2016 13:37:06 -0400
 Subject: [PATCH 3/4] Hack for fullscreen workaround
 
 https://bugreports.qt.io/browse/QTBUG-41309
 ---
- src/plugins/platforms/windows/qwindowswindow.cpp | 2 +-
+ qtbase/src/plugins/platforms/windows/qwindowswindow.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
+diff --git a/qtbase/src/plugins/platforms/windows/qwindowswindow.cpp b/qtbase/src/plugins/platforms/windows/qwindowswindow.cpp
 index 9c6cb53..d0829e3 100644
---- a/src/plugins/platforms/windows/qwindowswindow.cpp
-+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
+--- a/qtbase/src/plugins/platforms/windows/qwindowswindow.cpp
++++ b/qtbase/src/plugins/platforms/windows/qwindowswindow.cpp
 @@ -1769,7 +1769,7 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
              const UINT swpf = SWP_FRAMECHANGED | SWP_NOACTIVATE;
              const bool wasSync = testFlag(SynchronousGeometryChangeEvent);
              setFlag(SynchronousGeometryChangeEvent);
 -            SetWindowPos(m_data.hwnd, HWND_TOP, r.left(), r.top(), r.width(), r.height(), swpf);
 +            SetWindowPos(m_data.hwnd, HWND_TOP, r.left()-1, r.top()-1, r.width()+2, r.height()+2, swpf);
              if (!wasSync)
                  clearFlag(SynchronousGeometryChangeEvent);
              QWindowSystemInterface::handleGeometryChange(window(), r);
 -- 
 2.7.4.windows.1
 
diff --git a/3rdparty/ext_qt/CMakeLists.txt b/3rdparty/ext_qt/CMakeLists.txt
index de01c52ded..d1a31f042b 100644
--- a/3rdparty/ext_qt/CMakeLists.txt
+++ b/3rdparty/ext_qt/CMakeLists.txt
@@ -1,66 +1,60 @@
 SET(EXTPREFIX_qt  "${EXTPREFIX}")
 if (WIN32)
 ExternalProject_Add(
     ext_qt
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.zip
-    URL_MD5 03402708f260dcc917abae9bc559c1df
+    URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.zip
+    URL_MD5 9d7ea0cadcec7b5a63e8e83686756978
     PATCH_COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/disable-wintab.diff
           COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qtgui-private-headers.diff
           COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
           COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0002-Hack-always-return-we-support-DIBV5.patch
           COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0003-Hack-for-fullscreen-workaround.patch
 
     INSTALL_DIR ${EXTPREFIX_qt}
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix ${EXTPREFIX_qt}
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix ${EXTPREFIX_qt} -platform win32-g++
 
     # use this line for building Qt with debugging info enabled
-    #CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -release -force-debug-info -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix ${EXTPREFIX_qt}
+    #CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat -release -force-debug-info -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix ${EXTPREFIX_qt} -platform win32-g++
 
     BUILD_COMMAND nmake
     INSTALL_COMMAND nmake install
     UPDATE_COMMAND ""
     BUILD_IN_SOURCE 1
     ALWAYS 0
+    DEPENDS ext_patch
 )
 else() 
     if (APPLE)
         ExternalProject_Add(
            ext_qt
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.gz
-        URL_MD5 7a2a867bc12384f4161809136d49d4be
+        URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.gz
+        URL_MD5 8fdec6d657bc370bd3183d8fe8e9c47a
+        PATCH_COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff
         INSTALL_DIR ${EXTPREFIX_qt}
-        CONFIGURE_COMMAND "<SOURCE_DIR>/configure -confirm-license  -opensource -nomake examples \
-                -no-openssl \
-                -no-compile-examples -qt-freetype -qt-harfbuzz -opengl desktop \
-                -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg 
-                -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity \
-                -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia \
-                -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets \
-                -skip qtwebview \
-                -prefix ${EXTPREFIX_qt} "
+        CONFIGURE_COMMAND <SOURCE_DIR>/configure -confirm-license  -opensource -nomake examples -no-openssl -no-compile-examples -qt-freetype -qt-harfbuzz -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -prefix ${EXTPREFIX_qt} 
         BUILD_COMMAND make
         INSTALL_COMMAND make install
         UPDATE_COMMAND ""
         BUILD_IN_SOURCE 1
         ALWAYS 0
     )
     else()
         ExternalProject_Add(
             ext_qt
             DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-            URL http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.gz
-            URL_MD5 7a2a867bc12384f4161809136d49d4be
+            URL https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.gz
+            URL_MD5 8fdec6d657bc370bd3183d8fe8e9c47a
             PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qt-no-motion-compression.diff
             INSTALL_DIR ${EXTPREFIX_qt}
             CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_qt} -opensource -confirm-license -nomake examples -no-sql-sqlite -no-openssl -no-qml-debug -no-mtdev  -no-journald  -no-syslog -no-nis  -no-cups -no-tslib -no-directfb -no-linuxfb -no-libproxy -no-pch -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg  -qt-harfbuzz -qt-freetype -qt-xcb -qt-xkbcommon-x11 -optimized-qmake -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview 
             
             BUILD_COMMAND make
             INSTALL_COMMAND make install
             UPDATE_COMMAND ""
             BUILD_IN_SOURCE 1
             ALWAYS 0
         )
     endif()
 endif()
diff --git a/3rdparty/ext_qt/macdeploy-qt.diff b/3rdparty/ext_qt/macdeploy-qt.diff
index 2a33785139..ebad0e8a58 100644
--- a/3rdparty/ext_qt/macdeploy-qt.diff
+++ b/3rdparty/ext_qt/macdeploy-qt.diff
@@ -1,127 +1,127 @@
-diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
+diff --git a/qttools/src/macdeployqt/macdeployqt/main.cpp b/qttools/src/macdeployqt/macdeployqt/main.cpp
 index 81639f2..a7b28d1 100644
---- a/src/macdeployqt/macdeployqt/main.cpp
-+++ b/src/macdeployqt/macdeployqt/main.cpp
+--- a/qttools/src/macdeployqt/macdeployqt/main.cpp
++++ b/qttools/src/macdeployqt/macdeployqt/main.cpp
 @@ -57,6 +57,7 @@ int main(int argc, char **argv)
          qDebug() << "   -always-overwrite  : Copy files even if the target file exists";
          qDebug() << "   -codesign=<ident>  : Run codesign with the given identity on all executables";
          qDebug() << "   -appstore-compliant: Skip deployment of components that use private API";
 +        qDebug() << "   -extra-plugins=<d> : Deploy plugins from given extra directory";
          qDebug() << "";
          qDebug() << "macdeployqt takes an application bundle as input and makes it";
          qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
 @@ -96,6 +97,7 @@ int main(int argc, char **argv)
      extern bool runCodesign;
      extern QString codesignIdentiy;
      extern bool appstoreCompliant;
 +    QStringList extraPluginDirectories;
  
      for (int i = 2; i < argc; ++i) {
          QByteArray argument = QByteArray(argv[i]);
 @@ -151,6 +153,13 @@ int main(int argc, char **argv)
          } else if (argument == QByteArray("-appstore-compliant")) {
              LogDebug() << "Argument found:" << argument;
              appstoreCompliant = true;
 +        } else if (argument.startsWith(QByteArray("-extra-plugins"))) {
 +            LogDebug() << "Argument found:" << argument;
 +            int index = argument.indexOf('=');
 +            if (index == -1)
 +                LogError() << "Missing extra plugins directory";
 +            else
 +                extraPluginDirectories << argument.mid(index+1);
          } else if (argument.startsWith("-")) {
              LogError() << "Unknown argument" << argument << "\n";
              return 1;
 @@ -178,10 +187,13 @@ int main(int argc, char **argv)
          deploymentInfo.deployedFrameworks = deploymentInfo.deployedFrameworks.toSet().toList();
      }
  
 -    if (plugins && !deploymentInfo.qtPath.isEmpty()) {
 +    if ((plugins && !deploymentInfo.qtPath.isEmpty()) || !extraPluginDirectories.isEmpty()) {
          deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
          LogNormal();
 -        deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
 +        if (plugins && !deploymentInfo.qtPath.isEmpty())
 +            deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
 +        if (!extraPluginDirectories.isEmpty())
 +            deployExtraPlugins(appBundlePath, deploymentInfo, useDebugLibs, extraPluginDirectories);
          createQtConf(appBundlePath);
      }
  
-diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
+diff --git a/qttools/src/macdeployqt/shared/shared.cpp b/qttools/src/macdeployqt/shared/shared.cpp
 index d20b219..4a9aa1f 100644
---- a/src/macdeployqt/shared/shared.cpp
-+++ b/src/macdeployqt/shared/shared.cpp
+--- a/qttools/src/macdeployqt/shared/shared.cpp
++++ b/qttools/src/macdeployqt/shared/shared.cpp
 @@ -1020,6 +1020,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
      }
  }
  
 +void deployExtraPlugins(const ApplicationBundleInfo &appBundleInfo,
 +        const QString pluginDestinationPath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories)
 +{
 +    foreach (const QString &extraPluginDir, extraPluginDirectories) {
 +        LogNormal() << "Deploying plugins from" << extraPluginDir;
 +
 +        // search for dylib and so files, both work as plugins on mac os
 +        QDir dir(extraPluginDir);
 +        dir.setFilter(QDir::Files);
 +        dir.setNameFilters(QStringList() << "*.dylib" << "*.so");
 +        QDirIterator dirIterator(dir, QDirIterator::Subdirectories);
 +        QStringList pluginList;
 +        while (dirIterator.hasNext()) {
 +            dirIterator.next();
 +            if (!QFileInfo(dirIterator.filePath()).isFile())
 +                continue;
 +            pluginList.append(dir.relativeFilePath(dirIterator.filePath()));
 +        }
 +
 +        // deploy all found plugins
 +        foreach (const QString &plugin, pluginList) {
 +            QString sourcePath = extraPluginDir + "/" + plugin;
 +            const QString destinationPath = pluginDestinationPath + "/" + plugin;
 +            QDir dir;
 +            dir.mkpath(QFileInfo(destinationPath).path());
 +
 +            if (copyFilePrintStatus(sourcePath, destinationPath)) {
 +                runStrip(destinationPath);
 +
 +                QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
 +                deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
 +
 +            }
 +        }
 +    }
 +}
 +
  void createQtConf(const QString &appBundlePath)
  {
      // Set Plugins and imports paths. These are relative to App.app/Contents.
 @@ -1061,6 +1098,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo,
      deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
  }
  
 +void deployExtraPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories)
 +{
 +    ApplicationBundleInfo applicationBundle;
 +    applicationBundle.path = appBundlePath;
 +    applicationBundle.binaryPath = findAppBinary(appBundlePath);
 +
 +    const QString pluginDestinationPath = appBundlePath + "/" + "Contents/PlugIns";
 +    deployExtraPlugins(applicationBundle, pluginDestinationPath, deploymentInfo, useDebugLibs, extraPluginDirectories);
 +}
 +
  void deployQmlImport(const QString &appBundlePath, const QSet<QString> &rpaths, const QString &importSourcePath, const QString &importName)
  {
      QString importDestinationPath = appBundlePath + "/Contents/Resources/qml/" + importName;
-diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h
+diff --git a/qttools/src/macdeployqt/shared/shared.h b/qttools/src/macdeployqt/shared/shared.h
 index ea678c2..f10efd3 100644
---- a/src/macdeployqt/shared/shared.h
-+++ b/src/macdeployqt/shared/shared.h
+--- a/qttools/src/macdeployqt/shared/shared.h
++++ b/qttools/src/macdeployqt/shared/shared.h
 @@ -100,6 +100,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis
  DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath);
  void createQtConf(const QString &appBundlePath);
  void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs);
 +void deployExtraPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs, const QStringList &extraPluginDirectories);
  bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInfo, QStringList &qmlDirs);
  void changeIdentification(const QString &id, const QString &binaryPath);
  void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath);
diff --git a/3rdparty/ext_tiff/CMakeLists.txt b/3rdparty/ext_tiff/CMakeLists.txt
index ff6a8feddb..32351b3987 100755
--- a/3rdparty/ext_tiff/CMakeLists.txt
+++ b/3rdparty/ext_tiff/CMakeLists.txt
@@ -1,30 +1,30 @@
 SET(EXTPREFIX_tiff "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add( ext_tiff
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL http://files.kde.org/krita/build/dependencies/tiff-4.0.3.tar.gz
     URL_MD5 051c1068e6a0627f461948c365290410
         
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tiff-4.0.3-20130124.diff
     INSTALL_DIR ${EXTPREFIX_tiff}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_patch ext_zlib ext_jpeg
 )
-else (MSVC)
+else (MSVC OR MINGW)
 ExternalProject_Add( ext_tiff
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies/tiff-4.0.3.tar.gz
-	URL_MD5 051c1068e6a0627f461948c365290410
+	URL http://files.kde.org/krita/build/dependencies/tiff-4.0.6.tar.gz
+	URL_MD5 d1d2e940dea0b5ad435f21f03d96dd72
 
     CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_tiff}  ${GLOBAL_AUTOMAKE_PROFILE}
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 	
     UPDATE_COMMAND ""
 	ALWAYS 0
 	DEPENDS ext_zlib ext_jpeg
 )
-endif (MSVC)
+endif (MSVC OR MINGW)
diff --git a/3rdparty/ext_tiff/tiff-4.0.3-20130124.diff b/3rdparty/ext_tiff/tiff-4.0.3-20130124.diff
index c03a002ef6..e72df951f9 100755
--- a/3rdparty/ext_tiff/tiff-4.0.3-20130124.diff
+++ b/3rdparty/ext_tiff/tiff-4.0.3-20130124.diff
@@ -1,1420 +1,1458 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 new file mode 100644
 index 0000000..f4ef285
 --- /dev/null
 +++ b/CMakeLists.txt
 @@ -0,0 +1,45 @@
 +project(libtiff)
 +
 +cmake_minimum_required(VERSION 2.6)
 +
 +option(BUILD_TOOLS "build the tools" OFF)
 +option(BUILD_TESTS "build the tests" OFF)
 +
 +if(BUILD_TESTS)
 +    enable_testing()
 +endif(BUILD_TESTS)
 +
 +include_directories(
 +    ${CMAKE_SOURCE_DIR}/libtiff 
 +    ${CMAKE_SOURCE_DIR}/port 
 +    ${CMAKE_BINARY_DIR}
 +    ${CMAKE_BINARY_DIR}/libtiff
 +)
 +
 +include(ConfigureChecks.cmake)
 +
 +if(MSVC)
 +    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 +    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 +    if(NOT MSVC60)
 +        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
 +        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
 +    endif(NOT MSVC60)
 +endif(MSVC)
 +
 +include_directories(
 +    ${CMAKE_SOURCE_DIR}/libtiff 
 +    ${CMAKE_BINARY_DIR}
 +    ${CMAKE_BINARY_DIR}/libtiff
 +)
 +
 +add_subdirectory(libtiff)
 +add_subdirectory(man)
 +if(BUILD_TOOLS)
 +    add_subdirectory(port)
 +    add_subdirectory(tools)
 +endif(BUILD_TOOLS)
 +
 +if(BUILD_TESTS)
 +    add_subdirectory(tests)
 +endif(BUILD_TESTS)
 diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
 new file mode 100644
 index 0000000..ee25058
 --- /dev/null
 +++ b/ConfigureChecks.cmake
-@@ -0,0 +1,181 @@
+@@ -0,0 +1,199 @@
 +# configure checks.
 +find_package(OpenGL)
 +
 +include_directories(${CMAKE_BINARY_DIR})
 +
 +# options
 +if(APPLE)
 +    set(AC_APPLE_UNIVERSAL_BUILD 1)
 +endif(APPLE)
 +
 +option(CCITT_SUPPORT "CCITT Group 3 & 4 algorithms" ON)
 +option(LOGLUV_SUPPORT "LogLuv high dynamic range encoding" ON)
 +option(CXX_SUPPORT "C++ stream API (requires C++ compiler)" OFF)
 +option(LZW_SUPPORT "LZW algorithm" ON)
 +option(JBIG_SUPPORT "ISO JBIG compression (requires JBIG-KIT library)" OFF)
 +option(MDI_SUPPORT "Microsoft Document Imaging format" OFF)
 +option(NEXT_SUPPORT "NeXT 2-bit RLE algorithm" ON)
 +option(SUBIFD_SUPPORT "SubIFD tag (330) support" ON)
 +option(THUNDER_SUPPORT "ThunderScan 4-bit RLE algorithm" ON)
 +option(OJPEG_SUPPORT "Old JPEG compresson (read-only)" OFF)
 +option(PACKBITS_SUPPORT "Macintosh PackBits algorithm" ON)
 +
 +option(CHECK_JPEG_YCBCR_SUBSAMPLING 1)
 +option(DEFAULT_EXTRASAMPLE_AS_ALPHA "Treat extra sample as alpha" ON)
 +
 +
 +if(WIN32)
 +    set(X_DISPLAY_MISSING 1)
 +else(WIN32)
 +    set(STDC_HEADERS 1)
 +    set(HAVE_LIBC 1)
 +    set(HAVE_LIBM 1)
 +    set(HAVE_PTHREAD 1)
 +endif(WIN32)
 +
 +if(NOT WINCE)
 +    set(HAVE_IEEEFP 1)
 +endif(NOT WINCE)
 +
 +if(MSVC)
 +    set(inline "__inline")
 +else(MSVC)
 +    set(inline "inline")
 +endif(MSVC)
 +
 +include(CheckIncludeFiles)
 +include(CheckFunctionExists)
 +include(CheckLibraryExists)
 +include(CheckSymbolExists)
 +include(CheckTypeSize)
 +include(TestBigEndian)
 +
 +test_big_endian(HOST_BIGENDIAN)
 +
 +if(HOST_BIGENDIAN)
 +    set(HOST_FILLORDER "FILLORDER_MSB2LSB")
 +else(HOST_BIGENDIAN)
 +    set(HOST_FILLORDER "FILLORDER_LSB2MSB")
 +endif(HOST_BIGENDIAN)
 +
 +
 +
 +check_include_files("assert.h" HAVE_ASSERT_H)
 +check_include_files("dlfcn.h" HAVE_DLFCN_H)
 +check_include_files("fcntl.h" HAVE_FCNTL_H)
 +check_include_files("inttypes.h" HAVE_INTTYPES_H)
 +check_include_files("io.h" HAVE_IO_H)
 +check_include_files("limits.h" HAVE_LIMITS_H)
 +check_include_files("malloc.h" HAVE_MALLOC_H)
 +check_include_files("memory.h" HAVE_MEMORY_H)
 +check_include_files("search.h" HAVE_SEARCH_H)
 +check_include_files("stdint.h" HAVE_STDINT_H)
 +check_include_files("stdlib.h" HAVE_STDLIB_H)
 +check_include_files("strings.h" HAVE_STRINGS_H)
 +check_include_files("string.h" HAVE_STRING_H)
 +check_include_files("sys/stat.h" HAVE_SYS_STAT_H)
 +check_include_files("sys/time.h" HAVE_SYS_TIME_H)
 +check_include_files("sys/types.h" HAVE_SYS_TYPES_H)
 +check_include_files("unistd.h" HAVE_UNISTD_H)
 +check_include_files("windows.h" HAVE_WINDOWS_H)
 +
 +check_function_exists("floor" HAVE_FLOOR)
 +check_function_exists("getopt" HAVE_GETOPT)
 +check_function_exists("isascii" HAVE_ISASCII)
 +check_function_exists("jbg_newlen" HAVE_JBG_NEWLEN)
 +check_function_exists("lfind" HAVE_LFIND)
 +check_function_exists("memmove" HAVE_MEMMOVE)
 +check_function_exists("memset" HAVE_MEMSET)
 +check_function_exists("mmap" HAVE_MMAP)
 +check_function_exists("pow" HAVE_POW)
 +check_function_exists("setmode" HAVE_SETMODE)
 +check_function_exists("sqrt" HAVE_SQRT)
 +check_function_exists("strcasecmp" HAVE_STRCASECMP)
 +check_function_exists("strchr" HAVE_STRCHR)
 +check_function_exists("strrchr" HAVE_STRRCHR)
 +check_function_exists("strstr" HAVE_STRSTR)
 +check_function_exists("strtol" HAVE_STRTOL)
 +check_function_exists("strtoul" HAVE_STRTOUL)
 +
 +check_symbol_exists("int8" "stdint.h" HAVE_INT8)
 +check_symbol_exists("int16" "stdint.h" HAVE_INT16)
 +check_symbol_exists("int32" "stdint.h" HAVE_INT32)
++check_symbol_exists("int64" "stdint.h" HAVE_INT64)
 +
 +
 +set(PACKAGE "tiff")
 +set(PACKAGE_BUGREPORT "kde-windows@kde.org")
 +set(PACKAGE_NAME "LibTIFF Software")
 +set(PACKAGE_STRING "LibTIFF Software 4.0.3")
 +set(PACKAGE_TARNAME "tiff")
 +set(PACKAGE_URL "http://www.libtiff.org/")
 +set(PACKAGE_VERSION "4.0.3")
 +set(VERSION "4.0.3")
 +
 +
 +find_package(JPEG)
 +find_package(ZLIB)
 +
 +if(HAVE_JPEG)
 +    include_directories(${JPEG_INCLUDE_DIR})
 +    option(JPEG_SUPPORT "JPEG compression" ON)
 +endif(HAVE_JPEG)
 +
 +if(ZLIB_FOUND)
 +    include_directories(${ZLIB_INCLUDE_DIR})
 +    option(PIXARLOG_SUPPORT "Deflate compression" ON)
 +    option(ZIP_SUPPORT "Pixar log-format algorithm" ON)
 +endif(ZLIB_FOUND)
 +
 +CHECK_TYPE_SIZE("int" SIZEOF_INT)
 +CHECK_TYPE_SIZE("long" SIZEOF_LONG)
 +CHECK_TYPE_SIZE("signed long" SIZEOF_SIGNED_LONG)
 +CHECK_TYPE_SIZE("signed long long" SIZEOF_SIGNED_LONG_LONG)
 +CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
 +CHECK_TYPE_SIZE("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG)
 +
 +set(STRIPCHOP_DEFAULT "TIFF_STRIPCHOP")
 +
 +if(STRIPCHOP_DEFAULT AND NOT WIN32)
 +    set(STRIP_SIZE_DEFAULT 8192)
 +endif(STRIPCHOP_DEFAULT AND NOT WIN32)
 +
-+if(WIN32)
++if(MSVC)
++    set(TIFF_INT8_T "signed char")
++    set(TIFF_UINT8_T "unsigned char")
++    set(TIFF_INT16_T "signed short")
++    set(TIFF_UINT16_T "unsigned short")
++    set(TIFF_INT32_T "signed int")
++    set(TIFF_UINT32_T "unsigned int")
 +    set(TIFF_INT64_FORMAT "\"%I64d\"")
 +    set(TIFF_INT64_T "signed __int64")
 +    set(TIFF_UINT64_FORMAT "\"%I64u\"")
 +    set(TIFF_UINT64_T "unsigned __int64")
-+endif(WIN32)
++elseif(MINGW)
++    set(TIFF_INT8_T "signed char")
++    set(TIFF_UINT8_T "unsigned char")
++    set(TIFF_INT16_T "signed short")
++    set(TIFF_UINT16_T "unsigned short")
++    set(TIFF_INT32_T "signed int")
++    set(TIFF_UINT32_T "unsigned int")
++    set(TIFF_INT64_FORMAT "\"%lld\"")
++    set(TIFF_INT64_T "signed long long")
++    set(TIFF_UINT64_FORMAT "\"%llu\"")
++    set(TIFF_UINT64_T "unsigned long long")
++endif()
 +
 +check_symbol_exists("tm" "sys/time.h" TM_IN_SYS_TIME)
 +
 +check_symbol_exists("off_t" "sys/types.h" HAVE_OFF_T)
 +if(NOT HAVE_OFF_T)
 +    set(OFF_T "long int")
 +endif(NOT HAVE_OFF_T)
 +
 +check_symbol_exists("size_t" "sys/types.h" HAVE_SIZE_T)
 +if(NOT HAVE_SIZE_T)
 +    set(SIZE_T "unsigned int")
 +endif(NOT HAVE_SIZE_T)
 +
 +#***************************************************************************************
 +# still to fix later
 +#/* Define to necessary symbol if this constant uses a non-standard name on
 +#   your system. */
 +#cmakedefine PTHREAD_CREATE_JOINABLE
 +
 +#/* Define to 1 if your C compiler doesn't accept -c and -o together. */
 +#cmakedefine NO_MINUS_C_MINUS_O
 +
 +#/* Number of bits in a file offset, on hosts where this is settable. */
 +#cmakedefine _FILE_OFFSET_BITS
 +
 +#/* Define for large files, on AIX-style hosts. */
 +#cmakedefine _LARGE_FILES
 +#***************************************************************************************
 +
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtiff/tif_config.vc.h ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h @COPYONLY)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtiff/tiffconf.vc.h ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h @COPYONLY)
-+#configure_file(${CMAKE_SOURCE_DIR}/libtiff/tif_config.h.cmake ${CMAKE_BINARY_DIR}/tif_config.h)
-+#configure_file(${CMAKE_SOURCE_DIR}/libtiff/tiffconf.h.cmake ${CMAKE_BINARY_DIR}/tiffconf.h)
++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtiff/tif_config.vc.h ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h @COPYONLY)
++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtiff/tiffconf.vc.h ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h @COPYONLY)
++configure_file(${CMAKE_SOURCE_DIR}/libtiff/tif_config.h.cmake ${CMAKE_BINARY_DIR}/tif_config.h)
++configure_file(${CMAKE_SOURCE_DIR}/libtiff/tiffconf.h.cmake ${CMAKE_BINARY_DIR}/tiffconf.h)
 +
 diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
 new file mode 100644
 index 0000000..6d27cb9
 --- /dev/null
 +++ b/libtiff/CMakeLists.txt
 @@ -0,0 +1,63 @@
 +set(tiff_SRCS
 +    tif_aux.c
 +    tif_close.c
 +    tif_codec.c
 +    tif_color.c
 +    tif_compress.c
 +    tif_dir.c
 +    tif_dirinfo.c
 +    tif_dirread.c
 +    tif_dirwrite.c
 +    tif_dumpmode.c
 +    tif_error.c
 +    tif_extension.c
 +    tif_fax3.c
 +    tif_fax3sm.c
 +    tif_flush.c
 +    tif_getimage.c
 +    tif_jbig.c
 +    tif_jpeg.c
 +    tif_jpeg_12.c
 +    tif_luv.c
 +    tif_lzma.c
 +    tif_lzw.c
 +    tif_next.c
 +    tif_ojpeg.c
 +    tif_open.c
 +    tif_packbits.c
 +    tif_pixarlog.c
 +    tif_predict.c
 +    tif_print.c
 +    tif_read.c
 +    tif_strip.c
 +    tif_swab.c
 +    tif_thunder.c
 +    tif_tile.c
 +    tif_version.c
 +    tif_warning.c
 +    tif_write.c
 +    tif_zip.c
 +)
 +
 +if(WIN32)
 +    set(tiff_SRCS ${tiff_SRCS} tif_win32.c libtiff.def)
 +else(WIN32)
 +    set(tiff_SRCS ${tiff_SRCS} tif_unix.c)
 +endif(WIN32)
 +
 +add_library(tiff SHARED ${tiff_SRCS})
 +set_target_properties(tiff PROPERTIES OUTPUT_NAME "tiff3")
 +
 +if(JPEG_FOUND)
 +    target_link_libraries(tiff ${JPEG_LIBRARIES})
 +endif(JPEG_FOUND)
 +
 +if(ZLIB_FOUND)
 +    target_link_libraries(tiff ${ZLIB_LIBRARY})
 +endif(ZLIB_FOUND)
 +
 +install(TARGETS tiff RUNTIME DESTINATION bin
 +                     LIBRARY DESTINATION lib
 +                     ARCHIVE DESTINATION lib)
 +                     
 +install(FILES tiffvers.h tiff.h ${CMAKE_BINARY_DIR}/tiffconf.h tiffio.h DESTINATION include)
 \ No newline at end of file
 diff --git a/libtiff/tif_config.h.cmake b/libtiff/tif_config.h.cmake
 new file mode 100644
 index 0000000..d3e8f98
 --- /dev/null
 +++ b/libtiff/tif_config.h.cmake
-@@ -0,0 +1,320 @@
+@@ -0,0 +1,323 @@
 +/* libtiff/tif_config.h.in.  Generated from configure.ac by autoheader.  */
 +#ifndef TIF_CONFIG_H
 +#define TIF_CONFIG_H
 +
 +/* Define if building universal (internal helper macro) */
 +#cmakedefine AC_APPLE_UNIVERSAL_BUILD
 +
 +/* Support CCITT Group 3 & 4 algorithms */
 +#cmakedefine CCITT_SUPPORT
 +
 +/* Pick up YCbCr subsampling info from the JPEG data stream to support files
 +   lacking the tag (default enabled). */
 +#cmakedefine CHECK_JPEG_YCBCR_SUBSAMPLING
 +
 +/* Support C++ stream API (requires C++ compiler) */
 +#cmakedefine CXX_SUPPORT
 +
 +/* Treat extra sample as alpha (default enabled). The RGBA interface will
 +   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
 +   packages produce RGBA files but don't mark the alpha properly. */
 +#cmakedefine DEFAULT_EXTRASAMPLE_AS_ALPHA
 +
 +/* Use the Apple OpenGL framework. */
 +#cmakedefine HAVE_APPLE_OPENGL_FRAMEWORK
 +
 +/* Define to 1 if you have the <assert.h> header file. */
 +#cmakedefine HAVE_ASSERT_H
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#cmakedefine HAVE_DLFCN_H
 +
 +/* Define to 1 if you have the <fcntl.h> header file. */
 +#cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@
 +
 +/* Define to 1 if you have the `floor' function. */
 +#cmakedefine HAVE_FLOOR
 +
 +/* Define to 1 if you have the `getopt' function. */
 +#cmakedefine HAVE_GETOPT
 +
 +/* Define as 0 or 1 according to the floating point format suported by the
 +   machine */
 +#cmakedefine HAVE_IEEEFP
 +
 +/* Define to 1 if the system has the type `int16'. */
 +#cmakedefine HAVE_INT16
 +
 +/* Define to 1 if the system has the type `int32'. */
 +#cmakedefine HAVE_INT32
 +
++/* Define to 1 if the system has the type `int64'. */
++#cmakedefine HAVE_INT64
++
 +/* Define to 1 if the system has the type `int8'. */
 +#cmakedefine HAVE_INT8
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#cmakedefine HAVE_INTTYPES_H
 +
 +/* Define to 1 if you have the <io.h> header file. */
 +#cmakedefine HAVE_IO_H @HAVE_IO_H@
 +
 +/* Define to 1 if you have the `isascii' function. */
 +#cmakedefine HAVE_ISASCII
 +
 +/* Define to 1 if you have the `jbg_newlen' function. */
 +#cmakedefine HAVE_JBG_NEWLEN
 +
 +/* Define to 1 if you have the `lfind' function. */
 +#cmakedefine HAVE_LFIND
 +
 +/* Define to 1 if you have the `c' library (-lc). */
 +#cmakedefine HAVE_LIBC
 +
 +/* Define to 1 if you have the `m' library (-lm). */
 +#cmakedefine HAVE_LIBM
 +
 +/* Define to 1 if you have the <limits.h> header file. */
 +#cmakedefine HAVE_LIMITS_H
 +
 +/* Define to 1 if you have the <malloc.h> header file. */
 +#cmakedefine HAVE_MALLOC_H
 +
 +/* Define to 1 if you have the `memmove' function. */
 +#cmakedefine HAVE_MEMMOVE
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#cmakedefine HAVE_MEMORY_H
 +
 +/* Define to 1 if you have the `memset' function. */
 +#cmakedefine HAVE_MEMSET
 +
 +/* Define to 1 if you have the `mmap' function. */
 +#cmakedefine HAVE_MMAP
 +
 +/* Define to 1 if you have the `pow' function. */
 +#cmakedefine HAVE_POW
 +
 +/* Define if you have POSIX threads libraries and header files. */
 +#cmakedefine HAVE_PTHREAD
 +
 +/* Define to 1 if you have the <search.h> header file. */
 +#cmakedefine HAVE_SEARCH_H
 +
 +/* Define to 1 if you have the `setmode' function. */
 +#cmakedefine HAVE_SETMODE
 +
 +/* Define to 1 if you have the `sqrt' function. */
 +#cmakedefine HAVE_SQRT
 +
 +/* Define to 1 if you have the <stdint.h> header file. */
 +#cmakedefine HAVE_STDINT_H
 +
 +/* Define to 1 if you have the <stdlib.h> header file. */
 +#cmakedefine HAVE_STDLIB_H
 +
 +/* Define to 1 if you have the `strcasecmp' function. */
 +#cmakedefine HAVE_STRCASECMP
 +
 +/* Define to 1 if you have the `strchr' function. */
 +#cmakedefine HAVE_STRCHR
 +
 +/* Define to 1 if you have the <strings.h> header file. */
 +#cmakedefine HAVE_STRINGS_H
 +
 +/* Define to 1 if you have the <string.h> header file. */
 +#cmakedefine HAVE_STRING_H
 +
 +/* Define to 1 if you have the `strrchr' function. */
 +#cmakedefine HAVE_STRRCHR
 +
 +/* Define to 1 if you have the `strstr' function. */
 +#cmakedefine HAVE_STRSTR
 +
 +/* Define to 1 if you have the `strtol' function. */
 +#cmakedefine HAVE_STRTOL
 +
 +/* Define to 1 if you have the `strtoul' function. */
 +#cmakedefine HAVE_STRTOUL
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#cmakedefine HAVE_SYS_STAT_H
 +
 +/* Define to 1 if you have the <sys/time.h> header file. */
 +#cmakedefine HAVE_SYS_TIME_H
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
 +
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#cmakedefine HAVE_UNISTD_H 1
 +
 +/* Define to 1 if you have the <windows.h> header file. */
 +#cmakedefine HAVE_WINDOWS_H
 +
 +/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
 +   (Intel) */
 +#cmakedefine01 HOST_BIGENDIAN
 +
 +/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
 +#cmakedefine HOST_FILLORDER @HOST_FILLORDER@
 +
 +/* Support ISO JBIG compression (requires JBIG-KIT library) */
 +#cmakedefine JBIG_SUPPORT
 +
 +/* Support JPEG compression (requires IJG JPEG library) */
 +#cmakedefine JPEG_SUPPORT
 +
 +/* Support LogLuv high dynamic range encoding */
 +#cmakedefine LOGLUV_SUPPORT
 +
 +/* Define to the sub-directory in which libtool stores uninstalled libraries.
 +   */
 +#cmakedefine LT_OBJDIR
 +
 +/* Support LZW algorithm */
 +#cmakedefine LZW_SUPPORT
 +
 +/* Support Microsoft Document Imaging format */
 +#cmakedefine MDI_SUPPORT
 +
 +/* Support NeXT 2-bit RLE algorithm */
 +#cmakedefine NEXT_SUPPORT
 +
 +/* Define to 1 if your C compiler doesn't accept -c and -o together. */
 +#cmakedefine NO_MINUS_C_MINUS_O
 +
 +/* Support Old JPEG compresson (read-only) */
 +#cmakedefine OJPEG_SUPPORT
 +
 +/* Name of package */
 +#cmakedefine PACKAGE @PACKAGE@
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#cmakedefine PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@
 +
 +/* Define to the full name of this package. */
 +#cmakedefine PACKAGE_NAME @PACKAGE_NAME@
 +
 +/* Define to the full name and version of this package. */
 +#cmakedefine PACKAGE_STRING @PACKAGE_STRING@
 +
 +/* Define to the one symbol short name of this package. */
 +#cmakedefine PACKAGE_TARNAME @PACKAGE_TARNAME@
 +
 +/* Define to the home page for this package. */
 +#cmakedefine PACKAGE_URL @PACKAGE_URL@
 +
 +/* Define to the version of this package. */
 +#cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@
 +
 +/* Support Macintosh PackBits algorithm */
 +#cmakedefine PACKBITS_SUPPORT
 +
 +/* Support Pixar log-format algorithm (requires Zlib) */
 +#cmakedefine PIXARLOG_SUPPORT
 +
 +/* Define to necessary symbol if this constant uses a non-standard name on
 +   your system. */
 +#cmakedefine PTHREAD_CREATE_JOINABLE
 +
 +/* The size of `int', as computed by sizeof. */
 +#cmakedefine SIZEOF_INT @SIZEOF_INT@
 +
 +/* The size of `long', as computed by sizeof. */
 +#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
 +
 +/* The size of `signed long', as computed by sizeof. */
 +#cmakedefine SIZEOF_SIGNED_LONG @SIZEOF_SIGNED_LONG@
 +
 +/* The size of `signed long long', as computed by sizeof. */
 +#cmakedefine SIZEOF_SIGNED_LONG_LONG @SIZEOF_SIGNED_LONG_LONG@
 +
 +/* The size of `unsigned long', as computed by sizeof. */
 +#cmakedefine SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@
 +
 +/* The size of `unsigned long long', as computed by sizeof. */
 +#cmakedefine SIZEOF_UNSIGNED_LONG_LONG @SIZEOF_UNSIGNED_LONG_LONG@
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#cmakedefine STDC_HEADERS
 +
 +/* Support strip chopping (whether or not to convert single-strip uncompressed
 +   images to mutiple strips of specified size to reduce memory usage) */
 +#cmakedefine STRIPCHOP_DEFAULT @STRIPCHOP_DEFAULT@
 +
 +/* Default size of the strip in bytes (when strip chopping enabled) */
 +#cmakedefine STRIP_SIZE_DEFAULT @STRIP_SIZE_DEFAULT@
 +
 +/* Enable SubIFD tag (330) support */
 +#cmakedefine SUBIFD_SUPPORT
 +
 +/* Support ThunderScan 4-bit RLE algorithm */
 +#cmakedefine THUNDER_SUPPORT
 +
 +/* Signed 64-bit type formatter */
 +#cmakedefine TIFF_INT64_FORMAT @TIFF_INT64_FORMAT@
 +
 +/* Signed 64-bit type */
 +#cmakedefine TIFF_INT64_T @TIFF_INT64_T@
 +
 +/* Unsigned 64-bit type formatter */
 +#cmakedefine TIFF_UINT64_FORMAT @TIFF_UINT64_FORMAT@
 +
 +/* Unsigned 64-bit type */
 +#cmakedefine TIFF_UINT64_T @TIFF_UINT64_T@
 +
 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 +#cmakedefine TIME_WITH_SYS_TIME
 +
 +/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 +#cmakedefine TM_IN_SYS_TIME
 +
 +/* Version number of package */
 +#cmakedefine VERSION @VERSION@
 +
 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
 +   significant byte first (like Motorola and SPARC, unlike Intel). */
 +#if defined AC_APPLE_UNIVERSAL_BUILD
 +# if defined __BIG_ENDIAN__
 +#  define WORDS_BIGENDIAN 1
 +# endif
 +#else
 +# ifndef WORDS_BIGENDIAN
 +#  undef WORDS_BIGENDIAN
 +# endif
 +#endif
 +
 +/* Define to 1 if the X Window System is missing or not being used. */
 +#cmakedefine X_DISPLAY_MISSING
 +
 +/* Support Deflate compression */
 +#cmakedefine ZIP_SUPPORT
 +
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +#cmakedefine _FILE_OFFSET_BITS
 +
 +/* Define for large files, on AIX-style hosts. */
 +#cmakedefine _LARGE_FILES
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +#cmakedefine const
 +
 +/* Define to `__inline__' or `__inline' if that's what the C compiler
 +   calls it, or to nothing if 'inline' is not supported under any name.  */
 +#ifndef __cplusplus
 +#cmakedefine inline @inline@
 +#endif
 +
 +/* Define to `long int' if <sys/types.h> does not define. */
 +#cmakedefine off_t @off_t@
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#cmakedefine size_t @size_t@
 +
 +#ifdef _MSC_VER
 +#define lfind _lfind
 +#endif
 +
 +#if !defined(HAVE_GETOPT) && !defined(HAVE_STRCASECMP)
 +    #include "libport.h"
 +#endif
 +#endif
 \ No newline at end of file
 diff --git a/libtiff/tif_config.vc.h b/libtiff/tif_config.vc.h
 index c297cf3..2e10246 100644
 --- a/libtiff/tif_config.vc.h
 +++ b/libtiff/tif_config.vc.h
 @@ -47,7 +47,7 @@
  /* Set the native cpu bit order */
  #define HOST_FILLORDER FILLORDER_LSB2MSB
  
 -#define snprintf _snprintf
 +//#define snprintf _snprintf
  
  /* Define to 1 if your processor stores words with the most significant byte
     first (like Motorola and SPARC, unlike Intel and VAX). */
 diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
 index 2cf1de9..e07ca59 100644
 --- a/libtiff/tif_win32.c
 +++ b/libtiff/tif_win32.c
 @@ -365,7 +365,7 @@ _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c)
  #ifndef _WIN32_WCE
  
  #if (_MSC_VER < 1500)
 -#  define vsnprintf _vsnprintf
 +//#  define vsnprintf _vsnprintf
  #endif
  
  static void
-diff --git a/libtiff/tiff.h b/libtiff/tiff.h
-index 19b4e79..718f9e9 100644
---- a/libtiff/tiff.h
-+++ b/libtiff/tiff.h
-@@ -65,17 +65,17 @@
-  * strings              unsigned char*
-  */
- 
--typedef TIFF_INT8_T   int8;
--typedef TIFF_UINT8_T  uint8;
-+typedef __int8   int8;
-+typedef unsigned __int8  uint8;
- 
--typedef TIFF_INT16_T  int16;
--typedef TIFF_UINT16_T uint16;
-+typedef __int16  int16;
-+typedef unsigned __int16 uint16;
- 
--typedef TIFF_INT32_T  int32;
--typedef TIFF_UINT32_T uint32;
-+typedef __int32 int32;
-+typedef unsigned __int32 uint32;
- 
--typedef TIFF_INT64_T  int64;
--typedef TIFF_UINT64_T uint64;
-+typedef __int64 int64;
-+typedef unsigned __int64 uint64;
- 
- /*
-  * Some types as promoted in a variable argument list
 diff --git a/libtiff/tiffconf.h.cmake b/libtiff/tiffconf.h.cmake
 new file mode 100644
 index 0000000..aef040b
 --- /dev/null
 +++ b/libtiff/tiffconf.h.cmake
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,150 @@
 +/*
 +  Configuration defines for installed libtiff.
 +  This file maintained for backward compatibility. Do not use definitions
 +  from this file in your programs.
 +*/
 +
 +#ifndef _TIFFCONF_
 +#define _TIFFCONF_
 +
 +/* Define to 1 if the system has the type `int16'. */
 +#cmakedefine HAVE_INT16
 +
 +/* Define to 1 if the system has the type `int32'. */
 +#cmakedefine HAVE_INT32
 +
++/* Define to 1 if the system has the type `int64'. */
++#cmakedefine HAVE_INT64
++
 +/* Define to 1 if the system has the type `int8'. */
 +#cmakedefine HAVE_INT8
 +
++/* Signed 8-bit type */
++#cmakedefine TIFF_INT8_T @TIFF_INT8_T@
++
++/* Unsigned 8-bit type */
++#cmakedefine TIFF_UINT8_T @TIFF_UINT8_T@
++
++/* Signed 16-bit type */
++#cmakedefine TIFF_INT16_T @TIFF_INT16_T@
++
++/* Unsigned 16-bit type */
++#cmakedefine TIFF_UINT16_T @TIFF_UINT16_T@
++
++/* Signed 32-bit type */
++#cmakedefine TIFF_INT32_T @TIFF_INT32_T@
++
++/* Unsigned 32-bit type */
++#cmakedefine TIFF_UINT32_T @TIFF_UINT32_T@
++
++/* Signed 64-bit type formatter */
++#cmakedefine TIFF_INT64_FORMAT @TIFF_INT64_FORMAT@
++
++/* Signed 64-bit type */
++#cmakedefine TIFF_INT64_T @TIFF_INT64_T@
++
++/* Unsigned 64-bit type formatter */
++#cmakedefine TIFF_UINT64_FORMAT @TIFF_UINT64_FORMAT@
++
++/* Unsigned 64-bit type */
++#cmakedefine TIFF_UINT64_T @TIFF_UINT64_T@
++
++/* Signed size type */
++#if defined(_WIN64)
++#define TIFF_SSIZE_T TIFF_INT64_T
++#else
++#define TIFF_SSIZE_T TIFF_INT32_T
++#endif
++
++/* Signed size type formatter */
++#if defined(_WIN64)
++#define TIFF_SSIZE_FORMAT TIFF_INT64_FORMAT
++#else
++#define TIFF_SSIZE_FORMAT "%ld"
++#endif
++
 +/* The size of a `int', as computed by sizeof. */
 +#cmakedefine SIZEOF_INT @SIZEOF_INT@
 +
 +/* The size of a `long', as computed by sizeof. */
 +#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
 +
 +/* Compatibility stuff. */
 +
 +/* Define as 0 or 1 according to the floating point format suported by the
 +   machine */
 +#cmakedefine HAVE_IEEEFP
 +
 +/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
 +#cmakedefine HOST_FILLORDER @HOST_FILLORDER@
 +
 +/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
 +   (Intel) */
 +#cmakedefine01 HOST_BIGENDIAN
 +
 +/* Support CCITT Group 3 & 4 algorithms */
 +#cmakedefine CCITT_SUPPORT
 +
 +/* Support JPEG compression (requires IJG JPEG library) */
 +#cmakedefine JPEG_SUPPORT
 +
 +/* Support JBIG compression (requires JBIG-KIT library) */
 +#cmakedefine JBIG_SUPPORT
 +
 +/* Support LogLuv high dynamic range encoding */
 +#cmakedefine LOGLUV_SUPPORT
 +
 +/* Support LZW algorithm */
 +#cmakedefine LZW_SUPPORT
 +
 +/* Support NeXT 2-bit RLE algorithm */
 +#cmakedefine NEXT_SUPPORT
 +
 +/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
 +   fails with unpatched IJG JPEG library) */
 +#cmakedefine OJPEG_SUPPORT
 +
 +/* Support Macintosh PackBits algorithm */
 +#cmakedefine PACKBITS_SUPPORT
 +
 +/* Support Pixar log-format algorithm (requires Zlib) */
 +#cmakedefine PIXARLOG_SUPPORT
 +
 +/* Support ThunderScan 4-bit RLE algorithm */
 +#cmakedefine THUNDER_SUPPORT
 +
 +/* Support Deflate compression */
 +#cmakedefine ZIP_SUPPORT
 +
 +/* Support strip chopping (whether or not to convert single-strip uncompressed
 +   images to mutiple strips of ~8Kb to reduce memory usage) */
 +#cmakedefine STRIPCHOP_DEFAULT @STRIPCHOP_DEFAULT@
 +
 +/* Enable SubIFD tag (330) support */
 +#cmakedefine SUBIFD_SUPPORT
 +
 +/* Treat extra sample as alpha (default enabled). The RGBA interface will
 +   treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
 +   packages produce RGBA files but don't mark the alpha properly. */
 +#cmakedefine DEFAULT_EXTRASAMPLE_AS_ALPHA
 +
 +/* Pick up YCbCr subsampling info from the JPEG data stream to support files
 +   lacking the tag (default enabled). */
 +#cmakedefine CHECK_JPEG_YCBCR_SUBSAMPLING
 +
 +/* Support MS MDI magic number files as TIFF */
 +#cmakedefine MDI_SUPPORT
 +
 +/*
 + * Feature support definitions.
 + * XXX: These macros are obsoleted. Don't use them in your apps!
 + * Macros stays here for backward compatibility and should be always defined.
 + */
 +#define COLORIMETRY_SUPPORT
 +#define YCBCR_SUPPORT
 +#define CMYK_SUPPORT
 +#define ICC_SUPPORT
 +#define PHOTOSHOP_SUPPORT
 +#define IPTC_SUPPORT
 +
 +#endif /* _TIFFCONF_ */
 diff --git a/libtiff/tiffconf.vc.h b/libtiff/tiffconf.vc.h
 index 680f839..1d72692 100644
 --- a/libtiff/tiffconf.vc.h
 +++ b/libtiff/tiffconf.vc.h
 @@ -89,7 +89,7 @@
  #define CCITT_SUPPORT 1
  
  /* Support JPEG compression (requires IJG JPEG library) */
 -/* #undef JPEG_SUPPORT */
 +#define JPEG_SUPPORT 1
  
  /* Support JBIG compression (requires JBIG-KIT library) */
  /* #undef JBIG_SUPPORT */
 @@ -117,7 +117,7 @@
  #define THUNDER_SUPPORT 1
  
  /* Support Deflate compression */
 -/* #undef ZIP_SUPPORT */
 +#define ZIP_SUPPORT
  
  /* Support strip chopping (whether or not to convert single-strip uncompressed
     images to mutiple strips of ~8Kb to reduce memory usage) */
 diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
 new file mode 100644
 index 0000000..fe8f4c5
 --- /dev/null
 +++ b/man/CMakeLists.txt
 @@ -0,0 +1,73 @@
 +set(tiff1_FILES
 +    bmp2tiff.1
 +    fax2ps.1
 +    fax2tiff.1
 +    gif2tiff.1
 +    pal2rgb.1
 +    ppm2tiff.1
 +    ras2tiff.1
 +    raw2tiff.1
 +    rgb2ycbcr.1
 +    sgi2tiff.1
 +    thumbnail.1
 +    tiff2bw.1
 +    tiff2pdf.1
 +    tiff2ps.1
 +    tiff2rgba.1
 +    tiffcmp.1
 +    tiffcp.1
 +    tiffcrop.1
 +    tiffdither.1
 +    tiffdump.1
 +    tiffgt.1
 +    tiffinfo.1
 +    tiffmedian.1
 +    tiffset.1
 +    tiffsplit.1
 +    tiffsv.1
 +)
 +set(tiff3_FILES
 +    libtiff.3tiff
 +    TIFFbuffer.3tiff
 +    TIFFClose.3tiff
 +    TIFFcodec.3tiff
 +    TIFFcolor.3tiff
 +    TIFFDataWidth.3tiff
 +    TIFFError.3tiff
 +    TIFFFlush.3tiff
 +    TIFFGetField.3tiff
 +    TIFFmemory.3tiff
 +    TIFFOpen.3tiff
 +    TIFFPrintDirectory.3tiff
 +    TIFFquery.3tiff
 +    TIFFReadDirectory.3tiff
 +    TIFFReadEncodedStrip.3tiff
 +    TIFFReadEncodedTile.3tiff
 +    TIFFReadRawStrip.3tiff
 +    TIFFReadRawTile.3tiff
 +    TIFFReadRGBAImage.3tiff
 +    TIFFReadRGBAStrip.3tiff
 +    TIFFReadRGBATile.3tiff
 +    TIFFReadScanline.3tiff
 +    TIFFReadTile.3tiff
 +    TIFFRGBAImage.3tiff
 +    TIFFSetDirectory.3tiff
 +    TIFFSetField.3tiff
 +    TIFFsize.3tiff
 +    TIFFstrip.3tiff
 +    TIFFswab.3tiff
 +    TIFFtile.3tiff
 +    TIFFWarning.3tiff
 +    TIFFWriteDirectory.3tiff
 +    TIFFWriteEncodedStrip.3tiff
 +    TIFFWriteEncodedTile.3tiff
 +    TIFFWriteRawStrip.3tiff
 +    TIFFWriteRawTile.3tiff
 +    TIFFWriteScanline.3tiff
 +    TIFFWriteTile.3tiff
 +)
 +
 +if(BUILD_TOOLS)
 +    install(FILES ${tiff1_FILES} DESTINATION share/man/man1)
 +endif(BUILD_TOOLS)
 +install(FILES ${tiff3_FILES} DESTINATION share/man/man3)
 \ No newline at end of file
 diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt
 new file mode 100644
 index 0000000..c3dca62
 --- /dev/null
 +++ b/port/CMakeLists.txt
 @@ -0,0 +1,19 @@
 +if(NOT WIN32)
 +    set(port_SRCS
 +        dummy.c
 +    )
 +else(NOT WIN32)
 +    set(port_SRCS
 +        strcasecmp.c
 +        getopt.c
 +    )
 +endif(NOT WIN32)
 +
 +if(NOT HAVE_LFIND)
 +    set(port_SRCS ${port_SRCS} lfind.c)
 +endif(NOT HAVE_LFIND)
 +if(NOT HAVE_STRTOUL)
 +    set(port_SRCS ${port_SRCS} strtoul.c)
 +endif(NOT HAVE_STRTOUL)
 +
 +add_library(port ${port_SRCS})
 \ No newline at end of file
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
 new file mode 100644
 index 0000000..4ecc0bf
 --- /dev/null
 +++ b/tools/CMakeLists.txt
 @@ -0,0 +1,137 @@
 +
 +#EXTRA_PROGRAMS = sgi2tiff sgisv ycbcr
 +
 +#if HAVE_RPATH
 +#AM_LDFLAGS = $(LIBDIR)
 +#endif
 +
 +include_directories(${CMAKE_BINARY_DIR}/libtiff ${CMAKE_SOURCE_DIR}/libtiff)
 +
 +set(bmp2tiff_SRCS bmp2tiff.c)
 +add_executable(bmp2tiff ${bmp2tiff_SRCS})
 +target_link_libraries(bmp2tiff tiff port)
 +
 +set(fax2ps_SRCS fax2ps.c)
 +add_executable(fax2ps ${fax2ps_SRCS})
 +target_link_libraries(fax2ps tiff port)
 +
 +set(fax2tiff_SRCS fax2tiff.c)
 +add_executable(fax2tiff ${fax2tiff_SRCS})
 +target_link_libraries(fax2tiff tiff port)
 +
 +set(gif2tiff_SRCS gif2tiff.c)
 +add_executable(gif2tiff ${gif2tiff_SRCS})
 +target_link_libraries(gif2tiff tiff port)
 +
 +set(pal2rgb_SRCS pal2rgb.c)
 +add_executable(pal2rgb ${pal2rgb_SRCS})
 +target_link_libraries(pal2rgb tiff port)
 +
 +set(ppm2tiff_SRCS ppm2tiff.c)
 +add_executable(ppm2tiff ${ppm2tiff_SRCS})
 +target_link_libraries(ppm2tiff tiff port)
 +
 +set(ras2tiff_SRCS ras2tiff.c rasterfile.h)
 +add_executable(ras2tiff ${ras2tiff_SRCS})
 +target_link_libraries(ras2tiff tiff port)
 +
 +set(raw2tiff_SRCS raw2tiff.c)
 +add_executable(raw2tiff ${raw2tiff_SRCS})
 +target_link_libraries(raw2tiff tiff port)
 +
 +set(rgb2ycbcr_SRCS rgb2ycbcr.c ../libtiff/tif_aux.c)
 +add_executable(rgb2ycbcr ${rgb2ycbcr_SRCS})
 +target_link_libraries(rgb2ycbcr tiff port)
 +
 +set(thumbnail_SRCS thumbnail.c)
 +add_executable(thumbnail ${thumbnail_SRCS})
 +target_link_libraries(thumbnail tiff port)
 +
 +set(tiff2bw_SRCS tiff2bw.c)
 +add_executable(tiff2bw ${tiff2bw_SRCS})
 +target_link_libraries(tiff2bw tiff port)
 +
 +set(tiff2pdf_SRCS tiff2pdf.c)
 +add_executable(tiff2pdf ${tiff2pdf_SRCS})
 +target_link_libraries(tiff2pdf tiff port)
 +
 +set(tiff2ps_SRCS tiff2ps.c)
 +add_executable(tiff2ps ${tiff2ps_SRCS})
 +target_link_libraries(tiff2ps tiff port)
 +
 +set(tiff2rgba_SRCS tiff2rgba.c ../libtiff/tif_aux.c)
 +add_executable(tiff2rgba ${tiff2rgba_SRCS})
 +target_link_libraries(tiff2rgba tiff port)
 +
 +set(tiffcmp_SRCS tiffcmp.c)
 +add_executable(tiffcmp ${tiffcmp_SRCS})
 +target_link_libraries(tiffcmp tiff port)
 +
 +set(tiffcp_SRCS tiffcp.c)
 +add_executable(tiffcp ${tiffcp_SRCS})
 +target_link_libraries(tiffcp tiff port)
 +
 +set(tiffcrop_SRCS tiffcrop.c)
 +add_executable(tiffcrop ${tiffcrop_SRCS})
 +target_link_libraries(tiffcrop tiff port)
 +
 +set(tiffdither_SRCS tiffdither.c)
 +add_executable(tiffdither ${tiffdither_SRCS})
 +target_link_libraries(tiffdither tiff port)
 +
 +set(tiffdump_SRCS tiffdump.c)
 +add_executable(tiffdump ${tiffdump_SRCS})
 +target_link_libraries(tiffdump tiff port)
 +
 +set(tiffinfo_SRCS tiffinfo.c)
 +add_executable(tiffinfo ${tiffinfo_SRCS})
 +target_link_libraries(tiffinfo tiff port)
 +
 +set(tiffmedian_SRCS tiffmedian.c)
 +add_executable(tiffmedian ${tiffmedian_SRCS})
 +target_link_libraries(tiffmedian tiff port)
 +
 +set(tiffset_SRCS tiffset.c)
 +add_executable(tiffset ${tiffset_SRCS})
 +target_link_libraries(tiffset tiff port)
 +
 +set(tiffsplit_SRCS tiffsplit.c)
 +add_executable(tiffsplit ${tiffsplit_SRCS})
 +target_link_libraries(tiffsplit tiff port)
 +
 +if(HAVE_OPENGL)
 +    set(tiffgt_SRCS tiffgt.c)
 +#    include_directories(${OpenGL_INCLUDE_DIR})
 +    add_executable(tiffgt ${tiffgt_SRCS})
 +    target_link_libraries(tiffgt tiff port ${OpenGL_LIBRARIES})
 +endif(HAVE_OPENGL)
 +
 +set(tools
 +bmp2tiff
 +fax2ps
 +fax2tiff
 +gif2tiff
 +pal2rgb
 +ppm2tiff
 +ras2tiff
 +raw2tiff
 +rgb2ycbcr
 +thumbnail
 +tiff2bw
 +tiff2pdf
 +tiff2ps
 +tiff2rgba
 +tiffcmp
 +tiffcp
 +tiffcrop
 +tiffdither
 +tiffdump
 +tiffinfo
 +tiffmedian
 +tiffset
 +tiffsplit
 +)
 +
 +install(TARGETS ${tools} RUNTIME DESTINATION bin
 +                         LIBRARY DESTINATION lib
 +                         ARCHIVE DESTINATION lib)
 \ No newline at end of file
 diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
 index 9cd5d86..b1d9874 100644
 --- a/tools/tiffcrop.c
 +++ b/tools/tiffcrop.c
 @@ -2931,9 +2931,9 @@ extractContigSamples24bits (uint8 *in, uint8 *out, uint32 cols,
          }
        else /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 24);
 +        bytebuff1 = (uint8)(buff2 >> 24);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 16);
 +        bytebuff2 = (uint8)(buff2 >> 16);
          *dst++ = bytebuff2;
          ready_bits -= 16;
  
 @@ -2947,7 +2947,7 @@ extractContigSamples24bits (uint8 *in, uint8 *out, uint32 cols,
    /* catch any trailing bits at the end of the line */
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 24);
 +    bytebuff1 = (uint8)(buff2 >> 24);
      *dst++ = bytebuff1;
  
      buff2 = (buff2 << 8);
 @@ -3031,13 +3031,13 @@ extractContigSamples32bits (uint8 *in, uint8 *out, uint32 cols,
        /* If we have a full buffer's worth, write it out */
        if (ready_bits >= 32)
          {
 -        bytebuff1 = (buff2 >> 56);
 +        bytebuff1 = (uint8)(buff2 >> 56);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 48);
 +        bytebuff2 = (uint8)(buff2 >> 48);
          *dst++ = bytebuff2;
 -        bytebuff3 = (buff2 >> 40);
 +        bytebuff3 = (uint8)(buff2 >> 40);
          *dst++ = bytebuff3;
 -        bytebuff4 = (buff2 >> 32);
 +        bytebuff4 = (uint8)(buff2 >> 32);
          *dst++ = bytebuff4;
          ready_bits -= 32;
                      
 @@ -3054,7 +3054,7 @@ extractContigSamples32bits (uint8 *in, uint8 *out, uint32 cols,
      }
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 56);
 +    bytebuff1 = (uint8)(buff2 >> 56);
      *dst++ = bytebuff1;
      buff2 = (buff2 << 8);
      ready_bits -= 8;
 @@ -3304,9 +3304,9 @@ extractContigSamplesShifted24bits (uint8 *in, uint8 *out, uint32 cols,
          }
        else /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 24);
 +        bytebuff1 = (uint8)(buff2 >> 24);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 16);
 +        bytebuff2 = (uint8)(buff2 >> 16);
          *dst++ = bytebuff2;
          ready_bits -= 16;
  
 @@ -3320,7 +3320,7 @@ extractContigSamplesShifted24bits (uint8 *in, uint8 *out, uint32 cols,
    /* catch any trailing bits at the end of the line */
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 24);
 +    bytebuff1 = (uint8)(buff2 >> 24);
      *dst++ = bytebuff1;
  
      buff2 = (buff2 << 8);
 @@ -3412,13 +3412,13 @@ extractContigSamplesShifted32bits (uint8 *in, uint8 *out, uint32 cols,
          }
        else  /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 56);
 +        bytebuff1 = (uint8)(buff2 >> 56);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 48);
 +        bytebuff2 = (uint8)(buff2 >> 48);
          *dst++ = bytebuff2;
 -        bytebuff3 = (buff2 >> 40);
 +        bytebuff3 = (uint8)(buff2 >> 40);
          *dst++ = bytebuff3;
 -        bytebuff4 = (buff2 >> 32);
 +        bytebuff4 = (uint8)(buff2 >> 32);
          *dst++ = bytebuff4;
          ready_bits -= 32;
                      
 @@ -3430,7 +3430,7 @@ extractContigSamplesShifted32bits (uint8 *in, uint8 *out, uint32 cols,
      }
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 56);
 +    bytebuff1 = (uint8)(buff2 >> 56);
      *dst++ = bytebuff1;
      buff2 = (buff2 << 8);
      ready_bits -= 8;
 @@ -3944,9 +3944,9 @@ combineSeparateSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
  	/* If we have a full buffer's worth, write it out */
  	if (ready_bits >= 16)
  	  {
 -	    bytebuff1 = (buff2 >> 24);
 +	    bytebuff1 = (uint8)(buff2 >> 24);
  	    *dst++ = bytebuff1;
 -	    bytebuff2 = (buff2 >> 16);
 +	    bytebuff2 = (uint8)(buff2 >> 16);
  	    *dst++ = bytebuff2;
  	    ready_bits -= 16;
  
 @@ -3981,7 +3981,7 @@ combineSeparateSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
      /* catch any trailing bits at the end of the line */
      while (ready_bits > 0)
        {
 -	bytebuff1 = (buff2 >> 24);
 +	bytebuff1 = (uint8)(buff2 >> 24);
  	*dst++ = bytebuff1;
  
  	buff2 = (buff2 << 8);
 @@ -4077,13 +4077,13 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
  	/* If we have a full buffer's worth, write it out */
  	if (ready_bits >= 32)
  	  {
 -	  bytebuff1 = (buff2 >> 56);
 +	  bytebuff1 = (uint8)(buff2 >> 56);
  	  *dst++ = bytebuff1;
 -	  bytebuff2 = (buff2 >> 48);
 +	  bytebuff2 = (uint8)(buff2 >> 48);
  	  *dst++ = bytebuff2;
 -	  bytebuff3 = (buff2 >> 40);
 +	  bytebuff3 = (uint8)(buff2 >> 40);
  	  *dst++ = bytebuff3;
 -	  bytebuff4 = (buff2 >> 32);
 +	  bytebuff4 = (uint8)(buff2 >> 32);
  	  *dst++ = bytebuff4;
  	  ready_bits -= 32;
                      
 @@ -4104,17 +4104,17 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
  	  dump_info (dumpfile, format, "",
  		     "Row %3d, Col %3d, Sample %d, Src byte offset %3d  bit offset %2d  Dst offset %3d",
  		     row + 1, col + 1, s, src_byte, src_bit, dst - out);
 -	  dump_wide (dumpfile, format, "Match bits ", matchbits);
 +	  dump_wide (dumpfile, format, "Match bits ", (uint32)matchbits);
  	  dump_data (dumpfile, format, "Src   bits ", src, 8);
 -	  dump_wide (dumpfile, format, "Buff1 bits ", buff1);
 -	  dump_wide (dumpfile, format, "Buff2 bits ", buff2);
 +	  dump_wide (dumpfile, format, "Buff1 bits ", (uint32)buff1);
 +	  dump_wide (dumpfile, format, "Buff2 bits ", (uint32)buff2);
  	  dump_info (dumpfile, format, "", "Ready bits:   %d, %s", ready_bits, action); 
  	  }
  	}
        }
      while (ready_bits > 0)
        {
 -      bytebuff1 = (buff2 >> 56);
 +      bytebuff1 = (uint8)(buff2 >> 56);
        *dst++ = bytebuff1;
        buff2 = (buff2 << 8);
        ready_bits -= 8;
 @@ -4126,10 +4126,10 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
  	         "Row %3d, Col %3d, Src byte offset %3d  bit offset %2d  Dst offset %3d",
  		 row + 1, col + 1, src_byte, src_bit, dst - out);
  
 -      dump_long (dumpfile, format, "Match bits ", matchbits);
 +      dump_long (dumpfile, format, "Match bits ", (uint32)matchbits);
        dump_data (dumpfile, format, "Src   bits ", src, 4);
 -      dump_long (dumpfile, format, "Buff1 bits ", buff1);
 -      dump_long (dumpfile, format, "Buff2 bits ", buff2);
 +      dump_long (dumpfile, format, "Buff1 bits ", (uint32)buff1);
 +      dump_long (dumpfile, format, "Buff2 bits ", (uint32)buff2);
        dump_byte (dumpfile, format, "Write bits1", bytebuff1);
        dump_byte (dumpfile, format, "Write bits2", bytebuff2);
        dump_info (dumpfile, format, "", "Ready bits:  %2d", ready_bits); 
 @@ -4468,9 +4468,9 @@ combineSeparateTileSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
  	/* If we have a full buffer's worth, write it out */
  	if (ready_bits >= 16)
  	  {
 -	    bytebuff1 = (buff2 >> 24);
 +	    bytebuff1 = (uint8)(buff2 >> 24);
  	    *dst++ = bytebuff1;
 -	    bytebuff2 = (buff2 >> 16);
 +	    bytebuff2 = (uint8)(buff2 >> 16);
  	    *dst++ = bytebuff2;
  	    ready_bits -= 16;
  
 @@ -4505,7 +4505,7 @@ combineSeparateTileSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
      /* catch any trailing bits at the end of the line */
      while (ready_bits > 0)
        {
 -	bytebuff1 = (buff2 >> 24);
 +	bytebuff1 = (uint8)(buff2 >> 24);
  	*dst++ = bytebuff1;
  
  	buff2 = (buff2 << 8);
 @@ -4602,13 +4602,13 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
  	/* If we have a full buffer's worth, write it out */
  	if (ready_bits >= 32)
  	  {
 -	  bytebuff1 = (buff2 >> 56);
 +	  bytebuff1 = (uint8)(buff2 >> 56);
  	  *dst++ = bytebuff1;
 -	  bytebuff2 = (buff2 >> 48);
 +	  bytebuff2 = (uint8)(buff2 >> 48);
  	  *dst++ = bytebuff2;
 -	  bytebuff3 = (buff2 >> 40);
 +	  bytebuff3 = (uint8)(buff2 >> 40);
  	  *dst++ = bytebuff3;
 -	  bytebuff4 = (buff2 >> 32);
 +	  bytebuff4 = (uint8)(buff2 >> 32);
  	  *dst++ = bytebuff4;
  	  ready_bits -= 32;
                      
 @@ -4639,7 +4639,7 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
        }
      while (ready_bits > 0)
        {
 -      bytebuff1 = (buff2 >> 56);
 +      bytebuff1 = (uint8)(buff2 >> 56);
        *dst++ = bytebuff1;
        buff2 = (buff2 << 8);
        ready_bits -= 8;
 @@ -4651,10 +4651,10 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
  	         "Row %3d, Col %3d, Src byte offset %3d  bit offset %2d  Dst offset %3d",
  		 row + 1, col + 1, src_byte, src_bit, dst - out);
  
 -      dump_long (dumpfile, format, "Match bits ", matchbits);
 +      dump_long (dumpfile, format, "Match bits ", (uint32)matchbits);
        dump_data (dumpfile, format, "Src   bits ", src, 4);
 -      dump_long (dumpfile, format, "Buff1 bits ", buff1);
 -      dump_long (dumpfile, format, "Buff2 bits ", buff2);
 +      dump_long (dumpfile, format, "Buff1 bits ", (uint32)buff1);
 +      dump_long (dumpfile, format, "Buff2 bits ", (uint32)buff2);
        dump_byte (dumpfile, format, "Write bits1", bytebuff1);
        dump_byte (dumpfile, format, "Write bits2", bytebuff2);
        dump_info (dumpfile, format, "", "Ready bits:  %2d", ready_bits); 
 @@ -5548,12 +5548,12 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
    if (page->width <= 0)
      pwidth = iwidth;
    else
 -    pwidth = page->width;
 +    pwidth = (uint32)page->width;
  
    if (page->length <= 0)
      plength = ilength;
    else
 -    plength = page->length;
 +    plength = (uint32)page->length;
  
    if (dump->debug)
      {
 @@ -8060,9 +8060,9 @@ rotateContigSamples24bits(uint16 rotation, uint16 spp, uint16 bps, uint32 width,
        /* If we have a full buffer's worth, write it out */
        if (ready_bits >= 16)
          {
 -        bytebuff1 = (buff2 >> 24);
 +        bytebuff1 = (uint8)(buff2 >> 24);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 16);
 +        bytebuff2 = (uint8)(buff2 >> 16);
          *dst++ = bytebuff2;
          ready_bits -= 16;
  
 @@ -8081,7 +8081,7 @@ rotateContigSamples24bits(uint16 rotation, uint16 spp, uint16 bps, uint32 width,
   /* catch any trailing bits at the end of the line */
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 24);
 +    bytebuff1 = (uint8)(buff2 >> 24);
      *dst++ = bytebuff1;
  
      buff2 = (buff2 << 8);
 @@ -8172,13 +8172,13 @@ rotateContigSamples32bits(uint16 rotation, uint16 spp, uint16 bps, uint32 width,
          }
        else /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 56);
 +        bytebuff1 = (uint8)(buff2 >> 56);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 48);
 +        bytebuff2 = (uint8)(buff2 >> 48);
          *dst++ = bytebuff2;
 -        bytebuff3 = (buff2 >> 40);
 +        bytebuff3 = (uint8)(buff2 >> 40);
          *dst++ = bytebuff3;
 -        bytebuff4 = (buff2 >> 32);
 +        bytebuff4 = (uint8)(buff2 >> 32);
          *dst++ = bytebuff4;
          ready_bits -= 32;
                      
 @@ -8190,7 +8190,7 @@ rotateContigSamples32bits(uint16 rotation, uint16 spp, uint16 bps, uint32 width,
      }
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 56);
 +    bytebuff1 = (uint8)(buff2 >> 56);
      *dst++ = bytebuff1;
      buff2 = (buff2 << 8);
      ready_bits -= 8;
 @@ -8679,9 +8679,9 @@ reverseSamples24bits (uint16 spp, uint16 bps, uint32 width,
          }
        else /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 24);
 +        bytebuff1 = (uint8)(buff2 >> 24);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 16);
 +        bytebuff2 = (uint8)(buff2 >> 16);
          *dst++ = bytebuff2;
          ready_bits -= 16;
  
 @@ -8695,7 +8695,7 @@ reverseSamples24bits (uint16 spp, uint16 bps, uint32 width,
   /* catch any trailing bits at the end of the line */
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 24);
 +    bytebuff1 = (uint8)(buff2 >> 24);
      *dst++ = bytebuff1;
  
      buff2 = (buff2 << 8);
 @@ -8780,13 +8780,13 @@ reverseSamples32bits (uint16 spp, uint16 bps, uint32 width,
          }
        else /* If we have a full buffer's worth, write it out */
          {
 -        bytebuff1 = (buff2 >> 56);
 +        bytebuff1 = (uint8)(buff2 >> 56);
          *dst++ = bytebuff1;
 -        bytebuff2 = (buff2 >> 48);
 +        bytebuff2 = (uint8)(buff2 >> 48);
          *dst++ = bytebuff2;
 -        bytebuff3 = (buff2 >> 40);
 +        bytebuff3 = (uint8)(buff2 >> 40);
          *dst++ = bytebuff3;
 -        bytebuff4 = (buff2 >> 32);
 +        bytebuff4 = (uint8)(buff2 >> 32);
          *dst++ = bytebuff4;
          ready_bits -= 32;
                      
 @@ -8798,7 +8798,7 @@ reverseSamples32bits (uint16 spp, uint16 bps, uint32 width,
      }
    while (ready_bits > 0)
      {
 -    bytebuff1 = (buff2 >> 56);
 +    bytebuff1 = (uint8)(buff2 >> 56);
      *dst++ = bytebuff1;
      buff2 = (buff2 << 8);
      ready_bits -= 8;
diff --git a/3rdparty/ext_vc/CMakeLists.txt b/3rdparty/ext_vc/CMakeLists.txt
index d6680211a3..203f4bcca9 100755
--- a/3rdparty/ext_vc/CMakeLists.txt
+++ b/3rdparty/ext_vc/CMakeLists.txt
@@ -1,13 +1,15 @@
 SET(PREFIX_ext_vc "${EXTPREFIX}" )
 ExternalProject_Add( ext_vc
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL http://files.kde.org/krita/build/dependencies/Vc-1.2.0.tar.gz
     URL_MD5 f2a213ae4bad0dcf4ec6469e4dad41c1
 
     INSTALL_DIR ${PREFIX_ext_vc}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/vc1.2_malloc_free.patch
+
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PROCESSOR=x86
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 )
 
diff --git a/3rdparty/ext_vc/vc1.2_malloc_free.patch b/3rdparty/ext_vc/vc1.2_malloc_free.patch
new file mode 100644
index 0000000000..b257bd3dac
--- /dev/null
+++ b/3rdparty/ext_vc/vc1.2_malloc_free.patch
@@ -0,0 +1,15 @@
+--- a/common/malloc.h
++++ b/common/malloc.h
+@@ -90,6 +90,12 @@
+ {
+ #ifdef __MIC__
+     _mm_free(p);
++#elif defined(_WIN32)
++# ifdef __GNUC__
++    return __mingw_aligned_free(p);
++# else
++    return _aligned_free(p);
++# endif
+ #else
+     std::free(p);
+ #endif
diff --git a/3rdparty/ext_zlib/CMakeLists.txt b/3rdparty/ext_zlib/CMakeLists.txt
index d2bea61c2c..2934bff647 100755
--- a/3rdparty/ext_zlib/CMakeLists.txt
+++ b/3rdparty/ext_zlib/CMakeLists.txt
@@ -1,30 +1,30 @@
 SET(PREFIX_ext_zlib "${EXTPREFIX}" )
-if (MSVC)
+if (MSVC OR MINGW)
 ExternalProject_Add(
     ext_zlib
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-    URL http://files.kde.org/krita/build/dependencies/zlib-1.2.7.tar.gz
-    URL_MD5 60df6a37c56e7c1366cca812414f7b85
+    URL http://files.kde.org/krita/build/dependencies/zlib-1.2.8.tar.gz
+    URL_MD5 44d667c142d7cda120332623eab69f40
 
     INSTALL_DIR ${PREFIX_ext_zlib}
-    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.7-20130123.diff
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.8-20130901.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_zlib} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
 
     UPDATE_COMMAND ""
     ALWAYS 0
     DEPENDS ext_patch
 )
 else ()
 ExternalProject_Add( ext_zlib
 	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	URL http://files.kde.org/krita/build/dependencies//zlib-1.2.7.tar.gz
-	URL_MD5 60df6a37c56e7c1366cca812414f7b85
+	URL http://files.kde.org/krita/build/dependencies/zlib-1.2.8.tar.gz
+	URL_MD5 44d667c142d7cda120332623eab69f40
 	
-        INSTALL_DIR ${PREFIX_ext_zlib}
-	PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.7.diff
+    INSTALL_DIR ${PREFIX_ext_zlib}
+	PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.8-20130901.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_zlib} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} 
 
 	UPDATE_COMMAND ""
 	ALWAYS 0
 )
 endif ()
diff --git a/3rdparty/ext_zlib/zlib-1.2.7.diff b/3rdparty/ext_zlib/zlib-1.2.7.diff
deleted file mode 100755
index 578bbe73b9..0000000000
--- a/3rdparty/ext_zlib/zlib-1.2.7.diff
+++ /dev/null
@@ -1,891 +0,0 @@
-diff -Naur zlib-1.2.7-orig/CMakeLists.txt zlib-1.2.7/CMakeLists.txt
---- zlib-1.2.7-orig/CMakeLists.txt	2012-04-30 06:20:45.000000000 +0200
-+++ zlib-1.2.7/CMakeLists.txt	2013-06-08 17:00:40.000000000 +0200
-@@ -1,8 +1,15 @@
--cmake_minimum_required(VERSION 2.4.4)
-+cmake_minimum_required(VERSION 2.6)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
- 
-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-+
- project(zlib C)
- 
-+if(WINCE)
-+    find_package(Wcecompat REQUIRED)
-+    include_directories(${WCECOMPAT_INCLUDE_DIR})
-+endif(WINCE)
-+
- set(VERSION "1.2.7")
- 
- set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-@@ -11,6 +18,8 @@
- set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
- set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
- 
-+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-+
- include(CheckTypeSize)
- include(CheckFunctionExists)
- include(CheckIncludeFile)
-@@ -21,6 +30,7 @@
- check_include_file(stdint.h    HAVE_STDINT_H)
- check_include_file(stddef.h    HAVE_STDDEF_H)
- 
-+set(CMAKE_DEBUG_POSTFIX)
- #
- # Check to see if we have large file support
- #
-@@ -57,7 +67,7 @@
- check_include_file(unistd.h Z_HAVE_UNISTD_H)
- 
- if(MSVC)
--    set(CMAKE_DEBUG_POSTFIX "d")
-+#    set(CMAKE_DEBUG_POSTFIX "d")
-     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -152,6 +162,10 @@
- set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- set_target_properties(zlib PROPERTIES SOVERSION 1)
- 
-+if(WINCE)
-+    target_link_libraries(zlib ${WCECOMPAT_LIBRARIES})
-+endif(WINCE)
-+
- if(NOT CYGWIN)
-     # This property causes shared libraries on Linux to have the full version
-     # encoded into their final filename.  We disable this on Cygwin because
-@@ -163,10 +177,12 @@
-     set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
- endif()
- 
--if(UNIX)
-+if(UNIX OR MINGW)
-     # On unix-like platforms the library is almost always called libz
-    set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
--   set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
-+   if(NOT APPLE)
-+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
-+   endif()
- elseif(BUILD_SHARED_LIBS AND WIN32)
-     # Creates zlib1.dll when building shared library version
-     set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-@@ -192,12 +208,14 @@
- # Example binaries
- #============================================================================
- 
-+if(NOT WINCE)
- add_executable(example test/example.c)
- target_link_libraries(example zlib)
- add_test(example example)
- 
- add_executable(minigzip test/minigzip.c)
- target_link_libraries(minigzip zlib)
-+endif(NOT WINCE)
- 
- if(HAVE_OFF64_T)
-     add_executable(example64 test/example.c)
-@@ -209,3 +227,7 @@
-     target_link_libraries(minigzip64 zlib)
-     set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
- endif()
-+
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc DESTINATION lib/pkgconfig)
-diff -Naur zlib-1.2.7-orig/CMakeLists.txt.orig zlib-1.2.7/CMakeLists.txt.orig
---- zlib-1.2.7-orig/CMakeLists.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.7/CMakeLists.txt.orig	2013-06-08 16:58:50.000000000 +0200
-@@ -0,0 +1,213 @@
-+cmake_minimum_required(VERSION 2.4.4)
-+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-+
-+project(zlib C)
-+
-+set(VERSION "1.2.7")
-+
-+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-+
-+include(CheckTypeSize)
-+include(CheckFunctionExists)
-+include(CheckIncludeFile)
-+include(CheckCSourceCompiles)
-+enable_testing()
-+
-+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-+check_include_file(stdint.h    HAVE_STDINT_H)
-+check_include_file(stddef.h    HAVE_STDDEF_H)
-+
-+#
-+# Check to see if we have large file support
-+#
-+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-+# We add these other definitions here because CheckTypeSize.cmake
-+# in CMake 2.4.x does not automatically do so and we want
-+# compatibility with CMake 2.4.x.
-+if(HAVE_SYS_TYPES_H)
-+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-+endif()
-+if(HAVE_STDINT_H)
-+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-+endif()
-+if(HAVE_STDDEF_H)
-+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-+endif()
-+check_type_size(off64_t OFF64_T)
-+if(HAVE_OFF64_T)
-+   add_definitions(-D_LARGEFILE64_SOURCE=1)
-+endif()
-+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-+
-+#
-+# Check for fseeko
-+#
-+check_function_exists(fseeko HAVE_FSEEKO)
-+if(NOT HAVE_FSEEKO)
-+    add_definitions(-DNO_FSEEKO)
-+endif()
-+
-+#
-+# Check for unistd.h
-+#
-+check_include_file(unistd.h Z_HAVE_UNISTD_H)
-+
-+if(MSVC)
-+    set(CMAKE_DEBUG_POSTFIX "d")
-+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-+endif()
-+
-+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-+    # If we're doing an out of source build and the user has a zconf.h
-+    # in their source tree...
-+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-+        message(STATUS "Renaming")
-+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
-+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
-+        message(STATUS "but CMake generates it automatically in the build directory.")
-+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
-+  endif()
-+endif()
-+
-+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-+		${ZLIB_PC} @ONLY)
-+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-+
-+
-+#============================================================================
-+# zlib
-+#============================================================================
-+
-+set(ZLIB_PUBLIC_HDRS
-+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-+    zlib.h
-+)
-+set(ZLIB_PRIVATE_HDRS
-+    crc32.h
-+    deflate.h
-+    gzguts.h
-+    inffast.h
-+    inffixed.h
-+    inflate.h
-+    inftrees.h
-+    trees.h
-+    zutil.h
-+)
-+set(ZLIB_SRCS
-+    adler32.c
-+    compress.c
-+    crc32.c
-+    deflate.c
-+    gzclose.c
-+    gzlib.c
-+    gzread.c
-+    gzwrite.c
-+    inflate.c
-+    infback.c
-+    inftrees.c
-+    inffast.c
-+    trees.c
-+    uncompr.c
-+    zutil.c
-+)
-+
-+if(NOT MINGW)
-+    set(ZLIB_SRCS ${ZLIB_SRCS}
-+        win32/zlib1.rc # If present will override custom build rule below.
-+    )
-+endif()
-+
-+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-+
-+if(MINGW)
-+    # This gets us DLL resource information when compiling on MinGW.
-+    if(NOT CMAKE_RC_COMPILER)
-+        SET(CMAKE_RC_COMPILER windres.exe)
-+    endif()
-+
-+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-+                       COMMAND ${CMAKE_RC_COMPILER}
-+                            -D GCC_WINDRES
-+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-+                            -I ${CMAKE_CURRENT_BINARY_DIR}
-+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-+    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-+endif(MINGW)
-+
-+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-+set_target_properties(zlib PROPERTIES SOVERSION 1)
-+
-+if(NOT CYGWIN)
-+    # This property causes shared libraries on Linux to have the full version
-+    # encoded into their final filename.  We disable this on Cygwin because
-+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-+    # seems to be the default.
-+    #
-+    # This has no effect with MSVC, on that platform the version info for
-+    # the DLL comes from the resource file win32/zlib1.rc
-+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-+endif()
-+
-+if(UNIX)
-+    # On unix-like platforms the library is almost always called libz
-+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-+   if(NOT APPLE)
-+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
-+   endif()
-+elseif(BUILD_SHARED_LIBS AND WIN32)
-+    # Creates zlib1.dll when building shared library version
-+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-+endif()
-+
-+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-+    install(TARGETS zlib zlibstatic
-+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-+endif()
-+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
-+endif()
-+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-+endif()
-+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-+endif()
-+
-+#============================================================================
-+# Example binaries
-+#============================================================================
-+
-+add_executable(example test/example.c)
-+target_link_libraries(example zlib)
-+add_test(example example)
-+
-+add_executable(minigzip test/minigzip.c)
-+target_link_libraries(minigzip zlib)
-+
-+if(HAVE_OFF64_T)
-+    add_executable(example64 test/example.c)
-+    target_link_libraries(example64 zlib)
-+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-+    add_test(example64 example64)
-+
-+    add_executable(minigzip64 test/minigzip.c)
-+    target_link_libraries(minigzip64 zlib)
-+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-+endif()
-diff -Naur zlib-1.2.7-orig/cmake/modules/FindWcecompat.cmake zlib-1.2.7/cmake/modules/FindWcecompat.cmake
---- zlib-1.2.7-orig/cmake/modules/FindWcecompat.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.7/cmake/modules/FindWcecompat.cmake	2013-06-08 17:00:40.000000000 +0200
-@@ -0,0 +1,33 @@
-+# Try to find Wcecompat functionality
-+# Once done this will define
-+#
-+#  WCECOMPAT_FOUND - system has Wcecompat
-+#  WCECOMPAT_INCLUDE_DIR - Wcecompat include directory
-+#  WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat
-+#
-+# Copyright (c) 2010, Andreas Holzammer, <andy@kdab.com>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+
-+if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
-+  set(Wcecompat_FIND_QUIETLY TRUE)
-+endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
-+
-+find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat)
-+
-+set(WCECOMPAT_LIB_FOUND FALSE)
-+
-+if(WCECOMPAT_INCLUDE_DIR)
-+    find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex )
-+    if(WCECOMPAT_LIBRARIES)
-+      set(WCECOMPAT_LIB_FOUND TRUE)
-+    endif(WCECOMPAT_LIBRARIES)
-+endif(WCECOMPAT_INCLUDE_DIR)
-+
-+# I have no idea what this is about, but it seems to be used quite often, so I add this here
-+set(WCECOMPAT_CONST const)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Wcecompat  DEFAULT_MSG  WCECOMPAT_LIBRARIES  WCECOMPAT_LIB_FOUND)
-+
-+mark_as_advanced(WCECOMPAT_INCLUDE_DIR  WCECOMPAT_LIBRARIES  WCECOMPAT_CONST  WCECOMPAT_LIB_FOUND)
-diff -Naur zlib-1.2.7-orig/win32/zlib1.rc zlib-1.2.7/win32/zlib1.rc
---- zlib-1.2.7-orig/win32/zlib1.rc	2006-05-21 05:55:00.000000000 +0200
-+++ zlib-1.2.7/win32/zlib1.rc	2013-06-08 17:00:40.000000000 +0200
-@@ -10,9 +10,9 @@
-   PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
- #ifdef _DEBUG
--  FILEFLAGS		1
-+  FILEFLAGS		0x1L
- #else
--  FILEFLAGS		0
-+  FILEFLAGS		0x0L
- #endif
-   FILEOS		VOS__WINDOWS32
-   FILETYPE		VFT_DLL
-diff -Naur zlib-1.2.7-orig/zconf.h zlib-1.2.7/zconf.h
---- zlib-1.2.7-orig/zconf.h	2012-04-30 01:18:12.000000000 +0200
-+++ zlib-1.2.7/zconf.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,506 +0,0 @@
--/* zconf.h -- configuration of the zlib compression library
-- * Copyright (C) 1995-2012 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#ifndef ZCONF_H
--#define ZCONF_H
--
--/*
-- * If you *really* need a unique prefix for all types and library functions,
-- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-- * Even better than compiling with -DZ_PREFIX would be to use configure to set
-- * this permanently in zconf.h using "./configure --zprefix".
-- */
--#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
--#  define Z_PREFIX_SET
--
--/* all linked symbols */
--#  define _dist_code            z__dist_code
--#  define _length_code          z__length_code
--#  define _tr_align             z__tr_align
--#  define _tr_flush_block       z__tr_flush_block
--#  define _tr_init              z__tr_init
--#  define _tr_stored_block      z__tr_stored_block
--#  define _tr_tally             z__tr_tally
--#  define adler32               z_adler32
--#  define adler32_combine       z_adler32_combine
--#  define adler32_combine64     z_adler32_combine64
--#  ifndef Z_SOLO
--#    define compress              z_compress
--#    define compress2             z_compress2
--#    define compressBound         z_compressBound
--#  endif
--#  define crc32                 z_crc32
--#  define crc32_combine         z_crc32_combine
--#  define crc32_combine64       z_crc32_combine64
--#  define deflate               z_deflate
--#  define deflateBound          z_deflateBound
--#  define deflateCopy           z_deflateCopy
--#  define deflateEnd            z_deflateEnd
--#  define deflateInit2_         z_deflateInit2_
--#  define deflateInit_          z_deflateInit_
--#  define deflateParams         z_deflateParams
--#  define deflatePending        z_deflatePending
--#  define deflatePrime          z_deflatePrime
--#  define deflateReset          z_deflateReset
--#  define deflateResetKeep      z_deflateResetKeep
--#  define deflateSetDictionary  z_deflateSetDictionary
--#  define deflateSetHeader      z_deflateSetHeader
--#  define deflateTune           z_deflateTune
--#  define deflate_copyright     z_deflate_copyright
--#  define get_crc_table         z_get_crc_table
--#  ifndef Z_SOLO
--#    define gz_error              z_gz_error
--#    define gz_intmax             z_gz_intmax
--#    define gz_strwinerror        z_gz_strwinerror
--#    define gzbuffer              z_gzbuffer
--#    define gzclearerr            z_gzclearerr
--#    define gzclose               z_gzclose
--#    define gzclose_r             z_gzclose_r
--#    define gzclose_w             z_gzclose_w
--#    define gzdirect              z_gzdirect
--#    define gzdopen               z_gzdopen
--#    define gzeof                 z_gzeof
--#    define gzerror               z_gzerror
--#    define gzflush               z_gzflush
--#    define gzgetc                z_gzgetc
--#    define gzgetc_               z_gzgetc_
--#    define gzgets                z_gzgets
--#    define gzoffset              z_gzoffset
--#    define gzoffset64            z_gzoffset64
--#    define gzopen                z_gzopen
--#    define gzopen64              z_gzopen64
--#    ifdef _WIN32
--#      define gzopen_w              z_gzopen_w
--#    endif
--#    define gzprintf              z_gzprintf
--#    define gzputc                z_gzputc
--#    define gzputs                z_gzputs
--#    define gzread                z_gzread
--#    define gzrewind              z_gzrewind
--#    define gzseek                z_gzseek
--#    define gzseek64              z_gzseek64
--#    define gzsetparams           z_gzsetparams
--#    define gztell                z_gztell
--#    define gztell64              z_gztell64
--#    define gzungetc              z_gzungetc
--#    define gzwrite               z_gzwrite
--#  endif
--#  define inflate               z_inflate
--#  define inflateBack           z_inflateBack
--#  define inflateBackEnd        z_inflateBackEnd
--#  define inflateBackInit_      z_inflateBackInit_
--#  define inflateCopy           z_inflateCopy
--#  define inflateEnd            z_inflateEnd
--#  define inflateGetHeader      z_inflateGetHeader
--#  define inflateInit2_         z_inflateInit2_
--#  define inflateInit_          z_inflateInit_
--#  define inflateMark           z_inflateMark
--#  define inflatePrime          z_inflatePrime
--#  define inflateReset          z_inflateReset
--#  define inflateReset2         z_inflateReset2
--#  define inflateSetDictionary  z_inflateSetDictionary
--#  define inflateSync           z_inflateSync
--#  define inflateSyncPoint      z_inflateSyncPoint
--#  define inflateUndermine      z_inflateUndermine
--#  define inflateResetKeep      z_inflateResetKeep
--#  define inflate_copyright     z_inflate_copyright
--#  define inflate_fast          z_inflate_fast
--#  define inflate_table         z_inflate_table
--#  ifndef Z_SOLO
--#    define uncompress            z_uncompress
--#  endif
--#  define zError                z_zError
--#  ifndef Z_SOLO
--#    define zcalloc               z_zcalloc
--#    define zcfree                z_zcfree
--#  endif
--#  define zlibCompileFlags      z_zlibCompileFlags
--#  define zlibVersion           z_zlibVersion
--
--/* all zlib typedefs in zlib.h and zconf.h */
--#  define Byte                  z_Byte
--#  define Bytef                 z_Bytef
--#  define alloc_func            z_alloc_func
--#  define charf                 z_charf
--#  define free_func             z_free_func
--#  ifndef Z_SOLO
--#    define gzFile                z_gzFile
--#  endif
--#  define gz_header             z_gz_header
--#  define gz_headerp            z_gz_headerp
--#  define in_func               z_in_func
--#  define intf                  z_intf
--#  define out_func              z_out_func
--#  define uInt                  z_uInt
--#  define uIntf                 z_uIntf
--#  define uLong                 z_uLong
--#  define uLongf                z_uLongf
--#  define voidp                 z_voidp
--#  define voidpc                z_voidpc
--#  define voidpf                z_voidpf
--
--/* all zlib structs in zlib.h and zconf.h */
--#  define gz_header_s           z_gz_header_s
--#  define internal_state        z_internal_state
--
--#endif
--
--#if defined(__MSDOS__) && !defined(MSDOS)
--#  define MSDOS
--#endif
--#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
--#  define OS2
--#endif
--#if defined(_WINDOWS) && !defined(WINDOWS)
--#  define WINDOWS
--#endif
--#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
--#  ifndef WIN32
--#    define WIN32
--#  endif
--#endif
--#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
--#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
--#    ifndef SYS16BIT
--#      define SYS16BIT
--#    endif
--#  endif
--#endif
--
--/*
-- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
-- * than 64k bytes at a time (needed on systems with 16-bit int).
-- */
--#ifdef SYS16BIT
--#  define MAXSEG_64K
--#endif
--#ifdef MSDOS
--#  define UNALIGNED_OK
--#endif
--
--#ifdef __STDC_VERSION__
--#  ifndef STDC
--#    define STDC
--#  endif
--#  if __STDC_VERSION__ >= 199901L
--#    ifndef STDC99
--#      define STDC99
--#    endif
--#  endif
--#endif
--#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
--#  define STDC
--#endif
--
--#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
--#  define STDC
--#endif
--
--#ifndef STDC
--#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
--#    define const       /* note: need a more gentle solution here */
--#  endif
--#endif
--
--#if defined(ZLIB_CONST) && !defined(z_const)
--#  define z_const const
--#else
--#  define z_const
--#endif
--
--/* Some Mac compilers merge all .h files incorrectly: */
--#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
--#  define NO_DUMMY_DECL
--#endif
--
--/* Maximum value for memLevel in deflateInit2 */
--#ifndef MAX_MEM_LEVEL
--#  ifdef MAXSEG_64K
--#    define MAX_MEM_LEVEL 8
--#  else
--#    define MAX_MEM_LEVEL 9
--#  endif
--#endif
--
--/* Maximum value for windowBits in deflateInit2 and inflateInit2.
-- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
-- * created by gzip. (Files created by minigzip can still be extracted by
-- * gzip.)
-- */
--#ifndef MAX_WBITS
--#  define MAX_WBITS   15 /* 32K LZ77 window */
--#endif
--
--/* The memory requirements for deflate are (in bytes):
--            (1 << (windowBits+2)) +  (1 << (memLevel+9))
-- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
-- plus a few kilobytes for small objects. For example, if you want to reduce
-- the default memory requirements from 256K to 128K, compile with
--     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-- Of course this will generally degrade compression (there's no free lunch).
--
--   The memory requirements for inflate are (in bytes) 1 << windowBits
-- that is, 32K for windowBits=15 (default value) plus a few kilobytes
-- for small objects.
--*/
--
--                        /* Type declarations */
--
--#ifndef OF /* function prototypes */
--#  ifdef STDC
--#    define OF(args)  args
--#  else
--#    define OF(args)  ()
--#  endif
--#endif
--
--#ifndef Z_ARG /* function prototypes for stdarg */
--#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
--#    define Z_ARG(args)  args
--#  else
--#    define Z_ARG(args)  ()
--#  endif
--#endif
--
--/* The following definitions for FAR are needed only for MSDOS mixed
-- * model programming (small or medium model with some far allocations).
-- * This was tested only with MSC; for other MSDOS compilers you may have
-- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
-- * just define FAR to be empty.
-- */
--#ifdef SYS16BIT
--#  if defined(M_I86SM) || defined(M_I86MM)
--     /* MSC small or medium model */
--#    define SMALL_MEDIUM
--#    ifdef _MSC_VER
--#      define FAR _far
--#    else
--#      define FAR far
--#    endif
--#  endif
--#  if (defined(__SMALL__) || defined(__MEDIUM__))
--     /* Turbo C small or medium model */
--#    define SMALL_MEDIUM
--#    ifdef __BORLANDC__
--#      define FAR _far
--#    else
--#      define FAR far
--#    endif
--#  endif
--#endif
--
--#if defined(WINDOWS) || defined(WIN32)
--   /* If building or using zlib as a DLL, define ZLIB_DLL.
--    * This is not mandatory, but it offers a little performance increase.
--    */
--#  ifdef ZLIB_DLL
--#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
--#      ifdef ZLIB_INTERNAL
--#        define ZEXTERN extern __declspec(dllexport)
--#      else
--#        define ZEXTERN extern __declspec(dllimport)
--#      endif
--#    endif
--#  endif  /* ZLIB_DLL */
--   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
--    * define ZLIB_WINAPI.
--    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
--    */
--#  ifdef ZLIB_WINAPI
--#    ifdef FAR
--#      undef FAR
--#    endif
--#    include <windows.h>
--     /* No need for _export, use ZLIB.DEF instead. */
--     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
--#    define ZEXPORT WINAPI
--#    ifdef WIN32
--#      define ZEXPORTVA WINAPIV
--#    else
--#      define ZEXPORTVA FAR CDECL
--#    endif
--#  endif
--#endif
--
--#if defined (__BEOS__)
--#  ifdef ZLIB_DLL
--#    ifdef ZLIB_INTERNAL
--#      define ZEXPORT   __declspec(dllexport)
--#      define ZEXPORTVA __declspec(dllexport)
--#    else
--#      define ZEXPORT   __declspec(dllimport)
--#      define ZEXPORTVA __declspec(dllimport)
--#    endif
--#  endif
--#endif
--
--#ifndef ZEXTERN
--#  define ZEXTERN extern
--#endif
--#ifndef ZEXPORT
--#  define ZEXPORT
--#endif
--#ifndef ZEXPORTVA
--#  define ZEXPORTVA
--#endif
--
--#ifndef FAR
--#  define FAR
--#endif
--
--#if !defined(__MACTYPES__)
--typedef unsigned char  Byte;  /* 8 bits */
--#endif
--typedef unsigned int   uInt;  /* 16 bits or more */
--typedef unsigned long  uLong; /* 32 bits or more */
--
--#ifdef SMALL_MEDIUM
--   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
--#  define Bytef Byte FAR
--#else
--   typedef Byte  FAR Bytef;
--#endif
--typedef char  FAR charf;
--typedef int   FAR intf;
--typedef uInt  FAR uIntf;
--typedef uLong FAR uLongf;
--
--#ifdef STDC
--   typedef void const *voidpc;
--   typedef void FAR   *voidpf;
--   typedef void       *voidp;
--#else
--   typedef Byte const *voidpc;
--   typedef Byte FAR   *voidpf;
--   typedef Byte       *voidp;
--#endif
--
--/* ./configure may #define Z_U4 here */
--
--#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
--#  include <limits.h>
--#  if (UINT_MAX == 0xffffffffUL)
--#    define Z_U4 unsigned
--#  else
--#    if (ULONG_MAX == 0xffffffffUL)
--#      define Z_U4 unsigned long
--#    else
--#      if (USHRT_MAX == 0xffffffffUL)
--#        define Z_U4 unsigned short
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifdef Z_U4
--   typedef Z_U4 z_crc_t;
--#else
--   typedef unsigned long z_crc_t;
--#endif
--
--#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
--#  define Z_HAVE_UNISTD_H
--#endif
--
--#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
--#  define Z_HAVE_STDARG_H
--#endif
--
--#ifdef STDC
--#  ifndef Z_SOLO
--#    include <sys/types.h>      /* for off_t */
--#  endif
--#endif
--
--#ifdef _WIN32
--#  include <stddef.h>           /* for wchar_t */
--#endif
--
--/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
-- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
-- * though the former does not conform to the LFS document), but considering
-- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
-- * equivalently requesting no 64-bit operations
-- */
--#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
--#  undef _LARGEFILE64_SOURCE
--#endif
--
--#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
--#  define Z_HAVE_UNISTD_H
--#endif
--#ifndef Z_SOLO
--#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
--#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
--#    ifdef VMS
--#      include <unixio.h>       /* for off_t */
--#    endif
--#    ifndef z_off_t
--#      define z_off_t off_t
--#    endif
--#  endif
--#endif
--
--#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
--#  define Z_LFS64
--#endif
--
--#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
--#  define Z_LARGE64
--#endif
--
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
--#  define Z_WANT64
--#endif
--
--#if !defined(SEEK_SET) && !defined(Z_SOLO)
--#  define SEEK_SET        0       /* Seek from beginning of file.  */
--#  define SEEK_CUR        1       /* Seek from current position.  */
--#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
--#endif
--
--#ifndef z_off_t
--#  define z_off_t long
--#endif
--
--#if !defined(_WIN32) && defined(Z_LARGE64)
--#  define z_off64_t off64_t
--#else
--#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
--#    define z_off64_t __int64
--#  else
--#    define z_off64_t z_off_t
--#  endif
--#endif
--
--/* MVS linker does not support external names larger than 8 bytes */
--#if defined(__MVS__)
--  #pragma map(deflateInit_,"DEIN")
--  #pragma map(deflateInit2_,"DEIN2")
--  #pragma map(deflateEnd,"DEEND")
--  #pragma map(deflateBound,"DEBND")
--  #pragma map(inflateInit_,"ININ")
--  #pragma map(inflateInit2_,"ININ2")
--  #pragma map(inflateEnd,"INEND")
--  #pragma map(inflateSync,"INSY")
--  #pragma map(inflateSetDictionary,"INSEDI")
--  #pragma map(compressBound,"CMBND")
--  #pragma map(inflate_table,"INTABL")
--  #pragma map(inflate_fast,"INFA")
--  #pragma map(inflate_copyright,"INCOPY")
--#endif
--
--#endif /* ZCONF_H */
-diff -Naur zlib-1.2.7-orig/zlib.pc.cmake zlib-1.2.7/zlib.pc.cmake
---- zlib-1.2.7-orig/zlib.pc.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.7/zlib.pc.cmake	2013-06-08 17:00:40.000000000 +0200
-@@ -0,0 +1,13 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_PREFIX@/lib
-+sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
-+includedir=@CMAKE_INSTALL_PREFIX@/include
-+
-+Name: zlib
-+Description: zlib compression library
-+Version: @ZLIB_FULL_VERSION@
-+
-+Requires:
-+Libs: -L${libdir} -L${sharedlibdir} -lz
-+Cflags: -I${includedir}
diff --git a/3rdparty/ext_zlib/zlib-1.2.7-20130123.diff b/3rdparty/ext_zlib/zlib-1.2.8-20130901.diff
similarity index 90%
rename from 3rdparty/ext_zlib/zlib-1.2.7-20130123.diff
rename to 3rdparty/ext_zlib/zlib-1.2.8-20130901.diff
index e721016509..5000f4eee3 100644
--- a/3rdparty/ext_zlib/zlib-1.2.7-20130123.diff
+++ b/3rdparty/ext_zlib/zlib-1.2.8-20130901.diff
@@ -1,668 +1,673 @@
-diff -Nru -x '*~' zlib-1.2.7.orig/cmake/modules/FindWcecompat.cmake zlib-1.2.7/cmake/modules/FindWcecompat.cmake
---- zlib-1.2.7.orig/cmake/modules/FindWcecompat.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.7/cmake/modules/FindWcecompat.cmake	2013-01-23 13:05:41.165165700 +0100
+diff -Nru -x '*~' zlib-1.2.8.orig/cmake/modules/FindWcecompat.cmake zlib-1.2.8/cmake/modules/FindWcecompat.cmake
+--- zlib-1.2.8.orig/cmake/modules/FindWcecompat.cmake	1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.8/cmake/modules/FindWcecompat.cmake	2013-09-01 00:55:16.876062400 +0200
 @@ -0,0 +1,33 @@
 +# Try to find Wcecompat functionality
 +# Once done this will define
 +#
 +#  WCECOMPAT_FOUND - system has Wcecompat
 +#  WCECOMPAT_INCLUDE_DIR - Wcecompat include directory
 +#  WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat
 +#
 +# Copyright (c) 2010, Andreas Holzammer, <andy@kdab.com>
 +#
 +# Redistribution and use is allowed according to the terms of the BSD license.
 +
 +if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
 +  set(Wcecompat_FIND_QUIETLY TRUE)
 +endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
 +
 +find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat)
 +
 +set(WCECOMPAT_LIB_FOUND FALSE)
 +
 +if(WCECOMPAT_INCLUDE_DIR)
 +    find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex )
 +    if(WCECOMPAT_LIBRARIES)
 +      set(WCECOMPAT_LIB_FOUND TRUE)
 +    endif(WCECOMPAT_LIBRARIES)
 +endif(WCECOMPAT_INCLUDE_DIR)
 +
 +# I have no idea what this is about, but it seems to be used quite often, so I add this here
 +set(WCECOMPAT_CONST const)
 +
 +include(FindPackageHandleStandardArgs)
 +find_package_handle_standard_args(Wcecompat  DEFAULT_MSG  WCECOMPAT_LIBRARIES  WCECOMPAT_LIB_FOUND)
 +
 +mark_as_advanced(WCECOMPAT_INCLUDE_DIR  WCECOMPAT_LIBRARIES  WCECOMPAT_CONST  WCECOMPAT_LIB_FOUND)
-diff -Nru -x '*~' zlib-1.2.7.orig/CMakeLists.txt zlib-1.2.7/CMakeLists.txt
---- zlib-1.2.7.orig/CMakeLists.txt	2012-04-30 06:20:45.000000000 +0200
-+++ zlib-1.2.7/CMakeLists.txt	2013-01-23 14:27:12.151495800 +0100
+diff -Nru -x '*~' zlib-1.2.8.orig/CMakeLists.txt zlib-1.2.8/CMakeLists.txt
+--- zlib-1.2.8.orig/CMakeLists.txt	2013-04-29 00:57:10.000000000 +0200
++++ zlib-1.2.8/CMakeLists.txt	2013-09-01 00:58:02.253521400 +0200
 @@ -1,8 +1,15 @@
 -cmake_minimum_required(VERSION 2.4.4)
 +cmake_minimum_required(VERSION 2.6)
  set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
  
 +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 +
  project(zlib C)
  
 +if(WINCE)
 +    find_package(Wcecompat REQUIRED)
 +    include_directories(${WCECOMPAT_INCLUDE_DIR})
 +endif(WINCE)
 +
- set(VERSION "1.2.7")
+ set(VERSION "1.2.8")
  
- set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-@@ -11,6 +18,8 @@
+ option(ASM686 "Enable building i686 assembly implementation")
+@@ -14,6 +21,8 @@
  set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
  set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
  
 +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 +
  include(CheckTypeSize)
  include(CheckFunctionExists)
  include(CheckIncludeFile)
-@@ -21,6 +30,7 @@
+@@ -24,6 +33,7 @@
  check_include_file(stdint.h    HAVE_STDINT_H)
  check_include_file(stddef.h    HAVE_STDDEF_H)
  
 +set(CMAKE_DEBUG_POSTFIX)
  #
  # Check to see if we have large file support
  #
-@@ -57,7 +67,7 @@
+@@ -60,7 +70,7 @@
  check_include_file(unistd.h Z_HAVE_UNISTD_H)
  
  if(MSVC)
 -    set(CMAKE_DEBUG_POSTFIX "d")
 +#    set(CMAKE_DEBUG_POSTFIX "d")
      add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
      add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
      include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -152,6 +162,10 @@
+@@ -188,6 +198,10 @@
  set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
  set_target_properties(zlib PROPERTIES SOVERSION 1)
  
 +if(WINCE)
 +    target_link_libraries(zlib ${WCECOMPAT_LIBRARIES})
 +endif(WINCE)
 +
  if(NOT CYGWIN)
      # This property causes shared libraries on Linux to have the full version
      # encoded into their final filename.  We disable this on Cygwin because
-@@ -163,7 +177,7 @@
+@@ -199,7 +213,7 @@
      set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
  endif()
  
 -if(UNIX)
 +if(UNIX OR MINGW)
      # On unix-like platforms the library is almost always called libz
     set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-    set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
-@@ -192,12 +206,14 @@
+    if(NOT APPLE)
+@@ -230,12 +244,14 @@
  # Example binaries
  #============================================================================
  
 +if(NOT WINCE)
  add_executable(example test/example.c)
  target_link_libraries(example zlib)
  add_test(example example)
  
  add_executable(minigzip test/minigzip.c)
  target_link_libraries(minigzip zlib)
 +endif(NOT WINCE)
  
  if(HAVE_OFF64_T)
      add_executable(example64 test/example.c)
-@@ -209,3 +225,7 @@
+@@ -247,3 +263,7 @@
      target_link_libraries(minigzip64 zlib)
      set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
  endif()
 +
 +
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc @ONLY)
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc DESTINATION lib/pkgconfig)
-diff -Nru -x '*~' zlib-1.2.7.orig/win32/zlib1.rc zlib-1.2.7/win32/zlib1.rc
---- zlib-1.2.7.orig/win32/zlib1.rc	2006-05-21 05:55:00.000000000 +0200
-+++ zlib-1.2.7/win32/zlib1.rc	2013-01-23 13:05:41.190165800 +0100
+diff -Nru -x '*~' zlib-1.2.8.orig/win32/zlib1.rc zlib-1.2.8/win32/zlib1.rc
+--- zlib-1.2.8.orig/win32/zlib1.rc	2013-04-29 00:57:11.000000000 +0200
++++ zlib-1.2.8/win32/zlib1.rc	2013-09-01 00:59:54.116919600 +0200
 @@ -10,9 +10,9 @@
    PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
    FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
  #ifdef _DEBUG
 -  FILEFLAGS		1
 +  FILEFLAGS		0x1L
  #else
 -  FILEFLAGS		0
 +  FILEFLAGS		0x0L
  #endif
    FILEOS		VOS__WINDOWS32
    FILETYPE		VFT_DLL
-diff -Nru -x '*~' zlib-1.2.7.orig/zconf.h zlib-1.2.7/zconf.h
---- zlib-1.2.7.orig/zconf.h	2012-04-30 01:18:12.000000000 +0200
-+++ zlib-1.2.7/zconf.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,506 +0,0 @@
+diff -Nru -x '*~' zlib-1.2.8.orig/zconf.h zlib-1.2.8/zconf.h
+--- zlib-1.2.8.orig/zconf.h	2013-04-29 00:57:11.000000000 +0200
++++ zlib-1.2.8/zconf.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,511 +0,0 @@
 -/* zconf.h -- configuration of the zlib compression library
-- * Copyright (C) 1995-2012 Jean-loup Gailly.
+- * Copyright (C) 1995-2013 Jean-loup Gailly.
 - * For conditions of distribution and use, see copyright notice in zlib.h
 - */
 -
 -/* @(#) $Id$ */
 -
 -#ifndef ZCONF_H
 -#define ZCONF_H
 -
 -/*
 - * If you *really* need a unique prefix for all types and library functions,
 - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
 - * Even better than compiling with -DZ_PREFIX would be to use configure to set
 - * this permanently in zconf.h using "./configure --zprefix".
 - */
 -#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 -#  define Z_PREFIX_SET
 -
 -/* all linked symbols */
 -#  define _dist_code            z__dist_code
 -#  define _length_code          z__length_code
 -#  define _tr_align             z__tr_align
+-#  define _tr_flush_bits        z__tr_flush_bits
 -#  define _tr_flush_block       z__tr_flush_block
 -#  define _tr_init              z__tr_init
 -#  define _tr_stored_block      z__tr_stored_block
 -#  define _tr_tally             z__tr_tally
 -#  define adler32               z_adler32
 -#  define adler32_combine       z_adler32_combine
 -#  define adler32_combine64     z_adler32_combine64
 -#  ifndef Z_SOLO
 -#    define compress              z_compress
 -#    define compress2             z_compress2
 -#    define compressBound         z_compressBound
 -#  endif
 -#  define crc32                 z_crc32
 -#  define crc32_combine         z_crc32_combine
 -#  define crc32_combine64       z_crc32_combine64
 -#  define deflate               z_deflate
 -#  define deflateBound          z_deflateBound
 -#  define deflateCopy           z_deflateCopy
 -#  define deflateEnd            z_deflateEnd
 -#  define deflateInit2_         z_deflateInit2_
 -#  define deflateInit_          z_deflateInit_
 -#  define deflateParams         z_deflateParams
 -#  define deflatePending        z_deflatePending
 -#  define deflatePrime          z_deflatePrime
 -#  define deflateReset          z_deflateReset
 -#  define deflateResetKeep      z_deflateResetKeep
 -#  define deflateSetDictionary  z_deflateSetDictionary
 -#  define deflateSetHeader      z_deflateSetHeader
 -#  define deflateTune           z_deflateTune
 -#  define deflate_copyright     z_deflate_copyright
 -#  define get_crc_table         z_get_crc_table
 -#  ifndef Z_SOLO
 -#    define gz_error              z_gz_error
 -#    define gz_intmax             z_gz_intmax
 -#    define gz_strwinerror        z_gz_strwinerror
 -#    define gzbuffer              z_gzbuffer
 -#    define gzclearerr            z_gzclearerr
 -#    define gzclose               z_gzclose
 -#    define gzclose_r             z_gzclose_r
 -#    define gzclose_w             z_gzclose_w
 -#    define gzdirect              z_gzdirect
 -#    define gzdopen               z_gzdopen
 -#    define gzeof                 z_gzeof
 -#    define gzerror               z_gzerror
 -#    define gzflush               z_gzflush
 -#    define gzgetc                z_gzgetc
 -#    define gzgetc_               z_gzgetc_
 -#    define gzgets                z_gzgets
 -#    define gzoffset              z_gzoffset
 -#    define gzoffset64            z_gzoffset64
 -#    define gzopen                z_gzopen
 -#    define gzopen64              z_gzopen64
 -#    ifdef _WIN32
 -#      define gzopen_w              z_gzopen_w
 -#    endif
 -#    define gzprintf              z_gzprintf
+-#    define gzvprintf             z_gzvprintf
 -#    define gzputc                z_gzputc
 -#    define gzputs                z_gzputs
 -#    define gzread                z_gzread
 -#    define gzrewind              z_gzrewind
 -#    define gzseek                z_gzseek
 -#    define gzseek64              z_gzseek64
 -#    define gzsetparams           z_gzsetparams
 -#    define gztell                z_gztell
 -#    define gztell64              z_gztell64
 -#    define gzungetc              z_gzungetc
 -#    define gzwrite               z_gzwrite
 -#  endif
 -#  define inflate               z_inflate
 -#  define inflateBack           z_inflateBack
 -#  define inflateBackEnd        z_inflateBackEnd
 -#  define inflateBackInit_      z_inflateBackInit_
 -#  define inflateCopy           z_inflateCopy
 -#  define inflateEnd            z_inflateEnd
 -#  define inflateGetHeader      z_inflateGetHeader
 -#  define inflateInit2_         z_inflateInit2_
 -#  define inflateInit_          z_inflateInit_
 -#  define inflateMark           z_inflateMark
 -#  define inflatePrime          z_inflatePrime
 -#  define inflateReset          z_inflateReset
 -#  define inflateReset2         z_inflateReset2
 -#  define inflateSetDictionary  z_inflateSetDictionary
+-#  define inflateGetDictionary  z_inflateGetDictionary
 -#  define inflateSync           z_inflateSync
 -#  define inflateSyncPoint      z_inflateSyncPoint
 -#  define inflateUndermine      z_inflateUndermine
 -#  define inflateResetKeep      z_inflateResetKeep
 -#  define inflate_copyright     z_inflate_copyright
 -#  define inflate_fast          z_inflate_fast
 -#  define inflate_table         z_inflate_table
 -#  ifndef Z_SOLO
 -#    define uncompress            z_uncompress
 -#  endif
 -#  define zError                z_zError
 -#  ifndef Z_SOLO
 -#    define zcalloc               z_zcalloc
 -#    define zcfree                z_zcfree
 -#  endif
 -#  define zlibCompileFlags      z_zlibCompileFlags
 -#  define zlibVersion           z_zlibVersion
 -
 -/* all zlib typedefs in zlib.h and zconf.h */
 -#  define Byte                  z_Byte
 -#  define Bytef                 z_Bytef
 -#  define alloc_func            z_alloc_func
 -#  define charf                 z_charf
 -#  define free_func             z_free_func
 -#  ifndef Z_SOLO
 -#    define gzFile                z_gzFile
 -#  endif
 -#  define gz_header             z_gz_header
 -#  define gz_headerp            z_gz_headerp
 -#  define in_func               z_in_func
 -#  define intf                  z_intf
 -#  define out_func              z_out_func
 -#  define uInt                  z_uInt
 -#  define uIntf                 z_uIntf
 -#  define uLong                 z_uLong
 -#  define uLongf                z_uLongf
 -#  define voidp                 z_voidp
 -#  define voidpc                z_voidpc
 -#  define voidpf                z_voidpf
 -
 -/* all zlib structs in zlib.h and zconf.h */
 -#  define gz_header_s           z_gz_header_s
 -#  define internal_state        z_internal_state
 -
 -#endif
 -
 -#if defined(__MSDOS__) && !defined(MSDOS)
 -#  define MSDOS
 -#endif
 -#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
 -#  define OS2
 -#endif
 -#if defined(_WINDOWS) && !defined(WINDOWS)
 -#  define WINDOWS
 -#endif
 -#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
 -#  ifndef WIN32
 -#    define WIN32
 -#  endif
 -#endif
 -#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 -#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
 -#    ifndef SYS16BIT
 -#      define SYS16BIT
 -#    endif
 -#  endif
 -#endif
 -
 -/*
 - * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
 - * than 64k bytes at a time (needed on systems with 16-bit int).
 - */
 -#ifdef SYS16BIT
 -#  define MAXSEG_64K
 -#endif
 -#ifdef MSDOS
 -#  define UNALIGNED_OK
 -#endif
 -
 -#ifdef __STDC_VERSION__
 -#  ifndef STDC
 -#    define STDC
 -#  endif
 -#  if __STDC_VERSION__ >= 199901L
 -#    ifndef STDC99
 -#      define STDC99
 -#    endif
 -#  endif
 -#endif
 -#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
 -#  define STDC
 -#endif
 -#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
 -#  define STDC
 -#endif
 -#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
 -#  define STDC
 -#endif
 -#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
 -#  define STDC
 -#endif
 -
 -#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
 -#  define STDC
 -#endif
 -
 -#ifndef STDC
 -#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
 -#    define const       /* note: need a more gentle solution here */
 -#  endif
 -#endif
 -
 -#if defined(ZLIB_CONST) && !defined(z_const)
 -#  define z_const const
 -#else
 -#  define z_const
 -#endif
 -
 -/* Some Mac compilers merge all .h files incorrectly: */
 -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 -#  define NO_DUMMY_DECL
 -#endif
 -
 -/* Maximum value for memLevel in deflateInit2 */
 -#ifndef MAX_MEM_LEVEL
 -#  ifdef MAXSEG_64K
 -#    define MAX_MEM_LEVEL 8
 -#  else
 -#    define MAX_MEM_LEVEL 9
 -#  endif
 -#endif
 -
 -/* Maximum value for windowBits in deflateInit2 and inflateInit2.
 - * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
 - * created by gzip. (Files created by minigzip can still be extracted by
 - * gzip.)
 - */
 -#ifndef MAX_WBITS
 -#  define MAX_WBITS   15 /* 32K LZ77 window */
 -#endif
 -
 -/* The memory requirements for deflate are (in bytes):
 -            (1 << (windowBits+2)) +  (1 << (memLevel+9))
 - that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
 - plus a few kilobytes for small objects. For example, if you want to reduce
 - the default memory requirements from 256K to 128K, compile with
 -     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 - Of course this will generally degrade compression (there's no free lunch).
 -
 -   The memory requirements for inflate are (in bytes) 1 << windowBits
 - that is, 32K for windowBits=15 (default value) plus a few kilobytes
 - for small objects.
 -*/
 -
 -                        /* Type declarations */
 -
 -#ifndef OF /* function prototypes */
 -#  ifdef STDC
 -#    define OF(args)  args
 -#  else
 -#    define OF(args)  ()
 -#  endif
 -#endif
 -
 -#ifndef Z_ARG /* function prototypes for stdarg */
 -#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
 -#    define Z_ARG(args)  args
 -#  else
 -#    define Z_ARG(args)  ()
 -#  endif
 -#endif
 -
 -/* The following definitions for FAR are needed only for MSDOS mixed
 - * model programming (small or medium model with some far allocations).
 - * This was tested only with MSC; for other MSDOS compilers you may have
 - * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
 - * just define FAR to be empty.
 - */
 -#ifdef SYS16BIT
 -#  if defined(M_I86SM) || defined(M_I86MM)
 -     /* MSC small or medium model */
 -#    define SMALL_MEDIUM
 -#    ifdef _MSC_VER
 -#      define FAR _far
 -#    else
 -#      define FAR far
 -#    endif
 -#  endif
 -#  if (defined(__SMALL__) || defined(__MEDIUM__))
 -     /* Turbo C small or medium model */
 -#    define SMALL_MEDIUM
 -#    ifdef __BORLANDC__
 -#      define FAR _far
 -#    else
 -#      define FAR far
 -#    endif
 -#  endif
 -#endif
 -
 -#if defined(WINDOWS) || defined(WIN32)
 -   /* If building or using zlib as a DLL, define ZLIB_DLL.
 -    * This is not mandatory, but it offers a little performance increase.
 -    */
 -#  ifdef ZLIB_DLL
 -#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
 -#      ifdef ZLIB_INTERNAL
 -#        define ZEXTERN extern __declspec(dllexport)
 -#      else
 -#        define ZEXTERN extern __declspec(dllimport)
 -#      endif
 -#    endif
 -#  endif  /* ZLIB_DLL */
 -   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
 -    * define ZLIB_WINAPI.
 -    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
 -    */
 -#  ifdef ZLIB_WINAPI
 -#    ifdef FAR
 -#      undef FAR
 -#    endif
 -#    include <windows.h>
 -     /* No need for _export, use ZLIB.DEF instead. */
 -     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
 -#    define ZEXPORT WINAPI
 -#    ifdef WIN32
 -#      define ZEXPORTVA WINAPIV
 -#    else
 -#      define ZEXPORTVA FAR CDECL
 -#    endif
 -#  endif
 -#endif
 -
 -#if defined (__BEOS__)
 -#  ifdef ZLIB_DLL
 -#    ifdef ZLIB_INTERNAL
 -#      define ZEXPORT   __declspec(dllexport)
 -#      define ZEXPORTVA __declspec(dllexport)
 -#    else
 -#      define ZEXPORT   __declspec(dllimport)
 -#      define ZEXPORTVA __declspec(dllimport)
 -#    endif
 -#  endif
 -#endif
 -
 -#ifndef ZEXTERN
 -#  define ZEXTERN extern
 -#endif
 -#ifndef ZEXPORT
 -#  define ZEXPORT
 -#endif
 -#ifndef ZEXPORTVA
 -#  define ZEXPORTVA
 -#endif
 -
 -#ifndef FAR
 -#  define FAR
 -#endif
 -
 -#if !defined(__MACTYPES__)
 -typedef unsigned char  Byte;  /* 8 bits */
 -#endif
 -typedef unsigned int   uInt;  /* 16 bits or more */
 -typedef unsigned long  uLong; /* 32 bits or more */
 -
 -#ifdef SMALL_MEDIUM
 -   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
 -#  define Bytef Byte FAR
 -#else
 -   typedef Byte  FAR Bytef;
 -#endif
 -typedef char  FAR charf;
 -typedef int   FAR intf;
 -typedef uInt  FAR uIntf;
 -typedef uLong FAR uLongf;
 -
 -#ifdef STDC
 -   typedef void const *voidpc;
 -   typedef void FAR   *voidpf;
 -   typedef void       *voidp;
 -#else
 -   typedef Byte const *voidpc;
 -   typedef Byte FAR   *voidpf;
 -   typedef Byte       *voidp;
 -#endif
 -
--/* ./configure may #define Z_U4 here */
--
 -#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
 -#  include <limits.h>
 -#  if (UINT_MAX == 0xffffffffUL)
 -#    define Z_U4 unsigned
--#  else
--#    if (ULONG_MAX == 0xffffffffUL)
--#      define Z_U4 unsigned long
--#    else
--#      if (USHRT_MAX == 0xffffffffUL)
--#        define Z_U4 unsigned short
--#      endif
--#    endif
+-#  elif (ULONG_MAX == 0xffffffffUL)
+-#    define Z_U4 unsigned long
+-#  elif (USHRT_MAX == 0xffffffffUL)
+-#    define Z_U4 unsigned short
 -#  endif
 -#endif
 -
 -#ifdef Z_U4
 -   typedef Z_U4 z_crc_t;
 -#else
 -   typedef unsigned long z_crc_t;
 -#endif
 -
 -#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 -#  define Z_HAVE_UNISTD_H
 -#endif
 -
 -#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
 -#  define Z_HAVE_STDARG_H
 -#endif
 -
 -#ifdef STDC
 -#  ifndef Z_SOLO
 -#    include <sys/types.h>      /* for off_t */
 -#  endif
 -#endif
 -
+-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+-#  ifndef Z_SOLO
+-#    include <stdarg.h>         /* for va_list */
+-#  endif
+-#endif
+-
 -#ifdef _WIN32
--#  include <stddef.h>           /* for wchar_t */
+-#  ifndef Z_SOLO
+-#    include <stddef.h>         /* for wchar_t */
+-#  endif
 -#endif
 -
 -/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
 - * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
 - * though the former does not conform to the LFS document), but considering
 - * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
 - * equivalently requesting no 64-bit operations
 - */
--#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 -#  undef _LARGEFILE64_SOURCE
 -#endif
 -
 -#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
 -#  define Z_HAVE_UNISTD_H
 -#endif
 -#ifndef Z_SOLO
--#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
+-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
 -#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 -#    ifdef VMS
 -#      include <unixio.h>       /* for off_t */
 -#    endif
 -#    ifndef z_off_t
 -#      define z_off_t off_t
 -#    endif
 -#  endif
 -#endif
 -
 -#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
 -#  define Z_LFS64
 -#endif
 -
 -#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
 -#  define Z_LARGE64
 -#endif
 -
 -#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
 -#  define Z_WANT64
 -#endif
 -
 -#if !defined(SEEK_SET) && !defined(Z_SOLO)
 -#  define SEEK_SET        0       /* Seek from beginning of file.  */
 -#  define SEEK_CUR        1       /* Seek from current position.  */
 -#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 -#endif
 -
 -#ifndef z_off_t
 -#  define z_off_t long
 -#endif
 -
 -#if !defined(_WIN32) && defined(Z_LARGE64)
 -#  define z_off64_t off64_t
 -#else
 -#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
 -#    define z_off64_t __int64
 -#  else
 -#    define z_off64_t z_off_t
 -#  endif
 -#endif
 -
 -/* MVS linker does not support external names larger than 8 bytes */
 -#if defined(__MVS__)
 -  #pragma map(deflateInit_,"DEIN")
 -  #pragma map(deflateInit2_,"DEIN2")
 -  #pragma map(deflateEnd,"DEEND")
 -  #pragma map(deflateBound,"DEBND")
 -  #pragma map(inflateInit_,"ININ")
 -  #pragma map(inflateInit2_,"ININ2")
 -  #pragma map(inflateEnd,"INEND")
 -  #pragma map(inflateSync,"INSY")
 -  #pragma map(inflateSetDictionary,"INSEDI")
 -  #pragma map(compressBound,"CMBND")
 -  #pragma map(inflate_table,"INTABL")
 -  #pragma map(inflate_fast,"INFA")
 -  #pragma map(inflate_copyright,"INCOPY")
 -#endif
 -
 -#endif /* ZCONF_H */
-diff -Nru -x '*~' zlib-1.2.7.orig/zlib.pc.cmake zlib-1.2.7/zlib.pc.cmake
---- zlib-1.2.7.orig/zlib.pc.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.7/zlib.pc.cmake	2013-01-23 13:05:44.130170400 +0100
+diff -Nru -x '*~' zlib-1.2.8.orig/zlib.pc.cmake zlib-1.2.8/zlib.pc.cmake
+--- zlib-1.2.8.orig/zlib.pc.cmake	1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.8/zlib.pc.cmake	2013-09-01 00:55:16.932065600 +0200
 @@ -0,0 +1,13 @@
 +prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=@CMAKE_INSTALL_PREFIX@
 +libdir=@CMAKE_INSTALL_PREFIX@/lib
 +sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
 +includedir=@CMAKE_INSTALL_PREFIX@/include
 +
 +Name: zlib
 +Description: zlib compression library
 +Version: @ZLIB_FULL_VERSION@
 +
 +Requires:
 +Libs: -L${libdir} -L${sharedlibdir} -lz
 +Cflags: -I${includedir}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 443fb72eda..0e18671288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,673 +1,673 @@
 project(krita)
 
 message(STATUS "Using CMake version: ${CMAKE_VERSION}")
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 if (WIN32)
     set(MIN_QT_VERSION 5.6.0)
 else()
     set(MIN_QT_VERSION 5.4.0)
 endif()
 
 set(MIN_FRAMEWORKS_VERSION 5.7.0)
 
 if (POLICY CMP0002)
     cmake_policy(SET CMP0002 OLD)
 endif()
 
 if (POLICY CMP0017)
     cmake_policy(SET CMP0017 NEW)
 endif ()
 
 if (POLICY CMP0022)
     cmake_policy(SET CMP0022 OLD)
 endif ()
 
 if (POLICY CMP0026)
     cmake_policy(SET CMP0026 OLD)
 endif()
 
 if (POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)
 endif()
 
 if (POLICY CMP0046)
     cmake_policy(SET CMP0046 OLD)
 endif ()
 
 if (POLICY CMP0059)
     cmake_policy(SET CMP0059 OLD)
 endif()
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 OLD)
 endif()
 
 if (POLICY CMP0054)
     cmake_policy(SET CMP0054 OLD)
 endif()
 
 if (POLICY CMP0064)
     cmake_policy(SET CMP0064 OLD)
 endif()
 
 
 if (APPLE)
     set(APPLE_SUPPRESS_X11_WARNING TRUE)
     set(KDE_SKIP_RPATH_SETTINGS TRUE)
     set(CMAKE_MACOSX_RPATH 1)
     set(BUILD_WITH_INSTALL_RPATH 1)
-    add_definitions(-Wno-deprecated-register)
+    add_definitions(-mmacosx-version-min=10.9 -Wno-deprecated-register)
 endif()
 
 # QT5TODO: remove KDE4_BUILD_TESTS once all kde4_add_unit_test have been converted
 # transitional forward compatibility:
 # BUILD_TESTING is cmake standard, KDE4_BUILD_TESTS not used by ECM/KF5, but only
 # macros in cmake/transitional. Just, Macros from cmake/transitional,
 # incl. kde4_add_unit_test, are only picked up if no macros from kdelibs4 are installed,
 # because that transitional path is appended. Prepending instead might possibly unwantedly
 # mask ECM/KF5 macros. Not tested.
 # So have BUILD_TESTING define KDE4_BUILD_TESTS.
 if (BUILD_TESTING)
     set(KDE4_BUILD_TESTS TRUE)
 else()
     set(KDE4_BUILD_TESTS FALSE)
 endif()
 
  ######################
 #######################
 ## Constants defines ##
 #######################
 ######################
 
 # define common versions of Krita applications, used to generate kritaversion.h
 # update these version for every release:
 set(KRITA_VERSION_STRING "3.0.1 Alpha")
 set(KRITA_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc.
 set(KRITA_STABLE_VERSION_MINOR 0) # 0 for 3.0, 1 for 3.1, etc.
 set(KRITA_VERSION_RELEASE 89)     # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
 set(KRITA_ALPHA 1) # uncomment only for Alpha
 #set(KRITA_BETA 1) # uncomment only for Beta
 #set(KRITA_RC 1) # uncomment only for RC
 set(KRITA_YEAR 2016) # update every year
 
 if(NOT DEFINED KRITA_ALPHA AND NOT DEFINED KRITA_BETA AND NOT DEFINED KRITA_RC)
     set(KRITA_STABLE 1) # do not edit
 endif()
 
 message(STATUS "Krita version: ${KRITA_VERSION_STRING}")
 
 # Define the generic version of the Krita libraries here
 # This makes it easy to advance it when the next Krita release comes.
 # 14 was the last GENERIC_KRITA_LIB_VERSION_MAJOR of the previous Krita series
 # (2.x) so we're starting with 15 in 3.x series.
 if(KRITA_STABLE_VERSION_MAJOR EQUAL 3)
     math(EXPR GENERIC_KRITA_LIB_VERSION_MAJOR "${KRITA_STABLE_VERSION_MINOR} + 15")
 else()
     # let's make sure we won't forget to update the "15"
     message(FATAL_ERROR "Reminder: please update offset == 15 used to compute GENERIC_KRITA_LIB_VERSION_MAJOR to something bigger")
 endif()
 set(GENERIC_KRITA_LIB_VERSION "${GENERIC_KRITA_LIB_VERSION_MAJOR}.0.0")
 set(GENERIC_KRITA_LIB_SOVERSION "${GENERIC_KRITA_LIB_VERSION_MAJOR}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
                       "${CMAKE_SOURCE_DIR}/cmake/modules")
 LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/kde_macro")
 
 message("Module path:" ${CMAKE_MODULE_PATH})
 
 # fetch git revision for the current build
 
 set(KRITA_GIT_SHA1_STRING "")
 set(KRITA_GIT_BRANCH_STRING "")
 
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 get_git_branch(GIT_BRANCH)
 
 if(GIT_SHA1 AND GIT_BRANCH)
     string(SUBSTRING ${GIT_SHA1} 0 7 GIT_SHA1)
     set(KRITA_GIT_SHA1_STRING ${GIT_SHA1})
     set(KRITA_GIT_BRANCH_STRING ${GIT_BRANCH})
 endif()
 
 if(NOT DEFINED RELEASE_BUILD)
     # estimate mode by CMAKE_BUILD_TYPE content if not set on cmdline
     string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER)
     set(RELEASE_BUILD_TYPES "release" "relwithdebinfo" "minsizerel")
     list(FIND RELEASE_BUILD_TYPES "${CMAKE_BUILD_TYPE_TOLOWER}" INDEX)
     if (INDEX EQUAL -1)
         set(RELEASE_BUILD FALSE)
     else()
         set(RELEASE_BUILD TRUE)
     endif()
 endif()
 message(STATUS "Release build: ${RELEASE_BUILD}")
 
  ############
 #############
 ## Options ##
 #############
 ############
 
 option(PACKAGERS_BUILD "Build support of multiple CPU architectures in one binary. Should be used by packagers only or Krita developers. Only switch off when you're an artist optimizing a build for your very own machine." ON)
 if (WIN32)
     option(USE_BREAKPAD "Build the crash handler for Krita (only on windows)" OFF)
 endif ()
 
 option(HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal." ON)
 configure_file(config-hide-safe-asserts.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-hide-safe-asserts.h)
 
  #######################
 ########################
 ## Productset setting ##
 ########################
 #######################
 
 # For predefined productsets see the definitions in KritaProducts.cmake and
 # in the files in the folder cmake/productsets.
 
 # Finding out the products & features to build is done in 5 steps:
 # 1. have the user define the products/features wanted, by giving a productset
 # 2. estimate all additional required products/features
 # 3. estimate which of the products/features can be build by external deps
 # 4. find which products/features have been temporarily disabled due to problems
 # 5. estimate which of the products/features can be build by internal deps
 
 # get the special macros
 include(CalligraProductSetMacros)
 include(MacroJPEG)
 include(GenerateTestExportHeader)
 
 
 # get the definitions of products, features and product sets
 include(KritaProducts.cmake)
 
 set(PRODUCTSET_DEFAULT "ALL")
 # temporary migration support
 if (CREATIVEONLY)
     set(WARN_ABOUT_CREATIVEONLY TRUE)
     set(PRODUCTSET_DEFAULT "CREATIVE")
 endif ()
 
 if(NOT PRODUCTSET)
     set(PRODUCTSET ${PRODUCTSET_DEFAULT} CACHE STRING "Set of products/features to build" FORCE)
 endif()
 
 if (RELEASE_BUILD)
     set(CALLIGRA_SHOULD_BUILD_STAGING FALSE)
 else ()
     set(CALLIGRA_SHOULD_BUILD_STAGING TRUE)
 endif ()
 
 # finally choose products/features to build
 calligra_set_productset(${PRODUCTSET})
 
  ########################
 #########################
 ## Look for KDE and Qt ##
 #########################
 ########################
 
 find_package(ECM 1.7.0 REQUIRED NOMODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 include(ECMOptionalAddSubdirectory)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
 include(ECMMarkNonGuiExecutable)
 include(ECMGenerateHeaders)
 include(GenerateExportHeader)
 include(ECMMarkAsTest)
 include(ECMInstallIcons)
 
 include(CMakePackageConfigHelpers)
 include(WriteBasicConfigVersionFile)
 include(CheckFunctionExists)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(FeatureSummary)
 include(KDE4Macros)
 
 # do not reorder to be alphabetical: this is the order in which the frameworks
 # depend on each other.
 find_package(KF5 ${MIN_FRAMEWORKS_VERSION} REQUIRED COMPONENTS
         Archive
         Config
         WidgetsAddons
         Completion
         CoreAddons
         GuiAddons
         I18n
         ItemModels
         ItemViews
         WindowSystem
 )
 
 find_package(Qt5 ${MIN_QT_VERSION}
         REQUIRED COMPONENTS
         Core
         Gui
         Widgets
         Xml
         Network
         PrintSupport
         Svg
         Test
         Concurrent
 )
 
 
 set(QT_QTTEST_LIBRARY Qt5::Test)
 
 
 include (MacroLibrary)
 include (MacroAdditionalCleanFiles)
 include (MacroAddFileDependencies)
 
 macro_ensure_out_of_source_build("Compiling Krita inside the source directory is not possible. Please refer to the build instruction https://community.kde.org/Krita#Build_Instructions")
 
 # Note: OPTIONAL_COMPONENTS does not seem to be reliable
 # (as of ECM 5.15.0, CMake 3.2)
 if (NOT WIN32 AND NOT APPLE)
 
     find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
 
     find_package(Qt5DBus ${MIN_QT_VERSION} QUIET)
     set(HAVE_DBUS ${Qt5DBus_FOUND})
     macro_log_feature(${Qt5DBus_FOUND} "dbus" "Qt DBUS integration" "http://www.qt.io/" FALSE "" "Optionally used to provide a dbus api on Linux")
 
     find_package(KF5KIO ${MIN_FRAMEWORKS_VERSION} QUIET)
     macro_bool_to_01(KF5KIO_FOUND HAVE_KIO)
     macro_log_feature(${KF5KIO_FOUND} "KIO" "KDE's KIO Framework" "http://api.kde.org/frameworks-api/frameworks5-apidocs/kio/html/index.html" FALSE "" "Optionally used for recent document handling")
 
     find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION} QUIET) 
     macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH)
     macro_log_feature(${KF5Crash_FOUND} "kcrash" "KDE's Crash Handler" "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/index.html" FALSE "" "Optionally used to provide crash reporting on Linux")
 
     find_package(X11)
     if(X11_FOUND)
         find_package(Qt5 ${MIN_QT_VERSION} REQUIRED NO_MODULE COMPONENTS X11Extras)
         set(HAVE_X11 TRUE)
         add_definitions(-DHAVE_X11)
     else()
         set(HAVE_X11 FALSE)
     endif()
 
     find_package(XCB COMPONENTS XCB ATOM)
     if(XCB_FOUND)
         set(HAVE_XCB TRUE)
     else()
         set(HAVE_XCB FALSE)
     endif()
 else()
     set(HAVE_DBUS FALSE)
     set(HAVE_X11 FALSE)
     set(HAVE_XCB FALSE)
 endif()
 
 add_definitions(
   -DTRANSLATION_DOMAIN=\"krita\"
   -DQT_USE_QSTRINGBUILDER
   -DQT_STRICT_ITERATORS
   -DQT_NO_SIGNALS_SLOTS_KEYWORDS
   -DQT_USE_FAST_OPERATOR_PLUS
   -DQT_USE_FAST_CONCATENATION
   -DQT_NO_URL_CAST_FROM_STRING
   -DQT_DISABLE_DEPRECATED_BEFORE=0
 )
 
 #
 # The reason for this mode is that the Debug mode disable inlining
 #
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS_KRITADEVS "-O3 -g" CACHE STRING "" FORCE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -fext-numeric-literals")
 endif()
 
 if(UNIX)
     set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};m")
 endif()
 
 if(WIN32)
     if(MSVC)
         # C4522: 'class' : multiple assignment operators specified
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4522")
     endif()
 endif()
 
 # enable exceptions globally
 kde_enable_exceptions()
 
 
 # only with this definition will all the FOO_TEST_EXPORT macro do something
 # TODO: check if this can be moved to only those places which make use of it,
 # to reduce global compiler definitions that would trigger a recompile of
 # everything on a change (like adding/removing tests to/from the build)
 if(BUILD_TESTING)
     add_definitions(-DCOMPILING_TESTS)
 endif()
 
 set(KRITA_DEFAULT_TEST_DATA_DIR ${CMAKE_SOURCE_DIR}/sdk/tests/data/)
 macro(macro_add_unittest_definitions)
   add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
   add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
   add_definitions(-DFILES_DEFAULT_DATA_DIR="${KRITA_DEFAULT_TEST_DATA_DIR}")
 endmacro()
 
 
 
 
 # overcome some platform incompatibilities
 if(WIN32)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/winquirks)
     add_definitions(-D_USE_MATH_DEFINES)
     add_definitions(-DNOMINMAX)
     set(WIN32_PLATFORM_NET_LIBS ws2_32.lib netapi32.lib)
 endif()
 
 # set custom krita plugin installdir
 set(KRITA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/kritaplugins)
 
  ###########################
 ############################
 ## Required dependencies  ##
 ############################
 ###########################
 
 find_package(PNG REQUIRED)
 
 if (APPLE)
     # this is not added correctly on OSX -- see http://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242
     include_directories(SYSTEM ${PNG_INCLUDE_DIR})
 endif()
 
 add_definitions(-DBOOST_ALL_NO_LIB)
 find_package(Boost REQUIRED COMPONENTS system) # for pigment and stage
 
 ##
 ## Test for GNU Scientific Library
 ##
 macro_optional_find_package(GSL)
 macro_log_feature(GSL_FOUND "GSL" "GNU Scientific Library" "http://www.gnu.org/software/gsl" FALSE "1.7" "Required by Krita's Transform tool.")
 macro_bool_to_01(GSL_FOUND HAVE_GSL)
 configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
 
  ###########################
 ############################
 ## Optional dependencies  ##
 ############################
 ###########################
 
 ##
 ## Check for OpenEXR
 ##
 macro_optional_find_package(ZLIB)
 macro_log_feature(ZLIB_FOUND "zlib" "Compression library" "http://www.zlib.net/" FALSE "" "Optionally used by the G'Mic and the PSD plugins")
 macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
 
 
 macro_optional_find_package(OpenEXR)
 macro_log_feature(OPENEXR_FOUND "OpenEXR" "High dynamic-range (HDR) image file format" "http://www.openexr.com" FALSE "" "Required by the Krita OpenEXR filter")
 macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
 set(LINK_OPENEXR_LIB)
 if(OPENEXR_FOUND)
     include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR})
     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
     add_definitions(${OPENEXR_DEFINITIONS})
 endif()
 
 macro_optional_find_package(TIFF)
 macro_log_feature(TIFF_FOUND "tiff" "TIFF Library and Utilities" "http://www.remotesensing.org/libtiff" FALSE "" "Required by the Krita TIFF filter")
 
 macro_optional_find_package(JPEG)
 macro_log_feature(JPEG_FOUND "jpeg" "Free library for JPEG image compression. Note: libjpeg8 is NOT supported." "http://www.libjpeg-turbo.org" FALSE "" "Required by the Krita JPEG filter")
 
 macro_optional_find_package(OpenJPEG)
 macro_log_feature(OPENJPEG_FOUND "openjpeg" "Free library for JPEG 2000 image compression" "http://www.openjpeg.org" FALSE "" "Required by the Krita JPEG 2000 filter")
 
 set(LIBRAW_MIN_VERSION  "0.16")
 macro_optional_find_package(LibRaw ${LIBRAW_MIN_VERSION})
 macro_log_feature(LIBRAW_FOUND "LibRaw" "Library to decode RAW images" "http://www.libraw.org" FALSE "" "Required to build the raw import plugin")
 
 macro_optional_find_package(FFTW3)
 macro_log_feature(FFTW3_FOUND "FFTW3" "A fast, free C FFT library" "http://www.fftw.org/" FALSE "" "Required by the Krita for fast convolution operators and some G'Mic features")
 macro_bool_to_01(FFTW3_FOUND HAVE_FFTW3)
 
 macro_optional_find_package(OCIO)
 macro_log_feature(OCIO_FOUND "OCIO" "The OpenColorIO Library" "http://www.opencolorio.org" FALSE "" "Required by the Krita LUT docker")
 macro_bool_to_01(OCIO_FOUND HAVE_OCIO)
 
 ##
 ## Look for OpenGL
 ##
 # TODO: see if there is a better check for QtGui being built with opengl support (and thus the QOpenGL* classes)
 if(Qt5Gui_OPENGL_IMPLEMENTATION)
     message(STATUS "Found QtGui OpenGL support")
 else()
     message(FATAL_ERROR  "Did NOT find QtGui OpenGL support. Check your Qt configuration. You cannot build Krita without Qt OpenGL support.")
 endif()
 
 ##
 ## Test for eigen3
 ##
 find_package(Eigen3 REQUIRED)
 macro_log_feature(EIGEN3_FOUND "Eigen" "C++ template library for linear algebra" "http://eigen.tuxfamily.org" FALSE "3.0" "Required by Krita")
 
 ##
 ## Test for exiv2
 ##
 set(EXIV2_MIN_VERSION "0.16")
 find_package(Exiv2 REQUIRED)
 macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita")
 
 ##
 ## Test for lcms
 ##
 find_package(LCMS2 REQUIRED)
 macro_log_feature(LCMS2_FOUND "LittleCMS" "Color management engine" "http://www.littlecms.com" FALSE "2.4" "Will be used for color management and is necessary for Krita")
 if(LCMS2_FOUND)
     if(NOT ${LCMS2_VERSION} VERSION_LESS 2040 )
         set(HAVE_LCMS24 TRUE)
     endif()
     set(HAVE_REQUIRED_LCMS_VERSION TRUE)
     set(HAVE_LCMS2 TRUE)
 endif()
 
 ##
 ## Test for Vc
 ##
 set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 set(HAVE_VC FALSE)
 if( NOT MSVC)
     macro_optional_find_package(Vc 1.1.0)
     macro_log_feature(Vc_FOUND "Vc" "Portable, zero-overhead SIMD library for C++" "https://github.com/VcDevel/Vc" FALSE "" "Required by the Krita for vectorization")
     macro_bool_to_01(Vc_FOUND HAVE_VC)
     macro_bool_to_01(PACKAGERS_BUILD DO_PACKAGERS_BUILD)
 endif()
 configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h )
 
 if(HAVE_VC)
     message(STATUS "Vc found!")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
                         "${CMAKE_SOURCE_DIR}/cmake/vc")
 
     include (VcMacros)
 
     if(Vc_COMPILER_IS_CLANG)
         set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
     elseif (NOT MSVC)
         set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
     endif()
 
     #Handle Vc master
     if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG)
         AddCompilerFlag("-std=c++11" _ok)
         if(NOT _ok)
             AddCompilerFlag("-std=c++0x" _ok)
         endif()
     endif()
 
     macro(ko_compile_for_all_implementations_no_scalar _objs _src)
     if(PACKAGERS_BUILD)
         vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
     else()
         set(${_objs} ${_src})
     endif()
     endmacro()
 
     macro(ko_compile_for_all_implementations _objs _src)
     if(PACKAGERS_BUILD)
         vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
     else()
         set(${_objs} ${_src})
     endif()
     endmacro()
 
     if (NOT PACKAGERS_BUILD)
         # Optimize everything for the current architecture
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
     endif ()
 endif()
 set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
 
 ##
 ## Test for Xinput
 ##
 if(NOT WIN32 AND NOT APPLE)
   set(REQUIRED_Xinput_FOUND ${X11_Xinput_FOUND})
 else()
   set(REQUIRED_Xinput_FOUND TRUE)
 endif()
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
 
 if(WIN32)
     set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
                         RUNTIME DESTINATION ${BIN_INSTALL_DIR}
                         LIBRARY ${INSTALL_TARGETS_DEFAULT_ARGS}
                         ARCHIVE ${INSTALL_TARGETS_DEFAULT_ARGS} )
 endif()
 
 ##
 ## Test endianess
 ##
 include (TestBigEndian)
 test_big_endian(CMAKE_WORDS_BIGENDIAN)
 
 ##
 ## Test for qt-poppler
 ##
 macro_optional_find_package(Poppler)
 macro_log_feature( POPPLER_FOUND "Poppler-Qt5" "A PDF rendering library" "http://poppler.freedesktop.org" FALSE "" "Required by the Krita PDF filter.")
 
 ##
 ## Test for pthreads (for G'Mic)
 ##
 macro_optional_find_package(Threads)
 macro_log_feature(Threads_FOUND "PThreads" "A low-level threading library" "" FALSE "" "Optionally used by the G'Mic plugin")
 
 ##
 ## Test for OpenMP (for G'Mic)
 ##
 macro_optional_find_package(OpenMP)
 macro_log_feature(OPENMP_FOUND "OpenMP" "A low-level parallel execution library" "http://openmp.org/wp/" FALSE "" "Optionally used by the G'Mic plugin")
 
 ##
 ## Test for Curl (for G'Mic)
 ##
 macro_optional_find_package(CURL)
 macro_log_feature(CURL_FOUND "CURL" "A tool to fetch remote data" "http://curl.haxx.se/" FALSE "" "Optionally used by the G'Mic plugin")
 
  ############################
 #############################
 ## Add Krita helper macros ##
 #############################
 ############################
 
 include(MacroKritaAddBenchmark)
 
  ####################
 #####################
 ## Define includes ##
 #####################
 ####################
 
 # for config.h and <toplevel/foo.h> includes (if any?)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} 
                            ${CMAKE_CURRENT_BINARY_DIR} 
                            ${CMAKE_SOURCE_DIR}/interfaces 
 )
 
 include_directories(
    ${CMAKE_SOURCE_DIR}/libs/version
    ${CMAKE_BINARY_DIR}/libs/version
 )
 
  ###################################################
 ####################################################
 ## Detect which products/features can be compiled ##
 ####################################################
 ###################################################
 
 calligra_drop_product_on_bad_condition( APP_KRITA
     EIGEN3_FOUND "Eigen devel not found"
     EXIV2_FOUND "libexiv2 devel not found"
     HAVE_REQUIRED_LCMS_VERSION "lcms devel not found"
     Boost_SYSTEM_FOUND "boost-system devel not found"
     REQUIRED_Xinput_FOUND "Xinput devel not found "
 )
 
 #############################################
 ####  Backward compatibility BUILD_x=off ####
 #############################################
 
 # workaround: disable directly all products which might be activated by internal
 # dependencies, but belong to scope of old flag
 calligra_drop_products_on_old_flag(krita APP_KRITA)
 
 #############################################
 ####      Temporarily broken products    ####
 #############################################
 
 # If a product does not build due to some temporary brokeness disable it here,
 # by calling calligra_disable_product with the product id and the reason,
 # e.g.:
 # calligra_disable_product(APP_KEXI "isn't buildable at the moment")
 
 #############################################
 ####     Calculate buildable products    ####
 #############################################
 
 calligra_drop_unbuildable_products()
 
  ###################
 ####################
 ## Subdirectories ##
 ####################
 ###################
 
 if(SHOULD_BUILD_APP_KRITA)
   add_subdirectory(krita)
 endif()
 
 # non-app directories are moved here because they can depend on SHOULD_BUILD_{appname} variables set above
 add_subdirectory(libs)
 add_subdirectory(plugins)
 
 add_subdirectory( benchmarks )
 
 macro_display_feature_log()
 
 calligra_product_deps_report("product_deps")
 calligra_log_should_build()
 
 configure_file(KoConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h )
 configure_file(config_convolution.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_convolution.h)
 configure_file(config-ocio.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ocio.h )
 
 check_function_exists(powf HAVE_POWF)
 configure_file(config-powf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powf.h)
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index a92a669cc3..8054c22ed2 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -1,79 +1,83 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
     ${CMAKE_SOURCE_DIR}/sdk/tests
     ${CMAKE_SOURCE_DIR}/libs/pigment
     ${CMAKE_SOURCE_DIR}/libs/pigment/compositeops
 )
 include_directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
 )
 
 
 set(LINK_VC_LIB)
 if(HAVE_VC)
   include_directories(${Vc_INCLUDE_DIR})
 #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
   set(LINK_VC_LIB ${Vc_LIBRARIES})
 endif()
 
 macro_add_unittest_definitions()
 
 ########### next target ###############
 
 set(kis_datamanager_benchmark_SRCS kis_datamanager_benchmark.cpp)
 set(kis_hiterator_benchmark_SRCS kis_hline_iterator_benchmark.cpp)
 set(kis_viterator_benchmark_SRCS kis_vline_iterator_benchmark.cpp)
 set(kis_random_iterator_benchmark_SRCS kis_random_iterator_benchmark.cpp)
 set(kis_projection_benchmark_SRCS kis_projection_benchmark.cpp)
 set(kis_bcontrast_benchmark_SRCS kis_bcontrast_benchmark.cpp)
 set(kis_blur_benchmark_SRCS kis_blur_benchmark.cpp)
 set(kis_level_filter_benchmark_SRCS kis_level_filter_benchmark.cpp)
 set(kis_painter_benchmark_SRCS kis_painter_benchmark.cpp)
 set(kis_stroke_benchmark_SRCS kis_stroke_benchmark.cpp)
 set(kis_fast_math_benchmark_SRCS kis_fast_math_benchmark.cpp)
 set(kis_floodfill_benchmark_SRCS kis_floodfill_benchmark.cpp)
 set(kis_gradient_benchmark_SRCS kis_gradient_benchmark.cpp)
 set(kis_mask_generator_benchmark_SRCS kis_mask_generator_benchmark.cpp)
 set(kis_low_memory_benchmark_SRCS kis_low_memory_benchmark.cpp)
 set(kis_filter_selections_benchmark_SRCS kis_filter_selections_benchmark.cpp)
 set(kis_composition_benchmark_SRCS kis_composition_benchmark.cpp)
+set(kis_thumbnail_benchmark_SRCS kis_thumbnail_benchmark.cpp)
 
 krita_add_benchmark(KisDatamanagerBenchmark TESTNAME krita-benchmarks-KisDataManager ${kis_datamanager_benchmark_SRCS})
 krita_add_benchmark(KisHLineIteratorBenchmark TESTNAME krita-benchmarks-KisHLineIterator ${kis_hiterator_benchmark_SRCS})
 krita_add_benchmark(KisVLineIteratorBenchmark TESTNAME krita-benchmarks-KisVLineIterator ${kis_viterator_benchmark_SRCS})
 krita_add_benchmark(KisRandomIteratorBenchmark TESTNAME krita-benchmarks-KisRandomIterator ${kis_random_iterator_benchmark_SRCS})
 krita_add_benchmark(KisProjectionBenchmark TESTNAME krita-benchmarks-KisProjectionBenchmark ${kis_projection_benchmark_SRCS})
 krita_add_benchmark(KisBContrastBenchmark TESTNAME krita-benchmarks-KisBContrastBenchmark ${kis_bcontrast_benchmark_SRCS})
 krita_add_benchmark(KisBlurBenchmark TESTNAME krita-benchmarks-KisBlurBenchmark ${kis_blur_benchmark_SRCS})
 krita_add_benchmark(KisLevelFilterBenchmark TESTNAME krita-benchmarks-KisLevelFilterBenchmark ${kis_level_filter_benchmark_SRCS})
 krita_add_benchmark(KisPainterBenchmark TESTNAME krita-benchmarks-KisPainterBenchmark ${kis_painter_benchmark_SRCS})
 krita_add_benchmark(KisStrokeBenchmark TESTNAME krita-benchmarks-KisStrokeBenchmark ${kis_stroke_benchmark_SRCS})
 krita_add_benchmark(KisFastMathBenchmark TESTNAME krita-benchmarks-KisFastMath ${kis_fast_math_benchmark_SRCS})
 krita_add_benchmark(KisFloodfillBenchmark TESTNAME krita-benchmarks-KisFloodFill ${kis_floodfill_benchmark_SRCS})
 krita_add_benchmark(KisGradientBenchmark TESTNAME krita-benchmarks-KisGradientFill ${kis_gradient_benchmark_SRCS})
 krita_add_benchmark(KisMaskGeneratorBenchmark TESTNAME krita-benchmarks-KisMaskGenerator ${kis_mask_generator_benchmark_SRCS})
 krita_add_benchmark(KisLowMemoryBenchmark TESTNAME krita-benchmarks-KisLowMemory ${kis_low_memory_benchmark_SRCS})
 krita_add_benchmark(KisFilterSelectionsBenchmark TESTNAME krita-image-KisFilterSelectionsBenchmark ${kis_filter_selections_benchmark_SRCS})
 krita_add_benchmark(KisCompositionBenchmark TESTNAME krita-benchmarks-KisComposition ${kis_composition_benchmark_SRCS})
+krita_add_benchmark(KisThumbnailBenchmark TESTNAME krita-benchmarks-KisThumbnail ${kis_thumbnail_benchmark_SRCS})
 
 target_link_libraries(KisDatamanagerBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisHLineIteratorBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisVLineIteratorBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisRandomIteratorBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisProjectionBenchmark  kritaimage  kritaui Qt5::Test)
 target_link_libraries(KisBContrastBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisBlurBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisLevelFilterBenchmark kritaimage  Qt5::Test)
 target_link_libraries(KisPainterBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisStrokeBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisFastMathBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisFloodfillBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisGradientBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisLowMemoryBenchmark  kritaimage  Qt5::Test)
 target_link_libraries(KisFilterSelectionsBenchmark   kritaimage  Qt5::Test)
 target_link_libraries(KisCompositionBenchmark  kritaimage  Qt5::Test ${LINK_VC_LIB})
 if(HAVE_VC)
     set_property(TARGET KisCompositionBenchmark APPEND PROPERTY COMPILE_OPTIONS "${Vc_ARCHITECTURE_FLAGS}")
 endif()
 target_link_libraries(KisMaskGeneratorBenchmark  kritaimage  Qt5::Test)
+target_link_libraries(KisThumbnailBenchmark  kritaimage  Qt5::Test)
+
diff --git a/benchmarks/kis_thumbnail_benchmark.cpp b/benchmarks/kis_thumbnail_benchmark.cpp
new file mode 100644
index 0000000000..99a080584f
--- /dev/null
+++ b/benchmarks/kis_thumbnail_benchmark.cpp
@@ -0,0 +1,161 @@
+/*
+ *  Copyright (c) 2016 Eugene Ingerman geneing at gmail dot 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_thumbnail_benchmark.h"
+#include "kis_benchmark_values.h"
+
+#include <QTest>
+#include <QImage>
+#include "kis_iterator_ng.h"
+
+#include "kis_paint_device.h"
+#include "KoColorSpace.h"
+#include "KoColorSpaceRegistry.h"
+#include "KoCompositeOpRegistry.h"
+#include "KoColor.h"
+
+#include "kis_image.h"
+#include "kis_painter.h"
+#include "kis_types.h"
+#include "kis_sequential_iterator.h"
+#include "kis_transform_worker.h"
+
+
+
+#include <cmath>
+
+#define SAVE_OUTPUT
+
+const int THUMBNAIL_WIDTH = 64;
+const int THUMBNAIL_HEIGHT = 64;
+const int IMAGE_WIDTH = 8000;
+const int IMAGE_HEIGHT = 6000;
+const int OVERSAMPLE = 4;
+
+void KisThumbnailBenchmark::initTestCase()
+{
+    m_colorSpace = KoColorSpaceRegistry::instance()->rgb8();
+
+    m_dev = new KisPaintDevice(m_colorSpace);
+    KoColor color(m_colorSpace);
+    color.fromQColor(Qt::white);
+
+    m_dev->clear();
+    m_dev->fill(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT, color.data());
+
+    color.fromQColor(Qt::black);
+
+    KisPainter painter(m_dev);
+    painter.setPaintColor(color);
+    float radius = std::min(IMAGE_WIDTH, IMAGE_HEIGHT);
+    const float angle = 2 * 3.1415926 / 360.;
+    const float endWidth = 30;
+
+    for (float i = 0; i < 90; i += 5) {
+        painter.drawThickLine(QPointF(0, 0), QPointF(radius * std::sin(angle * i), radius * std::cos(angle * i)), 1, endWidth);
+        painter.drawThickLine(QPointF(IMAGE_WIDTH, IMAGE_HEIGHT),
+                              QPointF(IMAGE_WIDTH - radius * std::sin(angle * i), IMAGE_HEIGHT - radius * std::cos(angle * i)), 1, endWidth);
+    }
+#ifdef SAVE_OUTPUT
+    m_dev->convertToQImage(m_colorSpace->profile()).save("ThumbFullImage.png");
+#endif
+}
+
+void KisThumbnailBenchmark::cleanupTestCase()
+{
+}
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnail()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, QRect() );
+        //m_dev->setDirty();
+    }
+
+    image.save("createThumbnail.png");
+}
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnailCached()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, 2. );
+    }
+}
+
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnailHiQ()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(OVERSAMPLE * THUMBNAIL_WIDTH, OVERSAMPLE * THUMBNAIL_HEIGHT);
+        image = image.scaled(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        m_dev->setDirty();
+    }
+
+    image.save("createThumbnailHiQ.png");
+}
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnailHiQcreateThumbOversample2x()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, QRect(), 2,
+                                       KoColorConversionTransformation::internalRenderingIntent(),
+                                       KoColorConversionTransformation::internalConversionFlags());
+        m_dev->setDirty();
+    }
+
+    image.save("createThumbnailHiQcreateThumbOversample2x.png");
+}
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnailHiQcreateThumbOversample3x()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, QRect(), 3,
+                                       KoColorConversionTransformation::internalRenderingIntent(),
+                                       KoColorConversionTransformation::internalConversionFlags());
+        m_dev->setDirty();
+    }
+
+    image.save("createThumbnailHiQcreateThumbOversample3x.png");
+}
+
+void KisThumbnailBenchmark::benchmarkCreateThumbnailHiQcreateThumbOversample4x()
+{
+    QImage image;
+
+    QBENCHMARK{
+        image = m_dev->createThumbnail(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, QRect(), 4,
+                                       KoColorConversionTransformation::internalRenderingIntent(),
+                                       KoColorConversionTransformation::internalConversionFlags());
+        m_dev->setDirty();
+    }
+
+    image.save("createThumbnailHiQcreateThumbOversample4x.png");
+}
+
+
+QTEST_MAIN(KisThumbnailBenchmark)
diff --git a/benchmarks/kis_thumbnail_benchmark.h b/benchmarks/kis_thumbnail_benchmark.h
new file mode 100644
index 0000000000..bde2f38591
--- /dev/null
+++ b/benchmarks/kis_thumbnail_benchmark.h
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2016 Eugene Ingerman geneing at gmail dot 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.
+ */
+
+#ifndef KIS_THUMBNAIL_BENCHMARK_H
+#define KIS_THUMBNAIL_BENCHMARK_H
+
+#include <QtTest>
+#include "kis_paint_device.h"
+
+class KoColor;
+class KoColorSpace;
+
+class KisThumbnailBenchmark : public QObject
+{
+    Q_OBJECT
+
+private:
+    const KoColorSpace * m_colorSpace;
+    KisPaintDeviceSP m_dev;
+    QVector<QImage> m_thumbnails;
+    QSize m_thumbnailSizeLimit;
+    int m_oversampleRatio;
+    int m_skipCount;
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void benchmarkCreateThumbnail();
+    void benchmarkCreateThumbnailCached();
+    void benchmarkCreateThumbnailHiQ();
+
+    void benchmarkCreateThumbnailHiQcreateThumbOversample2x();
+    void benchmarkCreateThumbnailHiQcreateThumbOversample3x();
+    void benchmarkCreateThumbnailHiQcreateThumbOversample4x();
+
+};
+
+
+#endif
diff --git a/cmake/modules/FindOpenJPEG.cmake b/cmake/modules/FindOpenJPEG.cmake
deleted file mode 100644
index ae859572e9..0000000000
--- a/cmake/modules/FindOpenJPEG.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- cmake -*-
-
-# - Find OpenJPEG
-# Find the OpenJPEG includes and library
-# This module defines
-#  OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
-#  OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
-#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
-# also defined, but not for general use are
-#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-
-find_path(OPENJPEG_INCLUDE_DIR openjpeg.h
-PATHS
-    /usr/local/include/openjpeg
-    /usr/local/include
-    /usr/include/openjpeg
-    /usr/include/openjpeg-1.5
-    /usr/include
-PATH_SUFFIXES
-    openjpeg-1.5
-    openjpeg
-)
-
-set(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
-find_library(OPENJPEG_LIBRARY
-  NAMES ${OPENJPEG_NAMES}
-  PATHS
-      /usr/lib /usr/local/lib
-)
-
-if (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-    set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-    set(OPENJPEG_FOUND "YES")
-else ()
-  set(OPENJPEG_FOUND "NO")
-endif ()
-
-
-if (OPENJPEG_FOUND)
-   if (NOT OPENJPEG_FIND_QUIETLY)
-      message(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
-   endif ()
-else ()
-   if (OPENJPEG_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find OpenJPEG library")
-   endif ()
-endif ()
-
-# Deprecated declarations.
-set (NATIVE_OPENJPEG_INCLUDE_PATH ${OPENJPEG_INCLUDE_DIR} )
-get_filename_component (NATIVE_OPENJPEG_LIB_PATH ${OPENJPEG_LIBRARY} PATH)
-
-mark_as_advanced(
-  OPENJPEG_LIBRARY
-  OPENJPEG_INCLUDE_DIR
-  )
diff --git a/krita/data/input/kritadefault.profile b/krita/data/input/kritadefault.profile
index 2650ccaf0d..a1ce565a5d 100644
--- a/krita/data/input/kritadefault.profile
+++ b/krita/data/input/kritadefault.profile
@@ -1,66 +1,67 @@
 [Alternate Invocation]
 0={1;2;[1000023,1000020];1;0;0}
 1={0;2;[1000021,1000020];1;0;0}
 2={5;2;[1000021];2;0;0}
 3={3;2;[1000021,1000023];2;0;0}
 4={2;2;[1000023,1000021];1;0;0}
 5={4;2;[1000021];1;0;0}
 
 [Change Primary Setting]
 0={0;2;[1000020];1;0;0}
 
 [Exposure or Gamma]
 0={0;2;[59];1;0;0}
 
 [General]
 name=Krita Default
 version=3
 
 [Pan Canvas]
 0={0;4;[];0;0;2}
 1={0;2;[20];1;0;0}
 2={0;2;[];4;0;0}
 3={1;1;[];0;0;0}
 4={2;1;[];0;0;0}
 5={3;1;[];0;0;0}
 6={4;1;[];0;0;0}
 
 [Rotate Canvas]
 0={0;2;[1000020,20];1;0;0}
 1={1;2;[1000020,1000023,20];1;0;0}
 2={0;2;[1000020];4;0;0}
 3={2;1;[34];0;0;0}
 4={4;1;[35];0;0;0}
 5={3;1;[36];0;0;0}
 
 [Select Layer]
 0={1;2;[1000020,52];1;0;0}
 1={0;2;[52];1;0;0}
 
 [Show Popup Palette]
 0={0;2;[];2;0;0}
 
 [Switch Time]
 0={0;1;[1000014];0;0;0}
 1={1;1;[1000012];0;0;0}
 
 [Tool Invocation]
 0={3;2;[56];1;0;0}
 1={1;1;[1000005];0;0;0}
 2={0;2;[];1;0;0}
 3={1;1;[1000004];0;0;0}
 4={2;1;[1000000];0;0;0}
 
 [Zoom Canvas]
-0={0;4;[];0;0;1}
-1={0;2;[1000021,20];1;0;0}
-10={1;2;[1000021,1000023,20];1;0;0}
-11={6;1;[33];0;0;0}
-2={0;2;[1000021];4;0;0}
-3={2;3;[];0;1;0}
+0={2;1;[2b];0;0;0}
+1={4;1;[31];0;0;0}
+10={5;1;[32];0;0;0}
+11={0;4;[];0;0;1}
+12={8;2;[1000021,1000023];4;0;0}
+2={3;1;[2d];0;0;0}
+3={2;1;[3d];0;0;0}
 4={3;3;[];0;2;0}
-5={2;1;[3d];0;0;0}
-6={3;1;[2d];0;0;0}
-7={4;1;[31];0;0;0}
-8={2;1;[2b];0;0;0}
-9={5;1;[32];0;0;0}
+5={2;3;[];0;1;0}
+6={7;2;[1000021];4;0;0}
+7={7;2;[1000021,20];1;0;0}
+8={6;1;[33];0;0;0}
+9={8;2;[1000021,1000023,20];1;0;0}
diff --git a/krita/data/templates/animation/Anim-Jp-EN.desktop b/krita/data/templates/animation/Anim-Jp-EN.desktop
index 93e3c95708..214850c305 100644
--- a/krita/data/templates/animation/Anim-Jp-EN.desktop
+++ b/krita/data/templates/animation/Anim-Jp-EN.desktop
@@ -1,17 +1,19 @@
 [Desktop Entry]
 Type=Link
 URL=.source/Anim-Jp-EN.kra
 Icon=template_animation
 Name=Animation-Japanese-En
 Name[ca]=Animació-Japonès-EN
 Name[ca@valencia]=Animació-Japonés-EN
 Name[de]=Animation-Japanisch-En
 Name[en_GB]=Animation-Japanese-En
 Name[es]=Animación-Japonés-En
+Name[et]=Animation-Japanese-En
 Name[it]=Animazione-Giapponese-EN
 Name[nl]=Animatie-Japans-En
 Name[pl]=Animacja-Japońska-En
 Name[pt]=Animação-Japonês-EN
+Name[sk]=Animation-Japanese-En
 Name[sv]=Animering-japanska-en
 Name[uk]=Японська анімація (англійською)
 Name[x-test]=xxAnimation-Japanese-Enxx
diff --git a/krita/data/templates/animation/Anim-Jp-JP.desktop b/krita/data/templates/animation/Anim-Jp-JP.desktop
index 731c262b6b..e3b694daf8 100644
--- a/krita/data/templates/animation/Anim-Jp-JP.desktop
+++ b/krita/data/templates/animation/Anim-Jp-JP.desktop
@@ -1,17 +1,19 @@
 [Desktop Entry]
 Type=Link
 URL=.source/Anim-Jp-JP.kra
 Icon=template_animation
 Name=Animation-Japanese-JP
 Name[ca]=Animació-Japonès-JP
 Name[ca@valencia]=Animació-Japonés-JP
 Name[de]=Animation-Japanisch-JP
 Name[en_GB]=Animation-Japanese-JP
 Name[es]=Animación-Japonés-JP
+Name[et]=Animation-Japanese-JP
 Name[it]=Animazione-Giapponese-JP
 Name[nl]=Animatie-Japans-JP
 Name[pl]=Animacja-Japońska-JP
 Name[pt]=Animação-Japonês-JP
+Name[sk]=Animation-Japanese-JP
 Name[sv]=Animering-japanska-jp
 Name[uk]=Японська анімація (японською)
 Name[x-test]=xxAnimation-Japanese-JPxx
diff --git a/krita/main.cc b/krita/main.cc
index 9b914b22e1..00b23e3238 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -1,234 +1,235 @@
 /*
  * Copyright (c) 1999 Matthias Elter <me@kde.org>
  * Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  * Copyright (c) 2015 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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 <stdlib.h>
 
 #include <QString>
 #include <QPixmap>
 #include <kis_debug.h>
 #include <QProcess>
 #include <QProcessEnvironment>
 #include <QDesktopServices>
 #include <QDir>
 #include <QDate>
 #include <QLoggingCategory>
 #include <QLocale>
 #include <QSettings>
 
 #include <KisApplication.h>
 #include <KoConfig.h>
 #include <KoResourcePaths.h>
 
 #include "data/splash/splash_screen.xpm"
 #include "data/splash/splash_holidays.xpm"
 #include "KisDocument.h"
 #include "kis_splash_screen.h"
 #include "KisPart.h"
 #include "KisApplicationArguments.h"
 
 #if defined Q_OS_WIN
 #include <windows.h>
 #include <stdlib.h>
 #include <kis_tablet_support_win.h>
 
 #elif defined HAVE_X11
     #include <kis_tablet_support_x11.h>
     #include <kis_xi2_event_filter.h>
 #endif
 
 #if defined HAVE_KCRASH
 #include <kcrash.h>
 
 #elif defined USE_BREAKPAD
     #include "kis_crash_handler.h"
 #endif
 extern "C" int main(int argc, char **argv)
 {
     /**
      * Add a workaround for Qt 5.6, which implemented compression of the tablet events.
      * Since Qt 5.6.1 there will be this hacky environment variable option. After that,
      * Qt developers promised to give us better control for that. Please make sure the env
      * variable is set *before* the construction of QApplication!
      */
 #if defined Q_OS_LINUX && QT_VERSION >= 0x050600
     qputenv("QT_XCB_NO_EVENT_COMPRESSION", "1");
 #endif
 
     bool runningInKDE = !qgetenv("KDE_FULL_SESSION").isEmpty();
 
     /**
      * Disable debug output by default. (krita.input enables tablet debugging.)
      * Debug logs can be controlled by an environment variable QT_LOGGING_RULES.
      *
      * As an example, to get full debug output, run the following:
      * export QT_LOGGING_RULES="krita*=true"; krita
      *
      * See: http://doc.qt.io/qt-5/qloggingcategory.html
      */
     QLoggingCategory::setFilterRules("krita*.debug=false\n"
                                      "krita*.warning=true\n"
                                      "krita.tabletlog=true");
 
     // A per-user unique string, without /, because QLocalServer cannot use names with a / in it
     QString key = "Krita3" + QDesktopServices::storageLocation(QDesktopServices::HomeLocation).replace("/", "_");
     key = key.replace(":", "_").replace("\\","_");
 
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
     QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
 
 #if QT_VERSION >= 0x050600
     if (!qgetenv("KRITA_HIDPI").isEmpty()) {
         QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     }
 #endif
 
     KLocalizedString::setApplicationDomain("krita");
 
     // first create the application so we can create a pixmap
     KisApplication app(key, argc, argv);
 
 #ifdef Q_OS_LINUX
     qputenv("XDG_DATA_DIRS", QFile::encodeName(KoResourcePaths::getApplicationRoot() + "share") + ":" + qgetenv("XDG_DATA_DIRS"));
 #else
     qputenv("XDG_DATA_DIRS", QFile::encodeName(KoResourcePaths::getApplicationRoot() + "share"));
 #endif
 
     qDebug() << "Setting XDG_DATA_DIRS" << qgetenv("XDG_DATA_DIRS");
     qDebug() << "Available translations" << KLocalizedString::availableApplicationTranslations();
     qDebug() << "Available domain translations" << KLocalizedString::availableDomainTranslations("krita");
 
     // Now that the paths are set, set the language. First check the override from the langage
     // selection dialog.
     KLocalizedString::clearLanguages();
     const QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
     QSettings languageoverride(configPath + QStringLiteral("/klanguageoverridesrc"), QSettings::IniFormat);
     languageoverride.beginGroup(QStringLiteral("Language"));
     QString language = languageoverride.value(qAppName(), "").toString();
 
     qDebug() << "Override language:" << language;
 
     if (!language.isEmpty()) {
         KLocalizedString::setLanguages(language.split(":"));
         // And override Qt's locale, too
         qputenv("LANG", language.toLatin1());
         QLocale locale(language.split(":").first());
         QLocale::setDefault(locale);
         qDebug() << "Qt ui languages" << locale.uiLanguages();
     }
     else {
         // And if there isn't one, check the one set by the system.
         // XXX: This doesn't work, for some !@#$% reason.
         QLocale locale = QLocale::system();
         if (locale.bcp47Name() != QStringLiteral("en")) {
             KLocalizedString::setLanguages(QStringList() << locale.bcp47Name());
         }
     }
 
 #ifdef Q_OS_WIN
     QDir appdir(KoResourcePaths::getApplicationRoot());
+    QString path = qgetenv("PATH");
     qputenv("PATH", QFile::encodeName(appdir.absolutePath() + "/bin" + ";"
                                       + appdir.absolutePath() + "/lib" + ";"
-                                      + appdir.absolutePath() + "/lib/kde4" + ";"
                                       + appdir.absolutePath() + "/Frameworks" + ";"
-                                      + appdir.absolutePath()));
+                                      + appdir.absolutePath() + ";"
+                                      + path));
 
     qDebug() << "PATH" << qgetenv("PATH");
 #endif
 
     if (qApp->applicationDirPath().contains(KRITA_BUILD_DIR)) {
         qFatal("FATAL: You're trying to run krita from the build location. You can only run Krita from the installation location.");
     }
 
 
 #if defined HAVE_KCRASH
     KCrash::initialize();
 #elif defined USE_BREAKPAD
     qputenv("KDE_DEBUG", "1");
     KisCrashHandler crashHandler;
     Q_UNUSED(crashHandler);
 #endif
 
     // If we should clear the config, it has to be done as soon as possible after
     // KisApplication has been created. Otherwise the config file may have been read
     // and stored in a KConfig object we have no control over.
     app.askClearConfig();
 
     KisApplicationArguments args(app);
 
     if (app.isRunning()) {
         // only pass arguments to main instance if they are not for batch processing
         // any batch processing would be done in this separate instance
         const bool batchRun = (args.print() || args.exportAs() || args.exportAsPdf());
 
         if (!batchRun) {
             QByteArray ba = args.serialize();
             if (app.sendMessage(ba)) {
                 return 0;
             }
         }
     }
 
     if (!runningInKDE) {
         // Icons in menus are ugly and distracting
         app.setAttribute(Qt::AA_DontShowIconsInMenus);
     }
 
 #if defined HAVE_X11
     app.installNativeEventFilter(KisXi2EventFilter::instance());
 #endif
 
     // then create the pixmap from an xpm: we cannot get the
     // location of our datadir before we've started our components,
     // so use an xpm.
     QDate currentDate = QDate::currentDate();
     QWidget *splash = 0;
     if (currentDate > QDate(currentDate.year(), 12, 4) ||
             currentDate < QDate(currentDate.year(), 1, 9)) {
          splash = new KisSplashScreen(app.applicationVersion(), QPixmap(splash_holidays_xpm));
     }
     else {
         splash = new KisSplashScreen(app.applicationVersion(), QPixmap(splash_screen_xpm));
     }
 
     app.setSplashScreen(splash);
 
 
 #if defined Q_OS_WIN
     KisTabletSupportWin::init();
     // app.installNativeEventFilter(new KisTabletSupportWin());
 #endif
 
     if (!app.start(args)) {
         return 1;
     }
 
     // Set up remote arguments.
     QObject::connect(&app, SIGNAL(messageReceived(QByteArray,QObject*)),
                      &app, SLOT(remoteArguments(QByteArray,QObject*)));
 
     QObject::connect(&app, SIGNAL(fileOpenRequest(QString)),
                      &app, SLOT(fileOpenRequested(QString)));
 
     int state = app.exec();
 
     return state;
 }
 
diff --git a/libs/basicflakes/tools/KoCreatePathTool.cpp b/libs/basicflakes/tools/KoCreatePathTool.cpp
index f17cc2c1b9..c0355d2ecf 100644
--- a/libs/basicflakes/tools/KoCreatePathTool.cpp
+++ b/libs/basicflakes/tools/KoCreatePathTool.cpp
@@ -1,532 +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_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 QSpinBox(angleWidget);
+    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 7aff814107..4636e9c56b 100644
--- a/libs/basicflakes/tools/KoPencilTool.cpp
+++ b/libs/basicflakes/tools/KoPencilTool.cpp
@@ -1,558 +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_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 QDoubleSpinBox(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 QDoubleSpinBox(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/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
index c63e0821b8..aef106e243 100644
--- a/libs/flake/CMakeLists.txt
+++ b/libs/flake/CMakeLists.txt
@@ -1,225 +1,226 @@
 project(kritaflake)
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/libs/flake/commands
     ${CMAKE_SOURCE_DIR}/libs/flake/tools
     ${CMAKE_SOURCE_DIR}/libs/flake/svg
     ${CMAKE_BINARY_DIR}/libs/flake
 )
 
 add_subdirectory(styles)
 add_subdirectory(tests)
 
 set(kritaflake_SRCS
     KoGradientHelper.cpp
     KoFlake.cpp
     KoCanvasBase.cpp
     KoResourceManager_p.cpp
     KoDerivedResourceConverter.cpp
+    KoResourceUpdateMediator.cpp
     KoCanvasResourceManager.cpp
     KoDocumentResourceManager.cpp
     KoCanvasObserverBase.cpp
     KoCanvasSupervisor.cpp
     KoDockFactoryBase.cpp
     KoDockRegistry.cpp
     KoDataCenterBase.cpp
     KoInsets.cpp
     KoPathShape.cpp
     KoPathPoint.cpp
     KoPathSegment.cpp
     KoSelection.cpp
     KoShape.cpp
     KoShapeAnchor.cpp
     KoShapeBasedDocumentBase.cpp
     KoShapeApplicationData.cpp
     KoShapeContainer.cpp
     KoShapeContainerModel.cpp
     KoShapeContainerDefaultModel.cpp
     KoShapeGroup.cpp
     KoShapeManagerPaintingStrategy.cpp
     KoShapeManager.cpp
     KoShapePaintingContext.cpp
     KoFrameShape.cpp
     KoUnavailShape.cpp
     KoMarkerData.cpp
     KoMarker.cpp
     KoMarkerCollection.cpp
     KoMarkerSharedLoadingData.cpp
     KoToolBase.cpp
     KoCanvasController.cpp
     KoCanvasControllerWidget.cpp
     KoCanvasControllerWidgetViewport_p.cpp
     KoShapeRegistry.cpp
     KoDeferredShapeFactoryBase.cpp
     KoToolFactoryBase.cpp
     KoPathShapeFactory.cpp
     KoShapeFactoryBase.cpp
     KoShapeUserData.cpp
     KoParameterShape.cpp
     KoPointerEvent.cpp
     KoShapeController.cpp
     KoToolSelection.cpp
     KoShapeLayer.cpp
     KoPostscriptPaintDevice.cpp
     KoInputDevice.cpp
     KoToolManager_p.cpp
     KoToolManager.cpp
     KoToolRegistry.cpp
     KoToolProxy.cpp
     KoShapeSavingContext.cpp
     KoShapeLoadingContext.cpp
     KoLoadingShapeUpdater.cpp
     KoPathShapeLoader.cpp
     KoShapeStrokeModel.cpp
     KoShapeStroke.cpp
     KoShapeBackground.cpp
     KoColorBackground.cpp
     KoGradientBackground.cpp
     KoOdfGradientBackground.cpp
     KoHatchBackground.cpp
     KoPatternBackground.cpp
     KoShapeConfigWidgetBase.cpp
     KoDrag.cpp
     KoDragOdfSaveHelper.cpp
     KoShapeOdfSaveHelper.cpp
     KoShapePaste.cpp
     KoConnectionPoint.cpp
     KoConnectionShape.cpp
     KoConnectionShapeLoadingUpdater.cpp
     KoConnectionShapeFactory.cpp
     KoConnectionShapeConfigWidget.cpp
     KoSnapGuide.cpp
     KoSnapProxy.cpp
     KoSnapStrategy.cpp
     KoSnapData.cpp
     KoShapeShadow.cpp
     KoSharedLoadingData.cpp
     KoSharedSavingData.cpp
     KoViewConverter.cpp
     KoInputDeviceHandler.cpp
     KoInputDeviceHandlerEvent.cpp
     KoInputDeviceHandlerRegistry.cpp
     KoImageData.cpp
     KoImageData_p.cpp
     KoImageCollection.cpp
     KoOdfWorkaround.cpp
     KoFilterEffect.cpp
     KoFilterEffectStack.cpp
     KoFilterEffectFactoryBase.cpp
     KoFilterEffectRegistry.cpp
     KoFilterEffectConfigWidgetBase.cpp
     KoFilterEffectRenderContext.cpp
     KoFilterEffectLoadingContext.cpp
     KoTextShapeDataBase.cpp
     KoTosContainer.cpp
     KoTosContainerModel.cpp
     KoClipPath.cpp
     KoCurveFit.cpp
     commands/KoShapeGroupCommand.cpp
     commands/KoShapeAlignCommand.cpp
     commands/KoShapeBackgroundCommand.cpp
     commands/KoShapeCreateCommand.cpp
     commands/KoShapeDeleteCommand.cpp
     commands/KoShapeDistributeCommand.cpp
     commands/KoShapeLockCommand.cpp
     commands/KoShapeMoveCommand.cpp
     commands/KoShapeShearCommand.cpp
     commands/KoShapeSizeCommand.cpp
     commands/KoShapeStrokeCommand.cpp
     commands/KoShapeUngroupCommand.cpp
     commands/KoShapeReorderCommand.cpp
     commands/KoShapeKeepAspectRatioCommand.cpp
     commands/KoPathBaseCommand.cpp
     commands/KoPathPointMoveCommand.cpp
     commands/KoPathControlPointMoveCommand.cpp
     commands/KoPathPointTypeCommand.cpp
     commands/KoPathPointRemoveCommand.cpp
     commands/KoPathPointInsertCommand.cpp
     commands/KoPathSegmentBreakCommand.cpp
     commands/KoPathBreakAtPointCommand.cpp
     commands/KoPathSegmentTypeCommand.cpp
     commands/KoPathCombineCommand.cpp
     commands/KoSubpathRemoveCommand.cpp
     commands/KoSubpathJoinCommand.cpp
     commands/KoParameterHandleMoveCommand.cpp
     commands/KoParameterToPathCommand.cpp
     commands/KoShapeTransformCommand.cpp
     commands/KoPathFillRuleCommand.cpp
     commands/KoConnectionShapeTypeCommand.cpp
     commands/KoShapeShadowCommand.cpp
     commands/KoPathReverseCommand.cpp
     commands/KoShapeRenameCommand.cpp
     commands/KoShapeRunAroundCommand.cpp
     commands/KoPathPointMergeCommand.cpp
     commands/KoShapeTransparencyCommand.cpp
     commands/KoShapeClipCommand.cpp
     commands/KoShapeUnclipCommand.cpp
     commands/KoPathShapeMarkerCommand.cpp
     commands/KoShapeConnectionChangeCommand.cpp
     tools/KoCreateShapeStrategy.cpp
     tools/KoPathToolFactory.cpp
     tools/KoPathTool.cpp
     tools/KoPathToolSelection.cpp
     tools/KoPathToolHandle.cpp
     tools/PathToolOptionWidget.cpp
     tools/KoPathPointRubberSelectStrategy.cpp
     tools/KoPathPointMoveStrategy.cpp
     tools/KoPathConnectionPointStrategy.cpp
     tools/KoPathControlPointMoveStrategy.cpp
     tools/KoParameterChangeStrategy.cpp
     tools/KoZoomTool.cpp
     tools/KoZoomToolFactory.cpp
     tools/KoZoomToolWidget.cpp
     tools/KoZoomStrategy.cpp
     tools/KoPanTool.cpp
     tools/KoPanToolFactory.cpp
     tools/KoInteractionTool.cpp
     tools/KoInteractionStrategy.cpp
     tools/KoCreateShapesTool.cpp
     tools/KoCreateShapesToolFactory.cpp
     tools/KoShapeRubberSelectStrategy.cpp
     tools/KoPathSegmentChangeStrategy.cpp
     svg/KoShapePainter.cpp
     svg/SvgUtil.cpp
     svg/SvgGraphicContext.cpp
     svg/SvgSavingContext.cpp
     svg/SvgWriter.cpp
     svg/SvgStyleWriter.cpp
     svg/SvgShape.cpp
     svg/SvgParser.cpp
     svg/SvgStyleParser.cpp
     svg/SvgGradientHelper.cpp
     svg/SvgPatternHelper.cpp
     svg/SvgFilterHelper.cpp
     svg/SvgCssHelper.cpp
     svg/SvgClipPathHelper.cpp
     svg/SvgLoadingContext.cpp
     svg/SvgShapeFactory.cpp
 
     FlakeDebug.cpp
 )
 
 ki18n_wrap_ui(kritaflake_SRCS
     tools/PathToolOptionWidgetBase.ui
     KoConnectionShapeConfigWidget.ui
     tools/KoZoomToolWidget.ui
 )
 
 add_library(kritaflake SHARED ${kritaflake_SRCS})
 generate_export_header(kritaflake BASE_NAME kritaflake)
 
 target_include_directories(kritaflake
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/commands>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/svg>
 )
 
 target_link_libraries(kritaflake kritapigment kritawidgetutils kritaodf kritaundo2 KF5::WidgetsAddons Qt5::Svg)
 target_link_libraries(kritaflake LINK_INTERFACE_LIBRARIES kritapigment kritawidgetutils kritaodf kritaundo2 KF5::WidgetsAddons )
 
 set_target_properties(kritaflake PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritaflake  ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/libs/flake/KoCanvasResourceManager.cpp b/libs/flake/KoCanvasResourceManager.cpp
index da7b047f2e..45f2189de4 100644
--- a/libs/flake/KoCanvasResourceManager.cpp
+++ b/libs/flake/KoCanvasResourceManager.cpp
@@ -1,182 +1,197 @@
 /*
    Copyright (c) 2006 Boudewijn Rempt (boud@valdyas.org)
    Copyright (C) 2007, 2010 Thomas Zander <zander@kde.org>
    Copyright (c) 2008 Carlos Licea <carlos.licea@kdemail.net>
    Copyright (c) 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 "KoCanvasResourceManager.h"
 
 #include <QVariant>
 #include <FlakeDebug.h>
 
 #include "KoShape.h"
 #include "KoShapeStroke.h"
 #include "KoResourceManager_p.h"
 #include <KoColorSpaceRegistry.h>
 
 class Q_DECL_HIDDEN KoCanvasResourceManager::Private
 {
 public:
     KoResourceManager manager;
 };
 
 KoCanvasResourceManager::KoCanvasResourceManager(QObject *parent)
         : QObject(parent),
         d(new Private())
 {
     const KoColorSpace* cs = KoColorSpaceRegistry::instance()->rgb8();
     setForegroundColor(KoColor(Qt::black, cs));
     setBackgroundColor(KoColor(Qt::white, cs));
     setResource(ApplicationSpeciality, NoSpecial);
 
     connect(&d->manager, &KoResourceManager::resourceChanged,
             this, &KoCanvasResourceManager::canvasResourceChanged);
 }
 
 KoCanvasResourceManager::~KoCanvasResourceManager()
 {
     delete d;
 }
 
 void KoCanvasResourceManager::setResource(int key, const QVariant &value)
 {
     d->manager.setResource(key, value);
 }
 
 QVariant KoCanvasResourceManager::resource(int key) const
 {
     return d->manager.resource(key);
 }
 
 void KoCanvasResourceManager::setResource(int key, const KoColor &color)
 {
     QVariant v;
     v.setValue(color);
     setResource(key, v);
 }
 
 void KoCanvasResourceManager::setResource(int key, KoShape *shape)
 {
     QVariant v;
     v.setValue(shape);
     setResource(key, v);
 }
 
 void KoCanvasResourceManager::setResource(int key, const KoUnit &unit)
 {
     QVariant v;
     v.setValue(unit);
     setResource(key, v);
 }
 
 KoColor KoCanvasResourceManager::koColorResource(int key) const
 {
     return d->manager.koColorResource(key);
 }
 
 void KoCanvasResourceManager::setForegroundColor(const KoColor &color)
 {
     setResource(ForegroundColor, color);
 }
 
 KoColor KoCanvasResourceManager::foregroundColor() const
 {
     return koColorResource(ForegroundColor);
 }
 
 void KoCanvasResourceManager::setBackgroundColor(const KoColor &color)
 {
     setResource(BackgroundColor, color);
 }
 
 KoColor KoCanvasResourceManager::backgroundColor() const
 {
     return koColorResource(BackgroundColor);
 }
 
 KoShape *KoCanvasResourceManager::koShapeResource(int key) const
 {
     return d->manager.koShapeResource(key);
 }
 
 KoUnit KoCanvasResourceManager::unitResource(int key) const
 {
     return resource(key).value<KoUnit>();
 }
 
 
 void KoCanvasResourceManager::setActiveStroke(const KoShapeStroke &stroke)
 {
     QVariant v;
     v.setValue(stroke);
     setResource(ActiveStroke, v);
 }
 
 KoShapeStroke KoCanvasResourceManager::activeStroke() const
 {
     if (!d->manager.hasResource(ActiveStroke)) {
         KoShapeStroke empty;
         return empty;
     }
     return resource(ActiveStroke).value<KoShapeStroke>();
 }
 
 bool KoCanvasResourceManager::boolResource(int key) const
 {
     return d->manager.boolResource(key);
 }
 
 int KoCanvasResourceManager::intResource(int key) const
 {
     return d->manager.intResource(key);
 }
 
 QString KoCanvasResourceManager::stringResource(int key) const
 {
     return d->manager.stringResource(key);
 }
 
 QSizeF KoCanvasResourceManager::sizeResource(int key) const
 {
     return d->manager.sizeResource(key);
 }
 
 bool KoCanvasResourceManager::hasResource(int key) const
 {
     return d->manager.hasResource(key);
 }
 
 void KoCanvasResourceManager::clearResource(int key)
 {
     d->manager.clearResource(key);
 }
 
 void KoCanvasResourceManager::addDerivedResourceConverter(KoDerivedResourceConverterSP converter)
 {
     d->manager.addDerivedResourceConverter(converter);
 }
 
 bool KoCanvasResourceManager::hasDerivedResourceConverter(int key)
 {
     return d->manager.hasDerivedResourceConverter(key);
 }
 
 void KoCanvasResourceManager::removeDerivedResourceConverter(int key)
 {
     d->manager.removeDerivedResourceConverter(key);
 }
+
+void KoCanvasResourceManager::addResourceUpdateMediator(KoResourceUpdateMediatorSP mediator)
+{
+    d->manager.addResourceUpdateMediator(mediator);
+}
+
+bool KoCanvasResourceManager::hasResourceUpdateMediator(int key)
+{
+    return d->manager.hasResourceUpdateMediator(key);
+}
+
+void KoCanvasResourceManager::removeResourceUpdateMediator(int key)
+{
+    d->manager.removeResourceUpdateMediator(key);
+}
diff --git a/libs/flake/KoCanvasResourceManager.h b/libs/flake/KoCanvasResourceManager.h
index 96fc90bd03..9060cdb3d1 100644
--- a/libs/flake/KoCanvasResourceManager.h
+++ b/libs/flake/KoCanvasResourceManager.h
@@ -1,271 +1,288 @@
 /*
    Copyright (c) 2006, 2011 Boudewijn Rempt (boud@valdyas.org)
    Copyright (C) 2007, 2009, 2010 Thomas Zander <zander@kde.org>
    Copyright (c) 2008 Carlos Licea <carlos.licea@kdemail.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.
  */
 #ifndef KO_CANVASRESOURCEMANAGER_H
 #define KO_CANVASRESOURCEMANAGER_H
 
 #include <QObject>
 
 #include "kritaflake_export.h"
 #include "KoDerivedResourceConverter.h"
+#include "KoResourceUpdateMediator.h"
 
 class KoShape;
 class KoShapeStroke;
 class KoColor;
 class KoUnit;
 
 class QVariant;
 class QSizeF;
 
 /**
  * The KoCanvasResourceManager contains a set of per-canvas
  * properties, like current foreground color, current background
  * color and more. All tools belonging to the current canvas are
  * notified when a Resource changes (is set).
  *
  * The manager can contain all sorts of variable types and there are accessors
  * for the most common ones.  All variables are always stored inside a QVariant
  * instance internally and you can always just use the resource() method to get
  * that directly.
  * The way to store arbitairy data objects that are stored as pointers you can use
  * the following code snippets;
  * @code
  *  QVariant variant;
  *  variant.setValue<void*>(textShapeData->document());
  *  resourceManager->setResource(KoText::CurrentTextDocument, variant);
  *  // and get it out again.
  *  QVariant var = resourceManager->resource(KoText::CurrentTextDocument);
  *  document = static_cast<QTextDocument*>(var.value<void*>());
  * @endcode
  */
 class KRITAFLAKE_EXPORT KoCanvasResourceManager : public QObject
 {
     Q_OBJECT
 
 public:
 
     /**
      * This enum holds identifiers to the resources that can be stored in here.
      */
     enum CanvasResource {
         ForegroundColor,    ///< The active forground color selected for this canvas.
         BackgroundColor,    ///< The active background color selected for this canvas.
         ActiveStroke,       ///< The active stroke selected for this canvas
         PageSize,           ///< The size of the (current) page in postscript points.
         Unit,               ///< The unit of this canvas
         CurrentPage,        ///< The current page number
         ActiveStyleType,    ///< the actual active style type see KoFlake::StyleType for valid values
         ActiveRange,        ///< The area where the rulers should show white
         ShowTextShapeOutlines,     ///< Paint of text shape outlines ?
         ShowFormattingCharacters,  ///< Paint of formatting characters ?
         ShowTableBorders,  ///< Paint of table borders (when not really there) ?
         ShowSectionBounds, ///< Paint of sections bounds ?
         ShowInlineObjectVisualization, ///< paint a different  background for inline objects
         ApplicationSpeciality, ///< Special features and limitations of the application
         KarbonStart = 1000,      ///< Base number for Karbon specific values.
         KexiStart = 2000,        ///< Base number for Kexi specific values.
         FlowStart = 3000,        ///< Base number for Flow specific values.
         PlanStart = 4000,        ///< Base number for Plan specific values.
         StageStart = 5000,       ///< Base number for Stage specific values.
         KritaStart = 6000,       ///< Base number for Krita specific values.
         SheetsStart = 7000,      ///< Base number for Sheets specific values.
         WordsStart = 8000,       ///< Base number for Words specific values.
         KoPageAppStart = 9000    ///< Base number for KoPageApp specific values.
     };
 
     enum ApplicationSpecial {
         NoSpecial = 0,
         NoAdvancedText = 1
     };
 
     /**
      * Constructor.
      * @param parent the parent QObject, used for memory management.
      */
     explicit KoCanvasResourceManager(QObject *parent = 0);
     virtual ~KoCanvasResourceManager();
 
 public Q_SLOTS:
     /**
      * Set a resource of any type.
      * @param key the integer key
      * @param value the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource
      */
     void setResource(int key, const QVariant &value);
 
     /**
      * Set a resource of type KoColor.
      * @param key the integer key
      * @param color the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource
      */
     void setResource(int key, const KoColor &color);
 
     /**
      * Set a resource of type KoShape*.
      * @param key the integer key
      * @param id the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource
      */
     void setResource(int key, KoShape *shape);
 
     /**
      * Set a resource of type KoUnit
      * @param key the integer key
      * @param id the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource
      */
     void setResource(int key, const KoUnit &unit);
 
 public:
     /**
      * Returns a qvariant containing the specified resource or a standard one if the
      * specified resource does not exist.
      * @param key the key
      * @see KoCanvasResourceManager::CanvasResource
      */
     QVariant resource(int key) const;
 
     /**
      * Set the foregroundColor resource.
      * @param color the new foreground color
      */
     void setForegroundColor(const KoColor &color);
 
     /**
      * Return the foregroundColor
      */
     KoColor foregroundColor() const;
 
     /**
      * Set the backgroundColor resource.
      * @param color the new background color
      */
     void setBackgroundColor(const KoColor &color);
     /**
      * Return the backgroundColor
      */
     KoColor backgroundColor() const;
 
     /// Sets the stroke resource
     void setActiveStroke(const KoShapeStroke &stroke);
 
     /// Returns the stroke resource
     KoShapeStroke activeStroke() const;
 
     /**
      * Return the resource determined by param key as a boolean.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     bool boolResource(int key) const;
 
     /**
      * Return the resource determined by param key as an integer.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     int intResource(int key) const;
 
     /**
      * Return the resource determined by param key as a KoColor.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     KoColor koColorResource(int key) const;
 
     /**
      * Return the resource determined by param key as a pointer to a KoShape.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     KoShape *koShapeResource(int key) const;
 
     /**
      * Return the resource determined by param key as a QString .
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     QString stringResource(int key) const;
 
     /**
      * Return the resource determined by param key as a QSizeF.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     QSizeF sizeResource(int key) const;
 
     /**
      * Return the resource determined by param key as a KoUnit.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     KoUnit unitResource(int key) const;
 
     /**
      * Returns true if there is a resource set with the requested key.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource
      */
     bool hasResource(int key) const;
 
     /**
      * Remove the resource with @p key from the provider.
      * @param key the key that will be used to remove the resource
      * There will be a signal emitted with a variable that will return true on QVariable::isNull();
      * @see KoCanvasResourceManager::CanvasResource
      */
     void clearResource(int key);
 
     /**
      * @see KoReosurceManager::addDerivedResourceConverter()
      */
     void addDerivedResourceConverter(KoDerivedResourceConverterSP converter);
 
     /**
      * @see KoReosurceManager::hasDerivedResourceConverter()
      */
     bool hasDerivedResourceConverter(int key);
 
     /**
      * @see KoReosurceManager::removeDerivedResourceConverter()
      */
     void removeDerivedResourceConverter(int key);
 
+    /**
+     * @see KoReosurceManager::addResourceUpdateMediator
+     */
+    void addResourceUpdateMediator(KoResourceUpdateMediatorSP mediator);
+
+    /**
+     * @see KoReosurceManager::hasResourceUpdateMediator
+     */
+    bool hasResourceUpdateMediator(int key);
+
+    /**
+
+     * @see KoReosurceManager::removeResourceUpdateMediator
+     */
+    void removeResourceUpdateMediator(int key);
+
 Q_SIGNALS:
     /**
      * This signal is emitted every time a resource is set that is either
      * new or different from the previous set value.
      * @param key the indentifying key for the resource
      * @param value the variants new value.
      * @see KoCanvasResourceManager::CanvasResource
      */
     void canvasResourceChanged(int key, const QVariant &value);
 
 private:
     KoCanvasResourceManager(const KoCanvasResourceManager&);
     KoCanvasResourceManager& operator=(const KoCanvasResourceManager&);
 
     class Private;
     Private *const d;
 };
 
 #endif
diff --git a/libs/flake/KoDerivedResourceConverter.cpp b/libs/flake/KoDerivedResourceConverter.cpp
index 1ae9f1c111..93b59c88d0 100644
--- a/libs/flake/KoDerivedResourceConverter.cpp
+++ b/libs/flake/KoDerivedResourceConverter.cpp
@@ -1,52 +1,93 @@
 /*
  *  Copyright (c) 2016 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 "KoDerivedResourceConverter.h"
 
 #include "QVariant"
-
+#include "kis_assert.h"
 
 struct KoDerivedResourceConverter::Private
 {
     Private(int _key, int _sourceKey)
         : key(_key), sourceKey(_sourceKey) {}
 
     int key;
     int sourceKey;
+
+    QVariant lastKnownValue;
 };
 
 
 KoDerivedResourceConverter::KoDerivedResourceConverter(int key, int sourceKey)
     : m_d(new Private(key, sourceKey))
 {
 }
 
 KoDerivedResourceConverter::~KoDerivedResourceConverter()
 {
 }
 
 int KoDerivedResourceConverter::key() const
 {
     return m_d->key;
 }
 
 int KoDerivedResourceConverter::sourceKey() const
 {
     return m_d->sourceKey;
 }
 
+bool KoDerivedResourceConverter::notifySourceChanged(const QVariant &sourceValue)
+{
+    const QVariant newValue = fromSource(sourceValue);
+
+    const bool valueChanged = m_d->lastKnownValue != newValue;
+    m_d->lastKnownValue = newValue;
+
+    return valueChanged;
+}
+
+QVariant KoDerivedResourceConverter::readFromSource(const QVariant &sourceValue)
+{
+    const QVariant result = fromSource(sourceValue);
+
+    KIS_SAFE_ASSERT_RECOVER_NOOP(m_d->lastKnownValue.isNull() ||
+                                 result == m_d->lastKnownValue);
+
+    m_d->lastKnownValue = result;
+
+    return m_d->lastKnownValue;
+}
+
+QVariant KoDerivedResourceConverter::writeToSource(const QVariant &value,
+                                                   const QVariant &sourceValue,
+                                                   bool *changed)
+{
+    if (changed) {
+        *changed = m_d->lastKnownValue != value;
+    }
+
+    QVariant newSourceValue = sourceValue;
+
+    if (*changed || value != fromSource(sourceValue)) {
+        m_d->lastKnownValue = value;
+        newSourceValue = toSource(value, sourceValue);
+    }
+
+    return newSourceValue;
+}
diff --git a/libs/flake/KoDerivedResourceConverter.h b/libs/flake/KoDerivedResourceConverter.h
index ffffbc212d..8cf03b9f34 100644
--- a/libs/flake/KoDerivedResourceConverter.h
+++ b/libs/flake/KoDerivedResourceConverter.h
@@ -1,71 +1,79 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
 #ifndef __KO_DERIVED_RESOURCE_CONVERTER_H
 #define __KO_DERIVED_RESOURCE_CONVERTER_H
 
 #include <QScopedPointer>
 #include <QSharedPointer>
 #include "kritaflake_export.h"
 
 class QVariant;
 
 /**
  * \class KoDerivedResourceConverter
  *
  * Defines the abstraction of a derived resource. It should be
  * uploaded to the KoResourceManager during loading phase. The manager
  * will use it to convert values to/from the source resource.
  */
 
 class KRITAFLAKE_EXPORT KoDerivedResourceConverter
 {
 public:
     /**
      * \param key the unique id of the resource defined by this
      *            converter
      *
      * \param sourceKey the id of the parent resource, i.e. where the
      *                  values are really loaded/saved.
      */
     KoDerivedResourceConverter(int key, int sourceKey);
     virtual ~KoDerivedResourceConverter();
 
     int key() const;
     int sourceKey() const;
 
+    QVariant readFromSource(const QVariant &value);
+    QVariant writeToSource(const QVariant &value,
+                           const QVariant &sourceValue,
+                           bool *changed);
+
+    virtual bool notifySourceChanged(const QVariant &sourceValue);
+
+protected:
     /**
      * Converts the \p value of the source resource into the space of
      * the "derived" resource. E.g. preset -> opacity.
      */
     virtual QVariant fromSource(const QVariant &value) = 0;
 
     /**
      * Converts the value of the "derived" resource into the space of the
      * original ("source") resource. E.g. opacity -> preset.
      */
     virtual QVariant toSource(const QVariant &value, const QVariant &sourceValue) = 0;
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
 typedef QSharedPointer<KoDerivedResourceConverter> KoDerivedResourceConverterSP;
 
 #endif /* __KO_DERIVED_RESOURCE_CONVERTER_H */
diff --git a/libs/flake/KoResourceManager_p.cpp b/libs/flake/KoResourceManager_p.cpp
index ad8b11d50f..eeca376054 100644
--- a/libs/flake/KoResourceManager_p.cpp
+++ b/libs/flake/KoResourceManager_p.cpp
@@ -1,196 +1,239 @@
 /*
    Copyright (c) 2006, 2011 Boudewijn Rempt (boud@valdyas.org)
    Copyright (C) 2007, 2010 Thomas Zander <zander@kde.org>
    Copyright (c) 2008 Carlos Licea <carlos.licea@kdemail.net>
    Copyright (c) 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 "KoResourceManager_p.h"
 
 #include <QVariant>
 #include <FlakeDebug.h>
 
 #include "KoShape.h"
+#include "kis_assert.h"
+#include "kis_debug.h"
 
-void KoResourceManager::setResource(int key, const QVariant &value)
+void KoResourceManager::slotResourceInternalsChanged(int key)
 {
-    QVariant realValue = value;
-    int realKey = key;
-    QVariant currentValue = m_resources.value(key, QVariant());
+    KIS_SAFE_ASSERT_RECOVER_RETURN(m_resources.contains(key));
+    notifyDerivedResourcesChanged(key, m_resources[key]);
+}
 
+void KoResourceManager::setResource(int key, const QVariant &value)
+{
     KoDerivedResourceConverterSP converter =
         m_derivedResources.value(key, KoDerivedResourceConverterSP());
 
     if (converter) {
-        realKey = converter->sourceKey();
-        currentValue = m_resources.value(realKey, QVariant());
-        realValue = converter->toSource(value, currentValue);
-    }
+        const int sourceKey = converter->sourceKey();
+        const QVariant oldSourceValue = m_resources.value(sourceKey, QVariant());
+
+        bool valueChanged = false;
+        const QVariant newSourceValue = converter->writeToSource(value, oldSourceValue, &valueChanged);
+
+        if (valueChanged) {
+            notifyResourceChanged(key, value);
+        }
+
+        if (oldSourceValue != newSourceValue) {
+            m_resources[sourceKey] = newSourceValue;
+            notifyResourceChanged(sourceKey, newSourceValue);
+        }
 
-    if (m_resources.contains(realKey)) {
-        if (!converter && currentValue == realValue)
-            return;
-        m_resources[realKey] = realValue;
     } else {
-        m_resources.insert(realKey, realValue);
-    }
+        const QVariant oldValue = m_resources.value(key, QVariant());
+        m_resources[key] = value;
 
-    notifyResourceChanged(key, value);
+        if (m_updateMediators.contains(key)) {
+            m_updateMediators[key]->connectResource(value);
+        }
+
+        if (oldValue != value) {
+            notifyResourceChanged(key, value);
+        }
+    }
 }
 
 void KoResourceManager::notifyResourceChanged(int key, const QVariant &value)
 {
     emit resourceChanged(key, value);
+    notifyDerivedResourcesChanged(key, value);
+}
 
+void KoResourceManager::notifyDerivedResourcesChanged(int key, const QVariant &value)
+{
     QMultiHash<int, KoDerivedResourceConverterSP>::const_iterator it = m_derivedFromSource.constFind(key);
     QMultiHash<int, KoDerivedResourceConverterSP>::const_iterator end = m_derivedFromSource.constEnd();
 
     while (it != end && it.key() == key) {
         KoDerivedResourceConverterSP converter = it.value();
-        notifyResourceChanged(converter->key(), converter->fromSource(value));
+
+        if (converter->notifySourceChanged(value)) {
+            notifyResourceChanged(converter->key(), converter->readFromSource(value));
+        }
+
         it++;
     }
 }
 
 QVariant KoResourceManager::resource(int key) const
 {
     KoDerivedResourceConverterSP converter =
         m_derivedResources.value(key, KoDerivedResourceConverterSP());
 
     const int realKey = converter ? converter->sourceKey() : key;
     QVariant value = m_resources.value(realKey, QVariant());
 
-    return converter ? converter->fromSource(value) : value;
+    return converter ? converter->readFromSource(value) : value;
 }
 
 void KoResourceManager::setResource(int key, const KoColor &color)
 {
     QVariant v;
     v.setValue(color);
     setResource(key, v);
 }
 
 void KoResourceManager::setResource(int key, KoShape *shape)
 {
     QVariant v;
     v.setValue(shape);
     setResource(key, v);
 }
 
 void KoResourceManager::setResource(int key, const KoUnit &unit)
 {
     QVariant v;
     v.setValue(unit);
     setResource(key, v);
 }
 
 KoColor KoResourceManager::koColorResource(int key) const
 {
     if (! m_resources.contains(key)) {
         KoColor empty;
         return empty;
     }
     return resource(key).value<KoColor>();
 }
 
 KoShape *KoResourceManager::koShapeResource(int key) const
 {
     if (! m_resources.contains(key))
         return 0;
 
     return resource(key).value<KoShape *>();
 }
 
 
 KoUnit KoResourceManager::unitResource(int key) const
 {
     return resource(key).value<KoUnit>();
 }
 
 bool KoResourceManager::boolResource(int key) const
 {
     if (! m_resources.contains(key))
         return false;
     return m_resources[key].toBool();
 }
 
 int KoResourceManager::intResource(int key) const
 {
     if (! m_resources.contains(key))
         return 0;
     return m_resources[key].toInt();
 }
 
 QString KoResourceManager::stringResource(int key) const
 {
     if (! m_resources.contains(key)) {
         QString empty;
         return empty;
     }
     return qvariant_cast<QString>(resource(key));
 }
 
 QSizeF KoResourceManager::sizeResource(int key) const
 {
     if (! m_resources.contains(key)) {
         QSizeF empty;
         return empty;
     }
     return qvariant_cast<QSizeF>(resource(key));
 }
 
 bool KoResourceManager::hasResource(int key) const
 {
     KoDerivedResourceConverterSP converter =
         m_derivedResources.value(key, KoDerivedResourceConverterSP());
 
     const int realKey = converter ? converter->sourceKey() : key;
     return m_resources.contains(realKey);
 }
 
 void KoResourceManager::clearResource(int key)
 {
     // we cannot remove a derived resource
     if (m_derivedResources.contains(key)) return;
 
     if (m_resources.contains(key)) {
         m_resources.remove(key);
         notifyResourceChanged(key, QVariant());
     }
 }
 
 void KoResourceManager::addDerivedResourceConverter(KoDerivedResourceConverterSP converter)
 {
-    Q_ASSERT(!m_derivedResources.contains(converter->key()));
+    KIS_SAFE_ASSERT_RECOVER_NOOP(!m_derivedResources.contains(converter->key()));
 
     m_derivedResources.insert(converter->key(), converter);
     m_derivedFromSource.insertMulti(converter->sourceKey(), converter);
 }
 
 bool KoResourceManager::hasDerivedResourceConverter(int key)
 {
     return m_derivedResources.contains(key);
 }
 
 void KoResourceManager::removeDerivedResourceConverter(int key)
 {
     Q_ASSERT(m_derivedResources.contains(key));
 
     KoDerivedResourceConverterSP converter = m_derivedResources.value(key);
     m_derivedResources.remove(key);
     m_derivedFromSource.remove(converter->sourceKey(), converter);
 }
+
+void KoResourceManager::addResourceUpdateMediator(KoResourceUpdateMediatorSP mediator)
+{
+    KIS_SAFE_ASSERT_RECOVER_NOOP(!m_updateMediators.contains(mediator->key()));
+    m_updateMediators.insert(mediator->key(), mediator);
+    connect(mediator.data(), SIGNAL(sigResourceChanged(int)), SLOT(slotResourceInternalsChanged(int)));
+}
+
+bool KoResourceManager::hasResourceUpdateMediator(int key)
+{
+    return m_updateMediators.contains(key);
+}
+
+void KoResourceManager::removeResourceUpdateMediator(int key)
+{
+    KIS_SAFE_ASSERT_RECOVER_RETURN(m_updateMediators.contains(key));
+    m_updateMediators.remove(key);
+}
diff --git a/libs/flake/KoResourceManager_p.h b/libs/flake/KoResourceManager_p.h
index d58fc52b9d..f29d3f82b0 100644
--- a/libs/flake/KoResourceManager_p.h
+++ b/libs/flake/KoResourceManager_p.h
@@ -1,192 +1,220 @@
 /*
    Copyright (c) 2006, 2011 Boudewijn Rempt (boud@valdyas.org)
    Copyright (C) 2007, 2009, 2010 Thomas Zander <zander@kde.org>
    Copyright (c) 2008 Carlos Licea <carlos.licea@kdemail.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.
  */
 #ifndef KO_RESOURCEMANAGER_P_H
 #define KO_RESOURCEMANAGER_P_H
 
 #include <QObject>
 #include <QSizeF>
 #include <QHash>
 
 #include "kritaflake_export.h"
 #include <KoColor.h>
 #include <KoUnit.h>
 #include "KoDerivedResourceConverter.h"
+#include "KoResourceUpdateMediator.h"
+
 
 class KoShape;
 class QVariant;
 
 class KRITAFLAKE_EXPORT KoResourceManager : public QObject
 {
     Q_OBJECT
 public:
 
     KoResourceManager() {}
 
     /**
      * Set a resource of any type.
      * @param key the integer key
      * @param value the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     void setResource(int key, const QVariant &value);
 
     /**
      * Set a resource of type KoColor.
      * @param key the integer key
      * @param color the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     void setResource(int key, const KoColor &color);
 
     /**
      * Set a resource of type KoShape*.
      * @param key the integer key
      * @param id the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     void setResource(int key, KoShape *shape);
 
     /**
      * Set a resource of type KoUnit
      * @param key the integer key
      * @param id the new value for the key.
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     void setResource(int key, const KoUnit &unit);
 
     /**
      * Returns a qvariant containing the specified resource or a standard one if the
      * specified resource does not exist.
      * @param key the key
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     QVariant resource(int key) const;
 
     /**
      * Return the resource determined by param key as a boolean.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     bool boolResource(int key) const;
 
     /**
      * Return the resource determined by param key as an integer.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     int intResource(int key) const;
 
     /**
      * Return the resource determined by param key as a KoColor.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     KoColor koColorResource(int key) const;
 
     /**
      * Return the resource determined by param key as a pointer to a KoShape.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     KoShape *koShapeResource(int key) const;
 
     /**
      * Return the resource determined by param key as a QString .
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     QString stringResource(int key) const;
 
     /**
      * Return the resource determined by param key as a QSizeF.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     QSizeF sizeResource(int key) const;
 
     /**
      * Return the resource determined by param key as a KoUnit.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     KoUnit unitResource(int key) const;
 
     /**
      * Returns true if there is a resource set with the requested key.
      * @param key the indentifying key for the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     bool hasResource(int key) const;
 
     /**
      * Remove the resource with @p key from the provider.
      * @param key the key that will be used to remove the resource
      * @see KoCanvasResourceManager::CanvasResource KoDocumentResourceManager::DocumentResource
      */
     void clearResource(int key);
 
     /**
-     * Some of the resources may be "derive" from the other. For
+     * Some of the resources may be "derived" from the others. For
      * example opacity, composite op and erase mode properties are
      * contained inside a paintop preset, so we need not create a
      * separate resource for them. Instead we created a derived resource,
      * that loads/saves values from/to another resource, but has its own
      * "resource changed" signal (via a different key).
      *
      * When a parent resource changes, the resource manager emits
-     * update signals for all its derived resources. 
+     * update signals for all its derived resources.
      */
     void addDerivedResourceConverter(KoDerivedResourceConverterSP converter);
 
     /**
      * @return true if the resource with \p key is a derived resource
      *         (has a converter installed)
      *
      * @see addDerivedResourceConverter()
      */
     bool hasDerivedResourceConverter(int key);
 
     /**
      * Removes a derived resource converter. If you rty to add a
      * resource with \p key it will be treated as a usual resource.
      *
      * @see addDerivedResourceConverter()
      */
     void removeDerivedResourceConverter(int key);
 
+    /**
+     * Some resources can "mutate", that is their value doesn't change
+     * (a pointer), whereas the contents changes. But we should still
+     * notify all the derived resources subscribers that the resource
+     * has changed. For that purpose we use a special mediator class
+     * that connects the resource (which is not a QObject at all) and
+     * the resource manager controls that connection.
+     */
+    void addResourceUpdateMediator(KoResourceUpdateMediatorSP mediator);
+
+    /**
+     * \see addResourceUpdateMediator()
+     */
+    bool hasResourceUpdateMediator(int key);
+
+    /**
+     * \see addResourceUpdateMediator()
+     */
+    void removeResourceUpdateMediator(int key);
+
 Q_SIGNALS:
     void resourceChanged(int key, const QVariant &value);
 
 private:
     void notifyResourceChanged(int key, const QVariant &value);
+    void notifyDerivedResourcesChanged(int key, const QVariant &value);
+
+private Q_SLOTS:
+    void slotResourceInternalsChanged(int key);
 
 private:
     KoResourceManager(const KoResourceManager&);
     KoResourceManager& operator=(const KoResourceManager&);
 
     QHash<int, QVariant> m_resources;
 
     QHash<int, KoDerivedResourceConverterSP> m_derivedResources;
     QMultiHash<int, KoDerivedResourceConverterSP> m_derivedFromSource;
+
+    QHash<int, KoResourceUpdateMediatorSP> m_updateMediators;
 };
 
 #endif
 
diff --git a/plugins/paintops/particle/kis_particle_paintop_settings.h b/libs/flake/KoResourceUpdateMediator.cpp
similarity index 64%
copy from plugins/paintops/particle/kis_particle_paintop_settings.h
copy to libs/flake/KoResourceUpdateMediator.cpp
index bdc68793c8..1a641be458 100644
--- a/plugins/paintops/particle/kis_particle_paintop_settings.h
+++ b/libs/flake/KoResourceUpdateMediator.cpp
@@ -1,35 +1,41 @@
 /*
- *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
+ *  Copyright (c) 2016 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.
  */
 
-#ifndef KIS_PARTICLE_PAINTOP_SETTINGS_H_
-#define KIS_PARTICLE_PAINTOP_SETTINGS_H_
+#include "KoResourceUpdateMediator.h"
 
-#include <brushengine/kis_paintop_settings.h>
-#include <kis_types.h>
 
-class KisParticlePaintOpSettings : public KisPaintOpSettings
+struct KoResourceUpdateMediator::Private
 {
+    Private(int _key) : key(_key) {}
+    int key;
+};
 
-public:
-    bool paintIncremental();
-    bool isAirbrushing() const;
-    int rate() const;
 
-};
+KoResourceUpdateMediator::KoResourceUpdateMediator(int key)
+    : m_d(new Private(key))
+{
+}
 
-#endif
+KoResourceUpdateMediator::~KoResourceUpdateMediator()
+{
+}
+
+int KoResourceUpdateMediator::key() const
+{
+    return m_d->key;
+}
diff --git a/libs/flake/KoResourceUpdateMediator.h b/libs/flake/KoResourceUpdateMediator.h
new file mode 100644
index 0000000000..602df7443d
--- /dev/null
+++ b/libs/flake/KoResourceUpdateMediator.h
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KO_RESOURCE_UPDATE_MEDIATOR_H
+#define __KO_RESOURCE_UPDATE_MEDIATOR_H
+
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include "kritaflake_export.h"
+
+/**
+ * A special mediator class that connects the resource and the
+ * resource manager.  The resource manager connects to a
+ * sigResourceChanged() changed and when a resource changes, the
+ * manager calls connectResource() for this resource. After that, the
+ * mediator should notify the manager about every change that happens
+ * to the resource by emitting the corresponding signal.
+ *
+ * There is only one mediator for one type (key) of the resource.
+ */
+
+class KRITAFLAKE_EXPORT KoResourceUpdateMediator : public QObject
+{
+    Q_OBJECT
+public:
+    KoResourceUpdateMediator(int key);
+    virtual ~KoResourceUpdateMediator();
+
+    int key() const;
+    virtual void connectResource(QVariant sourceResource) = 0;
+
+Q_SIGNALS:
+    void sigResourceChanged(int key);
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+};
+
+typedef QSharedPointer<KoResourceUpdateMediator> KoResourceUpdateMediatorSP;
+
+#endif /* __KO_RESOURCE_UPDATE_MEDIATOR_H */
diff --git a/libs/flake/tests/TestResourceManager.cpp b/libs/flake/tests/TestResourceManager.cpp
index 9f9d2b5bf5..bd31773b43 100644
--- a/libs/flake/tests/TestResourceManager.cpp
+++ b/libs/flake/tests/TestResourceManager.cpp
@@ -1,144 +1,389 @@
 /* This file is part of the KDE project
    Copyright (C) 2008 Thorsten Zachmann <zachmann@kde.org>
 
    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 "TestResourceManager.h"
 
 #include "KoCanvasResourceManager.h"
 #include "KoResourceManager_p.h"
 #include "KoPathShape.h"
 #include "KoUnit.h"
 #include <QSignalSpy>
 #include <QTest>
 
+#include "kis_debug.h"
+
 void TestResourceManager::koShapeResource()
 {
     KoPathShape * shape = new KoPathShape();
     int key = 9001;
 
     KoCanvasResourceManager rp( 0 );
     rp.setResource( key, shape );
     QVERIFY( shape == rp.koShapeResource( key ) );
 }
 
 void TestResourceManager::testUnitChanged()
 {
     KoCanvasResourceManager rm(0);
     QSignalSpy spy(&rm, SIGNAL(canvasResourceChanged(int, const QVariant &)));
 
     KoUnit a;
     rm.setResource(KoCanvasResourceManager::Unit, a);
     QCOMPARE(spy.count(), 1);
 
     KoUnit b(KoUnit::Millimeter);
     rm.setResource(KoCanvasResourceManager::Unit, b);
     QCOMPARE(spy.count(), 2);
 }
 
 #include "kis_global.h"
 
 struct DerivedResource : public KoDerivedResourceConverter
 {
     DerivedResource(int key, int sourceKey) : KoDerivedResourceConverter(key, sourceKey) {}
 
     QVariant fromSource(const QVariant &value) {
         return value.toInt() + 10;
     }
 
     QVariant toSource(const QVariant &value, const QVariant &sourceValue) {
         Q_UNUSED(sourceValue);
         return value.toInt() - 10;
     }
 };
 
 void TestResourceManager::testConverters()
 {
     KoResourceManager m;
 
     const int key1 = 1;
     const int key2 = 2;
     const int derivedKey = 3;
 
     m.setResource(key1, 1);
     m.setResource(key2, 2);
 
     QCOMPARE(m.resource(key1).toInt(), 1);
     QCOMPARE(m.resource(key2).toInt(), 2);
     QVERIFY(!m.hasResource(derivedKey));
 
     m.addDerivedResourceConverter(toQShared(new DerivedResource(derivedKey, key2)));
 
     QCOMPARE(m.resource(derivedKey).toInt(), 12);
     QVERIFY(m.hasResource(derivedKey));
 
     m.setResource(derivedKey, 15);
 
     QCOMPARE(m.resource(key2).toInt(), 5);
     QCOMPARE(m.resource(derivedKey).toInt(), 15);
 
     QVERIFY(m.hasResource(derivedKey));
     m.clearResource(derivedKey);
     QVERIFY(m.hasResource(derivedKey));
     m.clearResource(key2);
     QVERIFY(!m.hasResource(derivedKey));
 }
 
 void TestResourceManager::testDerivedChanged()
 {
     // const int key1 = 1;
     const int key2 = 2;
     const int derivedKey = 3;
     const int otherDerivedKey = 4;
 
     KoCanvasResourceManager m(0);
     m.addDerivedResourceConverter(toQShared(new DerivedResource(derivedKey, key2)));
     m.addDerivedResourceConverter(toQShared(new DerivedResource(otherDerivedKey, key2)));
 
     m.setResource(derivedKey, 15);
 
     QCOMPARE(m.resource(key2).toInt(), 5);
     QCOMPARE(m.resource(derivedKey).toInt(), 15);
 
     QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int, const QVariant &)));
 
     m.setResource(derivedKey, 16);
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.count(), 3);
     QList<QVariant> args;
 
     args = spy[0];
     QCOMPARE(args[0].toInt(), derivedKey);
     QCOMPARE(args[1].toInt(), 16);
 
+    args = spy[1];
+    QCOMPARE(args[0].toInt(), key2);
+    QCOMPARE(args[1].toInt(), 6);
+
+    args = spy[2];
+    QCOMPARE(args[0].toInt(), otherDerivedKey);
+    QCOMPARE(args[1].toInt(), 16);
+
+    spy.clear();
+
     m.setResource(key2, 7);
-    QCOMPARE(spy.count(), 4);
+    QCOMPARE(spy.count(), 3);
 
-    args = spy[1];
+    args = spy[0];
     QCOMPARE(args[0].toInt(), key2);
     QCOMPARE(args[1].toInt(), 7);
 
-    args = spy[2];
+    args = spy[1];
     QCOMPARE(args[0].toInt(), otherDerivedKey);
     QCOMPARE(args[1].toInt(), 17);
 
-    args = spy[3];
+    args = spy[2];
     QCOMPARE(args[0].toInt(), derivedKey);
     QCOMPARE(args[1].toInt(), 17);
 }
 
+struct ComplexResource {
+    QHash<int, QVariant> m_resources;
+};
+
+typedef QSharedPointer<ComplexResource> ComplexResourceSP;
+Q_DECLARE_METATYPE(ComplexResourceSP);
+
+struct ComplexConverter : public KoDerivedResourceConverter
+{
+    ComplexConverter(int key, int sourceKey) : KoDerivedResourceConverter(key, sourceKey) {}
+
+    QVariant fromSource(const QVariant &value) {
+        KIS_ASSERT(value.canConvert<ComplexResourceSP>());
+        ComplexResourceSP res = value.value<ComplexResourceSP>();
+
+        return res->m_resources[key()];
+    }
+
+    QVariant toSource(const QVariant &value, const QVariant &sourceValue) {
+        KIS_ASSERT(sourceValue.canConvert<ComplexResourceSP>());
+        ComplexResourceSP res = sourceValue.value<ComplexResourceSP>();
+
+        res->m_resources[key()] = value;
+        return QVariant::fromValue(res);
+    }
+};
+
+struct ComplexMediator : public KoResourceUpdateMediator
+{
+    ComplexMediator(int key) : KoResourceUpdateMediator(key) {}
+
+    void connectResource(QVariant sourceResource) {
+        m_res = sourceResource;
+    }
+
+    void forceNotify() {
+        emit sigResourceChanged(key());
+    }
+
+    QVariant m_res;
+};
+typedef QSharedPointer<ComplexMediator> ComplexMediatorSP;
+
+void TestResourceManager::testComplexResource()
+{
+    const int key = 2;
+    const int complex1 = 3;
+    const int complex2 = 4;
+
+    KoCanvasResourceManager m(0);
+    m.addDerivedResourceConverter(toQShared(new ComplexConverter(complex1, key)));
+    m.addDerivedResourceConverter(toQShared(new ComplexConverter(complex2, key)));
+
+    ComplexMediatorSP mediator(new ComplexMediator(key));
+    m.addResourceUpdateMediator(mediator);
+
+    QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int, const QVariant &)));
+
+    ComplexResourceSP r1(new ComplexResource());
+    r1->m_resources[complex1] = 10;
+    r1->m_resources[complex2] = 20;
+
+    ComplexResourceSP r2(new ComplexResource());
+    r2->m_resources[complex1] = 15;
+    r2->m_resources[complex2] = 25;
+
+
+    // ####################################################
+    // Initial assignment
+    // ####################################################
+    m.setResource(key, QVariant::fromValue(r1));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 20);
+
+    QCOMPARE(spy[0][0].toInt(), key);
+    QCOMPARE(spy[0][1].value<ComplexResourceSP>(), r1);
+    QCOMPARE(spy[1][0].toInt(), complex2);
+    QCOMPARE(spy[1][1].toInt(), 20);
+    QCOMPARE(spy[2][0].toInt(), complex1);
+    QCOMPARE(spy[2][1].toInt(), 10);
+    spy.clear();
+
+    // ####################################################
+    // Change the whole resource
+    // ####################################################
+    m.setResource(key, QVariant::fromValue(r2));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(complex1).toInt(), 15);
+    QCOMPARE(m.resource(complex2).toInt(), 25);
+
+    QCOMPARE(spy[0][0].toInt(), key);
+    QCOMPARE(spy[0][1].value<ComplexResourceSP>(), r2);
+    QCOMPARE(spy[1][0].toInt(), complex2);
+    QCOMPARE(spy[1][1].toInt(), 25);
+    QCOMPARE(spy[2][0].toInt(), complex1);
+    QCOMPARE(spy[2][1].toInt(), 15);
+    spy.clear();
+
+    // ####################################################
+    // Change a derived resource
+    // ####################################################
+    m.setResource(complex1, 16);
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(complex1).toInt(), 16);
+    QCOMPARE(m.resource(complex2).toInt(), 25);
+
+    QCOMPARE(spy[0][0].toInt(), complex1);
+    QCOMPARE(spy[0][1].toInt(), 16);
+    spy.clear();
+
+    // ####################################################
+    // Change another derived resource
+    // ####################################################
+    m.setResource(complex2, 26);
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(complex1).toInt(), 16);
+    QCOMPARE(m.resource(complex2).toInt(), 26);
+
+    QCOMPARE(spy[0][0].toInt(), complex2);
+    QCOMPARE(spy[0][1].toInt(), 26);
+    spy.clear();
+
+    // ####################################################
+    // Switch back the whole source resource
+    // ####################################################
+    m.setResource(key, QVariant::fromValue(r1));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 20);
+
+    QCOMPARE(spy[0][0].toInt(), key);
+    QCOMPARE(spy[0][1].value<ComplexResourceSP>(), r1);
+    QCOMPARE(spy[1][0].toInt(), complex2);
+    QCOMPARE(spy[1][1].toInt(), 20);
+    QCOMPARE(spy[2][0].toInt(), complex1);
+    QCOMPARE(spy[2][1].toInt(), 10);
+    spy.clear();
+
+    // ####################################################
+    // The value keep unchanged case!
+    // ####################################################
+    m.setResource(complex1, 10);
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 20);
+
+    QCOMPARE(spy.size(), 0);
+    spy.clear();
+
+    // ####################################################
+    // While switching a complex resource one derived value
+    // is kept unchanged
+    // ####################################################
+    r2->m_resources[complex1] = 10;
+    m.setResource(key, QVariant::fromValue(r2));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r2);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 26);
+
+    QCOMPARE(spy[0][0].toInt(), key);
+    QCOMPARE(spy[0][1].value<ComplexResourceSP>(), r2);
+    QCOMPARE(spy[1][0].toInt(), complex2);
+    QCOMPARE(spy[1][1].toInt(), 26);
+    spy.clear();
+
+    // ####################################################
+    // No devived values are changed!
+    // ####################################################
+    *r1 = *r2;
+    m.setResource(key, QVariant::fromValue(r1));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 26);
+
+    QCOMPARE(spy[0][0].toInt(), key);
+    QCOMPARE(spy[0][1].value<ComplexResourceSP>(), r1);
+    spy.clear();
+
+    // ####################################################
+    // Try to set the same pointer. No signals emitted!
+    // ####################################################
+    m.setResource(key, QVariant::fromValue(r1));
+
+    QCOMPARE(mediator->m_res.value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(key).value<ComplexResourceSP>(), r1);
+    QCOMPARE(m.resource(complex1).toInt(), 10);
+    QCOMPARE(m.resource(complex2).toInt(), 26);
+
+    QCOMPARE(spy.size(), 0);
+    spy.clear();
+
+
+    // ####################################################
+    // Internals 'officially' changed, but the values not
+    // ####################################################
+    mediator->forceNotify();
+
+    QCOMPARE(spy.size(), 0);
+    spy.clear();
+
+    // ####################################################
+    // We changed the values, but didn't notify anyone :)
+    // ####################################################
+    r1->m_resources[complex1] = 11;
+    r1->m_resources[complex2] = 21;
+
+    mediator->forceNotify();
+
+    QCOMPARE(spy[0][0].toInt(), complex2);
+    QCOMPARE(spy[0][1].toInt(), 21);
+    QCOMPARE(spy[1][0].toInt(), complex1);
+    QCOMPARE(spy[1][1].toInt(), 11);
+    spy.clear();
+}
+
+
 QTEST_MAIN(TestResourceManager)
diff --git a/libs/flake/tests/TestResourceManager.h b/libs/flake/tests/TestResourceManager.h
index a0ef6826ae..947361db43 100644
--- a/libs/flake/tests/TestResourceManager.h
+++ b/libs/flake/tests/TestResourceManager.h
@@ -1,35 +1,36 @@
 /* This file is part of the KDE project
    Copyright (C) 2008 Thorsten Zachmann <zachmann@kde.org>
 
    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.
 */
 
 #ifndef TESTRESOURCEMANAGER_H
 #define TESTRESOURCEMANAGER_H
 
 #include <QObject>
 
 class TestResourceManager : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void koShapeResource();
     void testUnitChanged();
     void testConverters();
     void testDerivedChanged();
+    void testComplexResource();
 };
 
 #endif // TESTRESOURCEMANAGER_H
diff --git a/libs/global/kis_dom_utils.cpp b/libs/global/kis_dom_utils.cpp
index e0e47e8c34..206afecbed 100644
--- a/libs/global/kis_dom_utils.cpp
+++ b/libs/global/kis_dom_utils.cpp
@@ -1,264 +1,275 @@
 /*
  *  Copyright (c) 2014 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_dom_utils.h"
 
 #include <QTransform>
 
 #include "kis_debug.h"
 
 namespace KisDomUtils {
 
 void saveValue(QDomElement *parent, const QString &tag, const QSize &size)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "size");
 
     e.setAttribute("w", toString(size.width()));
     e.setAttribute("h", toString(size.height()));
 }
 
 void saveValue(QDomElement *parent, const QString &tag, const QRect &rc)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "rect");
 
     e.setAttribute("x", toString(rc.x()));
     e.setAttribute("y", toString(rc.y()));
     e.setAttribute("w", toString(rc.width()));
     e.setAttribute("h", toString(rc.height()));
 }
 
 void saveValue(QDomElement *parent, const QString &tag, const QPoint &pt)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "point");
 
     e.setAttribute("x", toString(pt.x()));
     e.setAttribute("y", toString(pt.y()));
 }
 
 void saveValue(QDomElement *parent, const QString &tag, const QPointF &pt)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "pointf");
 
     e.setAttribute("x", toString(pt.x()));
     e.setAttribute("y", toString(pt.y()));
 }
 
 void saveValue(QDomElement *parent, const QString &tag, const QVector3D &pt)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "vector3d");
 
     e.setAttribute("x", toString(pt.x()));
     e.setAttribute("y", toString(pt.y()));
     e.setAttribute("z", toString(pt.z()));
 }
 
 void saveValue(QDomElement *parent, const QString &tag, const QTransform &t)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "transform");
 
     e.setAttribute("m11", toString(t.m11()));
     e.setAttribute("m12", toString(t.m12()));
     e.setAttribute("m13", toString(t.m13()));
 
     e.setAttribute("m21", toString(t.m21()));
     e.setAttribute("m22", toString(t.m22()));
     e.setAttribute("m23", toString(t.m23()));
 
     e.setAttribute("m31", toString(t.m31()));
     e.setAttribute("m32", toString(t.m32()));
     e.setAttribute("m33", toString(t.m33()));
 }
 
 bool findOnlyElement(const QDomElement &parent, const QString &tag, QDomElement *el, QStringList *errorMessages)
 {
     QDomNodeList list = parent.elementsByTagName(tag);
     if (list.size() != 1 || !list.at(0).isElement()) {
         QString msg = i18n("Could not find \"%1\" XML tag in \"%2\"", tag, parent.tagName());
         if (errorMessages) {
             *errorMessages << msg;
         } else {
             warnKrita << msg;
         }
 
         return false;
     }
 
     *el = list.at(0).toElement();
     return true;
 }
 
+bool removeElements(QDomElement &parent, const QString &tag) {
+    QDomNodeList list = parent.elementsByTagName(tag);
+    KIS_SAFE_ASSERT_RECOVER_NOOP(list.size() <= 1);
+
+    for (int i = 0; i < list.size(); i++) {
+        parent.removeChild(list.at(i));
+    }
+
+    return list.size() > 0;
+}
+
 namespace Private {
     bool checkType(const QDomElement &e, const QString &expectedType)
     {
         QString type = e.attribute("type", "unknown-type");
         if (type != expectedType) {
             warnKrita << i18n("Error: incorrect type (%2) for value %1. Expected %3", e.tagName(), type, expectedType);
             return false;
         }
 
         return true;
     }
 }
 
 bool loadValue(const QDomElement &e, float *v)
 {
     if (!Private::checkType(e, "value")) return false;
     *v = toDouble(e.attribute("value", "0"));
     return true;
 }
 
 bool loadValue(const QDomElement &e, double *v)
 {
     if (!Private::checkType(e, "value")) return false;
     *v = toDouble(e.attribute("value", "0"));
     return true;
 }
 
 bool loadValue(const QDomElement &e, QSize *size)
 {
     if (!Private::checkType(e, "size")) return false;
 
     size->setWidth(toInt(e.attribute("w", "0")));
     size->setHeight(toInt(e.attribute("h", "0")));
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QRect *rc)
 {
     if (!Private::checkType(e, "rect")) return false;
 
     rc->setX(toInt(e.attribute("x", "0")));
     rc->setY(toInt(e.attribute("y", "0")));
     rc->setWidth(toInt(e.attribute("w", "0")));
     rc->setHeight(toInt(e.attribute("h", "0")));
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QPoint *pt)
 {
     if (!Private::checkType(e, "point")) return false;
 
     pt->setX(toInt(e.attribute("x", "0")));
     pt->setY(toInt(e.attribute("y", "0")));
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QPointF *pt)
 {
     if (!Private::checkType(e, "pointf")) return false;
 
     pt->setX(toDouble(e.attribute("x", "0")));
     pt->setY(toDouble(e.attribute("y", "0")));
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QVector3D *pt)
 {
     if (!Private::checkType(e, "vector3d")) return false;
 
     pt->setX(toDouble(e.attribute("x", "0")));
     pt->setY(toDouble(e.attribute("y", "0")));
     pt->setZ(toDouble(e.attribute("z", "0")));
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QTransform *t)
 {
     if (!Private::checkType(e, "transform")) return false;
 
     qreal m11 = toDouble(e.attribute("m11", "1.0"));
     qreal m12 = toDouble(e.attribute("m12", "0.0"));
     qreal m13 = toDouble(e.attribute("m13", "0.0"));
 
     qreal m21 = toDouble(e.attribute("m21", "0.0"));
     qreal m22 = toDouble(e.attribute("m22", "1.0"));
     qreal m23 = toDouble(e.attribute("m23", "0.0"));
 
     qreal m31 = toDouble(e.attribute("m31", "0.0"));
     qreal m32 = toDouble(e.attribute("m32", "0.0"));
     qreal m33 = toDouble(e.attribute("m33", "1.0"));
 
     t->setMatrix(
         m11, m12, m13,
         m21, m22, m23,
         m31, m32, m33);
 
     return true;
 }
 
 bool loadValue(const QDomElement &e, QString *value)
 {
     if (!Private::checkType(e, "value")) return false;
     *value = e.attribute("value", "no-value");
     return true;
 }
 
 QDomElement findElementByAttibute(QDomNode parent,
                                   const QString &tag,
                                   const QString &attribute,
                                   const QString &key)
 {
     QDomNode node = parent.firstChild();
 
     while (!node.isNull()) {
         QDomElement el = node.toElement();
 
         if (!el.isNull() && el.tagName() == tag) {
             QString value = el.attribute(attribute, "<undefined>");
             if (value == key) return el;
         }
 
         node = node.nextSibling();
     }
 
     return QDomElement();
 }
 
 
 
 
 }
diff --git a/libs/global/kis_dom_utils.h b/libs/global/kis_dom_utils.h
index e1e44fa158..92006ed6f8 100644
--- a/libs/global/kis_dom_utils.h
+++ b/libs/global/kis_dom_utils.h
@@ -1,239 +1,241 @@
 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef __KIS_DOM_UTILS_H
 #define __KIS_DOM_UTILS_H
 
 #include <QPointF>
 #include <QVector3D>
 #include <QVector>
 #include <QDomElement>
 #include <QLocale>
 
 #include <klocalizedstring.h>
 
 #include "kritaglobal_export.h"
 #include "kis_debug.h"
 
 namespace KisDomUtils {
 
     inline QString toString(const QString &value) {
         return value;
     }
 
     template<typename T>
         inline QString toString(T value) {
         return QString::number(value);
     }
 
     inline int toInt(const QString &str) {
         bool ok = false;
         int value = 0;
 
         QLocale c(QLocale::German);
 
         value = str.toInt(&ok);
         if (!ok) {
             value = c.toInt(str, &ok);
         }
 
         if (!ok) {
             warnKrita << "WARNING: KisDomUtils::toInt failed:" << ppVar(str);
             value = 0;
         }
 
         return value;
     }
 
     inline double toDouble(const QString &str) {
         bool ok = false;
         double value = 0;
 
         QLocale c(QLocale::German);
 
         /**
          * A special workaround to handle ','/'.' decimal point
          * in different locales. Added for backward compatibility,
          * because we used to save qreals directly using
          *
          * e.setAttribute("w", (qreal)value),
          *
          * which did local-aware conversion.
          */
 
         value = str.toDouble(&ok);
         if (!ok) {
             value = c.toDouble(str, &ok);
         }
 
         if (!ok) {
             warnKrita << "WARNING: KisDomUtils::toDouble failed:" << ppVar(str);
             value = 0;
         }
 
         return value;
     }
 
 
 /**
  * Save a value of type QRect into an XML tree. A child for \p parent
  * is created and assigned a tag \p tag.  The corresponding value can
  * be fetched from the XML using loadValue() later.
  *
  * \see loadValue()
  */
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QRect &rc);
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QSize &size);
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QPoint &pt);
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QPointF &pt);
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QVector3D &pt);
 void KRITAGLOBAL_EXPORT saveValue(QDomElement *parent, const QString &tag, const QTransform &t);
 
 /**
  * Save a value of a scalar type into an XML tree. A child for \p parent
  * is created and assigned a tag \p tag.  The corresponding value can
  * be fetched from the XML using loadValue() later.
  *
  * \see loadValue()
  */
 template <typename T>
 void saveValue(QDomElement *parent, const QString &tag, T value)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "value");
     e.setAttribute("value", toString(value));
 }
 
 /**
  * Save a vector of values into an XML tree. A child for \p parent is
  * created and assigned a tag \p tag.  The values in the array should
  * have a type supported by saveValue() overrides. The corresponding
  * vector can be fetched from the XML using loadValue() later.
  *
  * \see loadValue()
  */
-template <typename T>
-void saveValue(QDomElement *parent, const QString &tag, const QVector<T> &array)
+template <template <class> class Container, typename T>
+void saveValue(QDomElement *parent, const QString &tag, const Container<T> &array)
 {
     QDomDocument doc = parent->ownerDocument();
     QDomElement e = doc.createElement(tag);
     parent->appendChild(e);
 
     e.setAttribute("type", "array");
 
     int i = 0;
     Q_FOREACH (const T &v, array) {
         saveValue(&e, QString("item_%1").arg(i++), v);
     }
 }
 
 /**
  * Find an element with tag \p tag which is a child of \p parent. The element should
  * be the only element with the provided tag in this parent.
  *
  * \return true is the element with \p tag is found and it is unique
  */
 bool KRITAGLOBAL_EXPORT findOnlyElement(const QDomElement &parent, const QString &tag, QDomElement *el, QStringList *errorMessages = 0);
 
 
 /**
  * Load an object from an XML element, which is a child of \p parent and has
  * a tag \p tag.
  *
  * \return true if the object is successfully loaded and is unique
  *
  * \see saveValue()
  */
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, float *v);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, double *v);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QSize *size);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QRect *rc);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QPoint *pt);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QPointF *pt);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QVector3D *pt);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QTransform *t);
 bool KRITAGLOBAL_EXPORT loadValue(const QDomElement &e, QString *value);
 
 
 namespace Private {
     bool KRITAGLOBAL_EXPORT checkType(const QDomElement &e, const QString &expectedType);
 }
 
 
 /**
  * Load a scalar value from an XML element, which is a child of \p parent
  * and has a tag \p tag.
  *
  * \return true if the object is successfully loaded and is unique
  *
  * \see saveValue()
  */
 template <typename T>
     typename std::enable_if<std::is_arithmetic<T>::value, bool>::type
 loadValue(const QDomElement &e, T *value)
 {
     if (!Private::checkType(e, "value")) return false;
 
     QVariant v(e.attribute("value", "no-value"));
     *value = v.value<T>();
     return true;
 }
 
 /**
  * Load an array from an XML element, which is a child of \p parent
  * and has a tag \p tag.
  *
  * \return true if the object is successfully loaded and is unique
  *
  * \see saveValue()
  */
-template <typename T>
-bool loadValue(const QDomElement &e, QVector<T> *array)
+template <template <class> class Container, typename T>
+bool loadValue(const QDomElement &e, Container<T> *array)
 {
     if (!Private::checkType(e, "array")) return false;
 
     QDomElement child = e.firstChildElement();
     while (!child.isNull()) {
         T value;
         if (!loadValue(child, &value)) return false;
         *array << value;
         child = child.nextSiblingElement();
     }
     return true;
 }
 
 template <typename T>
 bool loadValue(const QDomElement &parent, const QString &tag, T *value)
 {
     QDomElement e;
     if (!findOnlyElement(parent, tag, &e)) return false;
 
     return loadValue(e, value);
 }
 
 KRITAGLOBAL_EXPORT QDomElement findElementByAttibute(QDomNode parent,
                                                     const QString &tag,
                                                     const QString &attribute,
                                                     const QString &key);
 
+KRITAGLOBAL_EXPORT bool removeElements(QDomElement &parent, const QString &tag);
+
 }
 
 #endif /* __KIS_DOM_UTILS_H */
diff --git a/libs/global/kis_global.h b/libs/global/kis_global.h
index af079e3217..785cd338bf 100644
--- a/libs/global/kis_global.h
+++ b/libs/global/kis_global.h
@@ -1,282 +1,323 @@
 /*
  *  Copyright (c) 2000 Matthias Elter <elter@kde.org>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *
  *  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 KISGLOBAL_H_
 #define KISGLOBAL_H_
 
 #include <limits.h>
 
 #include <KoConfig.h>
 #include "kis_assert.h"
 
 #include <QPoint>
 #include <QPointF>
 
 const quint8 quint8_MAX = UCHAR_MAX;
 const quint16 quint16_MAX = 65535;
 
 const qint32 qint32_MAX = (2147483647);
 const qint32 qint32_MIN = (-2147483647 - 1);
 
 const quint8 MAX_SELECTED = UCHAR_MAX;
 const quint8 MIN_SELECTED = 0;
 const quint8 SELECTION_THRESHOLD = 1;
 
 enum OutlineStyle {
     OUTLINE_NONE = 0,
     OUTLINE_CIRCLE,
     OUTLINE_FULL,
     OUTLINE_TILT,
     OUTLINE_COLOR,
 
     N_OUTLINE_STYLE_SIZE
 };
 
 enum CursorStyle {
     CURSOR_STYLE_NO_CURSOR = 0,
     CURSOR_STYLE_TOOLICON,
     CURSOR_STYLE_POINTER,
     CURSOR_STYLE_SMALL_ROUND,
     CURSOR_STYLE_CROSSHAIR,
     CURSOR_STYLE_TRIANGLE_RIGHTHANDED,
     CURSOR_STYLE_TRIANGLE_LEFTHANDED,
     CURSOR_STYLE_BLACK_PIXEL,
     CURSOR_STYLE_WHITE_PIXEL,
 
     N_CURSOR_STYLE_SIZE
 };
 
 enum OldCursorStyle {
     OLD_CURSOR_STYLE_TOOLICON = 0,
     OLD_CURSOR_STYLE_CROSSHAIR = 1,
     OLD_CURSOR_STYLE_POINTER = 2,
 
     OLD_CURSOR_STYLE_OUTLINE = 3,
 
     OLD_CURSOR_STYLE_NO_CURSOR = 4,
     OLD_CURSOR_STYLE_SMALL_ROUND = 5,
 
     OLD_CURSOR_STYLE_OUTLINE_CENTER_DOT = 6,
     OLD_CURSOR_STYLE_OUTLINE_CENTER_CROSS = 7,
 
     OLD_CURSOR_STYLE_TRIANGLE_RIGHTHANDED = 8,
     OLD_CURSOR_STYLE_TRIANGLE_LEFTHANDED = 9,
 
     OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_RIGHTHANDED = 10,
     OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_LEFTHANDED = 11
 };
 
 /*
  * Most wacom pads have 512 levels of pressure; Qt only supports 256, and even
  * this is downscaled to 127 levels because the line would be too jittery, and
  * the amount of masks take too much memory otherwise.
  */
 const qint32 PRESSURE_LEVELS = 127;
 const double PRESSURE_MIN = 0.0;
 const double PRESSURE_MAX = 1.0;
 const double PRESSURE_DEFAULT = PRESSURE_MAX;
 const double PRESSURE_THRESHOLD = 5.0 / 255.0;
 
 // copy of lcms.h
 #define INTENT_PERCEPTUAL                 0
 #define INTENT_RELATIVE_COLORIMETRIC      1
 #define INTENT_SATURATION                 2
 #define INTENT_ABSOLUTE_COLORIMETRIC      3
 
 #include <cmath>
 #include <QPointF>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
 
 // converts \p a to [0, 2 * M_PI) range
 inline qreal normalizeAngle(qreal a) {
     if (a < 0.0) {
         a = 2 * M_PI + fmod(a, 2 * M_PI);
     }
 
     return a > 2 * M_PI ? fmod(a, 2 * M_PI) : a;
 }
 
 // converts \p a to [0, 360.0) range
 inline qreal normalizeAngleDegrees(qreal a) {
     if (a < 0.0) {
         a = 360.0 + fmod(a, 360.0);
     }
 
     return a > 360.0 ? fmod(a, 360.0) : a;
 }
 
 inline qreal shortestAngularDistance(qreal a, qreal b) {
     qreal dist = fmod(qAbs(a - b), 2 * M_PI);
     if (dist > M_PI) dist = 2 * M_PI - dist;
 
     return dist;
 }
 
 inline qreal incrementInDirection(qreal a, qreal inc, qreal direction) {
     qreal b1 = a + inc;
     qreal b2 = a - inc;
 
     qreal d1 = shortestAngularDistance(b1, direction);
     qreal d2 = shortestAngularDistance(b2, direction);
 
     return d1 < d2 ? b1 : b2;
 }
 
 template<typename PointType>
 inline PointType snapToClosestAxis(PointType P) {
     if (qAbs(P.x()) < qAbs(P.y())) {
         P.setX(0);
     } else {
         P.setY(0);
     }
     return P;
 }
 
 template<typename T>
 inline T pow2(const T& x) {
     return x * x;
 }
 
 template<typename T>
 inline T kisDegreesToRadians(T degrees) {
     return degrees * M_PI / 180.0;
 }
 
 template<typename T>
 inline T kisRadiansToDegrees(T radians) {
     return radians * 180.0 / M_PI;
 }
 
 template<class T, typename U>
 inline T kisGrowRect(const T &rect, U offset) {
     return rect.adjusted(-offset, -offset, offset, offset);
 }
 
 inline qreal kisDistance(const QPointF &pt1, const QPointF &pt2) {
     return std::sqrt(pow2(pt1.x() - pt2.x()) + pow2(pt1.y() - pt2.y()));
 }
 
 inline qreal kisSquareDistance(const QPointF &pt1, const QPointF &pt2) {
     return pow2(pt1.x() - pt2.x()) + pow2(pt1.y() - pt2.y());
 }
 
 #include <QLineF>
 
 inline qreal kisDistanceToLine(const QPointF &m, const QLineF &line)
 {
     const QPointF &p1 = line.p1();
     const QPointF &p2 = line.p2();
 
     qreal distance = 0;
 
     if (qFuzzyCompare(p1.x(), p2.x())) {
         distance = qAbs(m.x() - p2.x());
     } else if (qFuzzyCompare(p1.y(), p2.y())) {
         distance = qAbs(m.y() - p2.y());
     } else {
         qreal A = 1;
         qreal B = - (p1.x() - p2.x()) / (p1.y() - p2.y());
         qreal C = - p1.x() - B * p1.y();
 
         distance = qAbs(A * m.x() + B * m.y() + C) / std::sqrt(pow2(A) + pow2(B));
     }
 
     return distance;
 }
 
 inline QPointF kisProjectOnVector(const QPointF &base, const QPointF &v)
 {
     const qreal prod = base.x() * v.x() + base.y() * v.y();
     const qreal lengthSq = pow2(base.x()) + pow2(base.y());
     qreal coeff = prod / lengthSq;
 
     return coeff * base;
 }
 
 #include <QRect>
 
 inline QRect kisEnsureInRect(QRect rc, const QRect &bounds)
 {
     if(rc.right() > bounds.right()) {
         rc.translate(bounds.right() - rc.right(), 0);
     }
 
     if(rc.left() < bounds.left()) {
         rc.translate(bounds.left() - rc.left(), 0);
     }
 
     if(rc.bottom() > bounds.bottom()) {
         rc.translate(0, bounds.bottom() - rc.bottom());
     }
 
     if(rc.top() < bounds.top()) {
         rc.translate(0, bounds.top() - rc.top());
     }
 
     return rc;
 }
 
 #include <QSharedPointer>
 
 template <class T>
 inline QSharedPointer<T> toQShared(T* ptr) {
     return QSharedPointer<T>(ptr);
 }
 
 template <class A, template <class C> class List>
 List<QSharedPointer<A>> listToQShared(const List<A*> list) {
     List<QSharedPointer<A>> newList;
     Q_FOREACH(A* value, list) {
         newList.append(toQShared(value));
     }
     return newList;
 }
 
+
+/**
+ * Convert a list of strong pointers into a list of weak pointers
+ */
+template <template <class> class Container, class T>
+Container<QWeakPointer<T>> listStrongToWeak(const Container<QSharedPointer<T>> &containter)
+{
+    Container<QWeakPointer<T> > result;
+    Q_FOREACH (QSharedPointer<T> v, containter) {
+        result << v;
+    }
+    return result;
+}
+
+/**
+ * Convert a list of weak pointers into a list of strong pointers
+ *
+ * WARNING: By default, uses "all or nothing" rule. If at least one of
+ *          the weak pointers is invalid, returns an *empty* list!
+ *          Even though some other pointer can still be converted
+ *          correctly.
+ */
+template <template <class> class Container, class T>
+    Container<QSharedPointer<T> > listWeakToStrong(const Container<QWeakPointer<T>> &containter,
+                                                   bool allOrNothing = true)
+{
+    Container<QSharedPointer<T> > result;
+    Q_FOREACH (QWeakPointer<T> v, containter) {
+        QSharedPointer<T> strong(v);
+        if (!strong && allOrNothing) {
+            result.clear();
+            return result;
+        }
+
+        if (strong) {
+            result << strong;
+        }
+    }
+    return result;
+}
+
 /**
  * A special wrapper object that converts Qt-style mutexes and locks
  * into an object that supports Std's (and Boost's) "Lockable"
  * concept. Basically, it converts tryLock() into try_lock() to comply
  * with the syntax.
  */
 
 template <class T>
 struct StdLockableWrapper {
     StdLockableWrapper(T *lock) : m_lock(lock) {}
 
     void lock() {
         m_lock->lock();
     }
 
     bool try_lock() {
         return m_lock->tryLock();
     }
 
     void unlock() {
         m_lock->unlock();
     }
 
 private:
     T *m_lock;
 };
 
 #endif // KISGLOBAL_H_
 
diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
index 661b9b9751..d4cd630d69 100644
--- a/libs/image/CMakeLists.txt
+++ b/libs/image/CMakeLists.txt
@@ -1,380 +1,384 @@
 add_subdirectory( tests )
 
 add_subdirectory( tiles3 )
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/metadata
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty
     ${CMAKE_CURRENT_SOURCE_DIR}/brushengine
     ${CMAKE_CURRENT_SOURCE_DIR}/commands
     ${CMAKE_CURRENT_SOURCE_DIR}/commands_new
     ${CMAKE_CURRENT_SOURCE_DIR}/filter
     ${CMAKE_CURRENT_SOURCE_DIR}/floodfill
     ${CMAKE_CURRENT_SOURCE_DIR}/generator
     ${CMAKE_CURRENT_SOURCE_DIR}/layerstyles
     ${CMAKE_CURRENT_SOURCE_DIR}/processing
     ${CMAKE_CURRENT_SOURCE_DIR}/recorder
 
     ${CMAKE_SOURCE_DIR}/sdk/tests
 )
 
 include_directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
 )
 
 if(FFTW3_FOUND)
   include_directories(${FFTW3_INCLUDE_DIR})
 endif()
 
 if(HAVE_VC)
   include_directories(SYSTEM ${Vc_INCLUDE_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS})
   ko_compile_for_all_implementations(__per_arch_circle_mask_generator_objs kis_brush_mask_applicator_factories.cpp)
 else()
   set(__per_arch_circle_mask_generator_objs kis_brush_mask_applicator_factories.cpp)
 endif()
 
 set(kritaimage_LIB_SRCS
     tiles3/kis_tile.cc
     tiles3/kis_tile_data.cc
     tiles3/kis_tile_data_store.cc
     tiles3/kis_tile_data_pooler.cc
     tiles3/kis_tiled_data_manager.cc
     tiles3/kis_memento_manager.cc
     tiles3/kis_hline_iterator.cpp
     tiles3/kis_vline_iterator.cpp
     tiles3/kis_random_accessor.cc
     tiles3/swap/kis_abstract_compression.cpp
     tiles3/swap/kis_lzf_compression.cpp
     tiles3/swap/kis_abstract_tile_compressor.cpp
     tiles3/swap/kis_legacy_tile_compressor.cpp
     tiles3/swap/kis_tile_compressor_2.cpp
     tiles3/swap/kis_chunk_allocator.cpp
     tiles3/swap/kis_memory_window.cpp
     tiles3/swap/kis_swapped_data_store.cpp
     tiles3/swap/kis_tile_data_swapper.cpp
    kis_distance_information.cpp
    kis_painter.cc
    kis_progress_updater.cpp
    brushengine/kis_paint_information.cc
    brushengine/kis_random_source.cpp
    brushengine/kis_stroke_random_source.cpp
    brushengine/kis_paintop.cc
    brushengine/kis_paintop_factory.cpp
    brushengine/kis_paintop_preset.cpp
    brushengine/kis_paintop_registry.cc
    brushengine/kis_paintop_settings.cpp
+   brushengine/kis_paintop_settings_update_proxy.cpp
    brushengine/kis_locked_properties.cc
    brushengine/kis_locked_properties_proxy.cpp
    brushengine/kis_locked_properties_server.cpp
    brushengine/kis_paintop_config_widget.cpp
+   brushengine/kis_uniform_paintop_property.cpp
+   brushengine/kis_combo_based_paintop_property.cpp
+   brushengine/kis_standard_uniform_properties_factory.cpp
    commands/kis_deselect_global_selection_command.cpp
    commands/kis_image_change_layers_command.cpp
    commands/kis_image_command.cpp
    commands/kis_image_set_projection_color_space_command.cpp
    commands/kis_image_layer_add_command.cpp
    commands/kis_image_layer_move_command.cpp
    commands/kis_image_layer_remove_command.cpp
    commands/kis_image_layer_remove_command_impl.cpp
    commands/kis_image_lock_command.cpp
    commands/kis_layer_command.cpp
    commands/kis_node_command.cpp
    commands/kis_node_compositeop_command.cpp
    commands/kis_node_opacity_command.cpp
    commands/kis_node_property_list_command.cpp
    commands/kis_reselect_global_selection_command.cpp
    commands/kis_set_global_selection_command.cpp
    commands_new/kis_saved_commands.cpp
    commands_new/kis_processing_command.cpp
    commands_new/kis_image_resize_command.cpp
    commands_new/kis_image_set_resolution_command.cpp
    commands_new/kis_node_move_command2.cpp
    commands_new/kis_set_layer_style_command.cpp
    commands_new/kis_selection_move_command2.cpp
    commands_new/kis_update_command.cpp
    commands_new/kis_switch_current_time_command.cpp
    commands_new/kis_change_projection_color_command.cpp
    commands_new/kis_activate_selection_mask_command.cpp
    processing/kis_do_nothing_processing_visitor.cpp
    processing/kis_simple_processing_visitor.cpp
    processing/kis_crop_processing_visitor.cpp
    processing/kis_crop_selections_processing_visitor.cpp
    processing/kis_transform_processing_visitor.cpp
    processing/kis_mirror_processing_visitor.cpp
    filter/kis_filter.cc
    filter/kis_filter_configuration.cc
    filter/kis_color_transformation_configuration.cc
    filter/kis_filter_registry.cc
    filter/kis_color_transformation_filter.cc
    generator/kis_generator.cpp
    generator/kis_generator_layer.cpp
    generator/kis_generator_registry.cpp
    floodfill/kis_fill_interval_map.cpp
    floodfill/kis_scanline_fill.cpp
    kis_adjustment_layer.cc
    kis_selection_based_layer.cpp
    kis_node_filter_interface.cpp
    kis_base_accessor.cpp
    kis_base_node.cpp
    kis_base_processor.cpp
    kis_bookmarked_configuration_manager.cc
    kis_clone_info.cpp
    kis_clone_layer.cpp
    kis_colorspace_convert_visitor.cpp
    kis_config_widget.cpp
    kis_convolution_kernel.cc
    kis_convolution_painter.cc
    kis_gaussian_kernel.cpp
    kis_cubic_curve.cpp
    kis_default_bounds.cpp
    kis_default_bounds_base.cpp
    kis_effect_mask.cc
    kis_fast_math.cpp
    kis_fill_painter.cc
    kis_filter_mask.cpp
    kis_filter_strategy.cc
    kis_transform_mask.cpp
    kis_transform_mask_params_interface.cpp
    kis_recalculate_transform_mask_job.cpp
    kis_recalculate_generator_layer_job.cpp
    kis_transform_mask_params_factory_registry.cpp
    kis_safe_transform.cpp
    kis_gradient_painter.cc
    kis_gradient_shape_strategy.cpp
    kis_cached_gradient_shape_strategy.cpp
    kis_polygonal_gradient_shape_strategy.cpp
    kis_iterator_ng.cpp
    kis_async_merger.cpp
    kis_merge_walker.cc
    kis_updater_context.cpp
    kis_update_job_item.cpp
    kis_stroke_strategy_undo_command_based.cpp
    kis_simple_stroke_strategy.cpp
    kis_stroke_job_strategy.cpp
    kis_stroke_strategy.cpp
    kis_stroke.cpp
    kis_strokes_queue.cpp
    kis_simple_update_queue.cpp
    kis_update_scheduler.cpp
    kis_queues_progress_updater.cpp
    kis_composite_progress_proxy.cpp
    kis_sync_lod_cache_stroke_strategy.cpp
    kis_lod_capable_layer_offset.cpp
    kis_update_time_monitor.cpp
    kis_group_layer.cc
    kis_count_visitor.cpp
    kis_histogram.cc
    kis_image_interfaces.cpp
    kis_image_animation_interface.cpp
    kis_time_range.cpp
    kis_node_graph_listener.cpp
    kis_image.cc
    kis_image_signal_router.cpp
    kis_image_config.cpp
    kis_projection_updates_filter.cpp
    kis_suspend_projection_updates_stroke_strategy.cpp
    kis_regenerate_frame_stroke_strategy.cpp
    kis_crop_saved_extra_data.cpp
    kis_signal_compressor.cpp
    kis_signal_compressor_with_param.cpp
    kis_thread_safe_signal_compressor.cpp
    kis_acyclic_signal_connector.cpp
    kis_timed_signal_threshold.cpp
    kis_layer.cc
    kis_indirect_painting_support.cpp
    kis_abstract_projection_plane.cpp
    kis_layer_projection_plane.cpp
    kis_command_utils.cpp
    kis_layer_utils.cpp
    kis_mask_projection_plane.cpp
    kis_projection_leaf.cpp
    kis_mask.cc
    kis_base_mask_generator.cpp
    kis_rect_mask_generator.cpp
    kis_circle_mask_generator.cpp
    kis_gauss_circle_mask_generator.cpp
    kis_gauss_rect_mask_generator.cpp
    ${__per_arch_circle_mask_generator_objs}
    kis_curve_circle_mask_generator.cpp
    kis_curve_rect_mask_generator.cpp
    kis_math_toolbox.cpp
    kis_memory_statistics_server.cpp
    kis_name_server.cpp
    kis_node.cpp
    kis_node_facade.cpp
    kis_node_progress_proxy.cpp
    kis_busy_progress_indicator.cpp
    kis_node_visitor.cpp
    kis_paint_device.cc
    kis_paint_device_debug_utils.cpp
    kis_fixed_paint_device.cpp
    kis_paint_layer.cc
    kis_perspective_math.cpp
    kis_pixel_selection.cpp
    kis_processing_information.cpp
    kis_properties_configuration.cc
    kis_random_accessor_ng.cpp
    kis_random_generator.cc
    kis_random_sub_accessor.cpp
    kis_wrapped_random_accessor.cpp
    kis_selection.cc
    kis_selection_mask.cpp
    kis_update_outline_job.cpp
    kis_update_selection_job.cpp
    kis_serializable_configuration.cc
    kis_transaction_data.cpp
    kis_transform_worker.cc
    kis_perspectivetransform_worker.cpp
    bsplines/kis_bspline_1d.cpp
    bsplines/kis_bspline_2d.cpp
    bsplines/kis_nu_bspline_2d.cpp
    kis_warptransform_worker.cc
    kis_cage_transform_worker.cpp
    kis_liquify_transform_worker.cpp
    kis_green_coordinates_math.cpp
    kis_algebra_2d.cpp
    kis_transparency_mask.cc
    kis_undo_store.cpp
    kis_undo_stores.cpp
    kis_undo_adapter.cpp
    kis_surrogate_undo_adapter.cpp
    kis_legacy_undo_adapter.cpp
    kis_post_execution_undo_adapter.cpp
    kis_processing_visitor.cpp
    kis_processing_applicator.cpp
    krita_utils.cpp
    kis_outline_generator.cpp
    kis_layer_composition.cpp
    kis_selection_filters.cpp
    KisProofingConfiguration.h
    metadata/kis_meta_data_entry.cc
    metadata/kis_meta_data_filter.cc
    metadata/kis_meta_data_filter_p.cc
    metadata/kis_meta_data_filter_registry.cc
    metadata/kis_meta_data_filter_registry_model.cc
    metadata/kis_meta_data_io_backend.cc
    metadata/kis_meta_data_merge_strategy.cc
    metadata/kis_meta_data_merge_strategy_p.cc
    metadata/kis_meta_data_merge_strategy_registry.cc
    metadata/kis_meta_data_parser.cc
    metadata/kis_meta_data_schema.cc
    metadata/kis_meta_data_schema_registry.cc
    metadata/kis_meta_data_store.cc
    metadata/kis_meta_data_type_info.cc
    metadata/kis_meta_data_validator.cc
    metadata/kis_meta_data_value.cc
    recorder/kis_action_recorder.cc
    recorder/kis_macro.cc
    recorder/kis_macro_player.cc
    recorder/kis_node_query_path.cc
    recorder/kis_play_info.cc
    recorder/kis_recorded_action.cc
    recorder/kis_recorded_action_factory_registry.cc
    recorder/kis_recorded_action_load_context.cpp
    recorder/kis_recorded_action_save_context.cpp
    recorder/kis_recorded_filter_action.cpp
    recorder/kis_recorded_fill_paint_action.cpp
    recorder/kis_recorded_node_action.cc
    recorder/kis_recorded_paint_action.cpp
    recorder/kis_recorded_path_paint_action.cpp
    recorder/kis_recorded_shape_paint_action.cpp
 
    kis_keyframe.cpp
    kis_keyframe_channel.cpp
    kis_scalar_keyframe_channel.cpp
    kis_raster_keyframe_channel.cpp
    kis_onion_skin_compositor.cpp
    kis_onion_skin_cache.cpp
    kis_idle_watcher.cpp
 
    kis_psd_layer_style.cpp
    kis_layer_properties_icons.cpp
 
    layerstyles/kis_multiple_projection.cpp
    layerstyles/kis_layer_style_filter.cpp
    layerstyles/kis_layer_style_filter_environment.cpp
    layerstyles/kis_layer_style_filter_projection_plane.cpp
    layerstyles/kis_layer_style_projection_plane.cpp
    layerstyles/kis_ls_drop_shadow_filter.cpp
    layerstyles/kis_ls_satin_filter.cpp
    layerstyles/kis_ls_stroke_filter.cpp
    layerstyles/kis_ls_bevel_emboss_filter.cpp
    layerstyles/kis_ls_overlay_filter.cpp
    layerstyles/kis_ls_utils.cpp
    layerstyles/gimp_bump_map.cpp
 )
 
 set(einspline_SRCS
    3rdparty/einspline/bspline_create.cpp
    3rdparty/einspline/bspline_data.cpp
    3rdparty/einspline/multi_bspline_create.cpp
    3rdparty/einspline/nubasis.cpp
    3rdparty/einspline/nubspline_create.cpp
    3rdparty/einspline/nugrid.cpp
 )
 
 add_library(kritaimage SHARED ${kritaimage_LIB_SRCS} ${einspline_SRCS})
 generate_export_header(kritaimage BASE_NAME kritaimage)
 
 target_link_libraries(kritaimage 
     PUBLIC
         kritaversion 
         kritawidgets 
         kritaglobal kritapsd 
         kritaodf kritapigment 
         kritaundo2 
         kritawidgetutils 
         Qt5::Concurrent
 )
 
 target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
 
 if(OPENEXR_FOUND)
   target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES})
 endif()
 
 if(FFTW3_FOUND)
   target_link_libraries(kritaimage PRIVATE ${FFTW3_LIBRARIES})
 endif()
 
 if(HAVE_VC)
   target_link_libraries(kritaimage PUBLIC ${Vc_LIBRARIES})
   if (NOT PACKAGERS_BUILD)
       set_property(TARGET kritaimage APPEND PROPERTY COMPILE_OPTIONS "${Vc_ARCHITECTURE_FLAGS}")
   endif()
 endif()
 
 if (NOT GSL_FOUND)
   message (WARNING "KRITA WARNING! No GNU Scientific Library was found! Krita's Shaped Gradients might be non-normalized! Please install GSL library.")
 else ()
   target_link_libraries(kritaimage PRIVATE ${GSL_LIBRARIES} ${GSL_CBLAS_LIBRARIES})
 endif ()
 
 target_include_directories(kritaimage
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/brushengine>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/filter>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/generator>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/layerstyles>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/metadata>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/processing>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/recorder>
 )
 
 set_target_properties(kritaimage PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 install(TARGETS kritaimage  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install schemas #############
 install( FILES
     metadata/schemas/dc.schema
     metadata/schemas/exif.schema
     metadata/schemas/tiff.schema
     metadata/schemas/mkn.schema
     metadata/schemas/xmp.schema
     metadata/schemas/xmpmm.schema
     metadata/schemas/xmprights.schema
 
     DESTINATION ${DATA_INSTALL_DIR}/krita/metadata/schemas)
diff --git a/libs/image/brushengine/kis_callback_based_paintop_property.h b/libs/image/brushengine/kis_callback_based_paintop_property.h
new file mode 100644
index 0000000000..6bfd5733d0
--- /dev/null
+++ b/libs/image/brushengine/kis_callback_based_paintop_property.h
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_CALLBACK_BASED_PAINTOP_PROPERTY_H
+#define __KIS_CALLBACK_BASED_PAINTOP_PROPERTY_H
+
+#include <functional>
+
+
+template <class ParentClass>
+class KisCallbackBasedPaintopProperty : public ParentClass
+{
+public:
+    KisCallbackBasedPaintopProperty(typename ParentClass::Type type,
+                                    const QString &id,
+                                    const QString &name,
+                                    KisPaintOpSettingsSP settings,
+                                    QObject *parent)
+        : ParentClass(type, id, name, settings, parent) {}
+
+    KisCallbackBasedPaintopProperty(const QString &id,
+                                const QString &name,
+                                KisPaintOpSettingsSP settings,
+                                QObject *parent)
+    : ParentClass(id, name, settings, parent) {}
+
+    typedef std::function<void (KisUniformPaintOpProperty*)> Callback;
+    typedef std::function<bool (const KisUniformPaintOpProperty*)> VisibleCallback;
+
+    void setReadCallback(Callback func) { m_readFunc = func; }
+    void setWriteCallback(Callback func) { m_writeFunc = func; }
+    void setIsVisibleCallback(VisibleCallback func) { m_visibleFunc = func; }
+
+protected:
+    virtual void readValueImpl() { if (m_readFunc) m_readFunc(this); }
+    virtual void writeValueImpl() { if (m_writeFunc) m_writeFunc(this); }
+    virtual bool isVisible() const { return m_visibleFunc ? m_visibleFunc(this) : true; }
+
+private:
+    Callback m_readFunc;
+    Callback m_writeFunc;
+    VisibleCallback m_visibleFunc;
+};
+
+#endif /* __KIS_CALLBACK_BASED_PAINTOP_PROPERTY_H */
diff --git a/libs/image/brushengine/kis_combo_based_paintop_property.cpp b/libs/image/brushengine/kis_combo_based_paintop_property.cpp
new file mode 100644
index 0000000000..2f1a6dc626
--- /dev/null
+++ b/libs/image/brushengine/kis_combo_based_paintop_property.cpp
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2016 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_combo_based_paintop_property.h"
+#include "kis_paintop_settings.h"
+
+#include "QIcon"
+
+
+struct KisComboBasedPaintOpProperty::Private
+{
+    QList<QString> items;
+    QList<QIcon> icons;
+};
+
+KisComboBasedPaintOpProperty::KisComboBasedPaintOpProperty(const QString &id,
+                                                           const QString &name,
+                                                           KisPaintOpSettingsSP settings,
+                                                           QObject *parent)
+    : KisUniformPaintOpProperty(Combo, id, name, settings, parent),
+      m_d(new Private)
+{
+}
+
+KisComboBasedPaintOpProperty::~KisComboBasedPaintOpProperty()
+{
+}
+
+QList<QString> KisComboBasedPaintOpProperty::items() const
+{
+    return m_d->items;
+}
+
+void KisComboBasedPaintOpProperty::setItems(const QList<QString> &list)
+{
+    m_d->items = list;
+}
+
+QList<QIcon> KisComboBasedPaintOpProperty::icons() const
+{
+    return m_d->icons;
+}
+
+void KisComboBasedPaintOpProperty::setIcons(const QList<QIcon> &list)
+{
+    m_d->icons = list;
+}
+
+
diff --git a/libs/image/brushengine/kis_combo_based_paintop_property.h b/libs/image/brushengine/kis_combo_based_paintop_property.h
new file mode 100644
index 0000000000..cdd7890213
--- /dev/null
+++ b/libs/image/brushengine/kis_combo_based_paintop_property.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_COMBO_BASED_PAINTOP_PROPERTY_H
+#define __KIS_COMBO_BASED_PAINTOP_PROPERTY_H
+
+#include <QScopedPointer>
+
+#include "kis_uniform_paintop_property.h"
+#include "kis_types.h"
+#include "kritaimage_export.h"
+
+class QIcon;
+
+
+class KRITAIMAGE_EXPORT KisComboBasedPaintOpProperty : public KisUniformPaintOpProperty
+{
+public:
+    KisComboBasedPaintOpProperty(const QString &id,
+                                 const QString &name,
+                                 KisPaintOpSettingsSP settings,
+                                 QObject *parent);
+    ~KisComboBasedPaintOpProperty();
+
+    // callback-compatible c-tor
+    KisComboBasedPaintOpProperty(Type type,
+                                 const QString &id,
+                                 const QString &name,
+                                 KisPaintOpSettingsSP settings,
+                                 QObject *parent);
+
+    QList<QString> items() const;
+    void setItems(const QList<QString> &list);
+
+    QList<QIcon> icons() const;
+    void setIcons(const QList<QIcon> &list);
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+};
+
+#endif /* __KIS_COMBO_BASED_PAINTOP_PROPERTY_H */
diff --git a/libs/image/brushengine/kis_locked_properties_proxy.h b/libs/image/brushengine/kis_locked_properties_proxy.h
index d83303e41c..7e23ef710c 100644
--- a/libs/image/brushengine/kis_locked_properties_proxy.h
+++ b/libs/image/brushengine/kis_locked_properties_proxy.h
@@ -1,55 +1,58 @@
 /*
  *  Copyright (c) 2014 Dmitry Kazakov <dimula73@gmail.com>
  *  Copyright (c) 2014 Mohit Goyal <mohit.bits2011@gmail.com>
  *
  *  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 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.
  */
 #ifndef KIS_LOCKED_PROPERTIES_PROXY_H
 #define KIS_LOCKED_PROPERTIES_PROXY_H
 
 #include "kis_properties_configuration.h"
 
 
 /**
  * This class acts as a proxy for all transfers between KisLockedPropertiesServer
  * and KisPaintOpSettings while using setConfiguration and writeConfiguration
  * methods. It is used to override the local settings of a * paintop with the
  * settings present in the KisLockedProperties List.
  *
  * Settings with the "_previous" suffix are used to save the local settings of
  * a preset in the preset itself. Whenever the user selects the option of going
  *  back to the previous configuration of the preset or "unlocks" an option
  * -- these settings are restored and the settings with the "_previous"
  * suffix are destroyed.
  */
 class KisLockedPropertiesServer;
 class KisLockedProperties;
 
 class KisLockedPropertiesProxy: public KisPropertiesConfiguration
 {
 public:
     KisLockedPropertiesProxy() ;
     KisLockedPropertiesProxy(KisLockedProperties* p);
     KisLockedPropertiesProxy(const KisPropertiesConfiguration *, KisLockedProperties *);
     using KisPropertiesConfiguration::getProperty;
     QVariant getProperty(const QString &name) const;
     using KisPropertiesConfiguration::setProperty;
     void setProperty(const QString & name, const QVariant & value);
 private:
     KisLockedProperties *m_lockedProperties;
     const KisPropertiesConfiguration *m_parent;
 };
 
+typedef QSharedPointer<KisLockedPropertiesProxy> KisLockedPropertiesProxySP;
+typedef QWeakPointer<KisLockedPropertiesProxy> KisLockedPropertiesProxyWSP;
+
 #endif // KIS_LOCKED_PROPERTIES_PROXY_H
diff --git a/libs/image/brushengine/kis_paintop_config_widget.cpp b/libs/image/brushengine/kis_paintop_config_widget.cpp
index ea7fc80ea5..2fbc63100b 100644
--- a/libs/image/brushengine/kis_paintop_config_widget.cpp
+++ b/libs/image/brushengine/kis_paintop_config_widget.cpp
@@ -1,76 +1,95 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *  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 "kis_paintop_config_widget.h"
 
 #include <brushengine/kis_paintop_settings.h>
 
 KisPaintOpConfigWidget::KisPaintOpConfigWidget(QWidget * parent, Qt::WFlags f)
     : KisConfigWidget(parent, f, 10),
-      m_userAllowedLod(true)
+      m_userAllowedLod(true),
+      m_isInsideUpdateCall(0)
 {
 }
 
 KisPaintOpConfigWidget::~KisPaintOpConfigWidget() {
 }
 
+void KisPaintOpConfigWidget::writeConfigurationSafe(KisPropertiesConfiguration *config) const
+{
+    if (m_isInsideUpdateCall) return;
+
+    m_isInsideUpdateCall++;
+    writeConfiguration(config);
+    m_isInsideUpdateCall--;
+}
+
+void KisPaintOpConfigWidget::setConfigurationSafe(const KisPropertiesConfiguration *config)
+{
+    if (m_isInsideUpdateCall) return;
+
+    m_isInsideUpdateCall++;
+    setConfiguration(config);
+    m_isInsideUpdateCall--;
+}
+
 void KisPaintOpConfigWidget::writeConfiguration(KisPropertiesConfiguration *config) const {
     KisPaintOpSettings::setLodUserAllowed(config, m_userAllowedLod);
 }
 
 void KisPaintOpConfigWidget::setConfiguration(const KisPropertiesConfiguration * config) {
     m_userAllowedLod = KisPaintOpSettings::isLodUserAllowed(config);
     emit sigUserChangedLodAvailability(m_userAllowedLod);
 }
 
 void KisPaintOpConfigWidget::setImage(KisImageWSP image) {
     m_image = image;
 }
 
 void KisPaintOpConfigWidget::setNode(KisNodeWSP node) {
     m_node = node;
 }
 
 void KisPaintOpConfigWidget::changePaintOpSize(qreal x, qreal y) {
     Q_UNUSED(x);
     Q_UNUSED(y);
 }
 
 QSizeF KisPaintOpConfigWidget::paintOpSize() const {
     return QSizeF(1.0, 1.0);
 }
 
 bool KisPaintOpConfigWidget::presetIsValid() {
     return true;
 }
 
 bool KisPaintOpConfigWidget::supportScratchBox() {
     return true;
 }
 
 void KisPaintOpConfigWidget::slotUserChangedLodAvailability(bool value) {
     m_userAllowedLod = value;
     emit sigConfigurationItemChanged();
 }
 
 void KisPaintOpConfigWidget::coldInitExternalLodAvailabilityWidget()
 {
     emit sigUserChangedLodAvailability(m_userAllowedLod);
     emit sigConfigurationItemChanged();
 }
diff --git a/libs/image/brushengine/kis_paintop_config_widget.h b/libs/image/brushengine/kis_paintop_config_widget.h
index db1cab4ead..f1d3a3f944 100644
--- a/libs/image/brushengine/kis_paintop_config_widget.h
+++ b/libs/image/brushengine/kis_paintop_config_widget.h
@@ -1,95 +1,102 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_PAINTOP_CONFIG_WIDGET_H_
 #define KIS_PAINTOP_CONFIG_WIDGET_H_
 
 #include "kritaimage_export.h"
 
 #include "kis_config_widget.h"
 #include "kis_image.h"
 #include <kis_debug.h>
 
 class KisPaintopLodLimitations;
 
 /**
  * Base class for widgets that are used to edit and display paintop settings.
  */
 class KRITAIMAGE_EXPORT KisPaintOpConfigWidget : public KisConfigWidget
 {
     Q_OBJECT
 
 public:
     KisPaintOpConfigWidget(QWidget * parent = 0, Qt::WFlags f = 0);
     virtual ~KisPaintOpConfigWidget();
 
+    void writeConfigurationSafe(KisPropertiesConfiguration *config) const;
+    void setConfigurationSafe(const KisPropertiesConfiguration *config);
+
+protected:
     /**
      * Write the settings in this widget to the given properties
      * configuration, which is cleared first.
      */
     virtual void writeConfiguration(KisPropertiesConfiguration *config) const;
     virtual void setConfiguration(const KisPropertiesConfiguration * config);
+public:
 
     virtual KisPaintopLodLimitations lodLimitations() const = 0;
 
     virtual void setImage(KisImageWSP image);
     virtual void setNode(KisNodeWSP node);
 
     /**
      * @see KisPaintOpSettings::changePaintOpSize(qreal x, qreal y)
      */
     virtual void changePaintOpSize(qreal x, qreal y);
 
     /**
      * @see KisPaintOpSettings::paintOpSize()
      */
     virtual QSizeF paintOpSize() const;
 
     /**
      * This is true for all of the paintop widget except for the Custom brush tab in the Brush tip dialog
      */
     virtual bool presetIsValid();
 
     /**
      * Some paintops are more complicated and require full canvas with layers, projections and KisImage etc.
      * Example is duplicate paintop. In this case simple canvas like scratchbox does not work.
      * Every paintop supports the scratchbox by default, override and return false if paintop does not.
      */
     virtual bool supportScratchBox();
 
 
     /**
      * This call makes KisPaintOpConfigWidget emit
      * sigUserChangedLodAvailability() signal with the current
      * availability value
      */
     void coldInitExternalLodAvailabilityWidget();
 
 public Q_SLOTS:
     void slotUserChangedLodAvailability(bool value);
 
 Q_SIGNALS:
     void sigUserChangedLodAvailability(bool value);
 
 protected:
     KisImageWSP m_image;
     KisNodeWSP m_node;
     bool m_userAllowedLod;
+
+    mutable int m_isInsideUpdateCall;
 };
 
 #endif
diff --git a/libs/image/brushengine/kis_paintop_preset.cpp b/libs/image/brushengine/kis_paintop_preset.cpp
index 26ff1cc83d..389ad3bd63 100644
--- a/libs/image/brushengine/kis_paintop_preset.cpp
+++ b/libs/image/brushengine/kis_paintop_preset.cpp
@@ -1,345 +1,393 @@
 /* This file is part of the KDE project
  * Copyright (C) Boudewijn Rempt <boud@valdyas.org>, (C) 2008
  * Copyright (C) Sven Langkamp <sven.langkamp@gmail.com>, (C) 2009
  *
  * 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 <brushengine/kis_paintop_preset.h>
 
 #include <QFile>
 #include <QSize>
 #include <QImage>
 #include <QImageWriter>
 #include <QImageReader>
 #include <QDomDocument>
 #include <QBuffer>
 
 #include <brushengine/kis_paintop_settings.h>
 #include "kis_paintop_registry.h"
 #include "kis_painter.h"
 #include <brushengine/kis_paint_information.h>
 #include "kis_paint_device.h"
 #include "kis_image.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include <brushengine/kis_paintop_config_widget.h>
 
 #include <KoStore.h>
 
 struct Q_DECL_HIDDEN KisPaintOpPreset::Private {
     Private()
         : settings(0),
           dirtyPreset(false)
     {
     }
 
     KisPaintOpSettingsSP settings;
     bool dirtyPreset;
-
+    QScopedPointer<KisPaintopSettingsUpdateProxy> updateProxy;
 };
 
 
 KisPaintOpPreset::KisPaintOpPreset()
     : KoResource(QString())
     , m_d(new Private)
 {
 }
 
 KisPaintOpPreset::KisPaintOpPreset(const QString & fileName)
     : KoResource(fileName)
     , m_d(new Private)
 {
 }
 
 KisPaintOpPreset::~KisPaintOpPreset()
 {
     delete m_d;
 }
 
 KisPaintOpPresetSP KisPaintOpPreset::clone() const
 {
     KisPaintOpPresetSP preset = new KisPaintOpPreset();
 
     if (settings()) {
         preset->setSettings(settings()); // the settings are cloned inside!
     }
     preset->setPresetDirty(isPresetDirty());
     // only valid if we could clone the settings
     preset->setValid(settings());
 
     preset->setPaintOp(paintOp());
     preset->setName(name());
     preset->setImage(image());
     preset->settings()->setPreset(KisPaintOpPresetWSP(preset));
 
     Q_ASSERT(preset->valid());
 
     return preset;
 }
 void KisPaintOpPreset::setPresetDirty(bool value)
 {
     m_d->dirtyPreset = value;
+
+    if (m_d->updateProxy && m_d->dirtyPreset != value) {
+        m_d->updateProxy->notifySettingsChanged();
+    }
 }
 bool KisPaintOpPreset::isPresetDirty() const
 {
     return m_d->dirtyPreset;
 }
 
 void KisPaintOpPreset::setPaintOp(const KoID & paintOp)
 {
     Q_ASSERT(m_d->settings);
     m_d->settings->setProperty("paintop", paintOp.id());
 }
 
 KoID KisPaintOpPreset::paintOp() const
 {
     Q_ASSERT(m_d->settings);
     return KoID(m_d->settings->getString("paintop"), name());
 }
 
+void KisPaintOpPreset::setOptionsWidget(KisPaintOpConfigWidget* widget)
+{
+    if (m_d->settings) {
+        m_d->settings->setOptionsWidget(widget);
+
+        if (widget) {
+            widget->setConfigurationSafe(m_d->settings);
+        }
+    }
+}
+
 void KisPaintOpPreset::setSettings(KisPaintOpSettingsSP settings)
 {
     Q_ASSERT(settings);
     Q_ASSERT(!settings->getString("paintop", "").isEmpty());
 
     DirtyStateSaver dirtyStateSaver(this);
 
+    KisPaintOpConfigWidget *oldOptionsWidget = 0;
+
     if (m_d->settings) {
+        oldOptionsWidget = m_d->settings->optionsWidget();
+        m_d->settings->setOptionsWidget(0);
         m_d->settings->setPreset(0);
         m_d->settings = 0;
     }
 
     if (settings) {
         m_d->settings = settings->clone();
         m_d->settings->setPreset(KisPaintOpPresetWSP(this));
+
+        if (oldOptionsWidget) {
+            m_d->settings->setOptionsWidget(oldOptionsWidget);
+            oldOptionsWidget->setConfigurationSafe(m_d->settings);
+        }
     }
 
     setValid(m_d->settings);
+
+    if (m_d->updateProxy) {
+        m_d->updateProxy->notifyUniformPropertiesChanged();
+        m_d->updateProxy->notifySettingsChanged();
+    }
 }
 
 KisPaintOpSettingsSP KisPaintOpPreset::settings() const
 {
     Q_ASSERT(m_d->settings);
     Q_ASSERT(!m_d->settings->getString("paintop", "").isEmpty());
 
     return m_d->settings;
 }
 
 bool KisPaintOpPreset::load()
 {
     dbgImage << "Load preset " << filename();
     setValid(false);
 
     if (filename().isEmpty()) {
         return false;
     }
 
     QIODevice *dev = 0;
     QByteArray ba;
 
     if (filename().startsWith("bundle://")) {
         QString bn = filename().mid(9);
         int pos = bn.lastIndexOf(":");
         QString fn = bn.right(bn.size() - pos - 1);
         bn = bn.left(pos);
 
         QScopedPointer<KoStore> resourceStore(KoStore::createStore(bn, KoStore::Read, "application/x-krita-resourcebundle", KoStore::Zip));
         if (!resourceStore || resourceStore->bad()) {
             warnKrita << "Could not open store on bundle" << bn;
             return false;
         }
 
         if (resourceStore->isOpen()) resourceStore->close();
 
         if (!resourceStore->open(fn)) {
             warnKrita << "Could not open preset" << fn << "in bundle" << bn;
             return false;
         }
 
         ba = resourceStore->device()->readAll();
         dev = new QBuffer(&ba);
 
         resourceStore->close();
     }
     else {
 
         dev = new QFile(filename());
         if (dev->size() == 0)
         {
             delete dev;
             return false;
         }
 
         if (!dev->open(QIODevice::ReadOnly)) {
             warnKrita << "Can't open file " << filename();
             delete dev;
             return false;
         }
     }
 
     bool res = loadFromDevice(dev);
     delete dev;
 
     setValid(res);
     setPresetDirty(false);
     return res;
 
 }
 
 bool KisPaintOpPreset::loadFromDevice(QIODevice *dev)
 {
 
     QImageReader reader(dev, "PNG");
 
     QString version = reader.text("version");
     QString preset = reader.text("preset");
 
     dbgImage << version;
 
     if (version != "2.2") {
         return false;
     }
 
     QImage img;
     if (!reader.read(&img)) {
         dbgImage << "Fail to decode PNG";
         return false;
     }
 
     //Workaround for broken presets
     //Presets was saved with nested cdata section
     preset.replace("<curve><![CDATA[", "<curve>");
     preset.replace("]]></curve>", "</curve>");
 
     QDomDocument doc;
     if (!doc.setContent(preset)) {
         return false;
     }
 
     fromXML(doc.documentElement());
 
     if (!m_d->settings) {
         return false;
     }
 
     setValid(true);
     setImage(img);
 
     return true;
 }
 
 bool KisPaintOpPreset::save()
 {
 
     if (filename().isEmpty())
         return false;
 
     QString paintopid = m_d->settings->getString("paintop", "");
 
     if (paintopid.isEmpty())
         return false;
 
     QFile f(filename());
     f.open(QFile::WriteOnly);
 
     return saveToDevice(&f);
 }
 
 void KisPaintOpPreset::toXML(QDomDocument& doc, QDomElement& elt) const
 {
     QString paintopid = m_d->settings->getString("paintop", "");
 
     elt.setAttribute("paintopid", paintopid);
     elt.setAttribute("name", name());
 
     // sanitize the settings
     bool hasTexture = m_d->settings->getBool("Texture/Pattern/Enabled");
     if (!hasTexture) {
         Q_FOREACH (const QString & key, m_d->settings->getProperties().keys()) {
             if (key.startsWith("Texture") && key != "Texture/Pattern/Enabled") {
                 m_d->settings->removeProperty(key);
             }
         }
     }
 
     m_d->settings->toXML(doc, elt);
 }
 
 void KisPaintOpPreset::fromXML(const QDomElement& presetElt)
 {
     setName(presetElt.attribute("name"));
     QString paintopid = presetElt.attribute("paintopid");
 
     if (paintopid.isEmpty()) {
         dbgImage << "No paintopid attribute";
         setValid(false);
         return;
     }
 
     if (KisPaintOpRegistry::instance()->get(paintopid) == 0) {
         dbgImage << "No paintop " << paintopid;
         setValid(false);
         return;
     }
 
     KoID id(paintopid, "");
 
     KisPaintOpSettingsSP settings = KisPaintOpRegistry::instance()->settings(id);
     if (!settings) {
         setValid(false);
         warnKrita << "Could not load settings for preset" << paintopid;
         return;
     }
 
     settings->fromXML(presetElt);
     // sanitize the settings
     bool hasTexture = settings->getBool("Texture/Pattern/Enabled");
     if (!hasTexture) {
         Q_FOREACH (const QString & key, settings->getProperties().keys()) {
             if (key.startsWith("Texture") && key != "Texture/Pattern/Enabled") {
                 settings->removeProperty(key);
             }
         }
     }
     setSettings(settings);
 
 }
 
 bool KisPaintOpPreset::saveToDevice(QIODevice *dev) const
 {
     QImageWriter writer(dev, "PNG");
 
     QDomDocument doc;
     QDomElement root = doc.createElement("Preset");
     toXML(doc, root);
     doc.appendChild(root);
 
     writer.setText("version", "2.2");
     writer.setText("preset", doc.toString());
 
     QImage img;
 
     if (image().isNull()) {
         img = QImage(1, 1, QImage::Format_RGB32);
     } else {
         img = image();
     }
 
     m_d->dirtyPreset = false;
 
     KoResource::saveToDevice(dev);
 
     return writer.write(img);
 
 }
 
+KisPaintopSettingsUpdateProxy* KisPaintOpPreset::updateProxy() const
+{
+    if (!m_d->updateProxy) {
+        m_d->updateProxy.reset(new KisPaintopSettingsUpdateProxy());
+    }
+    return m_d->updateProxy.data();
+}
+
+KisPaintopSettingsUpdateProxy* KisPaintOpPreset::updateProxyNoCreate() const
+{
+    return m_d->updateProxy.data();
+}
+
+QList<KisUniformPaintOpPropertySP> KisPaintOpPreset::uniformProperties()
+{
+    return m_d->settings->uniformProperties();
+}
diff --git a/libs/image/brushengine/kis_paintop_preset.h b/libs/image/brushengine/kis_paintop_preset.h
index 0b0fd93047..9213db29d2 100644
--- a/libs/image/brushengine/kis_paintop_preset.h
+++ b/libs/image/brushengine/kis_paintop_preset.h
@@ -1,114 +1,124 @@
 /* This file is part of the KDE project
  * Copyright (C) Boudewijn Rempt <boud@valdyas.org>, (C) 2008
  *
  * 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.
  */
 #ifndef KIS_PAINTOP_PRESET_H
 #define KIS_PAINTOP_PRESET_H
 
 #include <resources/KoResource.h>
 #include "KoID.h"
 
 #include "kis_types.h"
 #include "kis_shared.h"
 #include "kritaimage_export.h"
+#include <brushengine/kis_uniform_paintop_property.h>
 
+class KisPaintopSettingsUpdateProxy;
+class KisPaintOpConfigWidget;
 
 /**
  * A KisPaintOpPreset contains a particular set of settings
  * associated with a paintop, like brush, paintopsettings.
  * A new property in this class is to make it dirty. That means the
  * user can now temporarily save any tweaks in the Preset throughout
  * the session. The Dirty Preset setting/unsetting is handled by KisPaintOpPresetSettings
  */
 class KRITAIMAGE_EXPORT KisPaintOpPreset : public KoResource, public KisShared
 {
 public:
 
     KisPaintOpPreset();
 
     KisPaintOpPreset(const QString& filename);
 
     ~KisPaintOpPreset();
 
     KisPaintOpPresetSP clone() const;
 
     /// set the id of the paintop plugin
     void setPaintOp(const KoID & paintOp);
 
     /// return the id of the paintop plugin
     KoID paintOp() const;
 
     /// replace the current settings object with the specified settings
     void setSettings(KisPaintOpSettingsSP settings);
     void setOriginalSettings(KisPaintOpSettingsSP originalSettings);
 
     /// return the settings that define this paintop preset
     KisPaintOpSettingsSP settings() const;
     KisPaintOpSettingsSP originalSettings() const;
 
     bool load();
     bool loadFromDevice(QIODevice *dev);
 
     bool save();
     bool saveToDevice(QIODevice* dev) const;
 
     void toXML(QDomDocument& doc, QDomElement& elt) const;
 
     void fromXML(const QDomElement& elt);
 
     bool removable() const {
         return true;
     }
 
     QString defaultFileExtension() const {
         return ".kpp";
     }
     void setPresetDirty(bool value);
 
     bool isPresetDirty() const;
 
     /**
      * Never use manual save/restore calls to
      * isPresetDirty()/setPresetDirty()! They will lead to
      * hard-to-tack-down bugs when the dirty state will not be
      * restored on jumps like 'return', 'break' or exception.
      */
     class DirtyStateSaver {
     public:
         DirtyStateSaver(KisPaintOpPreset *preset)
             : m_preset(preset), m_isDirty(preset->isPresetDirty())
         {
         }
 
         ~DirtyStateSaver() {
             m_preset->setPresetDirty(m_isDirty);
         }
 
     private:
         KisPaintOpPreset *m_preset;
         bool m_isDirty;
     };
 
+    void setOptionsWidget(KisPaintOpConfigWidget *widget);
+
+    KisPaintopSettingsUpdateProxy* updateProxy() const;
+    KisPaintopSettingsUpdateProxy* updateProxyNoCreate() const;
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
 private:
 
     struct Private;
     Private * const m_d;
 };
 
 Q_DECLARE_METATYPE(KisPaintOpPresetSP)
 
 #endif
diff --git a/libs/image/brushengine/kis_paintop_settings.cpp b/libs/image/brushengine/kis_paintop_settings.cpp
index fade0b4462..993c762a22 100644
--- a/libs/image/brushengine/kis_paintop_settings.cpp
+++ b/libs/image/brushengine/kis_paintop_settings.cpp
@@ -1,361 +1,440 @@
 /*
  *  Copyright (c) 2007 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2008 Lukáš Tvrdý <lukast.dev@gmail.com>
  *  Copyright (c) 2014 Mohit Goyal <mohit.bits2011@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 <brushengine/kis_paintop_settings.h>
 
 #include <QImage>
 #include <QColor>
 #include <QPointer>
 
 #include <KoPointerEvent.h>
 #include <KoColor.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoViewConverter.h>
 
 #include "kis_paint_layer.h"
 #include "kis_image.h"
 #include "kis_painter.h"
 #include "kis_paint_device.h"
 #include "kis_paintop_registry.h"
 #include <brushengine/kis_paint_information.h>
 #include "kis_paintop_config_widget.h"
 #include <brushengine/kis_paintop_preset.h>
+#include "kis_paintop_settings_update_proxy.h"
 #include <time.h>
 #include<kis_types.h>
+#include <kis_signals_blocker.h>
+
+#include <brushengine/kis_locked_properties_server.h>
+#include <brushengine/kis_locked_properties_proxy.h>
+
 
 struct Q_DECL_HIDDEN KisPaintOpSettings::Private {
     Private() : disableDirtyNotifications(false) {}
 
     QPointer<KisPaintOpConfigWidget> settingsWidget;
     QString modelName;
     KisPaintOpPresetWSP preset;
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
 
 
     bool disableDirtyNotifications;
 
     class DirtyNotificationsLocker {
     public:
         DirtyNotificationsLocker(KisPaintOpSettings::Private *d)
             : m_d(d),
               m_oldNotificationsState(d->disableDirtyNotifications)
         {
             m_d->disableDirtyNotifications = true;
         }
 
         ~DirtyNotificationsLocker() {
             m_d->disableDirtyNotifications = m_oldNotificationsState;
         }
 
     private:
         KisPaintOpSettings::Private *m_d;
         bool m_oldNotificationsState;
         Q_DISABLE_COPY(DirtyNotificationsLocker)
     };
+
+    KisPaintopSettingsUpdateProxy* updateProxyNoCreate() const {
+        return preset ? preset->updateProxyNoCreate() : 0;
+    }
+
+    KisPaintopSettingsUpdateProxy* updateProxyCreate() const {
+        return preset ? preset->updateProxy() : 0;
+    }
 };
 
 
 KisPaintOpSettings::KisPaintOpSettings()
     : d(new Private)
 {
     d->preset = 0;
 }
 
 KisPaintOpSettings::~KisPaintOpSettings()
 {
 }
 
 void KisPaintOpSettings::setOptionsWidget(KisPaintOpConfigWidget* widget)
 {
     d->settingsWidget = widget;
 }
 void KisPaintOpSettings::setPreset(KisPaintOpPresetWSP preset)
 {
     d->preset = preset;
 }
 KisPaintOpPresetWSP KisPaintOpSettings::preset() const
 {
     return d->preset;
 }
 
 bool KisPaintOpSettings::mousePressEvent(const KisPaintInformation &pos, Qt::KeyboardModifiers modifiers, KisNodeWSP currentNode)
 {
     Q_UNUSED(pos);
     Q_UNUSED(modifiers);
     Q_UNUSED(currentNode);
     setRandomOffset();
     return true; // ignore the event by default
 }
 void KisPaintOpSettings::setRandomOffset()
 {
     srand(time(0));
     bool isRandomOffsetX = KisPropertiesConfiguration::getBool("Texture/Pattern/isRandomOffsetX");
     bool isRandomOffsetY = KisPropertiesConfiguration::getBool("Texture/Pattern/isRandomOffsetY");
     int offsetX = KisPropertiesConfiguration::getInt("Texture/Pattern/OffsetX");
     int offsetY = KisPropertiesConfiguration::getInt("Texture/Pattern/OffsetY");
     if (KisPropertiesConfiguration::getBool("Texture/Pattern/Enabled")) {
         if (isRandomOffsetX) {
             offsetX = rand() % KisPropertiesConfiguration::getInt("Texture/Pattern/MaximumOffsetX");
 
             KisPropertiesConfiguration::setProperty("Texture/Pattern/OffsetX", offsetX);
             offsetX = KisPropertiesConfiguration::getInt("Texture/Pattern/OffsetX");
 
         }
 
         if (isRandomOffsetY) {
             offsetY = rand() % KisPropertiesConfiguration::getInt("Texture/Pattern/MaximumOffsetY");
             KisPropertiesConfiguration::setProperty("Texture/Pattern/OffsetY", offsetY);
             offsetY = KisPropertiesConfiguration::getInt("Texture/Pattern/OffsetY");
         }
     }
 }
 
 
 KisPaintOpSettingsSP KisPaintOpSettings::clone() const
 {
     QString paintopID = getString("paintop");
     if (paintopID.isEmpty())
         return 0;
 
     KisPaintOpSettingsSP settings = KisPaintOpRegistry::instance()->settings(KoID(paintopID, ""));
     QMapIterator<QString, QVariant> i(getProperties());
     while (i.hasNext()) {
         i.next();
         settings->setProperty(i.key(), QVariant(i.value()));
     }
     settings->setPreset(this->preset());
     return settings;
 }
 
 void KisPaintOpSettings::activate()
 {
 }
 
-void KisPaintOpSettings::changePaintOpSize(qreal x, qreal y)
+void KisPaintOpSettings::setPaintOpOpacity(qreal value)
 {
-    if (!d->settingsWidget.isNull()) {
-        d->settingsWidget.data()->changePaintOpSize(x, y);
-        d->settingsWidget.data()->writeConfiguration(this);
-    }
-}
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
 
+    proxy->setProperty("OpacityValue", value);
+}
 
-QSizeF KisPaintOpSettings::paintOpSize() const
+void KisPaintOpSettings::setPaintOpFlow(qreal value)
 {
-    if (!d->settingsWidget.isNull()) {
-        return d->settingsWidget.data()->paintOpSize();
-    }
-    return QSizeF(1.0, 1.0);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    proxy->setProperty("FlowValue", value);
 }
 
-void KisPaintOpSettings::setPaintOpOpacity(qreal value)
+void KisPaintOpSettings::setPaintOpCompositeOp(const QString &value)
 {
-    setProperty("OpacityValue", value);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    proxy->setProperty("CompositeOp", value);
 }
 
-void KisPaintOpSettings::setPaintOpFlow(qreal value)
+qreal KisPaintOpSettings::paintOpOpacity() const
 {
-    setProperty("FlowValue", value);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    return proxy->getDouble("OpacityValue", 1.0);
 }
 
-void KisPaintOpSettings::setPaintOpCompositeOp(const QString &value)
+qreal KisPaintOpSettings::paintOpFlow() const
 {
-    setProperty("CompositeOp", value);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    return proxy->getDouble("FlowValue", 1.0);
 }
 
-qreal KisPaintOpSettings::paintOpOpacity() const
+void KisPaintOpSettings::setPaintOpSize(qreal value)
 {
-    return getDouble("OpacityValue", 1.0);
+    /**
+     * The widget already has the wrapping for the locked setings
+     * functionality, so just request it.
+     */
+
+    if (d->settingsWidget) {
+        const qreal sizeDiff = value - paintOpSize();
+
+        {
+            KisSignalsBlocker b(d->settingsWidget);
+            d->settingsWidget.data()->setConfigurationSafe(this);
+            d->settingsWidget.data()->changePaintOpSize(sizeDiff, 0);
+        }
+        d->settingsWidget.data()->writeConfigurationSafe(this);
+    }
 }
 
-qreal KisPaintOpSettings::paintOpFlow() const
+qreal KisPaintOpSettings::paintOpSize() const
 {
-    return getDouble("FlowValue", 1.0);
+    // see a comment about locked settings in setPaintOpSize()
+
+    qreal size = 1.0;
+
+    if (d->settingsWidget) {
+        size = d->settingsWidget.data()->paintOpSize().width();
+    }
+
+    return size;
 }
 
 QString KisPaintOpSettings::paintOpCompositeOp() const
 {
-    return getString("CompositeOp", COMPOSITE_OVER);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    return proxy->getString("CompositeOp", COMPOSITE_OVER);
 }
 
 void KisPaintOpSettings::setEraserMode(bool value)
 {
-    setProperty("EraserMode", value);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    proxy->setProperty("EraserMode", value);
 }
 
 bool KisPaintOpSettings::eraserMode() const
 {
-    return getBool("EraserMode", false);
+    KisLockedPropertiesProxySP proxy(
+        KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(this));
+
+    return proxy->getBool("EraserMode", false);
 }
 
 QString KisPaintOpSettings::effectivePaintOpCompositeOp() const
 {
     return !eraserMode() ? paintOpCompositeOp() : COMPOSITE_ERASE;
 }
 
 qreal KisPaintOpSettings::savedEraserSize() const
 {
     return getDouble("SavedEraserSize", 0.0);
 }
 
 void KisPaintOpSettings::setSavedEraserSize(qreal value)
 {
     setProperty("SavedEraserSize", value);
     setPropertyNotSaved("SavedEraserSize");
 }
 
 qreal KisPaintOpSettings::savedBrushSize() const
 {
     return getDouble("SavedBrushSize", 0.0);
 }
 
 void KisPaintOpSettings::setSavedBrushSize(qreal value)
 {
     setProperty("SavedBrushSize", value);
     setPropertyNotSaved("SavedBrushSize");
 }
 
 
 QString KisPaintOpSettings::modelName() const
 {
     return d->modelName;
 }
 
 void KisPaintOpSettings::setModelName(const QString & modelName)
 {
     d->modelName = modelName;
 }
 
 KisPaintOpConfigWidget* KisPaintOpSettings::optionsWidget() const
 {
     if (d->settingsWidget.isNull())
         return 0;
 
     return d->settingsWidget.data();
 }
 
 bool KisPaintOpSettings::isValid() const
 {
     return true;
 }
 
 bool KisPaintOpSettings::isLoadable()
 {
     return isValid();
 }
 
 QString KisPaintOpSettings::indirectPaintingCompositeOp() const
 {
     return COMPOSITE_ALPHA_DARKEN;
 }
 
 QPainterPath KisPaintOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     QPainterPath path;
     if (mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
         path = ellipseOutline(10, 10, 1.0, 0);
         
         if (mode == CursorTiltOutline) {
             path.addPath(makeTiltIndicator(info, QPointF(0.0, 0.0), 0.0, 2.0));
         }
 
         path.translate(info.pos());
     }
 
     return path;
 }
 
 QPainterPath KisPaintOpSettings::ellipseOutline(qreal width, qreal height, qreal scale, qreal rotation)
 {
     QPainterPath path;
     QRectF ellipse(0, 0, width * scale, height * scale);
     ellipse.translate(-ellipse.center());
     path.addEllipse(ellipse);
 
     QTransform m;
     m.reset();
     m.rotate(rotation);
     path = m.map(path);
     return path;
 }
 
 QPainterPath KisPaintOpSettings::makeTiltIndicator(KisPaintInformation const& info,
     QPointF const& start, qreal maxLength, qreal angle)
 {
     if (maxLength == 0.0) maxLength = 50.0;
     maxLength = qMax(maxLength, 50.0);
     qreal const length = maxLength * (1 - info.tiltElevation(info, 60.0, 60.0, true));
     qreal const baseAngle = 360.0 - fmod(KisPaintInformation::tiltDirection(info, true) * 360.0 + 270.0, 360.0);
 
     QLineF guideLine = QLineF::fromPolar(length, baseAngle + angle);
     guideLine.translate(start);
     QPainterPath ret;
     ret.moveTo(guideLine.p1());
     ret.lineTo(guideLine.p2());
     guideLine.setAngle(baseAngle - angle);
     ret.lineTo(guideLine.p2());
     ret.lineTo(guideLine.p1());
     return ret;
 }
 
 void KisPaintOpSettings::setCanvasRotation(qreal angle)
 {
     Private::DirtyNotificationsLocker locker(d.data());
 
     setProperty("runtimeCanvasRotation", angle);
     setPropertyNotSaved("runtimeCanvasRotation");
 }
 
 void KisPaintOpSettings::setCanvasMirroring(bool xAxisMirrored, bool yAxisMirrored)
 {
     Private::DirtyNotificationsLocker locker(d.data());
 
     setProperty("runtimeCanvasMirroredX", xAxisMirrored);
     setPropertyNotSaved("runtimeCanvasMirroredX");
 
     setProperty("runtimeCanvasMirroredY", yAxisMirrored);
     setPropertyNotSaved("runtimeCanvasMirroredY");
 }
 
 void KisPaintOpSettings::setProperty(const QString & name, const QVariant & value)
 {
     if (value != KisPropertiesConfiguration::getProperty(name) &&
         !d->disableDirtyNotifications && this->preset()) {
 
         this->preset()->setPresetDirty(true);
     }
 
     KisPropertiesConfiguration::setProperty(name, value);
     onPropertyChanged();
 }
 
 
 void KisPaintOpSettings::onPropertyChanged()
 {
+    KisPaintopSettingsUpdateProxy *proxy = d->updateProxyNoCreate();
 
+    if (proxy) {
+        proxy->notifySettingsChanged();
+    }
 }
 
 bool KisPaintOpSettings::isLodUserAllowed(const KisPropertiesConfiguration *config)
 {
     return config->getBool("lodUserAllowed", true);
 }
 
 void KisPaintOpSettings::setLodUserAllowed(KisPropertiesConfiguration *config, bool value)
 {
     config->setProperty("lodUserAllowed", value);
 }
+
+#include "kis_standard_uniform_properties_factory.h"
+
+QList<KisUniformPaintOpPropertySP> KisPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(d->uniformProperties);
+
+
+    if (props.isEmpty()) {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        props.append(createProperty(opacity, this, d->updateProxyCreate()));
+        props.append(createProperty(size, this, d->updateProxyCreate()));
+        props.append(createProperty(flow, this, d->updateProxyCreate()));
+
+        d->uniformProperties = listStrongToWeak(props);
+    }
+
+    return props;
+}
diff --git a/libs/image/brushengine/kis_paintop_settings.h b/libs/image/brushengine/kis_paintop_settings.h
index bcbc48f4a2..1af16fc1a2 100644
--- a/libs/image/brushengine/kis_paintop_settings.h
+++ b/libs/image/brushengine/kis_paintop_settings.h
@@ -1,276 +1,275 @@
 /*
  *  Copyright (c) 2007 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_PAINTOP_SETTINGS_H_
 #define KIS_PAINTOP_SETTINGS_H_
 
 #include "kis_types.h"
 #include "kritaimage_export.h"
 
 #include <QImage>
 #include <QScopedPointer>
 
 #include "kis_shared.h"
 #include "kis_properties_configuration.h"
 #include <brushengine/kis_paint_information.h>
+#include <brushengine/kis_uniform_paintop_property.h>
+
 
 
 class KisPaintOpConfigWidget;
+class KisPaintopSettingsUpdateProxy;
 
 /**
  * This class is used to cache the settings for a paintop
  * between two creations. There is one KisPaintOpSettings per input device (mouse, tablet,
  * etc...).
  *
  * The settings may be stored in a preset or a recorded brush stroke. Note that if your
  * paintop's settings subclass has data that is not stored as a property, that data is not
  * saved and restored.
  *
  * The object also contains a pointer to its parent KisPaintOpPreset object.This is to control the DirtyPreset
  * property of KisPaintOpPreset. Whenever the settings are changed/modified from the original -- the preset is
  * set to dirty.
  */
 class KRITAIMAGE_EXPORT KisPaintOpSettings : public KisPropertiesConfiguration, public KisShared
 {
 
 public:
 
     KisPaintOpSettings();
 
     virtual ~KisPaintOpSettings();
 
     /**
      *
      */
     virtual void setOptionsWidget(KisPaintOpConfigWidget* widget);
 
     /**
      * This function is called by a tool when the mouse is pressed. It's useful if
      * the paintop needs mouse interaction for instance in the case of the clone op.
      * If the tool is supposed to ignore the event, the paint op should return false
      * and if the tool is supposed to use the event, return true.
      */
     virtual bool mousePressEvent(const KisPaintInformation &pos, Qt::KeyboardModifiers modifiers, KisNodeWSP currentNode);
 
     /**
      * This function is called to set random offsets to the brush whenever the mouse is clicked. It is
      * specific to when the pattern option is set.
      *
      */
     virtual void setRandomOffset();
 
     /**
      * Clone the current settings object. Override this if your settings instance doesn't
      * store everything as properties.
      */
     virtual KisPaintOpSettingsSP clone() const;
 
     /**
      * @return the node the paintop is working on.
      */
     KisNodeSP node() const;
 
     /**
      * Call this function when the paint op is selected or the tool is activated
      */
     virtual void activate();
 
     /**
      * XXX: Remove this after 2.0, when the paint operation (incremental/non incremental) will
      *      be completely handled in the paintop, not in the tool. This is a filthy hack to move
      *      the option to the right place, at least.
      * @return true if we paint incrementally, false if we paint like Photoshop. By default, paintops
      *      do not support non-incremental.
      */
     virtual bool paintIncremental() {
         return true;
     }
 
     /**
      * @return the composite op it to which the indirect painting device
      * should be initialized to. This is used by clone op to reset
      * the composite op to COMPOSITE_COPY
      */
     virtual QString indirectPaintingCompositeOp() const;
 
     /**
      * Whether this paintop wants to deposit paint even when not moving, i.e. the
      * tool needs to activate its timer.
      */
     virtual bool isAirbrushing() const {
         return false;
     }
 
     /**
     * If this paintop deposit the paint even when not moving, the tool needs to know the rate of it in miliseconds
     */
     virtual int rate() const {
         return 100;
     }
 
     /**
      * This enum defines the current mode for painting an outline.
      */
     enum OutlineMode {
         CursorIsOutline = 1, ///< When this mode is set, an outline is painted around the cursor
         CursorIsCircleOutline,
         CursorNoOutline,
         CursorTiltOutline,
         CursorColorOutline
     };
 
     /**
      * Returns the brush outline in pixel coordinates. Tool is responsible for conversion into view coordinates.
      * Outline mode has to be passed to the paintop which builds the outline as some paintops have to paint outline
      * always like clone paintop indicating the duplicate position
      */
     virtual QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
 
     /**
     * Helpers for drawing the brush outline
     */
     static QPainterPath ellipseOutline(qreal width, qreal height, qreal scale, qreal rotation);
 
     /**
      * Helper for drawing a triangle representing the tilt of the stylus.
      *
      * @param start is the offset from the brush's outline's bounding box
      * @param lengthScale is used for deciding the size of the triangle.
      * Brush diameter or width are common choices for this.
      * @param angle is the angle between the two sides of the triangle.
      */
     static QPainterPath makeTiltIndicator(KisPaintInformation const& info,
         QPointF const& start, qreal lengthScale, qreal angle);
 
-    /**
-     * The behaviour might be different per paintop. Most of the time
-     * the brush diameter is increased by x pixels, y ignored
-     *
-     * @param x is add to the diameter or radius (according the paintop)
-     *  It might be also negative, to decrease the value of the brush diameter/radius.
-     *  x is in pixels
-     * @param y is unused, it supposed to be used to change some different attribute
-     * of the brush like softness or density
-     */
-    virtual void changePaintOpSize(qreal x, qreal y);
-
-    /**
-     * @return The width and the height of the brush mask/dab in pixels
-     */
-    virtual QSizeF paintOpSize() const;
-
     /**
      * Set paintop opacity directly in the properties
      */
     void setPaintOpOpacity(qreal value);
 
     /**
      * Set paintop flow directly in the properties
      */
     void setPaintOpFlow(qreal value);
 
     /**
      * Set paintop composite mode directly in the properties
      */
     void setPaintOpCompositeOp(const QString &value);
 
     /**
      * @return opacity saved in the properties
      */
     qreal paintOpOpacity() const;
 
     /**
      * @return flow saved in the properties
      */
     qreal paintOpFlow() const;
 
     /**
      * @return composite mode saved in the properties
      */
     QString paintOpCompositeOp() const;
 
+    /**
+     * Set paintop size directly in the properties
+     */
+    void setPaintOpSize(qreal value);
+
+    /**
+     * @return size saved in the properties
+     */
+    qreal paintOpSize() const;
+
     void setEraserMode(bool value);
     bool eraserMode() const;
 
     qreal savedEraserSize() const;
     void setSavedEraserSize(qreal value);
     qreal savedBrushSize() const;
     void setSavedBrushSize(qreal value);
 
     QString effectivePaintOpCompositeOp() const;
 
     void setPreset(KisPaintOpPresetWSP preset);
 
     KisPaintOpPresetWSP preset() const;
 
     /**
      * @return filename of the 3D brush model, empty if no brush is set
      */
     virtual QString modelName() const;
 
     /**
     * Set filename of 3D brush model. By default no brush is set
     */
     void setModelName(const QString & modelName);
 
     /// Check if the settings are valid, setting might be invalid through missing brushes etc
     /// Overwrite if the settings of a paintop can be invalid
     /// @return state of the settings, default implementation is true
     virtual bool isValid() const;
 
     /// Check if the settings are loadable, that might the case if we can fallback to something
     /// Overwrite if the settings can do some kind of fallback
     /// @return loadable state of the settings, by default implementation return the same as isValid()
     virtual bool isLoadable();
 
     /**
      * These methods are populating properties with runtime
      * information about canvas rotation/mirroring. This information
      * is set directly by KisToolFreehand. Later the data is accessed
      * by the pressure options to make a final decision.
      */
     void setCanvasRotation(qreal angle);
     void setCanvasMirroring(bool xAxisMirrored, bool yAxisMirrored);
 
     /**
      * Overrides the method in KisPropertiesCofiguration to allow
      * onPropertyChanged() callback
      */
     void setProperty(const QString & name, const QVariant & value);
 
+    virtual QList<KisUniformPaintOpPropertySP> uniformProperties();
+
     static bool isLodUserAllowed(const KisPropertiesConfiguration *config);
     static void setLodUserAllowed(KisPropertiesConfiguration *config, bool value);
 
-protected:
     /**
     * @return the option widget of the paintop (can be 0 is no option widgets is set)
     */
     KisPaintOpConfigWidget* optionsWidget() const;
 
+protected:
+
     /**
      * The callback is called every time when a property changes
      */
     virtual void onPropertyChanged();
 
 
 private:
     struct Private;
     const QScopedPointer<Private> d;
 };
 
 #endif
diff --git a/libs/flake/KoDerivedResourceConverter.cpp b/libs/image/brushengine/kis_paintop_settings_update_proxy.cpp
similarity index 53%
copy from libs/flake/KoDerivedResourceConverter.cpp
copy to libs/image/brushengine/kis_paintop_settings_update_proxy.cpp
index 1ae9f1c111..421e23b3d3 100644
--- a/libs/flake/KoDerivedResourceConverter.cpp
+++ b/libs/image/brushengine/kis_paintop_settings_update_proxy.cpp
@@ -1,52 +1,49 @@
 /*
  *  Copyright (c) 2016 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 "KoDerivedResourceConverter.h"
+#include "kis_paintop_settings_update_proxy.h"
 
-#include "QVariant"
+#include "kis_signal_compressor.h"
 
 
-struct KoDerivedResourceConverter::Private
+struct KisPaintopSettingsUpdateProxy::Private
 {
-    Private(int _key, int _sourceKey)
-        : key(_key), sourceKey(_sourceKey) {}
-
-    int key;
-    int sourceKey;
+    Private() : updatesCompressor(100, KisSignalCompressor::FIRST_ACTIVE) {}
+    KisSignalCompressor updatesCompressor;
 };
 
-
-KoDerivedResourceConverter::KoDerivedResourceConverter(int key, int sourceKey)
-    : m_d(new Private(key, sourceKey))
+KisPaintopSettingsUpdateProxy::KisPaintopSettingsUpdateProxy(QObject *parent)
+    : QObject(parent),
+      m_d(new Private)
 {
+    connect(&m_d->updatesCompressor, SIGNAL(timeout()), SIGNAL(sigSettingsChanged()));
 }
 
-KoDerivedResourceConverter::~KoDerivedResourceConverter()
+KisPaintopSettingsUpdateProxy::~KisPaintopSettingsUpdateProxy()
 {
 }
 
-int KoDerivedResourceConverter::key() const
+void KisPaintopSettingsUpdateProxy::notifySettingsChanged()
 {
-    return m_d->key;
+    m_d->updatesCompressor.start();
 }
 
-int KoDerivedResourceConverter::sourceKey() const
+void KisPaintopSettingsUpdateProxy::notifyUniformPropertiesChanged()
 {
-    return m_d->sourceKey;
+    emit sigUniformPropertiesChanged();
 }
-
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/image/brushengine/kis_paintop_settings_update_proxy.h
similarity index 62%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/image/brushengine/kis_paintop_settings_update_proxy.h
index 191461c149..bcaf996dec 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/image/brushengine/kis_paintop_settings_update_proxy.h
@@ -1,53 +1,46 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_PAINTOP_SETTINGS_UPDATE_PROXY_H
+#define __KIS_PAINTOP_SETTINGS_UPDATE_PROXY_H
 
 #include <QScopedPointer>
 #include <QObject>
-#include "kritaui_export.h"
 
-class QSpinBox;
-class KoAspectButton;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+class KisPaintopSettingsUpdateProxy : public QObject
 {
     Q_OBJECT
-public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
-
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
 
+public:
+    KisPaintopSettingsUpdateProxy(QObject *parent = 0);
+    ~KisPaintopSettingsUpdateProxy();
 
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+    void notifySettingsChanged();
+    void notifyUniformPropertiesChanged();
 
 Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+    void sigSettingsChanged();
+    void sigUniformPropertiesChanged();
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_PAINTOP_SETTINGS_UPDATE_PROXY_H */
diff --git a/libs/image/brushengine/kis_slider_based_paintop_property.h b/libs/image/brushengine/kis_slider_based_paintop_property.h
new file mode 100644
index 0000000000..79d4f0448d
--- /dev/null
+++ b/libs/image/brushengine/kis_slider_based_paintop_property.h
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_SLIDER_BASED_PAINTOP_PROPERTY_H
+#define __KIS_SLIDER_BASED_PAINTOP_PROPERTY_H
+
+#include "kis_uniform_paintop_property.h"
+
+
+/**
+ * This is a general class for the properties that can be represented
+ * in the GUI as an integer or double slider. The GUI representation
+ * creates a slider and connects it to this property using all the
+ * information contained in it.
+ *
+ * Methods of this property basically copy the methods of
+ * Kis{,Double}SliderSpinbox
+ */
+
+template <typename T>
+class KisSliderBasedPaintOpProperty : public KisUniformPaintOpProperty
+{
+public:
+    KisSliderBasedPaintOpProperty(Type type,
+                                  const QString &id,
+                                  const QString &name,
+                                  KisPaintOpSettingsSP settings,
+                                  QObject *parent)
+        : KisUniformPaintOpProperty(type, id, name, settings, parent),
+        m_min(T(0)),
+        m_max(T(100)),
+        m_singleStep(T(1)),
+        m_pageStep(T(10)),
+        m_exponentRatio(1.0),
+        m_decimals(2)
+    {
+    }
+
+    T min() const {
+        return m_min;
+    }
+    T max() const {
+        return m_max;
+    }
+    void setRange(T min, T max) {
+        m_min = min;
+        m_max = max;
+    }
+
+    T singleStep() const {
+        return m_singleStep;
+    }
+    void setSingleStep(T value) {
+        m_singleStep = value;
+    }
+
+    T pageStep() const {
+        return m_pageStep;
+    }
+    void setPageStep(T value) {
+        m_pageStep = value;
+    }
+
+    qreal exponentRatio() const {
+        return m_exponentRatio;
+    }
+    void setExponentRatio(qreal value) {
+        m_exponentRatio = value;
+    }
+
+    int decimals() const {
+        return m_decimals;
+    }
+    void setDecimals(int value) {
+        m_decimals = value;
+    }
+
+    QString suffix() const {
+        return m_suffix;
+    }
+    void setSuffix(QString value) {
+        m_suffix = value;
+    }
+
+
+private:
+    T m_min;
+    T m_max;
+
+    T m_singleStep;
+    T m_pageStep;
+    qreal m_exponentRatio;
+
+    int m_decimals;
+    QString m_suffix;
+};
+
+typedef KisSliderBasedPaintOpProperty<int> KisIntSliderBasedPaintOpProperty;
+typedef KisSliderBasedPaintOpProperty<qreal> KisDoubleSliderBasedPaintOpProperty;
+
+#include "kis_callback_based_paintop_property.h"
+
+typedef KisCallbackBasedPaintopProperty<KisIntSliderBasedPaintOpProperty> KisIntSliderBasedPaintOpPropertyCallback;
+typedef KisCallbackBasedPaintopProperty<KisDoubleSliderBasedPaintOpProperty> KisDoubleSliderBasedPaintOpPropertyCallback;
+
+#endif /* __KIS_SLIDER_BASED_PAINTOP_PROPERTY_H */
diff --git a/libs/image/brushengine/kis_standard_uniform_properties_factory.cpp b/libs/image/brushengine/kis_standard_uniform_properties_factory.cpp
new file mode 100644
index 0000000000..ff263eaae2
--- /dev/null
+++ b/libs/image/brushengine/kis_standard_uniform_properties_factory.cpp
@@ -0,0 +1,125 @@
+/*
+ *  Copyright (c) 2016 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_standard_uniform_properties_factory.h"
+
+#include "kis_slider_based_paintop_property.h"
+#include "kis_paintop_settings.h"
+#include "kis_paintop_settings_update_proxy.h"
+
+namespace KisStandardUniformPropertiesFactory {
+
+    KisUniformPaintOpPropertySP createProperty(const KoID &id,
+                                               KisPaintOpSettingsSP settings,
+                                               KisPaintopSettingsUpdateProxy *updateProxy)
+    {
+        return createProperty(id.id(), settings, updateProxy);
+    }
+
+    KisUniformPaintOpPropertySP createProperty(const QString &id,
+                                               KisPaintOpSettingsSP settings,
+                                               KisPaintopSettingsUpdateProxy *updateProxy)
+    {
+        KisUniformPaintOpPropertySP result;
+
+
+        if (id == size.id()) {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "size",
+                    i18n("Size"),
+                    settings, 0);
+
+            prop->setRange(0, 1000);
+            prop->setDecimals(2);
+            prop->setSingleStep(1);
+            prop->setExponentRatio(3.0);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->setValue(prop->settings()->paintOpSize());
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->settings()->setPaintOpSize(prop->value().toReal());
+                });
+
+            QObject::connect(updateProxy, SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            result = toQShared(prop);
+        } else if (id == opacity.id()) {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    opacity.id(),
+                    opacity.name(),
+                    settings, 0);
+
+            prop->setRange(0.0, 1.0);
+            prop->setSingleStep(0.01);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->setValue(prop->settings()->paintOpOpacity());
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->settings()->setPaintOpOpacity(prop->value().toReal());
+                });
+
+            QObject::connect(updateProxy, SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            result = toQShared(prop);
+        } else if (id == flow.id()) {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    flow.id(),
+                    flow.name(),
+                    settings, 0);
+
+            prop->setRange(0.0, 1.0);
+            prop->setSingleStep(0.01);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->setValue(prop->settings()->paintOpFlow());
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    prop->settings()->setPaintOpFlow(prop->value().toReal());
+                });
+
+            QObject::connect(updateProxy, SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            result = toQShared(prop);
+        } else if (id == angle.id()) {
+            qFatal("Not implemented");
+        } else if (id == spacing.id()) {
+            qFatal("Not implemented");
+        }
+
+        if (!result) {
+            KIS_SAFE_ASSERT_RECOVER_NOOP(0 && "Unknown Uniform property id!");
+        }
+
+        return result;
+    }
+}
diff --git a/libs/image/brushengine/kis_standard_uniform_properties_factory.h b/libs/image/brushengine/kis_standard_uniform_properties_factory.h
new file mode 100644
index 0000000000..a03f77cf1f
--- /dev/null
+++ b/libs/image/brushengine/kis_standard_uniform_properties_factory.h
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_STANDARD_UNIFORM_PROPERTIES_FACTORY_H
+#define __KIS_STANDARD_UNIFORM_PROPERTIES_FACTORY_H
+
+#include <KoID.h>
+
+#include "kis_uniform_paintop_property.h"
+
+class KisPaintopSettingsUpdateProxy;
+
+namespace KisStandardUniformPropertiesFactory
+{
+    static const KoID size("size", i18n("Size"));
+    static const KoID opacity("opacity", i18n("Opacity"));
+    static const KoID flow("flow", i18n("Flow"));
+    static const KoID angle("angle", i18n("Angle"));
+    static const KoID spacing("spacing", i18n("Spacing"));
+
+    /**
+     * Overload of createProperty(const QString &id, ...)
+     */
+    KisUniformPaintOpPropertySP createProperty(const KoID &id,
+                                               KisPaintOpSettingsSP settings,
+                                               KisPaintopSettingsUpdateProxy *updateProxy);
+
+    /**
+     * Factory for creating standard uniform properties. Right now
+     * it supports only size, opacity and flow.
+     */
+    KisUniformPaintOpPropertySP createProperty(const QString &id,
+                                               KisPaintOpSettingsSP settings,
+                                               KisPaintopSettingsUpdateProxy *updateProxy);
+}
+
+#endif /* __KIS_STANDARD_UNIFORM_PROPERTIES_FACTORY_H */
diff --git a/libs/image/brushengine/kis_uniform_paintop_property.cpp b/libs/image/brushengine/kis_uniform_paintop_property.cpp
new file mode 100644
index 0000000000..7d91ba2c6a
--- /dev/null
+++ b/libs/image/brushengine/kis_uniform_paintop_property.cpp
@@ -0,0 +1,129 @@
+/*
+ *  Copyright (c) 2016 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_uniform_paintop_property.h"
+
+#include <QVariant>
+#include "kis_debug.h"
+#include "kis_paintop_settings.h"
+
+struct KisUniformPaintOpProperty::Private
+{
+    Private(Type _type,
+            const QString &_id,
+            const QString &_name,
+            KisPaintOpSettingsSP _settings)
+        : type(_type),
+          id(_id),
+          name(_name),
+          settings(_settings),
+          isReadingValue(false),
+          isWritingValue(false) {}
+
+    Type type;
+    QString id;
+    QString name;
+
+    QVariant value;
+
+    KisPaintOpSettingsSP settings;
+    bool isReadingValue;
+    bool isWritingValue;
+};
+
+KisUniformPaintOpProperty::KisUniformPaintOpProperty(Type type,
+                                                     const QString &id,
+                                                     const QString &name,
+                                                     KisPaintOpSettingsSP settings,
+                                                     QObject *parent)
+    : QObject(parent),
+      m_d(new Private(type, id, name, settings))
+{
+}
+
+KisUniformPaintOpProperty::~KisUniformPaintOpProperty()
+{
+}
+
+QString KisUniformPaintOpProperty::id() const
+{
+    return m_d->id;
+}
+
+QString KisUniformPaintOpProperty::name() const
+{
+    return m_d->name;
+}
+
+KisUniformPaintOpProperty::Type KisUniformPaintOpProperty::type() const
+{
+    return m_d->type;
+}
+
+QVariant KisUniformPaintOpProperty::value() const
+{
+    return m_d->value;
+}
+
+QWidget *KisUniformPaintOpProperty::createPropertyWidget()
+{
+    return 0;
+}
+
+void KisUniformPaintOpProperty::setValue(const QVariant &value)
+{
+    if (m_d->value == value) return;
+    m_d->value = value;
+
+    emit valueChanged(value);
+
+    if (!m_d->isReadingValue) {
+        m_d->isWritingValue = true;
+        writeValueImpl();
+        m_d->isWritingValue = false;
+    }
+}
+
+void KisUniformPaintOpProperty::requestReadValue()
+{
+    if (m_d->isWritingValue) return;
+
+    m_d->isReadingValue = true;
+    readValueImpl();
+    m_d->isReadingValue = false;
+}
+
+KisPaintOpSettingsSP KisUniformPaintOpProperty::settings() const
+{
+    // correct conversion weak-to-strong shared pointer
+    return m_d->settings ? m_d->settings : 0;
+}
+
+bool KisUniformPaintOpProperty::isVisible() const
+{
+    return true;
+}
+
+void KisUniformPaintOpProperty::readValueImpl()
+{
+}
+
+void KisUniformPaintOpProperty::writeValueImpl()
+{
+}
+
diff --git a/libs/image/brushengine/kis_uniform_paintop_property.h b/libs/image/brushengine/kis_uniform_paintop_property.h
new file mode 100644
index 0000000000..bc3f7504d3
--- /dev/null
+++ b/libs/image/brushengine/kis_uniform_paintop_property.h
@@ -0,0 +1,83 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_UNIFORM_PAINT_OP_PROPERTY_H
+#define __KIS_UNIFORM_PAINT_OP_PROPERTY_H
+
+#include <QScopedPointer>
+#include <QObject>
+
+#include "kritaimage_export.h"
+#include "kis_types.h"
+
+
+class KRITAIMAGE_EXPORT KisUniformPaintOpProperty : public QObject
+{
+    Q_OBJECT
+public:
+    enum Type {
+        Int = 0,
+        Double,
+        Bool,
+        Combo
+    };
+
+public:
+    KisUniformPaintOpProperty(Type type,
+                              const QString &id,
+                              const QString &name,
+                              KisPaintOpSettingsSP settings,
+                              QObject *parent);
+    ~KisUniformPaintOpProperty();
+
+    QString id() const;
+    QString name() const;
+    Type type() const;
+
+    QVariant value() const;
+
+    QWidget *createPropertyWidget();
+
+    KisPaintOpSettingsSP settings() const;
+
+    virtual bool isVisible() const;
+
+public Q_SLOTS:
+    void setValue(const QVariant &value);
+    void requestReadValue();
+
+Q_SIGNALS:
+    void valueChanged(const QVariant &value);
+
+protected:
+    virtual void readValueImpl();
+    virtual void writeValueImpl();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+};
+
+template<class T> class QSharedPointer;
+template<class T> class QWeakPointer;
+template<class T> class QList;
+
+typedef QSharedPointer<KisUniformPaintOpProperty> KisUniformPaintOpPropertySP;
+typedef QWeakPointer<KisUniformPaintOpProperty> KisUniformPaintOpPropertyWSP;
+
+#endif /* __KIS_UNIFORM_PAINT_OP_PROPERTY_H */
diff --git a/libs/image/kis_acyclic_signal_connector.cpp b/libs/image/kis_acyclic_signal_connector.cpp
index cf617a336e..e1d620d29b 100644
--- a/libs/image/kis_acyclic_signal_connector.cpp
+++ b/libs/image/kis_acyclic_signal_connector.cpp
@@ -1,165 +1,197 @@
 /*
  *  Copyright (c) 2014 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_acyclic_signal_connector.h"
 
 #include "kis_debug.h"
 
 
 KisAcyclicSignalConnector::KisAcyclicSignalConnector(QObject *parent)
     : QObject(parent),
       m_signalsBlocked(0)
 {
 }
 
 void KisAcyclicSignalConnector::connectForwardDouble(QObject *sender, const char *signal,
                                                   QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(forwardSlotDouble(double)));
     connect(this, SIGNAL(forwardSignalDouble(double)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectBackwardDouble(QObject *sender, const char *signal,
                                                    QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(backwardSlotDouble(double)));
     connect(this, SIGNAL(backwardSignalDouble(double)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectForwardInt(QObject *sender, const char *signal,
                                                   QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(forwardSlotInt(int)));
     connect(this, SIGNAL(forwardSignalInt(int)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectBackwardInt(QObject *sender, const char *signal,
                                                    QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(backwardSlotInt(int)));
     connect(this, SIGNAL(backwardSignalInt(int)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectForwardBool(QObject *sender, const char *signal,
                                                   QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(forwardSlotBool(bool)));
     connect(this, SIGNAL(forwardSignalBool(bool)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectBackwardBool(QObject *sender, const char *signal,
                                                    QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(backwardSlotBool(bool)));
     connect(this, SIGNAL(backwardSignalBool(bool)), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectForwardVoid(QObject *sender, const char *signal,
                                                   QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(forwardSlotVoid()));
     connect(this, SIGNAL(forwardSignalVoid()), receiver, method);
 }
 
 void KisAcyclicSignalConnector::connectBackwardVoid(QObject *sender, const char *signal,
                                                  QObject *receiver, const char *method)
 {
 
     connect(sender, signal, this, SLOT(backwardSlotVoid()));
     connect(this, SIGNAL(backwardSignalVoid()), receiver, method);
 }
 
+void KisAcyclicSignalConnector::connectForwardVariant(QObject *sender, const char *signal,
+                                                  QObject *receiver, const char *method)
+{
+
+    connect(sender, signal, this, SLOT(forwardSlotVariant(const QVariant&)));
+    connect(this, SIGNAL(forwardSignalVariant(const QVariant&)), receiver, method);
+}
+
+void KisAcyclicSignalConnector::connectBackwardVariant(QObject *sender, const char *signal,
+                                                       QObject *receiver, const char *method)
+{
+    connect(sender, signal, this, SLOT(backwardSlotVariant(const QVariant&)));
+    connect(this, SIGNAL(backwardSignalVariant(const QVariant&)), receiver, method);
+}
+
 void KisAcyclicSignalConnector::forwardSlotDouble(double value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit forwardSignalDouble(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::backwardSlotDouble(double value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit backwardSignalDouble(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::forwardSlotInt(int value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit forwardSignalInt(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::backwardSlotInt(int value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit backwardSignalInt(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::forwardSlotBool(bool value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit forwardSignalBool(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::backwardSlotBool(bool value)
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit backwardSignalBool(value);
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::forwardSlotVoid()
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit forwardSignalVoid();
     m_signalsBlocked--;
 }
 
 void KisAcyclicSignalConnector::backwardSlotVoid()
 {
     if (m_signalsBlocked) return;
 
     m_signalsBlocked++;
     emit backwardSignalVoid();
     m_signalsBlocked--;
 }
 
+void KisAcyclicSignalConnector::forwardSlotVariant(const QVariant &value)
+{
+    if (m_signalsBlocked) return;
+
+    m_signalsBlocked++;
+    emit forwardSignalVariant(value);
+    m_signalsBlocked--;
+}
+
+void KisAcyclicSignalConnector::backwardSlotVariant(const QVariant &value)
+{
+    if (m_signalsBlocked) return;
+
+    m_signalsBlocked++;
+    emit backwardSignalVariant(value);
+    m_signalsBlocked--;
+}
diff --git a/libs/image/kis_acyclic_signal_connector.h b/libs/image/kis_acyclic_signal_connector.h
index 7ee341b7ef..84b2d124e0 100644
--- a/libs/image/kis_acyclic_signal_connector.h
+++ b/libs/image/kis_acyclic_signal_connector.h
@@ -1,106 +1,118 @@
 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef __KIS_ACYCLIC_SIGNAL_CONNECTOR_H
 #define __KIS_ACYCLIC_SIGNAL_CONNECTOR_H
 
 #include <QObject>
 #include "kritaimage_export.h"
 
 
 /**
  * A special class for connecting UI elements to manager classes.
  * It allows to avoid direct calling blockSignals() for the sender UI
  * element all the time. This is the most important when the measured
  * value can be changed not only by the user through the UI, but also
  * by the manager according to some internal rules.
  *
  * Example:
  *
  * Suppose we have the following connections:
  *
  * 1) QDoubleSpinBox::valueChanged(double) -> Manager::slotSetValue(double)
  * 2) Manager::valueChanged(double) -> QDoubleSpinBox::setValue(double)
  *
  * Now if the manager decides to change/correct the value, the spinbox
  * will go into an infinite loop.
  *
  * See an example in KisToolCropConfigWidget.
  */
 
 class KRITAIMAGE_EXPORT KisAcyclicSignalConnector : public QObject
 {
     Q_OBJECT
 public:
     KisAcyclicSignalConnector(QObject *parent);
 
     void connectForwardDouble(QObject *sender, const char *signal,
                               QObject *receiver, const char *method);
 
     void connectBackwardDouble(QObject *sender, const char *signal,
                                QObject *receiver, const char *method);
 
     void connectForwardInt(QObject *sender, const char *signal,
                            QObject *receiver, const char *method);
 
     void connectBackwardInt(QObject *sender, const char *signal,
                             QObject *receiver, const char *method);
 
     void connectForwardBool(QObject *sender, const char *signal,
                             QObject *receiver, const char *method);
 
     void connectBackwardBool(QObject *sender, const char *signal,
                              QObject *receiver, const char *method);
 
     void connectForwardVoid(QObject *sender, const char *signal,
                             QObject *receiver, const char *method);
 
     void connectBackwardVoid(QObject *sender, const char *signal,
                              QObject *receiver, const char *method);
 
+    void connectForwardVariant(QObject *sender, const char *signal,
+                               QObject *receiver, const char *method);
+
+    void connectBackwardVariant(QObject *sender, const char *signal,
+                                QObject *receiver, const char *method);
+
 private Q_SLOTS:
     void forwardSlotDouble(double value);
     void backwardSlotDouble(double value);
 
     void forwardSlotInt(int value);
     void backwardSlotInt(int value);
 
     void forwardSlotBool(bool value);
     void backwardSlotBool(bool value);
 
     void forwardSlotVoid();
     void backwardSlotVoid();
 
+    void forwardSlotVariant(const QVariant &value);
+    void backwardSlotVariant(const QVariant &value);
+
 Q_SIGNALS:
     void forwardSignalDouble(double value);
     void backwardSignalDouble(double value);
 
     void forwardSignalInt(int value);
     void backwardSignalInt(int value);
 
     void forwardSignalBool(bool value);
     void backwardSignalBool(bool value);
 
     void forwardSignalVoid();
     void backwardSignalVoid();
 
+    void forwardSignalVariant(const QVariant &value);
+    void backwardSignalVariant(const QVariant &value);
+
 private:
     int m_signalsBlocked;
 };
 
 #endif /* __KIS_ACYCLIC_SIGNAL_CONNECTOR_H */
diff --git a/libs/image/kis_brush_mask_applicators.h b/libs/image/kis_brush_mask_applicators.h
index 55a0c76b69..0e7b760be2 100644
--- a/libs/image/kis_brush_mask_applicators.h
+++ b/libs/image/kis_brush_mask_applicators.h
@@ -1,214 +1,214 @@
 /*
  *  Copyright (c) 2012 Sven Langkamp  <sven.langkamp@gmail.com>
  *  Copyright (c) 2012 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.
  */
 
 #ifndef __KIS_BRUSH_MASK_APPLICATORS_H
 #define __KIS_BRUSH_MASK_APPLICATORS_H
 
 #include "kis_brush_mask_applicator_base.h"
 #include "kis_global.h"
 
 // 3x3 supersampling
 #define SUPERSAMPLING 3
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <stdlib.h>
 #define srand48 srand
 inline double drand48() {
     return double(rand()) / RAND_MAX;
 }
 #endif
 
 #include <random>
 
 
 template<class MaskGenerator, Vc::Implementation _impl>
 struct KisBrushMaskScalarApplicator : public KisBrushMaskApplicatorBase
 {
     KisBrushMaskScalarApplicator(MaskGenerator *maskGenerator)
         : m_maskGenerator(maskGenerator)
     {
     }
 
     void process(const QRect &rect) {
         processScalar(rect);
     }
 
 protected:
     void processScalar(const QRect &rect);
 
 protected:
     MaskGenerator *m_maskGenerator;
 };
 
 #if defined HAVE_VC
 
 template<class MaskGenerator, Vc::Implementation _impl>
 struct KisBrushMaskVectorApplicator : public KisBrushMaskScalarApplicator<MaskGenerator, _impl>
 {
     KisBrushMaskVectorApplicator(MaskGenerator *maskGenerator)
         : KisBrushMaskScalarApplicator<MaskGenerator, _impl>(maskGenerator)
     {
     }
 
     void process(const QRect &rect) {
         startProcessing(rect, TypeHelper<MaskGenerator, _impl>());
     }
 
 protected:
     void processVector(const QRect &rect);
 
 private:
     template<class U, Vc::Implementation V> struct TypeHelper {};
 
 private:
     template<class U>
     inline void startProcessing(const QRect &rect, TypeHelper<U, Vc::ScalarImpl>) {
         KisBrushMaskScalarApplicator<MaskGenerator, _impl>::processScalar(rect);
     }
 
     template<class U, Vc::Implementation V>
     inline void startProcessing(const QRect &rect, TypeHelper<U, V>) {
         MaskGenerator *m_maskGenerator = KisBrushMaskScalarApplicator<MaskGenerator, _impl>::m_maskGenerator;
 
         if (m_maskGenerator->shouldVectorize()) {
             processVector(rect);
         } else {
             KisBrushMaskScalarApplicator<MaskGenerator, _impl>::processScalar(rect);
         }
     }
 };
 
 template<class MaskGenerator, Vc::Implementation _impl>
 void KisBrushMaskVectorApplicator<MaskGenerator, _impl>::processVector(const QRect &rect)
 {
     const MaskProcessingData *m_d = KisBrushMaskApplicatorBase::m_d;
     MaskGenerator *m_maskGenerator = KisBrushMaskScalarApplicator<MaskGenerator, _impl>::m_maskGenerator;
 
     qreal random = 1.0;
     quint8* dabPointer = m_d->device->data() + rect.y() * rect.width() * m_d->pixelSize;
     quint8 alphaValue = OPACITY_TRANSPARENT_U8;
     // this offset is needed when brush size is smaller then fixed device size
     int offset = (m_d->device->bounds().width() - rect.width()) * m_d->pixelSize;
 
     int width = rect.width();
 
     // We need to calculate with a multiple of the width of the simd register
     int alignOffset = 0;
     if (width % Vc::float_v::size() != 0) {
         alignOffset = Vc::float_v::size() - (width % Vc::float_v::size());
     }
     int simdWidth = width + alignOffset;
 
-    float *buffer = Vc::malloc<float, Vc::AlignOnVector>(simdWidth);
+    float *buffer = Vc::malloc<float, Vc::AlignOnCacheline>(simdWidth);
 
     typename MaskGenerator::FastRowProcessor processor(m_maskGenerator);
 
     for (int y = rect.y(); y < rect.y() + rect.height(); y++) {
 
         processor.template process<_impl>(buffer, simdWidth, y, m_d->cosa, m_d->sina, m_d->centerX, m_d->centerY);
 
         if (m_d->randomness != 0.0 || m_d->density != 1.0) {
             for (int x = 0; x < width; x++) {
 
                 if (m_d->randomness!= 0.0){
                     random = (1.0 - m_d->randomness) + m_d->randomness * float(rand()) / RAND_MAX;
                 }
 
                 alphaValue = quint8( (OPACITY_OPAQUE_U8 - buffer[x]*255) * random);
 
                 // avoid computation of random numbers if density is full
                 if (m_d->density != 1.0){
                     // compute density only for visible pixels of the mask
                     if (alphaValue != OPACITY_TRANSPARENT_U8){
                         if ( !(m_d->density >= drand48()) ){
                             alphaValue = OPACITY_TRANSPARENT_U8;
                         }
                     }
                 }
 
                 m_d->colorSpace->applyAlphaU8Mask(dabPointer, &alphaValue, 1);
                 dabPointer += m_d->pixelSize;
             }
         } else {
             m_d->colorSpace->applyInverseNormedFloatMask(dabPointer, buffer, width);
             dabPointer += width * m_d->pixelSize;
         }//endfor x
         dabPointer += offset;
     }//endfor y
     Vc::free(buffer);
 }
 
 #endif /* defined HAVE_VC */
 
 template<class MaskGenerator, Vc::Implementation _impl>
 void KisBrushMaskScalarApplicator<MaskGenerator, _impl>::processScalar(const QRect &rect)
 {
     const MaskProcessingData *m_d = KisBrushMaskApplicatorBase::m_d;
     MaskGenerator *m_maskGenerator = KisBrushMaskScalarApplicator<MaskGenerator, _impl>::m_maskGenerator;
 
     std::random_device rand_dev;
     std::default_random_engine rand_engine{rand_dev()};
     std::uniform_real_distribution<> rand_distr(0.0f, 1.0f);
 
     qreal random = 1.0;
     quint8* dabPointer = m_d->device->data() + rect.y() * rect.width() * m_d->pixelSize;
     quint8 alphaValue = OPACITY_TRANSPARENT_U8;
     // this offset is needed when brush size is smaller then fixed device size
     int offset = (m_d->device->bounds().width() - rect.width()) * m_d->pixelSize;
     int supersample = (m_maskGenerator->shouldSupersample() ? SUPERSAMPLING : 1);
     double invss = 1.0 / supersample;
     int samplearea = pow2(supersample);
     for (int y = rect.y(); y < rect.y() + rect.height(); y++) {
         for (int x = rect.x(); x < rect.x() + rect.width(); x++) {
             int value = 0;
             for (int sy = 0; sy < supersample; sy++) {
                 for (int sx = 0; sx < supersample; sx++) {
                     double x_ = x + sx * invss - m_d->centerX;
                     double y_ = y + sy * invss - m_d->centerY;
                     double maskX = m_d->cosa * x_ - m_d->sina * y_;
                     double maskY = m_d->sina * x_ + m_d->cosa * y_;
                     value += m_maskGenerator->valueAt(maskX, maskY);
                 }
             }
             if (supersample != 1) value /= samplearea;
 
             if (m_d->randomness!= 0.0){
                 random = (1.0 - m_d->randomness) + m_d->randomness * rand_distr(rand_engine);
             }
 
             alphaValue = quint8( (OPACITY_OPAQUE_U8 - value) * random);
 
             // avoid computation of random numbers if density is full
             if (m_d->density != 1.0){
                 // compute density only for visible pixels of the mask
                 if (alphaValue != OPACITY_TRANSPARENT_U8){
                     if ( !(m_d->density >= rand_distr(rand_engine)) ){
                         alphaValue = OPACITY_TRANSPARENT_U8;
                     }
                 }
             }
 
             m_d->colorSpace->applyAlphaU8Mask(dabPointer, &alphaValue, 1);
             dabPointer += m_d->pixelSize;
         }//endfor x
         dabPointer += offset;
     }//endfor y
 }
 
 #endif /* __KIS_BRUSH_MASK_APPLICATORS_H */
diff --git a/libs/image/kis_config_widget.cpp b/libs/image/kis_config_widget.cpp
index 5f50c48b80..336672acdc 100644
--- a/libs/image/kis_config_widget.cpp
+++ b/libs/image/kis_config_widget.cpp
@@ -1,46 +1,47 @@
 /*
  *  Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
  *  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_config_widget.h"
 #include "kis_debug.h"
 #include <QTimer>
 
 KisConfigWidget::KisConfigWidget(QWidget * parent, Qt::WFlags f, int delay)
         : QWidget(parent, f)
         , m_compressor(delay, KisSignalCompressor::FIRST_ACTIVE)
 {
-    connect(&m_compressor, SIGNAL(timeout()), SLOT(slotConfigChanged()));
-    connect(this, SIGNAL(sigConfigurationItemChanged()), &m_compressor, SLOT(start()));
+    connect(this, SIGNAL(sigConfigurationItemChanged()), SLOT(slotConfigChanged()));
+    connect(&m_compressor, SIGNAL(timeout()), SIGNAL(sigConfigurationUpdated()));
 }
 
 KisConfigWidget::~KisConfigWidget()
 {
 }
 
 void KisConfigWidget::slotConfigChanged()
 {
-    emit sigConfigurationUpdated();
+    if (!signalsBlocked()) {
+        m_compressor.start();
+    }
 }
 
 void KisConfigWidget::setView(KisViewManager *view)
 {
     if (!view) {
         warnKrita << "KisConfigWidget::setView has got view == 0. That's a bug! Please report it!";
     }
 }
-
diff --git a/libs/image/kis_config_widget.h b/libs/image/kis_config_widget.h
index 7c2d096015..4c4674079f 100644
--- a/libs/image/kis_config_widget.h
+++ b/libs/image/kis_config_widget.h
@@ -1,93 +1,92 @@
 /*
  *  Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *  Copyright (c) 2004-2006 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_CONFIG_WIDGET_H_
 #define _KIS_CONFIG_WIDGET_H_
 
 #include <QWidget>
 #include <kritaimage_export.h>
 
 #include "kis_signal_compressor.h"
 
 class KisViewManager;
 class KisPropertiesConfiguration;
 
 /**
  * Empty base class. Configurable resources like filters, paintops etc.
  * can build their own configuration widgets that inherit this class.
  * The configuration widget should emit sigConfigurationItemChanged
  * when it wants a preview updated; there is a timer that
  * waits a little time to see if there are more changes coming
  * and then emits sigConfigurationUpdated.
  */
 class KRITAIMAGE_EXPORT KisConfigWidget : public QWidget
 {
 
     Q_OBJECT
 
 protected:
 
     KisConfigWidget(QWidget * parent = 0, Qt::WFlags f = 0, int delay = 200);
 
 public:
     virtual ~KisConfigWidget();
 
     /**
      * @param config the configuration for this configuration widget.
      */
     virtual void setConfiguration(const KisPropertiesConfiguration * config) = 0;
 
     /**
      * @return the configuration
      */
     virtual KisPropertiesConfiguration* configuration() const = 0;
 
     /**
      * Sets the view object that can be used by the configuration
      * widget for richer functionality
      */
     virtual void setView(KisViewManager *view);
 
 Q_SIGNALS:
 
     /**
      * emitted whenever it makes sense to update the preview
      */
     void sigConfigurationUpdated();
 
     /**
      * Subclasses should emit this signal whenever the preview should be
      * be recalculated. This kicks of a timer, so it's perfectly fine
      * to connect this to the changed signals of the widgets in your configuration
      * widget.
      */
     void sigConfigurationItemChanged();
     void sigSaveLockedConfig(KisPropertiesConfiguration* p);
     void sigDropLockedConfig(KisPropertiesConfiguration* p);
 
 private Q_SLOTS:
 
     void slotConfigChanged();
 
 private:
     KisSignalCompressor m_compressor;
-    int m_delay;
 };
 
 
 #endif
diff --git a/libs/image/kis_convolution_painter.cc b/libs/image/kis_convolution_painter.cc
index 10a04a72b6..78a72523d7 100644
--- a/libs/image/kis_convolution_painter.cc
+++ b/libs/image/kis_convolution_painter.cc
@@ -1,160 +1,158 @@
 /*
  *  Copyright (c) 2005 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.
  */
 
 #include "kis_convolution_painter.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <cfloat>
 
 #include <QBrush>
 #include <QColor>
-#include <QFontInfo>
-#include <QFontMetrics>
 #include <QPen>
 #include <QMatrix>
 #include <QImage>
 #include <QMap>
 #include <QPainter>
 #include <QRect>
 #include <QString>
 #include <QVector>
 
 #include <kis_debug.h>
 #include <klocalizedstring.h>
 
 #include "kis_convolution_kernel.h"
 #include "kis_global.h"
 #include "kis_image.h"
 #include "kis_layer.h"
 #include "kis_paint_device.h"
 #include "kis_painter.h"
 #include "KoColorSpace.h"
 #include <KoChannelInfo.h>
 #include "kis_types.h"
 
 #include "kis_selection.h"
 
 #include "kis_convolution_worker.h"
 #include "kis_convolution_worker_spatial.h"
 
 #include "config_convolution.h"
 
 #ifdef HAVE_FFTW3
 #include "kis_convolution_worker_fft.h"
 #endif
 
 
 template<class factory>
 KisConvolutionWorker<factory>* KisConvolutionPainter::createWorker(const KisConvolutionKernelSP kernel,
                                                                    KisPainter *painter,
                                                                    KoUpdater *progress)
 {
     KisConvolutionWorker<factory> *worker;
 
 #ifdef HAVE_FFTW3
     #define THRESHOLD_SIZE 5
 
     if(m_enginePreference == SPATIAL ||
        (m_enginePreference != FFTW &&
         kernel->width() <= THRESHOLD_SIZE &&
         kernel->height() <= THRESHOLD_SIZE)) {
 
         worker = new KisConvolutionWorkerSpatial<factory>(painter, progress);
     }
     else {
         worker = new KisConvolutionWorkerFFT<factory>(painter, progress);
     }
 #else
     Q_UNUSED(kernel);
     worker = new KisConvolutionWorkerSpatial<factory>(painter, progress);
 #endif
 
     return worker;
 }
 
 
 KisConvolutionPainter::KisConvolutionPainter()
     : KisPainter(),
       m_enginePreference(NONE)
 {
 }
 
 KisConvolutionPainter::KisConvolutionPainter(KisPaintDeviceSP device)
     : KisPainter(device),
       m_enginePreference(NONE)
 {
 }
 
 KisConvolutionPainter::KisConvolutionPainter(KisPaintDeviceSP device, KisSelectionSP selection)
     : KisPainter(device, selection),
       m_enginePreference(NONE)
 {
 }
 
 KisConvolutionPainter::KisConvolutionPainter(KisPaintDeviceSP device, TestingEnginePreference enginePreference)
     : KisPainter(device),
       m_enginePreference(enginePreference)
 {
 }
 
 void KisConvolutionPainter::applyMatrix(const KisConvolutionKernelSP kernel, const KisPaintDeviceSP src, QPoint srcPos, QPoint dstPos, QSize areaSize, KisConvolutionBorderOp borderOp)
 {
     /**
      * Force BORDER_IGNORE op for the wraparound mode,
      * because the paint device has its own special
      * iterators, which do everything for us.
      */
     if (src->defaultBounds()->wrapAroundMode()) {
         borderOp = BORDER_IGNORE;
     }
 
     // Determine whether we convolve border pixels, or not.
     switch (borderOp) {
     case BORDER_REPEAT: {
         const QRect boundsRect = src->exactBounds();
         const QRect requestedRect = QRect(srcPos, areaSize);
         QRect dataRect = requestedRect | boundsRect;
 
         /**
          * FIXME: Implementation can return empty destination device
          * on faults and has no way to report this. This will cause a crash
          * on sequential convolutions inside iteratiors.
          *
          * o implementation should do it's work or assert otherwise
          *   (or report the issue somehow)
          * o check other cases of the switch for the vulnerability
          */
 
         if(dataRect.isValid()) {
             KisConvolutionWorker<RepeatIteratorFactory> *worker;
             worker = createWorker<RepeatIteratorFactory>(kernel, this, progressUpdater());
             worker->execute(kernel, src, srcPos, dstPos, areaSize, dataRect);
             delete worker;
         }
         break;
     }
     case BORDER_IGNORE:
     default: {
         KisConvolutionWorker<StandardIteratorFactory> *worker;
         worker = createWorker<StandardIteratorFactory>(kernel, this, progressUpdater());
         worker->execute(kernel, src, srcPos, dstPos, areaSize, QRect());
         delete worker;
     }
     }
 }
diff --git a/libs/image/kis_idle_watcher.cpp b/libs/image/kis_idle_watcher.cpp
index 86544dd20d..cf6ac565b0 100644
--- a/libs/image/kis_idle_watcher.cpp
+++ b/libs/image/kis_idle_watcher.cpp
@@ -1,128 +1,128 @@
 /*
  *  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 "kis_idle_watcher.h"
 
 #include <QTimer>
 #include "kis_image.h"
 #include "kis_signal_auto_connection.h"
 #include "kis_signal_compressor.h"
 
 
 struct KisIdleWatcher::Private
 {
     static const int IDLE_CHECK_PERIOD = 200; /* ms */
     static const int IDLE_CHECK_COUNT = 4; /* ticks */
 
     Private(int delay)
         : imageModifiedCompressor(delay,
                                   KisSignalCompressor::POSTPONE),
           idleCheckCounter(0)
     {
         idleCheckTimer.setSingleShot(true);
         idleCheckTimer.setInterval(IDLE_CHECK_PERIOD);
     }
 
     KisSignalAutoConnectionsStore connectionsStore;
     QVector<KisImageWSP> trackedImages;
 
     KisSignalCompressor imageModifiedCompressor;
 
     QTimer idleCheckTimer;
     int idleCheckCounter;
 };
 
 
-KisIdleWatcher::KisIdleWatcher(int delay)
-    : m_d(new Private(delay))
+KisIdleWatcher::KisIdleWatcher(int delay, QObject *parent)
+    : QObject(parent), m_d(new Private(delay))
 {
     connect(&m_d->imageModifiedCompressor, SIGNAL(timeout()), SLOT(startIdleCheck()));
     connect(&m_d->idleCheckTimer, SIGNAL(timeout()), SLOT(slotIdleCheckTick()));
 }
 
 KisIdleWatcher::~KisIdleWatcher()
 {
 }
 
 bool KisIdleWatcher::isIdle() const
 {
     bool idle = true;
 
     Q_FOREACH (KisImageSP image, m_d->trackedImages) {
         if (!image) continue;
 
         if (!image->isIdle()) {
             idle = false;
             break;
         }
     }
 
     return idle;
 }
 
 void KisIdleWatcher::setTrackedImages(const QVector<KisImageSP> &images)
 {
     m_d->connectionsStore.clear();
     m_d->trackedImages.clear();
 
     Q_FOREACH (KisImageSP image, images) {
         m_d->trackedImages << image;
         m_d->connectionsStore.addConnection(image, SIGNAL(sigImageModified()),
                                             this, SLOT(slotImageModified()));
     }
 }
 
 void KisIdleWatcher::setTrackedImage(KisImageSP image)
 {
     QVector<KisImageSP> images;
     images << image;
     setTrackedImages(images);
 }
 
 void KisIdleWatcher::slotImageModified()
 {
     stopIdleCheck();
     m_d->imageModifiedCompressor.start();
 }
 
 void KisIdleWatcher::startIdleCheck()
 {
     m_d->idleCheckCounter = 0;
     m_d->idleCheckTimer.start();
 }
 
 void KisIdleWatcher::stopIdleCheck()
 {
     m_d->idleCheckTimer.stop();
     m_d->idleCheckCounter = 0;
 }
 
 void KisIdleWatcher::slotIdleCheckTick()
 {
     if (isIdle()) {
         if (m_d->idleCheckCounter >= Private::IDLE_CHECK_COUNT) {
             stopIdleCheck();
             emit startedIdleMode();
         } else {
             m_d->idleCheckCounter++;
             m_d->idleCheckTimer.start();
         }
     } else {
         slotImageModified();
     }
 }
diff --git a/libs/image/kis_idle_watcher.h b/libs/image/kis_idle_watcher.h
index 221249bb54..ebac6e4f25 100644
--- a/libs/image/kis_idle_watcher.h
+++ b/libs/image/kis_idle_watcher.h
@@ -1,59 +1,61 @@
 /*
  *  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.
  */
 
 #ifndef __KIS_IDLE_WATCHER_H
 #define __KIS_IDLE_WATCHER_H
 
 #include "kritaimage_export.h"
 
 #include <QScopedPointer>
 #include <QObject>
 #include <QString>
 
 #include "kis_types.h"
 
 
 class KRITAIMAGE_EXPORT KisIdleWatcher : public QObject
 {
     Q_OBJECT
 public:
-    KisIdleWatcher(int delay);
+    KisIdleWatcher(int delay, QObject* parent = 0);
     ~KisIdleWatcher();
 
     bool isIdle() const;
 
     void setTrackedImages(const QVector<KisImageSP> &images);
     void setTrackedImage(KisImageSP image);
 
+    //Force to image modified state and start countdown to event
+    void startCountdown(void) { slotImageModified(); }
 
 Q_SIGNALS:
     void startedIdleMode();
 
 private Q_SLOTS:
     void slotImageModified();
     void slotIdleCheckTick();
 
     void startIdleCheck();
     void stopIdleCheck();
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
 #endif /* __KIS_IDLE_WATCHER_H */
diff --git a/libs/image/kis_layer.cc b/libs/image/kis_layer.cc
index c2ae9a5ea6..184e315a9d 100644
--- a/libs/image/kis_layer.cc
+++ b/libs/image/kis_layer.cc
@@ -1,840 +1,840 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *  Copyright (c) 2005 C. Boemann <cbo@boemann.dk>
  *  Copyright (c) 2009 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_layer.h"
 
 
 #include <klocalizedstring.h>
 #include <QImage>
 #include <QBitArray>
 #include <QStack>
 #include <QMutex>
 #include <QMutexLocker>
 
 #include <KoIcon.h>
 #include <kis_icon.h>
 #include <KoProperties.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoColorSpace.h>
 
 #include "kis_debug.h"
 #include "kis_image.h"
 
 #include "kis_painter.h"
 #include "kis_mask.h"
 #include "kis_effect_mask.h"
 #include "kis_selection_mask.h"
 #include "kis_meta_data_store.h"
 #include "kis_selection.h"
 #include "kis_paint_layer.h"
 
 #include "kis_clone_layer.h"
 
 #include "kis_psd_layer_style.h"
 #include "kis_layer_projection_plane.h"
 #include "layerstyles/kis_layer_style_projection_plane.h"
 
 #include "krita_utils.h"
 #include "kis_layer_properties_icons.h"
 
 
 class KisSafeProjection {
 public:
     KisPaintDeviceSP getDeviceLazy(KisPaintDeviceSP prototype) {
         QMutexLocker locker(&m_lock);
 
         if (!m_reusablePaintDevice) {
             m_reusablePaintDevice = new KisPaintDevice(*prototype);
         }
         if(!m_projection ||
            !(*m_projection->colorSpace() == *prototype->colorSpace())) {
             m_projection = m_reusablePaintDevice;
             m_projection->makeCloneFromRough(prototype, prototype->extent());
             m_projection->setProjectionDevice(true);
         }
 
         return m_projection;
     }
 
     void freeDevice() {
         QMutexLocker locker(&m_lock);
         m_projection = 0;
         if(m_reusablePaintDevice) {
             m_reusablePaintDevice->clear();
         }
     }
 
 private:
     QMutex m_lock;
     KisPaintDeviceSP m_projection;
     KisPaintDeviceSP m_reusablePaintDevice;
 };
 
 class KisCloneLayersList {
 public:
     void addClone(KisCloneLayerWSP cloneLayer) {
         m_clonesList.append(cloneLayer);
     }
 
     void removeClone(KisCloneLayerWSP cloneLayer) {
         m_clonesList.removeOne(cloneLayer);
     }
 
     void setDirty(const QRect &rect) {
         Q_FOREACH (KisCloneLayerWSP clone, m_clonesList) {
             clone->setDirtyOriginal(rect);
         }
     }
 
     const QList<KisCloneLayerWSP> registeredClones() const {
         return m_clonesList;
     }
 
     bool hasClones() const {
         return !m_clonesList.isEmpty();
     }
 
 private:
     QList<KisCloneLayerWSP> m_clonesList;
 };
 
 struct Q_DECL_HIDDEN KisLayer::Private
 {
     KisImageWSP image;
     QBitArray channelFlags;
     KisMetaData::Store* metaDataStore;
     KisSafeProjection safeProjection;
     KisCloneLayersList clonesList;
 
     KisPSDLayerStyleSP layerStyle;
     KisAbstractProjectionPlaneSP layerStyleProjectionPlane;
 
     KisAbstractProjectionPlaneSP projectionPlane;
 };
 
 
 KisLayer::KisLayer(KisImageWSP image, const QString &name, quint8 opacity)
         : KisNode()
         , m_d(new Private)
 {
     setName(name);
     setOpacity(opacity);
     m_d->image = image;
     m_d->metaDataStore = new KisMetaData::Store();
     m_d->projectionPlane = toQShared(new KisLayerProjectionPlane(this));
 }
 
 KisLayer::KisLayer(const KisLayer& rhs)
         : KisNode(rhs)
         , m_d(new Private())
 {
     if (this != &rhs) {
         m_d->image = rhs.m_d->image;
         m_d->metaDataStore = new KisMetaData::Store(*rhs.m_d->metaDataStore);
         m_d->channelFlags = rhs.m_d->channelFlags;
 
         setName(rhs.name());
         m_d->projectionPlane = toQShared(new KisLayerProjectionPlane(this));
 
         if (rhs.m_d->layerStyle) {
             setLayerStyle(rhs.m_d->layerStyle->clone());
         }
     }
 }
 
 KisLayer::~KisLayer()
 {
     delete m_d->metaDataStore;
     delete m_d;
 }
 
 const KoColorSpace * KisLayer::colorSpace() const
 {
     if (m_d->image)
         return m_d->image->colorSpace();
     return 0;
 }
 
 const KoCompositeOp * KisLayer::compositeOp() const
 {
     /**
      * FIXME: This function duplicates the same function from
      * KisMask. We can't move it to KisBaseNode as it doesn't
      * know anything about parent() method of KisNode
      * Please think it over...
      */
 
     KisNodeSP parentNode = parent();
     if (!parentNode) return 0;
 
     if (!parentNode->colorSpace()) return 0;
     const KoCompositeOp* op = parentNode->colorSpace()->compositeOp(compositeOpId());
     return op ? op : parentNode->colorSpace()->compositeOp(COMPOSITE_OVER);
 }
 
 KisPSDLayerStyleSP KisLayer::layerStyle() const
 {
     return m_d->layerStyle;
 }
 
 void KisLayer::setLayerStyle(KisPSDLayerStyleSP layerStyle)
 {
     if (layerStyle) {
         m_d->layerStyle = layerStyle;
 
         KisAbstractProjectionPlaneSP plane = !layerStyle->isEmpty() ?
             KisAbstractProjectionPlaneSP(new KisLayerStyleProjectionPlane(this)) :
             KisAbstractProjectionPlaneSP(0);
 
         m_d->layerStyleProjectionPlane = plane;
     } else {
         m_d->layerStyleProjectionPlane.clear();
         m_d->layerStyle.clear();
     }
 }
 
 KisBaseNode::PropertyList KisLayer::sectionModelProperties() const
 {
     KisBaseNode::PropertyList l = KisBaseNode::sectionModelProperties();
     l << KisBaseNode::Property(KoID("opacity", i18n("Opacity")), i18n("%1%", percentOpacity()));
 
     if (compositeOp()) {
         l << KisBaseNode::Property(KoID("compositeop", i18n("Composite Mode")), compositeOp()->description());
     }
 
     if (m_d->layerStyle && !m_d->layerStyle->isEmpty()) {
         l << KisLayerPropertiesIcons::getProperty(KisLayerPropertiesIcons::layerStyle, m_d->layerStyle->isEnabled());
     }
 
     l << KisLayerPropertiesIcons::getProperty(KisLayerPropertiesIcons::inheritAlpha, alphaChannelDisabled());
 
     return l;
 }
 
 void KisLayer::setSectionModelProperties(const KisBaseNode::PropertyList &properties)
 {
     KisBaseNode::setSectionModelProperties(properties);
 
     Q_FOREACH (const KisBaseNode::Property &property, properties) {
         if (property.id == KisLayerPropertiesIcons::inheritAlpha.id()) {
             disableAlphaChannel(property.state.toBool());
         }
 
         if (property.id == KisLayerPropertiesIcons::layerStyle.id()) {
             if (m_d->layerStyle &&
                 m_d->layerStyle->isEnabled() != property.state.toBool()) {
 
                 m_d->layerStyle->setEnabled(property.state.toBool());
 
                 baseNodeChangedCallback();
                 baseNodeInvalidateAllFramesCallback();
             }
         }
     }
 }
 
 void KisLayer::disableAlphaChannel(bool disable)
 {
     QBitArray newChannelFlags = m_d->channelFlags;
 
     if(newChannelFlags.isEmpty())
         newChannelFlags = colorSpace()->channelFlags(true, true);
 
     if(disable)
         newChannelFlags &= colorSpace()->channelFlags(true, false);
     else
         newChannelFlags |= colorSpace()->channelFlags(false, true);
 
     setChannelFlags(newChannelFlags);
 }
 
 bool KisLayer::alphaChannelDisabled() const
 {
     QBitArray flags = colorSpace()->channelFlags(false, true) & m_d->channelFlags;
     return flags.count(true) == 0 && !m_d->channelFlags.isEmpty();
 }
 
 
 void KisLayer::setChannelFlags(const QBitArray & channelFlags)
 {
     Q_ASSERT(channelFlags.isEmpty() ||((quint32)channelFlags.count() == colorSpace()->channelCount()));
 
     if (KritaUtils::compareChannelFlags(channelFlags,
                                         this->channelFlags())) {
         return;
     }
 
     if (!channelFlags.isEmpty() &&
         channelFlags == QBitArray(channelFlags.size(), true)) {
 
         m_d->channelFlags.clear();
     } else {
         m_d->channelFlags = channelFlags;
     }
 
     baseNodeChangedCallback();
     baseNodeInvalidateAllFramesCallback();
 }
 
 QBitArray & KisLayer::channelFlags() const
 {
     return m_d->channelFlags;
 }
 
 bool KisLayer::temporary() const
 {
     return nodeProperties().boolProperty("temporary", false);
 }
 
 void KisLayer::setTemporary(bool t)
 {
     nodeProperties().setProperty("temporary", t);
 }
 
 KisImageWSP KisLayer::image() const
 {
     return m_d->image;
 }
 
 void KisLayer::setImage(KisImageWSP image)
 {
     m_d->image = image;
     for (uint i = 0; i < childCount(); ++i) {
         // Only layers know about the image
         KisLayer *layer = dynamic_cast<KisLayer*>(at(i).data());
         if (layer) {
             layer->setImage(image);
         }
         // We lied, through the defaultBounds, masks also know about the image
         KisMask *mask = dynamic_cast<KisMask*>(at(i).data());
         if (mask) {
             mask->setImage(image);
         }
     }
 }
 
 bool KisLayer::canMergeAndKeepBlendOptions(KisLayerSP otherLayer)
 {
     return
         this->compositeOpId() == otherLayer->compositeOpId() &&
         this->opacity() == otherLayer->opacity() &&
         this->channelFlags() == otherLayer->channelFlags() &&
         !this->layerStyle() && !otherLayer->layerStyle() &&
         (this->colorSpace() == otherLayer->colorSpace() ||
          *this->colorSpace() == *otherLayer->colorSpace());
 }
 
 KisLayerSP KisLayer::createMergedLayerTemplate(KisLayerSP prevLayer)
 {
     const bool keepBlendingOptions = canMergeAndKeepBlendOptions(prevLayer);
 
     KisLayerSP newLayer = new KisPaintLayer(image(), prevLayer->name(), OPACITY_OPAQUE_U8);
 
     if (keepBlendingOptions) {
         newLayer->setCompositeOpId(compositeOpId());
         newLayer->setOpacity(opacity());
         newLayer->setChannelFlags(channelFlags());
     }
 
     return newLayer;
 }
 
 void KisLayer::fillMergedLayerTemplate(KisLayerSP dstLayer, KisLayerSP prevLayer)
 {
     const bool keepBlendingOptions = canMergeAndKeepBlendOptions(prevLayer);
 
     QRect layerProjectionExtent = this->projection()->extent();
     QRect prevLayerProjectionExtent = prevLayer->projection()->extent();
     bool alphaDisabled = this->alphaChannelDisabled();
     bool prevAlphaDisabled = prevLayer->alphaChannelDisabled();
 
     KisPaintDeviceSP mergedDevice = dstLayer->paintDevice();
 
     if (!keepBlendingOptions) {
 
         KisNodeSP parentNode = parent();
         KisPainter gc(mergedDevice);
 
         //Copy the pixels of previous layer with their actual alpha value
         prevLayer->disableAlphaChannel(false);
 
         prevLayer->projectionPlane()->apply(&gc, prevLayerProjectionExtent | image()->bounds());
 
         //Restore the previous prevLayer disableAlpha status for correct undo/redo
         prevLayer->disableAlphaChannel(prevAlphaDisabled);
 
         //Paint the pixels of the current layer, using their actual alpha value
         if (alphaDisabled == prevAlphaDisabled) {
             this->disableAlphaChannel(false);
         }
 
         this->projectionPlane()->apply(&gc, layerProjectionExtent | image()->bounds());
 
         //Restore the layer disableAlpha status for correct undo/redo
         this->disableAlphaChannel(alphaDisabled);
     }
     else {
         //Copy prevLayer
         KisPaintDeviceSP srcDev = prevLayer->projection();
         mergedDevice->makeCloneFrom(srcDev, srcDev->extent());
 
         //Paint layer on the copy
         KisPainter gc(mergedDevice);
         gc.bitBlt(layerProjectionExtent.topLeft(), this->projection(), layerProjectionExtent);
     }
 }
 
 void KisLayer::registerClone(KisCloneLayerWSP clone)
 {
     m_d->clonesList.addClone(clone);
 }
 
 void KisLayer::unregisterClone(KisCloneLayerWSP clone)
 {
     m_d->clonesList.removeClone(clone);
 }
 
 const QList<KisCloneLayerWSP> KisLayer::registeredClones() const
 {
     return m_d->clonesList.registeredClones();
 }
 
 bool KisLayer::hasClones() const
 {
     return m_d->clonesList.hasClones();
 }
 
 void KisLayer::updateClones(const QRect &rect)
 {
     m_d->clonesList.setDirty(rect);
 }
 
 KisSelectionMaskSP KisLayer::selectionMask() const
 {
     KoProperties properties;
     properties.setProperty("active", true);
     QList<KisNodeSP> masks = childNodes(QStringList("KisSelectionMask"), properties);
 
     // return the first visible mask
     Q_FOREACH (KisNodeSP mask, masks) {
         if (mask->visible()) {
             return dynamic_cast<KisSelectionMask*>(mask.data());
         }
     }
     return 0;
 }
 
 KisSelectionSP KisLayer::selection() const
 {
     if (selectionMask()) {
         return selectionMask()->selection();
     }
     else if (m_d->image) {
         return m_d->image->globalSelection();
     }
     else {
         return 0;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////
 
 QList<KisEffectMaskSP> KisLayer::effectMasks(KisNodeSP lastNode) const
 {
     QList<KisEffectMaskSP> masks;
 
     if (childCount() > 0) {
         KoProperties properties;
         properties.setProperty("visible", true);
         QList<KisNodeSP> nodes = childNodes(QStringList("KisEffectMask"), properties);
 
         Q_FOREACH (const KisNodeSP& node,  nodes) {
             if (node == lastNode) break;
 
             KisEffectMaskSP mask = dynamic_cast<KisEffectMask*>(const_cast<KisNode*>(node.data()));
             if (mask)
                 masks.append(mask);
         }
     }
     return masks;
 }
 
 bool KisLayer::hasEffectMasks() const
 {
     if (childCount() == 0) return false;
 
     KisNodeSP node = firstChild();
     while (node) {
         if (node->inherits("KisEffectMask") && node->visible()) {
             return true;
         }
         node = node->nextSibling();
     }
 
     return false;
 }
 
 QRect KisLayer::masksChangeRect(const QList<KisEffectMaskSP> &masks,
                                 const QRect &requestedRect,
                                 bool &rectVariesFlag) const
 {
     rectVariesFlag = false;
 
     QRect prevChangeRect = requestedRect;
 
     /**
      * We set default value of the change rect for the case
      * when there is no mask at all
      */
     QRect changeRect = requestedRect;
 
     Q_FOREACH (const KisEffectMaskSP& mask, masks) {
         changeRect = mask->changeRect(prevChangeRect);
 
         if (changeRect != prevChangeRect)
             rectVariesFlag = true;
 
         prevChangeRect = changeRect;
     }
 
     return changeRect;
 }
 
 QRect KisLayer::masksNeedRect(const QList<KisEffectMaskSP> &masks,
                               const QRect &changeRect,
                               QStack<QRect> &applyRects,
                               bool &rectVariesFlag) const
 {
     rectVariesFlag = false;
 
     QRect prevNeedRect = changeRect;
     QRect needRect;
 
     for (qint32 i = masks.size() - 1; i >= 0; i--) {
         applyRects.push(prevNeedRect);
 
         needRect = masks[i]->needRect(prevNeedRect);
 
         if (prevNeedRect != needRect)
             rectVariesFlag = true;
 
         prevNeedRect = needRect;
     }
 
     return needRect;
 }
 
 KisNode::PositionToFilthy calculatePositionToFilthy(KisNodeSP nodeInQuestion,
                                            KisNodeSP filthy,
                                            KisNodeSP parent)
 {
     if (parent == filthy || parent != filthy->parent()) {
         return KisNode::N_ABOVE_FILTHY;
     }
 
     if (nodeInQuestion == filthy) {
         return KisNode::N_FILTHY;
     }
 
     KisNodeSP node = nodeInQuestion->prevSibling();
     while (node) {
         if (node == filthy) {
             return KisNode::N_ABOVE_FILTHY;
         }
         node = node->prevSibling();
     }
 
     return KisNode::N_BELOW_FILTHY;
 }
 
 QRect KisLayer::applyMasks(const KisPaintDeviceSP source,
                            KisPaintDeviceSP destination,
                            const QRect &requestedRect,
                            KisNodeSP filthyNode,
                            KisNodeSP lastNode) const
 {
     Q_ASSERT(source);
     Q_ASSERT(destination);
 
     QList<KisEffectMaskSP> masks = effectMasks(lastNode);
     QRect changeRect;
     QRect needRect;
 
     if (masks.isEmpty()) {
         changeRect = requestedRect;
         if (source != destination) {
             copyOriginalToProjection(source, destination, requestedRect);
         }
     } else {
         QStack<QRect> applyRects;
         bool changeRectVaries;
         bool needRectVaries;
 
         /**
          * FIXME: Assume that varying of the changeRect has already
          * been taken into account while preparing walkers
          */
         changeRectVaries = false;
         changeRect = requestedRect;
         //changeRect = masksChangeRect(masks, requestedRect,
         //                             changeRectVaries);
 
         needRect = masksNeedRect(masks, changeRect,
                                  applyRects, needRectVaries);
 
         if (!changeRectVaries && !needRectVaries) {
             /**
              * A bit of optimization:
              * All filters will read/write exactly from/to the requested
              * rect so we needn't create temporary paint device,
              * just apply it onto destination
              */
             Q_ASSERT(needRect == requestedRect);
 
             if (source != destination) {
                 copyOriginalToProjection(source, destination, needRect);
             }
 
             Q_FOREACH (const KisEffectMaskSP& mask, masks) {
                 const QRect maskApplyRect = applyRects.pop();
                 const QRect maskNeedRect =
                     applyRects.isEmpty() ? needRect : applyRects.top();
 
                 PositionToFilthy maskPosition = calculatePositionToFilthy(mask, filthyNode, const_cast<KisLayer*>(this));
                 mask->apply(destination, maskApplyRect, maskNeedRect, maskPosition);
             }
             Q_ASSERT(applyRects.isEmpty());
         } else {
             /**
              * We can't eliminate additional copy-op
              * as filters' behaviour may be quite insane here,
              * so let them work on their own paintDevice =)
              */
 
             KisPaintDeviceSP tempDevice = new KisPaintDevice(colorSpace());
             tempDevice->prepareClone(source);
             copyOriginalToProjection(source, tempDevice, needRect);
 
             QRect maskApplyRect = applyRects.pop();
             QRect maskNeedRect = needRect;
 
             Q_FOREACH (const KisEffectMaskSP& mask, masks) {
                 PositionToFilthy maskPosition = calculatePositionToFilthy(mask, filthyNode, const_cast<KisLayer*>(this));
                 mask->apply(tempDevice, maskApplyRect, maskNeedRect, maskPosition);
 
                 if (!applyRects.isEmpty()) {
                     maskNeedRect = maskApplyRect;
                     maskApplyRect = applyRects.pop();
                 }
             }
             Q_ASSERT(applyRects.isEmpty());
 
             KisPainter::copyAreaOptimized(changeRect.topLeft(), tempDevice, destination, changeRect);
         }
     }
 
     return changeRect;
 }
 
 QRect KisLayer::updateProjection(const QRect& rect, KisNodeSP filthyNode)
 {
     QRect updatedRect = rect;
     KisPaintDeviceSP originalDevice = original();
     if (!rect.isValid() ||
             !visible() ||
             !originalDevice) return QRect();
 
     if (!needProjection() && !hasEffectMasks()) {
         m_d->safeProjection.freeDevice();
     } else {
 
         if (!updatedRect.isEmpty()) {
             KisPaintDeviceSP projection =
                 m_d->safeProjection.getDeviceLazy(originalDevice);
 
             updatedRect = applyMasks(originalDevice, projection,
                                      updatedRect, filthyNode, 0);
         }
     }
 
     return updatedRect;
 }
 
 QRect KisLayer::partialChangeRect(KisNodeSP lastNode, const QRect& rect)
 {
     bool changeRectVaries = false;
     QRect changeRect = outgoingChangeRect(rect);
     changeRect = masksChangeRect(effectMasks(lastNode), changeRect,
                                  changeRectVaries);
 
     return changeRect;
 }
 
 /**
  * \p rect is a dirty rect in layer's original() coordinates!
  */
 void KisLayer::buildProjectionUpToNode(KisPaintDeviceSP projection, KisNodeSP lastNode, const QRect& rect)
 {
     QRect changeRect = partialChangeRect(lastNode, rect);
 
     KisPaintDeviceSP originalDevice = original();
 
     KIS_ASSERT_RECOVER_RETURN(needProjection() || hasEffectMasks());
 
     if (!changeRect.isEmpty()) {
         applyMasks(originalDevice, projection,
                    changeRect, this, lastNode);
     }
 }
 
 bool KisLayer::needProjection() const
 {
     return false;
 }
 
 void KisLayer::copyOriginalToProjection(const KisPaintDeviceSP original,
                                         KisPaintDeviceSP projection,
                                         const QRect& rect) const
 {
     KisPainter::copyAreaOptimized(rect.topLeft(), original, projection, rect);
 }
 
 KisAbstractProjectionPlaneSP KisLayer::projectionPlane() const
 {
     return m_d->layerStyleProjectionPlane ?
         m_d->layerStyleProjectionPlane : m_d->projectionPlane;
 }
 
 KisAbstractProjectionPlaneSP KisLayer::internalProjectionPlane() const
 {
     return m_d->projectionPlane;
 }
 
 KisPaintDeviceSP KisLayer::projection() const
 {
     KisPaintDeviceSP originalDevice = original();
 
     return needProjection() || hasEffectMasks() ?
         m_d->safeProjection.getDeviceLazy(originalDevice) : originalDevice;
 }
 
 QRect KisLayer::changeRect(const QRect &rect, PositionToFilthy pos) const
 {
     QRect changeRect = rect;
     changeRect = incomingChangeRect(changeRect);
 
     if(pos == KisNode::N_FILTHY) {
         QRect projectionToBeUpdated = projection()->exactBoundsAmortized() & changeRect;
 
         bool changeRectVaries;
         changeRect = outgoingChangeRect(changeRect);
         changeRect = masksChangeRect(effectMasks(), changeRect, changeRectVaries);
 
         /**
          * If the projection contains some dirty areas we should also
          * add them to the change rect, because they might have
          * changed. E.g. when a visibility of the mask has chnaged
          * while the parent layer was invinisble.
          */
 
         if (!projectionToBeUpdated.isEmpty() &&
             !changeRect.contains(projectionToBeUpdated)) {
 
             changeRect |= projectionToBeUpdated;
         }
     }
 
     // TODO: string comparizon: optimize!
     if (pos != KisNode::N_FILTHY &&
         pos != KisNode::N_FILTHY_PROJECTION &&
         compositeOpId() != COMPOSITE_COPY) {
 
         changeRect |= rect;
     }
 
     return changeRect;
 }
 
 QRect KisLayer::incomingChangeRect(const QRect &rect) const
 {
     return rect;
 }
 
 QRect KisLayer::outgoingChangeRect(const QRect &rect) const
 {
     return rect;
 }
 
 QImage KisLayer::createThumbnail(qint32 w, qint32 h)
 {
     KisPaintDeviceSP originalDevice = original();
 
     return originalDevice ?
-           originalDevice->createThumbnail(w, h,
+           originalDevice->createThumbnail(w, h, 1,
                                            KoColorConversionTransformation::internalRenderingIntent(),
                                            KoColorConversionTransformation::internalConversionFlags()) : QImage();
 }
 
 qint32 KisLayer::x() const
 {
     KisPaintDeviceSP originalDevice = original();
     return originalDevice ? originalDevice->x() : 0;
 }
 qint32 KisLayer::y() const
 {
     KisPaintDeviceSP originalDevice = original();
     return originalDevice ? originalDevice->y() : 0;
 }
 void KisLayer::setX(qint32 x)
 {
     KisPaintDeviceSP originalDevice = original();
     if (originalDevice)
         originalDevice->setX(x);
 }
 void KisLayer::setY(qint32 y)
 {
     KisPaintDeviceSP originalDevice = original();
     if (originalDevice)
         originalDevice->setY(y);
 }
 
 QRect KisLayer::extent() const
 {
     KisPaintDeviceSP originalDevice = original();
     return originalDevice ? originalDevice->extent() : QRect();
 }
 
 QRect KisLayer::exactBounds() const
 {
     KisPaintDeviceSP originalDevice = original();
     return originalDevice ? originalDevice->exactBounds() : QRect();
 }
 
 KisLayerSP KisLayer::parentLayer() const
 {
     return dynamic_cast<KisLayer*>(parent().data());
 }
 
 KisMetaData::Store* KisLayer::metaData()
 {
     return m_d->metaDataStore;
 }
 
diff --git a/libs/image/kis_mask.cc b/libs/image/kis_mask.cc
index a419ed4295..5d776e735b 100644
--- a/libs/image/kis_mask.cc
+++ b/libs/image/kis_mask.cc
@@ -1,363 +1,363 @@
 /*
  *  Copyright (c) 2006 Boudewijn Rempt <boud@valdyas.org>
  *            (c) 2009 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_mask.h"
 
 
 #include <kis_debug.h>
 
 // to prevent incomplete class types on "delete selection->flatten();"
 #include <kundo2command.h>
 
 #include <QScopedPointer>
 
 #include <KoColorSpace.h>
 #include <KoCompositeOpRegistry.h>
 
 #include "kis_paint_device.h"
 #include "kis_selection.h"
 #include "kis_pixel_selection.h"
 #include "kis_painter.h"
 
 #include "kis_image.h"
 #include "kis_layer.h"
 
 #include "kis_cached_paint_device.h"
 #include "kis_mask_projection_plane.h"
 
 
 struct Q_DECL_HIDDEN KisMask::Private {
     Private(KisMask *_q)
         : q(_q),
           projectionPlane(new KisMaskProjectionPlane(q))
     {
     }
 
     mutable KisSelectionSP selection;
     KisCachedPaintDevice paintDeviceCache;
     KisMask *q;
 
     /**
      * Due to the design of the Kra format the X,Y offset of the paint
      * device belongs to the node, but not to the device itself.  So
      * the offset is set when the node is created, but not when the
      * selection is initialized. This causes the X,Y values to be
      * lost, since the selection doen not exist at the moment. That is
      * why we save it separately.
      */
     QScopedPointer<QPoint> deferredSelectionOffset;
 
     KisAbstractProjectionPlaneSP projectionPlane;
 
     void initSelectionImpl(KisSelectionSP copyFrom, KisLayerSP parentLayer, KisPaintDeviceSP copyFromDevice);
 };
 
 KisMask::KisMask(const QString & name)
         : KisNode()
         , m_d(new Private(this))
 {
     setName(name);
 }
 
 KisMask::KisMask(const KisMask& rhs)
         : KisNode(rhs)
         , KisIndirectPaintingSupport()
         , m_d(new Private(this))
 {
     setName(rhs.name());
 
     if (rhs.m_d->selection) {
         m_d->selection = new KisSelection(*rhs.m_d->selection.data());
         m_d->selection->setParentNode(this);
     }
 }
 
 KisMask::~KisMask()
 {
     delete m_d;
 }
 
 void KisMask::setImage(KisImageWSP image)
 {
     KisPaintDeviceSP parentPaintDevice = parent() ? parent()->original() : 0;
     KisDefaultBoundsBaseSP defaultBounds = new KisSelectionDefaultBounds(parentPaintDevice, image);
     if (m_d->selection) {
         m_d->selection->setDefaultBounds(defaultBounds);
     }
 }
 
 bool KisMask::allowAsChild(KisNodeSP node) const
 {
     Q_UNUSED(node);
     return false;
 }
 
 const KoColorSpace * KisMask::colorSpace() const
 {
     KisNodeSP parentNode = parent();
     return parentNode ? parentNode->colorSpace() : 0;
 }
 
 const KoCompositeOp * KisMask::compositeOp() const
 {
     /**
      * FIXME: This function duplicates the same function from
      * KisLayer. We can't move it to KisBaseNode as it doesn't
      * know anything about parent() method of KisNode
      * Please think it over...
      */
 
     KisNodeSP parentNode = parent();
     if (!parentNode) return 0;
 
     if (!parentNode->colorSpace()) return 0;
     const KoCompositeOp* op = parentNode->colorSpace()->compositeOp(compositeOpId());
     return op ? op : parentNode->colorSpace()->compositeOp(COMPOSITE_OVER);
 }
 
 void KisMask::initSelection(KisSelectionSP copyFrom, KisLayerSP parentLayer)
 {
     m_d->initSelectionImpl(copyFrom, parentLayer, 0);
 }
 
 void KisMask::initSelection(KisPaintDeviceSP copyFromDevice, KisLayerSP parentLayer)
 {
     m_d->initSelectionImpl(0, parentLayer, copyFromDevice);
 }
 
 void KisMask::initSelection(KisLayerSP parentLayer)
 {
     m_d->initSelectionImpl(0, parentLayer, 0);
 }
 
 void KisMask::Private::initSelectionImpl(KisSelectionSP copyFrom, KisLayerSP parentLayer, KisPaintDeviceSP copyFromDevice)
 {
     Q_ASSERT(parentLayer);
 
     KisPaintDeviceSP parentPaintDevice = parentLayer->original();
 
     if (copyFrom) {
         /**
          * We can't use setSelection as we may not have parent() yet
          */
         selection = new KisSelection(*copyFrom);
         selection->setDefaultBounds(new KisSelectionDefaultBounds(parentPaintDevice, parentLayer->image()));
         if (copyFrom->hasShapeSelection()) {
             delete selection->flatten();
         }
     } else if (copyFromDevice) {
         selection = new KisSelection(new KisSelectionDefaultBounds(parentPaintDevice, parentLayer->image()));
 
         QRect rc(copyFromDevice->extent());
         KisPainter::copyAreaOptimized(rc.topLeft(), copyFromDevice, selection->pixelSelection(), rc);
         selection->pixelSelection()->invalidateOutlineCache();
 
     } else {
         selection = new KisSelection(new KisSelectionDefaultBounds(parentPaintDevice, parentLayer->image()));
 
         quint8 newDefaultPixel = MAX_SELECTED;
         selection->pixelSelection()->setDefaultPixel(&newDefaultPixel);
 
         if (deferredSelectionOffset) {
             selection->setX(deferredSelectionOffset->x());
             selection->setY(deferredSelectionOffset->y());
             deferredSelectionOffset.reset();
         }
     }
     selection->setParentNode(q);
     selection->updateProjection();
 }
 
 KisSelectionSP KisMask::selection() const
 {
     return m_d->selection;
 }
 
 KisPaintDeviceSP KisMask::paintDevice() const
 {
     return selection()->pixelSelection();
 }
 
 KisPaintDeviceSP KisMask::original() const
 {
     return paintDevice();
 }
 
 KisPaintDeviceSP KisMask::projection() const
 {
     return paintDevice();
 }
 
 KisAbstractProjectionPlaneSP KisMask::projectionPlane() const
 {
     return m_d->projectionPlane;
 }
 
 void KisMask::setSelection(KisSelectionSP selection)
 {
     m_d->selection = selection;
     if (parent()) {
         const KisLayer *parentLayer = qobject_cast<const KisLayer*>(parent());
         m_d->selection->setDefaultBounds(new KisDefaultBounds(parentLayer->image()));
     }
     m_d->selection->setParentNode(this);
 }
 
 void KisMask::select(const QRect & rc, quint8 selectedness)
 {
     KisSelectionSP sel = selection();
     KisPixelSelectionSP psel = sel->pixelSelection();
     psel->select(rc, selectedness);
     sel->updateProjection(rc);
 }
 
 
 QRect KisMask::decorateRect(KisPaintDeviceSP &src,
                             KisPaintDeviceSP &dst,
                             const QRect & rc,
                             PositionToFilthy maskPos) const
 {
     Q_UNUSED(src);
     Q_UNUSED(dst);
     Q_UNUSED(maskPos);
     Q_ASSERT_X(0, "KisMask::decorateRect", "Should be overridden by successors");
     return rc;
 }
 
 void KisMask::apply(KisPaintDeviceSP projection, const QRect &applyRect, const QRect &needRect, PositionToFilthy maskPos) const
 {
     if (selection()) {
 
         m_d->selection->updateProjection(applyRect);
 
         if(!extent().intersects(applyRect))
             return;
 
         KisPaintDeviceSP cacheDevice = m_d->paintDeviceCache.getDevice(projection);
 
         QRect updatedRect = decorateRect(projection, cacheDevice, applyRect, maskPos);
 
         // masks don't have any compositioning
         KisPainter::copyAreaOptimized(updatedRect.topLeft(), cacheDevice, projection, updatedRect, m_d->selection);
         m_d->paintDeviceCache.putDevice(cacheDevice);
 
     } else {
         KisPaintDeviceSP cacheDevice = m_d->paintDeviceCache.getDevice(projection);
 
         cacheDevice->makeCloneFromRough(projection, needRect);
         projection->clear(needRect);
 
         decorateRect(cacheDevice, projection, applyRect, maskPos);
 
         m_d->paintDeviceCache.putDevice(cacheDevice);
     }
 }
 
 QRect KisMask::needRect(const QRect &rect,  PositionToFilthy pos) const
 {
     Q_UNUSED(pos);
     QRect resultRect = rect;
     if (m_d->selection)
         resultRect &= m_d->selection->selectedRect();
 
     return resultRect;
 }
 
 QRect KisMask::changeRect(const QRect &rect, PositionToFilthy pos) const
 {
     Q_UNUSED(pos);
     QRect resultRect = rect;
     if (m_d->selection)
         resultRect &= m_d->selection->selectedRect();
 
     return resultRect;
 }
 
 QRect KisMask::extent() const
 {
     return m_d->selection ? m_d->selection->selectedRect() :
            parent() ? parent()->extent() : QRect();
 }
 
 QRect KisMask::exactBounds() const
 {
     return m_d->selection ? m_d->selection->selectedExactRect() :
            parent() ? parent()->exactBounds() : QRect();
 }
 
 qint32 KisMask::x() const
 {
     return m_d->selection ? m_d->selection->x() :
            m_d->deferredSelectionOffset ? m_d->deferredSelectionOffset->x() :
            parent() ? parent()->x() : 0;
 }
 
 qint32 KisMask::y() const
 {
     return m_d->selection ? m_d->selection->y() :
            m_d->deferredSelectionOffset ? m_d->deferredSelectionOffset->y() :
            parent() ? parent()->y() : 0;
 }
 
 void KisMask::setX(qint32 x)
 {
     if (m_d->selection) {
         m_d->selection->setX(x);
     } else if (!m_d->deferredSelectionOffset) {
         m_d->deferredSelectionOffset.reset(new QPoint(x, 0));
     } else {
         m_d->deferredSelectionOffset->rx() = x;
     }
 }
 
 void KisMask::setY(qint32 y)
 {
     if (m_d->selection) {
         m_d->selection->setY(y);
     } else if (!m_d->deferredSelectionOffset) {
         m_d->deferredSelectionOffset.reset(new QPoint(0, y));
     } else {
         m_d->deferredSelectionOffset->ry() = y;
     }
 }
 
 QImage KisMask::createThumbnail(qint32 w, qint32 h)
 {
     KisPaintDeviceSP originalDevice =
         selection() ? selection()->projection() : 0;
 
     return originalDevice ?
-           originalDevice->createThumbnail(w, h,
+           originalDevice->createThumbnail(w, h, 1,
                                            KoColorConversionTransformation::internalRenderingIntent(),
                                            KoColorConversionTransformation::internalConversionFlags()) : QImage();
 }
 
 void KisMask::testingInitSelection(const QRect &rect, KisLayerSP parentLayer)
 {
     if (parentLayer) {
         m_d->selection = new KisSelection(new KisSelectionDefaultBounds(parentLayer->paintDevice(), parentLayer->image()));
     } else {
         m_d->selection = new KisSelection();
     }
 
     m_d->selection->pixelSelection()->select(rect, OPACITY_OPAQUE_U8);
     m_d->selection->updateProjection(rect);
     m_d->selection->setParentNode(this);
 }
 
diff --git a/libs/image/kis_paint_device.cc b/libs/image/kis_paint_device.cc
index 8a2b9c02d2..8b5e2a8c3d 100644
--- a/libs/image/kis_paint_device.cc
+++ b/libs/image/kis_paint_device.cc
@@ -1,1906 +1,2035 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_paint_device.h"
 
 #include <QRect>
 #include <QTransform>
 #include <QImage>
 #include <QList>
 #include <QHash>
 #include <QIODevice>
 #include <qmath.h>
 
 #include <klocalizedstring.h>
 
 #include <KoChannelInfo.h>
 #include <KoColorProfile.h>
 #include <KoColor.h>
 #include <KoColorSpace.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoColorModelStandardIds.h>
 #include <KoIntegerMaths.h>
 #include <KoMixColorsOp.h>
-
+#include <KoUpdater.h>
 
 #include "kis_image.h"
 #include "kis_random_sub_accessor.h"
 #include "kis_selection.h"
 #include "kis_node.h"
 #include "kis_datamanager.h"
 #include "kis_paint_device_writer.h"
 #include "kis_selection_component.h"
 #include "kis_pixel_selection.h"
 #include "kis_repeat_iterators_pixel.h"
 #include "kis_fixed_paint_device.h"
 
 #include "tiles3/kis_hline_iterator.h"
 #include "tiles3/kis_vline_iterator.h"
 #include "tiles3/kis_random_accessor.h"
 
 #include "kis_default_bounds.h"
 
 #include "kis_lod_transform.h"
 
 #include "kis_raster_keyframe_channel.h"
 
 #include "kis_paint_device_cache.h"
 #include "kis_paint_device_data.h"
 #include "kis_paint_device_frames_interface.h"
 
+#include "kis_transform_worker.h"
+#include "kis_filter_strategy.h"
+
 
 struct KisPaintDeviceSPStaticRegistrar {
     KisPaintDeviceSPStaticRegistrar() {
         qRegisterMetaType<KisPaintDeviceSP>("KisPaintDeviceSP");
     }
 };
 static KisPaintDeviceSPStaticRegistrar __registrar;
 
 
 
 struct KisPaintDevice::Private
 {
     /**
      * Used when the paint device is loading to ensure no lod/animation
      * interferes the process.
      */
     static const KisDefaultBoundsSP transitionalDefaultBounds;
 
 public:
 
     class KisPaintDeviceStrategy;
     class KisPaintDeviceWrappedStrategy;
 
     Private(KisPaintDevice *paintDevice);
     ~Private();
 
     KisPaintDevice *q;
     KisNodeWSP parent;
     QScopedPointer<KisRasterKeyframeChannel> contentChannel;
     KisDefaultBoundsBaseSP defaultBounds;
     QScopedPointer<KisPaintDeviceStrategy> basicStrategy;
     QScopedPointer<KisPaintDeviceWrappedStrategy> wrappedStrategy;
     QScopedPointer<KisPaintDeviceFramesInterface> framesInterface;
     bool isProjectionDevice;
 
     KisPaintDeviceStrategy* currentStrategy();
 
     void init(const KoColorSpace *cs, const quint8 *defaultPixel);
     KUndo2Command* convertColorSpace(const KoColorSpace * dstColorSpace, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags);
     bool assignProfile(const KoColorProfile * profile);
 
-    inline const KoColorSpace* colorSpace() const { return currentData()->colorSpace(); }
-    inline KisDataManagerSP dataManager() const { return currentData()->dataManager(); }
+    inline const KoColorSpace* colorSpace() const
+    {
+        return currentData()->colorSpace();
+    }
+    inline KisDataManagerSP dataManager() const
+    {
+        return currentData()->dataManager();
+    }
 
-    inline qint32 x() const {return currentData()->x();}
-    inline qint32 y() const {return currentData()->y();}
-    inline void setX(qint32 x) { currentData()->setX(x); }
-    inline void setY(qint32 y) { currentData()->setY(y); }
+    inline qint32 x() const
+    {
+        return currentData()->x();
+    }
+    inline qint32 y() const
+    {
+        return currentData()->y();
+    }
+    inline void setX(qint32 x)
+    {
+        currentData()->setX(x);
+    }
+    inline void setY(qint32 y)
+    {
+        currentData()->setY(y);
+    }
 
-    inline KisPaintDeviceCache* cache() { return currentData()->cache(); }
+    inline KisPaintDeviceCache* cache()
+    {
+        return currentData()->cache();
+    }
 
 
-    void cloneAllDataObjects(Private *rhs, bool copyFrames) {
+    void cloneAllDataObjects(Private *rhs, bool copyFrames)
+    {
 
         m_lodData.reset();
         m_externalFrameData.reset();
 
         if (!m_frames.isEmpty()) {
             m_frames.clear();
         }
 
         if (!copyFrames) {
             if (m_data) {
                 m_data->prepareClone(rhs->currentNonLodData(), true);
             } else {
                 m_data = toQShared(new KisPaintDeviceData(rhs->currentNonLodData(), true));
             }
         } else {
             if (m_data && !rhs->m_data) {
                 m_data.clear();
             } else if (!m_data && rhs->m_data) {
                 m_data = toQShared(new KisPaintDeviceData(rhs->m_data.data(), true));
             } else if (m_data && rhs->m_data) {
                 m_data->prepareClone(rhs->m_data.data(), true);
             }
 
             if (!rhs->m_frames.isEmpty()) {
                 FramesHash::const_iterator it = rhs->m_frames.constBegin();
                 FramesHash::const_iterator end = rhs->m_frames.constEnd();
 
                 for (; it != end; ++it) {
                     DataSP data = toQShared(new KisPaintDeviceData(it.value().data(), true));
                     m_frames.insert(it.key(), data);
                 }
             }
         }
 
         if (rhs->m_lodData) {
             m_lodData.reset(new KisPaintDeviceData(rhs->m_lodData.data(), true));
         }
     }
 
     void prepareClone(KisPaintDeviceSP src)
     {
         prepareCloneImpl(src, src->m_d->currentData());
         Q_ASSERT(fastBitBltPossible(src));
     }
 
     bool fastBitBltPossible(KisPaintDeviceSP src)
     {
         return fastBitBltPossibleImpl(src->m_d->currentData());
     }
 
-    int currentFrameId() const {
-        KIS_ASSERT_RECOVER(contentChannel) { return -1; }
+    int currentFrameId() const
+    {
+        KIS_ASSERT_RECOVER(contentChannel) {
+            return -1;
+        }
         return !defaultBounds->currentLevelOfDetail() ?
-            contentChannel->frameIdAt(defaultBounds->currentTime()) :
-            -1;
+               contentChannel->frameIdAt(defaultBounds->currentTime()) :
+               -1;
     }
 
-    KisDataManagerSP frameDataManager(int frameId) const {
+    KisDataManagerSP frameDataManager(int frameId) const
+    {
         DataSP data = m_frames[frameId];
         return data->dataManager();
     }
 
-    void invalidateFrameCache(int frameId) {
+    void invalidateFrameCache(int frameId)
+    {
         DataSP data = m_frames[frameId];
         return data->cache()->invalidate();
     }
 
 private:
     typedef KisPaintDeviceData Data;
     typedef QSharedPointer<Data> DataSP;
     typedef QHash<int, DataSP> FramesHash;
 
-    class FrameInsertionCommand : public KUndo2Command {
+    class FrameInsertionCommand : public KUndo2Command
+    {
     public:
 
         FrameInsertionCommand(FramesHash *hash, DataSP data, int frameId, bool insert, KUndo2Command *parentCommand)
             : KUndo2Command(parentCommand),
               m_hash(hash),
               m_data(data),
               m_frameId(frameId),
               m_insert(insert)
         {
         }
 
-        void redo() {
+        void redo()
+        {
             doSwap(m_insert);
         }
 
-        void undo() {
+        void undo()
+        {
             doSwap(!m_insert);
         }
 
     private:
-        void doSwap(bool insert) {
+        void doSwap(bool insert)
+        {
             if (insert) {
                 m_hash->insert(m_frameId, m_data);
             } else {
                 DataSP deletedData = m_hash->take(m_frameId);
             }
         }
 
     private:
         FramesHash *m_hash;
         DataSP m_data;
         int m_frameId;
         bool m_insert;
     };
 
 public:
 
     int createFrame(bool copy, int copySrc, const QPoint &offset, KUndo2Command *parentCommand)
     {
-        KIS_ASSERT_RECOVER(parentCommand) { return -1; }
+        KIS_ASSERT_RECOVER(parentCommand) {
+            return -1;
+        }
 
         DataSP data;
         bool initialFrame = false;
 
         if (m_frames.isEmpty()) {
             /**
              * Here we move the contents of the paint device to the
              * new frame and clear m_data to make the "background" for
              * the areas where there is no frame at all.
              */
             data = toQShared(new Data(m_data.data(), true));
             m_data->dataManager()->clear();
             m_data->cache()->invalidate();
             initialFrame = true;
 
         } else if (copy) {
             DataSP srcData = m_frames[copySrc];
             data = toQShared(new Data(srcData.data(), true));
         } else {
             DataSP srcData = m_frames.begin().value();
             data = toQShared(new Data(srcData.data(), false));
         }
 
         if (!initialFrame && !copy) {
             data->setX(offset.x());
             data->setY(offset.y());
         }
 
         int frameId = nextFreeFrameId++;
 
         KUndo2Command *cmd =
             new FrameInsertionCommand(&m_frames,
                                       data,
                                       frameId, true,
                                       parentCommand);
 
         cmd->redo();
 
         return frameId;
     }
 
     void deleteFrame(int frame, KUndo2Command *parentCommand)
     {
         KIS_ASSERT_RECOVER_RETURN(m_frames.contains(frame));
         KIS_ASSERT_RECOVER_RETURN(parentCommand);
 
         DataSP deletedData = m_frames[frame];
 
         KUndo2Command *cmd =
             new FrameInsertionCommand(&m_frames,
                                       deletedData,
                                       frame, false,
                                       parentCommand);
         cmd->redo();
     }
 
     QRect frameBounds(int frameId)
     {
         DataSP data = m_frames[frameId];
 
         QRect extent = data->dataManager()->extent();
         extent.translate(data->x(), data->y());
 
         return extent;
     }
 
-    QPoint frameOffset(int frameId) const {
+    QPoint frameOffset(int frameId) const
+    {
         DataSP data = m_frames[frameId];
         return QPoint(data->x(), data->y());
     }
 
-    void setFrameOffset(int frameId, const QPoint &offset) {
+    void setFrameOffset(int frameId, const QPoint &offset)
+    {
         DataSP data = m_frames[frameId];
         data->setX(offset.x());
         data->setY(offset.y());
     }
 
     const QList<int> frameIds() const
     {
         return m_frames.keys();
     }
 
-    bool readFrame(QIODevice *stream, int frameId) {
+    bool readFrame(QIODevice *stream, int frameId)
+    {
         bool retval = false;
         DataSP data = m_frames[frameId];
         retval = data->dataManager()->read(stream);
         data->cache()->invalidate();
         return retval;
     }
 
-    bool writeFrame(KisPaintDeviceWriter &store, int frameId) {
+    bool writeFrame(KisPaintDeviceWriter &store, int frameId)
+    {
         DataSP data = m_frames[frameId];
         return data->dataManager()->write(store);
     }
 
-    void setFrameDefaultPixel(const quint8 *defPixel, int frameId) {
+    void setFrameDefaultPixel(const quint8 *defPixel, int frameId)
+    {
         DataSP data = m_frames[frameId];
         data->dataManager()->setDefaultPixel(defPixel);
     }
 
-    const quint8* frameDefaultPixel(int frameId) const {
+    const quint8* frameDefaultPixel(int frameId) const
+    {
         DataSP data = m_frames[frameId];
         return data->dataManager()->defaultPixel();
     }
 
     void fetchFrame(int frameId, KisPaintDeviceSP targetDevice);
     void uploadFrame(int srcFrameId, int dstFrameId, KisPaintDeviceSP srcDevice);
     void uploadFrame(int dstFrameId, KisPaintDeviceSP srcDevice);
     void uploadFrameData(DataSP srcData, DataSP dstData);
 
     struct LodDataStructImpl;
     LodDataStruct* createLodDataStruct(int lod);
     void updateLodDataStruct(LodDataStruct *dst, const QRect &srcRect);
     void uploadLodDataStruct(LodDataStruct *dst);
     QRegion regionForLodSyncing() const;
 
     void tesingFetchLodDevice(KisPaintDeviceSP targetDevice);
 
 private:
 
     QRegion syncWholeDevice(Data *srcData);
 
-    inline DataSP currentFrameData() const {
+    inline DataSP currentFrameData() const
+    {
         DataSP data;
 
         const int numberOfFrames = contentChannel->keyframeCount();
 
         if (numberOfFrames > 1) {
             int frameId = contentChannel->frameIdAt(defaultBounds->currentTime());
-            KIS_ASSERT_RECOVER(m_frames.contains(frameId)) { return m_frames.begin().value(); }
+            KIS_ASSERT_RECOVER(m_frames.contains(frameId)) {
+                return m_frames.begin().value();
+            }
             data = m_frames[frameId];
         } else if (numberOfFrames == 1) {
             data = m_frames.begin().value();
         } else {
             data = m_data;
         }
 
         return data;
     }
 
-    inline Data* currentNonLodData() const {
+    inline Data* currentNonLodData() const
+    {
         Data *data = m_data.data();
 
         if (contentChannel) {
             data = currentFrameData().data();
         } else if (isProjectionDevice && defaultBounds->externalFrameActive()) {
             if (!m_externalFrameData) {
                 QMutexLocker l(&m_dataSwitchLock);
                 if (!m_externalFrameData) {
                     m_externalFrameData.reset(new Data(m_data.data(), false));
                 }
             }
             data = m_externalFrameData.data();
         }
 
         return data;
     }
 
-    inline void ensureLodDataPresent() const {
+    inline void ensureLodDataPresent() const
+    {
         if (!m_lodData) {
             Data *srcData = currentNonLodData();
 
             QMutexLocker l(&m_dataSwitchLock);
             if (!m_lodData) {
                 m_lodData.reset(new Data(srcData, false));
             }
         }
     }
 
-    inline Data* currentData() const {
+    inline Data* currentData() const
+    {
         Data *data = m_data.data();
 
         if (defaultBounds->currentLevelOfDetail()) {
             ensureLodDataPresent();
             data = m_lodData.data();
         } else {
             data = currentNonLodData();
         }
 
         return data;
     }
 
     void prepareCloneImpl(KisPaintDeviceSP src, Data *srcData)
     {
         currentData()->prepareClone(srcData);
 
         q->setDefaultPixel(srcData->dataManager()->defaultPixel());
         q->setDefaultBounds(src->defaultBounds());
     }
 
     bool fastBitBltPossibleImpl(Data *srcData)
     {
         return x() == srcData->x() && y() == srcData->y() &&
-            *colorSpace() == *srcData->colorSpace();
+               *colorSpace() == *srcData->colorSpace();
     }
 
-    QList<Data*> allDataObjects() const {
+    QList<Data*> allDataObjects() const
+    {
         QList<Data*> dataObjects;
 
         if (m_frames.isEmpty()) {
             dataObjects << m_data.data();
         }
         dataObjects << m_lodData.data();
         dataObjects << m_externalFrameData.data();
 
         Q_FOREACH (DataSP value, m_frames.values()) {
             dataObjects << value.data();
         }
 
         return dataObjects;
     }
 
     void transferFromData(Data *data, KisPaintDeviceSP targetDevice);
 
     struct Q_DECL_HIDDEN StrategyPolicy;
     typedef KisSequentialIteratorBase<ReadOnlyIteratorPolicy<StrategyPolicy>, StrategyPolicy> InternalSequentialConstIterator;
     typedef KisSequentialIteratorBase<WritableIteratorPolicy<StrategyPolicy>, StrategyPolicy> InternalSequentialIterator;
 
 private:
     friend class KisPaintDeviceFramesInterface;
 
 private:
     DataSP m_data;
     mutable QScopedPointer<Data> m_lodData;
     mutable QScopedPointer<Data> m_externalFrameData;
     mutable QMutex m_dataSwitchLock;
 
     FramesHash m_frames;
     int nextFreeFrameId;
 };
 
 const KisDefaultBoundsSP KisPaintDevice::Private::transitionalDefaultBounds = new KisDefaultBounds();
 
 #include "kis_paint_device_strategies.h"
 
 KisPaintDevice::Private::Private(KisPaintDevice *paintDevice)
     : q(paintDevice),
       basicStrategy(new KisPaintDeviceStrategy(paintDevice, this)),
       isProjectionDevice(false),
       m_data(new Data(paintDevice)),
       nextFreeFrameId(0)
 {
 }
 
 KisPaintDevice::Private::~Private()
 {
     m_frames.clear();
 }
 
 KisPaintDevice::Private::KisPaintDeviceStrategy* KisPaintDevice::Private::currentStrategy()
 {
     if (!defaultBounds->wrapAroundMode()) {
         return basicStrategy.data();
     }
 
     QRect wrapRect = defaultBounds->bounds();
     if (!wrappedStrategy || wrappedStrategy->wrapRect() != wrapRect) {
         wrappedStrategy.reset(new KisPaintDeviceWrappedStrategy(wrapRect, q, this));
     }
 
     return wrappedStrategy.data();
 }
 
 struct KisPaintDevice::Private::StrategyPolicy {
     StrategyPolicy(KisPaintDevice::Private::KisPaintDeviceStrategy *strategy,
                    KisDataManager *dataManager, qint32 offsetX, qint32 offsetY)
         : m_strategy(strategy),
           m_dataManager(dataManager),
           m_offsetX(offsetX),
           m_offsetY(offsetY)
     {
     }
 
-    KisHLineConstIteratorSP createConstIterator(const QRect &rect) {
+    KisHLineConstIteratorSP createConstIterator(const QRect &rect)
+    {
         return m_strategy->createHLineConstIteratorNG(m_dataManager, rect.x(), rect.y(), rect.width(), m_offsetX, m_offsetY);
     }
 
-    KisHLineIteratorSP createIterator(const QRect &rect) {
+    KisHLineIteratorSP createIterator(const QRect &rect)
+    {
         return m_strategy->createHLineIteratorNG(m_dataManager, rect.x(), rect.y(), rect.width(), m_offsetX, m_offsetY);
     }
 
-    int pixelSize() const {
+    int pixelSize() const
+    {
         return m_dataManager->pixelSize();
     }
 
 
     KisPaintDeviceStrategy *m_strategy;
     KisDataManager *m_dataManager;
     int m_offsetX;
     int m_offsetY;
 };
 
-struct KisPaintDevice::Private::LodDataStructImpl : public KisPaintDevice::LodDataStruct
-{
+struct KisPaintDevice::Private::LodDataStructImpl : public KisPaintDevice::LodDataStruct {
     LodDataStructImpl(Data *_lodData) : lodData(_lodData) {}
     QScopedPointer<Data> lodData;
 };
 
 QRegion KisPaintDevice::Private::regionForLodSyncing() const
 {
     Data *srcData = currentNonLodData();
     return srcData->dataManager()->region().translated(srcData->x(), srcData->y());
 }
 
 KisPaintDevice::LodDataStruct* KisPaintDevice::Private::createLodDataStruct(int newLod)
 {
     Data *srcData = currentNonLodData();
 
     Data *lodData = new Data(srcData, false);
     LodDataStruct *lodStruct = new LodDataStructImpl(lodData);
 
     int expectedX = KisLodTransform::coordToLodCoord(srcData->x(), newLod);
     int expectedY = KisLodTransform::coordToLodCoord(srcData->y(), newLod);
 
     /**
      * We compare color spaces as pure pointers, because they must be
      * exactly the same, since they come from the common source.
      */
     if (lodData->levelOfDetail() != newLod ||
         lodData->colorSpace() != srcData->colorSpace() ||
         lodData->x() != expectedX ||
         lodData->y() != expectedY) {
 
 
         lodData->prepareClone(srcData);
 
         lodData->setLevelOfDetail(newLod);
         lodData->setX(expectedX);
         lodData->setY(expectedY);
 
         // FIXME: different kind of synchronization
     }
 
     //QRegion dirtyRegion = syncWholeDevice(srcData);
     lodData->cache()->invalidate();
 
     return lodStruct;
 }
 
 void KisPaintDevice::Private::updateLodDataStruct(LodDataStruct *_dst, const QRect &originalRect)
 {
     LodDataStructImpl *dst = dynamic_cast<LodDataStructImpl*>(_dst);
     KIS_SAFE_ASSERT_RECOVER_RETURN(dst);
 
     Data *lodData = dst->lodData.data();
     Data *srcData = currentNonLodData();
 
     const int lod = lodData->levelOfDetail();
     const int srcStepSize = 1 << lod;
 
     const QRect srcRect = KisLodTransform::alignedRect(originalRect, lod);
     const QRect dstRect = KisLodTransform::scaledRect(srcRect, lod);
     if (!srcRect.isValid() || !dstRect.isValid()) return;
 
     KIS_ASSERT_RECOVER_NOOP(srcRect.width() / srcStepSize == dstRect.width());
 
     const int pixelSize = srcData->dataManager()->pixelSize();
 
     int rowsAccumulated = 0;
     int columnsAccumulated = 0;
 
     KoMixColorsOp *mixOp = colorSpace()->mixColorsOp();
 
     QScopedArrayPointer<quint8> blendData(new quint8[srcStepSize * srcRect.width() * pixelSize]);
     quint8 *blendDataPtr = blendData.data();
     int blendDataOffset = 0;
 
     const int srcCellSize = srcStepSize * srcStepSize;
     const int srcCellStride = srcCellSize * pixelSize;
     const int srcStepStride = srcStepSize * pixelSize;
     const int srcColumnStride = (srcStepSize - 1) * srcStepStride;
 
     QScopedArrayPointer<qint16> weights(new qint16[srcCellSize]);
 
     {
         const qint16 averageWeight = qCeil(255.0 / srcCellSize);
         const qint16 extraWeight = averageWeight * srcCellSize - 255;
         KIS_ASSERT_RECOVER_NOOP(extraWeight == 1);
 
         for (int i = 0; i < srcCellSize - 1; i++) {
             weights[i] = averageWeight;
         }
         weights[srcCellSize - 1] = averageWeight - extraWeight;
     }
 
     InternalSequentialConstIterator srcIntIt(StrategyPolicy(currentStrategy(), srcData->dataManager().data(), srcData->x(), srcData->y()), srcRect);
     InternalSequentialIterator dstIntIt(StrategyPolicy(currentStrategy(), lodData->dataManager().data(), lodData->x(), lodData->y()), dstRect);
 
     int rowsRemaining = srcRect.height();
     while (rowsRemaining > 0) {
 
         int colsRemaining = srcRect.width();
         while (colsRemaining > 0) {
 
             memcpy(blendDataPtr, srcIntIt.rawDataConst(), pixelSize);
             blendDataPtr += pixelSize;
             columnsAccumulated++;
 
             if (columnsAccumulated >= srcStepSize) {
                 blendDataPtr += srcColumnStride;
                 columnsAccumulated = 0;
             }
 
             srcIntIt.nextPixel();
             colsRemaining--;
         }
 
         rowsAccumulated++;
 
         if (rowsAccumulated >= srcStepSize) {
 
             // blend and write the final data
             blendDataPtr = blendData.data();
             for (int i = 0; i < dstRect.width(); i++) {
                 mixOp->mixColors(blendDataPtr, weights.data(), srcCellSize, dstIntIt.rawData());
 
                 blendDataPtr += srcCellStride;
                 dstIntIt.nextPixel();
             }
 
             // reset counters
             rowsAccumulated = 0;
             blendDataPtr = blendData.data();
             blendDataOffset = 0;
         } else {
             blendDataOffset += srcStepStride;
             blendDataPtr = blendData.data() + blendDataOffset;
         }
 
         rowsRemaining--;
     }
 }
 
 void KisPaintDevice::Private::uploadLodDataStruct(LodDataStruct *_dst)
 {
     LodDataStructImpl *dst = dynamic_cast<LodDataStructImpl*>(_dst);
     KIS_SAFE_ASSERT_RECOVER_RETURN(dst);
 
     KIS_SAFE_ASSERT_RECOVER_RETURN(
         dst->lodData->levelOfDetail() == defaultBounds->currentLevelOfDetail());
 
     ensureLodDataPresent();
 
     m_lodData->prepareClone(dst->lodData.data());
     m_lodData->dataManager()->bitBltRough(dst->lodData->dataManager(), dst->lodData->dataManager()->extent());
 }
 
 void KisPaintDevice::Private::transferFromData(Data *data, KisPaintDeviceSP targetDevice)
 {
     QRect extent = data->dataManager()->extent();
     extent.translate(data->x(), data->y());
 
     targetDevice->m_d->prepareCloneImpl(q, data);
     targetDevice->m_d->currentStrategy()->fastBitBltRough(data->dataManager(), extent);
 }
 
 void KisPaintDevice::Private::fetchFrame(int frameId, KisPaintDeviceSP targetDevice)
 {
     DataSP data = m_frames[frameId];
     transferFromData(data.data(), targetDevice);
 }
 
 void KisPaintDevice::Private::uploadFrame(int srcFrameId, int dstFrameId, KisPaintDeviceSP srcDevice)
 {
     DataSP dstData = m_frames[dstFrameId];
     KIS_ASSERT_RECOVER_RETURN(dstData);
 
     DataSP srcData = srcDevice->m_d->m_frames[srcFrameId];
     KIS_ASSERT_RECOVER_RETURN(srcData);
 
     uploadFrameData(srcData, dstData);
 }
 
-void KisPaintDevice::Private::uploadFrame(int dstFrameId, KisPaintDeviceSP srcDevice) {
+void KisPaintDevice::Private::uploadFrame(int dstFrameId, KisPaintDeviceSP srcDevice)
+{
     DataSP dstData = m_frames[dstFrameId];
     KIS_ASSERT_RECOVER_RETURN(dstData);
 
     DataSP srcData = srcDevice->m_d->m_data;
     KIS_ASSERT_RECOVER_RETURN(srcData);
 
     uploadFrameData(srcData, dstData);
 }
 
-void KisPaintDevice::Private::uploadFrameData(DataSP srcData, DataSP dstData) {
+void KisPaintDevice::Private::uploadFrameData(DataSP srcData, DataSP dstData)
+{
     if (srcData->colorSpace() != dstData->colorSpace() &&
         !(*srcData->colorSpace() == *dstData->colorSpace())) {
 
         KUndo2Command tempCommand;
 
         srcData = toQShared(new Data(srcData.data(), true));
         srcData->convertDataColorSpace(dstData->colorSpace(),
                                        KoColorConversionTransformation::internalRenderingIntent(),
                                        KoColorConversionTransformation::internalConversionFlags(),
                                        &tempCommand);
     }
 
     dstData->dataManager()->clear();
     dstData->cache()->invalidate();
 
     const QRect rect = srcData->dataManager()->extent();
     dstData->dataManager()->bitBltRough(srcData->dataManager(), rect);
 }
 
 void KisPaintDevice::Private::tesingFetchLodDevice(KisPaintDeviceSP targetDevice)
 {
     Data *data = m_lodData.data();
     Q_ASSERT(data);
 
     transferFromData(data, targetDevice);
 }
 
-KUndo2Command* KisPaintDevice::Private::convertColorSpace(const KoColorSpace * dstColorSpace, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags) {
+KUndo2Command* KisPaintDevice::Private::convertColorSpace(const KoColorSpace * dstColorSpace, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
+{
 
-    class DeviceChangeColorSpaceCommand : public KUndo2Command {
+    class DeviceChangeColorSpaceCommand : public KUndo2Command
+    {
     public:
         DeviceChangeColorSpaceCommand(KisPaintDeviceSP device)
             : m_firstRun(true),
               m_device(device)
-            {
-            }
+        {
+        }
 
-        void emitNotifications() {
+        void emitNotifications()
+        {
             m_device->emitColorSpaceChanged();
             m_device->setDirty();
         }
 
-        void redo() {
+        void redo()
+        {
             KUndo2Command::redo();
 
             if (!m_firstRun) {
                 m_firstRun = false;
                 return;
             }
 
             emitNotifications();
         }
 
-        void undo() {
+        void undo()
+        {
             KUndo2Command::undo();
             emitNotifications();
         }
 
     private:
         bool m_firstRun;
         KisPaintDeviceSP m_device;
     };
 
 
     KUndo2Command *parentCommand = new DeviceChangeColorSpaceCommand(q);
 
     QList<Data*> dataObjects = allDataObjects();;
 
     Q_FOREACH (Data *data, dataObjects) {
         if (!data) continue;
 
         data->convertDataColorSpace(dstColorSpace, renderingIntent, conversionFlags, parentCommand);
     }
 
     if (!parentCommand->childCount()) {
         delete parentCommand;
         parentCommand = 0;
     } else {
         q->emitColorSpaceChanged();
     }
 
     return parentCommand;
 
 }
 
 bool KisPaintDevice::Private::assignProfile(const KoColorProfile * profile)
 {
     if (!profile) return false;
 
     const KoColorSpace *dstColorSpace =
         KoColorSpaceRegistry::instance()->colorSpace(colorSpace()->colorModelId().id(), colorSpace()->colorDepthId().id(), profile);
     if (!dstColorSpace) return false;
 
     QList<Data*> dataObjects = allDataObjects();;
     Q_FOREACH (Data *data, dataObjects) {
         if (!data) continue;
         data->assignColorSpace(dstColorSpace);
     }
     q->emitProfileChanged();
 
     // no undo information is provided here
     return true;
 }
 
 void KisPaintDevice::Private::init(const KoColorSpace *cs, const quint8 *defaultPixel)
 {
     QList<Data*> dataObjects = allDataObjects();;
     Q_FOREACH (Data *data, dataObjects) {
         if (!data) continue;
 
         KisDataManagerSP dataManager = new KisDataManager(cs->pixelSize(), defaultPixel);
         data->init(cs, dataManager);
     }
 }
 
 KisPaintDevice::KisPaintDevice(const KoColorSpace * colorSpace, const QString& name)
     : QObject(0)
     , m_d(new Private(this))
 {
     init(colorSpace, new KisDefaultBounds(), 0, name);
 }
 
 KisPaintDevice::KisPaintDevice(KisNodeWSP parent, const KoColorSpace * colorSpace, KisDefaultBoundsBaseSP defaultBounds, const QString& name)
     : QObject(0)
     , m_d(new Private(this))
 {
     init(colorSpace, defaultBounds, parent, name);
 }
 
 void KisPaintDevice::init(const KoColorSpace *colorSpace,
                           KisDefaultBoundsBaseSP defaultBounds,
                           KisNodeWSP parent, const QString& name)
 {
     Q_ASSERT(colorSpace);
     setObjectName(name);
 
     // temporary def. bounds object for the initialization phase only
     m_d->defaultBounds = m_d->transitionalDefaultBounds;
 
     if (!defaultBounds) {
         // Reuse transitionalDefaultBounds here. Change if you change
         // semantics of transitionalDefaultBounds
         defaultBounds = m_d->transitionalDefaultBounds;
     }
 
     QScopedArrayPointer<quint8> defaultPixel(new quint8[colorSpace->pixelSize()]);
     colorSpace->fromQColor(Qt::transparent, defaultPixel.data());
     m_d->init(colorSpace, defaultPixel.data());
 
     Q_ASSERT(m_d->colorSpace());
 
     setDefaultBounds(defaultBounds);
     setParentNode(parent);
 }
 
 KisPaintDevice::KisPaintDevice(const KisPaintDevice& rhs, bool copyFrames, KisNode *newParentNode)
     : QObject()
     , KisShared()
     , m_d(new Private(this))
 {
     if (this != &rhs) {
         // temporary def. bounds object for the initialization phase only
         m_d->defaultBounds = m_d->transitionalDefaultBounds;
 
         // copy data objects with or without frames
         m_d->cloneAllDataObjects(rhs.m_d, copyFrames);
 
         if (copyFrames) {
             KIS_ASSERT_RECOVER_RETURN(rhs.m_d->framesInterface);
             KIS_ASSERT_RECOVER_RETURN(rhs.m_d->contentChannel);
             m_d->framesInterface.reset(new KisPaintDeviceFramesInterface(this));
             m_d->contentChannel.reset(new KisRasterKeyframeChannel(*rhs.m_d->contentChannel.data(), newParentNode, this));
         }
 
         setDefaultBounds(rhs.m_d->defaultBounds);
         setParentNode(0);
     }
 }
 
 KisPaintDevice::~KisPaintDevice()
 {
     delete m_d;
 }
 
 void KisPaintDevice::setProjectionDevice(bool value)
 {
     m_d->isProjectionDevice = value;
 }
 
 void KisPaintDevice::prepareClone(KisPaintDeviceSP src)
 {
     m_d->prepareClone(src);
     Q_ASSERT(fastBitBltPossible(src));
 }
 
 void KisPaintDevice::makeCloneFrom(KisPaintDeviceSP src, const QRect &rect)
 {
     prepareClone(src);
 
-     // we guarantee that *this is totally empty, so copy pixels that
+    // we guarantee that *this is totally empty, so copy pixels that
     // are areally present on the source image only
     const QRect optimizedRect = rect & src->extent();
 
     fastBitBlt(src, optimizedRect);
 }
 
 void KisPaintDevice::makeCloneFromRough(KisPaintDeviceSP src, const QRect &minimalRect)
 {
     prepareClone(src);
 
     // we guarantee that *this is totally empty, so copy pixels that
     // are areally present on the source image only
     const QRect optimizedRect = minimalRect & src->extent();
 
     fastBitBltRough(src, optimizedRect);
 }
 
 void KisPaintDevice::setDirty()
 {
     m_d->cache()->invalidate();
     if (m_d->parent.isValid())
         m_d->parent->setDirty();
 }
 
 void KisPaintDevice::setDirty(const QRect & rc)
 {
     m_d->cache()->invalidate();
     if (m_d->parent.isValid())
         m_d->parent->setDirty(rc);
 }
 
 void KisPaintDevice::setDirty(const QRegion & region)
 {
     m_d->cache()->invalidate();
     if (m_d->parent.isValid())
         m_d->parent->setDirty(region);
 }
 
 void KisPaintDevice::setDirty(const QVector<QRect> rects)
 {
     m_d->cache()->invalidate();
     if (m_d->parent.isValid())
         m_d->parent->setDirty(rects);
 }
 
 void KisPaintDevice::requestTimeSwitch(int time)
 {
     if (m_d->parent.isValid()) {
         m_d->parent->requestTimeSwitch(time);
     }
 }
 
 void KisPaintDevice::setParentNode(KisNodeWSP parent)
 {
     m_d->parent = parent;
 }
 
 // for testing purposes only
 KisNodeWSP KisPaintDevice::parentNode() const
 {
     return m_d->parent;
 }
 
 void KisPaintDevice::setDefaultBounds(KisDefaultBoundsBaseSP defaultBounds)
 {
     m_d->defaultBounds = defaultBounds;
     m_d->cache()->invalidate();
 }
 
 KisDefaultBoundsBaseSP KisPaintDevice::defaultBounds() const
 {
     return m_d->defaultBounds;
 }
 
 void KisPaintDevice::move(const QPoint &pt)
 {
     m_d->currentStrategy()->move(pt);
     m_d->cache()->invalidate();
 }
 
 void KisPaintDevice::move(qint32 x, qint32 y)
 {
     move(QPoint(x, y));
 }
 
 void KisPaintDevice::setX(qint32 x)
 {
     move(QPoint(x, m_d->y()));
 }
 
 void KisPaintDevice::setY(qint32 y)
 {
     move(QPoint(m_d->x(), y));
 }
 
 qint32 KisPaintDevice::x() const
 {
     return m_d->x();
 }
 
 qint32 KisPaintDevice::y() const
 {
     return m_d->y();
 }
 
 void KisPaintDevice::extent(qint32 &x, qint32 &y, qint32 &w, qint32 &h) const
 {
     QRect rc = extent();
     x = rc.x();
     y = rc.y();
     w = rc.width();
     h = rc.height();
 }
 
 QRect KisPaintDevice::extent() const
 {
     return m_d->currentStrategy()->extent();
 }
 
 QRegion KisPaintDevice::region() const
 {
     return m_d->currentStrategy()->region();
 }
 
 QRect KisPaintDevice::nonDefaultPixelArea() const
 {
     return m_d->cache()->nonDefaultPixelArea();
 }
 
 QRect KisPaintDevice::exactBounds() const
 {
     return m_d->cache()->exactBounds();
 }
 
 QRect KisPaintDevice::exactBoundsAmortized() const
 {
     return m_d->cache()->exactBoundsAmortized();
 }
 
-namespace Impl {
-
-struct CheckFullyTransparent
+namespace Impl
 {
+
+struct CheckFullyTransparent {
     CheckFullyTransparent(const KoColorSpace *colorSpace)
         : m_colorSpace(colorSpace)
     {
     }
 
-    bool isPixelEmpty(const quint8 *pixelData) {
+    bool isPixelEmpty(const quint8 *pixelData)
+    {
         return m_colorSpace->opacityU8(pixelData) == OPACITY_TRANSPARENT_U8;
     }
 
 private:
     const KoColorSpace *m_colorSpace;
 };
 
-struct CheckNonDefault
-{
+struct CheckNonDefault {
     CheckNonDefault(int pixelSize, const quint8 *defaultPixel)
         : m_pixelSize(pixelSize),
           m_defaultPixel(defaultPixel)
     {
     }
 
-    bool isPixelEmpty(const quint8 *pixelData) {
+    bool isPixelEmpty(const quint8 *pixelData)
+    {
         return memcmp(m_defaultPixel, pixelData, m_pixelSize) == 0;
     }
 
 private:
     int m_pixelSize;
     const quint8 *m_defaultPixel;
 };
 
 template <class ComparePixelOp>
 QRect calculateExactBoundsImpl(const KisPaintDevice *device, const QRect &startRect, const QRect &endRect, ComparePixelOp compareOp)
 {
     if (startRect == endRect) return startRect;
 
     // Solution n°2
     int  x, y, w, h;
     int boundLeft, boundTop, boundRight, boundBottom;
     int endDirN, endDirE, endDirS, endDirW;
 
     startRect.getRect(&x, &y, &w, &h);
 
     if (endRect.isEmpty()) {
         endDirS = startRect.bottom();
         endDirN = startRect.top();
         endDirE = startRect.right();
         endDirW = startRect.left();
         startRect.getCoords(&boundLeft, &boundTop, &boundRight, &boundBottom);
     } else {
         endDirS = endRect.top() - 1;
         endDirN = endRect.bottom() + 1;
         endDirE = endRect.left() - 1;
         endDirW = endRect.right() + 1;
         endRect.getCoords(&boundLeft, &boundTop, &boundRight, &boundBottom);
     }
 
     // XXX: a small optimization is possible by using H/V line iterators in the first
     //      and third cases, at the cost of making the code a bit more complex
 
     KisRandomConstAccessorSP accessor = device->createRandomConstAccessorNG(x, y);
 
     bool found = false;
     {
         for (qint32 y2 = y; y2 <= endDirS; ++y2) {
             for (qint32 x2 = x; x2 < x + w || found; ++ x2) {
                 accessor->moveTo(x2, y2);
                 if (!compareOp.isPixelEmpty(accessor->rawDataConst())) {
                     boundTop = y2;
                     found = true;
                     break;
                 }
             }
             if (found) break;
         }
     }
 
     /**
      * If the first pass hasn't found any opaque pixel, there is no
      * reason to check that 3 more times. They will not appear in the
      * meantime. Just return an empty bounding rect.
      */
     if (!found && endRect.isEmpty()) {
         return QRect();
     }
 
     found = false;
 
     for (qint32 y2 = y + h - 1; y2 >= endDirN ; --y2) {
         for (qint32 x2 = x + w - 1; x2 >= x || found; --x2) {
             accessor->moveTo(x2, y2);
             if (!compareOp.isPixelEmpty(accessor->rawDataConst())) {
                 boundBottom = y2;
                 found = true;
                 break;
             }
         }
         if (found) break;
     }
     found = false;
 
     {
         for (qint32 x2 = x; x2 <= endDirE ; ++x2) {
             for (qint32 y2 = y; y2 < y + h || found; ++y2) {
                 accessor->moveTo(x2, y2);
                 if (!compareOp.isPixelEmpty(accessor->rawDataConst())) {
                     boundLeft = x2;
                     found = true;
                     break;
                 }
             }
             if (found) break;
         }
     }
 
     found = false;
 
     // Look for right edge )
     {
 
         for (qint32 x2 = x + w - 1; x2 >= endDirW; --x2) {
-            for (qint32 y2 = y + h -1; y2 >= y || found; --y2) {
+            for (qint32 y2 = y + h - 1; y2 >= y || found; --y2) {
                 accessor->moveTo(x2, y2);
                 if (!compareOp.isPixelEmpty(accessor->rawDataConst())) {
                     boundRight = x2;
                     found = true;
                     break;
                 }
             }
             if (found) break;
         }
     }
 
     return QRect(boundLeft, boundTop,
                  boundRight - boundLeft + 1,
                  boundBottom - boundTop + 1);
 }
 
 }
 
 QRect KisPaintDevice::calculateExactBounds(bool nonDefaultOnly) const
 {
     QRect startRect = extent();
     QRect endRect;
 
     quint8 defaultOpacity = m_d->colorSpace()->opacityU8(defaultPixel());
-    if(defaultOpacity != OPACITY_TRANSPARENT_U8) {
+    if (defaultOpacity != OPACITY_TRANSPARENT_U8) {
         if (!nonDefaultOnly) {
             /**
              * We will calculate exact bounds only outside of the
              * image bounds, and that'll be nondefault area only.
              */
 
             endRect = defaultBounds()->bounds();
             nonDefaultOnly = true;
 
         } else {
             startRect = region().boundingRect();
         }
     }
 
     if (nonDefaultOnly) {
         Impl::CheckNonDefault compareOp(pixelSize(), defaultPixel());
         endRect = Impl::calculateExactBoundsImpl(this, startRect, endRect, compareOp);
     } else {
         Impl::CheckFullyTransparent compareOp(m_d->colorSpace());
         endRect = Impl::calculateExactBoundsImpl(this, startRect, endRect, compareOp);
     }
 
     return endRect;
 }
 
 
 void KisPaintDevice::crop(qint32 x, qint32 y, qint32 w, qint32 h)
 {
     crop(QRect(x, y, w, h));
 }
 
 
 void KisPaintDevice::crop(const QRect &rect)
 {
     m_d->currentStrategy()->crop(rect);
 }
 
 void KisPaintDevice::purgeDefaultPixels()
 {
     KisDataManagerSP dm = m_d->dataManager();
     dm->purge(dm->extent());
 }
 
 void KisPaintDevice::setDefaultPixel(const quint8 *defPixel)
 {
     m_d->dataManager()->setDefaultPixel(defPixel);
     m_d->cache()->invalidate();
 }
 
 const quint8 *KisPaintDevice::defaultPixel() const
 {
     return m_d->dataManager()->defaultPixel();
 }
 
 void KisPaintDevice::clear()
 {
     m_d->dataManager()->clear();
     m_d->cache()->invalidate();
 }
 
 void KisPaintDevice::clear(const QRect & rc)
 {
     m_d->currentStrategy()->clear(rc);
 }
 
 void KisPaintDevice::fill(const QRect & rc, const KoColor &color)
 {
     Q_ASSERT(*color.colorSpace() == *colorSpace());
     m_d->currentStrategy()->fill(rc, color.data());
 }
 
 void KisPaintDevice::fill(qint32 x, qint32 y, qint32 w, qint32 h, const quint8 *fillPixel)
 {
     m_d->currentStrategy()->fill(QRect(x, y, w, h), fillPixel);
 }
 
 
 bool KisPaintDevice::write(KisPaintDeviceWriter &store)
 {
     return m_d->dataManager()->write(store);
 }
 
 bool KisPaintDevice::read(QIODevice *stream)
 {
     bool retval;
 
     retval = m_d->dataManager()->read(stream);
     m_d->cache()->invalidate();
 
     return retval;
 }
 
 void KisPaintDevice::emitColorSpaceChanged()
 {
     emit colorSpaceChanged(m_d->colorSpace());
 }
 
 void KisPaintDevice::emitProfileChanged()
 {
     emit profileChanged(m_d->colorSpace()->profile());
 }
 
 KUndo2Command* KisPaintDevice::convertTo(const KoColorSpace * dstColorSpace, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
 {
     KUndo2Command *command = m_d->convertColorSpace(dstColorSpace, renderingIntent, conversionFlags);
     return command;
 }
 
 bool KisPaintDevice::setProfile(const KoColorProfile * profile)
 {
     return m_d->assignProfile(profile);
 }
 
 KisDataManagerSP KisPaintDevice::dataManager() const
 {
     return m_d->dataManager();
 }
 
 void KisPaintDevice::convertFromQImage(const QImage& _image, const KoColorProfile *profile,
                                        qint32 offsetX, qint32 offsetY)
 {
     QImage image = _image;
 
     if (image.format() != QImage::Format_ARGB32) {
         image = image.convertToFormat(QImage::Format_ARGB32);
     }
     // Don't convert if not no profile is given and both paint dev and qimage are rgba.
     if (!profile && colorSpace()->id() == "RGBA") {
         writeBytes(image.constBits(), offsetX, offsetY, image.width(), image.height());
     } else {
         try {
             quint8 * dstData = new quint8[image.width() * image.height() * pixelSize()];
             KoColorSpaceRegistry::instance()
-                    ->colorSpace(RGBAColorModelID.id(), Integer8BitsColorDepthID.id(), profile)
-                    ->convertPixelsTo(image.constBits(), dstData, colorSpace(), image.width() * image.height(),
-                                      KoColorConversionTransformation::internalRenderingIntent(),
-                                      KoColorConversionTransformation::internalConversionFlags());
+            ->colorSpace(RGBAColorModelID.id(), Integer8BitsColorDepthID.id(), profile)
+            ->convertPixelsTo(image.constBits(), dstData, colorSpace(), image.width() * image.height(),
+                              KoColorConversionTransformation::internalRenderingIntent(),
+                              KoColorConversionTransformation::internalConversionFlags());
 
             writeBytes(dstData, offsetX, offsetY, image.width(), image.height());
             delete[] dstData;
         } catch (std::bad_alloc) {
             warnKrita << "KisPaintDevice::convertFromQImage: Could not allocate" << image.width() * image.height() * pixelSize() << "bytes";
             return;
         }
     }
     m_d->cache()->invalidate();
 }
 
 QImage KisPaintDevice::convertToQImage(const KoColorProfile *dstProfile, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags) const
 {
     qint32 x1;
     qint32 y1;
     qint32 w;
     qint32 h;
 
     QRect rc = exactBounds();
     x1 = rc.x();
     y1 = rc.y();
     w = rc.width();
     h = rc.height();
 
     return convertToQImage(dstProfile, x1, y1, w, h, renderingIntent, conversionFlags);
 }
 
 QImage KisPaintDevice::convertToQImage(const KoColorProfile *dstProfile,
                                        const QRect &rc,
                                        KoColorConversionTransformation::Intent renderingIntent,
                                        KoColorConversionTransformation::ConversionFlags conversionFlags) const
 {
     return convertToQImage(dstProfile,
                            rc.x(), rc.y(), rc.width(), rc.height(),
                            renderingIntent, conversionFlags);
 }
 
 QImage KisPaintDevice::convertToQImage(const KoColorProfile *  dstProfile, qint32 x1, qint32 y1, qint32 w, qint32 h, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags) const
 {
 
     if (w < 0)
         return QImage();
 
     if (h < 0)
         return QImage();
 
     quint8 *data = 0;
     try {
         data = new quint8 [w * h * pixelSize()];
     } catch (std::bad_alloc) {
         warnKrita << "KisPaintDevice::convertToQImage std::bad_alloc for " << w << " * " << h << " * " << pixelSize();
         //delete[] data; // data is not allocated, so don't free it
         return QImage();
     }
     Q_CHECK_PTR(data);
 
     // XXX: Is this really faster than converting line by line and building the QImage directly?
     //      This copies potentially a lot of data.
     readBytes(data, x1, y1, w, h);
     QImage image = colorSpace()->convertToQImage(data, w, h, dstProfile, renderingIntent, conversionFlags);
     delete[] data;
 
     return image;
 }
 
-KisPaintDeviceSP KisPaintDevice::createThumbnailDevice(qint32 w, qint32 h, QRect rect) const
+inline bool moveBy(KisSequentialConstIterator& iter, int numPixels)
 {
-    KisPaintDeviceSP thumbnail = new KisPaintDevice(colorSpace());
-
-    int srcWidth, srcHeight;
-    int srcX0, srcY0;
-    QRect e = rect.isValid() ? rect : extent();
-    e.getRect(&srcX0, &srcY0, &srcWidth, &srcHeight);
-
-    if (w > srcWidth) {
-        w = srcWidth;
-        h = qint32(double(srcWidth) / w * h);
+    int pos = 0;
+    while (pos < numPixels) {
+        int step = std::min(iter.nConseqPixels(), numPixels - pos);
+        if (!iter.nextPixels(step))
+            return false;
+        pos += step;
     }
-    if (h > srcHeight) {
-        h = srcHeight;
-        w = qint32(double(srcHeight) / h * w);
-    }
-
-    if (srcWidth > srcHeight)
-        h = qint32(double(srcHeight) / srcWidth * w);
-    else if (srcHeight > srcWidth)
-        w = qint32(double(srcWidth) / srcHeight * h);
+    return true;
+}
 
-    const qint32 pixelSize = this->pixelSize();
+static KisPaintDeviceSP createThumbnailDeviceInternal(const KisPaintDevice* srcDev, qint32 srcX0, qint32 srcY0, qint32 srcWidth, qint32 srcHeight, qint32 w, qint32 h, QRect outputRect)
+{
+    KisPaintDeviceSP thumbnail = new KisPaintDevice(srcDev->colorSpace());
+    qint32 pixelSize = srcDev->pixelSize();
 
-    KisRandomConstAccessorSP iter = createRandomConstAccessorNG(0, 0);
+    KisRandomConstAccessorSP srcIter = srcDev->createRandomConstAccessorNG(0, 0);
     KisRandomAccessorSP dstIter = thumbnail->createRandomAccessorNG(0, 0);
 
-    for (qint32 y = 0; y < h; ++y) {
+    for (qint32 y = outputRect.y(); y < outputRect.y() + outputRect.height(); ++y) {
         qint32 iY = srcY0 + (y * srcHeight) / h;
-        for (qint32 x = 0; x < w; ++x) {
+        for (qint32 x = outputRect.x(); x < outputRect.x() + outputRect.width(); ++x) {
             qint32 iX = srcX0 + (x * srcWidth) / w;
-            iter->moveTo(iX, iY);
+            srcIter->moveTo(iX, iY);
             dstIter->moveTo(x,  y);
-            memcpy(dstIter->rawData(), iter->rawDataConst(), pixelSize);
+            memcpy(dstIter->rawData(), srcIter->rawDataConst(), pixelSize);
         }
     }
     return thumbnail;
+}
+
+KisPaintDeviceSP KisPaintDevice::createThumbnailDevice(qint32 w, qint32 h, QRect rect, QRect outputRect) const
+{
+    QSize thumbnailSize(w, h);
+
+    int srcWidth, srcHeight;
+    int srcX0, srcY0;
+    QRect imageRect = rect.isValid() ? rect : extent();
+
+    //can't create thumbnail for an empty device, e.g. layer thumbnail for empty image
+    if (imageRect.isEmpty() || !imageRect.isValid()) {
+        return new KisPaintDevice(colorSpace());
+    }
+
+    imageRect.getRect(&srcX0, &srcY0, &srcWidth, &srcHeight);
+
+    if ((thumbnailSize.width() > imageRect.width()) || (thumbnailSize.height() > imageRect.height())) {
+        thumbnailSize.scale(imageRect.size(), Qt::KeepAspectRatio);
+    }
 
+    if (!outputRect.isValid()) {
+        outputRect = QRect(0, 0, w, h);
+    }
+
+    KisPaintDeviceSP thumbnail = createThumbnailDeviceInternal(this, imageRect.x(), imageRect.y(), imageRect.width(), imageRect.height(),
+                                 thumbnailSize.width(), thumbnailSize.height(), outputRect);
+
+    return thumbnail;
 }
 
-QImage KisPaintDevice::createThumbnail(qint32 w, qint32 h, QRect rect, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
+KisPaintDeviceSP KisPaintDevice::createThumbnailDeviceOversampled(qint32 w, qint32 h, qreal oversample, QRect rect,  QRect outputTileRect) const
 {
-    KisPaintDeviceSP dev = createThumbnailDevice(w, h, rect);
+    QSize thumbnailSize(w, h);
+    qreal oversampleAdjusted = qMax(oversample, 1.);
+    QSize thumbnailOversampledSize = oversampleAdjusted * thumbnailSize;
+
+    QRect outputRect;
+    QRect imageRect = (rect.isValid() && !rect.isNull()) ? rect : extent();
+
+    //can't create thumbnail for an empty device, e.g. layer thumbnail for empty image
+    if (imageRect.isEmpty() || !imageRect.isValid()) {
+        return new KisPaintDevice(colorSpace());
+    }
+
+    qint32 hstart = thumbnailOversampledSize.height();
+
+    if ((thumbnailOversampledSize.width() > imageRect.width()) || (thumbnailOversampledSize.height() > imageRect.height())) {
+        thumbnailOversampledSize.scale(imageRect.size(), Qt::KeepAspectRatio);
+    }
+
+    oversampleAdjusted *= (hstart > 0) ? ((qreal)thumbnailOversampledSize.height() / hstart) : 1.; //readjusting oversample ratio, given that we had to adjust thumbnail size
+
+    outputRect = QRect(0, 0, thumbnailOversampledSize.width(), thumbnailOversampledSize.height());
+
+    if (outputTileRect.isValid()) {
+        //compensating output rectangle for oversampling
+        outputTileRect = QRect(oversampleAdjusted * outputTileRect.topLeft(), oversampleAdjusted * outputTileRect.bottomRight());
+        outputRect = outputRect.intersected(outputTileRect);
+    }
+
+    KisPaintDeviceSP thumbnail = createThumbnailDeviceInternal(this, imageRect.x(), imageRect.y(), imageRect.width(), imageRect.height(),
+                                 thumbnailOversampledSize.width(), thumbnailOversampledSize.height(), outputRect);
+
+    if (oversample != 1. && oversampleAdjusted != 1.) {
+        KoDummyUpdater updater;
+        KisTransformWorker worker(thumbnail, 1 / oversampleAdjusted, 1 / oversampleAdjusted, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+                                  &updater, KisFilterStrategyRegistry::instance()->value("Bilinear"));
+        worker.run();
+    }
+    return thumbnail;
+}
+
+QImage KisPaintDevice::createThumbnail(qint32 w, qint32 h, QRect rect, qreal oversample, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
+{
+    KisPaintDeviceSP dev = createThumbnailDeviceOversampled(w, h, oversample, rect);
     QImage thumbnail = dev->convertToQImage(KoColorSpaceRegistry::instance()->rgb8()->profile(), 0, 0, w, h, renderingIntent, conversionFlags);
     return thumbnail;
 }
 
-QImage KisPaintDevice::createThumbnail(qint32 w, qint32 h, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
+QImage KisPaintDevice::createThumbnail(qint32 w, qint32 h, qreal oversample, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags)
 {
-    return m_d->cache()->createThumbnail(w, h, renderingIntent, conversionFlags);
+    return m_d->cache()->createThumbnail(w, h, oversample, renderingIntent, conversionFlags);
 }
 
 KisHLineIteratorSP KisPaintDevice::createHLineIteratorNG(qint32 x, qint32 y, qint32 w)
 {
     m_d->cache()->invalidate();
     return m_d->currentStrategy()->createHLineIteratorNG(m_d->dataManager().data(), x, y, w, m_d->x(), m_d->y());
 }
 
 KisHLineConstIteratorSP KisPaintDevice::createHLineConstIteratorNG(qint32 x, qint32 y, qint32 w) const
 {
     return m_d->currentStrategy()->createHLineConstIteratorNG(m_d->dataManager().data(), x, y, w, m_d->x(), m_d->y());
 }
 
 KisVLineIteratorSP KisPaintDevice::createVLineIteratorNG(qint32 x, qint32 y, qint32 w)
 {
     m_d->cache()->invalidate();
     return m_d->currentStrategy()->createVLineIteratorNG(x, y, w);
 }
 
 KisVLineConstIteratorSP KisPaintDevice::createVLineConstIteratorNG(qint32 x, qint32 y, qint32 w) const
 {
     return m_d->currentStrategy()->createVLineConstIteratorNG(x, y, w);
 }
 
 KisRepeatHLineConstIteratorSP KisPaintDevice::createRepeatHLineConstIterator(qint32 x, qint32 y, qint32 w, const QRect& _dataWidth) const
 {
     return new KisRepeatHLineConstIteratorNG(m_d->dataManager().data(), x, y, w, m_d->x(), m_d->y(), _dataWidth);
 }
 
 KisRepeatVLineConstIteratorSP KisPaintDevice::createRepeatVLineConstIterator(qint32 x, qint32 y, qint32 h, const QRect& _dataWidth) const
 {
     return new KisRepeatVLineConstIteratorNG(m_d->dataManager().data(), x, y, h, m_d->x(), m_d->y(), _dataWidth);
 }
 
 KisRandomAccessorSP KisPaintDevice::createRandomAccessorNG(qint32 x, qint32 y)
 {
     m_d->cache()->invalidate();
     return m_d->currentStrategy()->createRandomAccessorNG(x, y);
 }
 
 KisRandomConstAccessorSP KisPaintDevice::createRandomConstAccessorNG(qint32 x, qint32 y) const
 {
     return m_d->currentStrategy()->createRandomConstAccessorNG(x, y);
 }
 
 KisRandomSubAccessorSP KisPaintDevice::createRandomSubAccessor() const
 {
     KisPaintDevice* pd = const_cast<KisPaintDevice*>(this);
     return new KisRandomSubAccessor(pd);
 }
 
 void KisPaintDevice::clearSelection(KisSelectionSP selection)
 {
     const KoColorSpace *colorSpace = m_d->colorSpace();
     QRect r = selection->selectedExactRect() & m_d->defaultBounds->bounds();
 
     if (r.isValid()) {
 
         KisHLineIteratorSP devIt = createHLineIteratorNG(r.x(), r.y(), r.width());
         KisHLineConstIteratorSP selectionIt = selection->projection()->createHLineConstIteratorNG(r.x(), r.y(), r.width());
 
         const quint8* defaultPixel_ = defaultPixel();
         bool transparentDefault = (colorSpace->opacityU8(defaultPixel_) == OPACITY_TRANSPARENT_U8);
         for (qint32 y = 0; y < r.height(); y++) {
 
             do {
                 // XXX: Optimize by using stretches
                 colorSpace->applyInverseAlphaU8Mask(devIt->rawData(), selectionIt->rawDataConst(), 1);
                 if (transparentDefault && colorSpace->opacityU8(devIt->rawData()) == OPACITY_TRANSPARENT_U8) {
                     memcpy(devIt->rawData(), defaultPixel_, colorSpace->pixelSize());
                 }
             } while (devIt->nextPixel() && selectionIt->nextPixel());
             devIt->nextRow();
             selectionIt->nextRow();
         }
         m_d->dataManager()->purge(r.translated(-m_d->x(), -m_d->y()));
         setDirty(r);
     }
 }
 
 bool KisPaintDevice::pixel(qint32 x, qint32 y, QColor *c) const
 {
     KisHLineConstIteratorSP iter = createHLineConstIteratorNG(x, y, 1);
 
     const quint8 *pix = iter->rawDataConst();
 
     if (!pix) return false;
 
     colorSpace()->toQColor(pix, c);
 
     return true;
 }
 
 
 bool KisPaintDevice::pixel(qint32 x, qint32 y, KoColor * kc) const
 {
     KisHLineConstIteratorSP iter = createHLineConstIteratorNG(x, y, 1);
 
     const quint8 *pix = iter->rawDataConst();
 
     if (!pix) return false;
 
     kc->setColor(pix, m_d->colorSpace());
 
     return true;
 }
 
 bool KisPaintDevice::setPixel(qint32 x, qint32 y, const QColor& c)
 {
     KisHLineIteratorSP iter = createHLineIteratorNG(x, y, 1);
 
     colorSpace()->fromQColor(c, iter->rawData());
     m_d->cache()->invalidate();
     return true;
 }
 
 bool KisPaintDevice::setPixel(qint32 x, qint32 y, const KoColor& kc)
 {
     const quint8 * pix;
     KisHLineIteratorSP iter = createHLineIteratorNG(x, y, 1);
     if (kc.colorSpace() != m_d->colorSpace()) {
         KoColor kc2(kc, m_d->colorSpace());
         pix = kc2.data();
         memcpy(iter->rawData(), pix, m_d->colorSpace()->pixelSize());
     } else {
         pix = kc.data();
         memcpy(iter->rawData(), pix, m_d->colorSpace()->pixelSize());
     }
     m_d->cache()->invalidate();
     return true;
 }
 
 bool KisPaintDevice::fastBitBltPossible(KisPaintDeviceSP src)
 {
     return m_d->fastBitBltPossible(src);
 }
 
 void KisPaintDevice::fastBitBlt(KisPaintDeviceSP src, const QRect &rect)
 {
     m_d->currentStrategy()->fastBitBlt(src, rect);
 }
 
 void KisPaintDevice::fastBitBltOldData(KisPaintDeviceSP src, const QRect &rect)
 {
     m_d->currentStrategy()->fastBitBltOldData(src, rect);
 }
 
 void KisPaintDevice::fastBitBltRough(KisPaintDeviceSP src, const QRect &rect)
 {
     m_d->currentStrategy()->fastBitBltRough(src, rect);
 }
 
 void KisPaintDevice::fastBitBltRoughOldData(KisPaintDeviceSP src, const QRect &rect)
 {
     m_d->currentStrategy()->fastBitBltRoughOldData(src, rect);
 }
 
 void KisPaintDevice::readBytes(quint8 * data, qint32 x, qint32 y, qint32 w, qint32 h) const
 {
     readBytes(data, QRect(x, y, w, h));
 }
 
 void KisPaintDevice::readBytes(quint8 *data, const QRect &rect) const
 {
     m_d->currentStrategy()->readBytes(data, rect);
 }
 
 void KisPaintDevice::writeBytes(const quint8 *data, qint32 x, qint32 y, qint32 w, qint32 h)
 {
     writeBytes(data, QRect(x, y, w, h));
 }
 
 void KisPaintDevice::writeBytes(const quint8 *data, const QRect &rect)
 {
     m_d->currentStrategy()->writeBytes(data, rect);
 }
 
 QVector<quint8*> KisPaintDevice::readPlanarBytes(qint32 x, qint32 y, qint32 w, qint32 h) const
 {
     return m_d->currentStrategy()->readPlanarBytes(x, y, w, h);
 }
 
 void KisPaintDevice::writePlanarBytes(QVector<quint8*> planes, qint32 x, qint32 y, qint32 w, qint32 h)
 {
     m_d->currentStrategy()->writePlanarBytes(planes, x, y, w, h);
 }
 
 
 quint32 KisPaintDevice::pixelSize() const
 {
     quint32 _pixelSize = m_d->colorSpace()->pixelSize();
     Q_ASSERT(_pixelSize > 0);
     return _pixelSize;
 }
 
 quint32 KisPaintDevice::channelCount() const
 {
     quint32 _channelCount = m_d->colorSpace()->channelCount();
     Q_ASSERT(_channelCount > 0);
     return _channelCount;
 }
 
 KisRasterKeyframeChannel *KisPaintDevice::createKeyframeChannel(const KoID &id, const KisNodeWSP node)
 {
     Q_ASSERT(!m_d->framesInterface);
     m_d->framesInterface.reset(new KisPaintDeviceFramesInterface(this));
 
     Q_ASSERT(!m_d->contentChannel);
     m_d->contentChannel.reset(new KisRasterKeyframeChannel(id, node, this));
 
     // Raster channels always have at least one frame (representing a static image)
     KUndo2Command tempParentCommand;
     m_d->contentChannel->addKeyframe(0, &tempParentCommand);
 
     return m_d->contentChannel.data();
 }
 
 KisRasterKeyframeChannel* KisPaintDevice::keyframeChannel() const
 {
     Q_ASSERT(m_d->contentChannel);
     return m_d->contentChannel.data();
 }
 
 const KoColorSpace* KisPaintDevice::colorSpace() const
 {
     Q_ASSERT(m_d->colorSpace() != 0);
     return m_d->colorSpace();
 }
 
 KisPaintDeviceSP KisPaintDevice::createCompositionSourceDevice() const
 {
     KisPaintDeviceSP device = new KisPaintDevice(compositionSourceColorSpace());
     device->setDefaultBounds(defaultBounds());
     return device;
 }
 
 KisPaintDeviceSP KisPaintDevice::createCompositionSourceDevice(KisPaintDeviceSP cloneSource) const
 {
     KisPaintDeviceSP clone = new KisPaintDevice(*cloneSource);
     clone->setDefaultBounds(defaultBounds());
     clone->convertTo(compositionSourceColorSpace(),
                      KoColorConversionTransformation::internalRenderingIntent(),
                      KoColorConversionTransformation::internalConversionFlags());
     return clone;
 }
 
 KisPaintDeviceSP KisPaintDevice::createCompositionSourceDevice(KisPaintDeviceSP cloneSource, const QRect roughRect) const
 {
     KisPaintDeviceSP clone = new KisPaintDevice(colorSpace());
     clone->setDefaultBounds(defaultBounds());
     clone->makeCloneFromRough(cloneSource, roughRect);
     clone->convertTo(compositionSourceColorSpace(),
                      KoColorConversionTransformation::internalRenderingIntent(),
                      KoColorConversionTransformation::internalConversionFlags());
     return clone;
 }
 
 KisFixedPaintDeviceSP KisPaintDevice::createCompositionSourceDeviceFixed() const
 {
     return new KisFixedPaintDevice(compositionSourceColorSpace());
 }
 
 const KoColorSpace* KisPaintDevice::compositionSourceColorSpace() const
 {
     return colorSpace();
 }
 
 QVector<qint32> KisPaintDevice::channelSizes() const
 {
     QVector<qint32> sizes;
     QList<KoChannelInfo*> channels = colorSpace()->channels();
     qSort(channels);
 
     Q_FOREACH (KoChannelInfo * channelInfo, channels) {
         sizes.append(channelInfo->size());
     }
     return sizes;
 }
 
 KisPaintDevice::MemoryReleaseObject::~MemoryReleaseObject()
 {
     KisDataManager::releaseInternalPools();
 }
 
 KisPaintDevice::MemoryReleaseObject* KisPaintDevice::createMemoryReleaseObject()
 {
     return new MemoryReleaseObject();
 }
 
 KisPaintDevice::LodDataStruct::~LodDataStruct()
 {
 }
 
 QRegion KisPaintDevice::regionForLodSyncing() const
 {
     return m_d->regionForLodSyncing();
 }
 
 KisPaintDevice::LodDataStruct* KisPaintDevice::createLodDataStruct(int lod)
 {
     return m_d->createLodDataStruct(lod);
 }
 
 void KisPaintDevice::updateLodDataStruct(LodDataStruct *dst, const QRect &srcRect)
 {
     m_d->updateLodDataStruct(dst, srcRect);
 }
 
 void KisPaintDevice::uploadLodDataStruct(LodDataStruct *dst)
 {
     m_d->uploadLodDataStruct(dst);
 }
 
 
 KisPaintDeviceFramesInterface* KisPaintDevice::framesInterface()
 {
     return m_d->framesInterface.data();
 }
 
 /******************************************************************/
 /*               KisPaintDeviceFramesInterface                    */
 /******************************************************************/
 
 KisPaintDeviceFramesInterface::KisPaintDeviceFramesInterface(KisPaintDevice *parentDevice)
     : q(parentDevice)
 {
 }
 
 QList<int> KisPaintDeviceFramesInterface::frames()
 {
     return q->m_d->frameIds();
 }
 
 int KisPaintDeviceFramesInterface::createFrame(bool copy, int copySrc, const QPoint &offset, KUndo2Command *parentCommand)
 {
     return q->m_d->createFrame(copy, copySrc, offset, parentCommand);
 }
 
 void KisPaintDeviceFramesInterface::deleteFrame(int frame, KUndo2Command *parentCommand)
 {
     return q->m_d->deleteFrame(frame, parentCommand);
 }
 
 void KisPaintDeviceFramesInterface::fetchFrame(int frameId, KisPaintDeviceSP targetDevice)
 {
     q->m_d->fetchFrame(frameId, targetDevice);
 }
 
 void KisPaintDeviceFramesInterface::uploadFrame(int srcFrameId, int dstFrameId, KisPaintDeviceSP srcDevice)
 {
     q->m_d->uploadFrame(srcFrameId, dstFrameId, srcDevice);
 }
 
 void KisPaintDeviceFramesInterface::uploadFrame(int dstFrameId, KisPaintDeviceSP srcDevice)
 {
     q->m_d->uploadFrame(dstFrameId, srcDevice);
 }
 
 QRect KisPaintDeviceFramesInterface::frameBounds(int frameId)
 {
     return q->m_d->frameBounds(frameId);
 }
 
 QPoint KisPaintDeviceFramesInterface::frameOffset(int frameId) const
 {
     return q->m_d->frameOffset(frameId);
 }
 
 void KisPaintDeviceFramesInterface::setFrameDefaultPixel(const quint8 *defPixel, int frameId)
 {
     KIS_ASSERT_RECOVER_RETURN(frameId >= 0);
     q->m_d->setFrameDefaultPixel(defPixel, frameId);
 }
 
 const quint8* KisPaintDeviceFramesInterface::frameDefaultPixel(int frameId) const
 {
-    KIS_ASSERT_RECOVER(frameId >= 0) { return (quint8*)"deadbeef"; }
+    KIS_ASSERT_RECOVER(frameId >= 0) {
+        return (quint8*)"deadbeef";
+    }
     return q->m_d->frameDefaultPixel(frameId);
 }
 
 bool KisPaintDeviceFramesInterface::writeFrame(KisPaintDeviceWriter &store, int frameId)
 {
-    KIS_ASSERT_RECOVER(frameId >= 0) { return false; }
+    KIS_ASSERT_RECOVER(frameId >= 0) {
+        return false;
+    }
     return q->m_d->writeFrame(store, frameId);
 }
 
 bool KisPaintDeviceFramesInterface::readFrame(QIODevice *stream, int frameId)
 {
-    KIS_ASSERT_RECOVER(frameId >= 0) { return false; }
+    KIS_ASSERT_RECOVER(frameId >= 0) {
+        return false;
+    }
     return q->m_d->readFrame(stream, frameId);
 }
 
 int KisPaintDeviceFramesInterface::currentFrameId() const
 {
     return q->m_d->currentFrameId();
 }
 
 KisDataManagerSP KisPaintDeviceFramesInterface::frameDataManager(int frameId) const
 {
-    KIS_ASSERT_RECOVER(frameId >= 0) { return q->m_d->dataManager(); }
+    KIS_ASSERT_RECOVER(frameId >= 0) {
+        return q->m_d->dataManager();
+    }
     return q->m_d->frameDataManager(frameId);
 }
 
 void KisPaintDeviceFramesInterface::invalidateFrameCache(int frameId)
 {
     KIS_ASSERT_RECOVER_RETURN(frameId >= 0);
 
     return q->m_d->invalidateFrameCache(frameId);
 }
 
 void KisPaintDeviceFramesInterface::setFrameOffset(int frameId, const QPoint &offset)
 {
     KIS_ASSERT_RECOVER_RETURN(frameId >= 0);
     return q->m_d->setFrameOffset(frameId, offset);
 }
 
 KisPaintDeviceFramesInterface::TestingDataObjects
 KisPaintDeviceFramesInterface::testingGetDataObjects() const
 {
     TestingDataObjects objects;
 
     objects.m_data = q->m_d->m_data.data();
     objects.m_lodData = q->m_d->m_lodData.data();
     objects.m_externalFrameData = q->m_d->m_externalFrameData.data();
 
     typedef KisPaintDevice::Private::FramesHash FramesHash;
 
     FramesHash::const_iterator it = q->m_d->m_frames.constBegin();
     FramesHash::const_iterator end = q->m_d->m_frames.constEnd();
 
     for (; it != end; ++it) {
         objects.m_frames.insert(it.key(), it.value().data());
     }
 
     objects.m_currentData = q->m_d->currentData();
 
     return objects;
 }
 
 QList<KisPaintDeviceData*> KisPaintDeviceFramesInterface::testingGetDataObjectsList() const
 {
     return q->m_d->allDataObjects();
 }
 
 void KisPaintDevice::tesingFetchLodDevice(KisPaintDeviceSP targetDevice)
 {
     m_d->tesingFetchLodDevice(targetDevice);
 }
diff --git a/libs/image/kis_paint_device.h b/libs/image/kis_paint_device.h
index a58e48526a..e326345da3 100644
--- a/libs/image/kis_paint_device.h
+++ b/libs/image/kis_paint_device.h
@@ -1,849 +1,850 @@
 /*
  *  Copyright (c) 2002 patrick julien <freak@codepimps.org>
  *  Copyright (c) 2006 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_PAINT_DEVICE_IMPL_H_
 #define KIS_PAINT_DEVICE_IMPL_H_
 
 #include <QObject>
 #include <QRect>
 #include <QVector>
 
 #include "kis_debug.h"
 
 #include <KoColorConversionTransformation.h>
 
 #include "kis_types.h"
 #include "kis_shared.h"
 #include "kis_default_bounds_base.h"
 
 #include <kritaimage_export.h>
 
 class KUndo2Command;
 class QRect;
 class QImage;
 class QPoint;
 class QString;
 class QColor;
 class QIODevice;
 
 class KoColor;
 class KoColorSpace;
 class KoColorProfile;
 
 class KisDataManager;
 class KisPaintDeviceWriter;
 class KisKeyframe;
 class KisRasterKeyframeChannel;
 
 class KisPaintDeviceFramesInterface;
 
 typedef KisSharedPtr<KisDataManager> KisDataManagerSP;
 
 
 /**
  * A paint device contains the actual pixel data and offers methods
  * to read and write pixels. A paint device has an integer x,y position
  * (i.e., are not positioned on the image with sub-pixel accuracy).
  * A KisPaintDevice doesn't have any fixed size, the size changes dynamically
  * when pixels are accessed by an iterator.
  */
 class KRITAIMAGE_EXPORT KisPaintDevice
-        : public QObject
-        , public KisShared
+    : public QObject
+    , public KisShared
 {
 
     Q_OBJECT
 
 public:
 
     /**
      * Create a new paint device with the specified colorspace.
      *
      * @param colorSpace the colorspace of this paint device
      * @param name for debugging purposes
      */
     explicit KisPaintDevice(const KoColorSpace * colorSpace, const QString& name = QString());
 
     /**
      * Create a new paint device with the specified colorspace. The
      * parent node will be notified of changes to this paint device.
      *
      * @param parent the node that contains this paint device
      * @param colorSpace the colorspace of this paint device
      * @param defaultBounds boundaries of the device in case it is empty
      * @param name for debugging purposes
      */
     KisPaintDevice(KisNodeWSP parent, const KoColorSpace * colorSpace, KisDefaultBoundsBaseSP defaultBounds = 0, const QString& name = QString());
 
     /**
      * Creates a copy of this device.
      *
      * If \p copyFrames is false, the newly created device clones the
      * current frame of \p rhs only (default and efficient
      * behavior). If \p copyFrames is true, the new device is a deep
      * copy of the source with all the frames included.
      */
     KisPaintDevice(const KisPaintDevice& rhs, bool copyFrames = false, KisNode *newParentNode = 0);
     virtual ~KisPaintDevice();
 
 protected:
     /**
      * A special constructor for usage in KisPixelSelection. It allows
      * two paint devices to share a data manager.
      *
      * @param explicitDataManager data manager to use inside paint device
      * @param src source paint device to copy parameters from
      * @param name for debugging purposes
      */
     KisPaintDevice(KisDataManagerSP explicitDataManager,
                    KisPaintDeviceSP src, const QString& name = QString());
 
 public:
 
     /**
      * Write the pixels of this paint device into the specified file store.
      */
     bool write(KisPaintDeviceWriter &store);
 
     /**
      * Fill this paint device with the pixels from the specified file store.
      */
     bool read(QIODevice *stream);
 
 public:
 
     /**
      * set the parent node of the paint device
      */
     void setParentNode(KisNodeWSP parent);
 
     /**
      * set the default bounds for the paint device when
      * the default pixel in not completely transarent
      */
     void setDefaultBounds(KisDefaultBoundsBaseSP bounds);
 
     /**
      * the default bounds rect of the paint device
      */
     KisDefaultBoundsBaseSP defaultBounds() const;
 
     /**
      * Moves the device to these new coordinates (so no incremental move or so)
      */
     void move(qint32 x, qint32 y);
 
     /**
      * Convenience method for the above.
      */
     virtual void move(const QPoint& pt);
 
     /**
      * The X offset of the paint device
      */
     qint32 x() const;
 
     /**
      * The Y offset of the paint device
      */
     qint32 y() const;
 
     /**
      * set the X offset of the paint device
      */
     void setX(qint32 x);
 
     /**
      * set the Y offset of the paint device
      */
     void setY(qint32 y);
 
     /**
      * Retrieve the bounds of the paint device. The size is not exact,
      * but may be larger if the underlying datamanager works that way.
      * For instance, the tiled datamanager keeps the extent to the nearest
      * multiple of 64.
      *
      * If default pixel is not transparent, then the actual extent
      * rect is united with the defaultBounds()->bounds() value
      * (the size of the image, usually).
      */
     QRect extent() const;
 
     /// Convience method for the above
     void extent(qint32 &x, qint32 &y, qint32 &w, qint32 &h) const;
 
     /**
      * Get the exact bounds of this paint device. The real solution is
      * very slow because it does a linear scanline search, but it
      * uses caching, so calling to this function without changing
      * the device is quite cheap.
      *
      * Exactbounds follows these rules:
      *
      * <ul>
      * <li>if default pixel is transparent, then exact bounds
      *     of actual pixel data are returned
      * <li>if default pixel is not transparent, then the union
      *     (defaultBounds()->bounds() | nonDefaultPixelArea()) is
      *     returned
      * </ul>
      * \see calculateExactBounds()
      */
     QRect exactBounds() const;
 
     /**
      * Relaxed version of the exactBounds() that can be used in tight
      * loops.  If the exact bounds value is present in the paint
      * device cache, returns this value.  If the cache is invalidated,
      * returns extent() and tries to recalculate the exact bounds not
      * faster than once in 1000 ms.
      */
     QRect exactBoundsAmortized() const;
 
     /**
      * Retuns exact rectangle of the paint device that contains
      * non-default pixels. For paint devices with fully transparent
      * default pixel is equivalent to exactBounds().
      *
      * nonDefaultPixelArea() follows these rules:
      *
      * <ul>
      * <li>if default pixel is transparent, then exact bounds
      *     of actual pixel data are returned. The same as exactBounds()
      * <li>if default pixel is not transparent, then calculates the
      *     rectangle of non-default pixels. May be smaller or greater
      *     than image bounds
      * </ul>
      * \see calculateExactBounds()
      */
     QRect nonDefaultPixelArea() const;
 
 
     /**
      * Returns a rough approximation of region covered by device.
      * For tiled data manager, it region will consist of a number
      * of rects each corresponding to a tile.
      */
     QRegion region() const;
 
     /**
      * Cut the paint device down to the specified rect. If the crop
      * area is bigger than the paint device, nothing will happen.
      */
     void crop(qint32 x, qint32 y, qint32 w, qint32 h);
 
     /// Convience method for the above
     void crop(const QRect & r);
 
     /**
      * Complete erase the current paint device. Its size will become 0. This
      * does not take the selection into account.
      */
     virtual void clear();
 
     /**
      * Clear the given rectangle to transparent black. The paint device will expand to
      * contain the given rect.
      */
     void clear(const QRect & rc);
 
     /**
      * Frees the memory occupied by the pixels containing default
      * values. The extents() and exactBounds() of the image will
      * probably also shrink
      */
     void purgeDefaultPixels();
 
     /**
      * Sets the default pixel. New data will be initialised with this pixel. The pixel is copied: the
      * caller still owns the pointer and needs to delete it to avoid memory leaks.
      * If frame ID is given, set default pixel for that frame. Otherwise use active frame.
      */
     void setDefaultPixel(const quint8 *defPixel);
 
     /**
      * Get a pointer to the default pixel.
      * If the frame parameter is given, get the default pixel of
      * specified frame. Otherwise use currently active frame.
      */
     const quint8 *defaultPixel() const;
 
     /**
      * Fill the given rectangle with the given pixel. The paint device will expand to
      * contain the given rect.
      */
     void fill(const QRect & rc, const KoColor &color);
 
     /**
      * Overloaded function. For legacy purposes only.
      * Please use fill(const QRect & rc, const KoColor &color) instead
      */
     void fill(qint32 x, qint32 y, qint32 w, qint32 h, const quint8 *fillPixel);
 
 public:
 
     /**
      * Prepares the device for fastBitBlt opreration. It clears
      * the device, switches x,y shifts and colorspace if needed.
      * After this call fastBitBltPossible will return true.
      * May be used for initialization of temporary devices.
      */
     void prepareClone(KisPaintDeviceSP src);
 
     /**
      * Make this device to become a clone of \a src. It will have the same
      * x,y shifts, colorspace and will share pixels inside \a rect.
      * After calling this function:
      * (this->extent() >= this->exactBounds() == rect).
      *
      * Rule of thumb:
      *
      * "Use makeCloneFrom() or makeCloneFromRough() if and only if you
      * are the only owner of the destination paint device and you are
      * 100% sure no other thread has access to it"
      */
     void makeCloneFrom(KisPaintDeviceSP src, const QRect &rect);
 
     /**
      * Make this device to become a clone of \a src. It will have the same
      * x,y shifts, colorspace and will share pixels inside \a rect.
      * Be careful, this function will copy *at least* \a rect
      * of pixels. Actual copy area will be a bigger - it will
      * be aligned by tiles borders. So after calling this function:
      * (this->extent() == this->exactBounds() >= rect).
      *
      * Rule of thumb:
      *
      * "Use makeCloneFrom() or makeCloneFromRough() if and only if you
      * are the only owner of the destination paint device and you are
      * 100% sure no other thread has access to it"
      */
     void makeCloneFromRough(KisPaintDeviceSP src, const QRect &minimalRect);
 
 
 protected:
     friend class KisPaintDeviceTest;
     friend class DataReaderThread;
 
     /**
      * Checks whether a src paint device can be used as source
      * of fast bitBlt operation. The result of the check may
      * depend on whether color spaces coinside, whether there is
      * any shift of tiles between the devices and etc.
      *
      * WARNING: This check must be done <i>before</i> performing any
      * fast bitBlt operation!
      *
      * \see fastBitBlt
      * \see fastBitBltRough
      */
     bool fastBitBltPossible(KisPaintDeviceSP src);
 
     /**
      * Clones rect from another paint device. The cloned area will be
      * shared between both paint devices as much as possible using
      * copy-on-write. Parts of the rect that cannot be shared
      * (cross tiles) are deep-copied,
      *
      * \see fastBitBltPossible
      * \see fastBitBltRough
      */
     void fastBitBlt(KisPaintDeviceSP src, const QRect &rect);
 
     /**
      * The same as \ref fastBitBlt() but reads old data
      */
     void fastBitBltOldData(KisPaintDeviceSP src, const QRect &rect);
 
     /**
      * Clones rect from another paint device in a rough and fast way.
      * All the tiles touched by rect will be shared, between both
      * devices, that means it will copy a bigger area than was
      * requested. This method is supposed to be used for bitBlt'ing
      * into temporary paint devices.
      *
      * \see fastBitBltPossible
      * \see fastBitBlt
      */
     void fastBitBltRough(KisPaintDeviceSP src, const QRect &rect);
 
     /**
      * The same as \ref fastBitBltRough() but reads old data
      */
     void fastBitBltRoughOldData(KisPaintDeviceSP src, const QRect &rect);
 
 public:
     /**
      * Read the bytes representing the rectangle described by x, y, w, h into
      * data. If data is not big enough, Krita will gladly overwrite the rest
      * of your precious memory.
      *
      * Since this is a copy, you need to make sure you have enough memory.
      *
      * Reading from areas not previously initialized will read the default
      * pixel value into data but not initialize that region.
      */
     void readBytes(quint8 * data, qint32 x, qint32 y, qint32 w, qint32 h) const;
 
     /**
      * Read the bytes representing the rectangle rect into
      * data. If data is not big enough, Krita will gladly overwrite the rest
      * of your precious memory.
      *
      * Since this is a copy, you need to make sure you have enough memory.
      *
      * Reading from areas not previously initialized will read the default
      * pixel value into data but not initialize that region.
      * @param data The address of the memory to receive the bytes read
      * @param rect The rectangle in the paint device to read from
      */
     void readBytes(quint8 * data, const QRect &rect) const;
 
     /**
      * Copy the bytes in data into the rect specified by x, y, w, h. If the
      * data is too small or uninitialized, Krita will happily read parts of
      * memory you never wanted to be read.
      *
      * If the data is written to areas of the paint device not previously initialized,
      * the paint device will grow.
      */
     void writeBytes(const quint8 * data, qint32 x, qint32 y, qint32 w, qint32 h);
 
     /**
      * Copy the bytes in data into the rectangle rect. If the
      * data is too small or uninitialized, Krita will happily read parts of
      * memory you never wanted to be read.
      *
      * If the data is written to areas of the paint device not previously initialized,
      * the paint device will grow.
      * @param data The address of the memory to write bytes from
      * @param rect The rectangle in the paint device to write to
      */
     void writeBytes(const quint8 * data, const QRect &rect);
 
     /**
      * Copy the bytes in the paint device into a vector of arrays of bytes,
      * where the number of arrays is the number of channels in the
      * paint device. If the specified area is larger than the paint
      * device's extent, the default pixel will be read.
      */
     QVector<quint8*> readPlanarBytes(qint32 x, qint32 y, qint32 w, qint32 h) const;
 
     /**
      * Write the data in the separate arrays to the channes. If there
      * are less vectors than channels, the remaining channels will not
      * be copied. If any of the arrays points to 0, the channel in
      * that location will not be touched. If the specified area is
      * larger than the paint device, the paint device will be
      * extended. There are no guards: if the area covers more pixels
      * than there are bytes in the arrays, krita will happily fill
      * your paint device with areas of memory you never wanted to be
      * read. Krita may also crash.
      *
      * XXX: what about undo?
      */
     void writePlanarBytes(QVector<quint8*> planes, qint32 x, qint32 y, qint32 w, qint32 h);
 
     /**
      * Converts the paint device to a different colorspace
      *
      * @return a command that can be used to undo the conversion.
      */
     KUndo2Command* convertTo(const KoColorSpace * dstColorSpace,
                              KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
                              KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags());
 
     /**
      * Changes the profile of the colorspace of this paint device to the given
      * profile. If the given profile is 0, nothing happens.
      */
     bool setProfile(const KoColorProfile * profile);
 
     /**
      * Fill this paint device with the data from image; starting at (offsetX, offsetY)
      * @param srcProfileName name of the RGB profile to interpret the image as. 0 is interpreted as sRGB
      */
     void convertFromQImage(const QImage& image, const KoColorProfile *profile, qint32 offsetX = 0, qint32 offsetY = 0);
 
     /**
      * Create an RGBA QImage from a rectangle in the paint device.
      *
      * @param x Left coordinate of the rectangle
      * @param y Top coordinate of the rectangle
      * @param w Width of the rectangle in pixels
      * @param h Height of the rectangle in pixels
      * @param dstProfile RGB profile to use in conversion. May be 0, in which
      * case it's up to the color strategy to choose a profile (most
      * like sRGB).
      */
     virtual QImage convertToQImage(const KoColorProfile *dstProfile, qint32 x, qint32 y, qint32 w, qint32 h,
                                    KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
                                    KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags()) const;
 
     /**
      * Overridden method for convenience
      */
     QImage convertToQImage(const KoColorProfile *dstProfile,
                            const QRect &rc,
                            KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
                            KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags()) const;
 
     /**
      * Create an RGBA QImage from a rectangle in the paint device. The
      * rectangle is defined by the parent image's bounds.
      *
      * @param dstProfile RGB profile to use in conversion. May be 0, in which
      * case it's up to the color strategy to choose a profile (most
      * like sRGB).
      */
     QImage convertToQImage(const KoColorProfile *  dstProfile,
-                                   KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
-                                   KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags()) const;
+                           KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
+                           KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags()) const;
 
     /**
      * Creates a paint device thumbnail of the paint device, retaining
      * the aspect ratio. The width and height of the returned device
      * won't exceed \p maxw and \p maxw, but they may be smaller.
      *
      * @param maxw: maximum width
      * @param maxh: maximum height
      * @param rect: only this rect will be used for the thumbnail
      *
      */
-    KisPaintDeviceSP createThumbnailDevice(qint32 w, qint32 h, QRect rect = QRect()) const;
+    KisPaintDeviceSP createThumbnailDevice(qint32 w, qint32 h, QRect rect = QRect(), QRect outputRect = QRect()) const;
+    KisPaintDeviceSP createThumbnailDeviceOversampled(qint32 w, qint32 h, qreal oversample, QRect rect = QRect(),  QRect outputRect = QRect()) const;
 
     /**
      * Creates a thumbnail of the paint device, retaining the aspect ratio.
      * The width and height of the returned QImage won't exceed \p maxw and \p maxw, but they may be smaller.
      * The colors are not corrected for display!
      *
      * @param maxw: maximum width
      * @param maxh: maximum height
      * @param rect: only this rect will be used for the thumbnail
+     * @param oversample: ratio used for antialiasing
      */
-    QImage createThumbnail(qint32 maxw, qint32 maxh, QRect rect,
-                                   KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
-                                   KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags());
+    QImage createThumbnail(qint32 maxw, qint32 maxh, QRect rect, qreal oversample = 1,
+                           KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
+                           KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags());
 
     /**
      * Cached version of createThumbnail(qint32 maxw, qint32 maxh, const KisSelection *selection, QRect rect)
      */
-    QImage createThumbnail(qint32 maxw, qint32 maxh,
-                                   KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
-                                   KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags());
+    QImage createThumbnail(qint32 maxw, qint32 maxh, qreal oversample = 1,
+                           KoColorConversionTransformation::Intent renderingIntent = KoColorConversionTransformation::internalRenderingIntent(),
+                           KoColorConversionTransformation::ConversionFlags conversionFlags = KoColorConversionTransformation::internalConversionFlags());
 
     /**
      * Fill c and opacity with the values found at x and y.
      *
      * The color values will be transformed from the profile of
      * this paint device to the display profile.
      *
      * @return true if the operation was successful.
      */
     bool pixel(qint32 x, qint32 y, QColor *c) const;
 
     /**
      * Fill kc with the values found at x and y. This method differs
      * from the above in using KoColor, which can be of any colorspace
      *
      * The color values will be transformed from the profile of
      * this paint device to the display profile.
      *
      * @return true if the operation was successful.
      */
     bool pixel(qint32 x, qint32 y, KoColor * kc) const;
 
     /**
      * Set the specified pixel to the specified color. Note that this
      * bypasses KisPainter. the PaintDevice is here used as an equivalent
      * to QImage, not QPixmap. This means that this is not undoable; also,
      * there is no compositing with an existing value at this location.
      *
      * The color values will be transformed from the display profile to
      * the paint device profile.
      *
      * Note that this will use 8-bit values and may cause a significant
      * degradation when used on 16-bit or hdr quality images.
      *
      * @return true if the operation was successful
      */
     bool setPixel(qint32 x, qint32 y, const QColor& c);
 
     /// Convience method for the above
     bool setPixel(qint32 x, qint32 y, const KoColor& kc);
 
     /**
      * @return the colorspace of the pixels in this paint device
      */
     const KoColorSpace* colorSpace() const;
 
     /**
      * There is quite a common technique in Krita. It is used in
      * cases, when we want to paint something over a paint device
      * using the composition, opacity or selection. E.g. painting a
      * dab in a paint op, filling the selection in the Fill Tool.
      * Such work is usually done in the following way:
      *
      * 1) Create a paint device
      *
      * 2) Fill it with the desired color or data
      *
      * 3) Create a KisPainter and set all the properties of the
      *    trasaction: selection, compositeOp, opacity and etc.
      *
      * 4) Paint a newly created paint device over the destination
      *    device.
      *
      * The following two methods (createCompositionSourceDevice() or
      * createCompositionSourceDeviceFixed())should be used for the
      * accomplishing the step 1). The point is that the desired color
      * space of the temporary device may not coincide with the color
      * space of the destination. That is the case, for example, for
      * the alpha8() colorspace used in the selections. So for such
      * devices the temporary target would have a different (grayscale)
      * color space.
      *
      * So there are two rules of thumb:
      *
      * 1) If you need a temporary device which you are going to fill
      *    with some data and then paint over the paint device, create
      *    it with either createCompositionSourceDevice() or
      *    createCompositionSourceDeviceFixed().
      *
      * 2) Do *not* expect that the color spaces of the destination and
      *    the temporary device would coincide. If you need to copy a
      *    single pixel from one device to another, you can use
      *    KisCrossDeviceColorPicker class, that will handle all the
      *    necessary conversions for you.
      *
      * \see createCompositionSourceDeviceFixed()
      * \see compositionSourceColorSpace()
      * \see KisCrossDeviceColorPicker
      * \see KisCrossDeviceColorPickerInt
      */
     KisPaintDeviceSP createCompositionSourceDevice() const;
 
     /**
      * The same as createCompositionSourceDevice(), but initializes the
      * newly created device with the content of \p cloneSource
      *
      * \see createCompositionSourceDevice()
      */
     KisPaintDeviceSP createCompositionSourceDevice(KisPaintDeviceSP cloneSource) const;
 
     /**
      * The same as createCompositionSourceDevice(), but initializes
      * the newly created device with the *rough* \p roughRect of
      * \p cloneSource.
      *
      * "Rough rect" means that it may copy a bit more than
      * requested. It is expected that the caller will not use the area
      * outside \p roughRect.
      *
      * \see createCompositionSourceDevice()
      */
     KisPaintDeviceSP createCompositionSourceDevice(KisPaintDeviceSP cloneSource, const QRect roughRect) const;
 
     /**
      * This is a convenience method for createCompositionSourceDevice()
      *
      * \see createCompositionSourceDevice()
      */
     KisFixedPaintDeviceSP createCompositionSourceDeviceFixed() const;
 
     /**
      * This is a lowlevel method for the principle used in
      * createCompositionSourceDevice(). In most of the cases the paint
      * device creation methods should be used instead of this function.
      *
      * \see createCompositionSourceDevice()
      * \see createCompositionSourceDeviceFixed()
      */
     virtual const KoColorSpace* compositionSourceColorSpace() const;
 
     /**
      * @return the internal datamanager that keeps the pixels.
      */
     KisDataManagerSP dataManager() const;
 
     /**
      * Replace the pixel data, color strategy, and profile.
      */
     void setDataManager(KisDataManagerSP data, const KoColorSpace * colorSpace = 0);
 
     /**
      * Return the number of bytes a pixel takes.
      */
     quint32 pixelSize() const;
 
     /**
      * Return the number of channels a pixel takes
      */
     quint32 channelCount() const;
 
     /**
      * Create a keyframe channel for the content on this device.
      * @param id identifier for the channel
      * @param node the parent node for the channel
      * @return keyframe channel
      */
     KisRasterKeyframeChannel *createKeyframeChannel(const KoID &id, const KisNodeWSP node);
 
     KisRasterKeyframeChannel* keyframeChannel() const;
 
     /**
      * An interface to modify/load/save frames stored inside this device
      */
     KisPaintDeviceFramesInterface* framesInterface();
 
 public:
 
     /**
      * Add the specified rect to the parent layer's set of dirty rects
      * (if there is a parent layer)
      */
     void setDirty(const QRect & rc);
 
     /**
      *  Add the specified region to the parent layer's dirty region
      *  (if there is a parent layer)
      */
     void setDirty(const QRegion & region);
 
     /**
      *  Set the parent layer completely dirty, if this paint device has
      *  as parent layer.
      */
     void setDirty();
 
     void setDirty(const QVector<QRect> rects);
 
     /**
      * Called by KisTransactionData when it thinks current time should
      * be changed. And the requests is forwarded to the image if
      * needed.
      */
     void requestTimeSwitch(int time);
 
 public:
 
     KisHLineIteratorSP createHLineIteratorNG(qint32 x, qint32 y, qint32 w);
     KisHLineConstIteratorSP createHLineConstIteratorNG(qint32 x, qint32 y, qint32 w) const;
 
     KisVLineIteratorSP createVLineIteratorNG(qint32 x, qint32 y, qint32 h);
     KisVLineConstIteratorSP createVLineConstIteratorNG(qint32 x, qint32 y, qint32 h) const;
 
     KisRandomAccessorSP createRandomAccessorNG(qint32 x, qint32 y);
     KisRandomConstAccessorSP createRandomConstAccessorNG(qint32 x, qint32 y) const;
 
     /**
      * Create an iterator that will "artificially" extend the paint device with the
      * value of the border when trying to access values outside the range of data.
      *
      * @param rc indicates the rectangle that truly contains data
      */
     KisRepeatHLineConstIteratorSP createRepeatHLineConstIterator(qint32 x, qint32 y, qint32 w, const QRect& _dataWidth) const;
     /**
      * Create an iterator that will "artificially" extend the paint device with the
      * value of the border when trying to access values outside the range of data.
      *
      * @param rc indicates the rectangle that trully contains data
      */
     KisRepeatVLineConstIteratorSP createRepeatVLineConstIterator(qint32 x, qint32 y, qint32 h, const QRect& _dataWidth) const;
 
     /**
      * This function create a random accessor which can easily access to sub pixel values.
      * @param selection an up-to-date selection that has the same origin as the paint device
      */
     KisRandomSubAccessorSP createRandomSubAccessor() const;
 
 
     /** Clear the selected pixels from the paint device */
     void clearSelection(KisSelectionSP selection);
 
 Q_SIGNALS:
 
     void profileChanged(const KoColorProfile *  profile);
     void colorSpaceChanged(const KoColorSpace *colorspace);
 
 public:
     friend class PaintDeviceCache;
 
     /**
      * Caclculates exact bounds of the device. Used internally
      * by a transparent caching system. The solution is very slow
      * because it does a linear scanline search. So the complexity
      * is n*n at worst.
      *
      * \see exactBounds(), nonDefaultPixelArea()
      */
     QRect calculateExactBounds(bool nonDefaultOnly) const;
 
 public:
-    struct MemoryReleaseObject : public QObject
-    {
+    struct MemoryReleaseObject : public QObject {
         ~MemoryReleaseObject();
     };
 
     static MemoryReleaseObject* createMemoryReleaseObject();
 
 public:
     struct LodDataStruct {
         virtual ~LodDataStruct();
     };
 
     QRegion regionForLodSyncing() const;
     LodDataStruct* createLodDataStruct(int lod);
     void updateLodDataStruct(LodDataStruct *dst, const QRect &srcRect);
     void uploadLodDataStruct(LodDataStruct *dst);
 
     void setProjectionDevice(bool value);
     void tesingFetchLodDevice(KisPaintDeviceSP targetDevice);
 
 private:
     KisPaintDevice& operator=(const KisPaintDevice&);
     void init(const KoColorSpace *colorSpace,
               KisDefaultBoundsBaseSP defaultBounds,
               KisNodeWSP parent, const QString& name);
 
     // Only KisPainter is allowed to have access to these low-level methods
     friend class KisPainter;
 
     /**
      * Return a vector with in order the size in bytes of the channels
      * in the colorspace of this paint device.
      */
     QVector<qint32> channelSizes() const;
 
     void emitColorSpaceChanged();
     void emitProfileChanged();
 
 private:
     friend class KisPaintDeviceFramesInterface;
 
 protected:
     friend class KisSelectionTest;
     KisNodeWSP parentNode() const;
 
 private:
     struct Private;
     Private * const m_d;
 };
 
 #endif // KIS_PAINT_DEVICE_IMPL_H_
diff --git a/libs/image/kis_paint_device_cache.h b/libs/image/kis_paint_device_cache.h
index 4ae8d28adc..99173b124c 100644
--- a/libs/image/kis_paint_device_cache.h
+++ b/libs/image/kis_paint_device_cache.h
@@ -1,159 +1,159 @@
 /*
  *  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.
  */
 
 #ifndef __KIS_PAINT_DEVICE_CACHE_H
 #define __KIS_PAINT_DEVICE_CACHE_H
 
 #include "kis_lock_free_cache.h"
 #include <QElapsedTimer>
 
 
 class KisPaintDeviceCache
 {
 public:
     KisPaintDeviceCache(KisPaintDevice *paintDevice)
         : m_paintDevice(paintDevice),
           m_exactBoundsCache(paintDevice),
           m_nonDefaultPixelAreaCache(paintDevice),
           m_regionCache(paintDevice)
     {
     }
 
     KisPaintDeviceCache(const KisPaintDeviceCache &rhs)
         : m_paintDevice(rhs.m_paintDevice),
           m_exactBoundsCache(rhs.m_paintDevice),
           m_nonDefaultPixelAreaCache(rhs.m_paintDevice),
           m_regionCache(rhs.m_paintDevice)
     {
     }
 
     void setupCache() {
         invalidate();
     }
 
     void invalidate() {
         m_thumbnailsValid = false;
         m_exactBoundsCache.invalidate();
         m_nonDefaultPixelAreaCache.invalidate();
         m_regionCache.invalidate();
     }
 
     QRect exactBounds() {
         return m_exactBoundsCache.getValue();
     }
 
     QRect exactBoundsAmortized() {
         QRect bounds;
         bool result = m_exactBoundsCache.tryGetValue(bounds);
 
         if (!result) {
             /**
              * The calculation of the exact bounds might be too slow
              * in some special cases, e.g. for an empty canvas of 7k
              * by 6k.  So we just always return extent, when the exact
              * bounds is not available.
              */
             bounds = m_paintDevice->extent();
         }
 
         return bounds;
     }
 
     QRect nonDefaultPixelArea() {
         return m_nonDefaultPixelAreaCache.getValue();
     }
 
     QRegion region() {
         return m_regionCache.getValue();
     }
 
-    QImage createThumbnail(qint32 w, qint32 h, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags) {
+    QImage createThumbnail(qint32 w, qint32 h, qreal oversample, KoColorConversionTransformation::Intent renderingIntent, KoColorConversionTransformation::ConversionFlags conversionFlags) {
         QImage thumbnail;
 
         if(m_thumbnailsValid) {
-            thumbnail = findThumbnail(w, h);
+            thumbnail = findThumbnail(w, h, oversample);
         }
         else {
             m_thumbnails.clear();
             m_thumbnailsValid = true;
         }
 
         if(thumbnail.isNull()) {
-            thumbnail = m_paintDevice->createThumbnail(w, h, QRect(), renderingIntent, conversionFlags);
-            cacheThumbnail(w, h, thumbnail);
+            thumbnail = m_paintDevice->createThumbnail(w, h, QRect(), oversample, renderingIntent, conversionFlags);
+            cacheThumbnail(w, h, oversample, thumbnail);
         }
 
         Q_ASSERT(!thumbnail.isNull() || m_paintDevice->extent().isEmpty());
         return thumbnail;
     }
 
 private:
-    inline QImage findThumbnail(qint32 w, qint32 h) {
+    inline QImage findThumbnail(qint32 w, qint32 h, qreal oversample) {
         QImage resultImage;
-        if (m_thumbnails.contains(w) && m_thumbnails[w].contains(h)) {
-            resultImage = m_thumbnails[w][h];
+        if (m_thumbnails.contains(w) && m_thumbnails[w].contains(h) && m_thumbnails[w][h].contains(oversample)) {
+            resultImage = m_thumbnails[w][h][oversample];
         }
         return resultImage;
     }
 
-    inline void cacheThumbnail(qint32 w, qint32 h, QImage image) {
-        m_thumbnails[w][h] = image;
+    inline void cacheThumbnail(qint32 w, qint32 h, qreal oversample, QImage image) {
+        m_thumbnails[w][h][oversample] = image;
     }
 
 private:
     KisPaintDevice *m_paintDevice;
 
     struct ExactBoundsCache : KisLockFreeCache<QRect> {
         ExactBoundsCache(KisPaintDevice *paintDevice) : m_paintDevice(paintDevice) {}
 
         QRect calculateNewValue() const {
             return m_paintDevice->calculateExactBounds(false);
         }
     private:
         KisPaintDevice *m_paintDevice;
     };
 
     struct NonDefaultPixelCache : KisLockFreeCache<QRect> {
         NonDefaultPixelCache(KisPaintDevice *paintDevice) : m_paintDevice(paintDevice) {}
 
         QRect calculateNewValue() const {
             return m_paintDevice->calculateExactBounds(true);
         }
     private:
         KisPaintDevice *m_paintDevice;
     };
 
     struct RegionCache : KisLockFreeCache<QRegion> {
         RegionCache(KisPaintDevice *paintDevice) : m_paintDevice(paintDevice) {}
 
         QRegion calculateNewValue() const {
             return m_paintDevice->dataManager()->region();
         }
     private:
         KisPaintDevice *m_paintDevice;
     };
 
     ExactBoundsCache m_exactBoundsCache;
     NonDefaultPixelCache m_nonDefaultPixelAreaCache;
     RegionCache m_regionCache;
 
     bool m_thumbnailsValid;
-    QMap<int, QMap<int, QImage> > m_thumbnails;
+    QMap<int, QMap<int, QMap<qreal,QImage> > > m_thumbnails;
 };
 
 #endif /* __KIS_PAINT_DEVICE_CACHE_H */
diff --git a/libs/image/kis_progress_update_helper.h b/libs/image/kis_progress_update_helper.h
index 20ac7b891e..684948000d 100644
--- a/libs/image/kis_progress_update_helper.h
+++ b/libs/image/kis_progress_update_helper.h
@@ -1,62 +1,63 @@
 /*
  *  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.
  */
 
 #ifndef __KIS_PROGRESS_UPDATE_HELPER_H
 #define __KIS_PROGRESS_UPDATE_HELPER_H
 
 #include <KoUpdater.h>
 #include <kis_types.h>
 
 class KisProgressUpdateHelper {
 public:
     KisProgressUpdateHelper(KoUpdaterPtr progressUpdater, int portion, int numSteps)
         : m_progressUpdater(progressUpdater),
+          m_baseProgress(0),
           m_portion(portion),
           m_currentStep(0),
           m_numSteps(numSteps)
      {
          if (m_progressUpdater) {
              m_baseProgress = m_progressUpdater->progress();
          }
      }
 
     ~KisProgressUpdateHelper() {
         if (m_progressUpdater) {
             m_progressUpdater->setProgress(m_baseProgress + m_portion);
         }
     }
 
     void step() {
         int localProgress = m_numSteps ?
             m_portion * (++m_currentStep) / m_numSteps : m_portion;
 
         if (m_progressUpdater) {
             m_progressUpdater->setProgress(m_baseProgress + localProgress);
         }
         // TODO: handle interrupted processing (connect to other layers, i.e. undo)
     }
 
 private:
     KoUpdaterPtr m_progressUpdater;
     int m_baseProgress;
     int m_portion;
     int m_currentStep;
     int m_numSteps;
 };
 
 #endif /* __KIS_PROGRESS_UPDATE_HELPER_H */
diff --git a/libs/image/kis_selection_based_layer.cpp b/libs/image/kis_selection_based_layer.cpp
index 2a9e1518b0..7c27e864a0 100644
--- a/libs/image/kis_selection_based_layer.cpp
+++ b/libs/image/kis_selection_based_layer.cpp
@@ -1,293 +1,293 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *  Copyright (c) 2005 C. Boemann <cbo@boemann.dk>
  *  Copyright (c) 2009 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_selection_based_layer.h"
 
 #include <klocalizedstring.h>
 #include "kis_debug.h"
 
 #include <KoCompositeOpRegistry.h>
 
 #include "kis_image.h"
 #include "kis_painter.h"
 #include "kis_default_bounds.h"
 
 #include "kis_selection.h"
 #include "kis_pixel_selection.h"
 #include "filter/kis_filter_configuration.h"
 #include "filter/kis_filter_registry.h"
 #include "filter/kis_filter.h"
 
 
 struct Q_DECL_HIDDEN KisSelectionBasedLayer::Private
 {
 public:
     Private() : useSelectionInProjection(true) {}
 
     KisSelectionSP selection;
     KisPaintDeviceSP paintDevice;
     bool useSelectionInProjection;
 };
 
 
 KisSelectionBasedLayer::KisSelectionBasedLayer(KisImageWSP image,
         const QString &name,
         KisSelectionSP selection,
         KisFilterConfiguration *filterConfig,
         bool useGeneratorRegistry)
         : KisLayer(image.data(), name, OPACITY_OPAQUE_U8),
           KisNodeFilterInterface(filterConfig, useGeneratorRegistry),
           m_d(new Private())
 {
     if (!selection)
         initSelection();
     else
         setInternalSelection(selection);
 
     m_d->paintDevice = new KisPaintDevice(this, image->colorSpace(), new KisDefaultBounds(image));
     connect(image.data(), SIGNAL(sigSizeChanged(QPointF,QPointF)), SLOT(slotImageSizeChanged()));
 }
 
 KisSelectionBasedLayer::KisSelectionBasedLayer(const KisSelectionBasedLayer& rhs)
         : KisLayer(rhs)
         , KisIndirectPaintingSupport()
         , KisNodeFilterInterface(rhs)
         , m_d(new Private())
 {
     setInternalSelection(rhs.m_d->selection);
 
     m_d->paintDevice = new KisPaintDevice(*rhs.m_d->paintDevice.data());
 }
 
 
 KisSelectionBasedLayer::~KisSelectionBasedLayer()
 {
     delete m_d;
 }
 
 void KisSelectionBasedLayer::initSelection()
 {
     m_d->selection = new KisSelection(new KisDefaultBounds(image()));
     quint8 newDefaultPixel = MAX_SELECTED;
     m_d->selection->pixelSelection()->setDefaultPixel(&newDefaultPixel);
     m_d->selection->setParentNode(this);
     m_d->selection->updateProjection();
 }
 
 void KisSelectionBasedLayer::slotImageSizeChanged()
 {
     if (m_d->selection) {
         /**
          * Make sure exactBounds() of the selection got recalculated after
          * the image changed
          */
         m_d->selection->pixelSelection()->setDirty();
         setDirty();
     }
 }
 
 void KisSelectionBasedLayer::setImage(KisImageWSP image)
 {
     m_d->paintDevice->setDefaultBounds(new KisDefaultBounds(image));
     KisLayer::setImage(image);
 
     connect(image.data(), SIGNAL(sigSizeChanged(QPointF,QPointF)), SLOT(slotImageSizeChanged()));
 }
 
 bool KisSelectionBasedLayer::allowAsChild(KisNodeSP node) const
 {
     return node->inherits("KisMask");
 }
 
 
 KisPaintDeviceSP KisSelectionBasedLayer::original() const
 {
     return m_d->paintDevice;
 }
 KisPaintDeviceSP KisSelectionBasedLayer::paintDevice() const
 {
     return m_d->selection->pixelSelection();
 }
 
 
 bool KisSelectionBasedLayer::needProjection() const
 {
     return m_d->selection;
 }
 
 void KisSelectionBasedLayer::setUseSelectionInProjection(bool value) const
 {
     m_d->useSelectionInProjection = value;
 }
 
 KisSelectionSP KisSelectionBasedLayer::fetchComposedInternalSelection(const QRect &rect) const
 {
     if (!m_d->selection) return 0;
     m_d->selection->updateProjection(rect);
 
     KisSelectionSP tempSelection = m_d->selection;
 
     lockTemporaryTarget();
 
     if (hasTemporaryTarget()) {
         /**
          * Cloning a selection with COW
          * FIXME: check whether it's faster than usual bitBlt'ing
          */
         tempSelection = new KisSelection(*tempSelection);
 
         KisPainter gc2(tempSelection->pixelSelection());
         setupTemporaryPainter(&gc2);
         gc2.bitBlt(rect.topLeft(), temporaryTarget(), rect);
     }
 
     unlockTemporaryTarget();
 
     return tempSelection;
 }
 
 void KisSelectionBasedLayer::copyOriginalToProjection(const KisPaintDeviceSP original,
         KisPaintDeviceSP projection,
         const QRect& rect) const
 {
     KisSelectionSP tempSelection;
 
     if (m_d->useSelectionInProjection) {
         tempSelection = fetchComposedInternalSelection(rect);
     }
 
     projection->clear(rect);
     KisPainter::copyAreaOptimized(rect.topLeft(), original, projection, rect, tempSelection);
 }
 
 QRect KisSelectionBasedLayer::cropChangeRectBySelection(const QRect &rect) const
 {
     return m_d->selection ?
         rect & m_d->selection->selectedRect() :
         rect;
 }
 
 QRect KisSelectionBasedLayer::needRect(const QRect &rect, PositionToFilthy pos) const
 {
     Q_UNUSED(pos);
     return rect;
 }
 
 void KisSelectionBasedLayer::resetCache(const KoColorSpace *colorSpace)
 {
     if (!colorSpace)
         colorSpace = image()->colorSpace();
 
     if (!m_d->paintDevice ||
             !(*m_d->paintDevice->colorSpace() == *colorSpace)) {
 
         m_d->paintDevice = new KisPaintDevice(this, colorSpace, new KisDefaultBounds(image()));
     } else {
         m_d->paintDevice->clear();
     }
 }
 
 KisSelectionSP KisSelectionBasedLayer::internalSelection() const
 {
     return m_d->selection;
 }
 
 void KisSelectionBasedLayer::setInternalSelection(KisSelectionSP selection)
 {
     if (selection) {
         m_d->selection = new KisSelection(*selection.data());
         m_d->selection->setParentNode(this);
         m_d->selection->updateProjection();
     } else {
         m_d->selection = 0;
     }
 
     if (selection->pixelSelection()->defaultBounds()->bounds() != image()->bounds()) {
         qWarning() << "WARNING: KisSelectionBasedLayer::setInternalSelection"
                    << "New selection has suspicious default bounds";
         qWarning() << "WARNING:" << ppVar(selection->pixelSelection()->defaultBounds()->bounds());
         qWarning() << "WARNING:" << ppVar(image()->bounds());
     }
 }
 
 qint32 KisSelectionBasedLayer::x() const
 {
     return m_d->selection ? m_d->selection->x() : 0;
 }
 
 qint32 KisSelectionBasedLayer::y() const
 {
     return m_d->selection ? m_d->selection->y() : 0;
 }
 
 void KisSelectionBasedLayer::setX(qint32 x)
 {
     if (m_d->selection) {
         m_d->selection->setX(x);
     }
 }
 
 void KisSelectionBasedLayer::setY(qint32 y)
 {
     if (m_d->selection) {
         m_d->selection->setY(y);
     }
 }
 
 void KisSelectionBasedLayer::setDirty(const QRect & rect)
 {
     KisLayer::setDirty(rect);
 }
 
 void KisSelectionBasedLayer::setDirty()
 {
     Q_ASSERT(image());
 
     setDirty(image()->bounds());
 }
 
 QRect KisSelectionBasedLayer::extent() const
 {
     Q_ASSERT(image());
 
     return m_d->selection ?
            m_d->selection->selectedRect() : image()->bounds();
 }
 
 QRect KisSelectionBasedLayer::exactBounds() const
 {
     Q_ASSERT(image());
 
     return m_d->selection ?
            m_d->selection->selectedExactRect() : image()->bounds();
 }
 
 QImage KisSelectionBasedLayer::createThumbnail(qint32 w, qint32 h)
 {
     KisSelectionSP originalSelection = internalSelection();
     KisPaintDeviceSP originalDevice = original();
 
     return originalDevice && originalSelection ?
-           originalDevice->createThumbnail(w, h,
+           originalDevice->createThumbnail(w, h, 1,
                                            KoColorConversionTransformation::internalRenderingIntent(),
                                            KoColorConversionTransformation::internalConversionFlags()) :
            QImage();
 }
 
diff --git a/libs/image/kis_signal_auto_connection.h b/libs/image/kis_signal_auto_connection.h
index b9dd59a6e1..60a32dfb07 100644
--- a/libs/image/kis_signal_auto_connection.h
+++ b/libs/image/kis_signal_auto_connection.h
@@ -1,131 +1,133 @@
 /*
  *  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.
  */
 
 #ifndef __KIS_SIGNAL_AUTO_CONNECTOR_H
 #define __KIS_SIGNAL_AUTO_CONNECTOR_H
 
 #include <QObject>
 #include <QPointer>
+#include <QVector>
+
 
 /**
  * A special wrapper class that represents a connection between two QObject objects.
  * It creates the connection on the construction and disconnects it on destruction.
  *
  * WARNING: never use QScopedPointer::reset() for updating the
  *          connection like:
  *
  * QScopedPointer<KisSignalAutoConnection> conn;
  * ...
  * void Something::setCanvas(KoCanvasBase * canvas) {
  *     conn.reset(new KisSignalAutoConnection(...));
  * }
  *
  * The object stored in a scoped pointer will be destructed *after*
  * the new object created which will cause you object to become
  * disconnected.
  *
  * Intead use two-stage updates:
  * conn.reset();
  * conn.reset(new KisSignalAutoConnection(...));
  */
 class KisSignalAutoConnection
 {
 public:
     /**
      * Creates a connection object and starts the requested connection
      */
     inline KisSignalAutoConnection(const QObject *sender, const char *signal,
                                   const QObject *receiver, const char *method,
                                   Qt::ConnectionType type = Qt::AutoConnection)
         : m_sender(const_cast<QObject*>(sender)),
           m_signal(signal),
           m_receiver(const_cast<QObject*>(receiver)),
           m_method(method)
     {
         QObject::connect(m_sender, m_signal, m_receiver, m_method, type);
     }
     inline ~KisSignalAutoConnection()
     {
         if (!m_sender.isNull() && !m_receiver.isNull()) {
             QObject::disconnect(m_sender, m_signal, m_receiver, m_method);
         }
     }
 
 private:
     KisSignalAutoConnection(const KisSignalAutoConnection &rhs);
 
 private:
     QPointer<QObject> m_sender;
     const char *m_signal;
     QPointer<QObject> m_receiver;
     const char *m_method;
 };
 
 typedef QSharedPointer<KisSignalAutoConnection> KisSignalAutoConnectionSP;
 
 
 /**
  * A class to store multiple connections and to be able to stop all of
  * them at once. It is handy when you need to reconnect some other
  * object to the current manager. Then you just call
  * connectionsStore.clear() and then call addConnection() again to
  * recreate them.
  */
 class KisSignalAutoConnectionsStore
 {
 public:
     /**
      * Connects \p sender to \p reciever with a connection of type \p type.
      * The connection is saved into the store so can be reset later with clear()
      *
      * \see addUniqueConnection()
      */
     inline void addConnection(const QObject *sender, const char *signal,
                               const QObject *receiver, const char *method,
                               Qt::ConnectionType type = Qt::AutoConnection)
     {
         m_connections.append(KisSignalAutoConnectionSP(
                                  new KisSignalAutoConnection(sender, signal,
                                                              receiver, method, type)));
     }
 
     /**
      * Convenience override for addConnection() that creates a unique connection
      *
      * \see addConnection()
      */
     inline void addUniqueConnection(const QObject *sender, const char *signal,
                                     const QObject *receiver, const char *method)
     {
         m_connections.append(KisSignalAutoConnectionSP(
                                  new KisSignalAutoConnection(sender, signal,
                                                              receiver, method, Qt::UniqueConnection)));
     }
 
     /**
      * Disconnects all the stored connections and removes them from the store
      */
     inline void clear() {
         m_connections.clear();
     }
 
 private:
     QVector<KisSignalAutoConnectionSP> m_connections;
 };
 
 #endif /* __KIS_SIGNAL_AUTO_CONNECTOR_H */
diff --git a/libs/image/kis_types.h b/libs/image/kis_types.h
index 243fc63e3d..e6e749bd2e 100644
--- a/libs/image/kis_types.h
+++ b/libs/image/kis_types.h
@@ -1,265 +1,273 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *
  *  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 KISTYPES_H_
 #define KISTYPES_H_
 
 #include <QVector>
 #include <QPoint>
 #include <QList>
 
 #include "kritaimage_export.h"
 
 template<class T>
 class KisWeakSharedPtr;
 template<class T>
 class KisSharedPtr;
 
 template<class T> class QSharedPointer;
 template<class T> class QWeakPointer;
 
 template <class T>
 uint qHash(KisSharedPtr<T> ptr) {
     return qHash(ptr.data());
 }
 
 template <class T>
 uint qHash(KisWeakSharedPtr<T> ptr) {
     return qHash(ptr.data());
 }
 
 /**
  * Define lots of shared pointer versions of Krita classes.
  * Shared pointer classes have the advantage of near automatic
  * memory management (but beware of circular references)
- * and the disadvantage that inheritiance relations are no longer
- * recognizable
+ * These types should never be passed by reference,
+ * because that will mess up their reference counter.
+ *
+ * An example of the naming pattern used:
+ *
+ * KisPaintDeviceSP is a KisSharedPtr of KisPaintDevice
+ * KisPaintDeviceWSP is a KisWeakSharedPtr of KisPaintDevice
+ * vKisPaintDeviceSP is a QVector of KisPaintDeviceSP
+ * vKisPaintDeviceSP_it is an iterator of vKisPaintDeviceSP
+ *
  */
 class KisImage;
 typedef KisSharedPtr<KisImage> KisImageSP;
 typedef KisWeakSharedPtr<KisImage> KisImageWSP;
 
 class KisPaintDevice;
 typedef KisSharedPtr<KisPaintDevice> KisPaintDeviceSP;
 typedef KisWeakSharedPtr<KisPaintDevice> KisPaintDeviceWSP;
 typedef QVector<KisPaintDeviceSP> vKisPaintDeviceSP;
 typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it;
 
 class KisFixedPaintDevice;
 typedef KisSharedPtr<KisFixedPaintDevice> KisFixedPaintDeviceSP;
 
 class KisMask;
 typedef KisSharedPtr<KisMask> KisMaskSP;
 typedef KisWeakSharedPtr<KisMask> KisMaskWSP;
 
 class KisNode;
 typedef KisSharedPtr<KisNode> KisNodeSP;
 typedef KisWeakSharedPtr<KisNode> KisNodeWSP;
 typedef QVector<KisNodeSP> vKisNodeSP;
 typedef vKisNodeSP::iterator vKisNodeSP_it;
 typedef vKisNodeSP::const_iterator vKisNodeSP_cit;
 
 class KisBaseNode;
 typedef KisSharedPtr<KisBaseNode> KisBaseNodeSP;
 typedef KisWeakSharedPtr<KisBaseNode> KisBaseNodeWSP;
 
 class KisEffectMask;
 typedef KisSharedPtr<KisEffectMask> KisEffectMaskSP;
 typedef KisWeakSharedPtr<KisEffectMask> KisEffectMaskWSP;
 
 class KisFilterMask;
 typedef KisSharedPtr<KisFilterMask> KisFilterMaskSP;
 typedef KisWeakSharedPtr<KisFilterMask> KisFilterMaskWSP;
 
 class KisTransformMask;
 typedef KisSharedPtr<KisTransformMask> KisTransformMaskSP;
 typedef KisWeakSharedPtr<KisTransformMask> KisTransformMaskWSP;
 
 class KisTransformMaskParamsInterface;
 typedef QSharedPointer<KisTransformMaskParamsInterface> KisTransformMaskParamsInterfaceSP;
 typedef QWeakPointer<KisTransformMaskParamsInterface> KisTransformMaskParamsInterfaceWSP;
 
 class KisTransparencyMask;
 typedef KisSharedPtr<KisTransparencyMask> KisTransparencyMaskSP;
 typedef KisWeakSharedPtr<KisTransparencyMask> KisTransparencyMaskWSP;
 
 class KisLayer;
 typedef KisSharedPtr<KisLayer> KisLayerSP;
 typedef KisWeakSharedPtr<KisLayer> KisLayerWSP;
 
 class KisShapeLayer;
 typedef KisSharedPtr<KisShapeLayer> KisShapeLayerSP;
 
 class KisPaintLayer;
 typedef KisSharedPtr<KisPaintLayer> KisPaintLayerSP;
 
 class KisAdjustmentLayer;
 typedef KisSharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;
 
 class KisGeneratorLayer;
 typedef KisSharedPtr<KisGeneratorLayer> KisGeneratorLayerSP;
 
 class KisCloneLayer;
 typedef KisSharedPtr<KisCloneLayer> KisCloneLayerSP;
 typedef KisWeakSharedPtr<KisCloneLayer> KisCloneLayerWSP;
 
 class KisGroupLayer;
 typedef KisSharedPtr<KisGroupLayer> KisGroupLayerSP;
 typedef KisWeakSharedPtr<KisGroupLayer> KisGroupLayerWSP;
 
 class KisSelection;
 typedef KisSharedPtr<KisSelection> KisSelectionSP;
 typedef KisWeakSharedPtr<KisSelection> KisSelectionWSP;
 
 class KisSelectionComponent;
 typedef KisSharedPtr<KisSelectionComponent> KisSelectionComponentSP;
 
 class KisBackground;
 typedef KisSharedPtr<KisBackground> KisBackgroundSP;
 
 class KisSelectionMask;
 typedef KisSharedPtr<KisSelectionMask> KisSelectionMaskSP;
 
 class KisPixelSelection;
 typedef KisSharedPtr<KisPixelSelection> KisPixelSelectionSP;
 
 class KisHistogram;
 typedef KisSharedPtr<KisHistogram> KisHistogramSP;
 
 typedef QVector<QPoint> vKisSegments;
 
 class KisFilter;
 typedef KisSharedPtr<KisFilter> KisFilterSP;
 
 class KisLayerStyleFilter;
 typedef KisSharedPtr<KisLayerStyleFilter> KisLayerStyleFilterSP;
 
 class KisGenerator;
 typedef KisSharedPtr<KisGenerator> KisGeneratorSP;
 
 class KisConvolutionKernel;
 typedef KisSharedPtr<KisConvolutionKernel> KisConvolutionKernelSP;
 
 class KisAnnotation;
 typedef KisSharedPtr<KisAnnotation> KisAnnotationSP;
 typedef QVector<KisAnnotationSP> vKisAnnotationSP;
 typedef vKisAnnotationSP::iterator vKisAnnotationSP_it;
 typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit;
 
 class KisAnimationFrameCache;
 typedef KisSharedPtr<KisAnimationFrameCache> KisAnimationFrameCacheSP;
 typedef KisWeakSharedPtr<KisAnimationFrameCache> KisAnimationFrameCacheWSP;
 
 class KisPaintingAssistant;
 typedef QSharedPointer<KisPaintingAssistant> KisPaintingAssistantSP;
 typedef QWeakPointer<KisPaintingAssistant> KisPaintingAssistantWSP;
 
 // Repeat iterators
 class KisHLineIterator2;
 template<class T> class KisRepeatHLineIteratorPixelBase;
 typedef KisRepeatHLineIteratorPixelBase< KisHLineIterator2 > KisRepeatHLineConstIteratorNG;
 typedef KisSharedPtr<KisRepeatHLineConstIteratorNG> KisRepeatHLineConstIteratorSP;
 
 class KisVLineIterator2;
 template<class T> class KisRepeatVLineIteratorPixelBase;
 typedef KisRepeatVLineIteratorPixelBase< KisVLineIterator2 > KisRepeatVLineConstIteratorNG;
 typedef KisSharedPtr<KisRepeatVLineConstIteratorNG> KisRepeatVLineConstIteratorSP;
 
 
 // NG Iterators
 class KisHLineIteratorNG;
 typedef KisSharedPtr<KisHLineIteratorNG> KisHLineIteratorSP;
 
 class KisHLineConstIteratorNG;
 typedef KisSharedPtr<KisHLineConstIteratorNG> KisHLineConstIteratorSP;
 
 class KisVLineIteratorNG;
 typedef KisSharedPtr<KisVLineIteratorNG> KisVLineIteratorSP;
 
 class KisVLineConstIteratorNG;
 typedef KisSharedPtr<KisVLineConstIteratorNG> KisVLineConstIteratorSP;
 
 class KisRandomConstAccessorNG;
 typedef KisSharedPtr<KisRandomConstAccessorNG> KisRandomConstAccessorSP;
 
 class KisRandomAccessorNG;
 typedef KisSharedPtr<KisRandomAccessorNG> KisRandomAccessorSP;
 
 class KisRandomSubAccessor;
 typedef KisSharedPtr<KisRandomSubAccessor> KisRandomSubAccessorSP;
 
 // Things
 
 typedef QVector<QPointF> vQPointF;
 
 class KisPaintOpPreset;
 typedef KisSharedPtr<KisPaintOpPreset> KisPaintOpPresetSP;
 typedef KisWeakSharedPtr<KisPaintOpPreset> KisPaintOpPresetWSP;
 
 class KisPaintOpSettings;
 typedef KisSharedPtr<KisPaintOpSettings> KisPaintOpSettingsSP;
 
 class KisPaintOp;
 typedef KisSharedPtr<KisPaintOp> KisPaintOpSP;
 
 class KoID;
 typedef QList<KoID> KoIDList;
 
 class KoUpdater;
 template<class T> class QPointer;
 typedef QPointer<KoUpdater> KoUpdaterPtr;
 
 class KisProcessingVisitor;
 typedef KisSharedPtr<KisProcessingVisitor> KisProcessingVisitorSP;
 
 class KUndo2Command;
 typedef QSharedPointer<KUndo2Command> KUndo2CommandSP;
 
 typedef QList<KisNodeSP> KisNodeList;
 typedef QSharedPointer<KisNodeList> KisNodeListSP;
 
 typedef QList<KisPaintDeviceSP> KisPaintDeviceList;
 
 class KisStroke;
 typedef QSharedPointer<KisStroke> KisStrokeSP;
 typedef QWeakPointer<KisStroke> KisStrokeWSP;
 typedef KisStrokeWSP KisStrokeId;
 
 class KisFilterConfiguration;
 typedef QSharedPointer<KisFilterConfiguration> KisSafeFilterConfigurationSP;
 
 class KisProjectionUpdatesFilter;
 typedef QSharedPointer<KisProjectionUpdatesFilter> KisProjectionUpdatesFilterSP;
 
 class KisAbstractProjectionPlane;
 typedef QSharedPointer<KisAbstractProjectionPlane> KisAbstractProjectionPlaneSP;
 typedef QWeakPointer<KisAbstractProjectionPlane> KisAbstractProjectionPlaneWSP;
 
 class KisProjectionLeaf;
 typedef QSharedPointer<KisProjectionLeaf> KisProjectionLeafSP;
 typedef QWeakPointer<KisProjectionLeaf> KisProjectionLeafWSP;
 
 class KisKeyframe;
 typedef QSharedPointer<KisKeyframe> KisKeyframeSP;
 typedef QWeakPointer<KisKeyframe> KisKeyframeWSP;
 
 #include <QSharedPointer>
 #include <QWeakPointer>
 #include <kis_shared_ptr.h>
 
 #endif // KISTYPES_H_
 
diff --git a/libs/image/kis_update_time_monitor.cpp b/libs/image/kis_update_time_monitor.cpp
index 6060298949..569dc5e779 100644
--- a/libs/image/kis_update_time_monitor.cpp
+++ b/libs/image/kis_update_time_monitor.cpp
@@ -1,256 +1,256 @@
 /*
  *  Copyright (c) 2011 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_update_time_monitor.h"
 
 #include <QGlobalStatic>
 #include <QHash>
 #include <QSet>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QPointF>
 #include <QRect>
 #include <QRegion>
 #include <QFile>
 #include <QDir>
 
 #include <QElapsedTimer>
 
 #include <QFileInfo>
 
 #include "kis_debug.h"
 #include "kis_global.h"
 #include "kis_image_config.h"
 
 
 #include <brushengine/kis_paintop_preset.h>
 
 Q_GLOBAL_STATIC(KisUpdateTimeMonitor, s_instance)
 
 
 struct StrokeTicket
 {
     StrokeTicket()
         : m_jobTime(0)
         , m_updateTime(0) {}
 
     QRegion dirtyRegion;
 
     void start() {
         m_timer.start();
     }
 
     void jobCompleted() {
         m_jobTime = m_timer.restart();
     }
 
     void updateCompleted() {
         m_updateTime = m_timer.restart();
     }
 
     qint64 jobTime() const {
         return m_jobTime;
     }
 
     qint64 updateTime() const {
         return m_updateTime;
     }
 
 private:
     QElapsedTimer m_timer;
     qint64 m_jobTime;
     qint64 m_updateTime;
 };
 
 struct Q_DECL_HIDDEN KisUpdateTimeMonitor::Private
 {
     Private()
         : jobsTime(0),
           responseTime(0),
           numTickets(0),
           numUpdates(0),
           mousePath(0.0),
           loggingEnabled(false)
     {
         loggingEnabled = KisImageConfig().enablePerfLog();
     }
 
     QHash<void*, StrokeTicket*> preliminaryTickets;
     QSet<StrokeTicket*> finishedTickets;
 
     qint64 jobsTime;
     qint64 responseTime;
     qint32 numTickets;
     qint32 numUpdates;
     QMutex mutex;
 
     qreal mousePath;
     QPointF lastMousePos;
     QElapsedTimer strokeTime;
     KisPaintOpPresetSP preset;
 
     bool loggingEnabled;
 };
 
 KisUpdateTimeMonitor::KisUpdateTimeMonitor()
     : m_d(new Private)
 {
     if (m_d->loggingEnabled) {
         QDir dir;
         if (dir.exists("log")) {
             dir.remove("log");
         }
         dir.mkdir("log");
     }
 }
 
 KisUpdateTimeMonitor::~KisUpdateTimeMonitor()
 {
     delete m_d;
 }
 
 KisUpdateTimeMonitor* KisUpdateTimeMonitor::instance()
 {
     return s_instance;
 }
 
 void KisUpdateTimeMonitor::startStrokeMeasure()
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     m_d->jobsTime = 0;
     m_d->responseTime = 0;
     m_d->numTickets = 0;
     m_d->numUpdates = 0;
     m_d->mousePath = 0;
 
     m_d->lastMousePos = QPointF();
     m_d->preset = 0;
     m_d->strokeTime.start();
 }
 
 void KisUpdateTimeMonitor::endStrokeMeasure()
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     if(m_d->numTickets) {
         printValues();
     }
 }
 
 void KisUpdateTimeMonitor::reportPaintOpPreset(KisPaintOpPresetSP preset)
 {
     if (!m_d->loggingEnabled) return;
 
     m_d->preset = preset;
 }
 
 void KisUpdateTimeMonitor::reportMouseMove(const QPointF &pos)
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     if (!m_d->lastMousePos.isNull()) {
         qreal distance = kisDistance(m_d->lastMousePos, pos);
         m_d->mousePath += distance;
     }
 
     m_d->lastMousePos = pos;
 }
 
 void KisUpdateTimeMonitor::printValues()
 {
     qint64 strokeTime = m_d->strokeTime.elapsed();
     qreal responseTime = qreal(m_d->responseTime) / m_d->numTickets;
     qreal nonUpdateTime = qreal(m_d->jobsTime) / m_d->numTickets;
     qreal jobsPerUpdate = qreal(m_d->numTickets) / m_d->numUpdates;
     qreal mouseSpeed = qreal(m_d->mousePath) / strokeTime;
 
     QString prefix;
 
     if (m_d->preset) {
         KisPaintOpPresetSP preset = m_d->preset->clone();
         prefix = QString("%1.").arg(preset->name());
         preset->setFilename(QString("log/%1.kpp").arg(preset->name()));
         preset->save();
     }
 
     QFile logFile(QString("log/%1stroke.rdata").arg(prefix));
     logFile.open(QIODevice::Append);
     QTextStream stream(&logFile);
     stream << mouseSpeed << "\t"
            << jobsPerUpdate << "\t"
            << nonUpdateTime << "\t"
            << responseTime << "\n";
     logFile.close();
 }
 
 void KisUpdateTimeMonitor::reportJobStarted(void *key)
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     StrokeTicket *ticket = new StrokeTicket();
     ticket->start();
 
     m_d->preliminaryTickets.insert(key, ticket);
 }
 
 void KisUpdateTimeMonitor::reportJobFinished(void *key, const QVector<QRect> &rects)
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     StrokeTicket *ticket = m_d->preliminaryTickets.take(key);
-    if (ticket) {
+    if( ticket ){
         ticket->jobCompleted();
 
         Q_FOREACH (const QRect &rect, rects) {
             ticket->dirtyRegion += rect;
         }
         m_d->finishedTickets.insert(ticket);
     }
 }
 
 void KisUpdateTimeMonitor::reportUpdateFinished(const QRect &rect)
 {
     if (!m_d->loggingEnabled) return;
 
     QMutexLocker locker(&m_d->mutex);
 
     Q_FOREACH (StrokeTicket *ticket, m_d->finishedTickets) {
         ticket->dirtyRegion -= rect;
         if(ticket->dirtyRegion.isEmpty()) {
             ticket->updateCompleted();
             m_d->jobsTime += ticket->jobTime();
             m_d->responseTime += ticket->jobTime() + ticket->updateTime();
             m_d->numTickets++;
 
             m_d->finishedTickets.remove(ticket);
             delete ticket;
         }
     }
     m_d->numUpdates++;
 }
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index 1107a768f5..d2c748b772 100644
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -1,536 +1,546 @@
 # 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
     ${EXIV2_INCLUDE_DIR}
 )
 
 include_directories(SYSTEM
     ${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
     dialogs/kis_internal_color_selector.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
+    brushhud/kis_uniform_paintop_property_widget.cpp
+    brushhud/kis_brush_hud.cpp
+    brushhud/kis_round_hud_button.cpp
+    brushhud/kis_dlg_brush_hud_config.cpp
+    brushhud/kis_brush_hud_properties_list.cpp
+    brushhud/kis_brush_hud_properties_config.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
     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_elided_label.cpp
     widgets/kis_spinbox_color_selector.cpp
     widgets/KoDualColorButton.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
 )
 
 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
+    brushhud/kis_dlg_brush_hud_config.ui
     forms/wdgdlginternalcolorselector.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/KisApplication.cpp b/libs/ui/KisApplication.cpp
index 34e0efcacb..7331a97d7d 100644
--- a/libs/ui/KisApplication.cpp
+++ b/libs/ui/KisApplication.cpp
@@ -1,737 +1,742 @@
  /* This file is part of the KDE project
    Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
    Copyright (C) 2009 Thomas Zander <zander@kde.org>
    Copyright (C) 2012 Boudewijn Rempt <boud@valdyas.org>
 
    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 "KisApplication.h"
 
 #include <stdlib.h>
 #ifdef Q_OS_WIN
 #include <windows.h>
 #include <tchar.h>
 #endif
 
 #include <QDesktopServices>
 #include <QDesktopWidget>
 #include <QDir>
 #include <QFile>
 #include <QLocale>
 #include <QMessageBox>
 #include <QMessageBox>
 #include <QProcessEnvironment>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QStringList>
 #include <QStyle>
 #include <QStyleFactory>
 #include <QSysInfo>
 #include <QTimer>
 #include <QWidget>
 
 #include <klocalizedstring.h>
 #include <kdesktopfile.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
 #include <KoColorSpaceRegistry.h>
 #include <KoPluginLoader.h>
 #include <KoShapeRegistry.h>
 #include <KoDpi.h>
 #include "KoGlobal.h"
 #include "KoConfig.h"
 #include <resources/KoHashGeneratorProvider.h>
 #include <KoResourcePaths.h>
 #include <KisMimeDatabase.h>
 #include "thememanager.h"
 #include "KisPrintJob.h"
 #include "KisDocument.h"
 #include "KisMainWindow.h"
 #include "KisAutoSaveRecoveryDialog.h"
 #include "KisPart.h"
 #include <kis_icon.h>
 #include "kis_md5_generator.h"
 #include "kis_splash_screen.h"
 #include "kis_config.h"
 #include "flake/kis_shape_selection.h"
 #include <filter/kis_filter.h>
 #include <filter/kis_filter_registry.h>
 #include <filter/kis_filter_configuration.h>
 #include <generator/kis_generator_registry.h>
 #include <generator/kis_generator.h>
 #include <brushengine/kis_paintop_registry.h>
 #include <metadata/kis_meta_data_io_backend.h>
 #include "kisexiv2/kis_exiv2.h"
 #include "KisApplicationArguments.h"
 #include <kis_debug.h>
 #include "kis_action_registry.h"
 #include <kis_brush_server.h>
 #include <kis_resource_server_provider.h>
 #include <KoResourceServerProvider.h>
 #include "kis_image_barrier_locker.h"
 #include "opengl/kis_opengl.h"
 
 #include <KritaVersionWrapper.h>
 namespace {
 const QTime appStartTime(QTime::currentTime());
 }
 
 class KisApplicationPrivate
 {
 public:
     KisApplicationPrivate()
         : splashScreen(0)
     {}
     KisSplashScreen *splashScreen;
 };
 
 class KisApplication::ResetStarting
 {
 public:
     ResetStarting(KisSplashScreen *splash = 0)
         : m_splash(splash)
     {
     }
 
     ~ResetStarting()  {
         if (m_splash) {
 
             KConfigGroup cfg( KSharedConfig::openConfig(), "SplashScreen");
             bool hideSplash = cfg.readEntry("HideSplashAfterStartup", false);
 
             if (hideSplash) {
                 m_splash->hide();
             }
             else {
                 m_splash->setWindowFlags(Qt::Tool);
                 QRect r(QPoint(), m_splash->size());
                 m_splash->move(QApplication::desktop()->availableGeometry().center() - r.center());
                 m_splash->setWindowTitle(qAppName());
                 m_splash->setParent(qApp->activeWindow());
                 Q_FOREACH (QObject *o, m_splash->children()) {
                     QWidget *w = qobject_cast<QWidget*>(o);
                     if (w && w->isHidden()) {
                         w->setVisible(true);
                     }
                 }
 
                 m_splash->show();
             }
         }
     }
 
     KisSplashScreen *m_splash;
 };
 
 
 
 KisApplication::KisApplication(const QString &key, int &argc, char **argv)
     : QtSingleApplication(key, argc, argv)
     , d(new KisApplicationPrivate)
     , m_autosaveDialog(0)
     , m_mainWindow(0)
     , m_batchRun(false)
 {
     QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
 
     setApplicationDisplayName("Krita");
     setApplicationName("krita");
     // Note: Qt docs suggest we set this, but if we do, we get resource paths of the form of krita/krita, which is weird.
 //    setOrganizationName("krita");
     setOrganizationDomain("krita.org");
 
     QString version = KritaVersionWrapper::versionString(true);
     setApplicationVersion(version);
     setWindowIcon(KisIconUtils::loadIcon("calligrakrita"));
 
-    QStringList styles = QStringList() << "fusion" << "plastique";
-    if (!styles.contains(style()->objectName().toLower())) {
-        Q_FOREACH (const QString & style, styles) {
-            if (!setStyle(style)) {
-                qDebug() << "No" << style << "available.";
-            }
-            else {
-                qDebug() << "Set style" << style;
-                break;
+    if (qgetenv("KRITA_NO_STYLE_OVERRIDE").isEmpty()) {
+        QStringList styles = QStringList() << "fusion" << "plastique";
+        if (!styles.contains(style()->objectName().toLower())) {
+            Q_FOREACH (const QString & style, styles) {
+                if (!setStyle(style)) {
+                    qDebug() << "No" << style << "available.";
+                }
+                else {
+                    qDebug() << "Set style" << style;
+                    break;
+                }
             }
         }
     }
+    else {
+        qDebug() << "Style override disabled, using" << style()->objectName();
+    }
 
     KisOpenGL::initialize();
     qDebug() << "krita has opengl" << KisOpenGL::hasOpenGL();
 }
 
 #if defined(Q_OS_WIN) && defined(ENV32BIT)
 typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
 
 LPFN_ISWOW64PROCESS fnIsWow64Process;
 
 BOOL isWow64()
 {
     BOOL bIsWow64 = FALSE;
 
     //IsWow64Process is not available on all supported versions of Windows.
     //Use GetModuleHandle to get a handle to the DLL that contains the function
     //and GetProcAddress to get a pointer to the function if available.
 
     fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress(
                 GetModuleHandle(TEXT("kernel32")),"IsWow64Process");
 
     if(0 != fnIsWow64Process)
     {
         if (!fnIsWow64Process(GetCurrentProcess(),&bIsWow64))
         {
             //handle error
         }
     }
     return bIsWow64;
 }
 #endif
 
 void initializeGlobals(const KisApplicationArguments &args)
 {
     int dpiX = args.dpiX();
     int dpiY = args.dpiY();
     if (dpiX > 0 && dpiY > 0) {
         KoDpi::setDPI(dpiX, dpiY);
     }
 }
 
 void addResourceTypes()
 {
     // All Krita's resource types
     KoResourcePaths::addResourceType("kis_pics", "data", "/pics/");
     KoResourcePaths::addResourceType("kis_images", "data", "/images/");
     KoResourcePaths::addResourceType("icc_profiles", "data", "/profiles/");
     KoResourcePaths::addResourceType("metadata_schema", "data", "/metadata/schemas/");
     KoResourcePaths::addResourceType("kis_brushes", "data", "/brushes/");
     KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/");
     KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/");
     KoResourcePaths::addResourceType("gmic_definitions", "data", "/gmic/");
     KoResourcePaths::addResourceType("kis_resourcebundles", "data", "/bundles/");
     KoResourcePaths::addResourceType("kis_defaultpresets", "data", "/defaultpresets/");
     KoResourcePaths::addResourceType("kis_paintoppresets", "data", "/paintoppresets/");
     KoResourcePaths::addResourceType("kis_workspaces", "data", "/workspaces/");
     KoResourcePaths::addResourceType("psd_layer_style_collections", "data", "/asl");
     KoResourcePaths::addResourceType("ko_patterns", "data", "/patterns/", true);
     KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/");
     KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/", true);
     KoResourcePaths::addResourceType("ko_palettes", "data", "/palettes/", true);
     KoResourcePaths::addResourceType("kis_shortcuts", "data", "/shortcuts/");
     KoResourcePaths::addResourceType("kis_actions", "data", "/actions");
     KoResourcePaths::addResourceType("icc_profiles", "data", "/color/icc");
     KoResourcePaths::addResourceType("ko_effects", "data", "/effects/");
     KoResourcePaths::addResourceType("tags", "data", "/tags/");
 
 //    // Extra directories to look for create resources. (Does anyone actually use that anymore?)
 //    KoResourcePaths::addResourceDir("ko_gradients", "/usr/share/create/gradients/gimp");
 //    KoResourcePaths::addResourceDir("ko_gradients", QDir::homePath() + QString("/.create/gradients/gimp"));
 //    KoResourcePaths::addResourceDir("ko_patterns", "/usr/share/create/patterns/gimp");
 //    KoResourcePaths::addResourceDir("ko_patterns", QDir::homePath() + QString("/.create/patterns/gimp"));
 //    KoResourcePaths::addResourceDir("kis_brushes", "/usr/share/create/brushes/gimp");
 //    KoResourcePaths::addResourceDir("kis_brushes", QDir::homePath() + QString("/.create/brushes/gimp"));
 //    KoResourcePaths::addResourceDir("ko_palettes", "/usr/share/create/swatches");
 //    KoResourcePaths::addResourceDir("ko_palettes", QDir::homePath() + QString("/.create/swatches"));
 
     // Make directories for all resources we can save, and tags
     QDir d;
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/tags/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/asl/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/bundles/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/gradients/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/paintoppresets/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/palettes/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/patterns/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/taskset/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/workspaces/");
     d.mkpath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/input/");
 }
 
 void KisApplication::loadResources()
 {
     setSplashScreenLoadingText(i18n("Loading Gradients..."));
     KoResourceServerProvider::instance()->gradientServer(true);
 
     // Load base resources
     setSplashScreenLoadingText(i18n("Loading Patterns..."));
     KoResourceServerProvider::instance()->patternServer(true);
 
     setSplashScreenLoadingText(i18n("Loading Palettes..."));
     KoResourceServerProvider::instance()->paletteServer(false);
 
     setSplashScreenLoadingText(i18n("Loading Brushes..."));
     KisBrushServer::instance()->brushServer(true);
 
     // load paintop presets
     setSplashScreenLoadingText(i18n("Loading Paint Operations..."));
     KisResourceServerProvider::instance()->paintOpPresetServer(true);
 
     setSplashScreenLoadingText(i18n("Loading Resource Bundles..."));
     KisResourceServerProvider::instance()->resourceBundleServer();
 }
 
 void KisApplication::loadPlugins()
 {
     KoShapeRegistry* r = KoShapeRegistry::instance();
     r->add(new KisShapeSelectionFactory());
 
     KisActionRegistry::instance();
     KisFilterRegistry::instance();
     KisGeneratorRegistry::instance();
     KisPaintOpRegistry::instance();
     KoColorSpaceRegistry::instance();
 
     // Load the krita-specific tools
     setSplashScreenLoadingText(i18n("Loading Plugins for Krita/Tool..."));
     KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Tool"),
                                      QString::fromLatin1("[X-Krita-Version] == 28"));
 
 
     // Load dockers
     setSplashScreenLoadingText(i18n("Loading Plugins for Krita/Dock..."));
     KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Dock"),
                                      QString::fromLatin1("[X-Krita-Version] == 28"));
 
     // XXX_EXIV: make the exiv io backends real plugins
     setSplashScreenLoadingText(i18n("Loading Plugins Exiv/IO..."));
     KisExiv2::initialize();
 }
 
 
 bool KisApplication::start(const KisApplicationArguments &args)
 {
 #if defined(Q_OS_WIN)  || defined (Q_OS_MAC)
 #ifdef ENV32BIT
     KisConfig cfg;
     if (isWow64() && !cfg.readEntry("WarnedAbout32Bits", false)) {
         QMessageBox::information(0,
                                  i18nc("@title:window", "Krita: Warning"),
                                  i18n("You are running a 32 bits build on a 64 bits Windows.\n"
                                       "This is not recommended.\n"
                                       "Please download and install the x64 build instead."));
         cfg.writeEntry("WarnedAbout32Bits", true);
 
     }
 #endif
 #endif
 
     setSplashScreenLoadingText(i18n("Initializing Globals"));
     initializeGlobals(args);
 
     const bool doTemplate = args.doTemplate();
     const bool print = args.print();
     const bool exportAs = args.exportAs();
     const bool exportAsPdf = args.exportAsPdf();
     const QString exportFileName = args.exportFileName();
 
     m_batchRun = (print || exportAs || exportAsPdf || !exportFileName.isEmpty());
     // print & exportAsPdf do user interaction ATM
     const bool needsMainWindow = !exportAs;
     // only show the mainWindow when no command-line mode option is passed
     // TODO: fix print & exportAsPdf to work without mainwindow shown
     const bool showmainWindow = !exportAs; // would be !batchRun;
 
     const bool showSplashScreen = !m_batchRun && qgetenv("NOSPLASH").isEmpty() &&  qgetenv("XDG_CURRENT_DESKTOP") != "GNOME";
     if (showSplashScreen) {
         d->splashScreen->show();
         d->splashScreen->repaint();
         processEvents();
     }
 
     KoHashGeneratorProvider::instance()->setGenerator("MD5", new KisMD5Generator());
 
     // Initialize all Krita directories etc.
     KoGlobal::initialize();
 
     KConfigGroup group(KSharedConfig::openConfig(), "theme");
     Digikam::ThemeManager themeManager;
     themeManager.setCurrentTheme(group.readEntry("Theme", "Krita dark"));
 
     ResetStarting resetStarting(d->splashScreen); // remove the splash when done
     Q_UNUSED(resetStarting);
 
     // Make sure we can save resources and tags
     setSplashScreenLoadingText(i18n("Adding resource types"));
     addResourceTypes();
 
     // Load all resources and tags before the plugins do that
     loadResources();
 
     // Load the plugins
     loadPlugins();
 
     if (needsMainWindow) {
         // show a mainWindow asap, if we want that
         setSplashScreenLoadingText(i18n("Loading Main Window..."));
         m_mainWindow = KisPart::instance()->createMainWindow();
 
         if (showmainWindow) {
             QTimer::singleShot(1, m_mainWindow, SLOT(show()));
         }
     }
     short int numberOfOpenDocuments = 0; // number of documents open
 
     // Check for autosave files that can be restored, if we're not running a batchrun (test, print, export to pdf)
     if (!m_batchRun) {
         checkAutosaveFiles();
     }
 
     setSplashScreenLoadingText(""); // done loading, so clear out label
 
     // Get the command line arguments which we have to parse
     int argsCount = args.filenames().count();
     if (argsCount > 0) {
 
         // Loop through arguments
         short int nPrinted = 0;
         for (int argNumber = 0; argNumber < argsCount; argNumber++) {
             QString fileName = args.filenames().at(argNumber);
             // are we just trying to open a template?
             if (doTemplate) {
                 // called in mix with batch options? ignore and silently skip
                 if (m_batchRun) {
                     continue;
                 }
                 if (createNewDocFromTemplate(fileName, m_mainWindow)) {
                     ++numberOfOpenDocuments;
                 }
                 // now try to load
             }
             else {
 
                 if (exportAs) {
                     QString outputMimetype = KisMimeDatabase::mimeTypeForFile(exportFileName);
                     if (outputMimetype == "application/octetstream") {
                         dbgKrita << i18n("Mimetype not found, try using the -mimetype option") << endl;
                         return 1;
                     }
 
                     KisDocument *doc = KisPart::instance()->createDocument();
                     doc->setFileBatchMode(m_batchRun);
                     doc->openUrl(QUrl::fromLocalFile(fileName));
 
                     qApp->processEvents(); // For vector layers to be updated
                     KisImageBarrierLocker locker(doc->image());
 
                     KisImportExportFilter::ConversionStatus status = KisImportExportFilter::OK;
                     KisImportExportManager manager(doc);
                     manager.setBatchMode(true);
                     QByteArray mime(outputMimetype.toLatin1());
                     status = manager.exportDocument(exportFileName, mime);
 
                     if (status != KisImportExportFilter::OK) {
                         dbgKrita << "Could not export " << fileName << "to" << exportFileName << ":" << (int)status;
                     }
                     nPrinted++;
                     QTimer::singleShot(0, this, SLOT(quit()));
                 }
                 else if (m_mainWindow) {
                     KisDocument *doc = KisPart::instance()->createDocument();
                     doc->setFileBatchMode(m_batchRun);
                     if (m_mainWindow->openDocumentInternal(QUrl::fromLocalFile(fileName), doc)) {
                         if (print) {
                             m_mainWindow->slotFilePrint();
                             nPrinted++;
                             // TODO: trigger closing of app once printing is done
                         }
                         else if (exportAsPdf) {
                             KisPrintJob *job = m_mainWindow->exportToPdf(exportFileName);
                             if (job)
                                 connect (job, SIGNAL(destroyed(QObject*)), m_mainWindow,
                                          SLOT(slotFileQuit()), Qt::QueuedConnection);
                             nPrinted++;
                         } else {
                             // Normal case, success
                             numberOfOpenDocuments++;
                         }
                     } else {
                         // .... if failed
                         // delete doc; done by openDocument
                     }
                 }
             }
         }
 
         if (m_batchRun) {
             return nPrinted > 0;
         }
     }
     // not calling this before since the program will quit there.
     return true;
 }
 
 KisApplication::~KisApplication()
 {
     delete d;
 }
 
 void KisApplication::setSplashScreen(QWidget *splashScreen)
 {
     d->splashScreen = qobject_cast<KisSplashScreen*>(splashScreen);
 }
 
 void KisApplication::setSplashScreenLoadingText(QString textToLoad)
 {
    d->splashScreen->loadingLabel->setText(textToLoad);
    d->splashScreen->repaint();
 }
 
 void KisApplication::hideSplashScreen()
 {
     if (d->splashScreen) {
         // hide the splashscreen to see the dialog
         d->splashScreen->hide();
     }
 }
 
 bool KisApplication::notify(QObject *receiver, QEvent *event)
 {
     try {
         return QApplication::notify(receiver, event);
     } catch (std::exception &e) {
         qWarning("Error %s sending event %i to object %s",
                  e.what(), event->type(), qPrintable(receiver->objectName()));
     } catch (...) {
         qWarning("Error <unknown> sending event %i to object %s",
                  event->type(), qPrintable(receiver->objectName()));
     }
     return false;
 
 }
 
 
 void KisApplication::remoteArguments(QByteArray message, QObject *socket)
 {
     Q_UNUSED(socket);
 
     // check if we have any mainwindow
     KisMainWindow *mw = qobject_cast<KisMainWindow*>(qApp->activeWindow());
     if (!mw) {
         mw = KisPart::instance()->mainWindows().first();
     }
 
     if (!mw) {
         return;
     }
 
     KisApplicationArguments args = KisApplicationArguments::deserialize(message);
     const bool doTemplate = args.doTemplate();
     const int argsCount = args.filenames().count();
 
     if (argsCount > 0) {
         // Loop through arguments
         for (int argNumber = 0; argNumber < argsCount; ++argNumber) {
             QString filename = args.filenames().at(argNumber);
             // are we just trying to open a template?
             if (doTemplate) {
                 createNewDocFromTemplate(filename, mw);
             }
             else if (QFile(filename).exists()) {
                 KisDocument *doc = KisPart::instance()->createDocument();
                 doc->setFileBatchMode(m_batchRun);
                 mw->openDocumentInternal(QUrl::fromLocalFile(filename), doc);
             }
         }
     }
 }
 
 void KisApplication::fileOpenRequested(const QString &url)
 {
     KisMainWindow *mainWindow = KisPart::instance()->mainWindows().first();
     if (mainWindow) {
         KisDocument *doc = KisPart::instance()->createDocument();
         doc->setFileBatchMode(m_batchRun);
         mainWindow->openDocumentInternal(QUrl::fromLocalFile(url), doc);
     }
 }
 
 
 void KisApplication::checkAutosaveFiles()
 {
     if (m_batchRun) return;
 
     // Check for autosave files from a previous run. There can be several, and
     // we want to offer a restore for every one. Including a nice thumbnail!
 
     QStringList filters;
     filters << QString(".krita-*-*-autosave.kra");
 
 #ifdef Q_OS_WIN
     QDir dir = QDir::temp();
 #else
     QDir dir = QDir::home();
 #endif
 
     // all autosave files for our application
     m_autosaveFiles = dir.entryList(filters, QDir::Files | QDir::Hidden);
 
     // Allow the user to make their selection
     if (m_autosaveFiles.size() > 0) {
         if (d->splashScreen) {
             // hide the splashscreen to see the dialog
             d->splashScreen->hide();
         }
         m_autosaveDialog = new KisAutoSaveRecoveryDialog(m_autosaveFiles, activeWindow());
         connect(m_autosaveDialog, SIGNAL(finished(int)), this, SLOT(onAutoSaveFinished(int)));
         m_autosaveDialog->exec();
     }
 }
 
 void KisApplication::onAutoSaveFinished(int result)
 {
     if (m_batchRun) return;
 
 #ifdef Q_OS_WIN
     QDir dir = QDir::temp();
 #else
     QDir dir = QDir::home();
 #endif
 
     if (result == QDialog::Accepted) {
         QStringList filesToRecover = m_autosaveDialog->recoverableFiles();
         Q_FOREACH (const QString &autosaveFile, m_autosaveFiles) {
             if (!filesToRecover.contains(autosaveFile)) {
                 QFile::remove(dir.absolutePath() + "/" + autosaveFile);
             }
         }
         m_autosaveFiles = filesToRecover;
     } else {
         m_autosaveFiles.clear();
     }
 
     QList<QUrl> autosaveUrls;
     if (m_autosaveFiles.size() > 0) {
 
         Q_FOREACH (const QString &autoSaveFile, m_autosaveFiles) {
             const QUrl url = QUrl::fromLocalFile(dir.absolutePath() + QLatin1Char('/') + autoSaveFile);
             autosaveUrls << url;
         }
     }
 
     if (m_mainWindow) {
         Q_FOREACH (const QUrl &url, autosaveUrls) {
             KisDocument *doc = KisPart::instance()->createDocument();
             doc->setFileBatchMode(m_batchRun);
             m_mainWindow->openDocumentInternal(url, doc);
         }
     }
 }
 
 bool KisApplication::createNewDocFromTemplate(const QString &fileName, KisMainWindow *mainWindow)
 {
     QString templatePath;
 
     const QUrl templateUrl = QUrl::fromLocalFile(fileName);
     if (QFile::exists(fileName)) {
         templatePath = templateUrl.toLocalFile();
         dbgUI << "using full path...";
     }
     else {
         QString desktopName(fileName);
         const QString templatesResourcePath =  QStringLiteral("templates/");
 
         QStringList paths = KoResourcePaths::findAllResources("data", templatesResourcePath + "*/" + desktopName);
         if (paths.isEmpty()) {
             paths = KoResourcePaths::findAllResources("data", templatesResourcePath + desktopName);
         }
 
         if (paths.isEmpty()) {
             QMessageBox::critical(0, i18nc("@title:window", "Krita"),
                                   i18n("No template found for: %1", desktopName));
         } else if (paths.count() > 1) {
             QMessageBox::critical(0, i18nc("@title:window", "Krita"),
                                   i18n("Too many templates found for: %1", desktopName));
         } else {
             templatePath = paths.at(0);
         }
     }
 
     if (!templatePath.isEmpty()) {
         QUrl templateBase;
         templateBase.setPath(templatePath);
         KDesktopFile templateInfo(templatePath);
 
         QString templateName = templateInfo.readUrl();
         QUrl templateURL;
         templateURL.setPath(templateBase.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path() + '/' + templateName);
 
         KisDocument *doc = KisPart::instance()->createDocument();
         doc->setFileBatchMode(m_batchRun);
         if (mainWindow->openDocumentInternal(templateURL, doc)) {
             doc->resetURL();
             doc->setEmpty();
             doc->setTitleModified();
             dbgUI << "Template loaded...";
             return true;
         }
         else {
             QMessageBox::critical(0, i18nc("@title:window", "Krita"),
                                   i18n("Template %1 failed to load.", templateURL.toDisplayString()));
         }
     }
 
     return false;
 }
 
 void KisApplication::clearConfig()
 {
     KIS_ASSERT_RECOVER_RETURN(qApp->thread() == QThread::currentThread());
 
     KSharedConfigPtr config =  KSharedConfig::openConfig();
 
     // find user settings file
     bool createDir = false;
     QString kritarcPath = KoResourcePaths::locateLocal("config", "kritarc", createDir);
 
     QFile configFile(kritarcPath);
     if (configFile.exists()) {
         // clear file
         if (configFile.open(QFile::WriteOnly)) {
             configFile.close();
         }
         else {
             QMessageBox::warning(0,
                                  i18nc("@title:window", "Krita"),
                                  i18n("Failed to clear %1\n\n"
                                       "Please make sure no other program is using the file and try again.",
                                       kritarcPath),
                                  QMessageBox::Ok, QMessageBox::Ok);
         }
     }
 
     // reload from disk; with the user file settings cleared,
     // this should load any default configuration files shipping with the program
     config->reparseConfiguration();
     config->sync();
 }
 
 void KisApplication::askClearConfig()
 {
     Qt::KeyboardModifiers mods = QApplication::queryKeyboardModifiers();
     bool askClearConfig = (mods & Qt::ControlModifier) && (mods & Qt::ShiftModifier) && (mods & Qt::AltModifier);
 
     if (askClearConfig) {
         bool ok = QMessageBox::question(0,
                                         i18nc("@title:window", "Krita"),
                                         i18n("Do you want to clear the settings file?"),
                                         QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes;
         if (ok) {
             clearConfig();
         }
     }
 }
diff --git a/libs/ui/KisColorsetChooser.cpp b/libs/ui/KisColorsetChooser.cpp
index 955917f51f..2f730f96c9 100644
--- a/libs/ui/KisColorsetChooser.cpp
+++ b/libs/ui/KisColorsetChooser.cpp
@@ -1,157 +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_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 QSpinBox(this);
+    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/KisMainWindow.cpp b/libs/ui/KisMainWindow.cpp
index 6783e69b9b..dd2087e24d 100644
--- a/libs/ui/KisMainWindow.cpp
+++ b/libs/ui/KisMainWindow.cpp
@@ -1,2512 +1,2512 @@
 /* This file is part of the KDE project
    Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
    Copyright (C) 2000-2006 David Faure <faure@kde.org>
    Copyright (C) 2007, 2009 Thomas zander <zander@kde.org>
    Copyright (C) 2010 Benjamin Port <port.benjamin@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 "KisMainWindow.h"
 
 #include <KoConfig.h>
 
 // qt includes
 #include <QApplication>
 #include <QByteArray>
 #include <QCloseEvent>
 #include <QDesktopServices>
 #include <QDesktopWidget>
 #include <QDockWidget>
 #include <QIcon>
 #include <QLabel>
 #include <QLayout>
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QPointer>
 #include <QPrintDialog>
 #include <QPrinter>
 #include <QPrintPreviewDialog>
 #include <QProgressBar>
 #include <QToolButton>
 #include <QSignalMapper>
 #include <QTabBar>
 #include <QMoveEvent>
 #include <QUrl>
 #include <QMessageBox>
 #include <QTemporaryFile>
 #include <QStatusBar>
 #include <QMenu>
 #include <QMenuBar>
 #include <KisMimeDatabase.h>
 #include <QMimeData>
 
 #include <kactioncollection.h>
 #include <QAction>
 #include <kactionmenu.h>
 #include <kis_debug.h>
 #include <kedittoolbar.h>
 #include <khelpmenu.h>
 #include <klocalizedstring.h>
 #include <kaboutdata.h>
 
 #ifdef HAVE_KIO
 #include <krecentdocument.h>
 #endif
 #include <krecentfilesaction.h>
 #include <KoResourcePaths.h>
 #include <ktoggleaction.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
 #include <kxmlguiwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
 #include <kguiitem.h>
 #include <kwindowconfig.h>
 
 #include "KoDockFactoryBase.h"
 #include "KoDockWidgetTitleBar.h"
 #include "KoDocumentInfoDlg.h"
 #include "KoDocumentInfo.h"
 #include "KoFileDialog.h"
 #include <kis_icon.h>
 #include <KoPageLayoutDialog.h>
 #include <KoPageLayoutWidget.h>
 #include <KoToolManager.h>
 #include <KoZoomController.h>
 #include "KoToolDocker.h"
 #include <KoToolBoxFactory.h>
 #include <KoDockRegistry.h>
 #include <KoPluginLoader.h>
 #include <KoColorSpaceEngine.h>
 
 #include <KisMimeDatabase.h>
 #include <brushengine/kis_paintop_settings.h>
 #include "dialogs/kis_about_application.h"
 #include "dialogs/kis_delayed_save_dialog.h"
 #include "dialogs/kis_dlg_preferences.h"
 #include "kis_action.h"
 #include "kis_action_manager.h"
 #include "KisApplication.h"
 #include "kis_canvas2.h"
 #include "kis_canvas_controller.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_clipboard.h"
 #include "kis_config.h"
 #include "kis_config_notifier.h"
 #include "kis_config_notifier.h"
 #include "kis_custom_image_widget.h"
 #include <KisDocument.h>
 #include "KisDocument.h"
 #include "KisDocument.h"
 #include "kis_group_layer.h"
 #include "kis_icon_utils.h"
 #include "kis_image_from_clipboard_widget.h"
 #include "kis_image.h"
 #include <KisImportExportFilter.h>
 #include "KisImportExportManager.h"
 #include "kis_mainwindow_observer.h"
 #include "kis_node.h"
 #include "KisOpenPane.h"
 #include "kis_paintop_box.h"
 #include "KisPart.h"
 #include "KisPrintJob.h"
 #include "kis_resource_server_provider.h"
 #include "kis_signal_compressor_with_param.h"
 #include "KisView.h"
 #include "KisViewManager.h"
 #include "thememanager.h"
 #include "kis_animation_importer.h"
 #include "dialogs/kis_dlg_import_image_sequence.h"
 #include "kis_animation_exporter.h"
 
 #include <mutex>
 
 #ifdef Q_OS_WIN
   #include <QtPlatformHeaders/QWindowsWindowFunctions>
 #endif
 
 class ToolDockerFactory : public KoDockFactoryBase
 {
 public:
     ToolDockerFactory() : KoDockFactoryBase() { }
 
     QString id() const {
         return "sharedtooldocker";
     }
 
     QDockWidget* createDockWidget() {
         KoToolDocker* dockWidget = new KoToolDocker();
         dockWidget->setTabEnabled(false);
         return dockWidget;
     }
 
     DockPosition defaultDockPosition() const {
         return DockRight;
     }
 };
 
 class Q_DECL_HIDDEN KisMainWindow::Private
 {
 public:
     Private(KisMainWindow *parent)
         : q(parent)
         , viewManager(0)
         , firstTime(true)
         , windowSizeDirty(false)
         , readOnly(false)
         , isImporting(false)
         , isExporting(false)
         , noCleanup(false)
         , showDocumentInfo(0)
         , saveAction(0)
         , saveActionAs(0)
 //        , printAction(0)
 //        , printActionPreview(0)
         , exportPdf(0)
         , closeAll(0)
 //        , reloadFile(0)
         , importFile(0)
         , exportFile(0)
         , undo(0)
         , redo(0)
         , newWindow(0)
         , close(0)
         , mdiCascade(0)
         , mdiTile(0)
         , mdiNextWindow(0)
         , mdiPreviousWindow(0)
         , toggleDockers(0)
         , toggleDockerTitleBars(0)
         , dockWidgetMenu(new KActionMenu(i18nc("@action:inmenu", "&Dockers"), parent))
         , windowMenu(new KActionMenu(i18nc("@action:inmenu", "&Window"), parent))
         , documentMenu(new KActionMenu(i18nc("@action:inmenu", "New &View"), parent))
         , helpMenu(0)
         , recentFiles(0)
         , toolOptionsDocker(0)
         , deferredClosingEvent(0)
         , themeManager(0)
         , mdiArea(new QMdiArea(parent))
         , activeSubWindow(0)
         , windowMapper(new QSignalMapper(parent))
         , documentMapper(new QSignalMapper(parent))
         , lastExportSpecialOutputFlag(0)
         , geometryInitialized(false)
     {
     }
 
     ~Private() {
         qDeleteAll(toolbarList);
     }
 
     KisMainWindow *q;
     KisViewManager *viewManager;
 
     QPointer<KisView> activeView;
 
     QPointer<QProgressBar> progress;
     QPointer<QToolButton> progressCancel;
     QMutex progressMutex;
 
     QList<QAction *> toolbarList;
 
     bool firstTime;
     bool windowSizeDirty;
     bool readOnly;
     bool isImporting;
     bool isExporting;
     bool noCleanup;
 
     KisAction *showDocumentInfo;
     KisAction *saveAction;
     KisAction *saveActionAs;
 //    KisAction *printAction;
 //    KisAction *printActionPreview;
     KisAction *exportPdf;
     KisAction *importAnimation;
     KisAction *exportAnimation;
     KisAction *closeAll;
 //    KisAction *reloadFile;
     KisAction *importFile;
     KisAction *exportFile;
     KisAction *undo;
     KisAction *redo;
     KisAction *newWindow;
     KisAction *close;
     KisAction *mdiCascade;
     KisAction *mdiTile;
     KisAction *mdiNextWindow;
     KisAction *mdiPreviousWindow;
     KisAction *toggleDockers;
     KisAction *toggleDockerTitleBars;
 
     KisAction *expandingSpacers[2];
 
     KActionMenu *dockWidgetMenu;
     KActionMenu *windowMenu;
     KActionMenu *documentMenu;
 
     KHelpMenu *helpMenu;
 
     KRecentFilesAction *recentFiles;
 
     QUrl lastExportUrl;
 
     QMap<QString, QDockWidget *> dockWidgetsMap;
     QMap<QDockWidget *, bool> dockWidgetVisibilityMap;
     QByteArray dockerStateBeforeHiding;
     KoToolDocker *toolOptionsDocker;
 
     QCloseEvent *deferredClosingEvent;
 
     Digikam::ThemeManager *themeManager;
 
     QMdiArea *mdiArea;
     QMdiSubWindow *activeSubWindow;
     QSignalMapper *windowMapper;
     QSignalMapper *documentMapper;
 
     QByteArray lastExportedFormat;
     int lastExportSpecialOutputFlag;
     QScopedPointer<KisSignalCompressorWithParam<int> > tabSwitchCompressor;
     bool geometryInitialized;
     QMutex savingEntryMutex;
 
     KisActionManager * actionManager() {
         return viewManager->actionManager();
     }
 
     QTabBar* findTabBarHACK() {
         QObjectList objects = mdiArea->children();
         Q_FOREACH (QObject *object, objects) {
             QTabBar *bar = qobject_cast<QTabBar*>(object);
             if (bar) {
                 return bar;
             }
         }
         return 0;
     }
 };
 
 KisMainWindow::KisMainWindow()
     : KXmlGuiWindow()
     , d(new Private(this))
 {
     KisConfig cfg;
 
     d->viewManager = new KisViewManager(this, actionCollection());
     KConfigGroup group( KSharedConfig::openConfig(), "theme");
     d->themeManager = new Digikam::ThemeManager(group.readEntry("Theme", "Krita dark"), this);
 
     setAcceptDrops(true);
     setStandardToolBarMenuEnabled(true);
     setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North);
     setDockNestingEnabled(true);
 
     qApp->setStartDragDistance(25);     // 25 px is a distance that works well for Tablet and Mouse events
 
 #ifdef Q_OS_MAC
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
 
     connect(this, SIGNAL(restoringDone()), this, SLOT(forceDockTabFonts()));
     connect(this, SIGNAL(documentSaved()), d->viewManager, SLOT(slotDocumentSaved()));
     connect(this, SIGNAL(themeChanged()), d->viewManager, SLOT(updateIcons()));
     connect(KisPart::instance(), SIGNAL(documentClosed(QString)), SLOT(updateWindowMenu()));
     connect(KisPart::instance(), SIGNAL(documentOpened(QString)), SLOT(updateWindowMenu()));
     connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), this, SLOT(configChanged()));
 
     actionCollection()->addAssociatedWidget(this);
 
     KoToolBoxFactory toolBoxFactory;
     QDockWidget *toolbox = createDockWidget(&toolBoxFactory);
     toolbox->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
     if (cfg.toolOptionsInDocker()) {
         ToolDockerFactory toolDockerFactory;
         d->toolOptionsDocker = qobject_cast<KoToolDocker*>(createDockWidget(&toolDockerFactory));
         d->toolOptionsDocker->toggleViewAction()->setEnabled(true);
     }
 
     QMap<QString, QAction*> dockwidgetActions;
     dockwidgetActions[toolbox->toggleViewAction()->text()] = toolbox->toggleViewAction();
     Q_FOREACH (const QString & docker, KoDockRegistry::instance()->keys()) {
         KoDockFactoryBase *factory = KoDockRegistry::instance()->value(docker);
         QDockWidget *dw = createDockWidget(factory);
         dockwidgetActions[dw->toggleViewAction()->text()] = dw->toggleViewAction();
     }
 
     if (d->toolOptionsDocker) {
         dockwidgetActions[d->toolOptionsDocker->toggleViewAction()->text()] = d->toolOptionsDocker->toggleViewAction();
     }
     connect(KoToolManager::instance(), SIGNAL(toolOptionWidgetsChanged(QList<QPointer<QWidget> >)), this, SLOT(newOptionWidgets(QList<QPointer<QWidget> >)));
 
     Q_FOREACH (QString title, dockwidgetActions.keys()) {
         d->dockWidgetMenu->addAction(dockwidgetActions[title]);
     }
 
 
     Q_FOREACH (QDockWidget *wdg, dockWidgets()) {
         if ((wdg->features() & QDockWidget::DockWidgetClosable) == 0) {
             wdg->setVisible(true);
         }
     }
 
     Q_FOREACH (KoCanvasObserverBase* observer, canvasObservers()) {
         observer->setObservedCanvas(0);
         KisMainwindowObserver* mainwindowObserver = dynamic_cast<KisMainwindowObserver*>(observer);
         if (mainwindowObserver) {
             mainwindowObserver->setMainWindow(d->viewManager);
         }
     }
 
     d->mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     d->mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     d->mdiArea->setTabPosition(QTabWidget::North);
     d->mdiArea->setTabsClosable(true);
 
     setCentralWidget(d->mdiArea);
 
     connect(d->mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(subWindowActivated()));
     connect(d->windowMapper, SIGNAL(mapped(QWidget*)), this, SLOT(setActiveSubWindow(QWidget*)));
     connect(d->documentMapper, SIGNAL(mapped(QObject*)), this, SLOT(newView(QObject*)));
 
     createActions();
 
     setAutoSaveSettings("krita", false);
 
     KoPluginLoader::instance()->load("Krita/ViewPlugin",
                                      "Type == 'Service' and ([X-Krita-Version] == 28)",
                                      KoPluginLoader::PluginsConfig(),
                                      viewManager(),
                                      false);
 
     subWindowActivated();
     updateWindowMenu();
 
 
     if (isHelpMenuEnabled() && !d->helpMenu) {
         // workaround for KHelpMenu (or rather KAboutData::applicationData()) internally
         // not using the Q*Application metadata ATM, which results e.g. in the bugreport wizard
         // not having the app version preset
         // fixed hopefully in KF5 5.22.0, patch pending
         QGuiApplication *app = qApp;
         KAboutData aboutData(app->applicationName(), app->applicationDisplayName(), app->applicationVersion());
         aboutData.setOrganizationDomain(app->organizationDomain().toUtf8());
         d->helpMenu = new KHelpMenu(this, aboutData, false);
         // workaround-less version:
         // d->helpMenu = new KHelpMenu(this, QString()/*unused*/, false);
 
         // The difference between using KActionCollection->addAction() is that
         // these actions do not get tied to the MainWindow.  What does this all do?
         KActionCollection *actions = d->viewManager->actionCollection();
         QAction *helpContentsAction = d->helpMenu->action(KHelpMenu::menuHelpContents);
         QAction *whatsThisAction = d->helpMenu->action(KHelpMenu::menuWhatsThis);
         QAction *reportBugAction = d->helpMenu->action(KHelpMenu::menuReportBug);
         QAction *switchLanguageAction = d->helpMenu->action(KHelpMenu::menuSwitchLanguage);
         QAction *aboutAppAction = d->helpMenu->action(KHelpMenu::menuAboutApp);
         QAction *aboutKdeAction = d->helpMenu->action(KHelpMenu::menuAboutKDE);
 
         if (helpContentsAction) {
             actions->addAction(helpContentsAction->objectName(), helpContentsAction);
         }
         if (whatsThisAction) {
             actions->addAction(whatsThisAction->objectName(), whatsThisAction);
         }
         if (reportBugAction) {
             actions->addAction(reportBugAction->objectName(), reportBugAction);
         }
         if (switchLanguageAction) {
             actions->addAction(switchLanguageAction->objectName(), switchLanguageAction);
         }
         if (aboutAppAction) {
             actions->addAction(aboutAppAction->objectName(), aboutAppAction);
         }
         if (aboutKdeAction) {
             actions->addAction(aboutKdeAction->objectName(), aboutKdeAction);
         }
 
         connect(d->helpMenu, SIGNAL(showAboutApplication()), SLOT(showAboutApplication()));
     }
 
     // KDE' libs 4''s help contents action is broken outside kde, for some reason... We can handle it just as easily ourselves
     QAction *helpAction = actionCollection()->action("help_contents");
     helpAction->disconnect();
     connect(helpAction, SIGNAL(triggered()), this, SLOT(showManual()));
 
 
 #if 0
     //check for colliding shortcuts
     QSet<QKeySequence> existingShortcuts;
     Q_FOREACH (QAction* action, actionCollection()->actions()) {
         if(action->shortcut() == QKeySequence(0)) {
             continue;
         }
         dbgKrita << "shortcut " << action->text() << " " << action->shortcut();
         Q_ASSERT(!existingShortcuts.contains(action->shortcut()));
         existingShortcuts.insert(action->shortcut());
     }
 #endif
 
     configChanged();
 
     // If we have customized the toolbars, load that first
     setLocalXMLFile(KoResourcePaths::locateLocal("data", "krita.xmlgui"));
     setXMLFile(":/kxmlgui5/krita.xmlgui");
 
     guiFactory()->addClient(this);
 
     // Create and plug toolbar list for Settings menu
     QList<QAction *> toolbarList;
     Q_FOREACH (QWidget* it, guiFactory()->containers("ToolBar")) {
         KToolBar * toolBar = ::qobject_cast<KToolBar *>(it);
 
         if (toolBar) {
             if (toolBar->objectName() == "BrushesAndStuff") {
                 toolBar->setEnabled(false);
             }
 
             KToggleAction* act = new KToggleAction(i18n("Show %1 Toolbar", toolBar->windowTitle()), this);
             actionCollection()->addAction(toolBar->objectName().toUtf8(), act);
             act->setCheckedState(KGuiItem(i18n("Hide %1 Toolbar", toolBar->windowTitle())));
             connect(act, SIGNAL(toggled(bool)), this, SLOT(slotToolbarToggled(bool)));
             act->setChecked(!toolBar->isHidden());
             toolbarList.append(act);
         } else
             warnUI << "Toolbar list contains a " << it->metaObject()->className() << " which is not a toolbar!";
     }
     plugActionList("toolbarlist", toolbarList);
     setToolbarList(toolbarList);
 
     applyToolBarLayout();
 
     d->viewManager->updateGUI();
     d->viewManager->updateIcons();
 
 #ifdef Q_OS_WIN
     auto w = qApp->activeWindow();
     if (w) QWindowsWindowFunctions::setHasBorderInFullScreen(w->windowHandle(), true);
 #endif
 
     QTimer::singleShot(1000, this, SLOT(checkSanity()));
 
     {
         using namespace std::placeholders; // For _1 placeholder
         std::function<void (int)> callback(
             std::bind(&KisMainWindow::switchTab, this, _1));
 
         d->tabSwitchCompressor.reset(
             new KisSignalCompressorWithParam<int>(500, callback, KisSignalCompressor::FIRST_INACTIVE));
     }
 
 
 
 }
 
 void KisMainWindow::setNoCleanup(bool noCleanup)
 {
     d->noCleanup = noCleanup;
 }
 
 KisMainWindow::~KisMainWindow()
 {
 //    Q_FOREACH (QAction *ac, actionCollection()->actions()) {
 //        QAction *action = qobject_cast<QAction*>(ac);
 //        if (action) {
 //        dbgKrita << "<Action"
 //                 << "name=" << action->objectName()
 //                 << "icon=" << action->icon().name()
 //                 << "text="  << action->text().replace("&", "&amp;")
 //                 << "whatsThis="  << action->whatsThis()
 //                 << "toolTip="  << action->toolTip().replace("<html>", "").replace("</html>", "")
 //                 << "iconText="  << action->iconText().replace("&", "&amp;")
 //                 << "shortcut="  << action->shortcut(QAction::ActiveShortcut).toString()
 //                 << "defaultShortcut="  << action->shortcut(QAction::DefaultShortcut).toString()
 //                 << "isCheckable="  << QString((action->isChecked() ? "true" : "false"))
 //                 << "statusTip=" << action->statusTip()
 //                 << "/>"   ;
 //        }
 //        else {
 //            dbgKrita << "Got a QAction:" << ac->objectName();
 //        }
 
 //    }
 
     // The doc and view might still exist (this is the case when closing the window)
     KisPart::instance()->removeMainWindow(this);
 
     if (d->noCleanup)
         return;
 
     delete d->viewManager;
     delete d;
 
 }
 
 void KisMainWindow::addView(KisView *view)
 {
     if (d->activeView == view) return;
 
     if (d->activeView) {
         d->activeView->disconnect(this);
     }
 
     showView(view);
     updateCaption();
     emit restoringDone();
 
     if (d->activeView) {
         connect(d->activeView, SIGNAL(titleModified(QString,bool)), SLOT(slotDocumentTitleModified(QString,bool)));
     }
 }
 
 void KisMainWindow::showView(KisView *imageView)
 {
     if (imageView && activeView() != imageView) {
         // XXX: find a better way to initialize this!
         imageView->setViewManager(d->viewManager);
         imageView->canvasBase()->setFavoriteResourceManager(d->viewManager->paintOpBox()->favoriteResourcesManager());
         imageView->slotLoadingFinished();
 
         QMdiSubWindow *subwin = d->mdiArea->addSubWindow(imageView);
         subwin->setAttribute(Qt::WA_DeleteOnClose, true);
         connect(subwin, SIGNAL(destroyed()), SLOT(updateWindowMenu()));
 
         KisConfig cfg;
         subwin->setOption(QMdiSubWindow::RubberBandMove, cfg.readEntry<int>("mdi_rubberband", cfg.useOpenGL()));
         subwin->setOption(QMdiSubWindow::RubberBandResize, cfg.readEntry<int>("mdi_rubberband", cfg.useOpenGL()));
         subwin->setWindowIcon(qApp->windowIcon());
 
         /**
          * Hack alert!
          *
          * Here we explicitly request KoToolManager to emit all the tool
          * activation signals, to reinitialize the tool options docker.
          *
          * That is needed due to a design flaw we have in the
          * initialization procedure.  The tool in the KoToolManager is
          * initialized in KisView::setViewManager() calls, which
          * happens early enough. During this call the tool manager
          * requests KoCanvasControllerWidget to emit the signal to
          * update the widgets in the tool docker. *But* at that moment
          * of time the view is not yet connected to the main window,
          * because it happens in KisViewManager::setCurrentView a bit
          * later. This fact makes the widgets updating signals be lost
          * and never reach the tool docker.
          *
          * So here we just explicitly call the tool activation stub.
          */
 
         KoToolManager::instance()->initializeCurrentToolForCanvas();
 
         if (d->mdiArea->subWindowList().size() == 1) {
             imageView->showMaximized();
         }
         else {
             imageView->show();
         }
 
         // No, no, no: do not try to call this _before_ the show() has
         // been called on the view; only when that has happened is the
         // opengl context active, and very bad things happen if we tell
         // the dockers to update themselves with a view if the opengl
         // context is not active.
         setActiveView(imageView);
 
         updateWindowMenu();
         updateCaption();
     }
 }
 
 void KisMainWindow::slotPreferences()
 {
     if (KisDlgPreferences::editPreferences()) {
         KisConfigNotifier::instance()->notifyConfigChanged();
 
         // XXX: should this be changed for the views in other windows as well?
         Q_FOREACH (QPointer<KisView> koview, KisPart::instance()->views()) {
             KisViewManager *view = qobject_cast<KisViewManager*>(koview);
             if (view) {
                 // Update the settings for all nodes -- they don't query
                 // KisConfig directly because they need the settings during
                 // compositing, and they don't connect to the config notifier
                 // because nodes are not QObjects (because only one base class
                 // can be a QObject).
                 KisNode* node = dynamic_cast<KisNode*>(view->image()->rootLayer().data());
                 node->updateSettings();
             }
 
         }
 
         d->viewManager->showHideScrollbars();
     }
 }
 
 void KisMainWindow::slotThemeChanged()
 {
     // save theme changes instantly
     KConfigGroup group( KSharedConfig::openConfig(), "theme");
     group.writeEntry("Theme", d->themeManager->currentThemeName());
 
     // reload action icons!
     Q_FOREACH (QAction *action, actionCollection()->actions()) {
         KisIconUtils::updateIcon(action);
     }
 
     emit themeChanged();
 }
 
 void KisMainWindow::updateReloadFileAction(KisDocument *doc)
 {
     Q_UNUSED(doc);
 //    d->reloadFile->setEnabled(doc && !doc->url().isEmpty());
 }
 
 void KisMainWindow::setReadWrite(bool readwrite)
 {
     d->saveAction->setEnabled(readwrite);
     d->importFile->setEnabled(readwrite);
     d->readOnly = !readwrite;
     updateCaption();
 }
 
 void KisMainWindow::addRecentURL(const QUrl &url)
 {
     dbgUI << "KisMainWindow::addRecentURL url=" << url.toDisplayString();
     // Add entry to recent documents list
     // (call coming from KisDocument because it must work with cmd line, template dlg, file/open, etc.)
     if (!url.isEmpty()) {
         bool ok = true;
         if (url.isLocalFile()) {
             QString path = url.adjusted(QUrl::StripTrailingSlash).toLocalFile();
             const QStringList tmpDirs = KoResourcePaths::resourceDirs("tmp");
             for (QStringList::ConstIterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it)
                 if (path.contains(*it))
                     ok = false; // it's in the tmp resource
 #ifdef HAVE_KIO
             if (ok) {
                 KRecentDocument::add(QUrl::fromLocalFile(path));
             }
 #endif
         }
 #ifdef HAVE_KIO
         else {
             KRecentDocument::add(url.adjusted(QUrl::StripTrailingSlash));
         }
 #endif
         if (ok) {
             d->recentFiles->addUrl(url);
         }
         saveRecentFiles();
 
     }
 }
 
 void KisMainWindow::saveRecentFiles()
 {
     // Save list of recent files
     KSharedConfigPtr config =  KSharedConfig::openConfig();
     d->recentFiles->saveEntries(config->group("RecentFiles"));
     config->sync();
 
     // Tell all windows to reload their list, after saving
     // Doesn't work multi-process, but it's a start
     Q_FOREACH (KMainWindow* window, KMainWindow::memberList())
         static_cast<KisMainWindow *>(window)->reloadRecentFileList();
 }
 
 void KisMainWindow::reloadRecentFileList()
 {
     d->recentFiles->loadEntries( KSharedConfig::openConfig()->group("RecentFiles"));
 }
 
 void KisMainWindow::updateCaption()
 {
     if (!d->mdiArea->activeSubWindow()) {
         updateCaption(QString(), false);
     }
     else {
         QString caption( d->activeView->document()->caption() );
         if (d->readOnly) {
             caption += ' ' + i18n("(write protected)");
         }
 
         d->activeView->setWindowTitle(caption);
 
         updateCaption(caption, d->activeView->document()->isModified());
 
         if (!d->activeView->document()->url().fileName().isEmpty())
             d->saveAction->setToolTip(i18n("Save as %1", d->activeView->document()->url().fileName()));
         else
             d->saveAction->setToolTip(i18n("Save"));
     }
 }
 
 void KisMainWindow::updateCaption(const QString & caption, bool mod)
 {
     dbgUI << "KisMainWindow::updateCaption(" << caption << "," << mod << ")";
 #ifdef KRITA_ALPHA
     setCaption(QString("ALPHA %1: %2").arg(KRITA_ALPHA).arg(caption), mod);
     return;
 #endif
 #ifdef KRITA_BETA
     setCaption(QString("BETA %1: %2").arg(KRITA_BETA).arg(caption), mod);
     return;
 #endif
 #ifdef KRITA_RC
     setCaption(QString("RELEASE CANDIDATE %1: %2").arg(KRITA_RC).arg(caption), mod);
     return;
 #endif
 
     setCaption(caption, mod);
 }
 
 
 KisView *KisMainWindow::activeView() const
 {
     if (d->activeView) {
         return d->activeView;
     }
     return 0;
 }
 
 bool KisMainWindow::openDocument(const QUrl &url)
 {
     if (!QFile(url.toLocalFile()).exists()) {
         QMessageBox::critical(0, i18nc("@title:window", "Krita"), i18n("The file %1 does not exist.", url.url()));
         d->recentFiles->removeUrl(url); //remove the file from the recent-opened-file-list
         saveRecentFiles();
         return false;
     }
     return openDocumentInternal(url);
 }
 
 bool KisMainWindow::openDocumentInternal(const QUrl &url, KisDocument *newdoc)
 {
     if (!url.isLocalFile()) {
         qDebug() << "KisMainWindow::openDocumentInternal. Not a local file:" << url;
         return false;
     }
 
     if (!newdoc) {
         newdoc = KisPart::instance()->createDocument();
     }
 
     d->firstTime = true;
     connect(newdoc, SIGNAL(sigProgress(int)), this, SLOT(slotProgress(int)));
     connect(newdoc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
     connect(newdoc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
     bool openRet = (!isImporting()) ? newdoc->openUrl(url) : newdoc->importDocument(url);
     if (!openRet) {
         delete newdoc;
         return false;
     }
 
     KisPart::instance()->addDocument(newdoc);
     updateReloadFileAction(newdoc);
 
     if (!QFileInfo(url.toLocalFile()).isWritable()) {
         setReadWrite(false);
     }
     return true;
 }
 
 void KisMainWindow::addViewAndNotifyLoadingCompleted(KisDocument *document)
 {
     KisView *view = KisPart::instance()->createView(document, resourceManager(), actionCollection(), this);
     addView(view);
 
     emit guiLoadingFinished();
 }
 
 QStringList KisMainWindow::showOpenFileDialog()
 {
     KoFileDialog dialog(this, KoFileDialog::ImportFiles, "OpenDocument");
     dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation));
     dialog.setMimeTypeFilters(KisImportExportManager::mimeFilter(KisImportExportManager::Import));
     dialog.setCaption(isImporting() ? i18n("Import Images") : i18n("Open Images"));
 
     return dialog.filenames();
 }
 
 // Separate from openDocument to handle async loading (remote URLs)
 void KisMainWindow::slotLoadCompleted()
 {
     KisDocument *newdoc = qobject_cast<KisDocument*>(sender());
 
     addViewAndNotifyLoadingCompleted(newdoc);
 
     disconnect(newdoc, SIGNAL(sigProgress(int)), this, SLOT(slotProgress(int)));
     disconnect(newdoc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
     disconnect(newdoc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
 
     emit loadCompleted();
 }
 
 void KisMainWindow::slotLoadCanceled(const QString & errMsg)
 {
     dbgUI << "KisMainWindow::slotLoadCanceled";
     if (!errMsg.isEmpty())   // empty when canceled by user
         QMessageBox::critical(this, i18nc("@title:window", "Krita"), errMsg);
     // ... can't delete the document, it's the one who emitted the signal...
 
     KisDocument* doc = qobject_cast<KisDocument*>(sender());
     Q_ASSERT(doc);
     disconnect(doc, SIGNAL(sigProgress(int)), this, SLOT(slotProgress(int)));
     disconnect(doc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
     disconnect(doc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
 }
 
 void KisMainWindow::slotSaveCanceled(const QString &errMsg)
 {
     dbgUI << "KisMainWindow::slotSaveCanceled";
     if (!errMsg.isEmpty())   // empty when canceled by user
         QMessageBox::critical(this, i18nc("@title:window", "Krita"), errMsg);
     slotSaveCompleted();
 }
 
 void KisMainWindow::slotSaveCompleted()
 {
     dbgUI << "KisMainWindow::slotSaveCompleted";
     KisDocument* doc = qobject_cast<KisDocument*>(sender());
     Q_ASSERT(doc);
     disconnect(doc, SIGNAL(sigProgress(int)), this, SLOT(slotProgress(int)));
     disconnect(doc, SIGNAL(completed()), this, SLOT(slotSaveCompleted()));
     disconnect(doc, SIGNAL(canceled(const QString &)), this, SLOT(slotSaveCanceled(const QString &)));
 
     if (d->deferredClosingEvent) {
         KXmlGuiWindow::closeEvent(d->deferredClosingEvent);
     }
 }
 
 bool KisMainWindow::saveDocument(KisDocument *document, bool saveas, bool silent, int specialOutputFlag)
 {
     if (!document) {
         return true;
     }
 
     /**
      * Make sure that we cannot enter this method twice!
      *
      * The lower level functions may call processEvents() so
      * double-entry is quite possible to achive. Here we try to lock
      * the mutex, and if it is failed, just cancel saving.
      */
     StdLockableWrapper<QMutex> wrapper(&d->savingEntryMutex);
     std::unique_lock<StdLockableWrapper<QMutex>> l(wrapper, std::try_to_lock);
     if (!l.owns_lock()) return false;
 
     KisDelayedSaveDialog dlg(document->image(), this);
     dlg.blockIfImageIsBusy();
 
     if (dlg.result() != QDialog::Accepted) {
         return false;
     }
 
     bool reset_url;
 
     if (document->url().isEmpty()) {
         reset_url = true;
         saveas = true;
     } else {
         reset_url = false;
     }
 
     connect(document, SIGNAL(sigProgress(int)), this, SLOT(slotProgress(int)));
     connect(document, SIGNAL(completed()), this, SLOT(slotSaveCompleted()));
     connect(document, SIGNAL(canceled(const QString &)), this, SLOT(slotSaveCanceled(const QString &)));
 
     QUrl oldURL = document->url();
     QString oldFile = document->localFilePath();
 
     QByteArray _native_format = document->nativeFormatMimeType();
     QByteArray oldOutputFormat = document->outputMimeType();
 
     int oldSpecialOutputFlag = document->specialOutputFlag();
 
     QUrl suggestedURL = document->url();
 
     QStringList mimeFilter;
 
     if (specialOutputFlag) {
         mimeFilter = KisMimeDatabase::suffixesForMimeType(_native_format);
     }
     else {
         mimeFilter = KisImportExportManager::mimeFilter(KisImportExportManager::Export);
     }
 
 
     if (!mimeFilter.contains(oldOutputFormat) && !isExporting()) {
         dbgUI << "KisMainWindow::saveDocument no export filter for" << oldOutputFormat;
 
         // --- don't setOutputMimeType in case the user cancels the Save As
         // dialog and then tries to just plain Save ---
 
         // suggest a different filename extension (yes, we fortunately don't all live in a world of magic :))
         QString suggestedFilename = suggestedURL.fileName();
 
         if (!suggestedFilename.isEmpty()) {  // ".kra" looks strange for a name
             int c = suggestedFilename.lastIndexOf('.');
 
             const QString ext = KisMimeDatabase::suffixesForMimeType(_native_format).first();
             if (!ext.isEmpty()) {
                 if (c < 0)
                     suggestedFilename = suggestedFilename + "." + ext;
                 else
                     suggestedFilename = suggestedFilename.left(c) + "." + ext;
             } else { // current filename extension wrong anyway
                 if (c > 0) {
                     // this assumes that a . signifies an extension, not just a .
                     suggestedFilename = suggestedFilename.left(c);
                 }
             }
 
             suggestedURL = suggestedURL.adjusted(QUrl::RemoveFilename);
             suggestedURL.setPath(suggestedURL.path() + suggestedFilename);
         }
 
         // force the user to choose outputMimeType
         saveas = true;
     }
 
     bool ret = false;
 
     if (document->url().isEmpty() || saveas) {
         // if you're just File/Save As'ing to change filter options you
         // don't want to be reminded about overwriting files etc.
         bool justChangingFilterOptions = false;
 
         KoFileDialog dialog(this, KoFileDialog::SaveFile, "SaveDocument");
         dialog.setCaption(i18n("untitled"));
         if (isExporting() && !d->lastExportUrl.isEmpty()) {
             dialog.setDefaultDir(d->lastExportUrl.toLocalFile(), true);
         }
         else {
             dialog.setDefaultDir(suggestedURL.toLocalFile(), true);
         }
         // Default to all supported file types if user is exporting, otherwise use Krita default
-        dialog.setMimeTypeFilters(mimeFilter);
+        dialog.setMimeTypeFilters(mimeFilter, QString(_native_format));
         QUrl newURL = QUrl::fromUserInput(dialog.filename());
 
         if (newURL.isLocalFile()) {
             QString fn = newURL.toLocalFile();
             if (QFileInfo(fn).completeSuffix().isEmpty()) {
                 fn.append(KisMimeDatabase::suffixesForMimeType(_native_format).first());
                 newURL = QUrl::fromLocalFile(fn);
             }
         }
 
         if (document->documentInfo()->aboutInfo("title") == i18n("Unnamed")) {
             QString fn = newURL.toLocalFile();
             QFileInfo info(fn);
             document->documentInfo()->setAboutInfo("title", info.baseName());
         }
 
         QByteArray outputFormat = _native_format;
 
         if (!specialOutputFlag) {
             QString outputFormatString = KisMimeDatabase::mimeTypeForFile(newURL.toLocalFile());
             outputFormat = outputFormatString.toLatin1();
         }
 
         if (!isExporting())
             justChangingFilterOptions = (newURL == document->url()) &&
                     (outputFormat == document->mimeType()) &&
                     (specialOutputFlag == oldSpecialOutputFlag);
         else
             justChangingFilterOptions = (newURL == d->lastExportUrl) &&
                     (outputFormat == d->lastExportedFormat) &&
                     (specialOutputFlag == d->lastExportSpecialOutputFlag);
 
 
         bool bOk = true;
         if (newURL.isEmpty()) {
             bOk = false;
         }
 
         // adjust URL before doing checks on whether the file exists.
         if (specialOutputFlag) {
             QString fileName = newURL.fileName();
             if ( specialOutputFlag== KisDocument::SaveAsDirectoryStore) {
                 //dbgKrita << "save to directory: " << newURL.url();
             }
         }
 
         if (bOk) {
             bool wantToSave = true;
 
             // don't change this line unless you know what you're doing :)
             if (!justChangingFilterOptions || document->confirmNonNativeSave(isExporting())) {
                 if (!document->isNativeFormat(outputFormat))
                     wantToSave = true;
             }
 
             if (wantToSave) {
                 //
                 // Note:
                 // If the user is stupid enough to Export to the current URL,
                 // we do _not_ change this operation into a Save As.  Reasons
                 // follow:
                 //
                 // 1. A check like "isExporting() && oldURL == newURL"
                 //    doesn't _always_ work on case-insensitive filesystems
                 //    and inconsistent behaviour is bad.
                 // 2. It is probably not a good idea to change document->mimeType
                 //    and friends because the next time the user File/Save's,
                 //    (not Save As) they won't be expecting that they are
                 //    using their File/Export settings
                 //
                 // As a bad side-effect of this, the modified flag will not
                 // be updated and it is possible that what is currently on
                 // their screen is not what is stored on disk (through loss
                 // of formatting).  But if you are dumb enough to change
                 // mimetype but not the filename, then arguably, _you_ are
                 // the "bug" :)
                 //
                 // - Clarence
                 //
                 document->setOutputMimeType(outputFormat, specialOutputFlag);
                 if (!isExporting()) {  // Save As
                     ret = document->saveAs(newURL);
 
                     if (ret) {
                         dbgUI << "Successful Save As!";
                         addRecentURL(newURL);
                         setReadWrite(true);
                     } else {
                         dbgUI << "Failed Save As!";
                         document->setUrl(oldURL);
                         document->setLocalFilePath(oldFile);
                         document->setOutputMimeType(oldOutputFormat, oldSpecialOutputFlag);
                     }
                 } else { // Export
                     ret = document->exportDocument(newURL);
 
                     if (ret) {
                         // a few file dialog convenience things
                         d->lastExportUrl = newURL;
                         d->lastExportedFormat = outputFormat;
                         d->lastExportSpecialOutputFlag = specialOutputFlag;
                     }
 
                     // always restore output format
                     document->setOutputMimeType(oldOutputFormat, oldSpecialOutputFlag);
                 }
 
                 if (silent) // don't let the document change the window caption
                     document->setTitleModified();
             }   // if (wantToSave)  {
             else
                 ret = false;
         }   // if (bOk) {
         else
             ret = false;
     } else { // saving
 
         bool needConfirm = document->confirmNonNativeSave(false) && !document->isNativeFormat(oldOutputFormat);
 
         if (!needConfirm ||
                 (needConfirm && exportConfirmation(oldOutputFormat /* not so old :) */))
                 ) {
             // be sure document has the correct outputMimeType!
             if (isExporting() || document->isModified()) {
                 ret = document->save();
             }
 
             if (!ret) {
                 dbgUI << "Failed Save!";
                 document->setUrl(oldURL);
                 document->setLocalFilePath(oldFile);
             }
         } else
             ret = false;
     }
 
 
     if (!ret && reset_url)
         document->resetURL(); //clean the suggested filename as the save dialog was rejected
 
     updateReloadFileAction(document);
     updateCaption();
 
     return ret;
 }
 
 bool KisMainWindow::exportConfirmation(const QByteArray &/*outputFormat*/)
 {
     return true;
 }
 
 void KisMainWindow::undo()
 {
     if (activeView()) {
         activeView()->undoAction()->trigger();
         d->undo->setText(activeView()->undoAction()->text());
     }
 }
 
 void KisMainWindow::redo()
 {
     if (activeView()) {
         activeView()->redoAction()->trigger();
         d->redo->setText(activeView()->redoAction()->text());
     }
 }
 
 void KisMainWindow::showEvent(QShowEvent *e)
 {
     KXmlGuiWindow::showEvent(e);
 
     if (!d->geometryInitialized) {
         /**
          * We should move the window only *after* it has been shown on
          * screen, otherwise it will become owned by a wrong screen, which
          * will make positioning of all the child widgets wrong.
          * (see bug https://bugs.kde.org/show_bug.cgi?id=362025)
          *
          * This is actually a bug/feature of Qt 5.5.x and it has been
          * fixed in Qt 5.6.0. So we can avoid this delay on newer versions
          * of Qt.
          */
         QTimer::singleShot(1, this, SLOT(initializeGeometry()));
         d->geometryInitialized = true;
     }
 }
 
 void KisMainWindow::closeEvent(QCloseEvent *e)
 {
     d->mdiArea->closeAllSubWindows();
 
     QAction *action= d->viewManager->actionCollection()->action("view_show_canvas_only");
 
     if ((action) && (action->isChecked())) {
         action->setChecked(false);
     }
     KConfigGroup cfg( KSharedConfig::openConfig(), "MainWindow");
     cfg.writeEntry("ko_geometry", saveGeometry().toBase64());
     cfg.writeEntry("ko_windowstate", saveState().toBase64());
 
     {
         KConfigGroup group( KSharedConfig::openConfig(), "theme");
         group.writeEntry("Theme", d->themeManager->currentThemeName());
     }
 
 
     if(d->activeView && d->activeView->document() && d->activeView->document()->isLoading()) {
         e->setAccepted(false);
         return;
     }
 
     QList<QMdiSubWindow*> childrenList = d->mdiArea->subWindowList();
 
     if (childrenList.isEmpty()) {
         d->deferredClosingEvent = e;
 
         if (!d->dockerStateBeforeHiding.isEmpty()) {
             restoreState(d->dockerStateBeforeHiding);
         }
         statusBar()->setVisible(true);
         menuBar()->setVisible(true);
 
         saveWindowSettings();
 
         if (d->noCleanup)
             return;
 
         Q_FOREACH (QMdiSubWindow *subwin, d->mdiArea->subWindowList()) {
             KisView *view = dynamic_cast<KisView*>(subwin);
             if (view) {
                 KisPart::instance()->removeView(view);
             }
         }
 
         if (!d->dockWidgetVisibilityMap.isEmpty()) { // re-enable dockers for persistency
             Q_FOREACH (QDockWidget* dockWidget, d->dockWidgetsMap)
                 dockWidget->setVisible(d->dockWidgetVisibilityMap.value(dockWidget));
         }
     } else {
         e->setAccepted(false);
     }
 }
 
 void KisMainWindow::saveWindowSettings()
 {
     KSharedConfigPtr config =  KSharedConfig::openConfig();
 
     if (d->windowSizeDirty ) {
         dbgUI << "KisMainWindow::saveWindowSettings";
         KConfigGroup group = config->group("MainWindow");
         KWindowConfig::saveWindowSize(windowHandle(), group);
         config->sync();
         d->windowSizeDirty = false;
     }
 
     if (!d->activeView || d->activeView->document()) {
 
         // Save toolbar position into the config file of the app, under the doc's component name
         KConfigGroup group =  KSharedConfig::openConfig()->group("krita");
         saveMainWindowSettings(group);
 
         // Save collapsable state of dock widgets
         for (QMap<QString, QDockWidget*>::const_iterator i = d->dockWidgetsMap.constBegin();
              i != d->dockWidgetsMap.constEnd(); ++i) {
             if (i.value()->widget()) {
                 KConfigGroup dockGroup = group.group(QString("DockWidget ") + i.key());
                 dockGroup.writeEntry("Collapsed", i.value()->widget()->isHidden());
                 dockGroup.writeEntry("Locked", i.value()->property("Locked").toBool());
                 dockGroup.writeEntry("DockArea", (int) dockWidgetArea(i.value()));
                 dockGroup.writeEntry("xPosition", (int) i.value()->widget()->x());
                 dockGroup.writeEntry("yPosition", (int) i.value()->widget()->y());
 
                 dockGroup.writeEntry("width", (int) i.value()->widget()->width());
                 dockGroup.writeEntry("height", (int) i.value()->widget()->height());
             }
         }
 
     }
 
      KSharedConfig::openConfig()->sync();
     resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down
 
 }
 
 void KisMainWindow::resizeEvent(QResizeEvent * e)
 {
     d->windowSizeDirty = true;
     KXmlGuiWindow::resizeEvent(e);
 }
 
 void KisMainWindow::setActiveView(KisView* view)
 {
     d->activeView = view;
     updateCaption();
     actionCollection()->action("edit_undo")->setText(activeView()->undoAction()->text());
     actionCollection()->action("edit_redo")->setText(activeView()->redoAction()->text());
     d->viewManager->setCurrentView(view);
 }
 
 void KisMainWindow::dragEnterEvent(QDragEnterEvent *event)
 {
     if (event->mimeData()->hasUrls() ||
         event->mimeData()->hasFormat("application/x-krita-node") ||
         event->mimeData()->hasFormat("application/x-qt-image")) {
 
         event->accept();
     }
 }
 
 void KisMainWindow::dropEvent(QDropEvent *event)
 {
     if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() > 0) {
         Q_FOREACH (const QUrl &url, event->mimeData()->urls()) {
             openDocument(url);
         }
     }
 }
 
 void KisMainWindow::dragMoveEvent(QDragMoveEvent * event)
 {
     QTabBar *tabBar = d->findTabBarHACK();
 
     if (!tabBar && d->mdiArea->viewMode() == QMdiArea::TabbedView) {
         qWarning() << "WARNING!!! Cannot find QTabBar in the main window! Looks like Qt has changed behavior. Drag & Drop between multiple tabs might not work properly (tabs will not switch automatically)!";
     }
 
     if (tabBar && tabBar->isVisible()) {
         QPoint pos = tabBar->mapFromGlobal(mapToGlobal(event->pos()));
         if (tabBar->rect().contains(pos)) {
             const int tabIndex = tabBar->tabAt(pos);
 
             if (tabIndex >= 0 && tabBar->currentIndex() != tabIndex) {
                 d->tabSwitchCompressor->start(tabIndex);
             }
         } else if (d->tabSwitchCompressor->isActive()) {
             d->tabSwitchCompressor->stop();
         }
     }
 }
 
 void KisMainWindow::dragLeaveEvent(QDragLeaveEvent * /*event*/)
 {
     if (d->tabSwitchCompressor->isActive()) {
         d->tabSwitchCompressor->stop();
     }
 }
 
 void KisMainWindow::switchTab(int index)
 {
     QTabBar *tabBar = d->findTabBarHACK();
     if (!tabBar) return;
 
     tabBar->setCurrentIndex(index);
 }
 
 void KisMainWindow::slotFileNew()
 {
     KisOpenPane *startupWidget = 0;
 
     const QStringList mimeFilter = KisImportExportManager::mimeFilter(KisImportExportManager::Import);
 
     startupWidget = new KisOpenPane(this, mimeFilter, QStringLiteral("templates/"));
     startupWidget->setWindowModality(Qt::WindowModal);
 
     KisConfig cfg;
 
     int w = cfg.defImageWidth();
     int h = cfg.defImageHeight();
     const double resolution = cfg.defImageResolution();
     const QString colorModel = cfg.defColorModel();
     const QString colorDepth = cfg.defaultColorDepth();
     const QString colorProfile = cfg.defColorProfile();
 
 
     CustomDocumentWidgetItem item;
     item.widget = new KisCustomImageWidget(startupWidget,
                                            w,
                                            h,
                                            resolution,
                                            colorModel,
                                            colorDepth,
                                            colorProfile,
                                            i18n("Unnamed"));
 
     item.icon = "application-x-krita";
 
     startupWidget->addCustomDocumentWidget(item.widget, item.title, item.icon);
 
     QSize sz = KisClipboard::instance()->clipSize();
     if (sz.isValid() && sz.width() != 0 && sz.height() != 0) {
         w = sz.width();
         h = sz.height();
     }
 
     item.widget = new KisImageFromClipboard(startupWidget,
                                             w,
                                             h,
                                             resolution,
                                             colorModel,
                                             colorDepth,
                                             colorProfile,
                                             i18n("Unnamed"));
 
     item.title = i18n("Create from Clipboard");
     item.icon = "klipper";
 
     startupWidget->addCustomDocumentWidget(item.widget, item.title, item.icon);
 
     // calls deleteLater
     connect(startupWidget, SIGNAL(documentSelected(KisDocument*)), KisPart::instance(), SLOT(startCustomDocument(KisDocument*)));
     // calls deleteLater
     connect(startupWidget, SIGNAL(openTemplate(const QUrl&)), KisPart::instance(), SLOT(openTemplate(const QUrl&)));
 
     startupWidget->exec();
 
     // Cancel calls deleteLater...
 
 }
 
 void KisMainWindow::slotFileOpen()
 {
     QStringList urls = showOpenFileDialog();
 
     if (urls.isEmpty())
         return;
 
     Q_FOREACH (const QString& url, urls) {
 
         if (!url.isEmpty()) {
             bool res = openDocument(QUrl::fromLocalFile(url));
             if (!res) {
                 warnKrita << "Loading" << url << "failed";
             }
         }
     }
 }
 
 void KisMainWindow::slotFileOpenRecent(const QUrl &url)
 {
     (void) openDocument(QUrl(url));
 }
 
 void KisMainWindow::slotFileSave()
 {
     if (saveDocument(d->activeView->document()))
         emit documentSaved();
 }
 
 void KisMainWindow::slotFileSaveAs()
 {
     if (saveDocument(d->activeView->document(), true))
         emit documentSaved();
 }
 
 KoCanvasResourceManager *KisMainWindow::resourceManager() const
 {
     return d->viewManager->resourceProvider()->resourceManager();
 }
 
 int KisMainWindow::viewCount() const
 {
     return d->mdiArea->subWindowList().size();
 }
 
 bool KisMainWindow::restoreWorkspace(const QByteArray &state)
 {
     QByteArray oldState = saveState();
     const bool showTitlebars = KisConfig().showDockerTitleBars();
 
     // needed because otherwise the layout isn't correctly restored in some situations
     Q_FOREACH (QDockWidget *dock, dockWidgets()) {
         dock->hide();
         dock->titleBarWidget()->setVisible(showTitlebars);
     }
 
     bool success = KXmlGuiWindow::restoreState(state);
 
     if (!success) {
         KXmlGuiWindow::restoreState(oldState);
         Q_FOREACH (QDockWidget *dock, dockWidgets()) {
             if (dock->titleBarWidget()) {
                 dock->titleBarWidget()->setVisible(showTitlebars || dock->isFloating());
             }
         }
         return false;
     }
 
 
     Q_FOREACH (QDockWidget *dock, dockWidgets()) {
         if (dock->titleBarWidget()) {
             const bool isCollapsed = (dock->widget() && dock->widget()->isHidden()) || !dock->widget();
             dock->titleBarWidget()->setVisible(showTitlebars || (dock->isFloating() && isCollapsed));
         }
     }
 
     return success;
 }
 
 KisViewManager *KisMainWindow::viewManager() const
 {
     return d->viewManager;
 }
 
 void KisMainWindow::slotDocumentInfo()
 {
     if (!d->activeView->document())
         return;
 
     KoDocumentInfo *docInfo = d->activeView->document()->documentInfo();
 
     if (!docInfo)
         return;
 
     KoDocumentInfoDlg *dlg = d->activeView->document()->createDocumentInfoDialog(this, docInfo);
 
     if (dlg->exec()) {
         if (dlg->isDocumentSaved()) {
             d->activeView->document()->setModified(false);
         } else {
             d->activeView->document()->setModified(true);
         }
         d->activeView->document()->setTitleModified();
     }
 
     delete dlg;
 }
 
 bool KisMainWindow::slotFileCloseAll()
 {
     Q_FOREACH (QMdiSubWindow *subwin, d->mdiArea->subWindowList()) {
         if (subwin) {
             if(!subwin->close())
                 return false;
         }
     }
 
     updateCaption();
     return true;
 }
 
 void KisMainWindow::slotFileQuit()
 {
     if(!slotFileCloseAll())
         return;
 
     close();
 
     Q_FOREACH (QPointer<KisMainWindow> mainWin, KisPart::instance()->mainWindows()) {
         if (mainWin != this) {
             if(!mainWin->slotFileCloseAll())
                 return;
 
             mainWin->close();
         }
     }
 }
 
 void KisMainWindow::slotFilePrint()
 {
     if (!activeView())
         return;
     KisPrintJob *printJob = activeView()->createPrintJob();
     if (printJob == 0)
         return;
     applyDefaultSettings(printJob->printer());
     QPrintDialog *printDialog = activeView()->createPrintDialog( printJob, this );
     if (printDialog && printDialog->exec() == QDialog::Accepted) {
         printJob->printer().setPageMargins(0.0, 0.0, 0.0, 0.0, QPrinter::Point);
         printJob->printer().setPaperSize(QSizeF(activeView()->image()->width() / (72.0 * activeView()->image()->xRes()),
                                                 activeView()->image()->height()/ (72.0 * activeView()->image()->yRes())),
                                          QPrinter::Inch);
         printJob->startPrinting(KisPrintJob::DeleteWhenDone);
     }
     else {
         delete printJob;
     }
     delete printDialog;
 }
 
 void KisMainWindow::slotFilePrintPreview()
 {
     if (!activeView())
         return;
     KisPrintJob *printJob = activeView()->createPrintJob();
     if (printJob == 0)
         return;
 
     /* Sets the startPrinting() slot to be blocking.
      The Qt print-preview dialog requires the printing to be completely blocking
      and only return when the full document has been printed.
      By default the KisPrintingDialog is non-blocking and
      multithreading, setting blocking to true will allow it to be used in the preview dialog */
     printJob->setProperty("blocking", true);
     QPrintPreviewDialog *preview = new QPrintPreviewDialog(&printJob->printer(), this);
     printJob->setParent(preview); // will take care of deleting the job
     connect(preview, SIGNAL(paintRequested(QPrinter*)), printJob, SLOT(startPrinting()));
     preview->exec();
     delete preview;
 }
 
 KisPrintJob* KisMainWindow::exportToPdf(const QString &pdfFileName)
 {
     if (!activeView())
         return 0;
     KoPageLayout pageLayout;
     pageLayout = activeView()->pageLayout();
     return exportToPdf(pageLayout, pdfFileName);
 }
 
 KisPrintJob* KisMainWindow::exportToPdf(KoPageLayout pageLayout, QString pdfFileName)
 {
     if (!activeView())
         return 0;
     if (!activeView()->document())
         return 0;
 
     if (pdfFileName.isEmpty()) {
         KConfigGroup group =  KSharedConfig::openConfig()->group("File Dialogs");
         QString defaultDir = group.readEntry("SavePdfDialog");
         if (defaultDir.isEmpty())
             defaultDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
         QUrl startUrl = QUrl::fromLocalFile(defaultDir);
         KisDocument* pDoc = d->activeView->document();
         /** if document has a file name, take file name and replace extension with .pdf */
         if (pDoc && pDoc->url().isValid()) {
             startUrl = pDoc->url();
             QString fileName = startUrl.fileName();
             fileName = fileName.replace( QRegExp( "\\.\\w{2,5}$", Qt::CaseInsensitive ), ".pdf" );
             startUrl = startUrl.adjusted(QUrl::RemoveFilename);
             startUrl.setPath(startUrl.path() +  fileName );
         }
 
         QPointer<KoPageLayoutDialog> layoutDlg(new KoPageLayoutDialog(this, pageLayout));
         layoutDlg->setWindowModality(Qt::WindowModal);
         if (layoutDlg->exec() != QDialog::Accepted || !layoutDlg) {
             delete layoutDlg;
             return 0;
         }
         pageLayout = layoutDlg->pageLayout();
         delete layoutDlg;
 
         KoFileDialog dialog(this, KoFileDialog::SaveFile, "SaveDocument");
         dialog.setCaption(i18n("Export as PDF"));
         dialog.setDefaultDir(startUrl.toLocalFile());
         dialog.setMimeTypeFilters(QStringList() << "application/pdf");
         QUrl url = QUrl::fromUserInput(dialog.filename());
 
         pdfFileName = url.toLocalFile();
         if (pdfFileName.isEmpty())
             return 0;
     }
 
     KisPrintJob *printJob = activeView()->createPrintJob();
     if (printJob == 0)
         return 0;
     if (isHidden()) {
         printJob->setProperty("noprogressdialog", true);
     }
 
     applyDefaultSettings(printJob->printer());
     // TODO for remote files we have to first save locally and then upload.
     printJob->printer().setOutputFileName(pdfFileName);
     printJob->printer().setDocName(pdfFileName);
     printJob->printer().setColorMode(QPrinter::Color);
 
     if (pageLayout.format == KoPageFormat::CustomSize) {
         printJob->printer().setPaperSize(QSizeF(pageLayout.width, pageLayout.height), QPrinter::Millimeter);
     } else {
         printJob->printer().setPaperSize(KoPageFormat::printerPageSize(pageLayout.format));
     }
 
     printJob->printer().setPageMargins(pageLayout.leftMargin, pageLayout.topMargin, pageLayout.rightMargin, pageLayout.bottomMargin, QPrinter::Millimeter);
 
     switch (pageLayout.orientation) {
     case KoPageFormat::Portrait:
         printJob->printer().setOrientation(QPrinter::Portrait);
         break;
     case KoPageFormat::Landscape:
         printJob->printer().setOrientation(QPrinter::Landscape);
         break;
     }
 
     //before printing check if the printer can handle printing
     if (!printJob->canPrint()) {
         QMessageBox::critical(this, i18nc("@title:window", "Krita"), i18n("Cannot export to the specified file"));
     }
 
     printJob->startPrinting(KisPrintJob::DeleteWhenDone);
     return printJob;
 }
 
 void KisMainWindow::importAnimation()
 {
     if (!activeView()) return;
 
     KisDocument *document = activeView()->document();
     if (!document) return;
 
     KisDlgImportImageSequence dlg(this, document);
 
     if (dlg.exec() == QDialog::Accepted) {
         QStringList files = dlg.files();
         int firstFrame = dlg.firstFrame();
         int step = dlg.step();
 
         document->setFileProgressProxy();
         document->setFileProgressUpdater(i18n("Import frames"));
         KisAnimationImporter importer(document);
         KisImportExportFilter::ConversionStatus status = importer.import(files, firstFrame, step);
         document->clearFileProgressUpdater();
         document->clearFileProgressProxy();
 
         if (status != KisImportExportFilter::OK && status != KisImportExportFilter::InternalError) {
             QString msg = KisImportExportFilter::conversionStatusString(status);
 
             if (!msg.isEmpty())
                 QMessageBox::critical(0, i18nc("@title:window", "Krita"), i18n("Could not finish import animation:\n%1", msg));
         }
         activeView()->canvasBase()->refetchDataFromImage();
     }
 }
 
 void KisMainWindow::exportAnimation()
 {
     if (!activeView()) return;
 
     KisDocument *document = activeView()->document();
     if (!document) return;
 
     document->setFileProgressProxy();
     document->setFileProgressUpdater(i18n("Export frames"));
     KisAnimationExporterUI exporter(this);
     KisImportExportFilter::ConversionStatus status = exporter.exportSequence(document);
     document->clearFileProgressUpdater();
     document->clearFileProgressProxy();
 
     if (status != KisImportExportFilter::OK && status != KisImportExportFilter::InternalError) {
         QString msg = KisImportExportFilter::conversionStatusString(status);
 
         if (!msg.isEmpty())
             QMessageBox::critical(0, i18nc("@title:window", "Krita"), i18n("Could not finish export animation:\n%1", msg));
     }
     activeView()->canvasBase()->refetchDataFromImage();
 }
 
 void KisMainWindow::slotConfigureToolbars()
 {
     KConfigGroup group =  KSharedConfig::openConfig()->group("krita");
     saveMainWindowSettings(group);
     KEditToolBar edit(factory(), this);
     connect(&edit, SIGNAL(newToolBarConfig()), this, SLOT(slotNewToolbarConfig()));
     (void) edit.exec();
     applyToolBarLayout();
 }
 
 void KisMainWindow::slotNewToolbarConfig()
 {
     applyMainWindowSettings(KSharedConfig::openConfig()->group("krita"));
 
     KXMLGUIFactory *factory = guiFactory();
     Q_UNUSED(factory);
 
     // Check if there's an active view
     if (!d->activeView)
         return;
 
     plugActionList("toolbarlist", d->toolbarList);
     applyToolBarLayout();
 }
 
 void KisMainWindow::slotToolbarToggled(bool toggle)
 {
     //dbgUI <<"KisMainWindow::slotToolbarToggled" << sender()->name() <<" toggle=" << true;
     // The action (sender) and the toolbar have the same name
     KToolBar * bar = toolBar(sender()->objectName());
     if (bar) {
         if (toggle) {
             bar->show();
         }
         else {
             bar->hide();
         }
 
         if (d->activeView && d->activeView->document()) {
             KConfigGroup group =  KSharedConfig::openConfig()->group("krita");
             saveMainWindowSettings(group);
         }
     } else
         warnUI << "slotToolbarToggled : Toolbar " << sender()->objectName() << " not found!";
 }
 
 void KisMainWindow::viewFullscreen(bool fullScreen)
 {
     KisConfig cfg;
     cfg.setFullscreenMode(fullScreen);
 
     if (fullScreen) {
         setWindowState(windowState() | Qt::WindowFullScreen);   // set
     } else {
         setWindowState(windowState() & ~Qt::WindowFullScreen);   // reset
     }
 }
 
 void KisMainWindow::slotProgress(int value)
 {
     qApp->processEvents();
 
     if (!d->progressMutex.tryLock()) return;
 
     dbgUI << "KisMainWindow::slotProgress" << value;
     if (value <= -1 || value >= 100) {
         if (d->progress) {
             statusBar()->removeWidget(d->progress);
             delete d->progress;
             d->progress = 0;
 
             disconnect(d->progressCancel, SIGNAL(clicked()), this, SLOT(slotProgressCanceled()));
             statusBar()->removeWidget(d->progressCancel);
             delete d->progressCancel;
             d->progressCancel = 0;
         }
         d->firstTime = true;
         d->progressMutex.unlock();
         return;
     }
     if (d->firstTime || !d->progress) {
         // The statusbar might not even be created yet.
         // So check for that first, and create it if necessary
         QStatusBar *bar = findChild<QStatusBar *>();
         if (!bar) {
             statusBar()->show();
             QApplication::sendPostedEvents(this, QEvent::ChildAdded);
         }
 
         if (d->progress) {
             statusBar()->removeWidget(d->progress);
             delete d->progress;
             d->progress = 0;
 
             disconnect(d->progressCancel, SIGNAL(clicked()), this, SLOT(slotProgressCanceled()));
             statusBar()->removeWidget(d->progressCancel);
             delete d->progressCancel;
             d->progress = 0;
         }
 
         d->progressCancel = new QToolButton(statusBar());
         d->progressCancel->setMaximumHeight(statusBar()->fontMetrics().height());
         d->progressCancel->setIcon(KisIconUtils::loadIcon("process-stop"));
         statusBar()->addPermanentWidget(d->progressCancel);
 
         d->progress = new QProgressBar(statusBar());
         d->progress->setMaximumHeight(statusBar()->fontMetrics().height());
         d->progress->setRange(0, 100);
         statusBar()->addPermanentWidget(d->progress);
 
         connect(d->progressCancel, SIGNAL(clicked()), this, SLOT(slotProgressCanceled()));
 
         d->progress->show();
         d->progressCancel->show();
         d->firstTime = false;
     }
     if (!d->progress.isNull()) {
         d->progress->setValue(value);
     }
     qApp->processEvents();
 
     d->progressMutex.unlock();
 }
 
 void KisMainWindow::slotProgressCanceled()
 {
     emit sigProgressCanceled();
 }
 
 void KisMainWindow::setMaxRecentItems(uint _number)
 {
     d->recentFiles->setMaxItems(_number);
 }
 
 void KisMainWindow::slotReloadFile()
 {
     KisDocument* document = d->activeView->document();
     if (!document || document->url().isEmpty())
         return;
 
     if (document->isModified()) {
         bool ok = QMessageBox::question(this,
                                         i18nc("@title:window", "Krita"),
                                         i18n("You will lose all changes made since your last save\n"
                                              "Do you want to continue?"),
                                         QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes;
         if (!ok)
             return;
     }
 
     QUrl url = document->url();
 
     saveWindowSettings();
     if (!document->reload()) {
         QMessageBox::critical(this, i18nc("@title:window", "Krita"), i18n("Error: Could not reload this document"));
     }
 
     return;
 
 }
 
 void KisMainWindow::slotImportFile()
 {
     dbgUI << "slotImportFile()";
 
     d->isImporting = true;
     slotFileOpen();
     d->isImporting = false;
 }
 
 void KisMainWindow::slotExportFile()
 {
     dbgUI << "slotExportFile()";
 
     d->isExporting = true;
     slotFileSaveAs();
     d->isExporting = false;
 }
 
 bool KisMainWindow::isImporting() const
 {
     return d->isImporting;
 }
 
 bool KisMainWindow::isExporting() const
 {
     return d->isExporting;
 }
 
 QDockWidget* KisMainWindow::createDockWidget(KoDockFactoryBase* factory)
 {
     QDockWidget* dockWidget = 0;
 
     if (!d->dockWidgetsMap.contains(factory->id())) {
         dockWidget = factory->createDockWidget();
 
         // It is quite possible that a dock factory cannot create the dock; don't
         // do anything in that case.
         if (!dockWidget) {
             warnKrita << "Could not create docker for" << factory->id();
             return 0;
         }
 
         KoDockWidgetTitleBar *titleBar = dynamic_cast<KoDockWidgetTitleBar*>(dockWidget->titleBarWidget());
 
         // Check if the dock widget is supposed to be collapsable
         if (!dockWidget->titleBarWidget()) {
             titleBar = new KoDockWidgetTitleBar(dockWidget);
             dockWidget->setTitleBarWidget(titleBar);
             titleBar->setCollapsable(factory->isCollapsable());
         }
         titleBar->setFont(KoDockRegistry::dockFont());
 
         dockWidget->setObjectName(factory->id());
         dockWidget->setParent(this);
 
         if (dockWidget->widget() && dockWidget->widget()->layout())
             dockWidget->widget()->layout()->setContentsMargins(1, 1, 1, 1);
 
         Qt::DockWidgetArea side = Qt::RightDockWidgetArea;
         bool visible = true;
 
         switch (factory->defaultDockPosition()) {
         case KoDockFactoryBase::DockTornOff:
             dockWidget->setFloating(true); // position nicely?
             break;
         case KoDockFactoryBase::DockTop:
             side = Qt::TopDockWidgetArea; break;
         case KoDockFactoryBase::DockLeft:
             side = Qt::LeftDockWidgetArea; break;
         case KoDockFactoryBase::DockBottom:
             side = Qt::BottomDockWidgetArea; break;
         case KoDockFactoryBase::DockRight:
             side = Qt::RightDockWidgetArea; break;
         case KoDockFactoryBase::DockMinimized:
         default:
             side = Qt::RightDockWidgetArea;
             visible = false;
         }
 
         KConfigGroup group =  KSharedConfig::openConfig()->group("krita").group("DockWidget " + factory->id());
         side = static_cast<Qt::DockWidgetArea>(group.readEntry("DockArea", static_cast<int>(side)));
         if (side == Qt::NoDockWidgetArea) side = Qt::RightDockWidgetArea;
 
         addDockWidget(side, dockWidget);
         if (!visible) {
             dockWidget->hide();
         }
         bool collapsed = factory->defaultCollapsed();
 
         bool locked = false;
         group =  KSharedConfig::openConfig()->group("krita").group("DockWidget " + factory->id());
         collapsed = group.readEntry("Collapsed", collapsed);
         locked = group.readEntry("Locked", locked);
 
         //dbgKrita << "docker" << factory->id() << dockWidget << "collapsed" << collapsed << "locked" << locked << "titlebar" << titleBar;
 
         if (titleBar && collapsed)
             titleBar->setCollapsed(true);
 
         if (titleBar && locked)
             titleBar->setLocked(true);
 
         d->dockWidgetsMap.insert(factory->id(), dockWidget);
     }
     else {
         dockWidget = d->dockWidgetsMap[factory->id()];
     }
 
 #ifdef Q_OS_MAC
     dockWidget->setAttribute(Qt::WA_MacSmallSize, true);
 #endif
     dockWidget->setFont(KoDockRegistry::dockFont());
 
     connect(dockWidget, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)), this, SLOT(forceDockTabFonts()));
 
     return dockWidget;
 }
 
 void KisMainWindow::forceDockTabFonts()
 {
     Q_FOREACH (QObject *child, children()) {
         if (child->inherits("QTabBar")) {
             ((QTabBar *)child)->setFont(KoDockRegistry::dockFont());
         }
     }
 }
 
 QList<QDockWidget*> KisMainWindow::dockWidgets() const
 {
     return d->dockWidgetsMap.values();
 }
 
 QDockWidget* KisMainWindow::dockWidget(const QString &id)
 {
     if (!d->dockWidgetsMap.contains(id)) return 0;
     return d->dockWidgetsMap[id];
 }
 
 QList<KoCanvasObserverBase*> KisMainWindow::canvasObservers() const
 {
     QList<KoCanvasObserverBase*> observers;
 
     Q_FOREACH (QDockWidget *docker, dockWidgets()) {
         KoCanvasObserverBase *observer = dynamic_cast<KoCanvasObserverBase*>(docker);
         if (observer) {
             observers << observer;
         }
         else {
             warnKrita << docker << "is not a canvas observer";
         }
     }
     return observers;
 }
 
 
 void KisMainWindow::toggleDockersVisibility(bool visible)
 {
     if (!visible) {
         d->dockerStateBeforeHiding = saveState();
 
         Q_FOREACH (QObject* widget, children()) {
             if (widget->inherits("QDockWidget")) {
                 QDockWidget* dw = static_cast<QDockWidget*>(widget);
                 if (dw->isVisible()) {
                     dw->hide();
                 }
             }
         }
     }
     else {
         restoreState(d->dockerStateBeforeHiding);
     }
 }
 
 void KisMainWindow::setToolbarList(QList<QAction *> toolbarList)
 {
     qDeleteAll(d->toolbarList);
     d->toolbarList = toolbarList;
 }
 
 void KisMainWindow::slotDocumentTitleModified(const QString &caption, bool mod)
 {
     updateCaption(caption, mod);
     updateReloadFileAction(d->activeView ? d->activeView->document() : 0);
 }
 
 
 void KisMainWindow::subWindowActivated()
 {
     bool enabled = (activeKisView() != 0);
 
     d->mdiCascade->setEnabled(enabled);
     d->mdiNextWindow->setEnabled(enabled);
     d->mdiPreviousWindow->setEnabled(enabled);
     d->mdiTile->setEnabled(enabled);
     d->close->setEnabled(enabled);
     d->closeAll->setEnabled(enabled);
 
     setActiveSubWindow(d->mdiArea->activeSubWindow());
     Q_FOREACH (QToolBar *tb, toolBars()) {
         if (tb->objectName() == "BrushesAndStuff") {
             tb->setEnabled(enabled);
         }
     }
 
     updateCaption();
     d->actionManager()->updateGUI();
 }
 
 void KisMainWindow::updateWindowMenu()
 {
     QMenu *menu = d->windowMenu->menu();
     menu->clear();
 
     menu->addAction(d->newWindow);
     menu->addAction(d->documentMenu);
 
     QMenu *docMenu = d->documentMenu->menu();
     docMenu->clear();
 
     Q_FOREACH (QPointer<KisDocument> doc, KisPart::instance()->documents()) {
         if (doc) {
             QString title = doc->url().toDisplayString();
             if (title.isEmpty()) title = doc->image()->objectName();
             QAction *action = docMenu->addAction(title);
             action->setIcon(qApp->windowIcon());
             connect(action, SIGNAL(triggered()), d->documentMapper, SLOT(map()));
             d->documentMapper->setMapping(action, doc);
         }
     }
 
     menu->addSeparator();
     menu->addAction(d->close);
     menu->addAction(d->closeAll);
     if (d->mdiArea->viewMode() == QMdiArea::SubWindowView) {
         menu->addSeparator();
         menu->addAction(d->mdiTile);
         menu->addAction(d->mdiCascade);
     }
     menu->addSeparator();
     menu->addAction(d->mdiNextWindow);
     menu->addAction(d->mdiPreviousWindow);
     menu->addSeparator();
 
     QList<QMdiSubWindow *> windows = d->mdiArea->subWindowList();
     for (int i = 0; i < windows.size(); ++i) {
         QPointer<KisView>child = qobject_cast<KisView*>(windows.at(i)->widget());
         if (child) {
             QString text;
             if (i < 9) {
                 text = i18n("&%1 %2", i + 1, child->document()->url().toDisplayString());
             }
             else {
                 text = i18n("%1 %2", i + 1, child->document()->url().toDisplayString());
             }
 
             QAction *action  = menu->addAction(text);
             action->setIcon(qApp->windowIcon());
             action->setCheckable(true);
             action->setChecked(child == activeKisView());
             connect(action, SIGNAL(triggered()), d->windowMapper, SLOT(map()));
             d->windowMapper->setMapping(action, windows.at(i));
         }
     }
 
     updateCaption();
 }
 
 void KisMainWindow::setActiveSubWindow(QWidget *window)
 {
     if (!window) return;
     QMdiSubWindow *subwin = qobject_cast<QMdiSubWindow *>(window);
     //dbgKrita << "setActiveSubWindow();" << subwin << d->activeSubWindow;
 
     if (subwin && subwin != d->activeSubWindow) {
         KisView *view = qobject_cast<KisView *>(subwin->widget());
         //dbgKrita << "\t" << view << activeView();
         if (view && view != activeView()) {
             setActiveView(view);
         }
         d->activeSubWindow = subwin;
     }
     updateWindowMenu();
     d->actionManager()->updateGUI();
 }
 
 void KisMainWindow::configChanged()
 {
     KisConfig cfg;
     QMdiArea::ViewMode viewMode = (QMdiArea::ViewMode)cfg.readEntry<int>("mdi_viewmode", (int)QMdiArea::TabbedView);
     d->mdiArea->setViewMode(viewMode);
     Q_FOREACH (QMdiSubWindow *subwin, d->mdiArea->subWindowList()) {
         subwin->setOption(QMdiSubWindow::RubberBandMove, cfg.readEntry<int>("mdi_rubberband", cfg.useOpenGL()));
         subwin->setOption(QMdiSubWindow::RubberBandResize, cfg.readEntry<int>("mdi_rubberband", cfg.useOpenGL()));
     }
 
     KConfigGroup group( KSharedConfig::openConfig(), "theme");
     d->themeManager->setCurrentTheme(group.readEntry("Theme", "Krita dark"));
     d->actionManager()->updateGUI();
 
     QBrush brush(cfg.getMDIBackgroundColor());
     d->mdiArea->setBackground(brush);
 
     QString backgroundImage = cfg.getMDIBackgroundImage();
     if (backgroundImage != "") {
         QImage image(backgroundImage);
         QBrush brush(image);
         d->mdiArea->setBackground(brush);
     }
 
     d->mdiArea->update();
 }
 
 void KisMainWindow::newView(QObject *document)
 {
     KisDocument *doc = qobject_cast<KisDocument*>(document);
     addViewAndNotifyLoadingCompleted(doc);
     d->actionManager()->updateGUI();
 }
 
 void KisMainWindow::newWindow()
 {
     KisPart::instance()->createMainWindow()->show();
 }
 
 void KisMainWindow::closeCurrentWindow()
 {
     d->mdiArea->currentSubWindow()->close();
     d->actionManager()->updateGUI();
 }
 
 void KisMainWindow::checkSanity()
 {
     // print error if the lcms engine is not available
     if (!KoColorSpaceEngineRegistry::instance()->contains("icc")) {
         // need to wait 1 event since exiting here would not work.
         m_errorMessage = i18n("The Calligra LittleCMS color management plugin is not installed. Krita will quit now.");
         m_dieOnError = true;
         QTimer::singleShot(0, this, SLOT(showErrorAndDie()));
         return;
     }
 
     KisPaintOpPresetResourceServer * rserver = KisResourceServerProvider::instance()->paintOpPresetServer();
     if (rserver->resources().isEmpty()) {
         m_errorMessage = i18n("Krita cannot find any brush presets! Krita will quit now.");
         m_dieOnError = true;
         QTimer::singleShot(0, this, SLOT(showErrorAndDie()));
         return;
     }
 }
 
 void KisMainWindow::showErrorAndDie()
 {
     QMessageBox::critical(0, i18nc("@title:window", "Installation error"), m_errorMessage);
     if (m_dieOnError) {
         exit(10);
     }
 }
 
 void KisMainWindow::showAboutApplication()
 {
     KisAboutApplication dlg(this);
     dlg.exec();
 }
 
 QPointer<KisView>KisMainWindow::activeKisView()
 {
     if (!d->mdiArea) return 0;
     QMdiSubWindow *activeSubWindow = d->mdiArea->activeSubWindow();
     //dbgKrita << "activeKisView" << activeSubWindow;
     if (!activeSubWindow) return 0;
     return qobject_cast<KisView*>(activeSubWindow->widget());
 }
 
 
 void KisMainWindow::newOptionWidgets(const QList<QPointer<QWidget> > &optionWidgetList)
 {
     Q_FOREACH (QWidget *w, optionWidgetList) {
 #ifdef Q_OS_MAC
         w->setAttribute(Qt::WA_MacSmallSize, true);
 #endif
         w->setFont(KoDockRegistry::dockFont());
     }
 
     if (d->toolOptionsDocker) {
         d->toolOptionsDocker->setOptionWidgets(optionWidgetList);
     }
     else {
         d->viewManager->paintOpBox()->newOptionWidgets(optionWidgetList);
     }
 }
 
 void KisMainWindow::applyDefaultSettings(QPrinter &printer) {
 
     if (!d->activeView) return;
 
     QString title = d->activeView->document()->documentInfo()->aboutInfo("title");
     if (title.isEmpty()) {
         title = d->activeView->document()->url().fileName();
         // strip off the native extension (I don't want foobar.kwd.ps when printing into a file)
         QString extension = KisMimeDatabase::suffixesForMimeType(d->activeView->document()->outputMimeType()).first();
         if (title.endsWith(extension)) {
             title.chop(extension.length());
         }
     }
 
     if (title.isEmpty()) {
         // #139905
         title = i18n("%1 unsaved document (%2)", qApp->applicationDisplayName(),
                      QLocale().toString(QDate::currentDate(), QLocale::ShortFormat));
     }
     printer.setDocName(title);
 }
 
 void KisMainWindow::createActions()
 {
     KisActionManager *actionManager = d->actionManager();
 
     actionManager->createStandardAction(KStandardAction::New, this, SLOT(slotFileNew()));
     actionManager->createStandardAction(KStandardAction::Open, this, SLOT(slotFileOpen()));
     actionManager->createStandardAction(KStandardAction::Quit, this, SLOT(slotFileQuit()));
     actionManager->createStandardAction(KStandardAction::ConfigureToolbars, this, SLOT(slotConfigureToolbars()));
     actionManager->createStandardAction(KStandardAction::FullScreen, this, SLOT(viewFullscreen(bool)));
 
     d->recentFiles = KStandardAction::openRecent(this, SLOT(slotFileOpenRecent(QUrl)), actionCollection());
     connect(d->recentFiles, SIGNAL(recentListCleared()), this, SLOT(saveRecentFiles()));
     KSharedConfigPtr configPtr =  KSharedConfig::openConfig();
     d->recentFiles->loadEntries(configPtr->group("RecentFiles"));
 
     d->saveAction = actionManager->createStandardAction(KStandardAction::Save, this, SLOT(slotFileSave()));
     d->saveAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
     d->saveActionAs = actionManager->createStandardAction(KStandardAction::SaveAs, this, SLOT(slotFileSaveAs()));
     d->saveActionAs->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
 //    d->printAction = actionManager->createStandardAction(KStandardAction::Print, this, SLOT(slotFilePrint()));
 //    d->printAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
 //    d->printActionPreview = actionManager->createStandardAction(KStandardAction::PrintPreview, this, SLOT(slotFilePrintPreview()));
 //    d->printActionPreview->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
     d->undo = actionManager->createStandardAction(KStandardAction::Undo, this, SLOT(undo()));
     d->undo ->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
     d->redo = actionManager->createStandardAction(KStandardAction::Redo, this, SLOT(redo()));
     d->redo->setActivationFlags(KisAction::ACTIVE_IMAGE);
 
     d->exportPdf  = actionManager->createAction("file_export_pdf");
     connect(d->exportPdf, SIGNAL(triggered()), this, SLOT(exportToPdf()));
 
     d->importAnimation  = actionManager->createAction("file_import_animation");
     connect(d->importAnimation, SIGNAL(triggered()), this, SLOT(importAnimation()));
 
     d->exportAnimation  = actionManager->createAction("file_export_animation");
     connect(d->exportAnimation, SIGNAL(triggered()), this, SLOT(exportAnimation()));
 
     d->closeAll = actionManager->createAction("file_close_all");
     connect(d->closeAll, SIGNAL(triggered()), this, SLOT(slotFileCloseAll()));
 
 //    d->reloadFile  = actionManager->createAction("file_reload_file");
 //    d->reloadFile->setActivationFlags(KisAction::CURRENT_IMAGE_MODIFIED);
 //    connect(d->reloadFile, SIGNAL(triggered(bool)), this, SLOT(slotReloadFile()));
 
     d->importFile  = actionManager->createAction("file_import_file");
     connect(d->importFile, SIGNAL(triggered(bool)), this, SLOT(slotImportFile()));
 
     d->exportFile  = actionManager->createAction("file_export_file");
     connect(d->exportFile, SIGNAL(triggered(bool)), this, SLOT(slotExportFile()));
 
     /* The following entry opens the document information dialog.  Since the action is named so it
         intends to show data this entry should not have a trailing ellipses (...).  */
     d->showDocumentInfo  = actionManager->createAction("file_documentinfo");
     connect(d->showDocumentInfo, SIGNAL(triggered(bool)), this, SLOT(slotDocumentInfo()));
 
 
     d->themeManager->setThemeMenuAction(new KActionMenu(i18nc("@action:inmenu", "&Themes"), this));
     d->themeManager->registerThemeActions(actionCollection());
     connect(d->themeManager, SIGNAL(signalThemeChanged()), this, SLOT(slotThemeChanged()));
 
 
     d->toggleDockers = actionManager->createAction("view_toggledockers");
     d->toggleDockers->setChecked(true);
     connect(d->toggleDockers, SIGNAL(toggled(bool)), SLOT(toggleDockersVisibility(bool)));
 
     d->toggleDockerTitleBars = actionManager->createAction("view_toggledockertitlebars");
     {
         KisConfig cfg;
         d->toggleDockerTitleBars->setChecked(cfg.showDockerTitleBars());
     }
     connect(d->toggleDockerTitleBars, SIGNAL(toggled(bool)), SLOT(showDockerTitleBars(bool)));
 
     actionCollection()->addAction("settings_dockers_menu", d->dockWidgetMenu);
     actionCollection()->addAction("window", d->windowMenu);
 
     d->mdiCascade = actionManager->createAction("windows_cascade");
     connect(d->mdiCascade, SIGNAL(triggered()), d->mdiArea, SLOT(cascadeSubWindows()));
 
     d->mdiTile = actionManager->createAction("windows_tile");
     connect(d->mdiTile, SIGNAL(triggered()), d->mdiArea, SLOT(tileSubWindows()));
 
     d->mdiNextWindow = actionManager->createAction("windows_next");
     connect(d->mdiNextWindow, SIGNAL(triggered()), d->mdiArea, SLOT(activateNextSubWindow()));
 
     d->mdiPreviousWindow = actionManager->createAction("windows_previous");
     connect(d->mdiPreviousWindow, SIGNAL(triggered()), d->mdiArea, SLOT(activatePreviousSubWindow()));
 
     d->newWindow = actionManager->createAction("view_newwindow");
     connect(d->newWindow, SIGNAL(triggered(bool)), this, SLOT(newWindow()));
 
     d->close = actionManager->createAction("file_close");
     connect(d->close, SIGNAL(triggered()), SLOT(closeCurrentWindow()));
 
     actionManager->createStandardAction(KStandardAction::Preferences, this, SLOT(slotPreferences()));
 
     for (int i = 0; i < 2; i++) {
         d->expandingSpacers[i] = new KisAction(i18n("Expanding Spacer"));
         d->expandingSpacers[i]->setDefaultWidget(new QWidget(this));
         d->expandingSpacers[i]->defaultWidget()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         actionManager->addAction(QString("expanding_spacer_%1").arg(i), d->expandingSpacers[i]);
     }
 }
 
 void KisMainWindow::applyToolBarLayout()
 {
     const bool isPlastiqueStyle = style()->objectName() == "plastique";
 
     Q_FOREACH (KToolBar *toolBar, toolBars()) {
         toolBar->layout()->setSpacing(4);
         if (isPlastiqueStyle) {
             toolBar->setContentsMargins(0, 0, 0, 2);
         }
     }
 }
 
 void KisMainWindow::initializeGeometry()
 {
     // if the user didn's specify the geometry on the command line (does anyone do that still?),
     // we first figure out some good default size and restore the x,y position. See bug 285804Z.
     KConfigGroup cfg( KSharedConfig::openConfig(), "MainWindow");
     QByteArray geom = QByteArray::fromBase64(cfg.readEntry("ko_geometry", QByteArray()));
     if (!restoreGeometry(geom)) {
         const int scnum = QApplication::desktop()->screenNumber(parentWidget());
         QRect desk = QApplication::desktop()->availableGeometry(scnum);
         // if the desktop is virtual then use virtual screen size
         if (QApplication::desktop()->isVirtualDesktop()) {
             desk = QApplication::desktop()->availableGeometry(QApplication::desktop()->screen(scnum));
         }
 
         quint32 x = desk.x();
         quint32 y = desk.y();
         quint32 w = 0;
         quint32 h = 0;
 
         // Default size -- maximize on small screens, something useful on big screens
         const int deskWidth = desk.width();
         if (deskWidth > 1024) {
             // a nice width, and slightly less than total available
             // height to componensate for the window decs
             w = (deskWidth / 3) * 2;
             h = (desk.height() / 3) * 2;
         }
         else {
             w = desk.width();
             h = desk.height();
         }
 
         x += (desk.width() - w) / 2;
         y += (desk.height() - h) / 2;
 
         move(x,y);
         setGeometry(geometry().x(), geometry().y(), w, h);
     }
     restoreWorkspace(QByteArray::fromBase64(cfg.readEntry("ko_windowstate", QByteArray())));
 }
 
 void KisMainWindow::showManual()
 {
     QDesktopServices::openUrl(QUrl("https://docs.krita.org"));
 }
 
 void KisMainWindow::showDockerTitleBars(bool show)
 {
     Q_FOREACH (QDockWidget *dock, dockWidgets()) {
         if (dock->titleBarWidget()) {
             const bool isCollapsed = (dock->widget() && dock->widget()->isHidden()) || !dock->widget();
             dock->titleBarWidget()->setVisible(show || (dock->isFloating() && isCollapsed));
         }
     }
 
     KisConfig cfg;
     cfg.setShowDockerTitleBars(show);
 }
 
 void KisMainWindow::moveEvent(QMoveEvent *e)
 {
     if (qApp->desktop()->screenNumber(this) != qApp->desktop()->screenNumber(e->oldPos())) {
         KisConfigNotifier::instance()->notifyConfigChanged();
     }
 }
 
 
 
 #include <moc_KisMainWindow.cpp>
diff --git a/libs/ui/KisViewManager.cpp b/libs/ui/KisViewManager.cpp
index bf410d71e0..4cfc936128 100644
--- a/libs/ui/KisViewManager.cpp
+++ b/libs/ui/KisViewManager.cpp
@@ -1,1250 +1,1253 @@
 /*
  *  This file is part of KimageShop^WKrayon^WKrita
  *
  *  Copyright (c) 1999 Matthias Elter  <me@kde.org>
  *                1999 Michael Koch    <koch@kde.org>
  *                1999 Carsten Pfeiffer <pfeiffer@kde.org>
  *                2002 Patrick Julien <freak@codepimps.org>
  *                2003-2011 Boudewijn Rempt <boud@valdyas.org>
  *                2004 Clarence Dang <dang@kde.org>
  *                2011 José Luis Vergara <pentalis@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 <stdio.h>
 
 #include "KisViewManager.h"
 #include <QPrinter>
 
 #include <QAction>
 #include <QApplication>
 #include <QBuffer>
 #include <QByteArray>
 #include <QDesktopServices>
 #include <QDesktopWidget>
 #include <QGridLayout>
 #include <QMainWindow>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QObject>
 #include <QPoint>
 #include <QPrintDialog>
 #include <QRect>
 #include <QScrollBar>
 #include <QStatusBar>
 #include <QToolBar>
 #include <QUrl>
 #include <QWidget>
 
 #include <kactioncollection.h>
 #include <klocalizedstring.h>
 #include <KoResourcePaths.h>
 #include <kselectaction.h>
 
 #include <KoCanvasController.h>
 #include <KoCompositeOp.h>
 #include <KoDockRegistry.h>
 #include <KoDockWidgetTitleBar.h>
 #include <KoProperties.h>
 #include <KoResourceItemChooserSync.h>
 #include <KoSelection.h>
 #include <KoStore.h>
 #include <KoToolManager.h>
 #include <KoToolRegistry.h>
 #include <KoViewConverter.h>
 #include <KoZoomHandler.h>
 #include <KoPluginLoader.h>
 #include <KoDocumentInfo.h>
 #include <KoGlobal.h>
 
 #include "input/kis_input_manager.h"
 #include "canvas/kis_canvas2.h"
 #include "canvas/kis_canvas_controller.h"
 #include "canvas/kis_grid_manager.h"
 #include "dialogs/kis_dlg_blacklist_cleanup.h"
 #include "input/kis_input_profile_manager.h"
 #include "kis_action_manager.h"
 #include "kis_action.h"
 #include "kis_canvas_controls_manager.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_composite_progress_proxy.h"
 #include "kis_config.h"
 #include "kis_config_notifier.h"
 #include "kis_control_frame.h"
 #include "kis_coordinates_converter.h"
 #include "KisDocument.h"
 #include "kis_favorite_resource_manager.h"
 #include "kis_filter_manager.h"
 #include "kis_group_layer.h"
 #include <kis_image.h>
 #include "kis_image_manager.h"
 #include <kis_layer.h>
 #include "kis_mainwindow_observer.h"
 #include "kis_mask_manager.h"
 #include "kis_mimedata.h"
 #include "kis_mirror_manager.h"
 #include "kis_node_commands_adapter.h"
 #include "kis_node.h"
 #include "kis_node_manager.h"
 #include "kis_painting_assistants_manager.h"
 #include <kis_paint_layer.h>
 #include "kis_paintop_box.h"
 #include <brushengine/kis_paintop_preset.h>
 #include "KisPart.h"
 #include "KisPrintJob.h"
 #include "kis_progress_widget.h"
 #include "kis_resource_server_provider.h"
 #include "kis_selection.h"
 #include "kis_selection_manager.h"
 #include "kis_shape_controller.h"
 #include "kis_shape_layer.h"
 #include <kis_signal_compressor.h>
 #include "kis_statusbar.h"
 #include <KisTemplateCreateDia.h>
 #include <kis_tool_freehand.h>
 #include "kis_tooltip_manager.h"
 #include <kis_undo_adapter.h>
 #include "KisView.h"
 #include "kis_zoom_manager.h"
 #include "kra/kis_kra_loader.h"
 #include "widgets/kis_floating_message.h"
 #include "kis_signal_auto_connection.h"
 #include "kis_icon_utils.h"
 #include "kis_guides_manager.h"
 #include "kis_derived_resources.h"
 
 
 class BlockingUserInputEventFilter : public QObject
 {
     bool eventFilter(QObject *watched, QEvent *event)
     {
         Q_UNUSED(watched);
         if(dynamic_cast<QWheelEvent*>(event)
                 || dynamic_cast<QKeyEvent*>(event)
                 || dynamic_cast<QMouseEvent*>(event)) {
             return true;
         }
         else {
             return false;
         }
     }
 };
 
 class KisViewManager::KisViewManagerPrivate
 {
 
 public:
 
     KisViewManagerPrivate(KisViewManager *_q, QWidget *_q_parent)
         : filterManager(_q)
         , createTemplate(0)
         , saveIncremental(0)
         , saveIncrementalBackup(0)
         , openResourcesDirectory(0)
         , rotateCanvasRight(0)
         , rotateCanvasLeft(0)
         , resetCanvasRotation(0)
         , wrapAroundAction(0)
         , levelOfDetailAction(0)
         , showRulersAction(0)
         , rulersTrackMouseAction(0)
         , zoomTo100pct(0)
         , zoomIn(0)
         , zoomOut(0)
         , selectionManager(_q)
         , statusBar(_q)
         , controlFrame(_q, _q_parent)
         , nodeManager(_q)
         , imageManager(_q)
         , gridManager(_q)
         , canvasControlsManager(_q)
         , paintingAssistantsManager(_q)
         , actionManager(_q)
         , mainWindow(0)
         , showFloatingMessage(true)
         , currentImageView(0)
         , canvasResourceProvider(_q)
         , canvasResourceManager()
         , guiUpdateCompressor(30, KisSignalCompressor::POSTPONE, _q)
         , mirrorManager(_q)
         , inputManager(_q)
         , actionAuthor(0)
     {
         canvasResourceManager.addDerivedResourceConverter(toQShared(new KisCompositeOpResourceConverter));
         canvasResourceManager.addDerivedResourceConverter(toQShared(new KisEffectiveCompositeOpResourceConverter));
         canvasResourceManager.addDerivedResourceConverter(toQShared(new KisOpacityResourceConverter));
+        canvasResourceManager.addDerivedResourceConverter(toQShared(new KisFlowResourceConverter));
+        canvasResourceManager.addDerivedResourceConverter(toQShared(new KisSizeResourceConverter));
         canvasResourceManager.addDerivedResourceConverter(toQShared(new KisLodAvailabilityResourceConverter));
         canvasResourceManager.addDerivedResourceConverter(toQShared(new KisEraserModeResourceConverter));
+        canvasResourceManager.addResourceUpdateMediator(toQShared(new KisPresetUpdateMediator));
     }
 
 public:
     KisFilterManager filterManager;
     KisAction *createTemplate;
     KisAction *createCopy;
     KisAction *saveIncremental;
     KisAction *saveIncrementalBackup;
     KisAction *openResourcesDirectory;
     KisAction *rotateCanvasRight;
     KisAction *rotateCanvasLeft;
     KisAction *resetCanvasRotation;
     KisAction *wrapAroundAction;
     KisAction *levelOfDetailAction;
     KisAction *showRulersAction;
     KisAction *rulersTrackMouseAction;
     KisAction *zoomTo100pct;
     KisAction *zoomIn;
     KisAction *zoomOut;
     KisAction *softProof;
     KisAction *gamutCheck;
 
     KisSelectionManager selectionManager;
     KisGuidesManager guidesManager;
     KisStatusBar statusBar;
 
     KisControlFrame controlFrame;
     KisNodeManager nodeManager;
     KisImageManager imageManager;
     KisGridManager gridManager;
     KisCanvasControlsManager canvasControlsManager;
     KisPaintingAssistantsManager paintingAssistantsManager;
     BlockingUserInputEventFilter blockingEventFilter;
     KisActionManager actionManager;
     QMainWindow* mainWindow;
     QPointer<KisFloatingMessage> savedFloatingMessage;
     bool showFloatingMessage;
     QPointer<KisView> currentImageView;
     KisCanvasResourceProvider canvasResourceProvider;
     KoCanvasResourceManager canvasResourceManager;
     KisSignalCompressor guiUpdateCompressor;
     KActionCollection *actionCollection;
     KisMirrorManager mirrorManager;
     KisInputManager inputManager;
 
     KisSignalAutoConnectionsStore viewConnections;
     KSelectAction *actionAuthor; // Select action for author profile.
 
     QByteArray canvasState;
 };
 
 
 KisViewManager::KisViewManager(QWidget *parent, KActionCollection *_actionCollection)
     : d(new KisViewManagerPrivate(this, parent))
 {
     d->actionCollection = _actionCollection;
     d->mainWindow = dynamic_cast<QMainWindow*>(parent);
     d->canvasResourceProvider.setResourceManager(&d->canvasResourceManager);
     connect(&d->guiUpdateCompressor, SIGNAL(timeout()), this, SLOT(guiUpdateTimeout()));
 
     createActions();
     setupManagers();
 
     // These initialization functions must wait until KisViewManager ctor is complete.
     d->statusBar.setup();
     d->controlFrame.setup(parent);
 
     //Check to draw scrollbars after "Canvas only mode" toggle is created.
     this->showHideScrollbars();
 
     QScopedPointer<KoDummyCanvasController> dummy(new KoDummyCanvasController(actionCollection()));
     KoToolManager::instance()->registerToolActions(actionCollection(), dummy.data());
 
     QTimer::singleShot(0, this, SLOT(initializeStatusBarVisibility()));
 
     connect(KoToolManager::instance(), SIGNAL(inputDeviceChanged(KoInputDevice)),
             d->controlFrame.paintopBox(), SLOT(slotInputDeviceChanged(KoInputDevice)));
 
     connect(KoToolManager::instance(), SIGNAL(changedTool(KoCanvasController*,int)),
             d->controlFrame.paintopBox(), SLOT(slotToolChanged(KoCanvasController*,int)));
 
     connect(&d->nodeManager, SIGNAL(sigNodeActivated(KisNodeSP)),
             resourceProvider(), SLOT(slotNodeActivated(KisNodeSP)));
 
     connect(resourceProvider()->resourceManager(), SIGNAL(canvasResourceChanged(int,QVariant)),
             d->controlFrame.paintopBox(), SLOT(slotCanvasResourceChanged(int,QVariant)));
 
     connect(KisPart::instance(), SIGNAL(sigViewAdded(KisView*)), SLOT(slotViewAdded(KisView*)));
     connect(KisPart::instance(), SIGNAL(sigViewRemoved(KisView*)), SLOT(slotViewRemoved(KisView*)));
 
     connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(slotUpdateAuthorProfileActions()));
 
     KisInputProfileManager::instance()->loadProfiles();
 
     KisConfig cfg;
     d->showFloatingMessage = cfg.showCanvasMessages();
 
 }
 
 
 KisViewManager::~KisViewManager()
 {
     KisConfig cfg;
     if (resourceProvider() && resourceProvider()->currentPreset()) {
         cfg.writeEntry("LastPreset", resourceProvider()->currentPreset()->name());
     }
     cfg.writeEntry("baseLength", KoResourceItemChooserSync::instance()->baseLength());
 
     delete d;
 }
 
 KActionCollection *KisViewManager::actionCollection() const
 {
     return d->actionCollection;
 }
 
 void KisViewManager::slotViewAdded(KisView *view)
 {
     d->inputManager.addTrackedCanvas(view->canvasBase());
 
     if (viewCount() == 0) {
         d->statusBar.showAllStatusBarItems();
     }
 }
 
 void KisViewManager::slotViewRemoved(KisView *view)
 {
     d->inputManager.removeTrackedCanvas(view->canvasBase());
 
     if (viewCount() == 0) {
         d->statusBar.hideAllStatusBarItems();
     }
 }
 
 void KisViewManager::setCurrentView(KisView *view)
 {
     bool first = true;
     if (d->currentImageView) {
         d->currentImageView->notifyCurrentStateChanged(false);
 
         d->currentImageView->canvasBase()->setCursor(QCursor(Qt::ArrowCursor));
         first = false;
         KisDocument* doc = d->currentImageView->document();
         if (doc) {
             doc->disconnect(this);
         }
         d->currentImageView->canvasController()->proxyObject->disconnect(&d->statusBar);
         d->viewConnections.clear();
     }
 
     // Restore the last used brush preset
     if (first) {
         KisConfig cfg;
         KisPaintOpPresetResourceServer * rserver = KisResourceServerProvider::instance()->paintOpPresetServer();
         QString lastPreset = cfg.readEntry("LastPreset", QString("Basic_tip_default"));
         KisPaintOpPresetSP preset = rserver->resourceByName(lastPreset);
         if (!preset) {
             preset = rserver->resourceByName("Basic_tip_default");
         }
 
         if (!preset) {
             preset = rserver->resources().first();
         }
         if (preset) {
             paintOpBox()->restoreResource(preset.data());
         }
 
     }
 
     d->softProof->setChecked(view->softProofing());
     d->gamutCheck->setChecked(view->gamutCheck());
 
     QPointer<KisView>imageView = qobject_cast<KisView*>(view);
 
     if (imageView) {
         // Wait for the async image to have loaded
         KisDocument* doc = view->document();
         //        connect(canvasController()->proxyObject, SIGNAL(documentMousePositionChanged(QPointF)), d->statusBar, SLOT(documentMousePositionChanged(QPointF)));
 
         d->currentImageView = imageView;
         KisCanvasController *canvasController = dynamic_cast<KisCanvasController*>(d->currentImageView->canvasController());
 
         d->viewConnections.addUniqueConnection(&d->nodeManager, SIGNAL(sigNodeActivated(KisNodeSP)), doc->image(), SLOT(requestStrokeEndActiveNode()));
         d->viewConnections.addUniqueConnection(d->rotateCanvasRight, SIGNAL(triggered()), canvasController, SLOT(rotateCanvasRight15()));
         d->viewConnections.addUniqueConnection(d->rotateCanvasLeft, SIGNAL(triggered()),canvasController, SLOT(rotateCanvasLeft15()));
         d->viewConnections.addUniqueConnection(d->resetCanvasRotation, SIGNAL(triggered()),canvasController, SLOT(resetCanvasRotation()));
 
         d->viewConnections.addUniqueConnection(d->wrapAroundAction, SIGNAL(toggled(bool)), canvasController, SLOT(slotToggleWrapAroundMode(bool)));
         d->wrapAroundAction->setChecked(canvasController->wrapAroundMode());
 
         d->viewConnections.addUniqueConnection(d->levelOfDetailAction, SIGNAL(toggled(bool)), canvasController, SLOT(slotToggleLevelOfDetailMode(bool)));
         d->levelOfDetailAction->setChecked(canvasController->levelOfDetailMode());
 
         d->viewConnections.addUniqueConnection(d->currentImageView->image(), SIGNAL(sigColorSpaceChanged(const KoColorSpace*)), d->controlFrame.paintopBox(), SLOT(slotColorSpaceChanged(const KoColorSpace*)));
         d->viewConnections.addUniqueConnection(d->showRulersAction, SIGNAL(toggled(bool)), imageView->zoomManager(), SLOT(setShowRulers(bool)));
         d->viewConnections.addUniqueConnection(d->rulersTrackMouseAction, SIGNAL(toggled(bool)), imageView->zoomManager(), SLOT(setRulersTrackMouse(bool)));
         d->viewConnections.addUniqueConnection(d->zoomTo100pct, SIGNAL(triggered()), imageView->zoomManager(), SLOT(zoomTo100()));
         d->viewConnections.addUniqueConnection(d->zoomIn, SIGNAL(triggered()), imageView->zoomController()->zoomAction(), SLOT(zoomIn()));
         d->viewConnections.addUniqueConnection(d->zoomOut, SIGNAL(triggered()), imageView->zoomController()->zoomAction(), SLOT(zoomOut()));
 
         d->viewConnections.addUniqueConnection(d->softProof, SIGNAL(toggled(bool)), view, SLOT(slotSoftProofing(bool)) );
         d->viewConnections.addUniqueConnection(d->gamutCheck, SIGNAL(toggled(bool)), view, SLOT(slotGamutCheck(bool)) );
 
         imageView->zoomManager()->setShowRulers(d->showRulersAction->isChecked());
         imageView->zoomManager()->setRulersTrackMouse(d->rulersTrackMouseAction->isChecked());
 
         showHideScrollbars();
     }
 
     d->filterManager.setView(imageView);
     d->selectionManager.setView(imageView);
     d->guidesManager.setView(imageView);
     d->nodeManager.setView(imageView);
     d->imageManager.setView(imageView);
     d->canvasControlsManager.setView(imageView);
     d->actionManager.setView(imageView);
     d->gridManager.setView(imageView);
     d->statusBar.setView(imageView);
     d->paintingAssistantsManager.setView(imageView);
     d->mirrorManager.setView(imageView);
 
     if (d->currentImageView) {
         d->currentImageView->notifyCurrentStateChanged(true);
         d->currentImageView->canvasController()->activate();
         d->currentImageView->canvasController()->setFocus();
     }
 
     d->actionManager.updateGUI();
 
     d->viewConnections.addUniqueConnection(
         image(), SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)),
         resourceProvider(), SLOT(slotImageSizeChanged()));
 
     d->viewConnections.addUniqueConnection(
         image(), SIGNAL(sigResolutionChanged(double,double)),
         resourceProvider(), SLOT(slotOnScreenResolutionChanged()));
 
     d->viewConnections.addUniqueConnection(
         image(), SIGNAL(sigNodeChanged(KisNodeSP)),
         this, SLOT(updateGUI()));
 
     d->viewConnections.addUniqueConnection(
         view->zoomManager()->zoomController(),
         SIGNAL(zoomChanged(KoZoomMode::Mode,qreal)),
         resourceProvider(), SLOT(slotOnScreenResolutionChanged()));
 
     resourceProvider()->slotImageSizeChanged();
     resourceProvider()->slotOnScreenResolutionChanged();
 }
 
 
 KoZoomController *KisViewManager::zoomController() const
 {
     if (d->currentImageView) {
         return d->currentImageView->zoomController();
     }
     return 0;
 }
 
 KisImageWSP KisViewManager::image() const
 {
     if (document()) {
         return document()->image();
     }
     return 0;
 }
 
 KisCanvasResourceProvider * KisViewManager::resourceProvider()
 {
     return &d->canvasResourceProvider;
 }
 
 KisCanvas2 * KisViewManager::canvasBase() const
 {
     if (d && d->currentImageView) {
         return d->currentImageView->canvasBase();
     }
     return 0;
 }
 
 QWidget* KisViewManager::canvas() const
 {
     if (d && d->currentImageView && d->currentImageView->canvasBase()->canvasWidget()) {
         return d->currentImageView->canvasBase()->canvasWidget();
     }
     return 0;
 }
 
 KisStatusBar * KisViewManager::statusBar() const
 {
     return &d->statusBar;
 }
 
 void KisViewManager::addStatusBarItem(QWidget *widget, int stretch, bool permanent)
 {
     d->statusBar.addStatusBarItem(widget, stretch, permanent);
 }
 
 void KisViewManager::removeStatusBarItem(QWidget *widget)
 {
     d->statusBar.removeStatusBarItem(widget);
 }
 
 KisPaintopBox* KisViewManager::paintOpBox() const
 {
     return d->controlFrame.paintopBox();
 }
 
 KoProgressUpdater* KisViewManager::createProgressUpdater(KoProgressUpdater::Mode mode)
 {
     return new KisProgressUpdater(d->statusBar.progress(), document()->progressProxy(), mode);
 }
 
 KisSelectionManager * KisViewManager::selectionManager()
 {
     return &d->selectionManager;
 }
 
 KisNodeSP KisViewManager::activeNode()
 {
     return d->nodeManager.activeNode();
 }
 
 KisLayerSP KisViewManager::activeLayer()
 {
     return d->nodeManager.activeLayer();
 }
 
 KisPaintDeviceSP KisViewManager::activeDevice()
 {
     return d->nodeManager.activePaintDevice();
 }
 
 KisZoomManager * KisViewManager::zoomManager()
 {
     if (d->currentImageView) {
         return d->currentImageView->zoomManager();
     }
     return 0;
 }
 
 KisFilterManager * KisViewManager::filterManager()
 {
     return &d->filterManager;
 }
 
 KisImageManager * KisViewManager::imageManager()
 {
     return &d->imageManager;
 }
 
 KisInputManager* KisViewManager::inputManager() const
 {
     return &d->inputManager;
 }
 
 KisSelectionSP KisViewManager::selection()
 {
     if (d->currentImageView) {
         return d->currentImageView->selection();
     }
     return 0;
 
 }
 
 bool KisViewManager::selectionEditable()
 {
     KisLayerSP layer = activeLayer();
     if (layer) {
         KoProperties properties;
         QList<KisNodeSP> masks = layer->childNodes(QStringList("KisSelectionMask"), properties);
         if (masks.size() == 1) {
             return masks[0]->isEditable();
         }
     }
     // global selection is always editable
     return true;
 }
 
 KisUndoAdapter * KisViewManager::undoAdapter()
 {
     if (!document()) return 0;
 
     KisImageWSP image = document()->image();
     Q_ASSERT(image);
 
     return image->undoAdapter();
 }
 
 void KisViewManager::createActions()
 {
     KisConfig cfg;
 
     d->saveIncremental = actionManager()->createAction("save_incremental_version");
     connect(d->saveIncremental, SIGNAL(triggered()), this, SLOT(slotSaveIncremental()));
 
     d->saveIncrementalBackup = actionManager()->createAction("save_incremental_backup");
     connect(d->saveIncrementalBackup, SIGNAL(triggered()), this, SLOT(slotSaveIncrementalBackup()));
 
     connect(mainWindow(), SIGNAL(documentSaved()), this, SLOT(slotDocumentSaved()));
 
     d->saveIncremental->setEnabled(false);
     d->saveIncrementalBackup->setEnabled(false);
 
     KisAction *tabletDebugger = actionManager()->createAction("tablet_debugger");
     connect(tabletDebugger, SIGNAL(triggered()), this, SLOT(toggleTabletLogger()));
 
     d->createTemplate = actionManager()->createAction("create_template");
     connect(d->createTemplate, SIGNAL(triggered()), this, SLOT(slotCreateTemplate()));
 
     d->createCopy = actionManager()->createAction("create_copy");
     connect(d->createCopy, SIGNAL(triggered()), this, SLOT(slotCreateCopy()));
 
     d->openResourcesDirectory = actionManager()->createAction("open_resources_directory");
     connect(d->openResourcesDirectory, SIGNAL(triggered()), SLOT(openResourcesDirectory()));
 
     d->rotateCanvasRight   = actionManager()->createAction("rotate_canvas_right");
     d->rotateCanvasLeft    = actionManager()->createAction("rotate_canvas_left");
     d->resetCanvasRotation = actionManager()->createAction("reset_canvas_rotation");
     d->wrapAroundAction    = actionManager()->createAction("wrap_around_mode");
     d->levelOfDetailAction = actionManager()->createAction("level_of_detail_mode");
     d->softProof           = actionManager()->createAction("softProof");
     d->gamutCheck          = actionManager()->createAction("gamutCheck");
 
     KisAction *tAction = actionManager()->createAction("showStatusBar");
     tAction->setChecked(cfg.showStatusBar());
     connect(tAction, SIGNAL(toggled(bool)), this, SLOT(showStatusBar(bool)));
 
     tAction = actionManager()->createAction("view_show_canvas_only");
     tAction->setChecked(false);
     connect(tAction, SIGNAL(toggled(bool)), this, SLOT(switchCanvasOnly(bool)));
 
     //Workaround, by default has the same shortcut as mirrorCanvas
     KisAction *a = dynamic_cast<KisAction*>(actionCollection()->action("format_italic"));
     if (a) {
         a->setDefaultShortcut(QKeySequence());
     }
 
     a = actionManager()->createAction("edit_blacklist_cleanup");
     connect(a, SIGNAL(triggered()), this, SLOT(slotBlacklistCleanup()));
 
     d->showRulersAction = actionManager()->createAction("view_ruler");
     d->showRulersAction->setChecked(cfg.showRulers());
     connect(d->showRulersAction, SIGNAL(toggled(bool)), SLOT(slotSaveShowRulersState(bool)));
 
     d->rulersTrackMouseAction = actionManager()->createAction("rulers_track_mouse");
     d->rulersTrackMouseAction->setChecked(cfg.rulersTrackMouse());
     connect(d->rulersTrackMouseAction, SIGNAL(toggled(bool)), SLOT(slotSaveRulersTrackMouseState(bool)));
 
     d->zoomTo100pct = actionManager()->createAction("zoom_to_100pct");
 
     d->zoomIn = actionManager()->createStandardAction(KStandardAction::ZoomIn, 0, "");
     d->zoomOut = actionManager()->createStandardAction(KStandardAction::ZoomOut, 0, "");
 
     d->actionAuthor  = new KSelectAction(KisIconUtils::loadIcon("im-user"), i18n("Active Author Profile"), this);
     connect(d->actionAuthor, SIGNAL(triggered(const QString &)), this, SLOT(changeAuthorProfile(const QString &)));
     actionCollection()->addAction("settings_active_author", d->actionAuthor);
     slotUpdateAuthorProfileActions();
 
 }
 
 void KisViewManager::setupManagers()
 {
     // Create the managers for filters, selections, layers etc.
     // XXX: When the currentlayer changes, call updateGUI on all
     // managers
 
     d->filterManager.setup(actionCollection(), actionManager());
 
     d->selectionManager.setup(actionManager());
 
     d->guidesManager.setup(actionManager());
 
     d->nodeManager.setup(actionCollection(), actionManager());
 
     d->imageManager.setup(actionManager());
 
     d->gridManager.setup(actionManager());
 
     d->paintingAssistantsManager.setup(actionManager());
 
     d->canvasControlsManager.setup(actionManager());
 
     d->mirrorManager.setup(actionCollection());
 
 }
 
 void KisViewManager::updateGUI()
 {
     d->guiUpdateCompressor.start();
 }
 
 void KisViewManager::slotBlacklistCleanup()
 {
     KisDlgBlacklistCleanup dialog;
     dialog.exec();
 }
 
 KisNodeManager * KisViewManager::nodeManager() const
 {
     return &d->nodeManager;
 }
 
 KisActionManager* KisViewManager::actionManager() const
 {
     return &d->actionManager;
 }
 
 KisGridManager * KisViewManager::gridManager() const
 {
     return &d->gridManager;
 }
 
 KisGuidesManager * KisViewManager::guidesManager() const
 {
     return &d->guidesManager;
 }
 
 KisPaintingAssistantsManager* KisViewManager::paintingAssistantsManager() const
 {
     return &d->paintingAssistantsManager;
 }
 
 KisDocument *KisViewManager::document() const
 {
     if (d->currentImageView && d->currentImageView->document()) {
         return d->currentImageView->document();
     }
     return 0;
 }
 
 int KisViewManager::viewCount() const
 {
     KisMainWindow *mw  = qobject_cast<KisMainWindow*>(d->mainWindow);
     if (mw) {
         return mw->viewCount();
     }
     return 0;
 }
 
 void KisViewManager::slotCreateTemplate()
 {
     if (!document()) return;
     KisTemplateCreateDia::createTemplate( QStringLiteral("templates/"), ".kra", document(), mainWindow());
 }
 
 void KisViewManager::slotCreateCopy()
 {
     if (!document()) return;
     KisDocument *doc = KisPart::instance()->createDocument();
 
     QString name = document()->documentInfo()->aboutInfo("name");
     if (name.isEmpty()) {
         name = document()->url().toLocalFile();
     }
     name = i18n("%1 (Copy)", name);
     doc->documentInfo()->setAboutInfo("title", name);
     KisImageWSP image = document()->image();
     KisImageSP newImage = new KisImage(doc->createUndoStore(), image->width(), image->height(), image->colorSpace(), name);
     newImage->setRootLayer(dynamic_cast<KisGroupLayer*>(image->rootLayer()->clone().data()));
     doc->setCurrentImage(newImage);
     KisPart::instance()->addDocument(doc);
     KisMainWindow *mw  = qobject_cast<KisMainWindow*>(d->mainWindow);
     mw->addViewAndNotifyLoadingCompleted(doc);
 }
 
 
 QMainWindow* KisViewManager::qtMainWindow() const
 {
     if (d->mainWindow)
         return d->mainWindow;
 
     //Fallback for when we have not yet set the main window.
     QMainWindow* w = qobject_cast<QMainWindow*>(qApp->activeWindow());
     if(w)
         return w;
 
     return mainWindow();
 }
 
 void KisViewManager::setQtMainWindow(QMainWindow* newMainWindow)
 {
     d->mainWindow = newMainWindow;
 }
 
 
 void KisViewManager::slotDocumentSaved()
 {
     d->saveIncremental->setEnabled(true);
     d->saveIncrementalBackup->setEnabled(true);
 }
 
 void KisViewManager::slotSaveIncremental()
 {
     if (!document()) return;
 
     bool foundVersion;
     bool fileAlreadyExists;
     bool isBackup;
     QString version = "000";
     QString newVersion;
     QString letter;
     QString fileName = document()->localFilePath();
 
     // Find current version filenames
     // v v Regexp to find incremental versions in the filename, taking our backup scheme into account as well
     // Considering our incremental version and backup scheme, format is filename_001~001.ext
     QRegExp regex("_\\d{1,4}[.]|_\\d{1,4}[a-z][.]|_\\d{1,4}[~]|_\\d{1,4}[a-z][~]");
     regex.indexIn(fileName);     //  Perform the search
     QStringList matches = regex.capturedTexts();
     foundVersion = matches.at(0).isEmpty() ? false : true;
 
     // Ensure compatibility with Save Incremental Backup
     // If this regex is not kept separate, the entire algorithm needs modification;
     // It's simpler to just add this.
     QRegExp regexAux("_\\d{1,4}[~]|_\\d{1,4}[a-z][~]");
     regexAux.indexIn(fileName);     //  Perform the search
     QStringList matchesAux = regexAux.capturedTexts();
     isBackup = matchesAux.at(0).isEmpty() ? false : true;
 
     // If the filename has a version, prepare it for incrementation
     if (foundVersion) {
         version = matches.at(matches.count() - 1);     //  Look at the last index, we don't care about other matches
         if (version.contains(QRegExp("[a-z]"))) {
             version.chop(1);             //  Trim "."
             letter = version.right(1);   //  Save letter
             version.chop(1);             //  Trim letter
         } else {
             version.chop(1);             //  Trim "."
         }
         version.remove(0, 1);            //  Trim "_"
     } else {
         // ...else, simply add a version to it so the next loop works
         QRegExp regex2("[.][a-z]{2,4}$");  //  Heuristic to find file extension
         regex2.indexIn(fileName);
         QStringList matches2 = regex2.capturedTexts();
         QString extensionPlusVersion = matches2.at(0);
         extensionPlusVersion.prepend(version);
         extensionPlusVersion.prepend("_");
         fileName.replace(regex2, extensionPlusVersion);
     }
 
     // Prepare the base for new version filename
     int intVersion = version.toInt(0);
     ++intVersion;
     QString baseNewVersion = QString::number(intVersion);
     while (baseNewVersion.length() < version.length()) {
         baseNewVersion.prepend("0");
     }
 
     // Check if the file exists under the new name and search until options are exhausted (test appending a to z)
     do {
         newVersion = baseNewVersion;
         newVersion.prepend("_");
         if (!letter.isNull()) newVersion.append(letter);
         if (isBackup) {
             newVersion.append("~");
         } else {
             newVersion.append(".");
         }
         fileName.replace(regex, newVersion);
         fileAlreadyExists = QFile(fileName).exists();
         if (fileAlreadyExists) {
             if (!letter.isNull()) {
                 char letterCh = letter.at(0).toLatin1();
                 ++letterCh;
                 letter = QString(QChar(letterCh));
             } else {
                 letter = 'a';
             }
         }
     } while (fileAlreadyExists && letter != "{");  // x, y, z, {...
 
     if (letter == "{") {
         QMessageBox::critical(mainWindow(), i18nc("@title:window", "Couldn't save incremental version"), i18n("Alternative names exhausted, try manually saving with a higher number"));
         return;
     }
     document()->setFileBatchMode(true);
     document()->saveAs(QUrl::fromUserInput(fileName));
     document()->setFileBatchMode(false);
 
     if (mainWindow()) {
         mainWindow()->updateCaption();
     }
 
 }
 
 void KisViewManager::slotSaveIncrementalBackup()
 {
     if (!document()) return;
 
     bool workingOnBackup;
     bool fileAlreadyExists;
     QString version = "000";
     QString newVersion;
     QString letter;
     QString fileName = document()->localFilePath();
 
     // First, discover if working on a backup file, or a normal file
     QRegExp regex("~\\d{1,4}[.]|~\\d{1,4}[a-z][.]");
     regex.indexIn(fileName);     //  Perform the search
     QStringList matches = regex.capturedTexts();
     workingOnBackup = matches.at(0).isEmpty() ? false : true;
 
     if (workingOnBackup) {
         // Try to save incremental version (of backup), use letter for alt versions
         version = matches.at(matches.count() - 1);     //  Look at the last index, we don't care about other matches
         if (version.contains(QRegExp("[a-z]"))) {
             version.chop(1);             //  Trim "."
             letter = version.right(1);   //  Save letter
             version.chop(1);             //  Trim letter
         } else {
             version.chop(1);             //  Trim "."
         }
         version.remove(0, 1);            //  Trim "~"
 
         // Prepare the base for new version filename
         int intVersion = version.toInt(0);
         ++intVersion;
         QString baseNewVersion = QString::number(intVersion);
         QString backupFileName = document()->localFilePath();
         while (baseNewVersion.length() < version.length()) {
             baseNewVersion.prepend("0");
         }
 
         // Check if the file exists under the new name and search until options are exhausted (test appending a to z)
         do {
             newVersion = baseNewVersion;
             newVersion.prepend("~");
             if (!letter.isNull()) newVersion.append(letter);
             newVersion.append(".");
             backupFileName.replace(regex, newVersion);
             fileAlreadyExists = QFile(backupFileName).exists();
             if (fileAlreadyExists) {
                 if (!letter.isNull()) {
                     char letterCh = letter.at(0).toLatin1();
                     ++letterCh;
                     letter = QString(QChar(letterCh));
                 } else {
                     letter = 'a';
                 }
             }
         } while (fileAlreadyExists && letter != "{");  // x, y, z, {...
 
         if (letter == "{") {
             QMessageBox::critical(mainWindow(), i18nc("@title:window", "Couldn't save incremental backup"), i18n("Alternative names exhausted, try manually saving with a higher number"));
             return;
         }
         QFile::copy(fileName, backupFileName);
         document()->saveAs(QUrl::fromUserInput(fileName));
 
         if (mainWindow()) mainWindow()->updateCaption();
     }
     else { // if NOT working on a backup...
         // Navigate directory searching for latest backup version, ignore letters
         const quint8 HARDCODED_DIGIT_COUNT = 3;
         QString baseNewVersion = "000";
         QString backupFileName = document()->localFilePath();
         QRegExp regex2("[.][a-z]{2,4}$");  //  Heuristic to find file extension
         regex2.indexIn(backupFileName);
         QStringList matches2 = regex2.capturedTexts();
         QString extensionPlusVersion = matches2.at(0);
         extensionPlusVersion.prepend(baseNewVersion);
         extensionPlusVersion.prepend("~");
         backupFileName.replace(regex2, extensionPlusVersion);
 
         // Save version with 1 number higher than the highest version found ignoring letters
         do {
             newVersion = baseNewVersion;
             newVersion.prepend("~");
             newVersion.append(".");
             backupFileName.replace(regex, newVersion);
             fileAlreadyExists = QFile(backupFileName).exists();
             if (fileAlreadyExists) {
                 // Prepare the base for new version filename, increment by 1
                 int intVersion = baseNewVersion.toInt(0);
                 ++intVersion;
                 baseNewVersion = QString::number(intVersion);
                 while (baseNewVersion.length() < HARDCODED_DIGIT_COUNT) {
                     baseNewVersion.prepend("0");
                 }
             }
         } while (fileAlreadyExists);
 
         // Save both as backup and on current file for interapplication workflow
         document()->setFileBatchMode(true);
         QFile::copy(fileName, backupFileName);
         document()->saveAs(QUrl::fromUserInput(fileName));
         document()->setFileBatchMode(false);
 
         if (mainWindow()) mainWindow()->updateCaption();
     }
 }
 
 void KisViewManager::disableControls()
 {
     // prevents possible crashes, if somebody changes the paintop during dragging by using the mousewheel
     // this is for Bug 250944
     // the solution blocks all wheel, mouse and key event, while dragging with the freehand tool
     // see KisToolFreehand::initPaint() and endPaint()
     d->controlFrame.paintopBox()->installEventFilter(&d->blockingEventFilter);
     Q_FOREACH (QObject* child, d->controlFrame.paintopBox()->children()) {
         child->installEventFilter(&d->blockingEventFilter);
     }
 }
 
 void KisViewManager::enableControls()
 {
     d->controlFrame.paintopBox()->removeEventFilter(&d->blockingEventFilter);
     Q_FOREACH (QObject* child, d->controlFrame.paintopBox()->children()) {
         child->removeEventFilter(&d->blockingEventFilter);
     }
 }
 
 void KisViewManager::showStatusBar(bool toggled)
 {
     KisMainWindow *mw = mainWindow();
     if(mw && mw->statusBar()) {
         mw->statusBar()->setVisible(toggled);
         KisConfig cfg;
         cfg.setShowStatusBar(toggled);
     }
 }
 
 void KisViewManager::switchCanvasOnly(bool toggled)
 {
     KisConfig cfg;
     KisMainWindow* main = mainWindow();
 
     if(!main) {
         dbgUI << "Unable to switch to canvas-only mode, main window not found";
         return;
     }
 
     if (toggled) {
         d->canvasState = qtMainWindow()->saveState();
     }
 
     if (cfg.hideStatusbarFullscreen()) {
         if (main->statusBar()) {
             if (!toggled) {
                 if (main->statusBar()->dynamicPropertyNames().contains("wasvisible")) {
                     if (main->statusBar()->property("wasvisible").toBool()) {
                         main->statusBar()->setVisible(true);
                     }
                 }
             }
             else {
                 main->statusBar()->setProperty("wasvisible", main->statusBar()->isVisible());
                 main->statusBar()->setVisible(false);
             }
         }
     }
 
     if (cfg.hideDockersFullscreen()) {
         KisAction* action = qobject_cast<KisAction*>(main->actionCollection()->action("view_toggledockers"));
         action->setCheckable(true);
         if (action && action->isChecked() == toggled) {
             action->setChecked(!toggled);
         }
     }
 
     if (cfg.hideTitlebarFullscreen() && !cfg.fullscreenMode()) {
         if(toggled) {
             main->setWindowState( main->windowState() | Qt::WindowFullScreen);
         } else {
             main->setWindowState( main->windowState() & ~Qt::WindowFullScreen);
         }
     }
 
     if (cfg.hideMenuFullscreen()) {
         if (!toggled) {
             if (main->menuBar()->dynamicPropertyNames().contains("wasvisible")) {
                 if (main->menuBar()->property("wasvisible").toBool()) {
                     main->menuBar()->setVisible(true);
                 }
             }
         }
         else {
             main->menuBar()->setProperty("wasvisible", main->menuBar()->isVisible());
             main->menuBar()->setVisible(false);
         }
     }
 
     if (cfg.hideToolbarFullscreen()) {
         QList<QToolBar*> toolBars = main->findChildren<QToolBar*>();
         Q_FOREACH (QToolBar* toolbar, toolBars) {
             if (!toggled) {
                 if (toolbar->dynamicPropertyNames().contains("wasvisible")) {
                     if (toolbar->property("wasvisible").toBool()) {
                         toolbar->setVisible(true);
                     }
                 }
             }
             else {
                 toolbar->setProperty("wasvisible", toolbar->isVisible());
                 toolbar->setVisible(false);
             }
         }
     }
 
     showHideScrollbars();
 
     if (toggled) {
         // show a fading heads-up display about the shortcut to go back
 
         showFloatingMessage(i18n("Going into Canvas-Only mode.\nPress %1 to go back.",
                                  actionCollection()->action("view_show_canvas_only")->shortcut().toString()), QIcon());
     }
     else {
         main->restoreState(d->canvasState);
     }
 
 }
 
 void KisViewManager::toggleTabletLogger()
 {
     d->inputManager.toggleTabletLogger();
 }
 
 void KisViewManager::openResourcesDirectory()
 {
     QString dir = KoResourcePaths::locateLocal("data", "");
     QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
 }
 
 void KisViewManager::updateIcons()
 {
     if (mainWindow()) {
         QList<QDockWidget*> dockers = mainWindow()->dockWidgets();
         Q_FOREACH (QDockWidget* dock, dockers) {
             dbgKrita << "name " << dock->objectName();
             KoDockWidgetTitleBar* titlebar = dynamic_cast<KoDockWidgetTitleBar*>(dock->titleBarWidget());
             if (titlebar) {
                 titlebar->updateIcons();
             }
 
             QObjectList objects;
             objects.append(dock);
             while (!objects.isEmpty()) {
                 QObject* object = objects.takeFirst();
                 objects.append(object->children());
 
                 KisIconUtils::updateIconCommon(object);
             }
         }
     }
 }
 void KisViewManager::initializeStatusBarVisibility()
 {
     KisConfig cfg;
     d->mainWindow->statusBar()->setVisible(cfg.showStatusBar());
 }
 
 void KisViewManager::guiUpdateTimeout()
 {
     d->nodeManager.updateGUI();
     d->selectionManager.updateGUI();
     d->filterManager.updateGUI();
     if (zoomManager()) {
         zoomManager()->updateGUI();
     }
     d->gridManager.updateGUI();
     d->actionManager.updateGUI();
 }
 
 void KisViewManager::showFloatingMessage(const QString &message, const QIcon& icon, int timeout, KisFloatingMessage::Priority priority, int alignment)
 {
     if (!d->currentImageView) return;
     d->currentImageView->showFloatingMessageImpl(message, icon, timeout, priority, alignment);
 
     emit floatingMessageRequested(message, icon.name());
 }
 
 KisMainWindow *KisViewManager::mainWindow() const
 {
     return qobject_cast<KisMainWindow*>(d->mainWindow);
 }
 
 
 void KisViewManager::showHideScrollbars()
 {
     if (!d->currentImageView) return;
     if (!d->currentImageView->canvasController()) return;
 
     KisConfig cfg;
     bool toggled = actionCollection()->action("view_show_canvas_only")->isChecked();
 
     if ( (toggled && cfg.hideScrollbarsFullscreen()) || (!toggled && cfg.hideScrollbars()) ) {
         d->currentImageView->canvasController()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         d->currentImageView->canvasController()->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     } else {
         d->currentImageView->canvasController()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
         d->currentImageView->canvasController()->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     }
 }
 
 void KisViewManager::slotSaveShowRulersState(bool value)
 {
     KisConfig cfg;
     cfg.setShowRulers(value);
 }
 
 void KisViewManager::slotSaveRulersTrackMouseState(bool value)
 {
     KisConfig cfg;
     cfg.setRulersTrackMouse(value);
 }
 
 void KisViewManager::setShowFloatingMessage(bool show)
 {
     d->showFloatingMessage = show;
 }
 
 void KisViewManager::changeAuthorProfile(const QString &profileName)
 {
     KConfigGroup appAuthorGroup(KoGlobal::calligraConfig(), "Author");
     if (profileName.isEmpty()) {
         appAuthorGroup.writeEntry("active-profile", "");
     } else if (profileName == i18nc("choice for author profile", "Anonymous")) {
         appAuthorGroup.writeEntry("active-profile", "anonymous");
     } else {
         appAuthorGroup.writeEntry("active-profile", profileName);
     }
     appAuthorGroup.sync();
     Q_FOREACH (KisDocument *doc, KisPart::instance()->documents()) {
         doc->documentInfo()->updateParameters();
     }
 }
 
 void KisViewManager::slotUpdateAuthorProfileActions()
 {
     Q_ASSERT(d->actionAuthor);
     if (!d->actionAuthor) {
         return;
     }
     d->actionAuthor->clear();
     d->actionAuthor->addAction(i18n("Default Author Profile"));
     d->actionAuthor->addAction(i18nc("choice for author profile", "Anonymous"));
 
     KConfigGroup authorGroup(KoGlobal::calligraConfig(), "Author");
     QStringList profiles = authorGroup.readEntry("profile-names", QStringList());
     Q_FOREACH (const QString &profile , profiles) {
         d->actionAuthor->addAction(profile);
     }
 
     KConfigGroup appAuthorGroup(KoGlobal::calligraConfig(), "Author");
     QString profileName = appAuthorGroup.readEntry("active-profile", "");
 
     if (profileName == "anonymous") {
         d->actionAuthor->setCurrentItem(1);
     } else if (profiles.contains(profileName)) {
         d->actionAuthor->setCurrentAction(profileName);
     } else {
         d->actionAuthor->setCurrentItem(0);
     }
 }
 
 
diff --git a/libs/ui/brushhud/kis_brush_hud.cpp b/libs/ui/brushhud/kis_brush_hud.cpp
new file mode 100644
index 0000000000..1ea80bb807
--- /dev/null
+++ b/libs/ui/brushhud/kis_brush_hud.cpp
@@ -0,0 +1,269 @@
+/*
+ *  Copyright (c) 2016 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_brush_hud.h"
+
+#include <QGuiApplication>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QPointer>
+#include <QLabel>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QScrollArea>
+#include <QEvent>
+#include <QToolButton>
+
+
+#include "kis_uniform_paintop_property.h"
+#include "kis_slider_based_paintop_property.h"
+#include "kis_uniform_paintop_property_widget.h"
+#include "kis_canvas_resource_provider.h"
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings.h"
+#include "kis_signal_auto_connection.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_icon_utils.h"
+#include "kis_dlg_brush_hud_config.h"
+#include "kis_brush_hud_properties_config.h"
+#include "kis_elided_label.h"
+
+#include "kis_debug.h"
+
+
+struct KisBrushHud::Private
+{
+    QPointer<KisElidedLabel> lblPresetName;
+    QPointer<QLabel> lblPresetIcon;
+    QPointer<QWidget> wdgProperties;
+    QPointer<QScrollArea> wdgPropertiesArea;
+    QPointer<QVBoxLayout> propertiesLayout;
+    QPointer<QToolButton> btnConfigure;
+
+    KisCanvasResourceProvider *provider;
+
+    KisSignalAutoConnectionsStore connections;
+    KisSignalAutoConnectionsStore presetConnections;
+
+    KisPaintOpPresetSP currentPreset;
+};
+
+KisBrushHud::KisBrushHud(KisCanvasResourceProvider *provider, QWidget *parent)
+    : QWidget(parent, Qt::FramelessWindowHint),
+      m_d(new Private)
+{
+    m_d->provider = provider;
+
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    QHBoxLayout *labelLayout = new QHBoxLayout();
+    m_d->lblPresetIcon = new QLabel(this);
+    const QSize iconSize = QSize(22,22) * qApp->devicePixelRatio();
+    m_d->lblPresetIcon->setMinimumSize(iconSize);
+    m_d->lblPresetIcon->setMaximumSize(iconSize);
+    m_d->lblPresetIcon->setScaledContents(true);
+
+    m_d->lblPresetName = new KisElidedLabel("<Preset Name>", Qt::ElideMiddle, this);
+
+    m_d->btnConfigure = new QToolButton(this);
+    m_d->btnConfigure->setAutoRaise(true);
+    m_d->btnConfigure->setIcon(KisIconUtils::loadIcon("applications-system"));
+    connect(m_d->btnConfigure, SIGNAL(clicked()), SLOT(slotConfigBrushHud()));
+
+    labelLayout->addWidget(m_d->lblPresetIcon);
+    labelLayout->addWidget(m_d->lblPresetName);
+    labelLayout->addWidget(m_d->btnConfigure);
+
+    layout->addLayout(labelLayout);
+
+    m_d->wdgPropertiesArea = new QScrollArea(this);
+    m_d->wdgPropertiesArea->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+    m_d->wdgPropertiesArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    m_d->wdgPropertiesArea->setWidgetResizable(true);
+
+    m_d->wdgProperties = new QWidget(this);
+    m_d->propertiesLayout = new QVBoxLayout(this);
+    m_d->propertiesLayout->setSpacing(0);
+    m_d->propertiesLayout->setContentsMargins(0, 0, 22, 0);
+    m_d->propertiesLayout->setSizeConstraint(QLayout::SetMinimumSize);
+
+    // not adding any widgets until explicitly requested
+
+    m_d->wdgProperties->setLayout(m_d->propertiesLayout);
+    m_d->wdgPropertiesArea->setWidget(m_d->wdgProperties);
+    layout->addWidget(m_d->wdgPropertiesArea);
+
+    setLayout(layout);
+    setCursor(Qt::ArrowCursor);
+}
+
+KisBrushHud::~KisBrushHud()
+{
+}
+
+QSize KisBrushHud::sizeHint() const
+{
+    QSize size = QWidget::sizeHint();
+    return QSize(size.width(), parentWidget()->height());
+}
+
+void KisBrushHud::slotReloadProperties()
+{
+    m_d->presetConnections.clear();
+    clearProperties();
+    updateProperties();
+}
+
+void KisBrushHud::clearProperties() const
+{
+    while (m_d->propertiesLayout->count()) {
+        QLayoutItem *item = m_d->propertiesLayout->takeAt(0);
+
+        QWidget *w = item->widget();
+        if (w) {
+            w->deleteLater();
+        }
+
+        delete item;
+    }
+
+    m_d->currentPreset.clear();
+}
+
+void KisBrushHud::updateProperties()
+{
+    KisPaintOpPresetSP preset = m_d->provider->currentPreset();
+    KisPaintOpSettingsSP settings = preset->settings();
+
+    if (preset == m_d->currentPreset) return;
+
+    m_d->presetConnections.clear();
+    clearProperties();
+
+    m_d->currentPreset = preset;
+    m_d->presetConnections.addConnection(
+        m_d->currentPreset->updateProxy(), SIGNAL(sigUniformPropertiesChanged()),
+        this, SLOT(slotReloadProperties()));
+
+    m_d->lblPresetIcon->setPixmap(QPixmap::fromImage(preset->image()));
+    m_d->lblPresetName->setLongText(preset->name());
+
+    QList<KisUniformPaintOpPropertySP> properties;
+
+    {
+        QList<KisUniformPaintOpPropertySP> allProperties = settings->uniformProperties();
+        QList<KisUniformPaintOpPropertySP> discardedProperties;
+
+        KisBrushHudPropertiesConfig cfg;
+        cfg.filterProperties(preset->paintOp().id(),
+                             allProperties,
+                             &properties,
+                             &discardedProperties);
+    }
+
+    Q_FOREACH(auto property, properties) {
+        QWidget *w = 0;
+
+        if (!property->isVisible()) continue;
+
+        if (property->type() == KisUniformPaintOpProperty::Int) {
+            w = new KisUniformPaintOpPropertyIntSlider(property, m_d->wdgProperties);
+        } else if (property->type() == KisUniformPaintOpProperty::Double) {
+            w = new KisUniformPaintOpPropertyDoubleSlider(property, m_d->wdgProperties);
+        } else if (property->type() == KisUniformPaintOpProperty::Bool) {
+            w = new KisUniformPaintOpPropertyCheckBox(property, m_d->wdgProperties);
+        } else if (property->type() == KisUniformPaintOpProperty::Combo) {
+            w = new KisUniformPaintOpPropertyComboBox(property, m_d->wdgProperties);
+        }
+
+        if (w) {
+            w->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            m_d->propertiesLayout->addWidget(w);
+        }
+    }
+
+    m_d->propertiesLayout->addStretch();
+}
+
+void KisBrushHud::showEvent(QShowEvent *event)
+{
+    m_d->connections.clear();
+    m_d->connections.addUniqueConnection(
+        m_d->provider->resourceManager(), SIGNAL(canvasResourceChanged(int, QVariant)),
+        this, SLOT(slotCanvasResourceChanged(int, QVariant)));
+
+    updateProperties();
+
+    QWidget::showEvent(event);
+}
+
+void KisBrushHud::hideEvent(QHideEvent *event)
+{
+    m_d->connections.clear();
+    QWidget::hideEvent(event);
+
+    clearProperties();
+}
+
+void KisBrushHud::slotCanvasResourceChanged(int key, const QVariant &resource)
+{
+    Q_UNUSED(resource);
+
+    if (key == KisCanvasResourceProvider::CurrentPaintOpPreset) {
+        updateProperties();
+    }
+}
+
+void KisBrushHud::paintEvent(QPaintEvent *event)
+{
+    QColor bgColor = palette().color(QPalette::Window);
+
+    QPainter painter(this);
+    painter.fillRect(rect() & event->rect(), bgColor);
+    painter.end();
+
+    QWidget::paintEvent(event);
+}
+
+bool KisBrushHud::event(QEvent *event)
+{
+    switch (event->type()) {
+    case QEvent::TabletPress:
+    case QEvent::TabletMove:
+    case QEvent::TabletRelease:
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonRelease:
+    case QEvent::Wheel:
+        event->accept();
+        return true;
+    }
+
+    return QWidget::event(event);
+}
+
+void KisBrushHud::slotConfigBrushHud()
+{
+    if (!m_d->currentPreset) return;
+
+    KisDlgConfigureBrushHud dlg(m_d->currentPreset);
+    dlg.exec();
+
+    slotReloadProperties();
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/brushhud/kis_brush_hud.h
similarity index 58%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/brushhud/kis_brush_hud.h
index 191461c149..6ed7c6aea0 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/brushhud/kis_brush_hud.h
@@ -1,53 +1,56 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_BRUSH_HUD_H
+#define __KIS_BRUSH_HUD_H
 
 #include <QScopedPointer>
-#include <QObject>
-#include "kritaui_export.h"
+#include <QWidget>
 
-class QSpinBox;
-class KoAspectButton;
+class KisCanvasResourceProvider;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+class KisBrushHud : public QWidget
 {
     Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
+    KisBrushHud(KisCanvasResourceProvider *provider, QWidget *parent);
+    ~KisBrushHud();
 
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    void updateProperties();
+    QSize sizeHint() const;
 
+protected:
+    void paintEvent(QPaintEvent *event);
+    bool event(QEvent *event);
+    void showEvent(QShowEvent *event);
+    void hideEvent(QHideEvent *event);
 
 private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+    void slotCanvasResourceChanged(int key, const QVariant &resource);
+    void slotReloadProperties();
+    void slotConfigBrushHud();
 
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+private:
+    void clearProperties() const;
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_BRUSH_HUD_H */
diff --git a/libs/ui/brushhud/kis_brush_hud_properties_config.cpp b/libs/ui/brushhud/kis_brush_hud_properties_config.cpp
new file mode 100644
index 0000000000..cf29bbf3e0
--- /dev/null
+++ b/libs/ui/brushhud/kis_brush_hud_properties_config.cpp
@@ -0,0 +1,141 @@
+/*
+ *  Copyright (c) 2016 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_brush_hud_properties_config.h"
+
+#include <QDomDocument>
+#include <QDomElement>
+
+#include "kis_config.h"
+#include "kis_dom_utils.h"
+
+
+struct KisBrushHudPropertiesConfig::Private
+{
+    QDomDocument doc;
+    QDomElement root;
+
+    void readConfig();
+    void writeConfig();
+
+    QDomDocument createDocument();
+};
+
+KisBrushHudPropertiesConfig::KisBrushHudPropertiesConfig()
+    : m_d(new Private)
+{
+    m_d->readConfig();
+}
+
+
+KisBrushHudPropertiesConfig::~KisBrushHudPropertiesConfig()
+{
+    m_d->writeConfig();
+}
+
+void KisBrushHudPropertiesConfig::setSelectedProperties(const QString &paintOpId, const QList<QString> &ids)
+{
+    QDomElement el = m_d->doc.createElement(paintOpId);
+
+    KisDomUtils::saveValue(&el, "properties_list", ids);
+
+    QDomElement oldEl = m_d->root.firstChildElement(paintOpId);
+    if (!oldEl.isNull()) {
+        m_d->root.replaceChild(el, oldEl);
+    } else {
+        m_d->root.appendChild(el);
+    }
+}
+
+QList<QString> KisBrushHudPropertiesConfig::selectedProperties(const QString &paintOpId) const
+{
+    QList<QString> result;
+    QDomElement el;
+    QStringList errors;
+
+    if (KisDomUtils::findOnlyElement(m_d->root, paintOpId, &el, &errors)) {
+        KisDomUtils::loadValue(el, "properties_list", &result);
+    }
+
+    return result;
+}
+
+void KisBrushHudPropertiesConfig::Private::readConfig()
+{
+    KisConfig cfg;
+    doc = QDomDocument();
+
+    QString docContent = cfg.brushHudSetting();
+    if (!docContent.isNull()) {
+        doc.setContent(docContent);
+        root = doc.firstChildElement("hud_properties");
+
+        int version = -1;
+        if (!KisDomUtils::loadValue(root, "version", &version) ||
+            version != 1) {
+
+            warnKrita << "Unknows Brush HUD XML document type or version!";
+            doc = QDomDocument();
+        }
+    }
+
+    if (doc.isNull()) {
+        doc = QDomDocument("hud_properties");
+        root = doc.createElement("hud_properties");
+        doc.appendChild(root);
+
+        KisDomUtils::saveValue(&root, "version", 1);
+    }
+}
+
+void KisBrushHudPropertiesConfig::Private::writeConfig()
+{
+    KisConfig cfg;
+    cfg.setBrushHudSetting(doc.toString());
+}
+
+void KisBrushHudPropertiesConfig::filterProperties(
+    const QString &paintOpId,
+    const QList<KisUniformPaintOpPropertySP> &allProperties,
+    QList<KisUniformPaintOpPropertySP> *chosenProperties,
+    QList<KisUniformPaintOpPropertySP> *skippedProperties) const {
+
+    QList<QString> selectedIds = selectedProperties(paintOpId);
+    *skippedProperties = allProperties;
+
+    Q_FOREACH (const QString &id, selectedIds) {
+        auto it = std::find_if(skippedProperties->begin(),
+                               skippedProperties->end(),
+                               [id] (KisUniformPaintOpPropertySP prop) {
+                                   return prop->id() == id;
+                               });
+
+        if (it != skippedProperties->end()) {
+            *chosenProperties << *it;
+            it = skippedProperties->erase(it);
+        } else {
+            warnKrita << "Filtering HUD properties: property \"" << id << "\" does not exist!";
+            ++it;
+        }
+    }
+}
+
+QDomDocument* KisBrushHudPropertiesConfig::testingGetDocument()
+{
+    return &m_d->doc;
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/brushhud/kis_brush_hud_properties_config.h
similarity index 51%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/brushhud/kis_brush_hud_properties_config.h
index 191461c149..8e4655dee9 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/brushhud/kis_brush_hud_properties_config.h
@@ -1,53 +1,54 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_BRUSH_HUD_PROPERTIES_CONFIG_H
+#define __KIS_BRUSH_HUD_PROPERTIES_CONFIG_H
 
 #include <QScopedPointer>
-#include <QObject>
 #include "kritaui_export.h"
 
-class QSpinBox;
-class KoAspectButton;
+#include "brushengine/kis_uniform_paintop_property.h"
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+class QDomDocument;
+class QStringList;
+class QString;
+
+
+class KRITAUI_EXPORT KisBrushHudPropertiesConfig
 {
-    Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
+    KisBrushHudPropertiesConfig();
+    ~KisBrushHudPropertiesConfig();
 
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    void setSelectedProperties(const QString &paintOpId, const QList<QString> &ids);
+    QList<QString> selectedProperties(const QString &paintOpId) const;
 
+    void filterProperties(const QString &paintOpId,
+                          const QList<KisUniformPaintOpPropertySP> &allProperties,
+                          QList<KisUniformPaintOpPropertySP> *chosenProperties,
+                          QList<KisUniformPaintOpPropertySP> *skippedProperties) const;
 
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
-
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+public:
+    QDomDocument *testingGetDocument();
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_BRUSH_HUD_PROPERTIES_CONFIG_H */
diff --git a/libs/ui/brushhud/kis_brush_hud_properties_list.cpp b/libs/ui/brushhud/kis_brush_hud_properties_list.cpp
new file mode 100644
index 0000000000..1f294a3bb3
--- /dev/null
+++ b/libs/ui/brushhud/kis_brush_hud_properties_list.cpp
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2016 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_brush_hud_properties_list.h"
+
+
+struct KisBrushHudPropertiesList::Private
+{
+};
+
+KisBrushHudPropertiesList::KisBrushHudPropertiesList(QWidget *parent)
+    : QListWidget(parent),
+      m_d(new Private)
+{
+    setDragDropMode(QAbstractItemView::DragDrop);
+    setDefaultDropAction(Qt::MoveAction);
+}
+
+KisBrushHudPropertiesList::~KisBrushHudPropertiesList()
+{
+}
+
+void KisBrushHudPropertiesList::addProperties(const QList<KisUniformPaintOpPropertySP> &properties)
+{
+    int index = 0;
+    Q_FOREACH (KisUniformPaintOpPropertySP prop, properties) {
+        QListWidgetItem *item = new QListWidgetItem(prop->name(), this);
+        item->setData(Qt::UserRole, prop->id());
+        addItem(item);
+        index++;
+    }
+}
+
+QList<QString> KisBrushHudPropertiesList::selectedPropertiesIds() const
+{
+    QList<QString> ids;
+
+    for (int i = 0; i < count(); i++) {
+        ids << item(i)->data(Qt::UserRole).toString();
+    }
+
+    return ids;
+}
+
+Qt::DropActions KisBrushHudPropertiesList::supportedDropActions() const
+{
+    // we cannot change drop actions to Move only! It stops working
+    // for some reason :(
+    return QListWidget::supportedDropActions();
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/brushhud/kis_brush_hud_properties_list.h
similarity index 59%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/brushhud/kis_brush_hud_properties_list.h
index 191461c149..56bf82714f 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/brushhud/kis_brush_hud_properties_list.h
@@ -1,53 +1,43 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_BRUSH_HUD_PROPERTIES_LIST_H
+#define __KIS_BRUSH_HUD_PROPERTIES_LIST_H
 
 #include <QScopedPointer>
-#include <QObject>
-#include "kritaui_export.h"
+#include <QListWidget>
+#include "kis_uniform_paintop_property.h"
 
-class QSpinBox;
-class KoAspectButton;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+class KisBrushHudPropertiesList : public QListWidget
 {
-    Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
+    KisBrushHudPropertiesList(QWidget *parent);
+    ~KisBrushHudPropertiesList();
 
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    void addProperties(const QList<KisUniformPaintOpPropertySP> &properties);
+    QList<QString> selectedPropertiesIds() const;
 
-
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
-
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+    Qt::DropActions supportedDropActions() const;
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_BRUSH_HUD_PROPERTIES_LIST_H */
diff --git a/libs/ui/brushhud/kis_dlg_brush_hud_config.cpp b/libs/ui/brushhud/kis_dlg_brush_hud_config.cpp
new file mode 100644
index 0000000000..235c533a56
--- /dev/null
+++ b/libs/ui/brushhud/kis_dlg_brush_hud_config.cpp
@@ -0,0 +1,129 @@
+/*
+ *  Copyright (c) 2016 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_dlg_brush_hud_config.h"
+#include "ui_kis_dlg_brush_hud_config.h"
+
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings.h"
+
+#include "kis_brush_hud_properties_config.h"
+
+
+struct KisDlgConfigureBrushHud::Private
+{
+    KisPaintOpPresetSP preset;
+    QList<KisUniformPaintOpPropertySP> properties;
+};
+
+KisDlgConfigureBrushHud::KisDlgConfigureBrushHud(KisPaintOpPresetSP preset, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::KisDlgConfigureBrushHud),
+    m_d(new Private)
+{
+    ui->setupUi(this);
+
+    m_d->preset = preset;
+    m_d->properties = preset->settings()->uniformProperties();
+
+    QList<KisUniformPaintOpPropertySP> available;
+    QList<KisUniformPaintOpPropertySP> chosen;
+
+    KisBrushHudPropertiesConfig cfg;
+    cfg.filterProperties(preset->paintOp().id(),
+                         m_d->properties, &chosen, &available);
+
+    ui->lstAvailable->addProperties(available);
+    ui->lstCurrent->addProperties(chosen);
+
+    connect(this, SIGNAL(accepted()), SLOT(slotConfigAccepted()));
+
+    connect(ui->btnAdd, SIGNAL(clicked()), SLOT(slotMoveRight()));
+    connect(ui->btnRemove, SIGNAL(clicked()), SLOT(slotMoveLeft()));
+
+    connect(ui->btnDown, SIGNAL(clicked()), SLOT(slotMoveDown()));
+    connect(ui->btnUp, SIGNAL(clicked()), SLOT(slotMoveUp()));
+}
+
+KisDlgConfigureBrushHud::~KisDlgConfigureBrushHud()
+{
+    delete ui;
+}
+
+void KisDlgConfigureBrushHud::slotConfigAccepted()
+{
+    KisBrushHudPropertiesConfig cfg;
+    cfg.setSelectedProperties(m_d->preset->paintOp().id(), ui->lstCurrent->selectedPropertiesIds());
+}
+
+void KisDlgConfigureBrushHud::slotMoveRight()
+{
+    QListWidgetItem *item = ui->lstAvailable->currentItem();
+    if (!item) return;
+
+    const int prevPosition = ui->lstAvailable->row(item) - 1;
+    const int newPosition = ui->lstCurrent->currentRow() + 1;
+
+    ui->lstAvailable->takeItem(ui->lstAvailable->row(item));
+    ui->lstAvailable->setCurrentRow(qMax(0, prevPosition));
+    ui->lstCurrent->insertItem(newPosition, item);
+    ui->lstCurrent->setCurrentItem(item);
+}
+
+void KisDlgConfigureBrushHud::slotMoveLeft()
+{
+    QListWidgetItem *item = ui->lstCurrent->currentItem();
+    if (!item) return;
+
+    const int prevPosition = ui->lstCurrent->row(item) - 1;
+    const int newPosition = ui->lstAvailable->currentRow() + 1;
+
+    ui->lstCurrent->takeItem(ui->lstCurrent->row(item));
+    ui->lstCurrent->setCurrentRow(qMax(0, prevPosition));
+    ui->lstAvailable->insertItem(newPosition, item);
+    ui->lstAvailable->setCurrentItem(item);
+}
+
+void KisDlgConfigureBrushHud::slotMoveUp()
+{
+    QListWidgetItem *item = ui->lstCurrent->currentItem();
+    if (!item) return;
+
+    int position = ui->lstCurrent->row(item);
+
+    if (position <= 0) return;
+
+    ui->lstCurrent->takeItem(ui->lstCurrent->row(item));
+    ui->lstCurrent->insertItem(position - 1, item);
+    ui->lstCurrent->setCurrentItem(item);
+}
+
+void KisDlgConfigureBrushHud::slotMoveDown()
+{
+    QListWidgetItem *item = ui->lstCurrent->currentItem();
+    if (!item) return;
+
+    int position = ui->lstCurrent->row(item);
+
+    if (position >= ui->lstCurrent->count() - 1) return;
+
+    ui->lstCurrent->takeItem(ui->lstCurrent->row(item));
+    ui->lstCurrent->insertItem(position + 1, item);
+    ui->lstCurrent->setCurrentItem(item);
+}
+
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/brushhud/kis_dlg_brush_hud_config.h
similarity index 61%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/brushhud/kis_dlg_brush_hud_config.h
index 191461c149..717c176810 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/brushhud/kis_dlg_brush_hud_config.h
@@ -1,53 +1,56 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef KIS_DLG_BRUSH_HUD_CONFIG_H
+#define KIS_DLG_BRUSH_HUD_CONFIG_H
 
 #include <QScopedPointer>
-#include <QObject>
-#include "kritaui_export.h"
+#include <QDialog>
 
-class QSpinBox;
-class KoAspectButton;
+#include "kis_types.h"
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+
+namespace Ui {
+class KisDlgConfigureBrushHud;
+}
+
+class KisDlgConfigureBrushHud : public QDialog
 {
     Q_OBJECT
-public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
-
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
 
+public:
+    explicit KisDlgConfigureBrushHud(KisPaintOpPresetSP preset, QWidget *parent = 0);
+    ~KisDlgConfigureBrushHud();
 
 private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+    void slotConfigAccepted();
+
+    void slotMoveRight();
+    void slotMoveLeft();
+    void slotMoveUp();
+    void slotMoveDown();
 
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+private:
+    Ui::KisDlgConfigureBrushHud *ui;
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif // KIS_DLG_BRUSH_HUD_CONFIG_H
diff --git a/libs/ui/brushhud/kis_dlg_brush_hud_config.ui b/libs/ui/brushhud/kis_dlg_brush_hud_config.ui
new file mode 100644
index 0000000000..bf90400738
--- /dev/null
+++ b/libs/ui/brushhud/kis_dlg_brush_hud_config.ui
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>KisDlgConfigureBrushHud</class>
+ <widget class="QDialog" name="KisDlgConfigureBrushHud">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>559</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Brush HUD configuration</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Available properties:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="KisBrushHudPropertiesList" name="lstAvailable"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QToolButton" name="btnAdd">
+         <property name="text">
+          <string>&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="btnRemove">
+         <property name="text">
+          <string>&lt;</string>
+         </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>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Current properties:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="KisBrushHudPropertiesList" name="lstCurrent"/>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QPushButton" name="btnUp">
+           <property name="text">
+            <string>Up</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnDown">
+           <property name="text">
+            <string>Down</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3">
+     <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>56</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="btnBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KisBrushHudPropertiesList</class>
+   <extends>QListView</extends>
+   <header>brushhud/kis_brush_hud_properties_list.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>btnBox</sender>
+   <signal>accepted()</signal>
+   <receiver>KisDlgConfigureBrushHud</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>btnBox</sender>
+   <signal>rejected()</signal>
+   <receiver>KisDlgConfigureBrushHud</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/libs/ui/brushhud/kis_round_hud_button.cpp b/libs/ui/brushhud/kis_round_hud_button.cpp
new file mode 100644
index 0000000000..e9a36ba063
--- /dev/null
+++ b/libs/ui/brushhud/kis_round_hud_button.cpp
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2016 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_round_hud_button.h"
+
+#include <QPaintEvent>
+#include <QPainter>
+
+#include "kis_global.h"
+
+
+
+struct KisRoundHudButton::Private
+{
+    Private() : isHighlighted(false) {}
+
+    bool isHighlighted;
+    QIcon onIcon;
+    QIcon offIcon;
+};
+
+KisRoundHudButton::KisRoundHudButton(QWidget *parent)
+    : QAbstractButton(parent),
+      m_d(new Private)
+{
+    setMouseTracking(true);
+}
+
+KisRoundHudButton::~KisRoundHudButton()
+{
+}
+
+void KisRoundHudButton::setOnOffIcons(const QIcon &on, const QIcon &off)
+{
+    m_d->onIcon = on;
+    m_d->offIcon = off;
+}
+
+void KisRoundHudButton::paintEvent(QPaintEvent *event)
+{
+    const int borderWidth = 3;
+    const QPointF center = QRectF(rect()).center();
+    const qreal radius = 0.5 * (center.x() + center.y()) - borderWidth;
+
+    const QPen fgPen(palette().color(m_d->isHighlighted ? QPalette::Highlight : QPalette::WindowText), borderWidth);
+    const QBrush bgBrush(palette().brush(isDown() || (isCheckable() && isChecked()) ? QPalette::Mid : QPalette::Window));
+
+    QPainter painter(this);
+    painter.setPen(fgPen);
+    painter.setBrush(bgBrush);
+    painter.setRenderHints(QPainter::Antialiasing);
+
+    painter.drawEllipse(center, radius, radius);
+
+    if (!icon().isNull()) {
+        const QIcon::Mode mode = isEnabled() ? QIcon::Normal : QIcon::Disabled;
+        const QIcon::State state = isCheckable() && isChecked() ? QIcon::On : QIcon::Off;
+        const QSize size = iconSize();
+
+        QPixmap pixmap = icon().pixmap(size, mode, state);
+
+        QPointF iconOffset(0.5 * (width() - pixmap.width()),
+                           0.5 * (height() - pixmap.height()));
+
+        painter.drawPixmap(iconOffset, pixmap);
+    }
+
+    if (!m_d->onIcon.isNull() && !m_d->onIcon.isNull()) {
+        const QIcon::Mode mode = isEnabled() ? QIcon::Normal : QIcon::Disabled;
+        const QIcon icon = isCheckable() && isChecked() ? m_d->onIcon : m_d->offIcon;
+        const QSize size = iconSize();
+
+        QPixmap pixmap = icon.pixmap(size, mode);
+        QPointF iconOffset(0.5 * (width() - pixmap.width()),
+                           0.5 * (height() - pixmap.height()));
+
+        painter.drawPixmap(iconOffset, pixmap);
+    }
+}
+
+bool KisRoundHudButton::hitButton(const QPoint &pos) const
+{
+    const int borderWidth = 3;
+    const QPointF center = QRectF(rect()).center();
+    const qreal radius = 0.5 * (center.x() + center.y()) - borderWidth;
+
+    return kisDistance(center, pos) < radius;
+}
+
+void KisRoundHudButton::mouseMoveEvent(QMouseEvent *event)
+{
+    m_d->isHighlighted = hitButton(event->pos());
+    QAbstractButton::mouseMoveEvent(event);
+}
+
+void KisRoundHudButton::leaveEvent(QEvent *event)
+{
+    Q_UNUSED(event);
+    m_d->isHighlighted = false;
+
+    QAbstractButton::leaveEvent(event);
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/brushhud/kis_round_hud_button.h
similarity index 59%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/brushhud/kis_round_hud_button.h
index 191461c149..4ebee9f4b7 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/brushhud/kis_round_hud_button.h
@@ -1,53 +1,47 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_ROUND_HUD_BUTTON_H
+#define __KIS_ROUND_HUD_BUTTON_H
 
 #include <QScopedPointer>
-#include <QObject>
-#include "kritaui_export.h"
+#include <QAbstractButton>
 
-class QSpinBox;
-class KoAspectButton;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+
+class KisRoundHudButton : public QAbstractButton
 {
-    Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
-
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    KisRoundHudButton(QWidget *parent);
+    ~KisRoundHudButton();
 
+    void setOnOffIcons(const QIcon &on, const QIcon &off);
 
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+protected:
+    void paintEvent(QPaintEvent *event);
+    bool hitButton(const QPoint &pos) const;
 
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+    void mouseMoveEvent(QMouseEvent *event);
+    void leaveEvent(QEvent *event);
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_ROUND_HUD_BUTTON_H */
diff --git a/libs/ui/brushhud/kis_uniform_paintop_property_widget.cpp b/libs/ui/brushhud/kis_uniform_paintop_property_widget.cpp
new file mode 100644
index 0000000000..06736238af
--- /dev/null
+++ b/libs/ui/brushhud/kis_uniform_paintop_property_widget.cpp
@@ -0,0 +1,225 @@
+/*
+ *  Copyright (c) 2016 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_uniform_paintop_property_widget.h"
+
+#include <QVBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+
+#include "kis_slider_spin_box.h"
+#include "kis_acyclic_signal_connector.h"
+#include "kis_slider_based_paintop_property.h"
+#include "kis_combo_based_paintop_property.h"
+#include "kis_debug.h"
+
+/****************************************************************/
+/*      KisUniformPaintOpPropertyWidget                         */
+/****************************************************************/
+
+struct KisUniformPaintOpPropertyWidget::Private
+{
+    Private(KisUniformPaintOpPropertySP _property)
+        : property(_property) {}
+
+    typedef KisUniformPaintOpProperty::Type Type;
+    KisUniformPaintOpPropertySP property;
+};
+
+KisUniformPaintOpPropertyWidget::KisUniformPaintOpPropertyWidget(KisUniformPaintOpPropertySP property, QWidget *parent)
+    : QWidget(parent),
+      m_d(new Private(property))
+{
+    KisAcyclicSignalConnector *conn = new KisAcyclicSignalConnector(this);
+    conn->connectForwardVariant(property.data(), SIGNAL(valueChanged(const QVariant&)),
+                                this, SLOT(setValue(const QVariant&)));
+
+    conn->connectBackwardVariant(this, SIGNAL(valueChanged(const QVariant&)),
+                                 property.data(), SLOT(setValue(const QVariant&)));
+}
+
+KisUniformPaintOpPropertyWidget::~KisUniformPaintOpPropertyWidget()
+{
+}
+
+KisUniformPaintOpPropertySP KisUniformPaintOpPropertyWidget::property() const
+{
+    return m_d->property;
+}
+
+/****************************************************************/
+/*      KisUniformPaintOpPropertyIntSlider                      */
+/****************************************************************/
+
+KisUniformPaintOpPropertyIntSlider::KisUniformPaintOpPropertyIntSlider(KisUniformPaintOpPropertySP property, QWidget *parent)
+    : KisUniformPaintOpPropertyWidget(property, parent)
+{
+    const QString prefix = QString("%1: ").arg(property->name());
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    KisIntSliderBasedPaintOpProperty *sliderProperty =
+        dynamic_cast<KisIntSliderBasedPaintOpProperty*>(property.data());
+    KIS_ASSERT_RECOVER_RETURN(sliderProperty);
+
+    m_slider = new KisSliderSpinBox(this);
+    m_slider->setBlockUpdateSignalOnDrag(true);
+    m_slider->setRange(sliderProperty->min(), sliderProperty->max());
+    m_slider->setSingleStep(sliderProperty->singleStep());
+    m_slider->setPageStep(sliderProperty->pageStep());
+    m_slider->setPrefix(prefix);
+    m_slider->setSuffix(sliderProperty->suffix());
+    m_slider->setExponentRatio(sliderProperty->exponentRatio());
+
+    m_slider->setValue(sliderProperty->value().toInt());
+    connect(m_slider, SIGNAL(valueChanged(int)), SLOT(slotSliderChanged(int)));
+
+    layout->addWidget(m_slider);
+    setLayout(layout);
+}
+
+void KisUniformPaintOpPropertyIntSlider::setValue(const QVariant &value)
+{
+    m_slider->setValue(value.toInt());
+}
+
+void KisUniformPaintOpPropertyIntSlider::slotSliderChanged(int value)
+{
+    emit valueChanged(value);
+}
+
+/****************************************************************/
+/*      KisUniformPaintOpPropertyDoubleSlider                   */
+/****************************************************************/
+
+KisUniformPaintOpPropertyDoubleSlider::KisUniformPaintOpPropertyDoubleSlider(KisUniformPaintOpPropertySP property, QWidget *parent)
+    : KisUniformPaintOpPropertyWidget(property, parent)
+{
+    const QString prefix = QString("%1: ").arg(property->name());
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    KisDoubleSliderBasedPaintOpProperty *sliderProperty =
+        dynamic_cast<KisDoubleSliderBasedPaintOpProperty*>(property.data());
+    KIS_ASSERT_RECOVER_RETURN(sliderProperty);
+
+    m_slider = new KisDoubleSliderSpinBox(this);
+    m_slider->setBlockUpdateSignalOnDrag(true);
+    m_slider->setRange(sliderProperty->min(), sliderProperty->max(), sliderProperty->decimals());
+    m_slider->setSingleStep(sliderProperty->singleStep());
+    m_slider->setPrefix(prefix);
+    m_slider->setSuffix(sliderProperty->suffix());
+    m_slider->setExponentRatio(sliderProperty->exponentRatio());
+
+    m_slider->setValue(sliderProperty->value().toReal());
+    connect(m_slider, SIGNAL(valueChanged(qreal)), SLOT(slotSliderChanged(qreal)));
+
+    layout->addWidget(m_slider);
+    setLayout(layout);
+}
+
+void KisUniformPaintOpPropertyDoubleSlider::setValue(const QVariant &value)
+{
+    m_slider->setValue(value.toReal());
+}
+
+void KisUniformPaintOpPropertyDoubleSlider::slotSliderChanged(qreal value)
+{
+    emit valueChanged(value);
+}
+
+/****************************************************************/
+/*      KisUniformPaintOpPropertyCheckBox                       */
+/****************************************************************/
+
+KisUniformPaintOpPropertyCheckBox::KisUniformPaintOpPropertyCheckBox(KisUniformPaintOpPropertySP property, QWidget *parent)
+    : KisUniformPaintOpPropertyWidget(property, parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    m_checkBox = new QCheckBox(property->name(), this);
+    m_checkBox->setChecked(property->value().toBool());
+    connect(m_checkBox, SIGNAL(toggled(bool)), SLOT(slotCheckBoxChanged(bool)));
+
+    layout->addWidget(m_checkBox);
+    setLayout(layout);
+}
+
+void KisUniformPaintOpPropertyCheckBox::setValue(const QVariant &value)
+{
+    m_checkBox->setChecked(value.toBool());
+}
+
+void KisUniformPaintOpPropertyCheckBox::slotCheckBoxChanged(bool value)
+{
+    emit valueChanged(value);
+}
+
+/****************************************************************/
+/*      KisUniformPaintOpPropertyComboBox                       */
+/****************************************************************/
+
+KisUniformPaintOpPropertyComboBox::KisUniformPaintOpPropertyComboBox(KisUniformPaintOpPropertySP property, QWidget *parent)
+    : KisUniformPaintOpPropertyWidget(property, parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    KisComboBasedPaintOpProperty *comboProperty =
+        dynamic_cast<KisComboBasedPaintOpProperty*>(property.data());
+    KIS_ASSERT_RECOVER_RETURN(comboProperty);
+
+    const QList<QString> items = comboProperty->items();
+    const QList<QIcon> icons = comboProperty->icons();
+
+    m_comboBox = new QComboBox(this);
+
+    KIS_SAFE_ASSERT_RECOVER_RETURN(icons.isEmpty() ||
+                                   items.size() == icons.size());
+
+    if (!icons.isEmpty()) {
+        auto itemIt = items.constBegin();
+        auto iconIt = icons.constBegin();
+
+        while (itemIt != items.constEnd() &&
+               iconIt != icons.constEnd()) {
+
+            m_comboBox->addItem(*iconIt, *itemIt);
+
+            ++itemIt;
+            ++iconIt;
+        }
+    } else {
+        Q_FOREACH (const QString &item, items) {
+            m_comboBox->addItem(item);
+        }
+    }
+
+    m_comboBox->setCurrentIndex(property->value().toInt());
+    connect(m_comboBox, SIGNAL(currentIndexChanged(int)), SLOT(slotComboBoxChanged(int)));
+
+    layout->addWidget(m_comboBox);
+    setLayout(layout);
+}
+
+void KisUniformPaintOpPropertyComboBox::setValue(const QVariant &value)
+{
+    m_comboBox->setCurrentIndex(value.toInt());
+}
+
+void KisUniformPaintOpPropertyComboBox::slotComboBoxChanged(int value)
+{
+    emit valueChanged(value);
+}
diff --git a/libs/ui/brushhud/kis_uniform_paintop_property_widget.h b/libs/ui/brushhud/kis_uniform_paintop_property_widget.h
new file mode 100644
index 0000000000..8bb42bed41
--- /dev/null
+++ b/libs/ui/brushhud/kis_uniform_paintop_property_widget.h
@@ -0,0 +1,119 @@
+/*
+ *  Copyright (c) 2016 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.
+ */
+
+#ifndef __KIS_UNIFORM_PAINTOP_PROPERTY_WIDGET_H
+#define __KIS_UNIFORM_PAINTOP_PROPERTY_WIDGET_H
+
+#include <QScopedPointer>
+#include <QWidget>
+
+#include "kis_uniform_paintop_property.h"
+
+
+class KisUniformPaintOpPropertyWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    KisUniformPaintOpPropertyWidget(KisUniformPaintOpPropertySP property, QWidget *parent);
+    ~KisUniformPaintOpPropertyWidget();
+
+protected:
+    KisUniformPaintOpPropertySP property() const;
+
+protected Q_SLOTS:
+    virtual void setValue(const QVariant &value) = 0;
+
+Q_SIGNALS:
+    void valueChanged(const QVariant &value);
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+};
+
+class KisSliderSpinBox;
+class KisDoubleSliderSpinBox;
+class QCheckBox;
+
+template <typename T> class KisSliderBasedPaintOpProperty;
+typedef KisSliderBasedPaintOpProperty<int> KisIntSliderBasedPaintOpProperty;
+typedef KisSliderBasedPaintOpProperty<qreal> KisDoubleSliderBasedPaintOpProperty;
+
+class KisUniformPaintOpPropertyIntSlider : public KisUniformPaintOpPropertyWidget
+{
+    Q_OBJECT
+public:
+    KisUniformPaintOpPropertyIntSlider(KisUniformPaintOpPropertySP property, QWidget *parent);
+
+    virtual void setValue(const QVariant &value);
+
+private Q_SLOTS:
+    void slotSliderChanged(int value);
+
+private:
+    KisSliderSpinBox *m_slider;
+};
+
+class KisUniformPaintOpPropertyDoubleSlider : public KisUniformPaintOpPropertyWidget
+{
+    Q_OBJECT
+public:
+    KisUniformPaintOpPropertyDoubleSlider(KisUniformPaintOpPropertySP property, QWidget *parent);
+
+    virtual void setValue(const QVariant &value);
+
+private Q_SLOTS:
+    void slotSliderChanged(qreal value);
+
+private:
+    KisDoubleSliderSpinBox *m_slider;
+};
+
+class KisUniformPaintOpPropertyCheckBox : public KisUniformPaintOpPropertyWidget
+{
+    Q_OBJECT
+public:
+    KisUniformPaintOpPropertyCheckBox(KisUniformPaintOpPropertySP property, QWidget *parent);
+
+    virtual void setValue(const QVariant &value);
+
+private Q_SLOTS:
+    void slotCheckBoxChanged(bool value);
+
+private:
+    QCheckBox *m_checkBox;
+};
+
+class QComboBox;
+
+class KisUniformPaintOpPropertyComboBox : public KisUniformPaintOpPropertyWidget
+{
+    Q_OBJECT
+public:
+    KisUniformPaintOpPropertyComboBox(KisUniformPaintOpPropertySP property, QWidget *parent);
+
+    virtual void setValue(const QVariant &value);
+
+private Q_SLOTS:
+    void slotComboBoxChanged(int value);
+
+private:
+    QComboBox *m_comboBox;
+};
+
+#endif /* __KIS_UNIFORM_PAINTOP_PROPERTY_WIDGET_H */
diff --git a/libs/ui/canvas/kis_canvas2.cpp b/libs/ui/canvas/kis_canvas2.cpp
index d5321267c7..44fcf60d51 100644
--- a/libs/ui/canvas/kis_canvas2.cpp
+++ b/libs/ui/canvas/kis_canvas2.cpp
@@ -1,970 +1,970 @@
 /* This file is part of the KDE project
  *
  * Copyright (C) 2006, 2010 Boudewijn Rempt <boud@valdyas.org>
  * Copyright (C) Lukáš Tvrdý <lukast.dev@gmail.com>, (C) 2010
  * Copyright (C) 2011 Silvio Heinrich <plassy@web.de>
  *
  *  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_canvas2.h"
 
 #include <QApplication>
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QTime>
 #include <QLabel>
 #include <QMouseEvent>
 #include <QDesktopWidget>
 
 #include <kis_debug.h>
 
 #include <KoUnit.h>
 #include <KoShapeManager.h>
 #include <KoColorProfile.h>
 #include <KoCanvasControllerWidget.h>
 #include <KisDocument.h>
 #include <KoSelection.h>
 #include <KoShapeController.h>
 
 #include <kis_lod_transform.h>
 #include "kis_tool_proxy.h"
 #include "kis_coordinates_converter.h"
 #include "kis_prescaled_projection.h"
 #include "kis_image.h"
 #include "kis_image_barrier_locker.h"
 #include "KisDocument.h"
 #include "flake/kis_shape_layer.h"
 #include "kis_canvas_resource_provider.h"
 #include "KisViewManager.h"
 #include "kis_config.h"
 #include "kis_config_notifier.h"
 #include "kis_abstract_canvas_widget.h"
 #include "kis_qpainter_canvas.h"
 #include "kis_group_layer.h"
 #include "flake/kis_shape_controller.h"
 #include "kis_node_manager.h"
 #include "kis_selection.h"
 #include "kis_selection_component.h"
 #include "flake/kis_shape_selection.h"
 #include "kis_image_config.h"
 #include "kis_infinity_manager.h"
 #include "kis_signal_compressor.h"
 #include "kis_display_color_converter.h"
 #include "kis_exposure_gamma_correction_interface.h"
 #include "KisView.h"
 #include "kis_canvas_controller.h"
 #include "kis_grid_config.h"
 
 #include "kis_animation_player.h"
 #include "kis_animation_frame_cache.h"
 #include "opengl/kis_opengl_canvas2.h"
 #include "opengl/kis_opengl.h"
 #include "kis_fps_decoration.h"
 
 #include "KoColorConversionTransformation.h"
 #include "KisProofingConfiguration.h"
 
 #include <kis_favorite_resource_manager.h>
 #include <kis_popup_palette.h>
 
 #include "input/kis_input_manager.h"
 #include "kis_painting_assistants_decoration.h"
 
 #include "kis_canvas_updates_compressor.h"
 
 class Q_DECL_HIDDEN KisCanvas2::KisCanvas2Private
 {
 
 public:
 
     KisCanvas2Private(KoCanvasBase *parent, KisCoordinatesConverter* coordConverter, QPointer<KisView> view, KoCanvasResourceManager* resourceManager)
         : coordinatesConverter(coordConverter)
         , view(view)
         , shapeManager(parent)
         , toolProxy(parent)
         , displayColorConverter(resourceManager, view)
     {
     }
 
     KisCoordinatesConverter *coordinatesConverter;
     QPointer<KisView>view;
     KisAbstractCanvasWidget *canvasWidget = 0;
     KoShapeManager shapeManager;
     bool currentCanvasIsOpenGL;
     int openGLFilterMode;
     KisToolProxy toolProxy;
     KisPrescaledProjectionSP prescaledProjection;
     bool vastScrolling;
 
     KisSignalCompressor updateSignalCompressor;
     QRect savedUpdateRect;
 
     QBitArray channelFlags;
     KisProofingConfiguration *proofingConfig = 0;
     bool softProofing = false;
     bool gamutCheck = false;
     bool proofingConfigUpdated = false;
 
     KisPopupPalette *popupPalette = 0;
     KisDisplayColorConverter displayColorConverter;
 
     KisCanvasUpdatesCompressor projectionUpdatesCompressor;
     KisAnimationPlayer *animationPlayer;
     KisAnimationFrameCacheSP frameCache;
     bool lodAllowedInCanvas;
     bool bootstrapLodBlocked;
 
     bool effectiveLodAllowedInCanvas() {
         return lodAllowedInCanvas && !bootstrapLodBlocked;
     }
 };
 
 KisCanvas2::KisCanvas2(KisCoordinatesConverter *coordConverter, KoCanvasResourceManager *resourceManager, KisView *view, KoShapeBasedDocumentBase *sc)
     : KoCanvasBase(sc, resourceManager)
     , m_d(new KisCanvas2Private(this, coordConverter, view, resourceManager))
 {
     /**
      * While loading LoD should be blocked. Only when GUI has finished
      * loading and zoom level settled down, LoD is given a green
      * light.
      */
     m_d->bootstrapLodBlocked = true;
     connect(view->mainWindow(), SIGNAL(guiLoadingFinished()), SLOT(bootstrapFinished()));
 
     m_d->updateSignalCompressor.setDelay(10);
     m_d->updateSignalCompressor.setMode(KisSignalCompressor::FIRST_ACTIVE);
 
 
 }
 
 void KisCanvas2::setup()
 {
     // a bit of duplication from slotConfigChanged()
     KisConfig cfg;
     m_d->vastScrolling = cfg.vastScrolling();
     m_d->lodAllowedInCanvas = cfg.levelOfDetailEnabled();
 
     createCanvas(cfg.useOpenGL());
 
     setLodAllowedInCanvas(m_d->lodAllowedInCanvas);
     m_d->animationPlayer = new KisAnimationPlayer(this);
     connect(m_d->view->canvasController()->proxyObject, SIGNAL(moveDocumentOffset(QPoint)), SLOT(documentOffsetMoved(QPoint)));
     connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(slotConfigChanged()));
 
     /**
      * We switch the shape manager every time vector layer or
      * shape selection is activated. Flake does not expect this
      * and connects all the signals of the global shape manager
      * to the clients in the constructor. To workaround this we
      * forward the signals of local shape managers stored in the
      * vector layers to the signals of global shape manager. So the
      * sequence of signal deliveries is the following:
      *
      * shapeLayer.m_d.canvas.m_shapeManager.selection() ->
      * shapeLayer ->
      * shapeController ->
      * globalShapeManager.selection()
      */
 
     KisShapeController *kritaShapeController = static_cast<KisShapeController*>(shapeController()->documentBase());
     connect(kritaShapeController, SIGNAL(selectionChanged()),
             this, SLOT(slotSelectionChanged()));
     connect(kritaShapeController, SIGNAL(selectionContentChanged()),
             globalShapeManager(), SIGNAL(selectionContentChanged()));
     connect(kritaShapeController, SIGNAL(currentLayerChanged(const KoShapeLayer*)),
             globalShapeManager()->selection(), SIGNAL(currentLayerChanged(const KoShapeLayer*)));
 
     connect(&m_d->updateSignalCompressor, SIGNAL(timeout()), SLOT(slotDoCanvasUpdate()));
 }
 
 KisCanvas2::~KisCanvas2()
 {
     if (m_d->animationPlayer->isPlaying()) {
         m_d->animationPlayer->forcedStopOnExit();
     }
     delete m_d;
 }
 
 void KisCanvas2::setCanvasWidget(QWidget * widget)
 {
     KisAbstractCanvasWidget *tmp = dynamic_cast<KisAbstractCanvasWidget*>(widget);
     Q_ASSERT_X(tmp, "setCanvasWidget", "Cannot cast the widget to a KisAbstractCanvasWidget");
     if (m_d->popupPalette) {
         m_d->popupPalette->setParent(widget);
     }
 
     if(m_d->canvasWidget != 0)
     {
         tmp->setDecorations(m_d->canvasWidget->decorations());
 
         // Redundant check for the constructor case, see below
         if(viewManager() != 0)
             viewManager()->inputManager()->removeTrackedCanvas(this);
     }
 
     m_d->canvasWidget = tmp;
 
     // Either tmp was null or we are being called by KisCanvas2 constructor that is called by KisView
     // constructor, so the view manager still doesn't exists.
     if(m_d->canvasWidget != 0 && viewManager() != 0)
         viewManager()->inputManager()->addTrackedCanvas(this);
 
     if (!m_d->canvasWidget->decoration(INFINITY_DECORATION_ID)) {
         KisInfinityManager *manager = new KisInfinityManager(m_d->view, this);
         manager->setVisible(true);
         m_d->canvasWidget->addDecoration(manager);
     }
 
     widget->setAutoFillBackground(false);
     widget->setAttribute(Qt::WA_OpaquePaintEvent);
     widget->setMouseTracking(true);
     widget->setAcceptDrops(true);
 
     KoCanvasControllerWidget *controller = dynamic_cast<KoCanvasControllerWidget*>(canvasController());
     if (controller) {
         Q_ASSERT(controller->canvas() == this);
         controller->changeCanvasWidget(widget);
     }
 }
 
 bool KisCanvas2::canvasIsOpenGL() const
 {
     return m_d->currentCanvasIsOpenGL;
 }
 
 KisOpenGL::FilterMode KisCanvas2::openGLFilterMode() const
 {
     return KisOpenGL::FilterMode(m_d->openGLFilterMode);
 }
 
 void KisCanvas2::gridSize(QPointF *offset, QSizeF *spacing) const
 {
     QTransform transform = coordinatesConverter()->imageToDocumentTransform();
 
     const QPoint intSpacing = m_d->view->document()->gridConfig().spacing();
     const QPoint intOffset = m_d->view->document()->gridConfig().offset();
 
     QPointF size = transform.map(QPointF(intSpacing));
     spacing->rwidth() = size.x();
     spacing->rheight() = size.y();
 
     *offset = transform.map(QPointF(intOffset));
 }
 
 bool KisCanvas2::snapToGrid() const
 {
     return m_d->view->document()->gridConfig().snapToGrid();
 }
 
 qreal KisCanvas2::rotationAngle() const
 {
     return m_d->coordinatesConverter->rotationAngle();
 }
 
 bool KisCanvas2::xAxisMirrored() const
 {
     return m_d->coordinatesConverter->xAxisMirrored();
 }
 
 bool KisCanvas2::yAxisMirrored() const
 {
     return m_d->coordinatesConverter->yAxisMirrored();
 }
 
 void KisCanvas2::channelSelectionChanged()
 {
     KisImageWSP image = this->image();
     m_d->channelFlags = image->rootLayer()->channelFlags();
 
     image->barrierLock();
     m_d->canvasWidget->channelSelectionChanged(m_d->channelFlags);
     startUpdateInPatches(image->bounds());
 
     image->unlock();
 
 }
 
 void KisCanvas2::addCommand(KUndo2Command *command)
 {
     // This method exists to support flake-related operations
     m_d->view->document()->addCommand(command);
 }
 
 KoShapeManager* KisCanvas2::shapeManager() const
 {
     if (!viewManager()) return globalShapeManager();
     if (!viewManager()->nodeManager()) return globalShapeManager();
 
     KisLayerSP activeLayer = viewManager()->nodeManager()->activeLayer();
     if (activeLayer && activeLayer->isEditable()) {
         KisShapeLayer * shapeLayer = dynamic_cast<KisShapeLayer*>(activeLayer.data());
         if (shapeLayer) {
             return shapeLayer->shapeManager();
         }
         KisSelectionSP selection = activeLayer->selection();
         if (selection && !selection.isNull()) {
             if (selection->hasShapeSelection()) {
                 KoShapeManager* m = dynamic_cast<KisShapeSelection*>(selection->shapeSelection())->shapeManager();
                 return m;
             }
 
         }
     }
     return globalShapeManager();
 }
 
 KoShapeManager * KisCanvas2::globalShapeManager() const
 {
     return &m_d->shapeManager;
 }
 
 void KisCanvas2::updateInputMethodInfo()
 {
     // TODO call (the protected) QWidget::updateMicroFocus() on the proper canvas widget...
 }
 
 const KisCoordinatesConverter* KisCanvas2::coordinatesConverter() const
 {
     return m_d->coordinatesConverter;
 }
 
 KoViewConverter* KisCanvas2::viewConverter() const
 {
     return m_d->coordinatesConverter;
 }
 
 KisInputManager* KisCanvas2::globalInputManager() const
 {
     return m_d->view->globalInputManager();
 }
 
 QWidget* KisCanvas2::canvasWidget()
 {
     return m_d->canvasWidget->widget();
 }
 
 const QWidget* KisCanvas2::canvasWidget() const
 {
     return m_d->canvasWidget->widget();
 }
 
 
 KoUnit KisCanvas2::unit() const
 {
     KoUnit unit(KoUnit::Pixel);
 
     KisImageWSP image = m_d->view->image();
     if (image) {
         if (!qFuzzyCompare(image->xRes(), image->yRes())) {
             warnKrita << "WARNING: resolution of the image is anisotropic"
                        << ppVar(image->xRes())
                        << ppVar(image->yRes());
         }
 
         const qreal resolution = image->xRes();
         unit.setFactor(resolution);
     }
 
     return unit;
 }
 
 KoToolProxy * KisCanvas2::toolProxy() const
 {
     return &m_d->toolProxy;
 }
 
 void KisCanvas2::createQPainterCanvas()
 {
     m_d->currentCanvasIsOpenGL = false;
 
     KisQPainterCanvas * canvasWidget = new KisQPainterCanvas(this, m_d->coordinatesConverter, m_d->view);
     m_d->prescaledProjection = new KisPrescaledProjection();
     m_d->prescaledProjection->setCoordinatesConverter(m_d->coordinatesConverter);
     m_d->prescaledProjection->setMonitorProfile(m_d->displayColorConverter.monitorProfile(),
                                                 m_d->displayColorConverter.renderingIntent(),
                                                 m_d->displayColorConverter.conversionFlags());
     m_d->prescaledProjection->setDisplayFilter(m_d->displayColorConverter.displayFilter());
     canvasWidget->setPrescaledProjection(m_d->prescaledProjection);
     setCanvasWidget(canvasWidget);
 }
 
 void KisCanvas2::createOpenGLCanvas()
 {
     KisConfig cfg;
     m_d->openGLFilterMode = cfg.openGLFilteringMode();
     m_d->currentCanvasIsOpenGL = true;
 
     KisOpenGLCanvas2 *canvasWidget = new KisOpenGLCanvas2(this, m_d->coordinatesConverter, 0, m_d->view->image(), &m_d->displayColorConverter);
     m_d->frameCache = KisAnimationFrameCache::getFrameCache(canvasWidget->openGLImageTextures());
 
     setCanvasWidget(canvasWidget);
 
     if (canvasWidget->needsFpsDebugging() && !decoration(KisFpsDecoration::idTag)) {
         addDecoration(new KisFpsDecoration(imageView()));
     }
 }
 
 void KisCanvas2::createCanvas(bool useOpenGL)
 {
     // deinitialize previous canvas structures
     m_d->prescaledProjection = 0;
     m_d->frameCache = 0;
 
     KisConfig cfg;
     QDesktopWidget dw;
     const KoColorProfile *profile = cfg.displayProfile(dw.screenNumber(imageView()));
     m_d->displayColorConverter.setMonitorProfile(profile);
 
     if (useOpenGL) {
         if (KisOpenGL::hasOpenGL()) {
             createOpenGLCanvas();
             if (cfg.canvasState() == "OPENGL_FAILED") {
                 // Creating the opengl canvas failed, fall back
                 warnKrita << "OpenGL Canvas initialization returned OPENGL_FAILED. Falling back to QPainter.";
                 createQPainterCanvas();
             }
         } else {
             warnKrita << "Tried to create OpenGL widget when system doesn't have OpenGL\n";
             createQPainterCanvas();
         }
     }
     else {
         createQPainterCanvas();
     }
 
     if (m_d->popupPalette) {
         m_d->popupPalette->setParent(m_d->canvasWidget->widget());
     }
 
 }
 
 void KisCanvas2::initializeImage()
 {
     KisImageWSP image = m_d->view->image();
 
     m_d->coordinatesConverter->setImage(image);
 
     connect(image, SIGNAL(sigImageUpdated(QRect)), SLOT(startUpdateCanvasProjection(QRect)), Qt::DirectConnection);
     connect(this, SIGNAL(sigCanvasCacheUpdated()), SLOT(updateCanvasProjection()));
     connect(image, SIGNAL(sigProofingConfigChanged()), SLOT(slotChangeProofingConfig()));
     connect(image, SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)), SLOT(startResizingImage()), Qt::DirectConnection);
     connect(this, SIGNAL(sigContinueResizeImage(qint32,qint32)), SLOT(finishResizingImage(qint32,qint32)));
 
     connectCurrentCanvas();
 }
 
 void KisCanvas2::connectCurrentCanvas()
 {
     KisImageWSP image = m_d->view->image();
 
     if (!m_d->currentCanvasIsOpenGL) {
         Q_ASSERT(m_d->prescaledProjection);
         m_d->prescaledProjection->setImage(image);
     }
 
     startResizingImage();
 
     emit imageChanged(image);
     setLodAllowedInCanvas(m_d->lodAllowedInCanvas);
 }
 
 void KisCanvas2::resetCanvas(bool useOpenGL)
 {
     // we cannot reset the canvas before it's created, but this method might be called,
     // for instance when setting the monitor profile.
     if (!m_d->canvasWidget) {
         return;
     }
     KisConfig cfg;
     bool needReset = (m_d->currentCanvasIsOpenGL != useOpenGL) ||
         (m_d->currentCanvasIsOpenGL &&
          m_d->openGLFilterMode != cfg.openGLFilteringMode());
 
     if (needReset) {
         createCanvas(useOpenGL);
         connectCurrentCanvas();
         notifyZoomChanged();
     }
     updateCanvasWidgetImpl();
 }
 
 void KisCanvas2::startUpdateInPatches(const QRect &imageRect)
 {
     if (m_d->currentCanvasIsOpenGL) {
         startUpdateCanvasProjection(imageRect);
     } else {
         KisImageConfig imageConfig;
         int patchWidth = imageConfig.updatePatchWidth();
         int patchHeight = imageConfig.updatePatchHeight();
 
         for (int y = 0; y < imageRect.height(); y += patchHeight) {
             for (int x = 0; x < imageRect.width(); x += patchWidth) {
                 QRect patchRect(x, y, patchWidth, patchHeight);
                 startUpdateCanvasProjection(patchRect);
             }
         }
     }
 }
 
 void KisCanvas2::setDisplayFilter(KisDisplayFilter *displayFilter)
 {
     m_d->displayColorConverter.setDisplayFilter(displayFilter);
     KisImageWSP image = this->image();
 
     image->barrierLock();
 
     m_d->canvasWidget->setDisplayFilter(displayFilter);
 
     image->unlock();
 }
 
 KisDisplayFilter *KisCanvas2::displayFilter() const
 {
     return m_d->displayColorConverter.displayFilter();
 }
 
 KisDisplayColorConverter* KisCanvas2::displayColorConverter() const
 {
     return &m_d->displayColorConverter;
 }
 
 KisExposureGammaCorrectionInterface* KisCanvas2::exposureGammaCorrectionInterface() const
 {
     KisDisplayFilter *displayFilter =
         m_d->displayColorConverter.displayFilter();
 
     return displayFilter ?
         displayFilter->correctionInterface() :
         KisDumbExposureGammaCorrectionInterface::instance();
 }
 
 void KisCanvas2::setProofingOptions(bool softProof, bool gamutCheck)
 {
     m_d->proofingConfig = this->image()->proofingConfiguration();
     if (!m_d->proofingConfig) {
         qDebug()<<"Canvas: No proofing config found, generating one.";
         KisImageConfig cfg;
         m_d->proofingConfig = cfg.defaultProofingconfiguration();
     }
     KoColorConversionTransformation::ConversionFlags conversionFlags = m_d->proofingConfig->conversionFlags;
 
     if (softProof && this->image()->colorSpace()->colorDepthId().id().contains("U")) {
         conversionFlags |= KoColorConversionTransformation::SoftProofing;
     } else {
         conversionFlags = conversionFlags &  ~KoColorConversionTransformation::SoftProofing;
     }
     if (gamutCheck && softProof && this->image()->colorSpace()->colorDepthId().id().contains("U")) {
         conversionFlags |= KoColorConversionTransformation::GamutCheck;
     } else {
         conversionFlags = conversionFlags & ~KoColorConversionTransformation::GamutCheck;
     }
     m_d->proofingConfig->conversionFlags = conversionFlags;
 
     m_d->proofingConfigUpdated = true;
     startUpdateInPatches(this->image()->bounds());
 
 }
 
 void KisCanvas2::slotSoftProofing(bool softProofing)
 {
     m_d->softProofing = softProofing;
     setProofingOptions(m_d->softProofing, m_d->gamutCheck);
 }
 
 void KisCanvas2::slotGamutCheck(bool gamutCheck)
 {
     m_d->gamutCheck = gamutCheck;
     setProofingOptions(m_d->softProofing, m_d->gamutCheck);
 }
 
 void KisCanvas2::slotChangeProofingConfig()
 {
     setProofingOptions(m_d->softProofing, m_d->gamutCheck);
 }
 
 void KisCanvas2::setProofingConfigUpdated(bool updated)
 {
     m_d->proofingConfigUpdated = updated;
 }
 
 bool KisCanvas2::proofingConfigUpdated()
 {
     return m_d->proofingConfigUpdated;
 }
 
 KisProofingConfiguration *KisCanvas2::proofingConfiguration() const
 {
     if (!m_d->proofingConfig) {
         m_d->proofingConfig = this->image()->proofingConfiguration();
         if (!m_d->proofingConfig) {
             qDebug()<<"Canvas: No proofing config found, generating one.";
             KisImageConfig cfg;
             m_d->proofingConfig = cfg.defaultProofingconfiguration();
         }
     }
     return m_d->proofingConfig;
 }
 
 void KisCanvas2::startResizingImage()
 {
     KisImageWSP image = this->image();
     qint32 w = image->width();
     qint32 h = image->height();
 
     emit sigContinueResizeImage(w, h);
 
     QRect imageBounds(0, 0, w, h);
     startUpdateInPatches(imageBounds);
 }
 
 void KisCanvas2::finishResizingImage(qint32 w, qint32 h)
 {
     m_d->canvasWidget->finishResizingImage(w, h);
 }
 
 void KisCanvas2::startUpdateCanvasProjection(const QRect & rc)
 {
     KisUpdateInfoSP info = m_d->canvasWidget->startUpdateCanvasProjection(rc, m_d->channelFlags);
     if (m_d->projectionUpdatesCompressor.putUpdateInfo(info)) {
         emit sigCanvasCacheUpdated();
     }
 }
 
 void KisCanvas2::updateCanvasProjection()
 {
     while (KisUpdateInfoSP info = m_d->projectionUpdatesCompressor.takeUpdateInfo()) {
         QRect vRect = m_d->canvasWidget->updateCanvasProjection(info);
         if (!vRect.isEmpty()) {
             updateCanvasWidgetImpl(m_d->coordinatesConverter->viewportToWidget(vRect).toAlignedRect());
         }
     }
 
     // TODO: Implement info->dirtyViewportRect() for KisOpenGLCanvas2 to avoid updating whole canvas
     if (m_d->currentCanvasIsOpenGL) {
         updateCanvasWidgetImpl();
     }
 }
 
 void KisCanvas2::slotDoCanvasUpdate()
 {
     if (m_d->canvasWidget->isBusy()) {
         // just restarting the timer
         updateCanvasWidgetImpl(m_d->savedUpdateRect);
         return;
     }
 
     if (m_d->savedUpdateRect.isEmpty()) {
         m_d->canvasWidget->widget()->update();
         emit updateCanvasRequested(m_d->canvasWidget->widget()->rect());
     } else {
         emit updateCanvasRequested(m_d->savedUpdateRect);
         m_d->canvasWidget->widget()->update(m_d->savedUpdateRect);
     }
 
     m_d->savedUpdateRect = QRect();
 }
 
 void KisCanvas2::updateCanvasWidgetImpl(const QRect &rc)
 {
     if (!m_d->updateSignalCompressor.isActive() ||
         !m_d->savedUpdateRect.isEmpty()) {
         m_d->savedUpdateRect |= rc;
     }
     m_d->updateSignalCompressor.start();
 }
 
 void KisCanvas2::updateCanvas()
 {
     updateCanvasWidgetImpl();
 }
 
 void KisCanvas2::updateCanvas(const QRectF& documentRect)
 {
     if (m_d->currentCanvasIsOpenGL && m_d->canvasWidget->decorations().size() > 0) {
         updateCanvasWidgetImpl();
     }
     else {
         // updateCanvas is called from tools, never from the projection
         // updates, so no need to prescale!
         QRect widgetRect = m_d->coordinatesConverter->documentToWidget(documentRect).toAlignedRect();
         widgetRect.adjust(-2, -2, 2, 2);
         if (!widgetRect.isEmpty()) {
             updateCanvasWidgetImpl(widgetRect);
         }
     }
 }
 
 void KisCanvas2::disconnectCanvasObserver(QObject *object)
 {
     KoCanvasBase::disconnectCanvasObserver(object);
     m_d->view->disconnect(object);
 }
 
 void KisCanvas2::notifyZoomChanged()
 {
     if (!m_d->currentCanvasIsOpenGL) {
         Q_ASSERT(m_d->prescaledProjection);
         m_d->prescaledProjection->notifyZoomChanged();
     }
 
     notifyLevelOfDetailChange();
     updateCanvas(); // update the canvas, because that isn't done when zooming using KoZoomAction
 }
 
 void KisCanvas2::notifyLevelOfDetailChange()
 {
     if (!m_d->effectiveLodAllowedInCanvas()) return;
 
     KisImageSP image = this->image();
 
     const qreal effectiveZoom = m_d->coordinatesConverter->effectiveZoom();
 
     KisConfig cfg;
     const int maxLod = cfg.numMipmapLevels();
 
     int lod = KisLodTransform::scaleToLod(effectiveZoom, maxLod);
     image->setDesiredLevelOfDetail(lod);
 }
 
 void KisCanvas2::preScale()
 {
     if (!m_d->currentCanvasIsOpenGL) {
         Q_ASSERT(m_d->prescaledProjection);
         m_d->prescaledProjection->preScale();
     }
 }
 
 const KoColorProfile *  KisCanvas2::monitorProfile()
 {
     return m_d->displayColorConverter.monitorProfile();
 }
 
 KisViewManager* KisCanvas2::viewManager() const
 {
     if (m_d->view) {
         return m_d->view->viewManager();
     }
     return 0;
 }
 
 QPointer<KisView>KisCanvas2::imageView() const
 {
     return m_d->view;
 }
 
 KisImageWSP KisCanvas2::image() const
 {
     return m_d->view->image();
 
 }
 
 KisImageWSP KisCanvas2::currentImage() const
 {
     return m_d->view->image();
 }
 
 void KisCanvas2::documentOffsetMoved(const QPoint &documentOffset)
 {
     QPointF offsetBefore = m_d->coordinatesConverter->imageRectInViewportPixels().topLeft();
     m_d->coordinatesConverter->setDocumentOffset(documentOffset);
     QPointF offsetAfter = m_d->coordinatesConverter->imageRectInViewportPixels().topLeft();
 
     QPointF moveOffset = offsetAfter - offsetBefore;
 
     if (!m_d->currentCanvasIsOpenGL)
         m_d->prescaledProjection->viewportMoved(moveOffset);
 
     emit documentOffsetUpdateFinished();
 
     updateCanvas();
 }
 
 void KisCanvas2::slotConfigChanged()
 {
     KisConfig cfg;
     m_d->vastScrolling = cfg.vastScrolling();
 
     resetCanvas(cfg.useOpenGL());
     slotSetDisplayProfile(cfg.displayProfile(QApplication::desktop()->screenNumber(this->canvasWidget())));
 
 }
 
 void KisCanvas2::refetchDataFromImage()
 {
     KisImageSP image = this->image();
     KisImageBarrierLocker l(image);
     startUpdateInPatches(image->bounds());
 }
 
 void KisCanvas2::slotSetDisplayProfile(const KoColorProfile *monitorProfile)
 {
     if (m_d->displayColorConverter.monitorProfile() == monitorProfile) return;
 
     m_d->displayColorConverter.setMonitorProfile(monitorProfile);
 
     {
         KisImageSP image = this->image();
         KisImageBarrierLocker l(image);
         m_d->canvasWidget->setDisplayProfile(&m_d->displayColorConverter);
     }
 
     refetchDataFromImage();
 }
 
 void KisCanvas2::addDecoration(KisCanvasDecorationSP deco)
 {
     m_d->canvasWidget->addDecoration(deco);
 }
 
 KisCanvasDecorationSP KisCanvas2::decoration(const QString& id) const
 {
     return m_d->canvasWidget->decoration(id);
 }
 
 
 QPoint KisCanvas2::documentOrigin() const
 {
     /**
      * In Krita we don't use document origin anymore.
      * All the centering when needed (vastScrolling < 0.5) is done
      * automatically by the KisCoordinatesConverter.
      */
 
     return QPoint();
 }
 
 QPoint KisCanvas2::documentOffset() const
 {
     return m_d->coordinatesConverter->documentOffset();
 }
 
 void KisCanvas2::setFavoriteResourceManager(KisFavoriteResourceManager* favoriteResourceManager)
 {
-    m_d->popupPalette = new KisPopupPalette(favoriteResourceManager, displayColorConverter()->displayRendererInterface(), m_d->canvasWidget->widget());
+    m_d->popupPalette = new KisPopupPalette(favoriteResourceManager, displayColorConverter()->displayRendererInterface(), m_d->view->resourceProvider(), m_d->canvasWidget->widget());
     m_d->popupPalette->showPopupPalette(false);
 }
 
 void KisCanvas2::setCursor(const QCursor &cursor)
 {
     canvasWidget()->setCursor(cursor);
 }
 
 KisAnimationFrameCacheSP KisCanvas2::frameCache() const
 {
     return m_d->frameCache;
 }
 
 KisAnimationPlayer *KisCanvas2::animationPlayer() const
 {
     return m_d->animationPlayer;
 }
 
 void KisCanvas2::slotSelectionChanged()
 {
     KisShapeLayer* shapeLayer = dynamic_cast<KisShapeLayer*>(viewManager()->activeLayer().data());
     if (!shapeLayer) {
         return;
     }
     m_d->shapeManager.selection()->deselectAll();
     Q_FOREACH (KoShape* shape, shapeLayer->shapeManager()->selection()->selectedShapes()) {
         m_d->shapeManager.selection()->select(shape);
     }
 }
 
 bool KisCanvas2::isPopupPaletteVisible() const
 {
     if (!m_d->popupPalette) {
         return false;
     }
     return m_d->popupPalette->isVisible();
 }
 
 
 void KisCanvas2::setWrapAroundViewingMode(bool value)
 {
     KisCanvasDecorationSP infinityDecoration =
         m_d->canvasWidget->decoration(INFINITY_DECORATION_ID);
 
     if (infinityDecoration) {
         infinityDecoration->setVisible(!value);
     }
 
     m_d->canvasWidget->setWrapAroundViewingMode(value);
 }
 
 bool KisCanvas2::wrapAroundViewingMode() const
 {
     KisCanvasDecorationSP infinityDecoration =
         m_d->canvasWidget->decoration(INFINITY_DECORATION_ID);
 
     if (infinityDecoration) {
         return !(infinityDecoration->visible());
     }
     return false;
 }
 
 void KisCanvas2::bootstrapFinished()
 {
     if (!m_d->bootstrapLodBlocked) return;
 
     m_d->bootstrapLodBlocked = false;
     setLodAllowedInCanvas(m_d->lodAllowedInCanvas);
 }
 
 void KisCanvas2::setLodAllowedInCanvas(bool value)
 {
     if (!KisOpenGL::supportsGLSL13()) {
         qWarning() << "WARNING: Level of Detail functionality is available only with openGL + GLSL 1.3 support";
     }
 
     m_d->lodAllowedInCanvas =
             value &&
             m_d->currentCanvasIsOpenGL &&
             KisOpenGL::supportsGLSL13() &&
             (m_d->openGLFilterMode == KisOpenGL::TrilinearFilterMode ||
              m_d->openGLFilterMode == KisOpenGL::HighQualityFiltering);
 
     KisImageSP image = this->image();
 
     if (m_d->effectiveLodAllowedInCanvas() != !image->levelOfDetailBlocked()) {
 
         image->setLevelOfDetailBlocked(!m_d->effectiveLodAllowedInCanvas());
         notifyLevelOfDetailChange();
     }
 
     KisConfig cfg;
     cfg.setLevelOfDetailEnabled(m_d->lodAllowedInCanvas);
 }
 
 bool KisCanvas2::lodAllowedInCanvas() const
 {
     return m_d->lodAllowedInCanvas;
 }
 
 void KisCanvas2::slotShowPopupPalette(const QPoint &p)
 {
     if (!m_d->popupPalette) {
         return;
     }
 
     m_d->popupPalette->showPopupPalette(p);
 }
 
 KisPaintingAssistantsDecorationSP KisCanvas2::paintingAssistantsDecoration() const
 {
     KisCanvasDecorationSP deco = decoration("paintingAssistantsDecoration");
     return qobject_cast<KisPaintingAssistantsDecoration*>(deco.data());
 }
diff --git a/libs/ui/dialogs/kis_dlg_preferences.cc b/libs/ui/dialogs/kis_dlg_preferences.cc
index 6657074862..3835c53c2a 100644
--- a/libs/ui/dialogs/kis_dlg_preferences.cc
+++ b/libs/ui/dialogs/kis_dlg_preferences.cc
@@ -1,1037 +1,1037 @@
 /*
  *  preferencesdlg.cc - part of KImageShop
  *
  *  Copyright (c) 1999 Michael Koch <koch@kde.org>
  *  Copyright (c) 2003-2011 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_dlg_preferences.h"
 
 #include <opengl/kis_opengl.h>
 
 #include <QBitmap>
 #include <QCheckBox>
 #include <QCursor>
 #include <QLabel>
 #include <QLayout>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSlider>
 #include <QToolButton>
 #include <QThread>
 #include <QDesktopServices>
 #include <QGridLayout>
 #include <QRadioButton>
 #include <QGroupBox>
 #include <QMdiArea>
 #include <QMessageBox>
 #include <QDesktopWidget>
 #include <QFileDialog>
 
 #include <KisDocument.h>
 #include <KoColorProfile.h>
 #include <KisApplication.h>
 #include <KoFileDialog.h>
 #include <KisPart.h>
 #include <KoColorSpaceEngine.h>
 #include <kis_icon.h>
 #include <KoConfig.h>
 #include "KoID.h"
 #include <KoConfigAuthorPage.h>
 #include <KoVBox.h>
 
 #include <klocalizedstring.h>
 #include <kundo2stack.h>
 #include <KoResourcePaths.h>
 #include "kis_action_registry.h"
 
 #include "widgets/squeezedcombobox.h"
 #include "kis_clipboard.h"
 #include "widgets/kis_cmb_idlist.h"
 #include "KoColorSpace.h"
 #include "KoColorSpaceRegistry.h"
 #include "KoColorConversionTransformation.h"
 #include "kis_cursor.h"
 #include "kis_config.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_preference_set_registry.h"
 #include "kis_color_manager.h"
 #include "KisProofingConfiguration.h"
 #include "kis_image_config.h"
 
 #include "slider_and_spin_box_sync.h"
 
 // for the performance update
 #include <kis_cubic_curve.h>
 
 #include "input/config/kis_input_configuration_page.h"
 
 
 GeneralTab::GeneralTab(QWidget *_parent, const char *_name)
     : WdgGeneralSettings(_parent, _name)
 {
     KisConfig cfg;
 
     m_cmbCursorShape->addItem(i18n("No Cursor"));
     m_cmbCursorShape->addItem(i18n("Tool Icon"));
     m_cmbCursorShape->addItem(i18n("Arrow"));
     m_cmbCursorShape->addItem(i18n("Small Circle"));
     m_cmbCursorShape->addItem(i18n("Crosshair"));
     m_cmbCursorShape->addItem(i18n("Triangle Righthanded"));
     m_cmbCursorShape->addItem(i18n("Triangle Lefthanded"));
     m_cmbCursorShape->addItem(i18n("Black Pixel"));
     m_cmbCursorShape->addItem(i18n("White Pixel"));
 
     m_cmbOutlineShape->addItem(i18n("No Outline"));
     m_cmbOutlineShape->addItem(i18n("Circle Outline"));
     m_cmbOutlineShape->addItem(i18n("Preview Outline"));
     m_cmbOutlineShape->addItem(i18n("Tilt Outline"));
 
     m_cmbCursorShape->setCurrentIndex(cfg.newCursorStyle());
     m_cmbOutlineShape->setCurrentIndex(cfg.newOutlineStyle());
 
     chkShowRootLayer->setChecked(cfg.showRootLayer());
 
     int autosaveInterval = cfg.autoSaveInterval();
     //convert to minutes
     m_autosaveSpinBox->setValue(autosaveInterval / 60);
     m_autosaveCheckBox->setChecked(autosaveInterval > 0);
     m_undoStackSize->setValue(cfg.undoStackLimit());
     m_backupFileCheckBox->setChecked(cfg.backupFile());
     m_showOutlinePainting->setChecked(cfg.showOutlineWhilePainting());
     m_hideSplashScreen->setChecked(cfg.hideSplashScreen());
     m_cmbMDIType->setCurrentIndex(cfg.readEntry<int>("mdi_viewmode", (int)QMdiArea::TabbedView));
     m_chkRubberBand->setChecked(cfg.readEntry<int>("mdi_rubberband", cfg.useOpenGL()));
     m_favoritePresetsSpinBox->setValue(cfg.favoritePresets());
     m_mdiColor->setColor(cfg.getMDIBackgroundColor());
     m_backgroundimage->setText(cfg.getMDIBackgroundImage());
     m_chkCanvasMessages->setChecked(cfg.showCanvasMessages());
     m_chkCompressKra->setChecked(cfg.compressKra());
     m_radioToolOptionsInDocker->setChecked(cfg.toolOptionsInDocker());
     m_chkSwitchSelectionCtrlAlt->setChecked(cfg.switchSelectionCtrlAlt());
     m_chkConvertOnImport->setChecked(cfg.convertToImageColorspaceOnImport());
 
     connect(m_bnFileName, SIGNAL(clicked()), SLOT(getBackgroundImage()));
     connect(clearBgImageButton, SIGNAL(clicked()), SLOT(clearBackgroundImage()));
 }
 
 void GeneralTab::setDefault()
 {
     KisConfig cfg;
 
     m_cmbCursorShape->setCurrentIndex(cfg.newCursorStyle(true));
     m_cmbOutlineShape->setCurrentIndex(cfg.newOutlineStyle(true));
     chkShowRootLayer->setChecked(cfg.showRootLayer(true));
     m_autosaveCheckBox->setChecked(cfg.autoSaveInterval(true) > 0);
     //convert to minutes
     m_autosaveSpinBox->setValue(cfg.autoSaveInterval(true) / 60);
     m_undoStackSize->setValue(cfg.undoStackLimit(true));
     m_backupFileCheckBox->setChecked(cfg.backupFile(true));
     m_showOutlinePainting->setChecked(cfg.showOutlineWhilePainting(true));
     m_hideSplashScreen->setChecked(cfg.hideSplashScreen(true));
     m_cmbMDIType->setCurrentIndex((int)QMdiArea::TabbedView);
     m_chkRubberBand->setChecked(cfg.useOpenGL(true));
     m_favoritePresetsSpinBox->setValue(cfg.favoritePresets(true));
     m_mdiColor->setColor(cfg.getMDIBackgroundColor(true));
     m_backgroundimage->setText(cfg.getMDIBackgroundImage(true));
     m_chkCanvasMessages->setChecked(cfg.showCanvasMessages(true));
     m_chkCompressKra->setChecked(cfg.compressKra(true));
     m_radioToolOptionsInDocker->setChecked(cfg.toolOptionsInDocker(true));
     m_chkSwitchSelectionCtrlAlt->setChecked(cfg.switchSelectionCtrlAlt(true));
     m_chkConvertOnImport->setChecked(cfg.convertToImageColorspaceOnImport(true));
 
 }
 
 CursorStyle GeneralTab::cursorStyle()
 {
     return (CursorStyle)m_cmbCursorShape->currentIndex();
 }
 
 OutlineStyle GeneralTab::outlineStyle()
 {
     return (OutlineStyle)m_cmbOutlineShape->currentIndex();
 }
 
 bool GeneralTab::showRootLayer()
 {
     return chkShowRootLayer->isChecked();
 }
 
 int GeneralTab::autoSaveInterval()
 {
     //convert to seconds
     return m_autosaveCheckBox->isChecked() ? m_autosaveSpinBox->value()*60 : 0;
 }
 
 int GeneralTab::undoStackSize()
 {
     return m_undoStackSize->value();
 }
 
 bool GeneralTab::showOutlineWhilePainting()
 {
     return m_showOutlinePainting->isChecked();
 }
 
 bool GeneralTab::hideSplashScreen()
 {
     return m_hideSplashScreen->isChecked();
 }
 
 int GeneralTab::mdiMode()
 {
     return m_cmbMDIType->currentIndex();
 }
 
 int GeneralTab::favoritePresets()
 {
     return m_favoritePresetsSpinBox->value();
 }
 
 bool GeneralTab::showCanvasMessages()
 {
     return m_chkCanvasMessages->isChecked();
 }
 
 bool GeneralTab::compressKra()
 {
     return m_chkCompressKra->isChecked();
 }
 
 bool GeneralTab::toolOptionsInDocker()
 {
     return m_radioToolOptionsInDocker->isChecked();
 }
 
 bool GeneralTab::switchSelectionCtrlAlt()
 {
     return m_chkSwitchSelectionCtrlAlt->isChecked();
 
 }
 
 bool GeneralTab::convertToImageColorspaceOnImport()
 {
     return m_chkConvertOnImport->isChecked();
 }
 
 
 void GeneralTab::getBackgroundImage()
 {
     KoFileDialog dialog(this, KoFileDialog::OpenFile, "BackgroundImages");
     dialog.setCaption(i18n("Select a Background Image"));
     dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation));
     dialog.setImageFilters();
 
     QString fn = dialog.filename();
     // dialog box was canceled or somehow no file was selected
     if (fn.isEmpty()) {
         return;
     }
 
     QImage image(fn);
     if (image.isNull()) {
         QMessageBox::warning(this, i18nc("@title:window", "Krita"), i18n("%1 is not a valid image file!", fn));
     }
     else {
         m_backgroundimage->setText(fn);
     }
 }
 
 void GeneralTab::clearBackgroundImage()
 {
     // clearing the background image text will implicitly make the background color be used
     m_backgroundimage->setText("");
 }
 
 ShortcutSettingsTab::ShortcutSettingsTab(QWidget *parent, const char *name)
     : QWidget(parent)
 {
     setObjectName(name);
 
     QGridLayout * l = new QGridLayout(this);
     l->setMargin(0);
     m_page = new WdgShortcutSettings(this);
     l->addWidget(m_page, 0, 0);
 
     KisPart::instance()->loadActions();
     KisActionRegistry::instance()->setupDialog(m_page);
 }
 
 void ShortcutSettingsTab::setDefault()
 {
     m_page->allDefault();
 }
 
 void ShortcutSettingsTab::saveChanges()
 {
     m_page->save();
     KisActionRegistry::instance()->settingsPageSaved();
 }
 
 void ShortcutSettingsTab::revertChanges()
 {
     m_page->allDefault();
 }
 
 ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name)
     : QWidget(parent)
 {
     setObjectName(name);
 
     // XXX: Make sure only profiles that fit the specified color model
     // are shown in the profile combos
 
     QGridLayout * l = new QGridLayout(this);
     l->setMargin(0);
     m_page = new WdgColorSettings(this);
     l->addWidget(m_page, 0, 0);
 
     KisConfig cfg;
 
     m_page->chkUseSystemMonitorProfile->setChecked(cfg.useSystemMonitorProfile());
     connect(m_page->chkUseSystemMonitorProfile, SIGNAL(toggled(bool)), this, SLOT(toggleAllowMonitorProfileSelection(bool)));
 
 // XXX: no color management integration on Windows or OSX yet
 #ifndef HAVE_X11
     m_page->chkUseSystemMonitorProfile->setVisible(false);
 #endif
     m_page->cmbWorkingColorSpace->setIDList(KoColorSpaceRegistry::instance()->listKeys());
     m_page->cmbWorkingColorSpace->setCurrent(cfg.workingColorSpace());
 
     m_page->bnAddColorProfile->setIcon(KisIconUtils::loadIcon("document-open"));
     m_page->bnAddColorProfile->setToolTip( i18n("Open Color Profile") );
     connect(m_page->bnAddColorProfile, SIGNAL(clicked()), SLOT(installProfile()));
 
     QGridLayout *monitorProfileGrid = new QGridLayout(m_page->monitorprofileholder);
     for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         QLabel *lbl = new QLabel(i18nc("The number of the screen", "Screen %1:", i + 1));
         monitorProfileGrid->addWidget(lbl, i, 0);
         m_monitorProfileLabels << lbl;
         SqueezedComboBox *cmb = new SqueezedComboBox();
         monitorProfileGrid->addWidget(cmb, i, 1);
         m_monitorProfileWidgets << cmb;
     }
 
     refillMonitorProfiles(KoID("RGBA", ""));
 
     for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
             m_monitorProfileWidgets[i]->setCurrent(cfg.monitorProfile(i));
         }
     }
 
     m_page->chkBlackpoint->setChecked(cfg.useBlackPointCompensation());
     m_page->chkAllowLCMSOptimization->setChecked(cfg.allowLCMSOptimization());
 
     KisImageConfig cfgImage;
 
     KisProofingConfiguration *proofingConfig = cfgImage.defaultProofingconfiguration();
     m_gamutWarning = new KoColorPopupAction(this);
     m_gamutWarning->setToolTip(i18n("Set default color used for out of Gamut Warning"));
     m_gamutWarning->setCurrentColor(proofingConfig->warningColor);
     m_page->gamutAlarm->setDefaultAction(m_gamutWarning);
     m_page->sldAdaptationState->setMaximum(20);
     m_page->sldAdaptationState->setMinimum(0);
     m_page->sldAdaptationState->setValue((int)proofingConfig->adaptationState*20);
 
     const KoColorSpace *proofingSpace =  KoColorSpaceRegistry::instance()->colorSpace(proofingConfig->proofingModel,proofingConfig->proofingDepth,proofingConfig->proofingProfile);
     m_page->proofingSpaceSelector->setCurrentColorSpace(proofingSpace);
 
     m_page->cmbProofingIntent->setCurrentIndex((int)proofingConfig->intent);
     m_page->ckbProofBlackPoint->setChecked(proofingConfig->conversionFlags.testFlag(KoColorConversionTransformation::BlackpointCompensation));
 
     m_pasteBehaviourGroup.addButton(m_page->radioPasteWeb, PASTE_ASSUME_WEB);
     m_pasteBehaviourGroup.addButton(m_page->radioPasteMonitor, PASTE_ASSUME_MONITOR);
     m_pasteBehaviourGroup.addButton(m_page->radioPasteAsk, PASTE_ASK);
 
     QAbstractButton *button = m_pasteBehaviourGroup.button(cfg.pasteBehaviour());
     Q_ASSERT(button);
 
     if (button) {
         button->setChecked(true);
     }
 
     m_page->cmbMonitorIntent->setCurrentIndex(cfg.monitorRenderIntent());
 
     toggleAllowMonitorProfileSelection(cfg.useSystemMonitorProfile());
 
 }
 
 void ColorSettingsTab::installProfile()
 {
     KoFileDialog dialog(this, KoFileDialog::OpenFiles, "OpenDocumentICC");
     dialog.setCaption(i18n("Install Color Profiles"));
     dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     dialog.setMimeTypeFilters(QStringList() << "application/vnd.iccprofile", "application/vnd.iccprofile");
     QStringList profileNames = dialog.filenames();
 
     KoColorSpaceEngine *iccEngine = KoColorSpaceEngineRegistry::instance()->get("icc");
     Q_ASSERT(iccEngine);
 
     QString saveLocation = KoResourcePaths::saveLocation("icc_profiles");
 
     Q_FOREACH (const QString &profileName, profileNames) {
         QUrl file(profileName);
         if (!QFile::copy(profileName, saveLocation + file.fileName())) {
             dbgKrita << "Could not install profile!";
             return;
         }
         iccEngine->addProfile(saveLocation + file.fileName());
 
     }
 
     KisConfig cfg;
     refillMonitorProfiles(KoID("RGBA", ""));
 
     for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
             m_monitorProfileWidgets[i]->setCurrent(cfg.monitorProfile(i));
         }
     }
 
 }
 
 void ColorSettingsTab::toggleAllowMonitorProfileSelection(bool useSystemProfile)
 {
     if (useSystemProfile) {
         KisConfig cfg;
         QStringList devices = KisColorManager::instance()->devices();
         if (devices.size() == QApplication::desktop()->screenCount()) {
             for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
                 m_monitorProfileWidgets[i]->clear();
                 QString monitorForScreen = cfg.monitorForScreen(i, devices[i]);
                 Q_FOREACH (const QString &device, devices) {
                     m_monitorProfileLabels[i]->setText(i18nc("The display/screen we got from Qt", "Screen %1:", i + 1));
                     m_monitorProfileWidgets[i]->addSqueezedItem(KisColorManager::instance()->deviceName(device), device);
                     if (devices[i] == monitorForScreen) {
                         m_monitorProfileWidgets[i]->setCurrentIndex(i);
                     }
                 }
             }
         }
     }
     else {
         KisConfig cfg;
         refillMonitorProfiles(KoID("RGBA", ""));
 
         for(int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
             if (m_monitorProfileWidgets[i]->contains(cfg.monitorProfile(i))) {
                 m_monitorProfileWidgets[i]->setCurrent(cfg.monitorProfile(i));
             }
         }
     }
 }
 
 void ColorSettingsTab::setDefault()
 {
     m_page->cmbWorkingColorSpace->setCurrent("RGBA");
 
     refillMonitorProfiles(KoID("RGBA", ""));
 
     KisConfig cfg;
     KisImageConfig cfgImage;
     KisProofingConfiguration *proofingConfig =  cfgImage.defaultProofingconfiguration();
     const KoColorSpace *proofingSpace =  KoColorSpaceRegistry::instance()->colorSpace(proofingConfig->proofingModel,proofingConfig->proofingDepth,proofingConfig->proofingProfile);
     m_page->proofingSpaceSelector->setCurrentColorSpace(proofingSpace);
     m_page->cmbProofingIntent->setCurrentIndex((int)proofingConfig->intent);
     m_page->ckbProofBlackPoint->setChecked(proofingConfig->conversionFlags.testFlag(KoColorConversionTransformation::BlackpointCompensation));
     m_page->sldAdaptationState->setValue(0);
 
     m_gamutWarning->setCurrentColor(proofingConfig->warningColor);
 
     m_page->chkBlackpoint->setChecked(cfg.useBlackPointCompensation(true));
     m_page->chkAllowLCMSOptimization->setChecked(cfg.allowLCMSOptimization(true));
     m_page->cmbMonitorIntent->setCurrentIndex(cfg.monitorRenderIntent(true));
     m_page->chkUseSystemMonitorProfile->setChecked(cfg.useSystemMonitorProfile(true));
     QAbstractButton *button = m_pasteBehaviourGroup.button(cfg.pasteBehaviour(true));
     Q_ASSERT(button);
     if (button) {
         button->setChecked(true);
     }
 }
 
 
 void ColorSettingsTab::refillMonitorProfiles(const KoID & s)
 {
     const KoColorSpaceFactory * csf = KoColorSpaceRegistry::instance()->colorSpaceFactory(s.id());
 
     for (int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         m_monitorProfileWidgets[i]->clear();
     }
 
     if (!csf)
         return;
 
     QList<const KoColorProfile *>  profileList = KoColorSpaceRegistry::instance()->profilesFor(csf);
 
     Q_FOREACH (const KoColorProfile *profile, profileList) {
 //        //dbgKrita << "Profile" << profile->name() << profile->isSuitableForDisplay() << csf->defaultProfile();
         if (profile->isSuitableForDisplay()) {
             for (int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
                 m_monitorProfileWidgets[i]->addSqueezedItem(profile->name());
             }
         }
     }
 
     for (int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
         m_monitorProfileLabels[i]->setText(i18nc("The number of the screen", "Screen %1:", i + 1));
         m_monitorProfileWidgets[i]->setCurrent(csf->defaultProfile());
     }
 }
 
 
 //---------------------------------------------------------------------------------------------------
 
 void TabletSettingsTab::setDefault()
 {
     KisCubicCurve curve;
     curve.fromString(DEFAULT_CURVE_STRING);
     m_page->pressureCurve->setCurve(curve);
 }
 
 TabletSettingsTab::TabletSettingsTab(QWidget* parent, const char* name): QWidget(parent)
 {
     setObjectName(name);
 
     QGridLayout * l = new QGridLayout(this);
     l->setMargin(0);
     m_page = new WdgTabletSettings(this);
     l->addWidget(m_page, 0, 0);
 
     KisConfig cfg;
     KisCubicCurve curve;
     curve.fromString( cfg.pressureTabletCurve() );
 
     m_page->pressureCurve->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
     m_page->pressureCurve->setCurve(curve);
 }
 
 
 //---------------------------------------------------------------------------------------------------
 #include "kis_acyclic_signal_connector.h"
 
 int getTotalRAM() {
     KisImageConfig cfg;
     return cfg.totalRAM();
 }
 
 int PerformanceTab::realTilesRAM()
 {
     return intMemoryLimit->value() - intPoolLimit->value();
 }
 
 PerformanceTab::PerformanceTab(QWidget *parent, const char *name)
     : WdgPerformanceSettings(parent, name)
 {
     KisImageConfig cfg;
     const int totalRAM = cfg.totalRAM();
     lblTotalMemory->setText(i18n("%1 MiB", totalRAM));
 
     sliderMemoryLimit->setSuffix(i18n(" %"));
     sliderMemoryLimit->setRange(1, 100, 2);
     sliderMemoryLimit->setSingleStep(0.01);
 
     sliderPoolLimit->setSuffix(i18n(" %"));
     sliderPoolLimit->setRange(0, 20, 2);
     sliderMemoryLimit->setSingleStep(0.01);
 
     sliderUndoLimit->setSuffix(i18n(" %"));
     sliderUndoLimit->setRange(0, 50, 2);
     sliderMemoryLimit->setSingleStep(0.01);
 
     intMemoryLimit->setMinimumWidth(80);
     intPoolLimit->setMinimumWidth(80);
     intUndoLimit->setMinimumWidth(80);
 
 
     SliderAndSpinBoxSync *sync1 =
         new SliderAndSpinBoxSync(sliderMemoryLimit,
                                  intMemoryLimit,
                                  getTotalRAM);
 
     sync1->slotParentValueChanged();
     m_syncs << sync1;
 
     SliderAndSpinBoxSync *sync2 =
         new SliderAndSpinBoxSync(sliderPoolLimit,
                                  intPoolLimit,
-                                 std::bind(&QSpinBox::value,
+                                 std::bind(&KisIntParseSpinBox::value,
                                              intMemoryLimit));
 
 
     connect(intMemoryLimit, SIGNAL(valueChanged(int)), sync2, SLOT(slotParentValueChanged()));
     sync2->slotParentValueChanged();
     m_syncs << sync2;
 
     SliderAndSpinBoxSync *sync3 =
         new SliderAndSpinBoxSync(sliderUndoLimit,
                                  intUndoLimit,
                                  std::bind(&PerformanceTab::realTilesRAM,
                                              this));
 
 
     connect(intPoolLimit, SIGNAL(valueChanged(int)), sync3, SLOT(slotParentValueChanged()));
     sync3->slotParentValueChanged();
     m_syncs << sync3;
 
     sliderSwapSize->setSuffix(i18n(" GiB"));
     sliderSwapSize->setRange(1, 64);
     intSwapSize->setRange(1, 64);
 
 
     KisAcyclicSignalConnector *swapSizeConnector = new KisAcyclicSignalConnector(this);
 
     swapSizeConnector->connectForwardInt(sliderSwapSize, SIGNAL(valueChanged(int)),
                                          intSwapSize, SLOT(setValue(int)));
 
     swapSizeConnector->connectBackwardInt(intSwapSize, SIGNAL(valueChanged(int)),
                                           sliderSwapSize, SLOT(setValue(int)));
 
     lblSwapFileLocation->setText(cfg.swapDir());
     connect(bnSwapFile, SIGNAL(clicked()), SLOT(selectSwapDir()));
 
     load(false);
 }
 
 PerformanceTab::~PerformanceTab()
 {
     qDeleteAll(m_syncs);
 }
 
 void PerformanceTab::load(bool requestDefault)
 {
     KisImageConfig cfg;
 
     sliderMemoryLimit->setValue(cfg.memoryHardLimitPercent(requestDefault));
     sliderPoolLimit->setValue(cfg.memoryPoolLimitPercent(requestDefault));
     sliderUndoLimit->setValue(cfg.memorySoftLimitPercent(requestDefault));
 
     chkPerformanceLogging->setChecked(cfg.enablePerfLog(requestDefault));
     chkProgressReporting->setChecked(cfg.enableProgressReporting(requestDefault));
 
     sliderSwapSize->setValue(cfg.maxSwapSize(requestDefault) / 1024);
     lblSwapFileLocation->setText(cfg.swapDir(requestDefault));
 
     {
         KisConfig cfg2;
         chkOpenGLLogging->setChecked(cfg2.enableOpenGLDebugging(requestDefault));
         chkDisableVectorOptimizations->setChecked(cfg2.enableAmdVectorizationWorkaround(requestDefault));
     }
 }
 
 void PerformanceTab::save()
 {
     KisImageConfig cfg;
 
     cfg.setMemoryHardLimitPercent(sliderMemoryLimit->value());
     cfg.setMemorySoftLimitPercent(sliderUndoLimit->value());
     cfg.setMemoryPoolLimitPercent(sliderPoolLimit->value());
 
     cfg.setEnablePerfLog(chkPerformanceLogging->isChecked());
     cfg.setEnableProgressReporting(chkProgressReporting->isChecked());
 
     cfg.setMaxSwapSize(sliderSwapSize->value() * 1024);
 
     cfg.setSwapDir(lblSwapFileLocation->text());
 
     {
         KisConfig cfg2;
         cfg2.setEnableOpenGLDebugging(chkOpenGLLogging->isChecked());
         cfg2.setEnableAmdVectorizationWorkaround(chkDisableVectorOptimizations->isChecked());
     }
 }
 
 void PerformanceTab::selectSwapDir()
 {
     KisImageConfig cfg;
     QString swapDir = cfg.swapDir();
     swapDir = QFileDialog::getExistingDirectory(0, i18nc("@title:window", "Select a swap directory"), swapDir);
     lblSwapFileLocation->setText(swapDir);
 }
 
 //---------------------------------------------------------------------------------------------------
 
 #include "KoColor.h"
 #include "KoColorPopupAction.h"
 
 DisplaySettingsTab::DisplaySettingsTab(QWidget *parent, const char *name)
     : WdgDisplaySettings(parent, name)
 {
     KisConfig cfg;
 
     if (!KisOpenGL::hasOpenGL()) {
         grpOpenGL->setEnabled(false);
         grpOpenGL->setChecked(false);
         chkUseTextureBuffer->setEnabled(false);
         chkDisableVsync->setEnabled(false);
         cmbFilterMode->setEnabled(false);
     } else {
         grpOpenGL->setEnabled(true);
         grpOpenGL->setChecked(cfg.useOpenGL());
         chkUseTextureBuffer->setEnabled(cfg.useOpenGL());
         chkUseTextureBuffer->setChecked(cfg.useOpenGLTextureBuffer());
         chkDisableVsync->setVisible(cfg.showAdvancedOpenGLSettings());
         chkDisableVsync->setEnabled(cfg.useOpenGL());
         chkDisableVsync->setChecked(cfg.disableVSync());
         cmbFilterMode->setEnabled(cfg.useOpenGL());
         cmbFilterMode->setCurrentIndex(cfg.openGLFilteringMode());
         // Don't show the high quality filtering mode if it's not available
         if (!KisOpenGL::supportsGLSL13()) {
             cmbFilterMode->removeItem(3);
         }
     }
     if (qApp->applicationName() == "kritasketch" || qApp->applicationName() == "kritagemini") {
        grpOpenGL->setVisible(false);
        grpOpenGL->setMaximumHeight(0);
     }
 
     KoColor c;
     c.fromQColor(cfg.selectionOverlayMaskColor());
     m_selectionOverlayColorAction = new KoColorPopupAction(this);
     m_selectionOverlayColorAction->setCurrentColor(c);
     m_selectionOverlayColorAction->setToolTip(i18n("Change the background color of the image"));
     btnSelectionOverlayColor->setDefaultAction(m_selectionOverlayColorAction);
 
     intCheckSize->setValue(cfg.checkSize());
     chkMoving->setChecked(cfg.scrollCheckers());
     colorChecks1->setColor(cfg.checkersColor1());
     colorChecks2->setColor(cfg.checkersColor2());
     canvasBorder->setColor(cfg.canvasBorderColor());
     hideScrollbars->setChecked(cfg.hideScrollbars());
     chkCurveAntialiasing->setChecked(cfg.antialiasCurves());
     chkSelectionOutlineAntialiasing->setChecked(cfg.antialiasSelectionOutline());
     chkChannelsAsColor->setChecked(cfg.showSingleChannelAsColor());
     chkHidePopups->setChecked(cfg.hidePopups());
 
     connect(grpOpenGL, SIGNAL(toggled(bool)), SLOT(slotUseOpenGLToggled(bool)));
 }
 
 void DisplaySettingsTab::setDefault()
 {
     KisConfig cfg;
     if (!KisOpenGL::hasOpenGL()) {
         grpOpenGL->setEnabled(false);
         grpOpenGL->setChecked(false);
         chkUseTextureBuffer->setEnabled(false);
         chkDisableVsync->setEnabled(false);
         cmbFilterMode->setEnabled(false);
     }
     else {
         grpOpenGL->setEnabled(true);
         grpOpenGL->setChecked(cfg.useOpenGL(true));
         chkUseTextureBuffer->setChecked(cfg.useOpenGLTextureBuffer(true));
         chkUseTextureBuffer->setEnabled(true);
         chkDisableVsync->setEnabled(true);
         chkDisableVsync->setChecked(cfg.disableVSync(true));
         cmbFilterMode->setEnabled(true);
         cmbFilterMode->setCurrentIndex(cfg.openGLFilteringMode(true));
     }
 
     chkMoving->setChecked(cfg.scrollCheckers(true));
     intCheckSize->setValue(cfg.checkSize(true));
     colorChecks1->setColor(cfg.checkersColor1(true));
     colorChecks2->setColor(cfg.checkersColor2(true));
     canvasBorder->setColor(cfg.canvasBorderColor(true));
     hideScrollbars->setChecked(cfg.hideScrollbars(true));
     chkCurveAntialiasing->setChecked(cfg.antialiasCurves(true));
     chkSelectionOutlineAntialiasing->setChecked(cfg.antialiasSelectionOutline(true));
     chkChannelsAsColor->setChecked(cfg.showSingleChannelAsColor(true));
     chkHidePopups->setChecked(cfg.hidePopups(true));
 
 }
 
 void DisplaySettingsTab::slotUseOpenGLToggled(bool isChecked)
 {
     chkUseTextureBuffer->setEnabled(isChecked);
     chkDisableVsync->setEnabled(isChecked);
     cmbFilterMode->setEnabled(isChecked);
 }
 
 //---------------------------------------------------------------------------------------------------
 FullscreenSettingsTab::FullscreenSettingsTab(QWidget* parent) : WdgFullscreenSettingsBase(parent)
 {
     KisConfig cfg;
 
     chkDockers->setChecked(cfg.hideDockersFullscreen());
     chkMenu->setChecked(cfg.hideMenuFullscreen());
     chkScrollbars->setChecked(cfg.hideScrollbarsFullscreen());
     chkStatusbar->setChecked(cfg.hideStatusbarFullscreen());
     chkTitlebar->setChecked(cfg.hideTitlebarFullscreen());
     chkToolbar->setChecked(cfg.hideToolbarFullscreen());
 
 }
 
 void FullscreenSettingsTab::setDefault()
 {
     KisConfig cfg;
     chkDockers->setChecked(cfg.hideDockersFullscreen(true));
     chkMenu->setChecked(cfg.hideMenuFullscreen(true));
     chkScrollbars->setChecked(cfg.hideScrollbarsFullscreen(true));
     chkStatusbar->setChecked(cfg.hideStatusbarFullscreen(true));
     chkTitlebar->setChecked(cfg.hideTitlebarFullscreen(true));
     chkToolbar->setChecked(cfg.hideToolbarFullscreen(true));
 }
 
 
 //---------------------------------------------------------------------------------------------------
 
 KisDlgPreferences::KisDlgPreferences(QWidget* parent, const char* name)
     : KPageDialog(parent)
 {
     Q_UNUSED(name);
     setWindowTitle(i18n("Preferences"));
     // QT5TODO: help button needs custom wiring up to whatever help should be shown
     setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::RestoreDefaults);
     button(QDialogButtonBox::Ok)->setDefault(true);
 
     setFaceType(KPageDialog::List);
 
     // General
     KoVBox *vbox = new KoVBox();
     KPageWidgetItem *page = new KPageWidgetItem(vbox, i18n("General"));
     page->setObjectName("general");
     page->setHeader(i18n("General"));
     page->setIcon(KisIconUtils::loadIcon("go-home"));
     addPage(page);
     m_general = new GeneralTab(vbox);
 
     // Shortcuts
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Keyboard Shortcuts"));
     page->setObjectName("shortcuts");
     page->setHeader(i18n("Shortcuts"));
     page->setIcon(KisIconUtils::loadIcon("document-export"));
     addPage(page);
     m_shortcutSettings = new ShortcutSettingsTab(vbox);
     connect(this, SIGNAL(accepted()), m_shortcutSettings, SLOT(saveChanges()));
 
     // Canvas input settings
     m_inputConfiguration = new KisInputConfigurationPage();
     page = addPage(m_inputConfiguration, i18n("Canvas Input Settings"));
     page->setHeader(i18n("Canvas Input"));
     page->setObjectName("canvasinput");
     page->setIcon(KisIconUtils::loadIcon("configure"));
 
     // Display
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Display"));
     page->setObjectName("display");
     page->setHeader(i18n("Display"));
     page->setIcon(KisIconUtils::loadIcon("preferences-desktop-display"));
     addPage(page);
     m_displaySettings = new DisplaySettingsTab(vbox);
 
     // Color
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Color Management"));
     page->setObjectName("colormanagement");
     page->setHeader(i18n("Color"));
     page->setIcon(KisIconUtils::loadIcon("preferences-desktop-color"));
     addPage(page);
     m_colorSettings = new ColorSettingsTab(vbox);
 
     // Performance
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Performance"));
     page->setObjectName("performance");
     page->setHeader(i18n("Performance"));
     page->setIcon(KisIconUtils::loadIcon("applications-system"));
     addPage(page);
     m_performanceSettings = new PerformanceTab(vbox);
 
     // Tablet
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Tablet settings"));
     page->setObjectName("tablet");
     page->setHeader(i18n("Tablet"));
     page->setIcon(KisIconUtils::loadIcon("document-edit"));
     addPage(page);
     m_tabletSettings = new TabletSettingsTab(vbox);
 
     // full-screen mode
     vbox = new KoVBox();
     page = new KPageWidgetItem(vbox, i18n("Canvas-only settings"));
     page->setObjectName("canvasonly");
     page->setHeader(i18n("Canvas-only"));
     page->setIcon(KisIconUtils::loadIcon("folder-pictures"));
     addPage(page);
     m_fullscreenSettings = new FullscreenSettingsTab(vbox);
 
     // Author profiles
     m_authorPage = new KoConfigAuthorPage();
     page = addPage(m_authorPage, i18nc("@title:tab Author page", "Author" ));
     page->setObjectName("author");
     page->setHeader(i18n("Author"));
     page->setIcon(KisIconUtils::loadIcon("im-user"));
 
 
     QPushButton *restoreDefaultsButton = button(QDialogButtonBox::RestoreDefaults);
 
     connect(this, SIGNAL(accepted()), m_inputConfiguration, SLOT(saveChanges()));
     connect(this, SIGNAL(rejected()), m_inputConfiguration, SLOT(revertChanges()));
 
     KisPreferenceSetRegistry *preferenceSetRegistry = KisPreferenceSetRegistry::instance();
     Q_FOREACH (KisAbstractPreferenceSetFactory *preferenceSetFactory, preferenceSetRegistry->values()) {
         KisPreferenceSet* preferenceSet = preferenceSetFactory->createPreferenceSet();
         vbox = new KoVBox();
         page = new KPageWidgetItem(vbox, preferenceSet->name());
         page->setHeader(preferenceSet->header());
         page->setIcon(preferenceSet->icon());
         addPage(page);
         preferenceSet->setParent(vbox);
         preferenceSet->loadPreferences();
 
         connect(restoreDefaultsButton, SIGNAL(clicked(bool)), preferenceSet, SLOT(loadDefaultPreferences()), Qt::UniqueConnection);
         connect(this, SIGNAL(accepted()), preferenceSet, SLOT(savePreferences()), Qt::UniqueConnection);
     }
 
 
     connect(restoreDefaultsButton, SIGNAL(clicked(bool)), this, SLOT(slotDefault()));
 
 }
 
 KisDlgPreferences::~KisDlgPreferences()
 {
 }
 
 void KisDlgPreferences::slotDefault()
 {
     if (currentPage()->objectName() == "general") {
         m_general->setDefault();
     }
     else if (currentPage()->objectName() == "shortcuts") {
         m_shortcutSettings->setDefault();
     }
     else if (currentPage()->objectName() == "display") {
         m_displaySettings->setDefault();
     }
     else if (currentPage()->objectName() == "colormanagement") {
         m_colorSettings->setDefault();
     }
     else if (currentPage()->objectName() == "performance") {
         m_performanceSettings->load(true);
     }
     else if (currentPage()->objectName() == "tablet") {
         m_tabletSettings->setDefault();
     }
     else if (currentPage()->objectName() == "canvasonly") {
         m_fullscreenSettings->setDefault();
     }
     else if (currentPage()->objectName() == "canvasinput") {
         m_inputConfiguration->setDefaults();
     }
 }
 
 bool KisDlgPreferences::editPreferences()
 {
     KisDlgPreferences* dialog;
 
     dialog = new KisDlgPreferences();
     bool baccept = (dialog->exec() == Accepted);
     if (baccept) {
         // General settings
         KisConfig cfg;
         cfg.setNewCursorStyle(dialog->m_general->cursorStyle());
         cfg.setNewOutlineStyle(dialog->m_general->outlineStyle());
         cfg.setShowRootLayer(dialog->m_general->showRootLayer());
         cfg.setShowOutlineWhilePainting(dialog->m_general->showOutlineWhilePainting());
         cfg.setHideSplashScreen(dialog->m_general->hideSplashScreen());
         cfg.writeEntry<int>("mdi_viewmode", dialog->m_general->mdiMode());
         cfg.setMDIBackgroundColor(dialog->m_general->m_mdiColor->color());
         cfg.setMDIBackgroundImage(dialog->m_general->m_backgroundimage->text());
         cfg.setAutoSaveInterval(dialog->m_general->autoSaveInterval());
         cfg.setBackupFile(dialog->m_general->m_backupFileCheckBox->isChecked());
         cfg.setShowCanvasMessages(dialog->m_general->showCanvasMessages());
         cfg.setCompressKra(dialog->m_general->compressKra());
         cfg.setToolOptionsInDocker(dialog->m_general->toolOptionsInDocker());
         cfg.setSwitchSelectionCtrlAlt(dialog->m_general->switchSelectionCtrlAlt());
         cfg.setConvertToImageColorspaceOnImport(dialog->m_general->convertToImageColorspaceOnImport());
 
         KisPart *part = KisPart::instance();
         if (part) {
             Q_FOREACH (QPointer<KisDocument> doc, part->documents()) {
                 if (doc) {
                     doc->setAutoSave(dialog->m_general->autoSaveInterval());
                     doc->setBackupFile(dialog->m_general->m_backupFileCheckBox->isChecked());
                     doc->undoStack()->setUndoLimit(dialog->m_general->undoStackSize());
                 }
             }
         }
         cfg.setUndoStackLimit(dialog->m_general->undoStackSize());
         cfg.setFavoritePresets(dialog->m_general->favoritePresets());
 
         // Color settings
         cfg.setUseSystemMonitorProfile(dialog->m_colorSettings->m_page->chkUseSystemMonitorProfile->isChecked());
         for (int i = 0; i < QApplication::desktop()->screenCount(); ++i) {
             if (dialog->m_colorSettings->m_page->chkUseSystemMonitorProfile->isChecked()) {
                 int currentIndex = dialog->m_colorSettings->m_monitorProfileWidgets[i]->currentIndex();
                 QString monitorid = dialog->m_colorSettings->m_monitorProfileWidgets[i]->itemData(currentIndex).toString();
                 cfg.setMonitorForScreen(i, monitorid);
             }
             else {
                 cfg.setMonitorProfile(i,
                                       dialog->m_colorSettings->m_monitorProfileWidgets[i]->itemHighlighted(),
                                       dialog->m_colorSettings->m_page->chkUseSystemMonitorProfile->isChecked());
             }
         }
         cfg.setWorkingColorSpace(dialog->m_colorSettings->m_page->cmbWorkingColorSpace->currentItem().id());
 
         KisImageConfig cfgImage;
         cfgImage.setDefaultProofingConfig(dialog->m_colorSettings->m_page->proofingSpaceSelector->currentColorSpace(), dialog->m_colorSettings->m_page->cmbProofingIntent->currentIndex(), dialog->m_colorSettings->m_page->ckbProofBlackPoint->isChecked(), dialog->m_colorSettings->m_gamutWarning->currentKoColor(), (double)dialog->m_colorSettings->m_page->sldAdaptationState->value()/20);
         cfg.setUseBlackPointCompensation(dialog->m_colorSettings->m_page->chkBlackpoint->isChecked());
         cfg.setAllowLCMSOptimization(dialog->m_colorSettings->m_page->chkAllowLCMSOptimization->isChecked());
         cfg.setPasteBehaviour(dialog->m_colorSettings->m_pasteBehaviourGroup.checkedId());
         cfg.setRenderIntent(dialog->m_colorSettings->m_page->cmbMonitorIntent->currentIndex());
 
         // Tablet settings
         cfg.setPressureTabletCurve( dialog->m_tabletSettings->m_page->pressureCurve->curve().toString() );
 
         dialog->m_performanceSettings->save();
 
         if (!cfg.useOpenGL() && dialog->m_displaySettings->grpOpenGL->isChecked())
             cfg.setCanvasState("TRY_OPENGL");
         cfg.setUseOpenGL(dialog->m_displaySettings->grpOpenGL->isChecked());
         cfg.setUseOpenGLTextureBuffer(dialog->m_displaySettings->chkUseTextureBuffer->isChecked());
         cfg.setOpenGLFilteringMode(dialog->m_displaySettings->cmbFilterMode->currentIndex());
         cfg.setDisableVSync(dialog->m_displaySettings->chkDisableVsync->isChecked());
 
         cfg.setCheckSize(dialog->m_displaySettings->intCheckSize->value());
         cfg.setScrollingCheckers(dialog->m_displaySettings->chkMoving->isChecked());
         cfg.setCheckersColor1(dialog->m_displaySettings->colorChecks1->color());
         cfg.setCheckersColor2(dialog->m_displaySettings->colorChecks2->color());
         cfg.setCanvasBorderColor(dialog->m_displaySettings->canvasBorder->color());
         cfg.setHideScrollbars(dialog->m_displaySettings->hideScrollbars->isChecked());
         cfg.setSelectionOverlayMaskColor(dialog->m_displaySettings->m_selectionOverlayColorAction->currentKoColor().toQColor());
         cfg.setAntialiasCurves(dialog->m_displaySettings->chkCurveAntialiasing->isChecked());
         cfg.setAntialiasSelectionOutline(dialog->m_displaySettings->chkSelectionOutlineAntialiasing->isChecked());
         cfg.setShowSingleChannelAsColor(dialog->m_displaySettings->chkChannelsAsColor->isChecked());
         cfg.setHidePopups(dialog->m_displaySettings->chkHidePopups->isChecked());
 
         cfg.setHideDockersFullscreen(dialog->m_fullscreenSettings->chkDockers->checkState());
         cfg.setHideMenuFullscreen(dialog->m_fullscreenSettings->chkMenu->checkState());
         cfg.setHideScrollbarsFullscreen(dialog->m_fullscreenSettings->chkScrollbars->checkState());
         cfg.setHideStatusbarFullscreen(dialog->m_fullscreenSettings->chkStatusbar->checkState());
         cfg.setHideTitlebarFullscreen(dialog->m_fullscreenSettings->chkTitlebar->checkState());
         cfg.setHideToolbarFullscreen(dialog->m_fullscreenSettings->chkToolbar->checkState());
 
         dialog->m_authorPage->apply();
 
     }
     delete dialog;
     return baccept;
 }
 
diff --git a/libs/ui/forms/kis_matrix_widget.ui b/libs/ui/forms/kis_matrix_widget.ui
index d055bbd75a..d7e7aca22c 100644
--- a/libs/ui/forms/kis_matrix_widget.ui
+++ b/libs/ui/forms/kis_matrix_widget.ui
@@ -1,130 +1,137 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>KisMatrixWidget</class>
-  <widget class="QWidget" name="KisMatrixWidget" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>191</width>
-        <height>115</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Matrix Widget</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QSpinBox" name="m11" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="2" >
-        <widget class="QSpinBox" name="m13" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="1" >
-        <widget class="QSpinBox" name="m12" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="1" column="2" >
-        <widget class="QSpinBox" name="m23" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="1" column="0" >
-        <widget class="QSpinBox" name="m21" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="1" column="1" >
-        <widget class="QSpinBox" 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="QSpinBox" name="m31" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="1" >
-        <widget class="QSpinBox" name="m32" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="2" >
-        <widget class="QSpinBox" name="m33" >
-          <property name="minimum" >
-            <number>-99</number>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="1" >
-        <spacer name="spacer4" >
-          <property name="sizeHint" >
-            <size>
-              <width>20</width>
-              <height>41</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-      <item row="1" column="3" >
-        <spacer name="spacer5" >
-          <property name="sizeHint" >
-            <size>
-              <width>21</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Qt::Horizontal</enum>
-          </property>
-        </spacer>
-      </item>
-    </layout>
-  </widget>
-  <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>
+<?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_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 2cf9bfda69..e6c2ee7608 100644
--- a/libs/ui/forms/wdgautogradient.ui
+++ b/libs/ui/forms/wdgautogradient.ui
@@ -1,376 +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">
+    <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="QSpinBox" name="intNumInputLeftOpacity">
+      <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">
+       <property name="color" stdset="0">
         <color>
          <red>255</red>
          <green>255</green>
          <blue>255</blue>
         </color>
        </property>
-       <property name="defaultColor">
+       <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="QSpinBox" name="intNumInputRightOpacity">
+      <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="margin">
+     <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_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 9538a90321..0bbd7ed23a 100644
--- a/libs/ui/forms/wdgdisplaysettings.ui
+++ b/libs/ui/forms/wdgdisplaysettings.ui
@@ -1,355 +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>500</width>
+    <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>Size:</string>
+         <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="QSpinBox" name="intCheckSize">
+       <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>OpenGL</string>
+      <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_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 24877ff8d6..d38056e557 100644
--- a/libs/ui/forms/wdggeneralsettings.ui
+++ b/libs/ui/forms/wdggeneralsettings.ui
@@ -1,710 +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>0</number>
+      <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 Toolbar</string>
+               <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="QSpinBox" name="m_favoritePresetsSpinBox">
+          <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="QSpinBox" name="m_autosaveSpinBox">
+          <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="QSpinBox" name="m_undoStackSize">
+          <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_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 23da1b7975..7526c61bec 100644
--- a/libs/ui/forms/wdgimportimagesequence.ui
+++ b/libs/ui/forms/wdgimportimagesequence.ui
@@ -1,122 +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="QSpinBox" name="spinFirstFrame">
+           <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="QSpinBox" name="spinStep">
+           <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_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 293b349512..4d5ee82786 100644
--- a/libs/ui/forms/wdgnewimage.ui
+++ b/libs/ui/forms/wdgnewimage.ui
@@ -1,679 +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>&amp;Predefined:</string>
+                 <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="QDoubleSpinBox" name="doubleWidth">
+                 <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="QDoubleSpinBox" name="doubleResolution">
+                 <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="QDoubleSpinBox" name="doubleHeight">
+                 <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>&amp;Width:</string>
+                   <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>Image Background &amp;Opacity:</string>
+          <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="QSpinBox" name="intNumLayers">
+        <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 first layer</string>
+            <string>As fi&amp;rst layer</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="radioBackgroundAsProjection">
            <property name="text">
-            <string>As canvas color</string>
+            <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">
+         <property name="color" stdset="0">
           <color>
            <red>255</red>
            <green>255</green>
            <blue>255</blue>
           </color>
          </property>
-         <property name="defaultColor">
+         <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="margin">
+          <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_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>KisColorSpaceSelector</class>
-   <extends>QWidget</extends>
-   <header>widgets/kis_color_space_selector.h</header>
-   <container>1</container>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <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 76132f678e..5e82cc60a0 100644
--- a/libs/ui/forms/wdgpaintactioneditor.ui
+++ b/libs/ui/forms/wdgpaintactioneditor.ui
@@ -1,197 +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>400</width>
+    <width>405</width>
     <height>376</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="KisNodeQueryPathEditor" name="nodeQueryPathEditor"/>
+    <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="QSpinBox" name="opacity">
+        <widget class="KisIntParseSpinBox" name="opacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimum" stdset="0">
+         <property name="minimum">
           <number>0</number>
          </property>
-         <property name="maximum" stdset="0">
+         <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">
+        <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_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 fd5805c0bc..93111dbe4c 100644
--- a/libs/ui/forms/wdgperformancesettings.ui
+++ b/libs/ui/forms/wdgperformancesettings.ui
@@ -1,300 +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">
+         <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="QSpinBox" name="intMemoryLimit">
+         <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">
+         <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="QSpinBox" name="intPoolLimit">
+         <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">
+         <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="QSpinBox" name="intUndoLimit">
+         <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">
+         <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="QSpinBox" name="intSwapSize">
+         <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>KisDoubleSliderSpinBox</class>
+   <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KisSliderSpinBox</class>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kis_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
-   <header location="global">kis_slider_spin_box.h</header>
+   <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 a86fc36566..c232202b2f 100644
--- a/libs/ui/forms/wdgrectangleconstraints.ui
+++ b/libs/ui/forms/wdgrectangleconstraints.ui
@@ -1,186 +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>218</width>
+    <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="QSpinBox" name="intHeight">
+      <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="QDoubleSpinBox" name="doubleRatio">
+      <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="QSpinBox" name="intWidth">
+      <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>kis_double_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/input/kis_input_manager.cpp b/libs/ui/input/kis_input_manager.cpp
index e6fedb1e14..34e482f9a7 100644
--- a/libs/ui/input/kis_input_manager.cpp
+++ b/libs/ui/input/kis_input_manager.cpp
@@ -1,597 +1,608 @@
 /* This file is part of the KDE project
  *
  *  Copyright (C) 2012 Arjen Hiemstra <ahiemstra@heimr.nl>
  *  Copyright (C) 2015 Michael Abrahams <miabraha@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_input_manager.h"
 
 #include <kis_debug.h>
 #include <QQueue>
 #include <klocalizedstring.h>
 #include <QApplication>
 
 #include <KoToolManager.h>
 
 #include "kis_tool_proxy.h"
 
 #include <kis_config.h>
 #include <kis_canvas2.h>
 #include <KisViewManager.h>
 #include <kis_image.h>
 #include <kis_canvas_resource_provider.h>
 #include <kis_favorite_resource_manager.h>
 
 #include "kis_abstract_input_action.h"
 #include "kis_tool_invocation_action.h"
 #include "kis_pan_action.h"
 #include "kis_alternate_invocation_action.h"
 #include "kis_rotate_canvas_action.h"
 #include "kis_zoom_action.h"
 #include "kis_show_palette_action.h"
 #include "kis_change_primary_setting_action.h"
 
 #include "kis_shortcut_matcher.h"
 #include "kis_stroke_shortcut.h"
 #include "kis_single_action_shortcut.h"
 #include "kis_touch_shortcut.h"
 
 #include "kis_input_profile.h"
 #include "kis_input_profile_manager.h"
 #include "kis_shortcut_configuration.h"
 
 #include <input/kis_tablet_debugger.h>
 #include <kis_signal_compressor.h>
 
 #include "kis_extended_modifiers_mapper.h"
 #include "kis_input_manager_p.h"
 
 template <typename T>
 uint qHash(QPointer<T> value) {
     return reinterpret_cast<quintptr>(value.data());
 }
 
 
 #define start_ignore_cursor_events() d->blockMouseEvents()
 #define stop_ignore_cursor_events() d->allowMouseEvents()
 #define break_if_should_ignore_cursor_events() if (d->ignoringQtCursorEvents()) break;
 
 // Touch rejection: if touch is disabled on canvas, no need to block mouse press events
 #define touch_start_block_press_events()  d->touchHasBlockedPressEvents = d->disableTouchOnCanvas;
 #define touch_stop_block_press_events()  d->touchHasBlockedPressEvents = false;
 #define break_if_touch_blocked_press_events() if (d->touchHasBlockedPressEvents) break;
 #define touch_eat_one_mouse_press() if (d->disableTouchOnCanvas) d->eatOneMousePress();
 
 KisInputManager::KisInputManager(QObject *parent)
     : QObject(parent), d(new Private(this))
 {
     d->setupActions();
 
     connect(KoToolManager::instance(), SIGNAL(changedTool(KoCanvasController*,int)),
             SLOT(slotToolChanged()));
     connect(&d->moveEventCompressor, SIGNAL(timeout()), SLOT(slotCompressedMoveEvent()));
 
 
 #ifndef Q_OS_MAC
     QApplication::instance()->
         installEventFilter(new Private::ProximityNotifier(d, this));
 #endif
 }
 
 KisInputManager::~KisInputManager()
 {
     delete d;
 }
 
 void KisInputManager::addTrackedCanvas(KisCanvas2 *canvas)
 {
     d->canvasSwitcher.addCanvas(canvas);
 }
 
 void KisInputManager::removeTrackedCanvas(KisCanvas2 *canvas)
 {
     d->canvasSwitcher.removeCanvas(canvas);
 }
 
 void KisInputManager::toggleTabletLogger()
 {
     KisTabletDebugger::instance()->toggleDebugging();
 }
 
 void KisInputManager::attachPriorityEventFilter(QObject *filter, int priority)
 {
     Private::PriorityList::iterator begin = d->priorityEventFilter.begin();
     Private::PriorityList::iterator it = begin;
     Private::PriorityList::iterator end = d->priorityEventFilter.end();
 
     it = std::find_if(begin, end,
                       [filter] (const Private::PriorityPair &a) { return a.second == filter; });
 
     if (it != end) return;
 
     it = std::find_if(begin, end,
                       [priority] (const Private::PriorityPair &a) { return a.first > priority; });
 
     d->priorityEventFilter.insert(it, qMakePair(priority, filter));
     d->priorityEventFilterSeqNo++;
 }
 
 void KisInputManager::detachPriorityEventFilter(QObject *filter)
 {
     Private::PriorityList::iterator it = d->priorityEventFilter.begin();
     Private::PriorityList::iterator end = d->priorityEventFilter.end();
 
     it = std::find_if(it, end,
                       [filter] (const Private::PriorityPair &a) { return a.second == filter; });
 
     if (it != end) {
         d->priorityEventFilter.erase(it);
     }
 }
 
 void KisInputManager::setupAsEventFilter(QObject *receiver)
 {
     if (d->eventsReceiver) {
         d->eventsReceiver->removeEventFilter(this);
     }
 
     d->eventsReceiver = receiver;
 
     if (d->eventsReceiver) {
         d->eventsReceiver->installEventFilter(this);
     }
 }
 
 void KisInputManager::stopIgnoringEvents()
 {
     stop_ignore_cursor_events();
 }
 
 void KisInputManager::slotFocusOnEnter(bool value)
 {
     Q_UNUSED(value);
     // not used anymore
 }
 
 #if defined (__clang__)
 #pragma GCC diagnostic ignored "-Wswitch"
 #endif
 
 bool KisInputManager::eventFilter(QObject* object, QEvent* event)
 {
     if (object != d->eventsReceiver) return false;
 
     if (d->eventEater.eventFilter(object, event)) return false;
 
     if (!d->matcher.hasRunningShortcut()) {
 
         int savedPriorityEventFilterSeqNo = d->priorityEventFilterSeqNo;
 
         for (auto it = d->priorityEventFilter.begin(); it != d->priorityEventFilter.end(); /*noop*/) {
             const QPointer<QObject> &filter = it->second;
 
             if (filter.isNull()) {
                 it = d->priorityEventFilter.erase(it);
 
                 d->priorityEventFilterSeqNo++;
                 savedPriorityEventFilterSeqNo++;
                 continue;
             }
 
             if (filter->eventFilter(object, event)) return true;
 
             /**
              * If the filter removed itself from the filters list or
              * added something there, just exit the loop
              */
             if (d->priorityEventFilterSeqNo != savedPriorityEventFilterSeqNo) {
                 return true;
             }
 
             ++it;
         }
 
         // KoToolProxy needs to pre-process some events to ensure the
         // global shortcuts (not the input manager's ones) are not
         // executed, in particular, this line will accept events when the
         // tool is in text editing, preventing shortcut triggering
         d->toolProxy->processEvent(event);
     }
 
     // Continue with the actual switch statement...
     return eventFilterImpl(event);
 }
 
 template <class Event>
 bool KisInputManager::compressMoveEventCommon(Event *event)
 {
     /**
      * We construct a copy of this event object, so we must ensure it
      * has a correct type.
      */
     static_assert(std::is_same<Event, QMouseEvent>::value ||
                   std::is_same<Event, QTabletEvent>::value,
                   "event should a mouse or a tablet event");
 
     bool retval = false;
 
     /**
      * Compress the events if the tool doesn't need high resolution input
      */
     if ((event->type() == QEvent::MouseMove ||
          event->type() == QEvent::TabletMove) &&
         (!d->matcher.supportsHiResInputEvents() ||
          d->testingCompressBrushEvents)) {
 
         d->compressedMoveEvent.reset(new Event(*event));
         d->moveEventCompressor.start();
 
         /**
          * On Linux Qt eats the rest of unneeded events if we
          * ignore the first of the chunk of tablet events. So
          * generally we should never activate this feature. Only
          * for testing purposes!
          */
         if (d->testingAcceptCompressedTabletEvents) {
             event->setAccepted(true);
         }
 
         retval = true;
     } else {
         slotCompressedMoveEvent();
         retval = d->handleCompressedTabletEvent(event);
     }
 
     return retval;
 }
 
 bool KisInputManager::eventFilterImpl(QEvent * event)
 {
     // TODO: Handle touch events correctly.
     bool retval = false;
 
     switch (event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick: {
         d->debugEvent<QMouseEvent, true>(event);
         break_if_should_ignore_cursor_events();
         break_if_touch_blocked_press_events();
 
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
         if (d->tryHidePopupPalette()) {
             retval = true;
         } else {
             //Make sure the input actions know we are active.
             KisAbstractInputAction::setInputManager(this);
             retval = d->matcher.buttonPressed(mouseEvent->button(), mouseEvent);
         }
         event->setAccepted(retval);
         break;
     }
     case QEvent::MouseButtonRelease: {
         d->debugEvent<QMouseEvent, true>(event);
         break_if_should_ignore_cursor_events();
         break_if_touch_blocked_press_events();
 
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
         retval = d->matcher.buttonReleased(mouseEvent->button(), mouseEvent);
         event->setAccepted(retval);
         break;
     }
     case QEvent::ShortcutOverride: {
         d->debugEvent<QKeyEvent, false>(event);
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
         Qt::Key key = KisExtendedModifiersMapper::workaroundShiftAltMetaHell(keyEvent);
 
         if (!keyEvent->isAutoRepeat()) {
             retval = d->matcher.keyPressed(key);
         } else {
             retval = d->matcher.autoRepeatedKeyPressed(key);
         }
 
         /**
          * Workaround for temporary switching of tools by
          * KoCanvasControllerWidget. We don't need this switch because
          * we handle it ourselves.
          */
         retval |= !d->forwardAllEventsToTool &&
                 (keyEvent->key() == Qt::Key_Space ||
                  keyEvent->key() == Qt::Key_Escape);
 
         break;
     }
     case QEvent::KeyRelease: {
         d->debugEvent<QKeyEvent, false>(event);
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
         if (!keyEvent->isAutoRepeat()) {
             Qt::Key key = KisExtendedModifiersMapper::workaroundShiftAltMetaHell(keyEvent);
             retval = d->matcher.keyReleased(key);
         }
         break;
     }
     case QEvent::MouseMove: {
         d->debugEvent<QMouseEvent, true>(event);
         break_if_should_ignore_cursor_events();
 
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
         retval = compressMoveEventCommon(mouseEvent);
 
         break;
     }
     case QEvent::Wheel: {
         d->debugEvent<QWheelEvent, false>(event);
         QWheelEvent *wheelEvent = static_cast<QWheelEvent*>(event);
         KisSingleActionShortcut::WheelAction action;
 
+        /**
+         * Ignore delta 0 events on OSX, since they are triggered by tablet
+         * proximity when using Wacom devices.
+         */
+#ifdef Q_OS_MAC
+        if(wheelEvent->delta() == 0) {
+            retval = true;
+            break;
+        }
+#endif
+
         if(wheelEvent->orientation() == Qt::Horizontal) {
             if(wheelEvent->delta() < 0) {
                 action = KisSingleActionShortcut::WheelRight;
             }
             else {
                 action = KisSingleActionShortcut::WheelLeft;
             }
         }
         else {
             if(wheelEvent->delta() > 0) {
                 action = KisSingleActionShortcut::WheelUp;
             }
             else {
                 action = KisSingleActionShortcut::WheelDown;
             }
         }
 
         //Make sure the input actions know we are active.
         KisAbstractInputAction::setInputManager(this);
         retval = d->matcher.wheelEvent(action, wheelEvent);
         break;
     }
     case QEvent::Enter:
         d->debugEvent<QEvent, false>(event);
         d->containsPointer = true;
         //Make sure the input actions know we are active.
         KisAbstractInputAction::setInputManager(this);
 
         stop_ignore_cursor_events();
         touch_stop_block_press_events();
 
         d->matcher.enterEvent();
         break;
     case QEvent::Leave:
         d->debugEvent<QEvent, false>(event);
         d->containsPointer = false;
         /**
          * We won't get a TabletProximityLeave event when the tablet
          * is hovering above some other widget, so restore cursor
          * events processing right now.
          */
         stop_ignore_cursor_events();
         touch_stop_block_press_events();
 
         d->matcher.leaveEvent();
         break;
     case QEvent::FocusIn:
         d->debugEvent<QEvent, false>(event);
         KisAbstractInputAction::setInputManager(this);
 
         //Clear all state so we don't have half-matched shortcuts dangling around.
         d->matcher.reinitialize();
 
         { // Emulate pressing of the key that are already pressed
             KisExtendedModifiersMapper mapper;
 
             Qt::KeyboardModifiers modifiers = mapper.queryStandardModifiers();
             Q_FOREACH (Qt::Key key, mapper.queryExtendedModifiers()) {
                 QKeyEvent kevent(QEvent::ShortcutOverride, key, modifiers);
                 eventFilterImpl(&kevent);
             }
         }
 
         stop_ignore_cursor_events();
         break;
     case QEvent::TabletRelease: {
 #ifdef Q_OS_MAC
         stop_ignore_cursor_events();
 #endif
         // break_if_touch_blocked_press_events();
         d->debugEvent<QTabletEvent, false>(event);
 
         QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(event);
         retval = d->matcher.buttonReleased(tabletEvent->button(), tabletEvent);
         retval = true;
         event->setAccepted(true);
         break;
     }
 
 
     case QEvent::TabletMove: {
         d->debugEvent<QTabletEvent, false>(event);
 
         QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(event);
         retval = compressMoveEventCommon(tabletEvent);
 
         /**
          * The flow of tablet events means the tablet is in the
          * proximity area, so activate it even when the
          * TabletEnterProximity event was missed (may happen when
          * changing focus of the window with tablet in the proximity
          * area)
          */
         start_ignore_cursor_events();
 
         break;
     }
 
     case QEvent::TabletPress: {
         d->debugEvent<QTabletEvent, false>(event);
         QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(event);
         if (d->tryHidePopupPalette()) {
             retval = true;
         } else {
             //Make sure the input actions know we are active.
             KisAbstractInputAction::setInputManager(this);
             retval = d->matcher.buttonPressed(tabletEvent->button(), tabletEvent);
         }
         event->setAccepted(true);
         retval = true;
         start_ignore_cursor_events();
         d->eatOneMousePress();
         break;
     }
 
     case QEvent::TouchBegin:
         touch_start_block_press_events();
         touch_eat_one_mouse_press();
         if (d->tryHidePopupPalette()) {
             retval = true;
         } else {
             KisAbstractInputAction::setInputManager(this);
             retval = d->matcher.touchBeginEvent(static_cast<QTouchEvent*>(event));
             event->accept();
         }
         // d->resetSavedTabletEvent(event->type());
         break;
     case QEvent::TouchUpdate: {
         QTouchEvent *tevent = static_cast<QTouchEvent*>(event);
 #ifdef Q_OS_MAC
         int count = 0;
         Q_FOREACH (const QTouchEvent::TouchPoint &point, tevent->touchPoints()) {
             if (point.state() != Qt::TouchPointReleased) {
                 count++;
             }
         }
 
         if (count < 2 && tevent->touchPoints().length() > count) {
             touch_stop_block_press_events();
             d->saveTouchEvent(tevent);
             retval = d->matcher.touchEndEvent(tevent);
             delete d->lastTouchEvent;
             d->lastTouchEvent = 0;
         } else {
 #endif
             touch_start_block_press_events();
             KisAbstractInputAction::setInputManager(this);
             retval = d->matcher.touchUpdateEvent(tevent);
 #ifdef Q_OS_MAC
         }
 #endif
         event->accept();
 
         // d->resetSavedTabletEvent(event->type());
         break;
     }
     case QEvent::TouchEnd:
         touch_stop_block_press_events();
         d->saveTouchEvent(static_cast<QTouchEvent*>(event));
         retval = d->matcher.touchEndEvent(static_cast<QTouchEvent*>(event));
         event->accept();
         // d->resetSavedTabletEvent(event->type());
         delete d->lastTouchEvent;
         d->lastTouchEvent = 0;
         break;
     default:
         break;
     }
 
     return !retval ? d->processUnhandledEvent(event) : true;
 }
 
 
 void KisInputManager::slotCompressedMoveEvent()
 {
     if (d->compressedMoveEvent) {
         // touch_stop_block_press_events();
 
         (void) d->handleCompressedTabletEvent(d->compressedMoveEvent.data());
         d->compressedMoveEvent.reset();
         dbgKrita << "Compressed move event received.";
     } else {
         dbgKrita << "Unexpected empty move event";
     }
 }
 
 KisCanvas2* KisInputManager::canvas() const
 {
     return d->canvas;
 }
 
 KisToolProxy* KisInputManager::toolProxy() const
 {
     return d->toolProxy;
 }
 
 QTouchEvent *KisInputManager::lastTouchEvent() const
 {
     return d->lastTouchEvent;
 }
 
 void KisInputManager::slotToolChanged()
 {
     auto toolManager = KoToolManager::instance();
     auto tool = toolManager->toolById(canvas(), toolManager->activeToolId());
     if (tool->isInTextMode()) {
         d->forwardAllEventsToTool = true;
         d->matcher.suppressAllActions(true);
     } else {
         d->forwardAllEventsToTool = false;
         d->matcher.suppressAllActions(false);
     }
 
     d->maskSyntheticEvents(tool->maskSyntheticEvents());
 }
 
 QPointF KisInputManager::widgetToDocument(const QPointF& position)
 {
     const QPointF half = QPointF(.5f, .5f);
     QPointF pixel = position + half;
     return d->canvas->coordinatesConverter()->widgetToDocument(pixel);
 }
 
 void KisInputManager::profileChanged()
 {
     d->matcher.clearShortcuts();
 
     KisInputProfile *profile = KisInputProfileManager::instance()->currentProfile();
     if (profile) {
         const QList<KisShortcutConfiguration*> shortcuts = profile->allShortcuts();
 
         for (KisShortcutConfiguration * const shortcut : shortcuts) {
             dbgUI << "Adding shortcut" << shortcut->keys() << "for action" << shortcut->action()->name();
             switch(shortcut->type()) {
             case KisShortcutConfiguration::KeyCombinationType:
                 d->addKeyShortcut(shortcut->action(), shortcut->mode(), shortcut->keys());
                 break;
             case KisShortcutConfiguration::MouseButtonType:
                 d->addStrokeShortcut(shortcut->action(), shortcut->mode(), shortcut->keys(), shortcut->buttons());
                 break;
             case KisShortcutConfiguration::MouseWheelType:
                 d->addWheelShortcut(shortcut->action(), shortcut->mode(), shortcut->keys(), shortcut->wheel());
                 break;
             case KisShortcutConfiguration::GestureType:
                 d->addTouchShortcut(shortcut->action(), shortcut->mode(), shortcut->gesture());
                 break;
             default:
                 break;
             }
         }
     }
     else {
         dbgKrita << "No Input Profile Found: canvas interaction will be impossible";
     }
 }
diff --git a/libs/ui/input/kis_zoom_action.cpp b/libs/ui/input/kis_zoom_action.cpp
index 8a49ab071a..fe237ad0da 100644
--- a/libs/ui/input/kis_zoom_action.cpp
+++ b/libs/ui/input/kis_zoom_action.cpp
@@ -1,246 +1,284 @@
 /* This file is part of the KDE project
  * Copyright (C) 2012 Arjen Hiemstra <ahiemstra@heimr.nl>
  *
  *  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_zoom_action.h"
 
 #include <QApplication>
 
 #include <klocalizedstring.h>
 
 #include <KoCanvasControllerWidget.h>
 #include <KoZoomController.h>
 
 #include <kis_canvas2.h>
 #include <kis_canvas_controller.h>
 #include "kis_cursor.h"
 #include "KisViewManager.h"
 #include "kis_input_manager.h"
 #include "kis_config.h"
 
 
+inline QPoint pointFromEvent(QEvent *event) {
+    if (!event) {
+        return QPoint();
+    } else if (QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event)) {
+        return mouseEvent->pos();
+    } else if (QTabletEvent *tabletEvent = dynamic_cast<QTabletEvent*>(event)) {
+        return tabletEvent->pos();
+    } else if (QWheelEvent *wheelEvent = dynamic_cast<QWheelEvent*>(event)) {
+        return wheelEvent->pos();
+    }
+
+    return QPoint();
+}
+
+
 class KisZoomAction::Private
 {
 public:
     Private(KisZoomAction *qq) : q(qq), distance(0), lastDistance(0.f) {}
 
     QPointF centerPoint(QTouchEvent* event);
 
     KisZoomAction *q;
     int distance;
     Shortcuts mode;
 
     QPointF lastPosition;
     float lastDistance;
 
-    void zoomTo(bool zoomIn, QEvent *event);
+    QPoint startPoint;
+
+    void zoomTo(bool zoomIn, const QPoint &pos);
 };
 
 QPointF KisZoomAction::Private::centerPoint(QTouchEvent* event)
 {
     QPointF result;
     int count = 0;
 
     Q_FOREACH (QTouchEvent::TouchPoint point, event->touchPoints()) {
         if (point.state() != Qt::TouchPointReleased) {
             result += point.screenPos();
             count++;
         }
     }
 
     if (count > 0) {
         return result / count;
     } else {
         return QPointF();
     }
 }
 
-void KisZoomAction::Private::zoomTo(bool zoomIn, QEvent *event)
+void KisZoomAction::Private::zoomTo(bool zoomIn, const QPoint &point)
 {
     KoZoomAction *zoomAction = q->inputManager()->canvas()->viewManager()->zoomController()->zoomAction();
 
-    if (event) {
-        QPoint pos = q->eventPos(event);
-
+    if (!point.isNull()) {
         float oldZoom = zoomAction->effectiveZoom();
         float newZoom = zoomIn ?
             zoomAction->nextZoomLevel() : zoomAction->prevZoomLevel();
 
         KoCanvasControllerWidget *controller =
             dynamic_cast<KoCanvasControllerWidget*>(
                 q->inputManager()->canvas()->canvasController());
 
-        controller->zoomRelativeToPoint(pos, newZoom / oldZoom);
+        controller->zoomRelativeToPoint(point, newZoom / oldZoom);
     } else {
         if (zoomIn) {
             zoomAction->zoomIn();
         } else {
             zoomAction->zoomOut();
         }
     }
 }
 
 KisZoomAction::KisZoomAction()
     : KisAbstractInputAction("Zoom Canvas")
     , d(new Private(this))
 {
     setName(i18n("Zoom Canvas"));
     setDescription(i18n("The <i>Zoom Canvas</i> action zooms the canvas."));
 
     QHash< QString, int > shortcuts;
     shortcuts.insert(i18n("Zoom Mode"), ZoomModeShortcut);
     shortcuts.insert(i18n("Discrete Zoom Mode"), DiscreteZoomModeShortcut);
+    shortcuts.insert(i18n("Relative Zoom Mode"), RelativeZoomModeShortcut);
+    shortcuts.insert(i18n("Relative Discrete Zoom Mode"), RelativeDiscreteZoomModeShortcut);
     shortcuts.insert(i18n("Zoom In"), ZoomInShortcut);
     shortcuts.insert(i18n("Zoom Out"), ZoomOutShortcut);
     shortcuts.insert(i18n("Reset Zoom to 100%"), ZoomResetShortcut);
     shortcuts.insert(i18n("Fit to Page"), ZoomToPageShortcut);
     shortcuts.insert(i18n("Fit to Width"), ZoomToWidthShortcut);
     setShortcutIndexes(shortcuts);
 }
 
 KisZoomAction::~KisZoomAction()
 {
     delete d;
 }
 
 int KisZoomAction::priority() const
 {
     return 4;
 }
 
 void KisZoomAction::activate(int shortcut)
 {
-    if (shortcut == DiscreteZoomModeShortcut) {
+    if (shortcut == DiscreteZoomModeShortcut ||
+        shortcut == RelativeDiscreteZoomModeShortcut) {
         QApplication::setOverrideCursor(KisCursor::zoomDiscreteCursor());
     } else /* if (shortcut == SmoothZoomModeShortcut) */ {
         QApplication::setOverrideCursor(KisCursor::zoomSmoothCursor());
     }
 }
 
 void KisZoomAction::deactivate(int shortcut)
 {
     Q_UNUSED(shortcut);
     QApplication::restoreOverrideCursor();
 }
 
 void KisZoomAction::begin(int shortcut, QEvent *event)
 {
     KisAbstractInputAction::begin(shortcut, event);
 
     d->lastDistance = 0.f;
 
     switch(shortcut) {
-        case ZoomModeShortcut: {
+        case ZoomModeShortcut:
+        case RelativeZoomModeShortcut: {
+            d->startPoint = pointFromEvent(event);
             d->mode = (Shortcuts)shortcut;
             QTouchEvent *tevent = dynamic_cast<QTouchEvent*>(event);
             if(tevent)
                 d->lastPosition = d->centerPoint(tevent);
             break;
         }
         case DiscreteZoomModeShortcut:
+        case RelativeDiscreteZoomModeShortcut:
+            d->startPoint = pointFromEvent(event);
             d->mode = (Shortcuts)shortcut;
             d->distance = 0;
             break;
         case ZoomInShortcut:
-            d->zoomTo(true, event);
+            d->zoomTo(true, pointFromEvent(event));
             break;
         case ZoomOutShortcut:
-            d->zoomTo(false, event);
+            d->zoomTo(false, pointFromEvent(event));
             break;
         case ZoomResetShortcut:
             inputManager()->canvas()->viewManager()->zoomController()->setZoom(KoZoomMode::ZOOM_CONSTANT, 1.0);
             break;
         case ZoomToPageShortcut:
             inputManager()->canvas()->viewManager()->zoomController()->setZoom(KoZoomMode::ZOOM_PAGE, 1.0);
             break;
         case ZoomToWidthShortcut:
             inputManager()->canvas()->viewManager()->zoomController()->setZoom(KoZoomMode::ZOOM_WIDTH, 1.0);
             break;
     }
 }
 
 void KisZoomAction::inputEvent( QEvent* event )
 {
     switch (event->type()) {
         case QEvent::TouchUpdate: {
             QTouchEvent *tevent = static_cast<QTouchEvent*>(event);
             QPointF center = d->centerPoint(tevent);
 
             int count = 0;
             float dist = 0.0f;
             Q_FOREACH (const QTouchEvent::TouchPoint &point, tevent->touchPoints()) {
                 if (point.state() != Qt::TouchPointReleased) {
                     count++;
 
                     dist += (point.screenPos() - center).manhattanLength();
                 }
             }
 
             dist /= count;
             float delta = qFuzzyCompare(1.0f, 1.0f + d->lastDistance) ? 1.f : dist / d->lastDistance;
 
             if(qAbs(delta) > 0.1f) {
                 qreal zoom = inputManager()->canvas()->viewManager()->zoomController()->zoomAction()->effectiveZoom();
                 Q_UNUSED(zoom);
                 static_cast<KisCanvasController*>(inputManager()->canvas()->canvasController())->zoomRelativeToPoint(center.toPoint(), delta);
                 d->lastDistance = dist;
                 // Also do panning here, as doing it later requires a further check for validity
                 QPointF moveDelta = center - d->lastPosition;
                 inputManager()->canvas()->canvasController()->pan(-moveDelta.toPoint());
                 d->lastPosition = center;
             }
             return;  // Don't try to update the cursor during a pinch-zoom
         }
         default:
             break;
     }
     KisAbstractInputAction::inputEvent(event);
 }
 
 void KisZoomAction::cursorMoved(const QPointF &lastPos, const QPointF &pos)
 {
     QPointF diff = -(pos - lastPos);
 
     const int stepCont = 100;
     const int stepDisc = 20;
 
-    if (d->mode == ZoomModeShortcut) {
+    if (d->mode == ZoomModeShortcut ||
+        d->mode == RelativeZoomModeShortcut) {
         KisConfig cfg;
         float coeff;
         if (cfg.readEntry<bool>("InvertMiddleClickZoom", false)) {
             coeff = 1.0 - qreal(diff.y()) / stepCont;
         }
         else {
             coeff = 1.0 + qreal(diff.y()) / stepCont;
         }
-        float zoom = coeff * inputManager()->canvas()->viewManager()->zoomController()->zoomAction()->effectiveZoom();
-        inputManager()->canvas()->viewManager()->zoomController()->setZoom(KoZoomMode::ZOOM_CONSTANT, zoom);
-    } else if (d->mode == DiscreteZoomModeShortcut) {
+
+        if (d->mode == ZoomModeShortcut) {
+            float zoom = coeff * inputManager()->canvas()->viewManager()->zoomController()->zoomAction()->effectiveZoom();
+            inputManager()->canvas()->viewManager()->zoomController()->setZoom(KoZoomMode::ZOOM_CONSTANT, zoom);
+        } else {
+            KoCanvasControllerWidget *controller =
+                dynamic_cast<KoCanvasControllerWidget*>(
+                    inputManager()->canvas()->canvasController());
+
+            controller->zoomRelativeToPoint(d->startPoint, coeff);
+        }
+
+    } else if (d->mode == DiscreteZoomModeShortcut ||
+               d->mode == RelativeDiscreteZoomModeShortcut) {
         d->distance += diff.y();
+
+        QPoint stillPoint = d->mode == RelativeDiscreteZoomModeShortcut ?
+            d->startPoint : QPoint();
+
         bool zoomIn = d->distance > 0;
         while (qAbs(d->distance) > stepDisc) {
-            d->zoomTo(zoomIn, 0);
+            d->zoomTo(zoomIn, stillPoint);
             d->distance += zoomIn ? -stepDisc : stepDisc;
         }
     }
 }
 
 bool KisZoomAction::isShortcutRequired(int shortcut) const
 {
     return shortcut == ZoomModeShortcut;
 }
 
diff --git a/libs/ui/input/kis_zoom_action.h b/libs/ui/input/kis_zoom_action.h
index 67bf033782..28f79fec7d 100644
--- a/libs/ui/input/kis_zoom_action.h
+++ b/libs/ui/input/kis_zoom_action.h
@@ -1,63 +1,65 @@
 /* This file is part of the KDE project
  * Copyright (C) 2012 Arjen Hiemstra <ahiemstra@heimr.nl>
  *
  *  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_ZOOM_ACTION_H
 #define KIS_ZOOM_ACTION_H
 
 #include "kis_abstract_input_action.h"
 
 /**
  * \brief Zoom Canvas implementation of KisAbstractInputAction.
  *
  * The Zoom Canvas action zooms the canvas.
  */
 class KisZoomAction : public KisAbstractInputAction
 {
 public:
     /**
      * The different behaviours for this action.
      */
     enum Shortcuts {
         ZoomModeShortcut, ///< Toggle zoom mode.
         DiscreteZoomModeShortcut, ///< Toggle discrete zoom mode
         ZoomInShortcut, ///< Zoom in by a fixed amount.
         ZoomOutShortcut, ///< Zoom out by a fixed amount.
         ZoomResetShortcut, ///< Reset zoom to 100%.
         ZoomToPageShortcut, ///< Zoom fit to page.
-        ZoomToWidthShortcut ///< Zoom fit to width.
+        ZoomToWidthShortcut, ///< Zoom fit to width.
+        RelativeZoomModeShortcut, ///< Toggle zoom mode relative to cursor
+        RelativeDiscreteZoomModeShortcut ///< Toggle discrete zoom mode relative to cursor
     };
     explicit KisZoomAction();
     virtual ~KisZoomAction();
 
     virtual int priority() const;
 
     void activate(int shortcut);
     void deactivate(int shortcut);
 
     void begin(int shortcut, QEvent *event = 0);
     void inputEvent(QEvent* event);
     void cursorMoved(const QPointF &lastPos, const QPointF &pos);
 
     virtual bool isShortcutRequired(int shortcut) const;
 
 private:
     class Private;
     Private * const d;
 };
 
 #endif // KIS_ZOOM_ACTION_H
diff --git a/libs/ui/kis_aspect_ratio_locker.cpp b/libs/ui/kis_aspect_ratio_locker.cpp
index 2d21acb324..dfd26f524e 100644
--- a/libs/ui/kis_aspect_ratio_locker.cpp
+++ b/libs/ui/kis_aspect_ratio_locker.cpp
@@ -1,94 +1,188 @@
 /*
  *  Copyright (c) 2016 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_aspect_ratio_locker.h"
 
 #include <QSpinBox>
+#include <QDoubleSpinBox>
+
 #include <KoAspectButton.h>
 
 #include "kis_signals_blocker.h"
+#include "kis_assert.h"
+#include "kis_debug.h"
+#include "kis_slider_spin_box.h"
+#include "kis_int_parse_spin_box.h"
+#include "kis_double_parse_spin_box.h"
 
 
-struct KisAspectRatioLocker::Private
+struct SliderWrapper
 {
-    Private() : aspectRatio(1.0) {}
+    template <class Slider>
+    SliderWrapper(Slider *slider)
+        : m_slider(QVariant::fromValue(slider)),
+          m_object(slider) {}
+
+    void setValue(qreal value) {
+
+        if (m_slider.canConvert<QSpinBox*>()) {
+            m_slider.value<QSpinBox*>()->setValue(qRound(value));
+
+        } else if (m_slider.canConvert<QDoubleSpinBox*>()) {
+            m_slider.value<QDoubleSpinBox*>()->setValue(value);
+
+        } else if (m_slider.canConvert<KisSliderSpinBox*>()) {
+            m_slider.value<KisSliderSpinBox*>()->setValue(qRound(value));
+
+        } else if (m_slider.canConvert<KisDoubleSliderSpinBox*>()) {
+            m_slider.value<KisDoubleSliderSpinBox*>()->setValue(value);
+        }
+    }
+
+    qreal value() const {
+        qreal result = 0.0;
+
+        if (m_slider.canConvert<QSpinBox*>()) {
+            result = m_slider.value<QSpinBox*>()->value();
 
-    QSpinBox *spinOne;
-    QSpinBox *spinTwo;
-    KoAspectButton *aspectButton;
+        } else if (m_slider.canConvert<QDoubleSpinBox*>()) {
+            result = m_slider.value<QDoubleSpinBox*>()->value();
+
+        } else if (m_slider.canConvert<KisSliderSpinBox*>()) {
+            result = m_slider.value<KisSliderSpinBox*>()->value();
+
+        } else if (m_slider.canConvert<KisDoubleSliderSpinBox*>()) {
+            result = m_slider.value<KisDoubleSliderSpinBox*>()->value();
+        }
+
+        return result;
+    }
+
+    bool isDragging() const {
+        bool result = false;
+
+        if (m_slider.canConvert<KisSliderSpinBox*>()) {
+            result = m_slider.value<KisSliderSpinBox*>()->isDragging();
+
+        } else if (m_slider.canConvert<KisDoubleSliderSpinBox*>()) {
+            result = m_slider.value<KisDoubleSliderSpinBox*>()->isDragging();
+        }
+
+        return result;
+    }
 
-    qreal aspectRatio;
+    QObject* object() const {
+        return m_object;
+    }
+
+private:
+    QVariant m_slider;
+    QObject *m_object;
+};
+
+struct KisAspectRatioLocker::Private
+{
+    QScopedPointer<SliderWrapper> spinOne;
+    QScopedPointer<SliderWrapper> spinTwo;
+    KoAspectButton *aspectButton = 0;
+
+    qreal aspectRatio = 1.0;
+    bool blockUpdatesOnDrag = false;
 };
 
 
 KisAspectRatioLocker::KisAspectRatioLocker(QObject *parent)
     : QObject(parent),
       m_d(new Private)
 {
 }
 
 KisAspectRatioLocker::~KisAspectRatioLocker()
 {
 }
 
-void KisAspectRatioLocker::connectSpinBoxes(QSpinBox *spinOne,
-                                            QSpinBox *spinTwo,
-                                            KoAspectButton *aspectButton)
+template <class SpinBoxType>
+void KisAspectRatioLocker::connectSpinBoxes(SpinBoxType *spinOne, SpinBoxType *spinTwo, KoAspectButton *aspectButton)
 {
-    m_d->spinOne = spinOne;
-    m_d->spinTwo = spinTwo;
+    m_d->spinOne.reset(new SliderWrapper(spinOne));
+    m_d->spinTwo.reset(new SliderWrapper(spinTwo));
     m_d->aspectButton = aspectButton;
 
-    connect(m_d->spinOne, SIGNAL(valueChanged(int)), SLOT(slotSpinOneChanged()));
-    connect(m_d->spinTwo, SIGNAL(valueChanged(int)), SLOT(slotSpinTwoChanged()));
+    if (QVariant::fromValue(spinOne->value()).type() == QVariant::Double) {
+        connect(spinOne, SIGNAL(valueChanged(qreal)), SLOT(slotSpinOneChanged()));
+        connect(spinTwo, SIGNAL(valueChanged(qreal)), SLOT(slotSpinTwoChanged()));
+    } else {
+        connect(spinOne, SIGNAL(valueChanged(int)), SLOT(slotSpinOneChanged()));
+        connect(spinTwo, SIGNAL(valueChanged(int)), SLOT(slotSpinTwoChanged()));
+    }
+
     connect(m_d->aspectButton, SIGNAL(keepAspectRatioChanged(bool)), SLOT(slotAspectButtonChanged()));
     slotAspectButtonChanged();
 }
 
+template void KisAspectRatioLocker::connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *aspectButton);
+template void KisAspectRatioLocker::connectSpinBoxes(QDoubleSpinBox *spinOne, QDoubleSpinBox *spinTwo, KoAspectButton *aspectButton);
+template void KisAspectRatioLocker::connectSpinBoxes(KisSliderSpinBox *spinOne, KisSliderSpinBox *spinTwo, KoAspectButton *aspectButton);
+template void KisAspectRatioLocker::connectSpinBoxes(KisDoubleSliderSpinBox *spinOne, KisDoubleSliderSpinBox *spinTwo, KoAspectButton *aspectButton);
+template void KisAspectRatioLocker::connectSpinBoxes(KisIntParseSpinBox *spinOne, KisIntParseSpinBox *spinTwo, KoAspectButton *aspectButton);
+template void KisAspectRatioLocker::connectSpinBoxes(KisDoubleParseSpinBox *spinOne, KisDoubleParseSpinBox *spinTwo, KoAspectButton *aspectButton);
+
 void KisAspectRatioLocker::slotSpinOneChanged()
 {
     if (m_d->aspectButton->keepAspectRatio()) {
-        KisSignalsBlocker b(m_d->spinTwo);
-        m_d->spinTwo->setValue(qRound(m_d->aspectRatio * m_d->spinOne->value()));
+        KisSignalsBlocker b(m_d->spinTwo->object());
+        m_d->spinTwo->setValue(m_d->aspectRatio * m_d->spinOne->value());
+    }
+
+    if (!m_d->blockUpdatesOnDrag || !m_d->spinOne->isDragging()) {
+        emit sliderValueChanged();
     }
-    emit sliderValueChanged();
 }
 
 void KisAspectRatioLocker::slotSpinTwoChanged()
 {
     if (m_d->aspectButton->keepAspectRatio()) {
-        KisSignalsBlocker b(m_d->spinOne);
-        m_d->spinOne->setValue(qRound(m_d->spinTwo->value() / m_d->aspectRatio));
+        KisSignalsBlocker b(m_d->spinOne->object());
+        m_d->spinOne->setValue(m_d->spinTwo->value() / m_d->aspectRatio);
     }
 
-    emit sliderValueChanged();
+    if (!m_d->blockUpdatesOnDrag || !m_d->spinTwo->isDragging()) {
+        emit sliderValueChanged();
+    }
 }
 
 void KisAspectRatioLocker::slotAspectButtonChanged()
 {
     if (m_d->aspectButton->keepAspectRatio() &&
         m_d->spinTwo->value() > 0 &&
         m_d->spinOne->value() > 0) {
 
         m_d->aspectRatio = qreal(m_d->spinTwo->value()) / m_d->spinOne->value();
     } else {
         m_d->aspectRatio = 1.0;
     }
 
-    emit aspectButtonChanged();
+    if (!m_d->spinTwo->isDragging()) {
+        emit aspectButtonChanged();
+    }
+}
+
+void KisAspectRatioLocker::setBlockUpdateSignalOnDrag(bool value)
+{
+    m_d->blockUpdatesOnDrag = value;
 }
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/kis_aspect_ratio_locker.h
index 191461c149..321b0c6904 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/kis_aspect_ratio_locker.h
@@ -1,53 +1,58 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
 #ifndef __KIS_ASPECT_RATIO_LOCKER_H
 #define __KIS_ASPECT_RATIO_LOCKER_H
 
 #include <QScopedPointer>
 #include <QObject>
 #include "kritaui_export.h"
 
 class QSpinBox;
+class QDoubleSpinBox;
+class KisSliderSpinBox;
+class KisDoubleSliderSpinBox;
 class KoAspectButton;
 
 class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
 {
     Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
+    KisAspectRatioLocker(QObject *parent = 0);
     ~KisAspectRatioLocker();
 
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    template <class SpinBoxType>
+        void connectSpinBoxes(SpinBoxType *spinOne, SpinBoxType *spinTwo, KoAspectButton *aspectButton);
 
+    void setBlockUpdateSignalOnDrag(bool block);
 
 private Q_SLOTS:
     void slotSpinOneChanged();
     void slotSpinTwoChanged();
     void slotAspectButtonChanged();
 
 Q_SIGNALS:
     void sliderValueChanged();
     void aspectButtonChanged();
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
 #endif /* __KIS_ASPECT_RATIO_LOCKER_H */
diff --git a/libs/ui/kis_canvas_resource_provider.cpp b/libs/ui/kis_canvas_resource_provider.cpp
index 54f97da4ae..84a4ba7ea9 100644
--- a/libs/ui/kis_canvas_resource_provider.cpp
+++ b/libs/ui/kis_canvas_resource_provider.cpp
@@ -1,524 +1,544 @@
 /*
  *  Copyright (c) 2006 Boudewijn Rempt  <boud@valdyas.org>
  *
  *  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_canvas_resource_provider.h"
 
 #include <QImage>
 #include <QPainter>
 
 #include <KoCanvasBase.h>
 #include <KoID.h>
 #include <KoColorModelStandardIds.h>
 #include <KoColorProfile.h>
 #include <resources/KoAbstractGradient.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoResourceServerProvider.h>
 #include <resources/KoStopGradient.h>
 #include <KoColorSpaceRegistry.h>
 
 #include <resources/KoPattern.h>
 #include <kis_paint_device.h>
 #include <filter/kis_filter_configuration.h>
 #include <kis_image.h>
 #include <kis_group_layer.h>
 #include <brushengine/kis_paintop_preset.h>
 #include <brushengine/kis_paintop_settings.h>
 #include "kis_favorite_resource_manager.h"
 
 #include "kis_config.h"
 #include "KisViewManager.h"
 #include "canvas/kis_canvas2.h"
 
 KisCanvasResourceProvider::KisCanvasResourceProvider(KisViewManager * view)
     : m_view(view)
 {
     m_fGChanged = true;
     m_enablefGChange = true;    // default to true, so that colour history is working without popup palette
 }
 
 KisCanvasResourceProvider::~KisCanvasResourceProvider()
 {
     disconnect(); // in case Qt gets confused
 }
 
 KoCanvasResourceManager* KisCanvasResourceProvider::resourceManager()
 {
     return m_resourceManager;
 }
 
 void KisCanvasResourceProvider::setResourceManager(KoCanvasResourceManager *resourceManager)
 {
     m_resourceManager = resourceManager;
 
     QVariant v;
     v.setValue(KoColor(Qt::black, KoColorSpaceRegistry::instance()->rgb8()));
     m_resourceManager->setResource(KoCanvasResourceManager::ForegroundColor, v);
 
     v.setValue(KoColor(Qt::white, KoColorSpaceRegistry::instance()->rgb8()));
     m_resourceManager->setResource(KoCanvasResourceManager::BackgroundColor, v);
 
     setCurrentCompositeOp(COMPOSITE_OVER);
 
     setMirrorHorizontal(false);
     setMirrorVertical(false);
 
     m_resourceManager->setResource(HdrExposure, 0.0);
     m_resourceManager->setResource(HdrGamma, 1.0);
     m_resourceManager->setResource(EffectiveZoom, 1.0);
 
     connect(m_resourceManager, SIGNAL(canvasResourceChanged(int,QVariant)),
             this, SLOT(slotCanvasResourceChanged(int,QVariant)));
 
     m_resourceManager->setResource(KoCanvasResourceManager::ApplicationSpeciality, KoCanvasResourceManager::NoAdvancedText);
 }
 
 
 KoCanvasBase * KisCanvasResourceProvider::canvas() const
 {
     return m_view->canvasBase();
 }
 
 KoColor KisCanvasResourceProvider::bgColor() const
 {
     return m_resourceManager->resource(KoCanvasResourceManager::BackgroundColor).value<KoColor>();
 }
 
 KoColor KisCanvasResourceProvider::fgColor() const
 {
     return m_resourceManager->resource(KoCanvasResourceManager::ForegroundColor).value<KoColor>();
 }
 
 float KisCanvasResourceProvider::HDRExposure() const
 {
     return static_cast<float>(m_resourceManager->resource(HdrExposure).toDouble());
 }
 
 void KisCanvasResourceProvider::setHDRExposure(float exposure)
 {
     m_resourceManager->setResource(HdrExposure, static_cast<double>(exposure));
 }
 
 float KisCanvasResourceProvider::HDRGamma() const
 {
     return static_cast<float>(m_resourceManager->resource(HdrGamma).toDouble());
 }
 
 void KisCanvasResourceProvider::setHDRGamma(float gamma)
 {
     m_resourceManager->setResource(HdrGamma, static_cast<double>(gamma));
 }
 
 
 KoPattern * KisCanvasResourceProvider::currentPattern() const
 {
     if (m_resourceManager->hasResource(CurrentPattern)) {
         return m_resourceManager->resource(CurrentPattern).value<KoPattern*>();
     }
     else {
         return 0;
     }
 }
 
 KisFilterConfiguration * KisCanvasResourceProvider::currentGeneratorConfiguration() const
 {
     return m_resourceManager->resource(CurrentGeneratorConfiguration).value<KisFilterConfiguration*>();
 }
 
 
 KoAbstractGradient* KisCanvasResourceProvider::currentGradient() const
 {
     if (m_resourceManager->hasResource(CurrentGradient)) {
         return m_resourceManager->resource(CurrentGradient).value<KoAbstractGradient*>();
     }
     else {
         return 0;
     }
 }
 
 KisImageWSP KisCanvasResourceProvider::currentImage() const
 {
     return m_view->image();
 }
 
 KisNodeSP KisCanvasResourceProvider::currentNode() const
 {
     return m_view->activeNode();
 }
 
 KisPaintOpPresetSP KisCanvasResourceProvider::currentPreset() const
 {
     KisPaintOpPresetSP preset = m_resourceManager->resource(CurrentPaintOpPreset).value<KisPaintOpPresetSP>();
     return preset;
 }
 
 void KisCanvasResourceProvider::setPaintOpPreset(const KisPaintOpPresetSP preset)
 {
     Q_ASSERT(preset->valid());
     Q_ASSERT(!preset->paintOp().id().isEmpty());
     Q_ASSERT(preset->settings());
     if (!preset) return;
 
     dbgUI << "setPaintOpPreset" << preset->paintOp();
 
     QVariant v;
     v.setValue(preset);
     m_resourceManager->setResource(CurrentPaintOpPreset, v);
 }
 
 KisPaintOpPresetSP KisCanvasResourceProvider::previousPreset() const
 {
     KisPaintOpPresetSP preset = m_resourceManager->resource(PreviousPaintOpPreset).value<KisPaintOpPresetSP>();
     return preset;
 }
 
 void KisCanvasResourceProvider::setPreviousPaintOpPreset(const KisPaintOpPresetSP preset)
 {
     Q_ASSERT(preset->valid());
     Q_ASSERT(!preset->paintOp().id().isEmpty());
     Q_ASSERT(preset->settings());
     if (!preset) return;
 
     dbgUI << "setPreviousPaintOpPreset" << preset->paintOp();
 
     QVariant v;
     v.setValue(preset);
     m_resourceManager->setResource(PreviousPaintOpPreset, v);
 }
 
 void KisCanvasResourceProvider::slotPatternActivated(KoResource * res)
 {
     KoPattern *pattern = dynamic_cast<KoPattern*>(res);
     QVariant v;
     v.setValue<KoPattern*>(pattern);
     m_resourceManager->setResource(CurrentPattern, v);
     emit sigPatternChanged(pattern);
 }
 
 void KisCanvasResourceProvider::slotGeneratorConfigurationActivated(KisFilterConfiguration * res)
 {
     KisFilterConfiguration * generatorConfiguration = dynamic_cast<KisFilterConfiguration*>(res);
     QVariant v;
     v.setValue<KisFilterConfiguration*>(generatorConfiguration);
     m_resourceManager->setResource(CurrentGeneratorConfiguration, v);
 }
 
 void KisCanvasResourceProvider::slotGradientActivated(KoResource *res)
 {
 
     KoAbstractGradient * gradient = dynamic_cast<KoAbstractGradient*>(res);
     QVariant v;
     v.setValue<KoAbstractGradient*>(gradient);
     m_resourceManager->setResource(CurrentGradient, v);
     emit sigGradientChanged(gradient);
 }
 
 
 void KisCanvasResourceProvider::setBGColor(const KoColor& c)
 {
     QVariant v;
     v.setValue(c);
     m_resourceManager->setResource(KoCanvasResourceManager::BackgroundColor, v);
     emit sigBGColorChanged(c);
 }
 
 void KisCanvasResourceProvider::setFGColor(const KoColor& c)
 {
     m_fGChanged = true;
 
     QVariant v;
     v.setValue(c);
     m_resourceManager->setResource(KoCanvasResourceManager::ForegroundColor, v);
     emit sigFGColorChanged(c);
 }
 
 void KisCanvasResourceProvider::slotSetFGColor(const KoColor& c)
 {
     setFGColor(c);
 }
 
 void KisCanvasResourceProvider::slotSetBGColor(const KoColor& c)
 {
     setBGColor(c);
 }
 
 void KisCanvasResourceProvider::slotNodeActivated(const KisNodeSP node)
 {
     QVariant v;
     v.setValue(KisNodeWSP(node));
     m_resourceManager->setResource(CurrentKritaNode, v);
     emit sigNodeChanged(currentNode());
 }
 
 
 void KisCanvasResourceProvider::slotImageSizeChanged()
 {
     if (KisImageWSP image = m_view->image()) {
         float fw = image->width() / image->xRes();
         float fh = image->height() / image->yRes();
 
         QSizeF postscriptSize(fw, fh);
         m_resourceManager->setResource(KoCanvasResourceManager::PageSize, postscriptSize);
     }
 }
 
 void KisCanvasResourceProvider::slotOnScreenResolutionChanged()
 {
     KisImageWSP image = m_view->image();
     KisCanvas2 *canvas = m_view->canvasBase();
 
     if(!image || !canvas) return;
 
     qreal zoomX, zoomY;
     canvas->coordinatesConverter()->zoom(&zoomX, &zoomY);
 
     qreal scaleX = zoomX / image->xRes();
     qreal scaleY = zoomY / image->yRes();
 
     emit sigOnScreenResolutionChanged(scaleX, scaleY);
 }
 
 void KisCanvasResourceProvider::slotCanvasResourceChanged(int key, const QVariant & res)
 {
     if(key == KoCanvasResourceManager::ForegroundColor || key == KoCanvasResourceManager::BackgroundColor) {
         KoAbstractGradient* resource = KoResourceServerProvider::instance()->gradientServer()->resources()[0];
         KoStopGradient* stopGradient = dynamic_cast<KoStopGradient*>(resource);
         if(stopGradient) {
             QList<KoGradientStop> stops;
             stops << KoGradientStop(0.0, fgColor()) << KoGradientStop(1.0,  KoColor(QColor(0, 0, 0, 0), fgColor().colorSpace()));
             stopGradient->setStops(stops);
             KoResourceServerProvider::instance()->gradientServer()->updateResource(resource);
         }
         resource = KoResourceServerProvider::instance()->gradientServer()->resources()[1];
         stopGradient = dynamic_cast<KoStopGradient*>(resource);
         if(stopGradient) {
             QList<KoGradientStop> stops;
             stops << KoGradientStop(0.0, fgColor()) << KoGradientStop(1.0, bgColor());
             stopGradient->setStops(stops);
             KoResourceServerProvider::instance()->gradientServer()->updateResource(resource);
         }
     }
     switch (key) {
     case(KoCanvasResourceManager::ForegroundColor):
         m_fGChanged = true;
         emit sigFGColorChanged(res.value<KoColor>());
         break;
     case(KoCanvasResourceManager::BackgroundColor):
         emit sigBGColorChanged(res.value<KoColor>());
         break;
     case(CurrentPattern):
         emit sigPatternChanged(static_cast<KoPattern *>(res.value<void *>()));
         break;
     case(CurrentGradient):
         emit sigGradientChanged(static_cast<KoAbstractGradient *>(res.value<void *>()));
         break;
     case(CurrentKritaNode) :
         emit sigNodeChanged(currentNode());
         break;
     case (Opacity):
     {
         emit sigOpacityChanged(res.toDouble());
     }
     default:
         ;
         // Do nothing
     };
 }
 
 void KisCanvasResourceProvider::setCurrentCompositeOp(const QString& compositeOp)
 {
     m_resourceManager->setResource(CurrentCompositeOp,
                                    QVariant::fromValue(compositeOp));
 }
 
 QString KisCanvasResourceProvider::currentCompositeOp() const
 {
     return m_resourceManager->resource(CurrentCompositeOp).value<QString>();
 }
 
 bool KisCanvasResourceProvider::eraserMode() const
 {
     return m_resourceManager->resource(EraserMode).toBool();
 }
 
 void KisCanvasResourceProvider::setEraserMode(bool value)
 {
     m_resourceManager->setResource(EraserMode,
                                    QVariant::fromValue(value));
 }
 
 void KisCanvasResourceProvider::slotPainting()
 {
     if (m_fGChanged && m_enablefGChange) {
         emit sigFGColorUsed(fgColor());
         m_fGChanged = false;
     }
 }
 
 void KisCanvasResourceProvider::slotResetEnableFGChange(bool b)
 {
     m_enablefGChange = b;
 }
 
 QList<QPointer<KisAbstractPerspectiveGrid> > KisCanvasResourceProvider::perspectiveGrids() const
 {
     return m_perspectiveGrids;
 }
 
 void KisCanvasResourceProvider::addPerspectiveGrid(KisAbstractPerspectiveGrid* grid)
 {
     m_perspectiveGrids.append(grid);
 }
 
 void KisCanvasResourceProvider::removePerspectiveGrid(KisAbstractPerspectiveGrid* grid)
 {
     m_perspectiveGrids.removeOne(grid);
 }
 
 void KisCanvasResourceProvider::clearPerspectiveGrids()
 {
     m_perspectiveGrids.clear();
 }
 
 void KisCanvasResourceProvider::setMirrorHorizontal(bool mirrorHorizontal)
 {
     m_resourceManager->setResource(MirrorHorizontal, mirrorHorizontal);
     emit mirrorModeChanged();
 }
 
 bool KisCanvasResourceProvider::mirrorHorizontal() const
 {
     return m_resourceManager->resource(MirrorHorizontal).toBool();
 }
 
 void KisCanvasResourceProvider::setMirrorVertical(bool mirrorVertical)
 {
     m_resourceManager->setResource(MirrorVertical, mirrorVertical);
     emit mirrorModeChanged();
 }
 
 bool KisCanvasResourceProvider::mirrorVertical() const
 {
     return m_resourceManager->resource(MirrorVertical).toBool();
 }
 
 void KisCanvasResourceProvider::setMirrorHorizontalLock(bool isLocked)
 {
     m_resourceManager->setResource(MirrorHorizontalLock, isLocked);
     emit mirrorModeChanged();
 }
 
 bool KisCanvasResourceProvider::mirrorHorizontalLock() {
      return m_resourceManager->resource(MirrorHorizontalLock).toBool();
 }
 
 void KisCanvasResourceProvider::setMirrorVerticalLock(bool isLocked)
 {
     m_resourceManager->setResource(MirrorVerticalLock, isLocked);
     emit mirrorModeChanged();
 }
 
 
 
 bool KisCanvasResourceProvider::mirrorVerticalHideDecorations() {
      return m_resourceManager->resource(MirrorVerticalHideDecorations).toBool();
 }
 
 void KisCanvasResourceProvider::setMirrorVerticalHideDecorations(bool hide)
 {
     m_resourceManager->setResource(MirrorVerticalHideDecorations, hide);
     emit mirrorModeChanged();
 }
 
 
 bool KisCanvasResourceProvider::mirrorHorizontalHideDecorations() {
      return m_resourceManager->resource(MirrorHorizontalHideDecorations).toBool();
 }
 
 void KisCanvasResourceProvider::setMirrorHorizontalHideDecorations(bool hide)
 {
     m_resourceManager->setResource(MirrorHorizontalHideDecorations, hide);
     emit mirrorModeChanged();
 }
 
 
 bool KisCanvasResourceProvider::mirrorVerticalLock() {
      return m_resourceManager->resource(MirrorVerticalLock).toBool();
 }
 
 void KisCanvasResourceProvider::mirrorVerticalMoveCanvasToCenter() {
      emit moveMirrorVerticalCenter();
 }
 
 void KisCanvasResourceProvider::mirrorHorizontalMoveCanvasToCenter() {
      emit moveMirrorHorizontalCenter();
 }
 
 
 
 void KisCanvasResourceProvider::setOpacity(qreal opacity)
 {
     m_resourceManager->setResource(Opacity, opacity);
 }
 
 qreal KisCanvasResourceProvider::opacity() const
 {
     return m_resourceManager->resource(Opacity).toReal();
 }
 
+void KisCanvasResourceProvider::setFlow(qreal flow)
+{
+    m_resourceManager->setResource(Flow, flow);
+}
+
+qreal KisCanvasResourceProvider::flow() const
+{
+    return m_resourceManager->resource(Flow).toReal();
+}
+
+void KisCanvasResourceProvider::setSize(qreal size)
+{
+    m_resourceManager->setResource(Size, size);
+}
+
+qreal KisCanvasResourceProvider::size() const
+{
+    return m_resourceManager->resource(Size).toReal();
+}
+
 void KisCanvasResourceProvider::setSelectionAction(int action)
 {
     m_resourceManager->setResource(SelectionAction, action);
     emit sigSelectionActionChanged(action);
 }
 
 int KisCanvasResourceProvider::selectionAction()
 {
     return m_resourceManager->resource(SelectionAction).toInt();
 }
 
 void KisCanvasResourceProvider::setSelectionMode(int mode)
 {
     m_resourceManager->setResource(SelectionMode, mode);
     emit sigSelectionModeChanged(mode);
 }
 
 int KisCanvasResourceProvider::selectionMode()
 {
     return m_resourceManager->resource(SelectionMode).toInt();
 }
 
 
 void KisCanvasResourceProvider::setGlobalAlphaLock(bool lock)
 {
     m_resourceManager->setResource(GlobalAlphaLock, lock);
 }
 
 bool KisCanvasResourceProvider::globalAlphaLock() const
 {
     return m_resourceManager->resource(GlobalAlphaLock).toBool();
 }
 
 void KisCanvasResourceProvider::notifyLoadingWorkspace(KisWorkspaceResource* workspace)
 {
     emit sigLoadingWorkspace(workspace);
 }
 
 void KisCanvasResourceProvider::notifySavingWorkspace(KisWorkspaceResource* workspace)
 {
     emit sigSavingWorkspace(workspace);
 }
 
diff --git a/libs/ui/kis_canvas_resource_provider.h b/libs/ui/kis_canvas_resource_provider.h
index 9ec14d6db6..a219beab27 100644
--- a/libs/ui/kis_canvas_resource_provider.h
+++ b/libs/ui/kis_canvas_resource_provider.h
@@ -1,239 +1,247 @@
 /*
  *  Copyright (c) 2006 Boudewijn Rempt  <boud@valdyas.org>
  *
  *  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_CANVAS_RESOURCE_PROVIDER_H_
 #define KIS_CANVAS_RESOURCE_PROVIDER_H_
 
 #include <QObject>
 
 #include <KoColor.h>
 #include <KoID.h>
 #include <KoCanvasResourceManager.h>
 
 #include "kis_types.h"
 #include "kritaui_export.h"
 
 class KisWorkspaceResource;
 class KoColorProfile;
 class KoAbstractGradient;
 class KoResource;
 
 class KoCanvasBase;
 class KisViewManager;
 class KoPattern;
 class KisFilterConfiguration;
 
 #include <kis_abstract_perspective_grid.h>
 
 /**
  * KisCanvasResourceProvider contains the per-window current settings that
  * influence painting, like paintop, color, gradients and so on.
  */
 class KRITAUI_EXPORT KisCanvasResourceProvider : public QObject
 {
     Q_OBJECT
 
 public:
 
     enum Resources {
         HdrExposure = KoCanvasResourceManager::KritaStart + 1,
         CurrentPattern,
         CurrentGradient,
         CurrentDisplayProfile,
         CurrentImage,
         CurrentKritaNode,
         CurrentPaintOpPreset,
         CurrentGeneratorConfiguration,
         CurrentCompositeOp,
         CurrentEffectiveCompositeOp,
         LodAvailability,
         EraserMode,
         MirrorHorizontal,
         MirrorVertical,
         MirrorHorizontalLock,
         MirrorVerticalLock,
         MirrorVerticalHideDecorations,
         MirrorHorizontalHideDecorations,
         MirrorAxesCenter,
         Opacity,
+        Flow,
+        Size,
         HdrGamma,
         GlobalAlphaLock,
         PreviousPaintOpPreset,
         EffectiveZoom, ///<-Used only by painting tools for non-displaying purposes
         PresetAllowsLod,
         SelectionAction,
         SelectionMode
     };
 
 
     KisCanvasResourceProvider(KisViewManager * view);
     ~KisCanvasResourceProvider();
 
     void setResourceManager(KoCanvasResourceManager *resourceManager);
     KoCanvasResourceManager* resourceManager();
 
     KoCanvasBase * canvas() const;
 
     KoColor bgColor() const;
     void setBGColor(const KoColor& c);
 
     KoColor fgColor() const;
     void setFGColor(const KoColor& c);
 
     float HDRExposure() const;
     void setHDRExposure(float exposure);
 
     float HDRGamma() const;
     void setHDRGamma(float gamma);
 
     bool eraserMode() const;
     void setEraserMode(bool value);
 
     KoPattern *currentPattern() const;
 
     KoAbstractGradient *currentGradient() const;
 
     KisImageWSP currentImage() const;
 
     KisNodeSP currentNode() const;
 
     KisPaintOpPresetSP currentPreset() const;
     void setPaintOpPreset(const KisPaintOpPresetSP preset);
 
     KisPaintOpPresetSP previousPreset() const;
     void setPreviousPaintOpPreset(const KisPaintOpPresetSP preset);
 
     KisFilterConfiguration* currentGeneratorConfiguration() const;
 
     void setCurrentCompositeOp(const QString& compositeOp);
     QString currentCompositeOp() const;
 
     QList<QPointer<KisAbstractPerspectiveGrid> > perspectiveGrids() const;
     void addPerspectiveGrid(KisAbstractPerspectiveGrid*);
     void removePerspectiveGrid(KisAbstractPerspectiveGrid*);
     void clearPerspectiveGrids();
 
     void setMirrorHorizontal(bool mirrorHorizontal);
     bool mirrorHorizontal() const;
 
     void setMirrorVertical(bool mirrorVertical);
     bool mirrorVertical() const;
 
     // options for horizontal and vertical mirror toolbar
     void setMirrorHorizontalLock(bool isLocked);
     bool mirrorHorizontalLock();
     void setMirrorVerticalLock(bool isLocked);
     bool mirrorVerticalLock();
 
     void setMirrorVerticalHideDecorations(bool hide);
     bool mirrorVerticalHideDecorations();
 
     void setMirrorHorizontalHideDecorations(bool hide);
     bool mirrorHorizontalHideDecorations();
 
     void mirrorVerticalMoveCanvasToCenter();
     void mirrorHorizontalMoveCanvasToCenter();
 
 
 
     void setOpacity(qreal opacity);
     qreal opacity() const;
 
+    void setFlow(qreal opacity);
+    qreal flow() const;
+
+    void setSize(qreal size);
+    qreal size() const;
+
     void setGlobalAlphaLock(bool lock);
     bool globalAlphaLock() const;
 
 
     ///Notify that the workspace is saved and settings should be saved to it
     void notifySavingWorkspace(KisWorkspaceResource* workspace);
 
     ///Notify that the workspace is loaded and settings can be read
     void notifyLoadingWorkspace(KisWorkspaceResource* workspace);
 
     int selectionAction();
     void setSelectionAction(int action);
     int selectionMode();
     void setSelectionMode(int mode);
 
 
 public Q_SLOTS:
 
     void slotSetFGColor(const KoColor& c);
     void slotSetBGColor(const KoColor& c);
     void slotPatternActivated(KoResource *pattern);
     void slotGradientActivated(KoResource *gradient);
     void slotNodeActivated(const KisNodeSP node);
     void slotGeneratorConfigurationActivated(KisFilterConfiguration * generatorConfiguration);
     void slotPainting();
 
     /**
      * Set the image size in pixels. The resource provider will store
      * the image size in postscript points.
      */
     // FIXME: this slot doesn't catch the case when image resolution is changed
     void slotImageSizeChanged();
     void slotOnScreenResolutionChanged();
 
     // This is a flag to handle a bug:
     // If pop up palette is visible and a new colour is selected, the new colour
     // will be added when the user clicks on the canvas to hide the palette
     // In general, we want to be able to store recent color if the pop up palette
     // is not visible
     void slotResetEnableFGChange(bool);
 
 private Q_SLOTS:
 
     void slotCanvasResourceChanged(int key, const QVariant & res);
 
 Q_SIGNALS:
 
     void sigFGColorChanged(const KoColor &);
     void sigBGColorChanged(const KoColor &);
     void sigGradientChanged(KoAbstractGradient *);
     void sigPatternChanged(KoPattern *);
     void sigNodeChanged(const KisNodeSP);
     void sigDisplayProfileChanged(const KoColorProfile *);
     void sigFGColorUsed(const KoColor&);
     void sigOnScreenResolutionChanged(qreal scaleX, qreal scaleY);
     void sigOpacityChanged(qreal);
     void sigSavingWorkspace(KisWorkspaceResource* workspace);
     void sigLoadingWorkspace(KisWorkspaceResource* workspace);
     void sigSelectionActionChanged(const int);
     void sigSelectionModeChanged(const int);
 
     void mirrorModeChanged();
     void moveMirrorVerticalCenter();
     void moveMirrorHorizontalCenter();
 
 
 private:
 
     KisViewManager * m_view;
     KoCanvasResourceManager *m_resourceManager;
     bool m_fGChanged;
     QList<QPointer<KisAbstractPerspectiveGrid> > m_perspectiveGrids;
 
     // This is a flag to handle a bug:
     // If pop up palette is visible and a new colour is selected, the new colour
     // will be added when the user clicks on the canvas to hide the palette
     // In general, we want to be able to store recent color if the pop up palette
     // is not visible
     bool m_enablefGChange;
 
 };
 
 #endif
diff --git a/libs/ui/kis_config.cc b/libs/ui/kis_config.cc
index 61b7d92da4..93ec389eb8 100644
--- a/libs/ui/kis_config.cc
+++ b/libs/ui/kis_config.cc
@@ -1,1691 +1,1712 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *
  *  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_config.h"
 
 #include <limits.h>
 
 #include <QtGlobal>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QMutex>
 #include <QFont>
 #include <QThread>
 #include <QStringList>
 
 
 #include <kconfig.h>
 
 #include <KisDocument.h>
 
 #include <KoColor.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoColorModelStandardIds.h>
 #include <KoColorProfile.h>
 
 #include <kis_debug.h>
 
 #include "kis_canvas_resource_provider.h"
 #include "kis_config_notifier.h"
 #include "kis_snap_config.h"
 
 #include <config-ocio.h>
 
 #include <kis_color_manager.h>
 
 KisConfig::KisConfig()
     : m_cfg( KSharedConfig::openConfig()->group(""))
 {
 }
 
 KisConfig::~KisConfig()
 {
     if (qApp->thread() != QThread::currentThread()) {
         //dbgKrita << "WARNING: KisConfig: requested config synchronization from nonGUI thread! Skipping...";
         return;
     }
 
     m_cfg.sync();
 }
 
 
 bool KisConfig::disableTouchOnCanvas(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("disableTouchOnCanvas", false));
 }
 
 void KisConfig::setDisableTouchOnCanvas(bool value) const
 {
     m_cfg.writeEntry("disableTouchOnCanvas", value);
 }
 
 bool KisConfig::useProjections(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("useProjections", true));
 }
 
 void KisConfig::setUseProjections(bool useProj) const
 {
     m_cfg.writeEntry("useProjections", useProj);
 }
 
 bool KisConfig::undoEnabled(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("undoEnabled", true));
 }
 
 void KisConfig::setUndoEnabled(bool undo) const
 {
     m_cfg.writeEntry("undoEnabled", undo);
 }
 
 int KisConfig::undoStackLimit(bool defaultValue) const
 {
     return (defaultValue ? 30 : m_cfg.readEntry("undoStackLimit", 30));
 }
 
 void KisConfig::setUndoStackLimit(int limit) const
 {
     m_cfg.writeEntry("undoStackLimit", limit);
 }
 
 bool KisConfig::useCumulativeUndoRedo(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("useCumulativeUndoRedo",false));
 }
 
 void KisConfig::setCumulativeUndoRedo(bool value)
 {
     m_cfg.writeEntry("useCumulativeUndoRedo", value);
 }
 
 qreal KisConfig::stackT1(bool defaultValue) const
 {
      return (defaultValue ? 5 : m_cfg.readEntry("stackT1",5));
 }
 
 void KisConfig::setStackT1(int T1)
 {
     m_cfg.writeEntry("stackT1", T1);
 }
 
 qreal KisConfig::stackT2(bool defaultValue) const
 {
      return (defaultValue ? 1 : m_cfg.readEntry("stackT2",1));
 }
 
 void KisConfig::setStackT2(int T2)
 {
     m_cfg.writeEntry("stackT2", T2);
 }
 
 int KisConfig::stackN(bool defaultValue) const
 {
     return (defaultValue ? 5 : m_cfg.readEntry("stackN",5));
 }
 
 void KisConfig::setStackN(int N)
 {
      m_cfg.writeEntry("stackN", N);
 }
 
 qint32 KisConfig::defImageWidth(bool defaultValue) const
 {
     return (defaultValue ? 1600 : m_cfg.readEntry("imageWidthDef", 1600));
 }
 
 qint32 KisConfig::defImageHeight(bool defaultValue) const
 {
     return (defaultValue ? 1200 : m_cfg.readEntry("imageHeightDef", 1200));
 }
 
 qreal KisConfig::defImageResolution(bool defaultValue) const
 {
     return (defaultValue ? 100.0 : m_cfg.readEntry("imageResolutionDef", 100.0)) / 72.0;
 }
 
 QString KisConfig::defColorModel(bool defaultValue) const
 {
     return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->colorModelId().id()
                         : m_cfg.readEntry("colorModelDef", KoColorSpaceRegistry::instance()->rgb8()->colorModelId().id()));
 }
 
 void KisConfig::defColorModel(const QString & model) const
 {
     m_cfg.writeEntry("colorModelDef", model);
 }
 
 QString KisConfig::defaultColorDepth(bool defaultValue) const
 {
     return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->colorDepthId().id()
                         : m_cfg.readEntry("colorDepthDef", KoColorSpaceRegistry::instance()->rgb8()->colorDepthId().id()));
 }
 
 void KisConfig::setDefaultColorDepth(const QString & depth) const
 {
     m_cfg.writeEntry("colorDepthDef", depth);
 }
 
 QString KisConfig::defColorProfile(bool defaultValue) const
 {
     return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->profile()->name() :
                            m_cfg.readEntry("colorProfileDef",
                                            KoColorSpaceRegistry::instance()->rgb8()->profile()->name()));
 }
 
 void KisConfig::defColorProfile(const QString & profile) const
 {
     m_cfg.writeEntry("colorProfileDef", profile);
 }
 
 void KisConfig::defImageWidth(qint32 width) const
 {
     m_cfg.writeEntry("imageWidthDef", width);
 }
 
 void KisConfig::defImageHeight(qint32 height) const
 {
     m_cfg.writeEntry("imageHeightDef", height);
 }
 
 void KisConfig::defImageResolution(qreal res) const
 {
     m_cfg.writeEntry("imageResolutionDef", res*72.0);
 }
 
 void cleanOldCursorStyleKeys(KConfigGroup &cfg)
 {
     if (cfg.hasKey("newCursorStyle") &&
         cfg.hasKey("newOutlineStyle")) {
 
         cfg.deleteEntry("cursorStyleDef");
     }
 }
 
 CursorStyle KisConfig::newCursorStyle(bool defaultValue) const
 {
     if (defaultValue) {
         return CURSOR_STYLE_NO_CURSOR;
     }
 
 
     int style = m_cfg.readEntry("newCursorStyle", int(-1));
 
     if (style < 0) {
         // old style format
         style = m_cfg.readEntry("cursorStyleDef", int(OLD_CURSOR_STYLE_OUTLINE));
 
         switch (style) {
         case OLD_CURSOR_STYLE_TOOLICON:
             style = CURSOR_STYLE_TOOLICON;
             break;
         case OLD_CURSOR_STYLE_CROSSHAIR:
         case OLD_CURSOR_STYLE_OUTLINE_CENTER_CROSS:
             style = CURSOR_STYLE_CROSSHAIR;
             break;
         case OLD_CURSOR_STYLE_POINTER:
             style = CURSOR_STYLE_POINTER;
             break;
         case OLD_CURSOR_STYLE_OUTLINE:
         case OLD_CURSOR_STYLE_NO_CURSOR:
             style = CURSOR_STYLE_NO_CURSOR;
             break;
         case OLD_CURSOR_STYLE_SMALL_ROUND:
         case OLD_CURSOR_STYLE_OUTLINE_CENTER_DOT:
             style = CURSOR_STYLE_SMALL_ROUND;
             break;
         case OLD_CURSOR_STYLE_TRIANGLE_RIGHTHANDED:
         case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_RIGHTHANDED:
             style = CURSOR_STYLE_TRIANGLE_RIGHTHANDED;
             break;
         case OLD_CURSOR_STYLE_TRIANGLE_LEFTHANDED:
         case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_LEFTHANDED:
             style = CURSOR_STYLE_TRIANGLE_LEFTHANDED;
             break;
         default:
             style = -1;
         }
     }
 
     cleanOldCursorStyleKeys(m_cfg);
 
     // compatibility with future versions
     if (style < 0 || style >= N_CURSOR_STYLE_SIZE) {
         style = CURSOR_STYLE_NO_CURSOR;
     }
 
     return (CursorStyle) style;
 }
 
 void KisConfig::setNewCursorStyle(CursorStyle style)
 {
     m_cfg.writeEntry("newCursorStyle", (int)style);
 }
 
 OutlineStyle KisConfig::newOutlineStyle(bool defaultValue) const
 {
     if (defaultValue) {
         return OUTLINE_FULL;
     }
 
     int style = m_cfg.readEntry("newOutlineStyle", int(-1));
 
     if (style < 0) {
         // old style format
         style = m_cfg.readEntry("cursorStyleDef", int(OLD_CURSOR_STYLE_OUTLINE));
 
         switch (style) {
         case OLD_CURSOR_STYLE_TOOLICON:
         case OLD_CURSOR_STYLE_CROSSHAIR:
         case OLD_CURSOR_STYLE_POINTER:
         case OLD_CURSOR_STYLE_NO_CURSOR:
         case OLD_CURSOR_STYLE_SMALL_ROUND:
         case OLD_CURSOR_STYLE_TRIANGLE_RIGHTHANDED:
         case OLD_CURSOR_STYLE_TRIANGLE_LEFTHANDED:
             style = OUTLINE_NONE;
             break;
         case OLD_CURSOR_STYLE_OUTLINE:
         case OLD_CURSOR_STYLE_OUTLINE_CENTER_DOT:
         case OLD_CURSOR_STYLE_OUTLINE_CENTER_CROSS:
         case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_RIGHTHANDED:
         case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_LEFTHANDED:
             style = OUTLINE_FULL;
             break;
         default:
             style = -1;
         }
     }
 
     cleanOldCursorStyleKeys(m_cfg);
 
     // compatibility with future versions
     if (style < 0 || style >= N_OUTLINE_STYLE_SIZE) {
         style = OUTLINE_FULL;
     }
 
     return (OutlineStyle) style;
 }
 
 void KisConfig::setNewOutlineStyle(OutlineStyle style)
 {
     m_cfg.writeEntry("newOutlineStyle", (int)style);
 }
 
 QRect KisConfig::colorPreviewRect() const
 {
     return m_cfg.readEntry("colorPreviewRect", QVariant(QRect(32, 32, 48, 48))).toRect();
 }
 
 void KisConfig::setColorPreviewRect(const QRect &rect)
 {
     m_cfg.writeEntry("colorPreviewRect", QVariant(rect));
 }
 
 bool KisConfig::useDirtyPresets(bool defaultValue) const
 {
    return (defaultValue ? false : m_cfg.readEntry("useDirtyPresets",false));
 }
 void KisConfig::setUseDirtyPresets(bool value)
 {
     m_cfg.writeEntry("useDirtyPresets",value);
     KisConfigNotifier::instance()->notifyConfigChanged();
 }
 
 bool KisConfig::useEraserBrushSize(bool defaultValue) const
 {
    return (defaultValue ? false : m_cfg.readEntry("useEraserBrushSize",false));
 }
 
 void KisConfig::setUseEraserBrushSize(bool value)
 {
     m_cfg.writeEntry("useEraserBrushSize",value);
     KisConfigNotifier::instance()->notifyConfigChanged();
 }
 
 QColor KisConfig::getMDIBackgroundColor(bool defaultValue) const
 {
     QColor col(77, 77, 77);
     return (defaultValue ? col : m_cfg.readEntry("mdiBackgroundColor", col));
 }
 
 void KisConfig::setMDIBackgroundColor(const QColor &v) const
 {
     m_cfg.writeEntry("mdiBackgroundColor", v);
 }
 
 QString KisConfig::getMDIBackgroundImage(bool defaultValue) const
 {
     return (defaultValue ? "" : m_cfg.readEntry("mdiBackgroundImage", ""));
 }
 
 void KisConfig::setMDIBackgroundImage(const QString &filename) const
 {
     m_cfg.writeEntry("mdiBackgroundImage", filename);
 }
 
 QString KisConfig::monitorProfile(int screen) const
 {
     // Note: keep this in sync with the default profile for the RGB colorspaces!
     QString profile = m_cfg.readEntry("monitorProfile" + QString(screen == 0 ? "": QString("_%1").arg(screen)), "sRGB-elle-V2-srgbtrc.icc");
     //dbgKrita << "KisConfig::monitorProfile()" << profile;
     return profile;
 }
 
 QString KisConfig::monitorForScreen(int screen, const QString &defaultMonitor, bool defaultValue) const
 {
     return (defaultValue ? defaultMonitor
                          : m_cfg.readEntry(QString("monitor_for_screen_%1").arg(screen), defaultMonitor));
 }
 
 void KisConfig::setMonitorForScreen(int screen, const QString& monitor)
 {
     m_cfg.writeEntry(QString("monitor_for_screen_%1").arg(screen), monitor);
 }
 
 void KisConfig::setMonitorProfile(int screen, const QString & monitorProfile, bool override) const
 {
     m_cfg.writeEntry("monitorProfile/OverrideX11", override);
     m_cfg.writeEntry("monitorProfile" + QString(screen == 0 ? "": QString("_%1").arg(screen)), monitorProfile);
 }
 
 const KoColorProfile *KisConfig::getScreenProfile(int screen)
 {
     if (screen < 0) return 0;
 
     KisConfig cfg;
     QString monitorId;
     if (KisColorManager::instance()->devices().size() > screen && screen > 0) {
         monitorId = cfg.monitorForScreen(screen, KisColorManager::instance()->devices()[screen]);
     }
     //dbgKrita << "getScreenProfile(). Screen" << screen << "monitor id" << monitorId;
 
     if (monitorId.isEmpty()) {
         return 0;
     }
 
     QByteArray bytes = KisColorManager::instance()->displayProfile(monitorId);
 
     //dbgKrita << "\tgetScreenProfile()" << bytes.size();
 
     if (bytes.length() > 0) {
         const KoColorProfile *profile = KoColorSpaceRegistry::instance()->createColorProfile(RGBAColorModelID.id(), Integer8BitsColorDepthID.id(), bytes);
         //dbgKrita << "\tKisConfig::getScreenProfile for screen" << screen << profile->name();
         return profile;
     }
     else {
         //dbgKrita << "\tCould not get a system monitor profile";
         return 0;
     }
 }
 
 const KoColorProfile *KisConfig::displayProfile(int screen) const
 {
     if (screen < 0) return 0;
 
     // if the user plays with the settings, they can override the display profile, in which case
     // we don't want the system setting.
     bool override = useSystemMonitorProfile();
     //dbgKrita << "KisConfig::displayProfile(). Override X11:" << override;
     const KoColorProfile *profile = 0;
     if (override) {
         //dbgKrita << "\tGoing to get the screen profile";
         profile = KisConfig::getScreenProfile(screen);
     }
 
     // if it fails. check the configuration
     if (!profile || !profile->isSuitableForDisplay()) {
         //dbgKrita << "\tGoing to get the monitor profile";
         QString monitorProfileName = monitorProfile(screen);
         //dbgKrita << "\t\tmonitorProfileName:" << monitorProfileName;
         if (!monitorProfileName.isEmpty()) {
             profile = KoColorSpaceRegistry::instance()->profileByName(monitorProfileName);
         }
         if (profile) {
             //dbgKrita << "\t\tsuitable for display" << profile->isSuitableForDisplay();
         }
         else {
             //dbgKrita << "\t\tstill no profile";
         }
     }
     // if we still don't have a profile, or the profile isn't suitable for display,
     // we need to get a last-resort profile. the built-in sRGB is a good choice then.
     if (!profile || !profile->isSuitableForDisplay()) {
         //dbgKrita << "\tnothing worked, going to get sRGB built-in";
         profile = KoColorSpaceRegistry::instance()->profileByName("sRGB Built-in");
     }
 
     if (profile) {
         //dbgKrita << "\tKisConfig::displayProfile for screen" << screen << "is" << profile->name();
     }
     else {
         //dbgKrita << "\tCouldn't get a display profile at all";
     }
 
     return profile;
 }
 
 QString KisConfig::workingColorSpace(bool defaultValue) const
 {
     return (defaultValue ? "RGBA" : m_cfg.readEntry("workingColorSpace", "RGBA"));
 }
 
 void KisConfig::setWorkingColorSpace(const QString & workingColorSpace) const
 {
     m_cfg.writeEntry("workingColorSpace", workingColorSpace);
 }
 
 QString KisConfig::printerColorSpace(bool /*defaultValue*/) const
 {
     //TODO currently only rgb8 is supported
     //return (defaultValue ? "RGBA" : m_cfg.readEntry("printerColorSpace", "RGBA"));
     return QString("RGBA");
 }
 
 void KisConfig::setPrinterColorSpace(const QString & printerColorSpace) const
 {
     m_cfg.writeEntry("printerColorSpace", printerColorSpace);
 }
 
 
 QString KisConfig::printerProfile(bool defaultValue) const
 {
     return (defaultValue ? "" : m_cfg.readEntry("printerProfile", ""));
 }
 
 void KisConfig::setPrinterProfile(const QString & printerProfile) const
 {
     m_cfg.writeEntry("printerProfile", printerProfile);
 }
 
 
 bool KisConfig::useBlackPointCompensation(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("useBlackPointCompensation", true));
 }
 
 void KisConfig::setUseBlackPointCompensation(bool useBlackPointCompensation) const
 {
     m_cfg.writeEntry("useBlackPointCompensation", useBlackPointCompensation);
 }
 
 bool KisConfig::allowLCMSOptimization(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("allowLCMSOptimization", true));
 }
 
 void KisConfig::setAllowLCMSOptimization(bool allowLCMSOptimization)
 {
     m_cfg.writeEntry("allowLCMSOptimization", allowLCMSOptimization);
 }
 
 
 bool KisConfig::showRulers(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("showrulers", false));
 }
 
 void KisConfig::setShowRulers(bool rulers) const
 {
     m_cfg.writeEntry("showrulers", rulers);
 }
 
 bool KisConfig::rulersTrackMouse(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("rulersTrackMouse", true));
 }
 
 void KisConfig::setRulersTrackMouse(bool value) const
 {
     m_cfg.writeEntry("rulersTrackMouse", value);
 }
 
 qint32 KisConfig::pasteBehaviour(bool defaultValue) const
 {
     return (defaultValue ? 2 : m_cfg.readEntry("pasteBehaviour", 2));
 }
 
 void KisConfig::setPasteBehaviour(qint32 renderIntent) const
 {
     m_cfg.writeEntry("pasteBehaviour", renderIntent);
 }
 
 
 qint32 KisConfig::monitorRenderIntent(bool defaultValue) const
 {
     qint32 intent = m_cfg.readEntry("renderIntent", INTENT_PERCEPTUAL);
     if (intent > 3) intent = 3;
     if (intent < 0) intent = 0;
     return (defaultValue ? INTENT_PERCEPTUAL : intent);
 }
 
 void KisConfig::setRenderIntent(qint32 renderIntent) const
 {
     if (renderIntent > 3) renderIntent = 3;
     if (renderIntent < 0) renderIntent = 0;
     m_cfg.writeEntry("renderIntent", renderIntent);
 }
 
 bool KisConfig::useOpenGL(bool defaultValue) const
 {
     if (defaultValue) {
         return true;
     }
 
     //dbgKrita << "use opengl" << m_cfg.readEntry("useOpenGL", true) << "success" << m_cfg.readEntry("canvasState", "OPENGL_SUCCESS");
     QString canvasState = m_cfg.readEntry("canvasState", "OPENGL_SUCCESS");
     return (m_cfg.readEntry("useOpenGL", true) && (canvasState == "OPENGL_SUCCESS" || canvasState == "TRY_OPENGL"));
 }
 
 void KisConfig::setUseOpenGL(bool useOpenGL) const
 {
     m_cfg.writeEntry("useOpenGL", useOpenGL);
 }
 
 int KisConfig::openGLFilteringMode(bool defaultValue) const
 {
     return (defaultValue ? 3 : m_cfg.readEntry("OpenGLFilterMode", 3));
 }
 
 void KisConfig::setOpenGLFilteringMode(int filteringMode)
 {
     m_cfg.writeEntry("OpenGLFilterMode", filteringMode);
 }
 
 bool KisConfig::useOpenGLTextureBuffer(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("useOpenGLTextureBuffer", true));
 }
 
 void KisConfig::setUseOpenGLTextureBuffer(bool useBuffer)
 {
     m_cfg.writeEntry("useOpenGLTextureBuffer", useBuffer);
 }
 
 int KisConfig::openGLTextureSize(bool defaultValue) const
 {
     return (defaultValue ? 256 : m_cfg.readEntry("textureSize", 256));
 }
 
 bool KisConfig::disableVSync(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("disableVSync", true));
 }
 
 void KisConfig::setDisableVSync(bool disableVSync)
 {
     m_cfg.writeEntry("disableVSync", disableVSync);
 }
 
 bool KisConfig::showAdvancedOpenGLSettings(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("showAdvancedOpenGLSettings", false));
 }
 
 bool KisConfig::forceOpenGLFenceWorkaround(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("forceOpenGLFenceWorkaround", false));
 }
 
 int KisConfig::numMipmapLevels(bool defaultValue) const
 {
     return (defaultValue ? 4 : m_cfg.readEntry("numMipmapLevels", 4));
 }
 
 int KisConfig::textureOverlapBorder() const
 {
     return 1 << qMax(0, numMipmapLevels());
 }
 
 qint32 KisConfig::maxNumberOfThreads(bool defaultValue) const
 {
     return (defaultValue ? QThread::idealThreadCount() : m_cfg.readEntry("maxthreads", QThread::idealThreadCount()));
 }
 
 void KisConfig::setMaxNumberOfThreads(qint32 maxThreads)
 {
     m_cfg.writeEntry("maxthreads", maxThreads);
 }
 
 quint32 KisConfig::getGridMainStyle(bool defaultValue) const
 {
     int v = m_cfg.readEntry("gridmainstyle", 0);
     v = qBound(0, v, 2);
     return (defaultValue ? 0 : v);
 }
 
 void KisConfig::setGridMainStyle(quint32 v) const
 {
     m_cfg.writeEntry("gridmainstyle", v);
 }
 
 quint32 KisConfig::getGridSubdivisionStyle(bool defaultValue) const
 {
     quint32 v = m_cfg.readEntry("gridsubdivisionstyle", 1);
     if (v > 2) v = 2;
     return (defaultValue ? 1 : v);
 }
 
 void KisConfig::setGridSubdivisionStyle(quint32 v) const
 {
     m_cfg.writeEntry("gridsubdivisionstyle", v);
 }
 
 QColor KisConfig::getGridMainColor(bool defaultValue) const
 {
     QColor col(99, 99, 99);
     return (defaultValue ? col : m_cfg.readEntry("gridmaincolor", col));
 }
 
 void KisConfig::setGridMainColor(const QColor & v) const
 {
     m_cfg.writeEntry("gridmaincolor", v);
 }
 
 QColor KisConfig::getGridSubdivisionColor(bool defaultValue) const
 {
     QColor col(150, 150, 150);
     return (defaultValue ? col : m_cfg.readEntry("gridsubdivisioncolor", col));
 }
 
 void KisConfig::setGridSubdivisionColor(const QColor & v) const
 {
     m_cfg.writeEntry("gridsubdivisioncolor", v);
 }
 
 quint32 KisConfig::guidesLineStyle(bool defaultValue) const
 {
     int v = m_cfg.readEntry("guidesLineStyle", 0);
     v = qBound(0, v, 2);
     return (defaultValue ? 0 : v);
 }
 
 void KisConfig::setGuidesLineStyle(quint32 v) const
 {
     m_cfg.writeEntry("guidesLineStyle", v);
 }
 
 QColor KisConfig::guidesColor(bool defaultValue) const
 {
     QColor col(99, 99, 99);
     return (defaultValue ? col : m_cfg.readEntry("guidesColor", col));
 }
 
 void KisConfig::setGuidesColor(const QColor & v) const
 {
     m_cfg.writeEntry("guidesColor", v);
 }
 
 void KisConfig::loadSnapConfig(KisSnapConfig *config, bool defaultValue) const
 {
     KisSnapConfig defaultConfig(false);
 
     if (defaultValue) {
         *config = defaultConfig;
         return;
     }
 
     config->setOrthogonal(m_cfg.readEntry("globalSnapOrthogonal", defaultConfig.orthogonal()));
     config->setNode(m_cfg.readEntry("globalSnapNode", defaultConfig.node()));
     config->setExtension(m_cfg.readEntry("globalSnapExtension", defaultConfig.extension()));
     config->setIntersection(m_cfg.readEntry("globalSnapIntersection", defaultConfig.intersection()));
     config->setBoundingBox(m_cfg.readEntry("globalSnapBoundingBox", defaultConfig.boundingBox()));
     config->setImageBounds(m_cfg.readEntry("globalSnapImageBounds", defaultConfig.imageBounds()));
     config->setImageCenter(m_cfg.readEntry("globalSnapImageCenter", defaultConfig.imageCenter()));
 }
 
 void KisConfig::saveSnapConfig(const KisSnapConfig &config)
 {
     m_cfg.writeEntry("globalSnapOrthogonal", config.orthogonal());
     m_cfg.writeEntry("globalSnapNode", config.node());
     m_cfg.writeEntry("globalSnapExtension", config.extension());
     m_cfg.writeEntry("globalSnapIntersection", config.intersection());
     m_cfg.writeEntry("globalSnapBoundingBox", config.boundingBox());
     m_cfg.writeEntry("globalSnapImageBounds", config.imageBounds());
     m_cfg.writeEntry("globalSnapImageCenter", config.imageCenter());
 }
 
 qint32 KisConfig::checkSize(bool defaultValue) const
 {
     return (defaultValue ? 32 : m_cfg.readEntry("checksize", 32));
 }
 
 void KisConfig::setCheckSize(qint32 checksize) const
 {
     m_cfg.writeEntry("checksize", checksize);
 }
 
 bool KisConfig::scrollCheckers(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("scrollingcheckers", false));
 }
 
 void KisConfig::setScrollingCheckers(bool sc) const
 {
     m_cfg.writeEntry("scrollingcheckers", sc);
 }
 
 QColor KisConfig::canvasBorderColor(bool defaultValue) const
 {
     QColor color(QColor(128,128,128));
     return (defaultValue ? color : m_cfg.readEntry("canvasBorderColor", color));
 }
 
 void KisConfig::setCanvasBorderColor(const QColor& color) const
 {
     m_cfg.writeEntry("canvasBorderColor", color);
 }
 
 bool KisConfig::hideScrollbars(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("hideScrollbars", false));
 }
 
 void KisConfig::setHideScrollbars(bool value) const
 {
     m_cfg.writeEntry("hideScrollbars", value);
 }
 
 
 QColor KisConfig::checkersColor1(bool defaultValue) const
 {
     QColor col(220, 220, 220);
     return (defaultValue ? col : m_cfg.readEntry("checkerscolor", col));
 }
 
 void KisConfig::setCheckersColor1(const QColor & v) const
 {
     m_cfg.writeEntry("checkerscolor", v);
 }
 
 QColor KisConfig::checkersColor2(bool defaultValue) const
 {
     return (defaultValue ? QColor(Qt::white) : m_cfg.readEntry("checkerscolor2", QColor(Qt::white)));
 }
 
 void KisConfig::setCheckersColor2(const QColor & v) const
 {
     m_cfg.writeEntry("checkerscolor2", v);
 }
 
 bool KisConfig::antialiasCurves(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("antialiascurves", true));
 }
 
 void KisConfig::setAntialiasCurves(bool v) const
 {
     m_cfg.writeEntry("antialiascurves", v);
 }
 
 QColor KisConfig::selectionOverlayMaskColor(bool defaultValue) const
 {
     QColor def(255, 0, 0, 220);
     return (defaultValue ? def : m_cfg.readEntry("selectionOverlayMaskColor", def));
 }
 
 void KisConfig::setSelectionOverlayMaskColor(const QColor &color)
 {
     m_cfg.writeEntry("selectionOverlayMaskColor", color);
 }
 
 bool KisConfig::antialiasSelectionOutline(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("AntialiasSelectionOutline", false));
 }
 
 void KisConfig::setAntialiasSelectionOutline(bool v) const
 {
     m_cfg.writeEntry("AntialiasSelectionOutline", v);
 }
 
 bool KisConfig::showRootLayer(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("ShowRootLayer", false));
 }
 
 void KisConfig::setShowRootLayer(bool showRootLayer) const
 {
     m_cfg.writeEntry("ShowRootLayer", showRootLayer);
 }
 
 bool KisConfig::showGlobalSelection(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("ShowGlobalSelection", false));
 }
 
 void KisConfig::setShowGlobalSelection(bool showGlobalSelection) const
 {
     m_cfg.writeEntry("ShowGlobalSelection", showGlobalSelection);
 }
 
 bool KisConfig::showOutlineWhilePainting(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("ShowOutlineWhilePainting", true));
 }
 
 void KisConfig::setShowOutlineWhilePainting(bool showOutlineWhilePainting) const
 {
     m_cfg.writeEntry("ShowOutlineWhilePainting", showOutlineWhilePainting);
 }
 
 bool KisConfig::hideSplashScreen(bool defaultValue) const
 {
     KConfigGroup cfg( KSharedConfig::openConfig(), "SplashScreen");
     return (defaultValue ? true : cfg.readEntry("HideSplashAfterStartup", true));
 }
 
 void KisConfig::setHideSplashScreen(bool hideSplashScreen) const
 {
     KConfigGroup cfg( KSharedConfig::openConfig(), "SplashScreen");
     cfg.writeEntry("HideSplashAfterStartup", hideSplashScreen);
 }
 
 qreal KisConfig::outlineSizeMinimum(bool defaultValue) const
 {
     return (defaultValue ? 1.0 : m_cfg.readEntry("OutlineSizeMinimum", 1.0));
 }
 
 void KisConfig::setOutlineSizeMinimum(qreal outlineSizeMinimum) const
 {
     m_cfg.writeEntry("OutlineSizeMinimum", outlineSizeMinimum);
 }
 
 int KisConfig::autoSaveInterval(bool defaultValue)  const
 {
     return (defaultValue ? KisDocument::defaultAutoSave() : m_cfg.readEntry("AutoSaveInterval", KisDocument::defaultAutoSave()));
 }
 
 void KisConfig::setAutoSaveInterval(int seconds)  const
 {
     return m_cfg.writeEntry("AutoSaveInterval", seconds);
 }
 
 bool KisConfig::backupFile(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("CreateBackupFile", true));
 }
 
 void KisConfig::setBackupFile(bool backupFile) const
 {
     m_cfg.writeEntry("CreateBackupFile", backupFile);
 }
 
 bool KisConfig::showFilterGallery(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("showFilterGallery", false));
 }
 
 void KisConfig::setShowFilterGallery(bool showFilterGallery) const
 {
     m_cfg.writeEntry("showFilterGallery", showFilterGallery);
 }
 
 bool KisConfig::showFilterGalleryLayerMaskDialog(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("showFilterGalleryLayerMaskDialog", true));
 }
 
 void KisConfig::setShowFilterGalleryLayerMaskDialog(bool showFilterGallery) const
 {
     m_cfg.writeEntry("setShowFilterGalleryLayerMaskDialog", showFilterGallery);
 }
 
 QString KisConfig::canvasState(bool defaultValue) const
 {
     return (defaultValue ? "OPENGL_NOT_TRIED" : m_cfg.readEntry("canvasState", "OPENGL_NOT_TRIED"));
 }
 
 void KisConfig::setCanvasState(const QString& state) const
 {
     static QStringList acceptableStates;
     if (acceptableStates.isEmpty()) {
         acceptableStates << "OPENGL_SUCCESS" << "TRY_OPENGL" << "OPENGL_NOT_TRIED" << "OPENGL_FAILED";
     }
     if (acceptableStates.contains(state)) {
         m_cfg.writeEntry("canvasState", state);
         m_cfg.sync();
     }
 }
 
 bool KisConfig::toolOptionsPopupDetached(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("ToolOptionsPopupDetached", false));
 }
 
 void KisConfig::setToolOptionsPopupDetached(bool detached) const
 {
     m_cfg.writeEntry("ToolOptionsPopupDetached", detached);
 }
 
 
 bool KisConfig::paintopPopupDetached(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("PaintopPopupDetached", false));
 }
 
 void KisConfig::setPaintopPopupDetached(bool detached) const
 {
     m_cfg.writeEntry("PaintopPopupDetached", detached);
 }
 
 QString KisConfig::pressureTabletCurve(bool defaultValue) const
 {
     return (defaultValue ? "0,0;1,1" : m_cfg.readEntry("tabletPressureCurve","0,0;1,1;"));
 }
 
 void KisConfig::setPressureTabletCurve(const QString& curveString) const
 {
     m_cfg.writeEntry("tabletPressureCurve", curveString);
 }
 
 qreal KisConfig::vastScrolling(bool defaultValue) const
 {
     return (defaultValue ? 0.9 : m_cfg.readEntry("vastScrolling", 0.9));
 }
 
 void KisConfig::setVastScrolling(const qreal factor) const
 {
     m_cfg.writeEntry("vastScrolling", factor);
 }
 
 int KisConfig::presetChooserViewMode(bool defaultValue) const
 {
     return (defaultValue ? 0 : m_cfg.readEntry("presetChooserViewMode", 0));
 }
 
 void KisConfig::setPresetChooserViewMode(const int mode) const
 {
     m_cfg.writeEntry("presetChooserViewMode", mode);
 }
 
 bool KisConfig::firstRun(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("firstRun", true));
 }
 
 void KisConfig::setFirstRun(const bool first) const
 {
     m_cfg.writeEntry("firstRun", first);
 }
 
 int KisConfig::horizontalSplitLines(bool defaultValue) const
 {
     return (defaultValue ? 1 : m_cfg.readEntry("horizontalSplitLines", 1));
 }
 void KisConfig::setHorizontalSplitLines(const int numberLines) const
 {
     m_cfg.writeEntry("horizontalSplitLines", numberLines);
 }
 
 int KisConfig::verticalSplitLines(bool defaultValue) const
 {
     return (defaultValue ? 1 : m_cfg.readEntry("verticalSplitLines", 1));
 }
 
 void KisConfig::setVerticalSplitLines(const int numberLines) const
 {
     m_cfg.writeEntry("verticalSplitLines", numberLines);
 }
 
 bool KisConfig::clicklessSpacePan(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("clicklessSpacePan", true));
 }
 
 void KisConfig::setClicklessSpacePan(const bool toggle) const
 {
     m_cfg.writeEntry("clicklessSpacePan", toggle);
 }
 
 
 bool KisConfig::hideDockersFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("hideDockersFullScreen", true));
 }
 
 void KisConfig::setHideDockersFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideDockersFullScreen", value);
 }
 
 bool KisConfig::showDockerTitleBars(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("showDockerTitleBars", true));
 }
 
 void KisConfig::setShowDockerTitleBars(const bool value) const
 {
     m_cfg.writeEntry("showDockerTitleBars", value);
 }
 
 bool KisConfig::showStatusBar(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("showStatusBar", true));
 }
 
 void KisConfig::setShowStatusBar(const bool value) const
 {
     m_cfg.writeEntry("showStatusBar", value);
 }
 
 bool KisConfig::hideMenuFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true: m_cfg.readEntry("hideMenuFullScreen", true));
 }
 
 void KisConfig::setHideMenuFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideMenuFullScreen", value);
 }
 
 bool KisConfig::hideScrollbarsFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("hideScrollbarsFullScreen", true));
 }
 
 void KisConfig::setHideScrollbarsFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideScrollbarsFullScreen", value);
 }
 
 bool KisConfig::hideStatusbarFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true: m_cfg.readEntry("hideStatusbarFullScreen", true));
 }
 
 void KisConfig::setHideStatusbarFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideStatusbarFullScreen", value);
 }
 
 bool KisConfig::hideTitlebarFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("hideTitleBarFullscreen", true));
 }
 
 void KisConfig::setHideTitlebarFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideTitleBarFullscreen", value);
 }
 
 bool KisConfig::hideToolbarFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("hideToolbarFullscreen", true));
 }
 
 void KisConfig::setHideToolbarFullscreen(const bool value) const
 {
     m_cfg.writeEntry("hideToolbarFullscreen", value);
 }
 
 bool KisConfig::fullscreenMode(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("fullscreenMode", true));
 }
 
 void KisConfig::setFullscreenMode(const bool value) const
 {
     m_cfg.writeEntry("fullscreenMode", value);
 }
 
 QStringList KisConfig::favoriteCompositeOps(bool defaultValue) const
 {
     return (defaultValue ? QStringList() : m_cfg.readEntry("favoriteCompositeOps", QStringList()));
 }
 
 void KisConfig::setFavoriteCompositeOps(const QStringList& compositeOps) const
 {
     m_cfg.writeEntry("favoriteCompositeOps", compositeOps);
 }
 
 QString KisConfig::exportConfiguration(const QString &filterId, bool defaultValue) const
 {
     return (defaultValue ? QString() : m_cfg.readEntry("ExportConfiguration-" + filterId, QString()));
 }
 
 void KisConfig::setExportConfiguration(const QString &filterId, const KisPropertiesConfiguration &properties) const
 {
     QString exportConfig = properties.toXML();
     m_cfg.writeEntry("ExportConfiguration-" + filterId, exportConfig);
 
 }
 
 bool KisConfig::useOcio(bool defaultValue) const
 {
 #ifdef HAVE_OCIO
     return (defaultValue ? false : m_cfg.readEntry("Krita/Ocio/UseOcio", false));
 #else
     Q_UNUSED(defaultValue);
     return false;
 #endif
 }
 
 void KisConfig::setUseOcio(bool useOCIO) const
 {
     m_cfg.writeEntry("Krita/Ocio/UseOcio", useOCIO);
 }
 
 int KisConfig::favoritePresets(bool defaultValue) const
 {
     return (defaultValue ? 10 : m_cfg.readEntry("numFavoritePresets", 10));
 }
 
 void KisConfig::setFavoritePresets(const int value)
 {
     m_cfg.writeEntry("numFavoritePresets", value);
 }
 
 bool KisConfig::levelOfDetailEnabled(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("levelOfDetailEnabled", false));
 }
 
 void KisConfig::setLevelOfDetailEnabled(bool value)
 {
     m_cfg.writeEntry("levelOfDetailEnabled", value);
 }
 
 KisConfig::OcioColorManagementMode
 KisConfig::ocioColorManagementMode(bool defaultValue) const
 {
     return (OcioColorManagementMode)(defaultValue ? INTERNAL
                                                   : m_cfg.readEntry("Krita/Ocio/OcioColorManagementMode", (int) INTERNAL));
 }
 
 void KisConfig::setOcioColorManagementMode(OcioColorManagementMode mode) const
 {
     m_cfg.writeEntry("Krita/Ocio/OcioColorManagementMode", (int) mode);
 }
 
 QString KisConfig::ocioConfigurationPath(bool defaultValue) const
 {
     return (defaultValue ? QString() : m_cfg.readEntry("Krita/Ocio/OcioConfigPath", QString()));
 }
 
 void KisConfig::setOcioConfigurationPath(const QString &path) const
 {
     m_cfg.writeEntry("Krita/Ocio/OcioConfigPath", path);
 }
 
 QString KisConfig::ocioLutPath(bool defaultValue) const
 {
     return (defaultValue ? QString() : m_cfg.readEntry("Krita/Ocio/OcioLutPath", QString()));
 }
 
 void KisConfig::setOcioLutPath(const QString &path) const
 {
     m_cfg.writeEntry("Krita/Ocio/OcioLutPath", path);
 }
 
 int KisConfig::ocioLutEdgeSize(bool defaultValue) const
 {
     return (defaultValue ? 64 : m_cfg.readEntry("Krita/Ocio/LutEdgeSize", 64));
 }
 
 void KisConfig::setOcioLutEdgeSize(int value)
 {
     m_cfg.writeEntry("Krita/Ocio/LutEdgeSize", value);
 }
 
 bool KisConfig::ocioLockColorVisualRepresentation(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("Krita/Ocio/OcioLockColorVisualRepresentation", false));
 }
 
 void KisConfig::setOcioLockColorVisualRepresentation(bool value)
 {
     m_cfg.writeEntry("Krita/Ocio/OcioLockColorVisualRepresentation", value);
 }
 
 QString KisConfig::defaultPalette(bool defaultValue) const
 {
     return (defaultValue ? QString() : m_cfg.readEntry("defaultPalette", QString()));
 }
 
 void KisConfig::setDefaultPalette(const QString& name) const
 {
     m_cfg.writeEntry("defaultPalette", name);
 }
 
 QString KisConfig::toolbarSlider(int sliderNumber, bool defaultValue) const
 {
     QString def = "flow";
     if (sliderNumber == 1) {
         def = "opacity";
     }
     if (sliderNumber == 2) {
         def = "size";
     }
     return (defaultValue ? def : m_cfg.readEntry(QString("toolbarslider_%1").arg(sliderNumber), def));
 }
 
 void KisConfig::setToolbarSlider(int sliderNumber, const QString &slider)
 {
     m_cfg.writeEntry(QString("toolbarslider_%1").arg(sliderNumber), slider);
 }
 
 bool KisConfig::sliderLabels(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("sliderLabels", true));
 }
 
 void KisConfig::setSliderLabels(bool enabled)
 {
     m_cfg.writeEntry("sliderLabels", enabled);
 }
 
 QString KisConfig::currentInputProfile(bool defaultValue) const
 {
     return (defaultValue ? QString() : m_cfg.readEntry("currentInputProfile", QString()));
 }
 
 void KisConfig::setCurrentInputProfile(const QString& name)
 {
     m_cfg.writeEntry("currentInputProfile", name);
 }
 
 bool KisConfig::useSystemMonitorProfile(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("ColorManagement/UseSystemMonitorProfile", false));
 }
 
 void KisConfig::setUseSystemMonitorProfile(bool _useSystemMonitorProfile) const
 {
     m_cfg.writeEntry("ColorManagement/UseSystemMonitorProfile", _useSystemMonitorProfile);
 }
 
 bool KisConfig::presetStripVisible(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("presetStripVisible", true));
 }
 
 void KisConfig::setPresetStripVisible(bool visible)
 {
     m_cfg.writeEntry("presetStripVisible", visible);
 }
 
 bool KisConfig::scratchpadVisible(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("scratchpadVisible", true));
 }
 
 void KisConfig::setScratchpadVisible(bool visible)
 {
     m_cfg.writeEntry("scratchpadVisible", visible);
 }
 
 bool KisConfig::showSingleChannelAsColor(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("showSingleChannelAsColor", false));
 }
 
 void KisConfig::setShowSingleChannelAsColor(bool asColor)
 {
     m_cfg.writeEntry("showSingleChannelAsColor", asColor);
 }
 
 bool KisConfig::hidePopups(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("hidePopups", false));
 }
 
 void KisConfig::setHidePopups(bool hidepopups)
 {
     m_cfg.writeEntry("hidePopups", hidepopups);
 }
 
 int KisConfig::numDefaultLayers(bool defaultValue) const
 {
     return (defaultValue ? 2 : m_cfg.readEntry("NumberOfLayersForNewImage", 2));
 }
 
 void KisConfig::setNumDefaultLayers(int num)
 {
     m_cfg.writeEntry("NumberOfLayersForNewImage", num);
 }
 
 quint8 KisConfig::defaultBackgroundOpacity(bool defaultValue) const
 {
   return (defaultValue ? (int)OPACITY_OPAQUE_U8 : m_cfg.readEntry("BackgroundOpacityForNewImage", (int)OPACITY_OPAQUE_U8));
 }
 
 void KisConfig::setDefaultBackgroundOpacity(quint8 value)
 {
   m_cfg.writeEntry("BackgroundOpacityForNewImage", (int)value);
 }
 
 QColor KisConfig::defaultBackgroundColor(bool defaultValue) const
 {
   return (defaultValue ? QColor(Qt::white) : m_cfg.readEntry("BackgroundColorForNewImage", QColor(Qt::white)));
 }
 
 void KisConfig::setDefaultBackgroundColor(QColor value)
 {
   m_cfg.writeEntry("BackgroundColorForNewImage", value);
 }
 
 KisConfig::BackgroundStyle KisConfig::defaultBackgroundStyle(bool defaultValue) const
 {
   return (KisConfig::BackgroundStyle)(defaultValue ? LAYER : m_cfg.readEntry("BackgroundStyleForNewImage", (int)LAYER));
 }
 
 void KisConfig::setDefaultBackgroundStyle(KisConfig::BackgroundStyle value)
 {
   m_cfg.writeEntry("BackgroundStyleForNewImage", (int)value);
 }
 
 int KisConfig::lineSmoothingType(bool defaultValue) const
 {
     return (defaultValue ? 1 : m_cfg.readEntry("LineSmoothingType", 1));
 }
 
 void KisConfig::setLineSmoothingType(int value)
 {
     m_cfg.writeEntry("LineSmoothingType", value);
 }
 
 qreal KisConfig::lineSmoothingDistance(bool defaultValue) const
 {
     return (defaultValue ? 50.0 : m_cfg.readEntry("LineSmoothingDistance", 50.0));
 }
 
 void KisConfig::setLineSmoothingDistance(qreal value)
 {
     m_cfg.writeEntry("LineSmoothingDistance", value);
 }
 
 qreal KisConfig::lineSmoothingTailAggressiveness(bool defaultValue) const
 {
     return (defaultValue ? 0.15 : m_cfg.readEntry("LineSmoothingTailAggressiveness", 0.15));
 }
 
 void KisConfig::setLineSmoothingTailAggressiveness(qreal value)
 {
     m_cfg.writeEntry("LineSmoothingTailAggressiveness", value);
 }
 
 bool KisConfig::lineSmoothingSmoothPressure(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("LineSmoothingSmoothPressure", false));
 }
 
 void KisConfig::setLineSmoothingSmoothPressure(bool value)
 {
     m_cfg.writeEntry("LineSmoothingSmoothPressure", value);
 }
 
 bool KisConfig::lineSmoothingScalableDistance(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("LineSmoothingScalableDistance", true));
 }
 
 void KisConfig::setLineSmoothingScalableDistance(bool value)
 {
     m_cfg.writeEntry("LineSmoothingScalableDistance", value);
 }
 
 qreal KisConfig::lineSmoothingDelayDistance(bool defaultValue) const
 {
     return (defaultValue ? 50.0 : m_cfg.readEntry("LineSmoothingDelayDistance", 50.0));
 }
 
 void KisConfig::setLineSmoothingDelayDistance(qreal value)
 {
     m_cfg.writeEntry("LineSmoothingDelayDistance", value);
 }
 
 bool KisConfig::lineSmoothingUseDelayDistance(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("LineSmoothingUseDelayDistance", true));
 }
 
 void KisConfig::setLineSmoothingUseDelayDistance(bool value)
 {
     m_cfg.writeEntry("LineSmoothingUseDelayDistance", value);
 }
 
 bool KisConfig::lineSmoothingFinishStabilizedCurve(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("LineSmoothingFinishStabilizedCurve", true));
 }
 
 void KisConfig::setLineSmoothingFinishStabilizedCurve(bool value)
 {
     m_cfg.writeEntry("LineSmoothingFinishStabilizedCurve", value);
 }
 
 bool KisConfig::lineSmoothingStabilizeSensors(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("LineSmoothingStabilizeSensors", true));
 }
 
 void KisConfig::setLineSmoothingStabilizeSensors(bool value)
 {
     m_cfg.writeEntry("LineSmoothingStabilizeSensors", value);
 }
 
 int KisConfig::paletteDockerPaletteViewSectionSize(bool defaultValue) const
 {
     return (defaultValue ? 12 : m_cfg.readEntry("paletteDockerPaletteViewSectionSize", 12));
 }
 
 void KisConfig::setPaletteDockerPaletteViewSectionSize(int value) const
 {
     m_cfg.writeEntry("paletteDockerPaletteViewSectionSize", value);
 }
 
 int KisConfig::tabletEventsDelay(bool defaultValue) const
 {
     return (defaultValue ? 10 : m_cfg.readEntry("tabletEventsDelay", 10));
 }
 
 void KisConfig::setTabletEventsDelay(int value)
 {
     m_cfg.writeEntry("tabletEventsDelay", value);
 }
 
 bool KisConfig::testingAcceptCompressedTabletEvents(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("testingAcceptCompressedTabletEvents", false));
 }
 
 void KisConfig::setTestingAcceptCompressedTabletEvents(bool value)
 {
     m_cfg.writeEntry("testingAcceptCompressedTabletEvents", value);
 }
 
 bool KisConfig::shouldEatDriverShortcuts(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("shouldEatDriverShortcuts", false));
 }
 
 bool KisConfig::testingCompressBrushEvents(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("testingCompressBrushEvents", false));
 }
 
 void KisConfig::setTestingCompressBrushEvents(bool value)
 {
     m_cfg.writeEntry("testingCompressBrushEvents", value);
 }
 
 bool KisConfig::useVerboseOpenGLDebugOutput(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("useVerboseOpenGLDebugOutput", false));
 }
 
 int KisConfig::workaroundX11SmoothPressureSteps(bool defaultValue) const
 {
     return (defaultValue ? 0 : m_cfg.readEntry("workaroundX11SmoothPressureSteps", 0));
 }
 
 bool KisConfig::showCanvasMessages(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("showOnCanvasMessages", true));
 }
 
 void KisConfig::setShowCanvasMessages(bool show)
 {
     m_cfg.writeEntry("showOnCanvasMessages", show);
 }
 
 bool KisConfig::compressKra(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("compressLayersInKra", false));
 }
 
 void KisConfig::setCompressKra(bool compress)
 {
     m_cfg.writeEntry("compressLayersInKra", compress);
 }
 
 bool KisConfig::toolOptionsInDocker(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("ToolOptionsInDocker", true));
 }
 
 void KisConfig::setToolOptionsInDocker(bool inDocker)
 {
     m_cfg.writeEntry("ToolOptionsInDocker", inDocker);
 }
 
 const KoColorSpace* KisConfig::customColorSelectorColorSpace(bool defaultValue) const
 {
     const KoColorSpace *cs = 0;
 
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     if (defaultValue || cfg.readEntry("useCustomColorSpace", true)) {
         KoColorSpaceRegistry* csr = KoColorSpaceRegistry::instance();
         QString modelID = cfg.readEntry("customColorSpaceModel", "RGBA");
         QString depthID = cfg.readEntry("customColorSpaceDepthID", "U8");
         QString profile = cfg.readEntry("customColorSpaceProfile", "sRGB built-in - (lcms internal)");
         if (profile == "default") {
           // qDebug() << "Falling back to default color profile.";
           profile = "sRGB built-in - (lcms internal)";
         }
         cs = csr->colorSpace(modelID, depthID, profile);
     }
 
     return cs;
 }
 
 void KisConfig::setCustomColorSelectorColorSpace(const KoColorSpace *cs)
 {
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     cfg.writeEntry("useCustomColorSpace", bool(cs));
     if(cs) {
         cfg.writeEntry("customColorSpaceModel", cs->colorModelId().id());
         cfg.writeEntry("customColorSpaceDepthID", cs->colorDepthId().id());
         cfg.writeEntry("customColorSpaceProfile", cs->profile()->name());
     }
 
     KisConfigNotifier::instance()->notifyConfigChanged();
 }
 
 bool KisConfig::enableOpenGLDebugging(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("enableOpenGLDebugging", false));
 }
 
 void KisConfig::setEnableOpenGLDebugging(bool value) const
 {
     m_cfg.writeEntry("enableOpenGLDebugging", value);
 }
 
 void KisConfig::setEnableAmdVectorizationWorkaround(bool value)
 {
     m_cfg.writeEntry("amdDisableVectorWorkaround", value);
 }
 
 bool KisConfig::enableAmdVectorizationWorkaround(bool defaultValue) const
 {
     return (defaultValue ? false : m_cfg.readEntry("amdDisableVectorWorkaround", false));
 }
 
 void KisConfig::setAnimationDropFrames(bool value)
 {
     bool oldValue = animationDropFrames();
 
     if (value == oldValue) return;
 
     m_cfg.writeEntry("animationDropFrames", value);
     KisConfigNotifier::instance()->notifyDropFramesModeChanged();
 }
 
 bool KisConfig::animationDropFrames(bool defaultValue) const
 {
     return (defaultValue ? true : m_cfg.readEntry("animationDropFrames", true));
 }
 
 int KisConfig::scribbingUpdatesDelay(bool defaultValue) const
 {
     return (defaultValue ? 30 : m_cfg.readEntry("scribbingUpdatesDelay", 30));
 }
 
 void KisConfig::setScribbingUpdatesDelay(int value)
 {
     m_cfg.writeEntry("scribbingUpdatesDelay", value);
 }
 
 bool KisConfig::switchSelectionCtrlAlt(bool defaultValue) const
 {
     return defaultValue ? false : m_cfg.readEntry("switchSelectionCtrlAlt", false);
 }
 
 void KisConfig::setSwitchSelectionCtrlAlt(bool value)
 {
     m_cfg.writeEntry("switchSelectionCtrlAlt", value);
     KisConfigNotifier::instance()->notifyConfigChanged();
 }
 
 bool KisConfig::convertToImageColorspaceOnImport(bool defaultValue) const
 {
     return defaultValue ? false : m_cfg.readEntry("ConvertToImageColorSpaceOnImport", false);
 }
 
 void KisConfig::setConvertToImageColorspaceOnImport(bool value)
 {
     m_cfg.writeEntry("ConvertToImageColorSpaceOnImport", value);
 }
 
 int KisConfig::stabilizerSampleSize(bool defaultValue) const
 {
 #ifdef Q_OS_WIN
     const int defaultSampleSize = 50;
 #else
     const int defaultSampleSize = 15;
 #endif
 
     return defaultValue ?
         defaultSampleSize : m_cfg.readEntry("stabilizerSampleSize", defaultSampleSize);
 }
 
 void KisConfig::setStabilizerSampleSize(int value)
 {
     m_cfg.writeEntry("stabilizerSampleSize", value);
 }
 
 QString KisConfig::customFFMpegPath(bool defaultValue) const
 {
     return defaultValue ? QString() : m_cfg.readEntry("ffmpegExecutablePath", QString());
 }
 
 void KisConfig::setCustomFFMpegPath(const QString &value) const
 {
     m_cfg.writeEntry("ffmpegExecutablePath", value);
 }
+
+bool KisConfig::showBrushHud(bool defaultValue) const
+{
+    return defaultValue ? false : m_cfg.readEntry("showBrushHud", false);
+}
+
+void KisConfig::setShowBrushHud(bool value)
+{
+    m_cfg.writeEntry("showBrushHud", value);
+}
+
+QString KisConfig::brushHudSetting(bool defaultValue) const
+{
+    QString defaultDoc = "<!DOCTYPE hud_properties>\n<hud_properties>\n <version type=\"value\" value=\"1\"/>\n <paintbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"angle\"/>\n  </properties_list>\n </paintbrush>\n <colorsmudge>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"smudge_mode\"/>\n   <item_3 type=\"value\" value=\"smudge_length\"/>\n   <item_4 type=\"value\" value=\"smudge_color_rate\"/>\n  </properties_list>\n </colorsmudge>\n <sketchbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"opacity\"/>\n   <item_1 type=\"value\" value=\"size\"/>\n  </properties_list>\n </sketchbrush>\n <hairybrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n  </properties_list>\n </hairybrush>\n <experimentbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"opacity\"/>\n   <item_1 type=\"value\" value=\"shape_windingfill\"/>\n  </properties_list>\n </experimentbrush>\n <spraybrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"spray_particlecount\"/>\n   <item_3 type=\"value\" value=\"spray_density\"/>\n  </properties_list>\n </spraybrush>\n <hatchingbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"hatching_angle\"/>\n   <item_3 type=\"value\" value=\"hatching_thickness\"/>\n   <item_4 type=\"value\" value=\"hatching_separation\"/>\n  </properties_list>\n </hatchingbrush>\n <gridbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"grid_divisionlevel\"/>\n  </properties_list>\n </gridbrush>\n <curvebrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"opacity\"/>\n   <item_1 type=\"value\" value=\"curve_historysize\"/>\n   <item_2 type=\"value\" value=\"curve_linewidth\"/>\n   <item_3 type=\"value\" value=\"curve_lineopacity\"/>\n   <item_4 type=\"value\" value=\"curve_connectionline\"/>\n  </properties_list>\n </curvebrush>\n <dynabrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"dyna_diameter\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"dyna_mass\"/>\n   <item_3 type=\"value\" value=\"dyna_drag\"/>\n  </properties_list>\n </dynabrush>\n <particlebrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"opacity\"/>\n   <item_1 type=\"value\" value=\"particle_particles\"/>\n   <item_2 type=\"value\" value=\"particle_opecityweight\"/>\n   <item_3 type=\"value\" value=\"particle_iterations\"/>\n  </properties_list>\n </particlebrush>\n <duplicate>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"clone_healing\"/>\n   <item_3 type=\"value\" value=\"clone_movesource\"/>\n  </properties_list>\n </duplicate>\n <deformbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n   <item_2 type=\"value\" value=\"deform_amount\"/>\n   <item_3 type=\"value\" value=\"deform_mode\"/>\n  </properties_list>\n </deformbrush>\n <tangentnormal>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n  </properties_list>\n </tangentnormal>\n <filter>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n  </properties_list>\n </filter>\n <chalkbrush>\n  <properties_list type=\"array\">\n   <item_0 type=\"value\" value=\"size\"/>\n   <item_1 type=\"value\" value=\"opacity\"/>\n  </properties_list>\n </chalkbrush>\n</hud_properties>\n";
+    return defaultValue ? defaultDoc : m_cfg.readEntry("brushHudSettings", defaultDoc);
+}
+
+void KisConfig::setBrushHudSetting(const QString &value) const
+{
+    m_cfg.writeEntry("brushHudSettings", value);
+}
diff --git a/libs/ui/kis_config.h b/libs/ui/kis_config.h
index 2d09bb2d89..ce6219c9af 100644
--- a/libs/ui/kis_config.h
+++ b/libs/ui/kis_config.h
@@ -1,515 +1,521 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *
  *  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_CONFIG_H_
 #define KIS_CONFIG_H_
 
 #include <QString>
 #include <QStringList>
 #include <QList>
 #include <QColor>
 
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 
 #include "kis_global.h"
 #include "kis_properties_configuration.h"
 #include "kritaui_export.h"
 
 class KoColorProfile;
 class KoColorSpace;
 class KisSnapConfig;
 
 class KRITAUI_EXPORT KisConfig
 {
 public:
     KisConfig();
     ~KisConfig();
 
     bool disableTouchOnCanvas(bool defaultValue = false) const;
     void setDisableTouchOnCanvas(bool value) const;
 
     bool useProjections(bool defaultValue = false) const;
     void setUseProjections(bool useProj) const;
 
     bool undoEnabled(bool defaultValue = false) const;
     void setUndoEnabled(bool undo) const;
 
     int undoStackLimit(bool defaultValue = false) const;
     void setUndoStackLimit(int limit) const;
 
     bool useCumulativeUndoRedo(bool defaultValue = false) const;
     void setCumulativeUndoRedo(bool value);
 
     double stackT1(bool defaultValue = false) const;
     void setStackT1(int T1);
 
     double stackT2(bool defaultValue = false) const;
     void setStackT2(int T2);
 
     int stackN(bool defaultValue = false) const;
     void setStackN(int N);
 
     qint32 defImageWidth(bool defaultValue = false) const;
     void defImageWidth(qint32 width) const;
 
     qint32 defImageHeight(bool defaultValue = false) const;
     void defImageHeight(qint32 height) const;
 
     qreal defImageResolution(bool defaultValue = false) const;
     void defImageResolution(qreal res) const;
 
     /**
      * @return the id of the default color model used for creating new images.
      */
     QString defColorModel(bool defaultValue = false) const;
     /**
      * set the id of the default color model used for creating new images.
      */
     void defColorModel(const QString & model) const;
 
     /**
      * @return the id of the default color depth used for creating new images.
      */
     QString defaultColorDepth(bool defaultValue = false) const;
     /**
      * set the id of the default color depth used for creating new images.
      */
     void setDefaultColorDepth(const QString & depth) const;
 
     /**
      * @return the id of the default color profile used for creating new images.
      */
     QString defColorProfile(bool defaultValue = false) const;
     /**
      * set the id of the default color profile used for creating new images.
      */
     void defColorProfile(const QString & depth) const;
 
     CursorStyle newCursorStyle(bool defaultValue = false) const;
     void setNewCursorStyle(CursorStyle style);
 
     OutlineStyle newOutlineStyle(bool defaultValue = false) const;
     void setNewOutlineStyle(OutlineStyle style);
 
     QRect colorPreviewRect() const;
     void setColorPreviewRect(const QRect &rect);
 
     /// get the profile the user has selected for the given screen
     QString monitorProfile(int screen) const;
     void setMonitorProfile(int screen, const QString & monitorProfile, bool override) const;
 
     QString monitorForScreen(int screen, const QString &defaultMonitor, bool defaultValue = true) const;
     void setMonitorForScreen(int screen, const QString& monitor);
 
     /// Get the actual profile to be used for the given screen, which is
     /// either the screen profile set by the color management system or
     /// the custom monitor profile set by the user, depending on the configuration
     const KoColorProfile *displayProfile(int screen) const;
 
     QString workingColorSpace(bool defaultValue = false) const;
     void setWorkingColorSpace(const QString & workingColorSpace) const;
 
     QString importProfile(bool defaultValue = false) const;
     void setImportProfile(const QString & importProfile) const;
 
     QString printerColorSpace(bool defaultValue = false) const;
     void setPrinterColorSpace(const QString & printerColorSpace) const;
 
     QString printerProfile(bool defaultValue = false) const;
     void setPrinterProfile(const QString & printerProfile) const;
 
     bool useBlackPointCompensation(bool defaultValue = false) const;
     void setUseBlackPointCompensation(bool useBlackPointCompensation) const;
 
     bool allowLCMSOptimization(bool defaultValue = false) const;
     void setAllowLCMSOptimization(bool allowLCMSOptimization);
 
     bool showRulers(bool defaultValue = false) const;
     void setShowRulers(bool rulers) const;
 
     bool rulersTrackMouse(bool defaultValue = false) const;
     void setRulersTrackMouse(bool value) const;
 
     qint32 pasteBehaviour(bool defaultValue = false) const;
     void setPasteBehaviour(qint32 behaviour) const;
 
     qint32 monitorRenderIntent(bool defaultValue = false) const;
     void setRenderIntent(qint32 monitorRenderIntent) const;
 
     bool useOpenGL(bool defaultValue = false) const;
     void setUseOpenGL(bool useOpenGL) const;
 
     int openGLFilteringMode(bool defaultValue = false) const;
     void setOpenGLFilteringMode(int filteringMode);
 
     bool useOpenGLTextureBuffer(bool defaultValue = false) const;
     void setUseOpenGLTextureBuffer(bool useBuffer);
 
     bool disableVSync(bool defaultValue = false) const;
     void setDisableVSync(bool disableVSync);
 
     bool showAdvancedOpenGLSettings(bool defaultValue = false) const;
 
     bool forceOpenGLFenceWorkaround(bool defaultValue = false) const;
 
     int numMipmapLevels(bool defaultValue = false) const;
     int openGLTextureSize(bool defaultValue = false) const;
     int textureOverlapBorder() const;
 
     qint32 maxNumberOfThreads(bool defaultValue = false) const;
     void setMaxNumberOfThreads(qint32 numberOfThreads);
 
     quint32 getGridMainStyle(bool defaultValue = false) const;
     void setGridMainStyle(quint32 v) const;
 
     quint32 getGridSubdivisionStyle(bool defaultValue = false) const;
     void setGridSubdivisionStyle(quint32 v) const;
 
     QColor getGridMainColor(bool defaultValue = false) const;
     void setGridMainColor(const QColor & v) const;
 
     QColor getGridSubdivisionColor(bool defaultValue = false) const;
     void setGridSubdivisionColor(const QColor & v) const;
 
     quint32 guidesLineStyle(bool defaultValue = false) const;
     void setGuidesLineStyle(quint32 v) const;
     QColor guidesColor(bool defaultValue = false) const;
     void setGuidesColor(const QColor & v) const;
 
     void loadSnapConfig(KisSnapConfig *config, bool defaultValue = false) const;
     void saveSnapConfig(const KisSnapConfig &config);
 
     qint32 checkSize(bool defaultValue = false) const;
     void setCheckSize(qint32 checkSize) const;
 
     bool scrollCheckers(bool defaultValue = false) const;
     void setScrollingCheckers(bool scollCheckers) const;
 
     QColor checkersColor1(bool defaultValue = false) const;
     void setCheckersColor1(const QColor & v) const;
 
     QColor checkersColor2(bool defaultValue = false) const;
     void setCheckersColor2(const QColor & v) const;
 
     QColor canvasBorderColor(bool defaultValue = false) const;
     void setCanvasBorderColor(const QColor &color) const;
 
     bool hideScrollbars(bool defaultValue = false) const;
     void setHideScrollbars(bool value) const;
 
     bool antialiasCurves(bool defaultValue = false) const;
     void setAntialiasCurves(bool v) const;
 
     QColor selectionOverlayMaskColor(bool defaultValue = false) const;
     void setSelectionOverlayMaskColor(const QColor &color);
 
     bool antialiasSelectionOutline(bool defaultValue = false) const;
     void setAntialiasSelectionOutline(bool v) const;
 
     bool showRootLayer(bool defaultValue = false) const;
     void setShowRootLayer(bool showRootLayer) const;
 
     bool showGlobalSelection(bool defaultValue = false) const;
     void setShowGlobalSelection(bool showGlobalSelection) const;
 
     bool showOutlineWhilePainting(bool defaultValue = false) const;
     void setShowOutlineWhilePainting(bool showOutlineWhilePainting) const;
 
     bool hideSplashScreen(bool defaultValue = false) const;
     void setHideSplashScreen(bool hideSplashScreen) const;
 
     qreal outlineSizeMinimum(bool defaultValue = false) const;
     void setOutlineSizeMinimum(qreal outlineSizeMinimum) const;
 
     int autoSaveInterval(bool defaultValue = false) const;
     void setAutoSaveInterval(int seconds) const;
 
     bool backupFile(bool defaultValue = false) const;
     void setBackupFile(bool backupFile) const;
 
     bool showFilterGallery(bool defaultValue = false) const;
     void setShowFilterGallery(bool showFilterGallery) const;
 
     bool showFilterGalleryLayerMaskDialog(bool defaultValue = false) const;
     void setShowFilterGalleryLayerMaskDialog(bool showFilterGallery) const;
 
     // OPENGL_SUCCESS, TRY_OPENGL, OPENGL_NOT_TRIED, OPENGL_FAILED
     QString canvasState(bool defaultValue = false) const;
     void setCanvasState(const QString& state) const;
 
     bool toolOptionsPopupDetached(bool defaultValue = false) const;
     void setToolOptionsPopupDetached(bool detached) const;
 
     bool paintopPopupDetached(bool defaultValue = false) const;
     void setPaintopPopupDetached(bool detached) const;
 
     QString pressureTabletCurve(bool defaultValue = false) const;
     void setPressureTabletCurve(const QString& curveString) const;
 
     qreal vastScrolling(bool defaultValue = false) const;
     void setVastScrolling(const qreal factor) const;
 
     int presetChooserViewMode(bool defaultValue = false) const;
     void setPresetChooserViewMode(const int mode) const;
 
     bool firstRun(bool defaultValue = false) const;
     void setFirstRun(const bool firstRun) const;
 
     bool clicklessSpacePan(bool defaultValue = false) const;
     void setClicklessSpacePan(const bool toggle) const;
 
     int horizontalSplitLines(bool defaultValue = false) const;
     void setHorizontalSplitLines(const int numberLines) const;
 
     int verticalSplitLines(bool defaultValue = false) const;
     void setVerticalSplitLines(const int numberLines) const;
 
     bool hideDockersFullscreen(bool defaultValue = false) const;
     void setHideDockersFullscreen(const bool value) const;
 
     bool showDockerTitleBars(bool defaultValue = false) const;
     void setShowDockerTitleBars(const bool value) const;
 
     bool showStatusBar(bool defaultValue = false) const;
     void setShowStatusBar(const bool value) const;
 
     bool hideMenuFullscreen(bool defaultValue = false) const;
     void setHideMenuFullscreen(const bool value) const;
 
     bool hideScrollbarsFullscreen(bool defaultValue = false) const;
     void setHideScrollbarsFullscreen(const bool value) const;
 
     bool hideStatusbarFullscreen(bool defaultValue = false) const;
     void setHideStatusbarFullscreen(const bool value) const;
 
     bool hideTitlebarFullscreen(bool defaultValue = false) const;
     void setHideTitlebarFullscreen(const bool value) const;
 
     bool hideToolbarFullscreen(bool defaultValue = false) const;
     void setHideToolbarFullscreen(const bool value) const;
 
     bool fullscreenMode(bool defaultValue = false) const;
     void setFullscreenMode(const bool value) const;
 
     QStringList favoriteCompositeOps(bool defaultValue = false) const;
     void setFavoriteCompositeOps(const QStringList& compositeOps) const;
 
     QString exportConfiguration(const QString &filterId, bool defaultValue = false) const;
     void setExportConfiguration(const QString &filterId, const KisPropertiesConfiguration &properties) const;
 
     bool useOcio(bool defaultValue = false) const;
     void setUseOcio(bool useOCIO) const;
 
     int favoritePresets(bool defaultValue = false) const;
     void setFavoritePresets(const int value);
 
     bool levelOfDetailEnabled(bool defaultValue = false) const;
     void setLevelOfDetailEnabled(bool value);
 
     enum OcioColorManagementMode {
         INTERNAL = 0,
         OCIO_CONFIG,
         OCIO_ENVIRONMENT
     };
 
     OcioColorManagementMode ocioColorManagementMode(bool defaultValue = false) const;
     void setOcioColorManagementMode(OcioColorManagementMode mode) const;
 
     QString ocioConfigurationPath(bool defaultValue = false) const;
     void setOcioConfigurationPath(const QString &path) const;
 
     QString ocioLutPath(bool defaultValue = false) const;
     void setOcioLutPath(const QString &path) const;
 
     int ocioLutEdgeSize(bool defaultValue = false) const;
     void setOcioLutEdgeSize(int value);
 
     bool ocioLockColorVisualRepresentation(bool defaultValue = false) const;
     void setOcioLockColorVisualRepresentation(bool value);
 
     bool useSystemMonitorProfile(bool defaultValue = false) const;
     void setUseSystemMonitorProfile(bool _useSystemMonitorProfile) const;
 
     QString defaultPalette(bool defaultValue = false) const;
     void setDefaultPalette(const QString& name) const;
 
     QString toolbarSlider(int sliderNumber, bool defaultValue = false) const;
     void setToolbarSlider(int sliderNumber, const QString &slider);
 
     bool sliderLabels(bool defaultValue = false) const;
     void setSliderLabels(bool enabled);
 
     QString currentInputProfile(bool defaultValue = false) const;
     void setCurrentInputProfile(const QString& name);
 
     bool presetStripVisible(bool defaultValue = false) const;
     void setPresetStripVisible(bool visible);
 
     bool scratchpadVisible(bool defaultValue = false) const;
     void setScratchpadVisible(bool visible);
 
     bool showSingleChannelAsColor(bool defaultValue = false) const;
     void setShowSingleChannelAsColor(bool asColor);
 
     bool hidePopups(bool defaultValue = false) const;
     void setHidePopups(bool hidepopups);
 
     int numDefaultLayers(bool defaultValue = false) const;
     void setNumDefaultLayers(int num);
 
     quint8 defaultBackgroundOpacity(bool defaultValue = false) const;
     void setDefaultBackgroundOpacity(quint8 value);
 
     QColor defaultBackgroundColor(bool defaultValue = false) const;
     void setDefaultBackgroundColor(QColor value);
 
     enum BackgroundStyle {
         LAYER = 0,
         PROJECTION = 1
     };
 
     BackgroundStyle defaultBackgroundStyle(bool defaultValue = false) const;
     void setDefaultBackgroundStyle(BackgroundStyle value);
 
     int lineSmoothingType(bool defaultValue = false) const;
     void setLineSmoothingType(int value);
 
     qreal lineSmoothingDistance(bool defaultValue = false) const;
     void setLineSmoothingDistance(qreal value);
 
     qreal lineSmoothingTailAggressiveness(bool defaultValue = false) const;
     void setLineSmoothingTailAggressiveness(qreal value);
 
     bool lineSmoothingSmoothPressure(bool defaultValue = false) const;
     void setLineSmoothingSmoothPressure(bool value);
 
     bool lineSmoothingScalableDistance(bool defaultValue = false) const;
     void setLineSmoothingScalableDistance(bool value);
 
     qreal lineSmoothingDelayDistance(bool defaultValue = false) const;
     void setLineSmoothingDelayDistance(qreal value);
 
     bool lineSmoothingUseDelayDistance(bool defaultValue = false) const;
     void setLineSmoothingUseDelayDistance(bool value);
 
     bool lineSmoothingFinishStabilizedCurve(bool defaultValue = false) const;
     void setLineSmoothingFinishStabilizedCurve(bool value);
 
     bool lineSmoothingStabilizeSensors(bool defaultValue = false) const;
     void setLineSmoothingStabilizeSensors(bool value);
 
     int paletteDockerPaletteViewSectionSize(bool defaultValue = false) const;
     void setPaletteDockerPaletteViewSectionSize(int value) const;
 
     int tabletEventsDelay(bool defaultValue = false) const;
     void setTabletEventsDelay(int value);
 
     bool testingAcceptCompressedTabletEvents(bool defaultValue = false) const;
     void setTestingAcceptCompressedTabletEvents(bool value);
 
     bool shouldEatDriverShortcuts(bool defaultValue = false) const;
 
     bool testingCompressBrushEvents(bool defaultValue = false) const;
     void setTestingCompressBrushEvents(bool value);
 
     const KoColorSpace* customColorSelectorColorSpace(bool defaultValue = false) const;
     void setCustomColorSelectorColorSpace(const KoColorSpace *cs);
 
     bool useDirtyPresets(bool defaultValue = false) const;
     void setUseDirtyPresets(bool value);
 
     bool useEraserBrushSize(bool defaultValue = false) const;
     void setUseEraserBrushSize(bool value);
 
     QColor getMDIBackgroundColor(bool defaultValue = false) const;
     void setMDIBackgroundColor(const QColor & v) const;
 
     QString getMDIBackgroundImage(bool defaultValue = false) const;
     void setMDIBackgroundImage(const QString & fileName) const;
 
     bool useVerboseOpenGLDebugOutput(bool defaultValue = false) const;
 
     int workaroundX11SmoothPressureSteps(bool defaultValue = false) const;
 
     bool showCanvasMessages(bool defaultValue = false) const;
     void setShowCanvasMessages(bool show);
 
     bool compressKra(bool defaultValue = false) const;
     void setCompressKra(bool compress);
 
     bool toolOptionsInDocker(bool defaultValue = false) const;
     void setToolOptionsInDocker(bool inDocker);
 
     void setEnableOpenGLDebugging(bool value) const;
     bool enableOpenGLDebugging(bool defaultValue = false) const;
 
     void setEnableAmdVectorizationWorkaround(bool value);
     bool enableAmdVectorizationWorkaround(bool defaultValue = false) const;
 
     bool animationDropFrames(bool defaultValue = false) const;
     void setAnimationDropFrames(bool value);
 
     int scribbingUpdatesDelay(bool defaultValue = false) const;
     void setScribbingUpdatesDelay(int value);
 
     bool switchSelectionCtrlAlt(bool defaultValue = false) const;
     void setSwitchSelectionCtrlAlt(bool value);
 
     bool convertToImageColorspaceOnImport(bool defaultValue = false) const;
     void setConvertToImageColorspaceOnImport(bool value);
 
     int stabilizerSampleSize(bool defaultValue = false) const;
     void setStabilizerSampleSize(int value);
 
     QString customFFMpegPath(bool defaultValue = false) const;
     void setCustomFFMpegPath(const QString &value) const;
 
+    bool showBrushHud(bool defaultValue = false) const;
+    void setShowBrushHud(bool value);
+
+    QString brushHudSetting(bool defaultValue = false) const;
+    void setBrushHudSetting(const QString &value) const;
+
     template<class T>
     void writeEntry(const QString& name, const T& value) {
         m_cfg.writeEntry(name, value);
     }
 
     template<class T>
     void writeList(const QString& name, const QList<T>& value) {
         m_cfg.writeEntry(name, value);
     }
 
     template<class T>
     T readEntry(const QString& name, const T& defaultValue=T()) {
         return m_cfg.readEntry(name, defaultValue);
     }
 
     template<class T>
     QList<T> readList(const QString& name, const QList<T>& defaultValue=QList<T>()) {
         return m_cfg.readEntry(name, defaultValue);
     }
 
 
     /// get the profile the color managment system has stored for the given screen
     static const KoColorProfile* getScreenProfile(int screen);
 
 private:
     KisConfig(const KisConfig&);
     KisConfig& operator=(const KisConfig&) const;
 
 
 private:
     mutable KConfigGroup m_cfg;
 };
 
 #endif // KIS_CONFIG_H_
diff --git a/libs/ui/kis_custom_pattern.cc b/libs/ui/kis_custom_pattern.cc
index a452a6aee6..2ff668991d 100644
--- a/libs/ui/kis_custom_pattern.cc
+++ b/libs/ui/kis_custom_pattern.cc
@@ -1,175 +1,175 @@
 /*
  *  Copyright (c) 2006 Bart Coppens <kde@bartcoppens.be>
  *
  *  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_custom_pattern.h"
 
 #include <KoResourceServerProvider.h>
 #include <resources/KoPattern.h>
 
 #include <QLabel>
 #include <QImage>
 #include <QPushButton>
 #include <QComboBox>
 #include <QPixmap>
 #include <QShowEvent>
 
 
 #include <QTemporaryFile>
 
 #include "KisDocument.h"
 #include "KisViewManager.h"
 #include "kis_image.h"
 #include "kis_layer.h"
 #include "kis_paint_device.h"
 
 #include <kis_debug.h>
 #include "kis_resource_server_provider.h"
 #include "kis_paint_layer.h"
 
 KisCustomPattern::KisCustomPattern(QWidget *parent, const char* name, const QString& caption, KisViewManager* view)
     : KisWdgCustomPattern(parent, name), m_view(view)
 {
     Q_ASSERT(m_view);
     setWindowTitle(caption);
 
     m_pattern = 0;
 
     preview->setScaledContents(true);
 
     KoResourceServer<KoPattern>* rServer = KoResourceServerProvider::instance()->patternServer(false);
     m_rServerAdapter = QSharedPointer<KoAbstractResourceServerAdapter>(new KoResourceServerAdapter<KoPattern>(rServer));
 
     connect(addButton, SIGNAL(pressed()), this, SLOT(slotAddPredefined()));
     connect(patternButton, SIGNAL(pressed()), this, SLOT(slotUsePattern()));
     connect(updateButton, SIGNAL(pressed()), this, SLOT(slotUpdateCurrentPattern()));
     connect(cmbSource, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateCurrentPattern()));
 }
 
 KisCustomPattern::~KisCustomPattern()
 {
     delete m_pattern;
 }
 
 void KisCustomPattern::slotUpdateCurrentPattern()
 {
     delete m_pattern;
     m_pattern = 0;
     if (m_view && m_view->image()) {
         createPattern();
         if (m_pattern) {
             const qint32 maxSize = 150;
             if ((m_pattern->width() > maxSize) || (m_pattern->height() > maxSize)) {
                 float aspectRatio = (float)m_pattern->width() / m_pattern->height();
                 qint32 scaledWidth, scaledHeight;
 
                 if (m_pattern->width() > m_pattern->height()) {
                     scaledWidth = maxSize;
                     scaledHeight = maxSize / aspectRatio;
                 } else {
                     scaledWidth = maxSize * aspectRatio;
                     scaledHeight = maxSize;
                 }
 
                 if (scaledWidth == 0) scaledWidth++;
                 if (scaledHeight == 0) scaledHeight++;
 
                 QPixmap scaledPixmap = QPixmap::fromImage(m_pattern->pattern());
                 preview->setPixmap(scaledPixmap.scaled(scaledWidth, scaledHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation));
             } else {
                 preview->setPixmap(QPixmap::fromImage(m_pattern->pattern()));
             }
         }
     }
 }
 
 void KisCustomPattern::slotAddPredefined()
 {
     if (!m_pattern)
         return;
 
     // Save in the directory that is likely to be: ~/.kde/share/apps/krita/patterns
     // a unique file with this pattern name
     QString dir = KoResourceServerProvider::instance()->patternServer()->saveLocation();
     QString extension;
 
     QString tempFileName;
     {
         QTemporaryFile file(dir +  QLatin1String("/krita_XXXXXX") + QLatin1String(".pat") );
         file.setAutoRemove(false);
         file.open();
         tempFileName = file.fileName();
     }
 
     // Save it to that file
     m_pattern->setFilename(tempFileName);
 
     // Add it to the pattern server, so that it automatically gets to the mediators, and
     // so to the other pattern choosers can pick it up, if they want to
     m_rServerAdapter->addResource(m_pattern->clone());
 }
 
 void KisCustomPattern::slotUsePattern()
 {
     if (!m_pattern)
         return;
     KoPattern* copy = m_pattern->clone();
 
     Q_CHECK_PTR(copy);
 
     emit(activatedResource(copy));
 }
 
 void KisCustomPattern::createPattern()
 {
     if (!m_view) return;
 
     KisPaintDeviceSP dev;
     QString name;
     KisImageWSP image = m_view->image();
     if (!image) return;
     QRect rc = image->bounds();
 
     if (cmbSource->currentIndex() == 0) {
         dev = m_view->activeNode()->projection();
         name = m_view->activeNode()->name();
         QRect rc2 = dev->exactBounds();
         rc = rc.intersected(rc2);
     }
     else {
         image->lock();
         dev = image->projection();
         image->unlock();
         name = image->objectName();
     }
     if (!dev) return;
     // warn when creating large patterns
 
     QSize size = rc.size();
     if (size.width() > 1000 || size.height() > 1000) {
         lblWarning->setText(i18n("The current image is too big to create a pattern. "
                                 "The pattern will be scaled down."));
         size.scale(1000, 1000, Qt::KeepAspectRatio);
     }
 
     QString dir = KoResourceServerProvider::instance()->patternServer()->saveLocation();
-    m_pattern = new KoPattern(dev->createThumbnail(size.width(), size.height(), rc,
+    m_pattern = new KoPattern(dev->createThumbnail(size.width(), size.height(), rc, /*oversample*/ 1,
                                                     KoColorConversionTransformation::internalRenderingIntent(),
                                                     KoColorConversionTransformation::internalConversionFlags()), name, dir);
 }
 
 
diff --git a/libs/ui/kis_derived_resources.cpp b/libs/ui/kis_derived_resources.cpp
index 147a6b1722..fa2be17958 100644
--- a/libs/ui/kis_derived_resources.cpp
+++ b/libs/ui/kis_derived_resources.cpp
@@ -1,153 +1,238 @@
 /*
  *  Copyright (c) 2016 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_derived_resources.h"
 
+#include "kis_signal_auto_connection.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_paintop_preset.h"
 #include "kis_paintop_settings.h"
+#include "kis_paintop_settings_update_proxy.h"
+
+struct KisPresetUpdateMediator::Private
+{
+    KisSignalAutoConnectionsStore connections;
+};
+
+KisPresetUpdateMediator::KisPresetUpdateMediator()
+    : KoResourceUpdateMediator(KisCanvasResourceProvider::CurrentPaintOpPreset),
+      m_d(new Private)
+{
+}
+
+KisPresetUpdateMediator::~KisPresetUpdateMediator()
+{
+}
+
+void KisPresetUpdateMediator::connectResource(QVariant sourceResource)
+{
+    KisPaintOpPresetSP preset = sourceResource.value<KisPaintOpPresetSP>();
+    if (!preset) return;
+
+    m_d->connections.clear();
+    m_d->connections.addUniqueConnection(
+        preset->updateProxy(),
+        SIGNAL(sigSettingsChanged()),
+        this,
+        SLOT(slotSettingsChanged()));
+}
+
+void KisPresetUpdateMediator::slotSettingsChanged()
+{
+    emit sigResourceChanged(key());
+}
 
 
 /*********************************************************************/
 /*          KisCompositeOpResourceConverter                          */
 /*********************************************************************/
 
 
 KisCompositeOpResourceConverter::KisCompositeOpResourceConverter()
     : KoDerivedResourceConverter(KisCanvasResourceProvider::CurrentCompositeOp,
                                  KisCanvasResourceProvider::CurrentPaintOpPreset)
 {
 }
 
 QVariant KisCompositeOpResourceConverter::fromSource(const QVariant &value)
 {
     KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
     return preset ? preset->settings()->paintOpCompositeOp() : QVariant();
 }
 
 QVariant KisCompositeOpResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
 {
     KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
     if (!preset) return sourceValue;
 
     preset->settings()->setPaintOpCompositeOp(value.toString());
     return QVariant::fromValue(preset);
 }
 
 /*********************************************************************/
 /*          KisEffectiveCompositeOpResourceConverter                 */
 /*********************************************************************/
 
 
 KisEffectiveCompositeOpResourceConverter::KisEffectiveCompositeOpResourceConverter()
     : KoDerivedResourceConverter(KisCanvasResourceProvider::CurrentEffectiveCompositeOp,
                                  KisCanvasResourceProvider::CurrentPaintOpPreset)
 {
 }
 
 QVariant KisEffectiveCompositeOpResourceConverter::fromSource(const QVariant &value)
 {
     KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
     return preset ? preset->settings()->effectivePaintOpCompositeOp() : QVariant();
 }
 
 QVariant KisEffectiveCompositeOpResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
 {
     Q_UNUSED(value);
 
     // WARNING: we don't save that!
     KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
     if (!preset) return sourceValue;
 
     return QVariant::fromValue(preset);
 }
 
 /*********************************************************************/
 /*          KisOpacityResourceConverter                              */
 /*********************************************************************/
 
 KisOpacityResourceConverter::KisOpacityResourceConverter()
     : KoDerivedResourceConverter(KisCanvasResourceProvider::Opacity,
                                  KisCanvasResourceProvider::CurrentPaintOpPreset)
 {
 }
 
 QVariant KisOpacityResourceConverter::fromSource(const QVariant &value)
 {
     KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
     return preset ? preset->settings()->paintOpOpacity() : QVariant();
 }
 
 QVariant KisOpacityResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
 {
     KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
     if (!preset) return sourceValue;
 
     preset->settings()->setPaintOpOpacity(value.toReal());
     return QVariant::fromValue(preset);
 }
 
+/*********************************************************************/
+/*          KisFlowResourceConverter                                 */
+/*********************************************************************/
+
+KisFlowResourceConverter::KisFlowResourceConverter()
+    : KoDerivedResourceConverter(KisCanvasResourceProvider::Flow,
+                                 KisCanvasResourceProvider::CurrentPaintOpPreset)
+{
+}
+
+QVariant KisFlowResourceConverter::fromSource(const QVariant &value)
+{
+    KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
+    return preset ? preset->settings()->paintOpFlow() : QVariant();
+}
+
+QVariant KisFlowResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
+{
+    KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
+    if (!preset) return sourceValue;
+
+    preset->settings()->setPaintOpFlow(value.toReal());
+    return QVariant::fromValue(preset);
+}
+
+/*********************************************************************/
+/*          KisSizeResourceConverter                                 */
+/*********************************************************************/
+
+KisSizeResourceConverter::KisSizeResourceConverter()
+    : KoDerivedResourceConverter(KisCanvasResourceProvider::Size,
+                                 KisCanvasResourceProvider::CurrentPaintOpPreset)
+{
+}
+
+QVariant KisSizeResourceConverter::fromSource(const QVariant &value)
+{
+    KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
+    return preset ? preset->settings()->paintOpSize() : QVariant();
+}
+
+QVariant KisSizeResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
+{
+    KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
+    if (!preset) return sourceValue;
+
+    preset->settings()->setPaintOpSize(value.toReal());
+    return QVariant::fromValue(preset);
+}
+
 /*********************************************************************/
 /*          KisLodAvailabilityResourceConverter                      */
 /*********************************************************************/
 
 KisLodAvailabilityResourceConverter::KisLodAvailabilityResourceConverter()
     : KoDerivedResourceConverter(KisCanvasResourceProvider::LodAvailability,
                                  KisCanvasResourceProvider::CurrentPaintOpPreset)
 {
 }
 
 QVariant KisLodAvailabilityResourceConverter::fromSource(const QVariant &value)
 {
     KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
     return preset ? KisPaintOpSettings::isLodUserAllowed(preset->settings()) : QVariant();
 }
 
 QVariant KisLodAvailabilityResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
 {
     KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
     if (!preset) return sourceValue;
 
     KisPaintOpSettings::setLodUserAllowed(preset->settings().data(), value.toBool());
     return QVariant::fromValue(preset);
 }
 
 /*********************************************************************/
 /*          KisEraserModeResourceConverter                           */
 /*********************************************************************/
 
 KisEraserModeResourceConverter::KisEraserModeResourceConverter()
     : KoDerivedResourceConverter(KisCanvasResourceProvider::EraserMode,
                                  KisCanvasResourceProvider::CurrentPaintOpPreset)
 {
 }
 
 QVariant KisEraserModeResourceConverter::fromSource(const QVariant &value)
 {
     KisPaintOpPresetSP preset = value.value<KisPaintOpPresetSP>();
     return preset ? preset->settings()->eraserMode() : QVariant();
 }
 
 QVariant KisEraserModeResourceConverter::toSource(const QVariant &value, const QVariant &sourceValue)
 {
     KisPaintOpPresetSP preset = sourceValue.value<KisPaintOpPresetSP>();
     if (!preset) return sourceValue;
 
     preset->settings()->setEraserMode(value.toBool());
     return QVariant::fromValue(preset);
 }
diff --git a/libs/ui/kis_derived_resources.h b/libs/ui/kis_derived_resources.h
index 6e905b5ae9..d5e775f4de 100644
--- a/libs/ui/kis_derived_resources.h
+++ b/libs/ui/kis_derived_resources.h
@@ -1,72 +1,107 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
 #ifndef __KIS_DERIVED_RESOURCES_H
 #define __KIS_DERIVED_RESOURCES_H
 
 #include "KoDerivedResourceConverter.h"
+#include "KoResourceUpdateMediator.h"
+#include <QScopedPointer>
 
+class KisPresetUpdateMediator : public KoResourceUpdateMediator
+{
+    Q_OBJECT
+public:
+    KisPresetUpdateMediator();
+    ~KisPresetUpdateMediator();
+    void connectResource(QVariant sourceResource);
+
+private Q_SLOTS:
+    void slotSettingsChanged();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+};
 
 class KisCompositeOpResourceConverter : public KoDerivedResourceConverter
 {
 public:
     KisCompositeOpResourceConverter();
 
     QVariant fromSource(const QVariant &value);
     QVariant toSource(const QVariant &value, const QVariant &sourceValue);
 };
 
 class KisEffectiveCompositeOpResourceConverter : public KoDerivedResourceConverter
 {
 public:
     KisEffectiveCompositeOpResourceConverter();
 
     QVariant fromSource(const QVariant &value);
     QVariant toSource(const QVariant &value, const QVariant &sourceValue);
 };
 
-class KisOpacityResourceConverter : public KoDerivedResourceConverter
+class KisOpacityResourceConverter : public KoDerivedResourceConverter, public QObject
 {
 public:
     KisOpacityResourceConverter();
 
     QVariant fromSource(const QVariant &value);
     QVariant toSource(const QVariant &value, const QVariant &sourceValue);
 };
 
+class KisFlowResourceConverter : public KoDerivedResourceConverter, public QObject
+{
+public:
+    KisFlowResourceConverter();
+
+    QVariant fromSource(const QVariant &value);
+    QVariant toSource(const QVariant &value, const QVariant &sourceValue);
+};
+
+class KisSizeResourceConverter : public KoDerivedResourceConverter, public QObject
+{
+public:
+    KisSizeResourceConverter();
+
+    QVariant fromSource(const QVariant &value);
+    QVariant toSource(const QVariant &value, const QVariant &sourceValue);
+};
+
 class KisLodAvailabilityResourceConverter : public KoDerivedResourceConverter
 {
 public:
     KisLodAvailabilityResourceConverter();
 
     QVariant fromSource(const QVariant &value);
     QVariant toSource(const QVariant &value, const QVariant &sourceValue);
 };
 
 class KisEraserModeResourceConverter : public KoDerivedResourceConverter
 {
 public:
     KisEraserModeResourceConverter();
 
     QVariant fromSource(const QVariant &value);
     QVariant toSource(const QVariant &value, const QVariant &sourceValue);
 };
 
 
 
 #endif /* __KIS_DERIVED_RESOURCES_H */
diff --git a/libs/ui/kis_layer_manager.cc b/libs/ui/kis_layer_manager.cc
index f2a6a48804..5eef42ee08 100644
--- a/libs/ui/kis_layer_manager.cc
+++ b/libs/ui/kis_layer_manager.cc
@@ -1,815 +1,815 @@
 /*
  *  Copyright (C) 2006 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_layer_manager.h"
 
 #include <QRect>
 #include <QApplication>
 #include <QCursor>
 #include <QString>
 #include <QDialog>
 #include <QVBoxLayout>
 #include <QFileInfo>
 #include <QDesktopServices>
 
 #include <kactioncollection.h>
 #include <klocalizedstring.h>
 #include <QMessageBox>
 #include <QUrl>
 
 #include <kis_file_name_requester.h>
 #include <kis_icon.h>
 #include <KisImportExportManager.h>
 #include <KisDocument.h>
 #include <KoColorSpace.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoPointerEvent.h>
 #include <KoColorProfile.h>
 #include <KoSelection.h>
 #include <KisPart.h>
 #include <KisMainWindow.h>
 
 #include <filter/kis_filter_configuration.h>
 #include <filter/kis_filter.h>
 #include <kis_filter_strategy.h>
 #include <generator/kis_generator_layer.h>
 #include <kis_file_layer.h>
 #include <kis_adjustment_layer.h>
 #include <kis_mask.h>
 #include <kis_clone_layer.h>
 #include <kis_group_layer.h>
 #include <kis_image.h>
 #include <kis_layer.h>
 #include <kis_paint_device.h>
 #include <kis_selection.h>
 #include <flake/kis_shape_layer.h>
 #include <kis_undo_adapter.h>
 #include <kis_painter.h>
 #include <metadata/kis_meta_data_store.h>
 #include <metadata/kis_meta_data_merge_strategy_registry.h>
 #include <kis_psd_layer_style.h>
 #include <KisMimeDatabase.h>
 
 #include "KisImportExportManager.h"
 #include "kis_config.h"
 #include "kis_cursor.h"
 #include "dialogs/kis_dlg_adj_layer_props.h"
 #include "dialogs/kis_dlg_adjustment_layer.h"
 #include "dialogs/kis_dlg_layer_properties.h"
 #include "dialogs/kis_dlg_generator_layer.h"
 #include "dialogs/kis_dlg_file_layer.h"
 #include "dialogs/kis_dlg_layer_style.h"
 #include "KisDocument.h"
 #include "kis_filter_manager.h"
 #include "kis_node_visitor.h"
 #include "kis_paint_layer.h"
 #include "commands/kis_image_commands.h"
 #include "commands/kis_layer_command.h"
 #include "commands/kis_node_commands.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_selection_manager.h"
 #include "kis_statusbar.h"
 #include "KisViewManager.h"
 #include "kis_zoom_manager.h"
 #include "canvas/kis_canvas2.h"
 #include "widgets/kis_meta_data_merge_strategy_chooser_widget.h"
 #include "widgets/kis_wdg_generator.h"
 #include "kis_progress_widget.h"
 #include "kis_node_commands_adapter.h"
 #include "kis_node_manager.h"
 #include "kis_action.h"
 #include "kis_action_manager.h"
 #include "KisPart.h"
 #include "kis_raster_keyframe_channel.h"
 
 #include "kis_signal_compressor_with_param.h"
 #include "kis_abstract_projection_plane.h"
 #include "commands_new/kis_set_layer_style_command.h"
 #include "kis_post_execution_undo_adapter.h"
 #include "kis_selection_mask.h"
 #include "kis_layer_utils.h"
 
 #include "KisSaveGroupVisitor.h"
 
 KisLayerManager::KisLayerManager(KisViewManager * view)
     : m_view(view)
     , m_imageView(0)
     , m_imageFlatten(0)
     , m_imageMergeLayer(0)
     , m_groupLayersSave(0)
     , m_imageResizeToLayer(0)
     , m_flattenLayer(0)
     , m_rasterizeLayer(0)
     , m_commandsAdapter(new KisNodeCommandsAdapter(m_view))
     , m_layerStyle(0)
 {
 }
 
 KisLayerManager::~KisLayerManager()
 {
     delete m_commandsAdapter;
 }
 
 void KisLayerManager::setView(QPointer<KisView>view)
 {
     m_imageView = view;
 }
 
 KisLayerSP KisLayerManager::activeLayer()
 {
     if (m_imageView) {
         return m_imageView->currentLayer();
     }
     return 0;
 }
 
 KisPaintDeviceSP KisLayerManager::activeDevice()
 {
     if (activeLayer()) {
         return activeLayer()->paintDevice();
     }
     return 0;
 }
 
 void KisLayerManager::activateLayer(KisLayerSP layer)
 {
     if (m_imageView) {
         emit sigLayerActivated(layer);
         layersUpdated();
         if (layer) {
             m_view->resourceProvider()->slotNodeActivated(layer.data());
         }
     }
 }
 
 
 void KisLayerManager::setup(KisActionManager* actionManager)
 {
     m_imageFlatten = actionManager->createAction("flatten_image");
     connect(m_imageFlatten, SIGNAL(triggered()), this, SLOT(flattenImage()));
 
     m_imageMergeLayer = actionManager->createAction("merge_layer");
     connect(m_imageMergeLayer, SIGNAL(triggered()), this, SLOT(mergeLayer()));
 
     m_flattenLayer = actionManager->createAction("flatten_layer");
     connect(m_flattenLayer, SIGNAL(triggered()), this, SLOT(flattenLayer()));
 
     m_rasterizeLayer = actionManager->createAction("rasterize_layer");
     connect(m_rasterizeLayer, SIGNAL(triggered()), this, SLOT(rasterizeLayer()));
 
     m_groupLayersSave = actionManager->createAction("save_groups_as_images");
     connect(m_groupLayersSave, SIGNAL(triggered()), this, SLOT(saveGroupLayers()));
 
     m_convertGroupAnimated = actionManager->createAction("convert_group_to_animated");
     connect(m_convertGroupAnimated, SIGNAL(triggered()), this, SLOT(convertGroupToAnimated()));
 
     m_imageResizeToLayer = actionManager->createAction("resizeimagetolayer");
     connect(m_imageResizeToLayer, SIGNAL(triggered()), this, SLOT(imageResizeToActiveLayer()));
 
     KisAction *action = actionManager->createAction("trim_to_image");
     connect(action, SIGNAL(triggered()), this, SLOT(trimToImage()));
 
     m_layerStyle  = actionManager->createAction("layer_style");
     connect(m_layerStyle, SIGNAL(triggered()), this, SLOT(layerStyle()));
 
 }
 
 void KisLayerManager::updateGUI()
 {
     KisImageWSP image = m_view->image();
 
     KisLayerSP layer;
     qint32 nlayers = 0;
 
     if (image) {
         layer = activeLayer();
         nlayers = image->nlayers();
     }
 
     // XXX these should be named layer instead of image
     m_imageFlatten->setEnabled(nlayers > 1);
     m_imageMergeLayer->setEnabled(nlayers > 1 && layer && layer->prevSibling());
     m_flattenLayer->setEnabled(nlayers > 1 && layer && layer->firstChild());
 
     if (m_view->statusBar())
         m_view->statusBar()->setProfile(image);
 }
 
 void KisLayerManager::imageResizeToActiveLayer()
 {
     KisLayerSP layer;
     KisImageWSP image = m_view->image();
 
     if (image && (layer = activeLayer())) {
         QRect cropRect = layer->projection()->nonDefaultPixelArea();
         if (!cropRect.isEmpty()) {
             image->cropImage(cropRect);
         } else {
             m_view->showFloatingMessage(
                 i18nc("floating message in layer manager",
                       "Layer is empty "),
                 QIcon(), 2000, KisFloatingMessage::Low);
         }
     }
 }
 
 void KisLayerManager::trimToImage()
 {
     KisImageWSP image = m_view->image();
     if (image) {
         image->cropImage(image->bounds());
     }
 }
 
 void KisLayerManager::layerProperties()
 {
     if (!m_view) return;
     if (!m_view->document()) return;
 
     KisLayerSP layer = activeLayer();
     QList<KisNodeSP> selectedNodes = m_view->nodeManager()->selectedNodes();
     const bool multipleLayersSelected = selectedNodes.size() > 1;
 
     if (!layer) return;
 
     KisAdjustmentLayerSP alayer = KisAdjustmentLayerSP(dynamic_cast<KisAdjustmentLayer*>(layer.data()));
     KisGeneratorLayerSP glayer = KisGeneratorLayerSP(dynamic_cast<KisGeneratorLayer*>(layer.data()));
 
     if (alayer && !multipleLayersSelected) {
 
         KisPaintDeviceSP dev = alayer->projection();
 
         KisDlgAdjLayerProps dlg(alayer, alayer.data(), dev, m_view, alayer->filter().data(), alayer->name(), i18n("Filter Layer Properties"), m_view->mainWindow(), "dlgadjlayerprops");
         dlg.resize(dlg.minimumSizeHint());
 
 
         KisSafeFilterConfigurationSP configBefore(alayer->filter());
         KIS_ASSERT_RECOVER_RETURN(configBefore);
         QString xmlBefore = configBefore->toXML();
 
 
         if (dlg.exec() == QDialog::Accepted) {
 
             alayer->setName(dlg.layerName());
 
             KisSafeFilterConfigurationSP configAfter(dlg.filterConfiguration());
             Q_ASSERT(configAfter);
             QString xmlAfter = configAfter->toXML();
 
             if(xmlBefore != xmlAfter) {
                 KisChangeFilterCmd *cmd
                    = new KisChangeFilterCmd(alayer,
                                              configBefore->name(),
                                              xmlBefore,
                                              configAfter->name(),
                                              xmlAfter,
                                              false);
                 // FIXME: check whether is needed
                 cmd->redo();
                 m_view->undoAdapter()->addCommand(cmd);
                 m_view->document()->setModified(true);
             }
         }
         else {
             KisSafeFilterConfigurationSP configAfter(dlg.filterConfiguration());
             Q_ASSERT(configAfter);
             QString xmlAfter = configAfter->toXML();
 
             if(xmlBefore != xmlAfter) {
                 alayer->setFilter(KisFilterRegistry::instance()->cloneConfiguration(configBefore.data()));
                 alayer->setDirty();
             }
         }
     }
     else if (glayer && !multipleLayersSelected) {
 
         KisDlgGeneratorLayer dlg(glayer->name(), m_view, m_view->mainWindow());
         dlg.setCaption(i18n("Fill Layer Properties"));
 
         KisSafeFilterConfigurationSP configBefore(glayer->filter());
         Q_ASSERT(configBefore);
         QString xmlBefore = configBefore->toXML();
 
         dlg.setConfiguration(configBefore.data());
         dlg.resize(dlg.minimumSizeHint());
 
         if (dlg.exec() == QDialog::Accepted) {
 
             glayer->setName(dlg.layerName());
 
             KisSafeFilterConfigurationSP configAfter(dlg.configuration());
             Q_ASSERT(configAfter);
             QString xmlAfter = configAfter->toXML();
 
             if(xmlBefore != xmlAfter) {
                 KisChangeFilterCmd *cmd
                         = new KisChangeFilterCmd(glayer,
                                                  configBefore->name(),
                                                  xmlBefore,
                                                  configAfter->name(),
                                                  xmlAfter,
                                                  true);
                 // FIXME: check whether is needed
                 cmd->redo();
                 m_view->undoAdapter()->addCommand(cmd);
                 m_view->document()->setModified(true);
             }
 
         }
     } else { // If layer == normal painting layer, vector layer, or group layer
         QList<KisNodeSP> selectedNodes = m_view->nodeManager()->selectedNodes();
 
         KisDlgLayerProperties *dialog = new KisDlgLayerProperties(selectedNodes, m_view);
         dialog->resize(dialog->minimumSizeHint());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         Qt::WindowFlags flags = dialog->windowFlags();
         dialog->setWindowFlags(flags | Qt::WindowStaysOnTopHint | Qt::Dialog);
         dialog->show();
 
     }
 }
 
 void KisLayerManager::convertNodeToPaintLayer(KisNodeSP source)
 {
     KisImageWSP image = m_view->image();
     if (!image) return;
 
 
-    KisLayer *srcLayer = dynamic_cast<KisLayer*>(source.data());
+    KisGroupLayer *srcLayer = dynamic_cast<KisGroupLayer*>(source.data());
     if (srcLayer) {
         image->flattenLayer(srcLayer);
         return;
     }
 
 
     KisPaintDeviceSP srcDevice =
         source->paintDevice() ? source->projection() : source->original();
 
     if (!srcDevice) return;
 
     KisPaintDeviceSP clone;
 
     if (!(*srcDevice->colorSpace() ==
           *srcDevice->compositionSourceColorSpace())) {
 
         clone = new KisPaintDevice(srcDevice->compositionSourceColorSpace());
 
         QRect rc(srcDevice->extent());
         KisPainter::copyAreaOptimized(rc.topLeft(), srcDevice, clone, rc);
 
     } else {
         clone = new KisPaintDevice(*srcDevice);
     }
 
     KisLayerSP layer = new KisPaintLayer(image,
                                          source->name(),
                                          source->opacity(),
                                          clone);
     layer->setCompositeOpId(source->compositeOpId());
 
     KisNodeSP parent = source->parent();
     KisNodeSP above = source;
 
     while (parent && !parent->allowAsChild(layer)) {
         above = above->parent();
         parent = above ? above->parent() : 0;
     }
 
     m_commandsAdapter->beginMacro(kundo2_i18n("Convert to a Paint Layer"));
     m_commandsAdapter->addNode(layer, parent, above);
     m_commandsAdapter->removeNode(source);
     m_commandsAdapter->endMacro();
 
 }
 
 void KisLayerManager::convertGroupToAnimated()
 {
     KisGroupLayerSP group = dynamic_cast<KisGroupLayer*>(activeLayer().data());
     if (group.isNull()) return;
 
     KisPaintLayerSP animatedLayer = new KisPaintLayer(m_view->image(), group->name(), OPACITY_OPAQUE_U8);
     animatedLayer->enableAnimation();
     KisRasterKeyframeChannel *contentChannel = dynamic_cast<KisRasterKeyframeChannel*>(
             animatedLayer->getKeyframeChannel(KisKeyframeChannel::Content.id()));
     KIS_ASSERT_RECOVER_RETURN(contentChannel);
 
     KisNodeSP child = group->firstChild();
     int time = 0;
     while (child) {
         contentChannel->importFrame(time, child->projection(), NULL);
         time++;
 
         child = child->nextSibling();
     }
 
     m_commandsAdapter->beginMacro(kundo2_i18n("Convert to an animated layer"));
     m_commandsAdapter->addNode(animatedLayer, group->parent(), group);
     m_commandsAdapter->removeNode(group);
     m_commandsAdapter->endMacro();
 }
 
 void KisLayerManager::adjustLayerPosition(KisNodeSP node, KisNodeSP activeNode, KisNodeSP &parent, KisNodeSP &above)
 {
     Q_ASSERT(activeNode);
 
     parent = activeNode;
     above = parent->lastChild();
 
     while (parent &&
            (!parent->allowAsChild(node) || parent->userLocked())) {
 
         above = parent;
         parent = parent->parent();
     }
 
     if (!parent) {
         warnKrita << "KisLayerManager::adjustLayerPosition:"
                    << "No node accepted newly created node";
 
         parent = m_view->image()->root();
         above = parent->lastChild();
     }
 }
 
 void KisLayerManager::addLayerCommon(KisNodeSP activeNode, KisLayerSP layer, bool updateImage)
 {
     KisNodeSP parent;
     KisNodeSP above;
     adjustLayerPosition(layer, activeNode, parent, above);
 
 
     KisGroupLayer *group = dynamic_cast<KisGroupLayer*>(parent.data());
     const bool parentForceUpdate = group && !group->projectionIsValid();
     updateImage |= parentForceUpdate;
 
     m_commandsAdapter->addNode(layer, parent, above, updateImage, updateImage);
 }
 
 KisLayerSP KisLayerManager::addLayer(KisNodeSP activeNode)
 {
     KisLayerSP layer = KisLayerUtils::constructDefaultLayer(m_view->image());
     addLayerCommon(activeNode, layer, false);
 
     return layer;
 }
 
 void KisLayerManager::addGroupLayer(KisNodeSP activeNode)
 {
     KisImageWSP image = m_view->image();
     addLayerCommon(activeNode,
                    new KisGroupLayer(image.data(), image->nextLayerName(), OPACITY_OPAQUE_U8), false);
 }
 
 void KisLayerManager::addCloneLayer(KisNodeSP activeNode)
 {
     KisImageWSP image = m_view->image();
     addLayerCommon(activeNode,
                    new KisCloneLayer(activeLayer(), image.data(), image->nextLayerName(), OPACITY_OPAQUE_U8));
 }
 
 void KisLayerManager::addShapeLayer(KisNodeSP activeNode)
 {
     if (!m_view) return;
     if (!m_view->document()) return;
 
     KisImageWSP image = m_view->image();
     KisShapeLayerSP layer = new KisShapeLayer(m_view->document()->shapeController(), image.data(), image->nextLayerName(), OPACITY_OPAQUE_U8);
 
     addLayerCommon(activeNode, layer, false);
 }
 
 void KisLayerManager::addAdjustmentLayer(KisNodeSP activeNode)
 {
     KisImageWSP image = m_view->image();
 
     KisSelectionSP selection = m_view->selection();
     KisAdjustmentLayerSP adjl = addAdjustmentLayer(activeNode, QString(), 0, selection);
     image->refreshGraph();
 
     KisPaintDeviceSP previewDevice = new KisPaintDevice(*adjl->original());
 
     KisDlgAdjustmentLayer dlg(adjl, adjl.data(), previewDevice, image->nextLayerName(), i18n("New Filter Layer"), m_view);
     dlg.resize(dlg.minimumSizeHint());
 
     // ensure that the device may be free'd by the dialog
     // when it is not needed anymore
     previewDevice = 0;
 
     if (dlg.exec() != QDialog::Accepted || adjl->filter().isNull()) {
         // XXX: add messagebox warning if there's no filter set!
         m_commandsAdapter->undoLastCommand();
     } else {
         adjl->setName(dlg.layerName());
     }
 
 }
 
 KisAdjustmentLayerSP KisLayerManager::addAdjustmentLayer(KisNodeSP activeNode, const QString & name,
                                                          KisFilterConfiguration * filter, KisSelectionSP selection)
 {
     KisImageWSP image = m_view->image();
     KisAdjustmentLayerSP layer = new KisAdjustmentLayer(image, name, filter, selection);
     addLayerCommon(activeNode, layer);
 
     return layer;
 }
 
 void KisLayerManager::addGeneratorLayer(KisNodeSP activeNode)
 {
     KisImageWSP image = m_view->image();
 
     KisDlgGeneratorLayer dlg(image->nextLayerName(), m_view, m_view->mainWindow());
     dlg.resize(dlg.minimumSizeHint());
 
     if (dlg.exec() == QDialog::Accepted) {
         KisSelectionSP selection = m_view->selection();
         KisFilterConfiguration * generator = dlg.configuration();
         QString name = dlg.layerName();
 
         addLayerCommon(activeNode,
             new KisGeneratorLayer(image, name, generator, selection));
     }
 
 }
 
 void KisLayerManager::rotateLayer(double radians)
 {
     if (!m_view->image()) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     m_view->image()->rotateNode(layer, radians);
 }
 
 void KisLayerManager::shearLayer(double angleX, double angleY)
 {
     if (!m_view->image()) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     m_view->image()->shearNode(layer, angleX, angleY);
 }
 
 void KisLayerManager::flattenImage()
 {
     KisImageWSP image = m_view->image();
 
     if (image) {
         bool doIt = true;
 
         if (image->nHiddenLayers() > 0) {
             int answer = QMessageBox::warning(m_view->mainWindow(),
                                               i18nc("@title:window", "Flatten Image"),
                                               i18n("The image contains hidden layers that will be lost. Do you want to flatten the image?"),
                                               QMessageBox::Yes | QMessageBox::No,
                                               QMessageBox::No);
 
             if (answer != QMessageBox::Yes) {
                 doIt = false;
             }
         }
 
         if (doIt) {
             image->flatten();
         }
     }
 }
 
 inline bool isSelectionMask(KisNodeSP node) {
     return dynamic_cast<KisSelectionMask*>(node.data());
 }
 
 bool tryMergeSelectionMasks(KisNodeSP currentNode, KisImageSP image)
 {
     bool result = false;
 
     KisNodeSP prevNode = currentNode->prevSibling();
     if (isSelectionMask(currentNode) &&
         prevNode && isSelectionMask(prevNode)) {
 
         QList<KisNodeSP> mergedNodes;
         mergedNodes.append(currentNode);
         mergedNodes.append(prevNode);
 
         image->mergeMultipleLayers(mergedNodes, currentNode);
 
         result = true;
     }
 
     return result;
 }
 
 void KisLayerManager::mergeLayer()
 {
     KisImageWSP image = m_view->image();
     if (!image) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     QList<KisNodeSP> selectedNodes = m_view->nodeManager()->selectedNodes();
     if (selectedNodes.size() > 1) {
         image->mergeMultipleLayers(selectedNodes, m_view->activeNode());
 
     } else if (!tryMergeSelectionMasks(m_view->activeNode(), image)) {
 
         if (!layer->prevSibling()) return;
         KisLayer *prevLayer = dynamic_cast<KisLayer*>(layer->prevSibling().data());
         if (!prevLayer) return;
 
         if (layer->metaData()->isEmpty() && prevLayer->metaData()->isEmpty()) {
             image->mergeDown(layer, KisMetaData::MergeStrategyRegistry::instance()->get("Drop"));
         }
         else {
             const KisMetaData::MergeStrategy* strategy = KisMetaDataMergeStrategyChooserWidget::showDialog(m_view->mainWindow());
             if (!strategy) return;
             image->mergeDown(layer, strategy);
         }
     }
 
     m_view->updateGUI();
 }
 
 void KisLayerManager::flattenLayer()
 {
     KisImageWSP image = m_view->image();
     if (!image) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     image->flattenLayer(layer);
     m_view->updateGUI();
 }
 
 void KisLayerManager::rasterizeLayer()
 {
     KisImageWSP image = m_view->image();
     if (!image) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     KisPaintLayerSP paintLayer = new KisPaintLayer(image, layer->name(), layer->opacity());
     KisPainter gc(paintLayer->paintDevice());
     QRect rc = layer->projection()->exactBounds();
     gc.bitBlt(rc.topLeft(), layer->projection(), rc);
 
     m_commandsAdapter->beginMacro(kundo2_i18n("Rasterize Layer"));
     m_commandsAdapter->addNode(paintLayer.data(), layer->parent().data(), layer.data());
 
     int childCount = layer->childCount();
     for (int i = 0; i < childCount; i++) {
         m_commandsAdapter->moveNode(layer->firstChild(), paintLayer, paintLayer->lastChild());
     }
     m_commandsAdapter->removeNode(layer);
     m_commandsAdapter->endMacro();
     updateGUI();
 }
 
 
 void KisLayerManager::layersUpdated()
 {
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     m_view->updateGUI();
 }
 
 void KisLayerManager::saveGroupLayers()
 {
     QStringList listMimeFilter = KisImportExportManager::mimeFilter(KisImportExportManager::Export);
 
     KoDialog dlg;
     QWidget *page = new QWidget(&dlg);
     dlg.setMainWidget(page);
     QBoxLayout *layout = new QVBoxLayout(page);
 
     KisFileNameRequester *urlRequester = new KisFileNameRequester(page);
     urlRequester->setMode(KoFileDialog::SaveFile);
     if (m_view->document()->url().isLocalFile()) {
         urlRequester->setStartDir(QFileInfo(m_view->document()->url().toLocalFile()).absolutePath());
     }
     urlRequester->setMimeTypeFilters(listMimeFilter);
     urlRequester->setFileName(m_view->document()->url().toLocalFile());
     layout->addWidget(urlRequester);
 
     QCheckBox *chkInvisible = new QCheckBox(i18n("Convert Invisible Groups"), page);
     chkInvisible->setChecked(false);
     layout->addWidget(chkInvisible);
     QCheckBox *chkDepth = new QCheckBox(i18n("Export Only Toplevel Groups"), page);
     chkDepth->setChecked(true);
     layout->addWidget(chkDepth);
 
     if (!dlg.exec()) return;
 
     QString path = urlRequester->fileName();
 
     if (path.isEmpty()) return;
 
     QFileInfo f(path);
 
     QString mimeType= KisMimeDatabase::mimeTypeForFile(f.fileName());
     if (mimeType.isEmpty()) {
         mimeType = "image/png";
     }
     QString extension = KisMimeDatabase::suffixesForMimeType(mimeType).first();
     QString basename = f.baseName();
 
     KisImageWSP image = m_view->image();
     if (!image) return;
 
     KisSaveGroupVisitor v(image, chkInvisible->isChecked(), chkDepth->isChecked(), f.absolutePath(), basename, extension, mimeType);
     image->rootLayer()->accept(v);
 
 }
 
 bool KisLayerManager::activeLayerHasSelection()
 {
     return (activeLayer()->selection() != 0);
 }
 
 void KisLayerManager::addFileLayer(KisNodeSP activeNode)
 {
 
     QString basePath;
     QUrl url = m_view->document()->url();
     if (url.isLocalFile()) {
         basePath = QFileInfo(url.toLocalFile()).absolutePath();
     }
     KisImageWSP image = m_view->image();
 
     KisDlgFileLayer dlg(basePath, image->nextLayerName(), m_view->mainWindow());
     dlg.resize(dlg.minimumSizeHint());
 
     if (dlg.exec() == QDialog::Accepted) {
         QString name = dlg.layerName();
         QString fileName = dlg.fileName();
 
         if(fileName.isEmpty()){
             QMessageBox::critical(m_view->mainWindow(), i18nc("@title:window", "Krita"), i18n("No file name specified"));
             return;
         }
 
         KisFileLayer::ScalingMethod scalingMethod = dlg.scaleToImageResolution();
 
         addLayerCommon(activeNode,
                        new KisFileLayer(image, basePath, fileName, scalingMethod, name, OPACITY_OPAQUE_U8));
     }
 
 }
 
 void updateLayerStyles(KisLayerSP layer, KisDlgLayerStyle *dlg)
 {
     KisSetLayerStyleCommand::updateLayerStyle(layer, dlg->style()->clone());
 }
 
 void KisLayerManager::layerStyle()
 {
     KisImageWSP image = m_view->image();
     if (!image) return;
 
     KisLayerSP layer = activeLayer();
     if (!layer) return;
 
     KisPSDLayerStyleSP oldStyle;
     if (layer->layerStyle()) {
         oldStyle = layer->layerStyle()->clone();
     }
     else {
         oldStyle = toQShared(new KisPSDLayerStyle());
     }
 
     KisDlgLayerStyle dlg(oldStyle->clone(), m_view->resourceProvider());
 
     std::function<void ()> updateCall(std::bind(updateLayerStyles, layer, &dlg));
     SignalToFunctionProxy proxy(updateCall);
     connect(&dlg, SIGNAL(configChanged()), &proxy, SLOT(start()));
 
     if (dlg.exec() == QDialog::Accepted) {
         KisPSDLayerStyleSP newStyle = dlg.style();
 
         KUndo2CommandSP command = toQShared(
             new KisSetLayerStyleCommand(layer, oldStyle, newStyle));
 
         image->postExecutionUndoAdapter()->addCommand(command);
     }
 }
 
diff --git a/libs/ui/kis_paintop_box.cc b/libs/ui/kis_paintop_box.cc
index 5f2ec22f1a..05f3f174f1 100644
--- a/libs/ui/kis_paintop_box.cc
+++ b/libs/ui/kis_paintop_box.cc
@@ -1,1206 +1,1197 @@
 /*
  *  kis_paintop_box.cc - part of KImageShop/Krayon/Krita
  *
  *  Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *  Copyright (c) 2009-2011 Sven Langkamp (sven.langkamp@gmail.com)
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
  *  Copyright (C) 2011 Silvio Heinrich <plassy@web.de>
  *  Copyright (C) 2011 Srikanth Tiyyagura <srikanth.tulasiram@gmail.com>
  *  Copyright (c) 2014 Mohit Goyal <mohit.bits2011@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_paintop_box.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QToolButton>
 #include <QPixmap>
 #include <QWidgetAction>
 #include <QApplication>
 #include <QMenu>
 
 #include <kis_debug.h>
 
 #include <kactioncollection.h>
 #include <kacceleratormanager.h>
 #include <QKeySequence>
 
 
 #include <kis_icon.h>
 #include <KoColorSpace.h>
 #include <KoCompositeOpRegistry.h>
 #include <KoResourceSelector.h>
 #include <KoResourceServerAdapter.h>
 #include <KoToolManager.h>
 #include <QTemporaryFile>
 #include <KoColorSpaceRegistry.h>
 
 #include <kis_paint_device.h>
 #include <brushengine/kis_paintop_registry.h>
 #include <brushengine/kis_paintop_preset.h>
 #include <brushengine/kis_paintop_settings.h>
+#include <brushengine/kis_paintop_settings_update_proxy.h>
 #include <kis_config_widget.h>
 #include <kis_image.h>
 #include <kis_node.h>
 #include <brushengine/kis_paintop_config_widget.h>
 #include <kis_action.h>
 
 #include "kis_canvas2.h"
 #include "kis_node_manager.h"
 #include "KisViewManager.h"
 #include "kis_canvas_resource_provider.h"
 #include "kis_resource_server_provider.h"
 #include "kis_favorite_resource_manager.h"
 #include "kis_config.h"
 
 #include "widgets/kis_popup_button.h"
 #include "widgets/kis_tool_options_popup.h"
 #include "widgets/kis_paintop_presets_popup.h"
 #include "widgets/kis_tool_options_popup.h"
 #include "widgets/kis_paintop_presets_chooser_popup.h"
 #include "widgets/kis_workspace_chooser.h"
 #include "widgets/kis_paintop_list_widget.h"
 #include "widgets/kis_slider_spin_box.h"
 #include "widgets/kis_cmb_composite.h"
 #include "widgets/kis_widget_chooser.h"
 #include "tool/kis_tool.h"
 #include "kis_signals_blocker.h"
 #include "kis_action_manager.h"
 #include "kis_highlighted_button.h"
 
 typedef KoResourceServerSimpleConstruction<KisPaintOpPreset, SharedPointerStoragePolicy<KisPaintOpPresetSP> > KisPaintOpPresetResourceServer;
 typedef KoResourceServerAdapter<KisPaintOpPreset, SharedPointerStoragePolicy<KisPaintOpPresetSP> > KisPaintOpPresetResourceServerAdapter;
 
 KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *name)
     : QWidget(parent)
     , m_resourceProvider(view->resourceProvider())
     , m_optionWidget(0)
     , m_toolOptionsPopupButton(0)
     , m_brushEditorPopupButton(0)
     , m_presetSelectorPopupButton(0)
     , m_toolOptionsPopup(0)
     , m_viewManager(view)
     , m_previousNode(0)
     , m_currTabletToolID(KoInputDevice::invalid())
     , m_presetsEnabled(true)
     , m_blockUpdate(false)
     , m_dirtyPresetsEnabled(false)
     , m_eraserBrushSizeEnabled(false)
+    , m_presetUpdateCompressor(200, KisSignalCompressor::FIRST_ACTIVE)
 {
     Q_ASSERT(view != 0);
 
 
     setObjectName(name);
     KisConfig cfg;
     m_dirtyPresetsEnabled = cfg.useDirtyPresets();
     m_eraserBrushSizeEnabled = cfg.useEraserBrushSize();
 
     KAcceleratorManager::setNoAccel(this);
 
     setWindowTitle(i18n("Painter's Toolchest"));
 
     KConfigGroup grp =  KSharedConfig::openConfig()->group("krita").group("Toolbar BrushesAndStuff");
     int iconsize = grp.readEntry("IconSize", 32);
 
     if (!cfg.toolOptionsInDocker()) {
         m_toolOptionsPopupButton = new KisPopupButton(this);
         m_toolOptionsPopupButton->setIcon(KisIconUtils::loadIcon("configure"));
         m_toolOptionsPopupButton->setToolTip(i18n("Tool Settings"));
         m_toolOptionsPopupButton->setFixedSize(iconsize, iconsize);
     }
 
     m_brushEditorPopupButton = new KisPopupButton(this);
     m_brushEditorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_02"));
     m_brushEditorPopupButton->setToolTip(i18n("Edit brush settings"));
     m_brushEditorPopupButton->setFixedSize(iconsize, iconsize);
 
     m_presetSelectorPopupButton = new KisPopupButton(this);
     m_presetSelectorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_01"));
     m_presetSelectorPopupButton->setToolTip(i18n("Choose brush preset"));
     m_presetSelectorPopupButton->setFixedSize(iconsize, iconsize);
 
     m_eraseModeButton = new KisHighlightedToolButton(this);
     m_eraseModeButton->setFixedSize(iconsize, iconsize);
     m_eraseModeButton->setCheckable(true);
 
     m_eraseAction = m_viewManager->actionManager()->createAction("erase_action");
     m_eraseModeButton->setDefaultAction(m_eraseAction);
 
     m_reloadButton = new QToolButton(this);
     m_reloadButton->setFixedSize(iconsize, iconsize);
 
     m_reloadAction = m_viewManager->actionManager()->createAction("reload_preset_action");
     m_reloadButton->setDefaultAction(m_reloadAction);
 
     m_alphaLockButton = new KisHighlightedToolButton(this);
     m_alphaLockButton->setFixedSize(iconsize, iconsize);
     m_alphaLockButton->setCheckable(true);
 
     KisAction* alphaLockAction = m_viewManager->actionManager()->createAction("preserve_alpha");
     m_alphaLockButton->setDefaultAction(alphaLockAction);
 
 
 
 
     // horizontal and vertical mirror toolbar buttons
 
     // mirror tool options for the X Mirror
     QMenu *toolbarMenuXMirror = new QMenu();
 
     KisAction* hideCanvasDecorationsX = m_viewManager->actionManager()->createAction("mirrorX-hideDecorations");
     hideCanvasDecorationsX->setCheckable(true);
     hideCanvasDecorationsX->setText(i18n("Hide Mirror Line"));
     toolbarMenuXMirror->addAction(hideCanvasDecorationsX);
 
     KisAction* lockActionX = m_viewManager->actionManager()->createAction("mirrorX-lock");
     lockActionX->setText(i18n("Lock"));
     lockActionX->setCheckable(true);
     toolbarMenuXMirror->addAction(lockActionX);
 
     KisAction* moveToCenterActionX = m_viewManager->actionManager()->createAction("mirrorX-moveToCenter");
     moveToCenterActionX->setCheckable(false);
     moveToCenterActionX->setText(i18n("Move to Canvas Center"));
     toolbarMenuXMirror->addAction(moveToCenterActionX);
 
 
 
     // mirror tool options for the Y Mirror
     QMenu *toolbarMenuYMirror = new QMenu();
 
     KisAction* hideCanvasDecorationsY = m_viewManager->actionManager()->createAction("mirrorY-hideDecorations");
     hideCanvasDecorationsY->setCheckable(true);
     hideCanvasDecorationsY->setText(i18n("Hide Mirror Line"));
     toolbarMenuYMirror->addAction(hideCanvasDecorationsY);
 
 
     KisAction* lockActionY = m_viewManager->actionManager()->createAction("mirrorY-lock");
     lockActionY->setText(i18n("Lock"));
     lockActionY->setCheckable(true);
     toolbarMenuYMirror->addAction(lockActionY);
 
     KisAction* moveToCenterActionY = m_viewManager->actionManager()->createAction("mirrorY-moveToCenter");
     moveToCenterActionY->setCheckable(false);
     moveToCenterActionY->setText(i18n("Move to Canvas Center"));
     toolbarMenuYMirror->addAction(moveToCenterActionY);
 
 
 
 
     // create horizontal and vertical mirror buttons
 
     m_hMirrorButton = new KisHighlightedToolButton(this);
     int menuPadding = 10;
     m_hMirrorButton->setFixedSize(iconsize + menuPadding, iconsize);
     m_hMirrorButton->setCheckable(true);
     m_hMirrorAction = m_viewManager->actionManager()->createAction("hmirror_action");
     m_hMirrorButton->setDefaultAction(m_hMirrorAction);
     m_hMirrorButton->setMenu(toolbarMenuXMirror);
     m_hMirrorButton->setPopupMode(QToolButton::MenuButtonPopup);
 
     m_vMirrorButton = new KisHighlightedToolButton(this);
     m_vMirrorButton->setFixedSize(iconsize + menuPadding, iconsize);
     m_vMirrorButton->setCheckable(true);
     m_vMirrorAction = m_viewManager->actionManager()->createAction("vmirror_action");
     m_vMirrorButton->setDefaultAction(m_vMirrorAction);
     m_vMirrorButton->setMenu(toolbarMenuYMirror);
     m_vMirrorButton->setPopupMode(QToolButton::MenuButtonPopup);
 
 
     // add connections for horizontal and mirrror buttons
     connect(lockActionX, SIGNAL(toggled(bool)), this, SLOT(slotLockXMirrorToggle(bool)));
     connect(lockActionY, SIGNAL(toggled(bool)), this, SLOT(slotLockYMirrorToggle(bool)));
 
     connect(moveToCenterActionX, SIGNAL(triggered(bool)), this, SLOT(slotMoveToCenterMirrorX()));
     connect(moveToCenterActionY, SIGNAL(triggered(bool)), this, SLOT(slotMoveToCenterMirrorY()));
 
     connect(hideCanvasDecorationsX, SIGNAL(toggled(bool)), this, SLOT(slotHideDecorationMirrorX(bool)));
     connect(hideCanvasDecorationsY, SIGNAL(toggled(bool)), this, SLOT(slotHideDecorationMirrorY(bool)));
 
     const bool sliderLabels = cfg.sliderLabels();
     int sliderWidth;
 
     if (sliderLabels) {
         sliderWidth = 150 * logicalDpiX() / 96;
     }
     else {
         sliderWidth = 120 * logicalDpiX() / 96;
     }
 
     for (int i = 0; i < 3; ++i) {
         m_sliderChooser[i] = new KisWidgetChooser(i + 1);
 
         KisDoubleSliderSpinBox* slOpacity;
         KisDoubleSliderSpinBox* slFlow;
         KisDoubleSliderSpinBox* slSize;
         if (sliderLabels) {
             slOpacity = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("opacity");
             slFlow    = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("flow");
             slSize    = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("size");
             slOpacity->setPrefix(QString("%1  ").arg(i18n("Opacity:")));
             slFlow->setPrefix(QString("%1  ").arg(i18n("Flow:")));
             slSize->setPrefix(QString("%1  ").arg(i18n("Size:")));
         }
         else {
             slOpacity = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("opacity", i18n("Opacity:"));
             slFlow    = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("flow", i18n("Flow:"));
             slSize    = m_sliderChooser[i]->addWidget<KisDoubleSliderSpinBox>("size", i18n("Size:"));
         }
 
         slOpacity->setRange(0.0, 1.0, 2);
         slOpacity->setValue(1.0);
         slOpacity->setSingleStep(0.05);
         slOpacity->setMinimumWidth(qMax(sliderWidth, slOpacity->sizeHint().width()));
         slOpacity->setFixedHeight(iconsize);
         slOpacity->setBlockUpdateSignalOnDrag(true);
 
         slFlow->setRange(0.0, 1.0, 2);
         slFlow->setValue(1.0);
         slFlow->setSingleStep(0.05);
         slFlow->setMinimumWidth(qMax(sliderWidth, slFlow->sizeHint().width()));
         slFlow->setFixedHeight(iconsize);
         slFlow->setBlockUpdateSignalOnDrag(true);
 
         slSize->setRange(0, 1000, 2);
         slSize->setValue(100);
 
         slSize->setSingleStep(1);
         slSize->setExponentRatio(3.0);
         slSize->setSuffix(i18n(" px"));
         slSize->setMinimumWidth(qMax(sliderWidth, slSize->sizeHint().width()));
         slSize->setFixedHeight(iconsize);
         slSize->setBlockUpdateSignalOnDrag(true);
 
         m_sliderChooser[i]->chooseWidget(cfg.toolbarSlider(i + 1));
     }
 
     m_cmbCompositeOp = new KisCompositeOpComboBox();
     m_cmbCompositeOp->setFixedHeight(iconsize);
     Q_FOREACH (KisAction * a, m_cmbCompositeOp->blendmodeActions()) {
         m_viewManager->actionManager()->addAction(a->text(), a);
     }
 
     m_workspaceWidget = new KisPopupButton(this);
     m_workspaceWidget->setIcon(KisIconUtils::loadIcon("view-choose"));
     m_workspaceWidget->setToolTip(i18n("Choose workspace"));
     m_workspaceWidget->setFixedSize(iconsize, iconsize);
     m_workspaceWidget->setPopupWidget(new KisWorkspaceChooser(view));
 
     QHBoxLayout* baseLayout = new QHBoxLayout(this);
     m_paintopWidget = new QWidget(this);
     baseLayout->addWidget(m_paintopWidget);
     baseLayout->setSpacing(4);
     baseLayout->setContentsMargins(0, 0, 0, 0);
 
     m_layout = new QHBoxLayout(m_paintopWidget);
     if (!cfg.toolOptionsInDocker()) {
         m_layout->addWidget(m_toolOptionsPopupButton);
     }
     m_layout->addWidget(m_brushEditorPopupButton);
     m_layout->addWidget(m_presetSelectorPopupButton);
     m_layout->setSpacing(4);
     m_layout->setContentsMargins(0, 0, 0, 0);
 
     QWidget* compositeActions = new QWidget(this);
     QHBoxLayout* compositeLayout = new QHBoxLayout(compositeActions);
     compositeLayout->addWidget(m_cmbCompositeOp);
     compositeLayout->addWidget(m_eraseModeButton);
     compositeLayout->addWidget(m_alphaLockButton);
 
     compositeLayout->setSpacing(4);
     compositeLayout->setContentsMargins(0, 0, 0, 0);
 
     compositeLayout->addWidget(m_reloadButton);
 
     QWidgetAction * action;
 
     action = new QWidgetAction(this);
     view->actionCollection()->addAction("composite_actions", action);
     action->setText(i18n("Brush composite"));
     action->setDefaultWidget(compositeActions);
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("brushslider1", action);
     view->actionCollection()->addAction("brushslider1", action);
     action->setDefaultWidget(m_sliderChooser[0]);
     connect(action, SIGNAL(triggered()), m_sliderChooser[0], SLOT(showPopupWidget()));
     connect(m_viewManager->mainWindow(), SIGNAL(themeChanged()), m_sliderChooser[0], SLOT(updateThemedIcons()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("brushslider2", action);
     view->actionCollection()->addAction("brushslider2", action);
     action->setDefaultWidget(m_sliderChooser[1]);
     connect(action, SIGNAL(triggered()), m_sliderChooser[1], SLOT(showPopupWidget()));
     connect(m_viewManager->mainWindow(), SIGNAL(themeChanged()), m_sliderChooser[1], SLOT(updateThemedIcons()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("brushslider3", action);
     view->actionCollection()->addAction("brushslider3", action);
     action->setDefaultWidget(m_sliderChooser[2]);
     connect(action, SIGNAL(triggered()), m_sliderChooser[2], SLOT(showPopupWidget()));
         connect(m_viewManager->mainWindow(), SIGNAL(themeChanged()), m_sliderChooser[2], SLOT(updateThemedIcons()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("next_favorite_preset", action);
     view->actionCollection()->addAction("next_favorite_preset", action);
     connect(action, SIGNAL(triggered()), this, SLOT(slotNextFavoritePreset()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("previous_favorite_preset", action);
     view->actionCollection()->addAction("previous_favorite_preset", action);
     connect(action, SIGNAL(triggered()), this, SLOT(slotPreviousFavoritePreset()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("previous_preset", action);
     view->actionCollection()->addAction("previous_preset", action);
 
     connect(action, SIGNAL(triggered()), this, SLOT(slotSwitchToPreviousPreset()));
 
     if (!cfg.toolOptionsInDocker()) {
         action = new QWidgetAction(this);
         KisActionRegistry::instance()->propertizeAction("show_tool_options", action);
         view->actionCollection()->addAction("show_tool_options", action);
         connect(action, SIGNAL(triggered()), m_toolOptionsPopupButton, SLOT(showPopupWidget()));
     }
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("show_brush_editor", action);
     view->actionCollection()->addAction("show_brush_editor", action);
     connect(action, SIGNAL(triggered()), m_brushEditorPopupButton, SLOT(showPopupWidget()));
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("show_brush_presets", action);
     view->actionCollection()->addAction("show_brush_presets", action);
     connect(action, SIGNAL(triggered()), m_presetSelectorPopupButton, SLOT(showPopupWidget()));
 
     QWidget* mirrorActions = new QWidget(this);
     QHBoxLayout* mirrorLayout = new QHBoxLayout(mirrorActions);
     mirrorLayout->addWidget(m_hMirrorButton);
     mirrorLayout->addWidget(m_vMirrorButton);
     mirrorLayout->setSpacing(4);
     mirrorLayout->setContentsMargins(0, 0, 0, 0);
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("mirror_actions", action);
     action->setDefaultWidget(mirrorActions);
     view->actionCollection()->addAction("mirror_actions", action);
 
     action = new QWidgetAction(this);
     KisActionRegistry::instance()->propertizeAction("workspaces", action);
     view->actionCollection()->addAction("workspaces", action);
     action->setDefaultWidget(m_workspaceWidget);
 
     if (!cfg.toolOptionsInDocker()) {
         m_toolOptionsPopup = new KisToolOptionsPopup();
         m_toolOptionsPopupButton->setPopupWidget(m_toolOptionsPopup);
         m_toolOptionsPopup->switchDetached(false);
     }
 
     m_presetsPopup = new KisPaintOpPresetsPopup(m_resourceProvider);
     m_brushEditorPopupButton->setPopupWidget(m_presetsPopup);
     m_presetsPopup->switchDetached(false);
     connect(m_viewManager->mainWindow(), SIGNAL(themeChanged()), m_presetsPopup, SLOT(updateThemedIcons()));
 
     m_presetsChooserPopup = new KisPaintOpPresetsChooserPopup();
     m_presetsChooserPopup->setFixedSize(500, 600);
     m_presetSelectorPopupButton->setPopupWidget(m_presetsChooserPopup);
 
     m_currCompositeOpID = KoCompositeOpRegistry::instance().getDefaultCompositeOp().id();
 
     slotNodeChanged(view->activeNode());
     // Get all the paintops
     QList<QString> keys = KisPaintOpRegistry::instance()->keys();
     QList<KisPaintOpFactory*> factoryList;
 
     Q_FOREACH (const QString & paintopId, keys) {
         factoryList.append(KisPaintOpRegistry::instance()->get(paintopId));
     }
     m_presetsPopup->setPaintOpList(factoryList);
 
     connect(m_presetsPopup       , SIGNAL(paintopActivated(QString))          , SLOT(slotSetPaintop(QString)));
     connect(m_presetsPopup       , SIGNAL(savePresetClicked())                , SLOT(slotSaveActivePreset()));
     connect(m_presetsPopup       , SIGNAL(defaultPresetClicked())             , SLOT(slotSetupDefaultPreset()));
     connect(m_presetsPopup       , SIGNAL(signalResourceSelected(KoResource*)), SLOT(resourceSelected(KoResource*)));
     connect(m_presetsPopup       , SIGNAL(reloadPresetClicked())              , SLOT(slotReloadPreset()));
     connect(m_presetsPopup       , SIGNAL(dirtyPresetToggled(bool))           , SLOT(slotDirtyPresetToggled(bool)));
     connect(m_presetsPopup       , SIGNAL(eraserBrushSizeToggled(bool))       , SLOT(slotEraserBrushSizeToggled(bool)));
 
     connect(m_presetsChooserPopup, SIGNAL(resourceSelected(KoResource*))      , SLOT(resourceSelected(KoResource*)));
     connect(m_resourceProvider   , SIGNAL(sigNodeChanged(const KisNodeSP))    , SLOT(slotNodeChanged(const KisNodeSP)));
     connect(m_cmbCompositeOp     , SIGNAL(currentIndexChanged(int))           , SLOT(slotSetCompositeMode(int)));
     connect(m_eraseAction          , SIGNAL(toggled(bool))                    , SLOT(slotToggleEraseMode(bool)));
     connect(alphaLockAction      , SIGNAL(toggled(bool))                    , SLOT(slotToggleAlphaLockMode(bool)));
 
 
     connect(m_hMirrorAction        , SIGNAL(toggled(bool))                    , SLOT(slotHorizontalMirrorChanged(bool)));
     connect(m_vMirrorAction        , SIGNAL(toggled(bool))                    , SLOT(slotVerticalMirrorChanged(bool)));
 
 
 
 
     connect(m_reloadAction         , SIGNAL(triggered())                        , SLOT(slotReloadPreset()));
 
     connect(m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("opacity"), SIGNAL(valueChanged(qreal)), SLOT(slotSlider1Changed()));
     connect(m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("flow")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider1Changed()));
     connect(m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider1Changed()));
     connect(m_sliderChooser[1]->getWidget<KisDoubleSliderSpinBox>("opacity"), SIGNAL(valueChanged(qreal)), SLOT(slotSlider2Changed()));
     connect(m_sliderChooser[1]->getWidget<KisDoubleSliderSpinBox>("flow")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider2Changed()));
     connect(m_sliderChooser[1]->getWidget<KisDoubleSliderSpinBox>("size")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider2Changed()));
     connect(m_sliderChooser[2]->getWidget<KisDoubleSliderSpinBox>("opacity"), SIGNAL(valueChanged(qreal)), SLOT(slotSlider3Changed()));
     connect(m_sliderChooser[2]->getWidget<KisDoubleSliderSpinBox>("flow")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider3Changed()));
     connect(m_sliderChooser[2]->getWidget<KisDoubleSliderSpinBox>("size")   , SIGNAL(valueChanged(qreal)), SLOT(slotSlider3Changed()));
 
     //Needed to connect canvas to favorite resource manager
-    connect(m_viewManager->resourceProvider(), SIGNAL(sigOpacityChanged(qreal)), SLOT(slotOpacityChanged(qreal)));
     connect(m_viewManager->resourceProvider(), SIGNAL(sigFGColorChanged(KoColor)), SLOT(slotUnsetEraseMode()));
 
     m_favoriteResourceManager = new KisFavoriteResourceManager(this);
     connect(m_resourceProvider, SIGNAL(sigFGColorUsed(KoColor)), m_favoriteResourceManager, SLOT(slotAddRecentColor(KoColor)));
 
     connect(m_resourceProvider, SIGNAL(sigFGColorChanged(KoColor)), m_favoriteResourceManager, SLOT(slotChangeFGColorSelector(KoColor)));
     connect(m_resourceProvider, SIGNAL(sigBGColorChanged(KoColor)), m_favoriteResourceManager, SLOT(slotSetBGColor(KoColor)));
     // cold initialization
     m_favoriteResourceManager->slotChangeFGColorSelector(m_resourceProvider->fgColor());
     m_favoriteResourceManager->slotSetBGColor(m_resourceProvider->bgColor());
 
     connect(m_favoriteResourceManager, SIGNAL(sigSetFGColor(KoColor)), m_resourceProvider, SLOT(slotSetFGColor(KoColor)));
     connect(m_favoriteResourceManager, SIGNAL(sigSetBGColor(KoColor)), m_resourceProvider, SLOT(slotSetBGColor(KoColor)));
     connect(m_favoriteResourceManager, SIGNAL(sigEnableChangeColor(bool)), m_resourceProvider, SLOT(slotResetEnableFGChange(bool)));
 
     connect(view->mainWindow(), SIGNAL(themeChanged()), this, SLOT(slotUpdateSelectionIcon()));
 
     slotInputDeviceChanged(KoToolManager::instance()->currentInputDevice());
 }
 
 KisPaintopBox::~KisPaintopBox()
 {
     KisConfig cfg;
     QMapIterator<TabletToolID, TabletToolData> iter(m_tabletToolMap);
     while (iter.hasNext()) {
         iter.next();
         if ((iter.key().pointer) == QTabletEvent::Eraser) {
             cfg.writeEntry(QString("LastEraser_%1").arg(iter.key().uniqueID) , iter.value().preset->name());
         }
         else {
             cfg.writeEntry(QString("LastPreset_%1").arg(iter.key().uniqueID) , iter.value().preset->name());
         }
     }
     // Do not delete the widget, since it it is global to the application, not owned by the view
     m_presetsPopup->setPaintOpSettingsWidget(0);
     qDeleteAll(m_paintopOptionWidgets);
     delete m_favoriteResourceManager;
 
     for (int i = 0; i < 3; ++i) {
         delete m_sliderChooser[i];
     }
 }
 
 void KisPaintopBox::restoreResource(KoResource* resource)
 {
     KisPaintOpPreset* preset = dynamic_cast<KisPaintOpPreset*>(resource);
     if (preset) {
         setCurrentPaintop(preset->paintOp(), preset);
 
         m_presetsPopup->setPresetImage(preset->image());
         m_presetsPopup->resourceSelected(resource);
     }
 }
 
 void KisPaintopBox::newOptionWidgets(const QList<QPointer<QWidget> > &optionWidgetList)
 {
     if (m_toolOptionsPopup) {
         m_toolOptionsPopup->newOptionWidgets(optionWidgetList);
     }
 }
 
 void KisPaintopBox::resourceSelected(KoResource* resource)
 {
     KisPaintOpPreset* preset = dynamic_cast<KisPaintOpPreset*>(resource);
     if (preset) {
         if (!preset->settings()->isLoadable())
             return;
 
         setCurrentPaintopAndReload(preset->paintOp(), preset);
         m_presetsPopup->setPresetImage(preset->image());
         m_presetsPopup->resourceSelected(resource);
     }
 }
 
 void KisPaintopBox::setCurrentPaintopAndReload(const KoID& paintop, KisPaintOpPresetSP preset)
 {
     if (!m_dirtyPresetsEnabled) {
         KisSignalsBlocker blocker(m_optionWidget);
         if (!preset->load()) {
             warnKrita << "failed to load the preset.";
         }
     }
 
     setCurrentPaintop(paintop, preset);
 }
 
 void KisPaintopBox::setCurrentPaintop(const KoID& paintop, KisPaintOpPresetSP preset)
 {
     if (m_resourceProvider->currentPreset()) {
 
         m_resourceProvider->setPreviousPaintOpPreset(m_resourceProvider->currentPreset());
 
         if (m_optionWidget) {
             m_optionWidget->disconnect(this);
             m_optionWidget->hide();
         }
 
         m_paintOpPresetMap[m_resourceProvider->currentPreset()->paintOp()] = m_resourceProvider->currentPreset();
         m_tabletToolMap[m_currTabletToolID].preset = m_resourceProvider->currentPreset();
         m_tabletToolMap[m_currTabletToolID].paintOpID = m_resourceProvider->currentPreset()->paintOp();
     }
 
     preset = (!preset) ? activePreset(paintop) : preset;
     Q_ASSERT(preset && preset->settings());
 
-    m_resourceProvider->setPaintOpPreset(preset);
-
     if (!m_paintopOptionWidgets.contains(paintop))
         m_paintopOptionWidgets[paintop] = KisPaintOpRegistry::instance()->get(paintop.id())->createConfigWidget(this);
 
     m_optionWidget = m_paintopOptionWidgets[paintop];
 
-    preset->settings()->setOptionsWidget(m_optionWidget);
+    KisSignalsBlocker b(m_optionWidget);
+
+    preset->setOptionsWidget(m_optionWidget);
 
     m_optionWidget->setImage(m_viewManager->image());
     m_optionWidget->setNode(m_viewManager->activeNode());
-    m_optionWidget->setConfiguration(preset->settings());
 
     m_presetsPopup->setPaintOpSettingsWidget(m_optionWidget);
 
+    m_resourceProvider->setPaintOpPreset(preset);
+
     Q_ASSERT(m_optionWidget && m_presetSelectorPopupButton);
+
     connect(m_optionWidget, SIGNAL(sigConfigurationUpdated()), this, SLOT(slotGuiChangedCurrentPreset()));
+    connect(&m_presetUpdateCompressor, SIGNAL(timeout()), this, SLOT(slotUpdateOptionsWidget()));
+
     connect(m_optionWidget, SIGNAL(sigSaveLockedConfig(KisPropertiesConfiguration*)), this, SLOT(slotSaveLockedOptionToPreset(KisPropertiesConfiguration*)));
     connect(m_optionWidget, SIGNAL(sigDropLockedConfig(KisPropertiesConfiguration*)), this, SLOT(slotDropLockedOption(KisPropertiesConfiguration*)));
 
 
     // load the current brush engine icon for the brush editor toolbar button
     KisPaintOpFactory* paintOp = KisPaintOpRegistry::instance()->get(paintop.id());
     QString pixFilename = KoResourcePaths::findResource("kis_images", paintOp->pixmap());
 
     m_brushEditorPopupButton->setIcon(QIcon(pixFilename));
     m_presetsPopup->setCurrentPaintOp(paintop.id());
 
     if (m_presetsPopup->currentPaintOp() != paintop.id()) {
         // Must change the paintop as the current one is not supported
         // by the new colorspace.
         dbgKrita << "current paintop " << paintop.name() << " was not set, not supported by colorspace";
     }
 
-    /**
-     * We will get more update signals from the configuration widgets
-     * but they might be delayed by some internal deferring timers,
-     * so just call the slot directly
-     */
-    slotUpdatePreset();
+    m_presetConnections.clear();
+
+    // preset -> compressor
+    m_presetConnections.addConnection(
+        preset->updateProxy(), SIGNAL(sigSettingsChanged()),
+        &m_presetUpdateCompressor, SLOT(start()));
+}
+
+void KisPaintopBox::slotUpdateOptionsWidget()
+{
+    KisPaintOpPresetSP preset = m_resourceProvider->currentPreset();
+
+    KIS_SAFE_ASSERT_RECOVER_RETURN(preset);
+    KIS_SAFE_ASSERT_RECOVER_RETURN(m_optionWidget);
+
+    KisSignalsBlocker b(m_optionWidget);
+    m_optionWidget->setConfigurationSafe(preset->settings().data());
+
+    m_presetsPopup->resourceSelected(preset.data());
+    m_presetsPopup->updateViewSettings();
+
 }
 
 KisPaintOpPresetSP KisPaintopBox::defaultPreset(const KoID& paintOp)
 {
     QString defaultName = paintOp.id() + ".kpp";
     QString path = KoResourcePaths::findResource("kis_defaultpresets", defaultName);
 
     KisPaintOpPresetSP preset = new KisPaintOpPreset(path);
 
     if (!preset->load()) {
         preset = KisPaintOpRegistry::instance()->defaultPreset(paintOp);
     }
 
     Q_ASSERT(preset);
     Q_ASSERT(preset->valid());
 
     return preset;
 }
 
 KisPaintOpPresetSP KisPaintopBox::activePreset(const KoID& paintOp)
 {
     if (m_paintOpPresetMap[paintOp] == 0) {
         m_paintOpPresetMap[paintOp] = defaultPreset(paintOp);
     }
 
     return m_paintOpPresetMap[paintOp];
 }
 
 void KisPaintopBox::updateCompositeOp(QString compositeOpID)
 {
     if (!m_optionWidget) return;
     KisSignalsBlocker blocker(m_optionWidget);
 
     KisNodeSP node = m_resourceProvider->currentNode();
 
     if (node && node->paintDevice()) {
         if (!node->paintDevice()->colorSpace()->hasCompositeOp(compositeOpID))
             compositeOpID = KoCompositeOpRegistry::instance().getDefaultCompositeOp().id();
 
-        m_cmbCompositeOp->blockSignals(true);
-        m_cmbCompositeOp->selectCompositeOp(KoID(compositeOpID));
-        m_cmbCompositeOp->blockSignals(false);
-
+        {
+            KisSignalsBlocker b1(m_cmbCompositeOp);
+            m_cmbCompositeOp->selectCompositeOp(KoID(compositeOpID));
+        }
         if (compositeOpID != m_currCompositeOpID) {
-            m_resourceProvider->currentPreset()->settings()->setPaintOpCompositeOp(compositeOpID);
-            m_optionWidget->setConfiguration(m_resourceProvider->currentPreset()->settings().data());
-            m_resourceProvider->setCurrentCompositeOp(compositeOpID);
             m_currCompositeOpID = compositeOpID;
         }
     }
 }
 
 void KisPaintopBox::setWidgetState(int flags)
 {
     if (flags & (ENABLE_COMPOSITEOP | DISABLE_COMPOSITEOP)) {
         m_cmbCompositeOp->setEnabled(flags & ENABLE_COMPOSITEOP);
         m_eraseModeButton->setEnabled(flags & ENABLE_COMPOSITEOP);
     }
 
     if (flags & (ENABLE_PRESETS | DISABLE_PRESETS)) {
         m_presetSelectorPopupButton->setEnabled(flags & ENABLE_PRESETS);
         m_brushEditorPopupButton->setEnabled(flags & ENABLE_PRESETS);
     }
 
     for (int i = 0; i < 3; ++i) {
         if (flags & (ENABLE_OPACITY | DISABLE_OPACITY))
             m_sliderChooser[i]->getWidget("opacity")->setEnabled(flags & ENABLE_OPACITY);
 
         if (flags & (ENABLE_FLOW | DISABLE_FLOW))
             m_sliderChooser[i]->getWidget("flow")->setEnabled(flags & ENABLE_FLOW);
 
         if (flags & (ENABLE_SIZE | DISABLE_SIZE))
             m_sliderChooser[i]->getWidget("size")->setEnabled(flags & ENABLE_SIZE);
     }
 }
 
 void KisPaintopBox::setSliderValue(const QString& sliderID, qreal value)
 {
     for (int i = 0; i < 3; ++i) {
         KisDoubleSliderSpinBox* slider = m_sliderChooser[i]->getWidget<KisDoubleSliderSpinBox>(sliderID);
-        slider->blockSignals(true);
+        KisSignalsBlocker b(slider);
         slider->setValue(value);
-        slider->blockSignals(false);
     }
 }
 
 void KisPaintopBox::slotSetPaintop(const QString& paintOpId)
 {
     if (KisPaintOpRegistry::instance()->get(paintOpId) != 0) {
         KoID id(paintOpId, KisPaintOpRegistry::instance()->get(paintOpId)->name());
         setCurrentPaintop(id);
     }
 }
 
 void KisPaintopBox::slotInputDeviceChanged(const KoInputDevice& inputDevice)
 {
     TabletToolMap::iterator toolData = m_tabletToolMap.find(inputDevice);
 
     if (toolData == m_tabletToolMap.end()) {
         KisConfig cfg;
         KisPaintOpPresetResourceServer *rserver = KisResourceServerProvider::instance()->paintOpPresetServer(false);
         KisPaintOpPresetSP preset;
         if (inputDevice.pointer() == QTabletEvent::Eraser) {
             preset = rserver->resourceByName(cfg.readEntry<QString>(QString("LastEraser_%1").arg(inputDevice.uniqueTabletId()), "Eraser_circle"));
         }
         else {
             preset = rserver->resourceByName(cfg.readEntry<QString>(QString("LastPreset_%1").arg(inputDevice.uniqueTabletId()), "Basic_tip_default"));
         }
         if (!preset) {
             preset = rserver->resourceByName("Basic_tip_default");
         }
         if (preset) {
             setCurrentPaintop(preset->paintOp(), preset);
         }
     }
     else {
         setCurrentPaintop(toolData->paintOpID, toolData->preset);
     }
 
     m_currTabletToolID = TabletToolID(inputDevice);
 }
 
 void KisPaintopBox::slotCanvasResourceChanged(int key, const QVariant &value)
 {
     if (m_viewManager) {
         sender()->blockSignals(true);
         KisPaintOpPresetSP preset = m_viewManager->resourceProvider()->resourceManager()->resource(KisCanvasResourceProvider::CurrentPaintOpPreset).value<KisPaintOpPresetSP>();
         if (preset && m_resourceProvider->currentPreset()->name() != preset->name()) {
             QString compositeOp = preset->settings()->getString("CompositeOp");
             updateCompositeOp(compositeOp);
             resourceSelected(preset.data());
         }
         m_presetsChooserPopup->canvasResourceChanged(preset.data(), preset);
 
-        if (m_resourceProvider->currentCompositeOp() != m_currCompositeOpID) {
-            updateCompositeOp(m_resourceProvider->currentCompositeOp());
+        if (key == KisCanvasResourceProvider::CurrentCompositeOp) {
+            if (m_resourceProvider->currentCompositeOp() != m_currCompositeOpID) {
+                updateCompositeOp(m_resourceProvider->currentCompositeOp());
+            }
+        }
+
+        if (key == KisCanvasResourceProvider::Size) {
+            setSliderValue("size", m_resourceProvider->size());
+        }
+
+        if (key == KisCanvasResourceProvider::Opacity) {
+            setSliderValue("opacity", m_resourceProvider->opacity());
+        }
+
+        if (key == KisCanvasResourceProvider::Flow) {
+            setSliderValue("flow", m_resourceProvider->flow());
         }
 
         if (key == KisCanvasResourceProvider::EraserMode) {
             m_eraseAction->setChecked(value.toBool());
         }
 
         sender()->blockSignals(false);
     }
 }
 
 void KisPaintopBox::slotSaveActivePreset()
 {
     KisPaintOpPresetSP curPreset = m_resourceProvider->currentPreset();
 
     if (!curPreset)
         return;
 
     m_favoriteResourceManager->setBlockUpdates(true);
 
     KisPaintOpPresetSP newPreset = curPreset->clone();
     KisPaintOpPresetResourceServer * rServer = KisResourceServerProvider::instance()->paintOpPresetServer();
     QString saveLocation = rServer->saveLocation();
     QString presetName = m_presetsPopup->getPresetName();
     QString presetFilename = saveLocation + presetName + newPreset->defaultFileExtension();
 
     QStringList tags;
     KisPaintOpPresetSP resource = rServer->resourceByName(presetName);
     if (resource) {
 
         tags = rServer->assignedTagsList(resource.data());
         rServer->removeResourceAndBlacklist(resource);
 
     }
 
     newPreset->setImage(m_presetsPopup->cutOutOverlay());
     newPreset->setFilename(presetFilename);
     newPreset->setName(presetName);
     newPreset->setPresetDirty(false);
 
     rServer->addResource(newPreset);
     Q_FOREACH (const QString & tag, tags) {
         rServer->addTag(newPreset.data(), tag);
     }
 
     // HACK ALERT! the server does not notify the observers
     // automatically, so we need to call theupdate manually!
     rServer->tagCategoryMembersChanged();
 
     restoreResource(newPreset.data());
 
     m_favoriteResourceManager->setBlockUpdates(false);
 }
 
 void KisPaintopBox::slotUpdatePreset()
 {
     if (!m_resourceProvider->currentPreset()) return;
 
     // block updates of avoid some over updating of the option widget
     m_blockUpdate = true;
 
-    setSliderValue("size", m_resourceProvider->currentPreset()->settings()->paintOpSize().width());
+    setSliderValue("size", m_resourceProvider->size());
 
     {
         qreal opacity = m_resourceProvider->currentPreset()->settings()->paintOpOpacity();
         m_resourceProvider->setOpacity(opacity);
         setSliderValue("opacity", opacity);
         setWidgetState(ENABLE_OPACITY);
     }
 
     {
         setSliderValue("flow", m_resourceProvider->currentPreset()->settings()->paintOpFlow());
         setWidgetState(ENABLE_FLOW);
     }
 
     {
         updateCompositeOp(m_resourceProvider->currentPreset()->settings()->paintOpCompositeOp());
         setWidgetState(ENABLE_COMPOSITEOP);
     }
 
-    {
-        const bool newEraseMode = m_resourceProvider->eraserMode();
-        if (m_eraseAction->isChecked() != newEraseMode) {
-            KisSignalsBlocker b(m_eraseAction, m_eraseModeButton);
-            m_eraseAction->setChecked(newEraseMode);
-            m_eraseModeButton->setChecked(newEraseMode);
-        }
-    }
-
     m_blockUpdate = false;
 }
 
 void KisPaintopBox::slotSetupDefaultPreset()
 {
     KisPaintOpPresetSP preset = defaultPreset(m_resourceProvider->currentPreset()->paintOp());
-    preset->settings()->setOptionsWidget(m_optionWidget);
-    m_optionWidget->setConfiguration(preset->settings());
-    m_optionWidget->writeConfiguration(const_cast<KisPaintOpSettings*>(preset->settings().data()));
+    preset->setOptionsWidget(m_optionWidget);
+    m_resourceProvider->setPaintOpPreset(preset);
 }
 
 void KisPaintopBox::slotNodeChanged(const KisNodeSP node)
 {
     if (m_previousNode.isValid() && m_previousNode->paintDevice())
         disconnect(m_previousNode->paintDevice().data(), SIGNAL(colorSpaceChanged(const KoColorSpace*)), this, SLOT(slotColorSpaceChanged(const KoColorSpace*)));
 
     // Reconnect colorspace change of node
     if (node && node->paintDevice()) {
         connect(node->paintDevice().data(), SIGNAL(colorSpaceChanged(const KoColorSpace*)), this, SLOT(slotColorSpaceChanged(const KoColorSpace*)));
         m_resourceProvider->setCurrentCompositeOp(m_currCompositeOpID);
         m_previousNode = node;
         slotColorSpaceChanged(node->colorSpace());
     }
 
     if (m_optionWidget) {
         m_optionWidget->setNode(node);
     }
 }
 
 void KisPaintopBox::slotColorSpaceChanged(const KoColorSpace* colorSpace)
 {
     m_cmbCompositeOp->validate(colorSpace);
 }
 
 void KisPaintopBox::slotToggleEraseMode(bool checked)
 {
     const bool oldEraserMode = m_resourceProvider->eraserMode();
     m_resourceProvider->setEraserMode(checked);
 
-    KisPaintOpSettingsSP settings = m_resourceProvider->currentPreset()->settings();
-    m_optionWidget->setConfiguration(settings.data());
-
     if (oldEraserMode != checked && m_eraserBrushSizeEnabled) {
-        const qreal currentSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value();
+        const qreal currentSize = m_resourceProvider->size();
+
+        KisPaintOpSettingsSP settings = m_resourceProvider->currentPreset()->settings();
 
         // remember brush size. set the eraser size to the normal brush size if not set
         if (checked) {
             settings->setSavedBrushSize(currentSize);
             if (qFuzzyIsNull(settings->savedEraserSize())) {
                 settings->setSavedEraserSize(currentSize);
             }
         } else {
             settings->setSavedEraserSize(currentSize);
             if (qFuzzyIsNull(settings->savedBrushSize())) {
                 settings->setSavedBrushSize(currentSize);
             }
         }
 
         //update value in UI (this is the main place the value is 'stored' in memory)
-        qreal updateSize = checked ? settings->savedEraserSize() : settings->savedBrushSize();
-        m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->setValue(updateSize);
-        m_sliderChooser[1]->getWidget<KisDoubleSliderSpinBox>("size")->setValue(updateSize);
-        m_sliderChooser[2]->getWidget<KisDoubleSliderSpinBox>("size")->setValue(updateSize);
+        qreal newSize = checked ? settings->savedEraserSize() : settings->savedBrushSize();
+        m_resourceProvider->setSize(newSize);
     }
 }
 
 void KisPaintopBox::slotSetCompositeMode(int index)
 {
     Q_UNUSED(index);
-
-    if (m_resourceProvider->currentPreset()->settings()->hasProperty("CompositeOp")) {
-        QString compositeOp = m_cmbCompositeOp->selectedCompositeOp().id();
-        updateCompositeOp(compositeOp);
-    }
+    QString compositeOp = m_cmbCompositeOp->selectedCompositeOp().id();
+    m_resourceProvider->setCurrentCompositeOp(compositeOp);
 }
 
 void KisPaintopBox::slotHorizontalMirrorChanged(bool value)
 {
     m_resourceProvider->setMirrorHorizontal(value);
 }
 
 void KisPaintopBox::slotVerticalMirrorChanged(bool value)
 {
     m_resourceProvider->setMirrorVertical(value);
 }
 
 void KisPaintopBox::sliderChanged(int n)
 {
     if (!m_optionWidget) // widget will not exist if the are no documents open
         return;
 
+
     KisSignalsBlocker blocker(m_optionWidget);
 
-    m_optionWidget->writeConfiguration(const_cast<KisPaintOpSettings*>(m_resourceProvider->currentPreset()->settings().data()));
     qreal opacity = m_sliderChooser[n]->getWidget<KisDoubleSliderSpinBox>("opacity")->value();
     qreal flow    = m_sliderChooser[n]->getWidget<KisDoubleSliderSpinBox>("flow")->value();
     qreal size    = m_sliderChooser[n]->getWidget<KisDoubleSliderSpinBox>("size")->value();
 
 
     setSliderValue("opacity", opacity);
     setSliderValue("flow"   , flow);
     setSliderValue("size"   , size);
 
     if (m_presetsEnabled) {
         // IMPORTANT: set the PaintOp size before setting the other properties
         //            it wont work the other way
-        qreal sizeDiff = size - m_resourceProvider->currentPreset()->settings()->paintOpSize().width();
-        m_resourceProvider->currentPreset()->settings()->changePaintOpSize(sizeDiff, 0);
+        // TODO: why?!
+
+        m_resourceProvider->setSize(size);
+        m_resourceProvider->setOpacity(opacity);
+        m_resourceProvider->setFlow(flow);
 
-        m_resourceProvider->currentPreset()->settings()->setPaintOpOpacity(opacity);
-        m_resourceProvider->currentPreset()->settings()->setPaintOpFlow(flow);
 
         KisLockedPropertiesProxy *propertiesProxy = KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(m_resourceProvider->currentPreset()->settings());
         propertiesProxy->setProperty("OpacityValue", opacity);
         propertiesProxy->setProperty("FlowValue", flow);
         delete propertiesProxy;
-
-        m_optionWidget->setConfiguration(m_resourceProvider->currentPreset()->settings().data());
+    } else {
+        m_resourceProvider->setOpacity(opacity);
     }
 
-    m_resourceProvider->setOpacity(opacity);
-
     m_presetsPopup->resourceSelected(m_resourceProvider->currentPreset().data());
 }
 
 void KisPaintopBox::slotSlider1Changed()
 {
     sliderChanged(0);
 }
 
 void KisPaintopBox::slotSlider2Changed()
 {
     sliderChanged(1);
 }
 
 void KisPaintopBox::slotSlider3Changed()
 {
     sliderChanged(2);
 }
 
 void KisPaintopBox::slotToolChanged(KoCanvasController* canvas, int toolId)
 {
     Q_UNUSED(canvas);
     Q_UNUSED(toolId);
 
     if (!m_viewManager->canvasBase()) return;
 
     QString  id   = KoToolManager::instance()->activeToolId();
     KisTool* tool = dynamic_cast<KisTool*>(KoToolManager::instance()->toolById(m_viewManager->canvasBase(), id));
 
     if (tool) {
         int flags = tool->flags();
 
         if (flags & KisTool::FLAG_USES_CUSTOM_COMPOSITEOP) {
             setWidgetState(ENABLE_COMPOSITEOP | ENABLE_OPACITY);
         } else                                              {
             setWidgetState(DISABLE_COMPOSITEOP | DISABLE_OPACITY);
         }
 
         if (flags & KisTool::FLAG_USES_CUSTOM_PRESET) {
             setWidgetState(ENABLE_PRESETS | ENABLE_SIZE | ENABLE_FLOW);
             slotUpdatePreset();
             m_presetsEnabled = true;
         } else {
             setWidgetState(DISABLE_PRESETS | DISABLE_SIZE | DISABLE_FLOW);
             m_presetsEnabled = false;
         }
     } else setWidgetState(DISABLE_ALL);
 }
 
-void KisPaintopBox::slotOpacityChanged(qreal opacity)
-{
-    if (m_blockUpdate || !m_optionWidget) return;
-    m_blockUpdate = true;
-
-    for (int i = 0; i < 3; ++i) {
-        KisDoubleSliderSpinBox *opacitySlider = m_sliderChooser[i]->getWidget<KisDoubleSliderSpinBox>("opacity");
-        opacitySlider->blockSignals(true);
-        opacitySlider->setValue(opacity);
-        opacitySlider->blockSignals(false);
-    }
-    if (m_presetsEnabled) {
-        m_resourceProvider->currentPreset()->settings()->setPaintOpOpacity(opacity);
-        m_optionWidget->setConfiguration(m_resourceProvider->currentPreset()->settings().data());
-    }
-    m_blockUpdate = false;
-}
-
 void KisPaintopBox::slotPreviousFavoritePreset()
 {
     if (!m_favoriteResourceManager) return;
 
     int i = 0;
     Q_FOREACH (KisPaintOpPresetSP preset, m_favoriteResourceManager->favoritePresetList()) {
         if (m_resourceProvider->currentPreset() && m_resourceProvider->currentPreset()->name() == preset->name()) {
             if (i > 0) {
                 m_favoriteResourceManager->slotChangeActivePaintop(i - 1);
             } else {
                 m_favoriteResourceManager->slotChangeActivePaintop(m_favoriteResourceManager->numFavoritePresets() - 1);
             }
             return;
         }
         i++;
     }
 
 }
 
 void KisPaintopBox::slotNextFavoritePreset()
 {
     if (!m_favoriteResourceManager) return;
 
     int i = 0;
     Q_FOREACH (KisPaintOpPresetSP preset, m_favoriteResourceManager->favoritePresetList()) {
         if (m_resourceProvider->currentPreset()->name() == preset->name()) {
             if (i < m_favoriteResourceManager->numFavoritePresets() - 1) {
                 m_favoriteResourceManager->slotChangeActivePaintop(i + 1);
             } else {
                 m_favoriteResourceManager->slotChangeActivePaintop(0);
             }
             return;
         }
         i++;
     }
 }
 
 void KisPaintopBox::slotSwitchToPreviousPreset()
 {
     if (m_resourceProvider->previousPreset()) {
         setCurrentPaintop(m_resourceProvider->previousPreset()->paintOp(), m_resourceProvider->previousPreset());
     }
 }
 
 void KisPaintopBox::slotUnsetEraseMode()
 {
     m_eraseAction->setChecked(false);
 }
 
 void KisPaintopBox::slotToggleAlphaLockMode(bool checked)
 {
     if (checked) {
         m_alphaLockButton->actions()[0]->setIcon(KisIconUtils::loadIcon("transparency-locked"));
     } else {
         m_alphaLockButton->actions()[0]->setIcon(KisIconUtils::loadIcon("transparency-unlocked"));
     }
     m_resourceProvider->setGlobalAlphaLock(checked);
 }
 
 void KisPaintopBox::slotReloadPreset()
 {
     KisSignalsBlocker blocker(m_optionWidget);
 
     //Here using the name and fetching the preset from the server was the only way the load was working. Otherwise it was not loading.
     KisPaintOpPresetResourceServer * rserver = KisResourceServerProvider::instance()->paintOpPresetServer();
     KisPaintOpPresetSP preset = rserver->resourceByName(m_resourceProvider->currentPreset()->name());
     if (preset) {
         preset->load();
-        preset->settings()->setOptionsWidget(m_optionWidget);
-        m_optionWidget->setConfiguration(preset->settings());
-        m_presetsPopup->resourceSelected(preset.data());
     }
-    slotUpdatePreset();
 }
 void KisPaintopBox::slotGuiChangedCurrentPreset() // Called only when UI is changed and not when preset is changed
 {
-    m_optionWidget->writeConfiguration(const_cast<KisPaintOpSettings*>(m_resourceProvider->currentPreset()->settings().data()));
-    slotUpdatePreset();
+    m_optionWidget->writeConfigurationSafe(const_cast<KisPaintOpSettings*>(m_resourceProvider->currentPreset()->settings().data()));
 
-    m_presetsPopup->resourceSelected(m_resourceProvider->currentPreset().data());
-    m_presetsPopup->updateViewSettings();
+    //m_presetsPopup->resourceSelected(m_resourceProvider->currentPreset().data());
+
+    // TODO!!!!!!!!
+    //m_presetsPopup->updateViewSettings();
 }
 void KisPaintopBox::slotSaveLockedOptionToPreset(KisPropertiesConfiguration* p)
 {
 
     QMapIterator<QString, QVariant> i(p->getProperties());
     while (i.hasNext()) {
         i.next();
         m_resourceProvider->currentPreset()->settings()->setProperty(i.key(), QVariant(i.value()));
         if (m_resourceProvider->currentPreset()->settings()->hasProperty(i.key() + "_previous")) {
             m_resourceProvider->currentPreset()->settings()->removeProperty(i.key() + "_previous");
         }
 
     }
     slotGuiChangedCurrentPreset();
 
 }
 
 void KisPaintopBox::slotDropLockedOption(KisPropertiesConfiguration* p)
 {
     KisSignalsBlocker blocker(m_optionWidget);
     KisPaintOpPresetSP preset = m_resourceProvider->currentPreset();
 
     {
         KisPaintOpPreset::DirtyStateSaver dirtySaver(preset.data());
 
         QMapIterator<QString, QVariant> i(p->getProperties());
         while (i.hasNext()) {
             i.next();
             if (preset->settings()->hasProperty(i.key() + "_previous")) {
                 preset->settings()->setProperty(i.key(), preset->settings()->getProperty(i.key() + "_previous"));
                 preset->settings()->removeProperty(i.key() + "_previous");
             }
 
         }
-        m_optionWidget->setConfiguration(preset->settings());
     }
 
-    slotUpdatePreset();
+    //slotUpdatePreset();
 }
 void KisPaintopBox::slotDirtyPresetToggled(bool value)
 {
     if (!value) {
         slotReloadPreset();
         m_presetsPopup->resourceSelected(m_resourceProvider->currentPreset().data());
         m_presetsPopup->updateViewSettings();
     }
     m_dirtyPresetsEnabled = value;
     KisConfig cfg;
     cfg.setUseDirtyPresets(m_dirtyPresetsEnabled);
 
 }
 void KisPaintopBox::slotEraserBrushSizeToggled(bool value)
 {
     m_eraserBrushSizeEnabled = value;
     KisConfig cfg;
     cfg.setUseEraserBrushSize(m_eraserBrushSizeEnabled);
 }
 
 void KisPaintopBox::slotUpdateSelectionIcon()
 {
     m_hMirrorAction->setIcon(KisIconUtils::loadIcon("symmetry-horizontal"));
     m_vMirrorAction->setIcon(KisIconUtils::loadIcon("symmetry-vertical"));
 
     KisConfig cfg;
     if (!cfg.toolOptionsInDocker()) {
         m_toolOptionsPopupButton->setIcon(KisIconUtils::loadIcon("configure"));
     }
 
     m_presetSelectorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_01"));
     m_brushEditorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_02"));
     m_workspaceWidget->setIcon(KisIconUtils::loadIcon("view-choose"));
 
     m_eraseAction->setIcon(KisIconUtils::loadIcon("draw-eraser"));
     m_reloadAction->setIcon(KisIconUtils::loadIcon("view-refresh"));
 }
 
 void KisPaintopBox::slotLockXMirrorToggle(bool toggleLock) {
     m_resourceProvider->setMirrorHorizontalLock(toggleLock);
 }
 
 void KisPaintopBox::slotLockYMirrorToggle(bool toggleLock) {
     m_resourceProvider->setMirrorVerticalLock(toggleLock);
 }
 
 void KisPaintopBox::slotHideDecorationMirrorX(bool toggled) {
     m_resourceProvider->setMirrorHorizontalHideDecorations(toggled);
 }
 
 void KisPaintopBox::slotHideDecorationMirrorY(bool toggled) {
     m_resourceProvider->setMirrorVerticalHideDecorations(toggled);
 }
 
 
 
 void KisPaintopBox::slotMoveToCenterMirrorX() {
   m_resourceProvider->mirrorHorizontalMoveCanvasToCenter();
 }
 
 void KisPaintopBox::slotMoveToCenterMirrorY() {
   m_resourceProvider->mirrorVerticalMoveCanvasToCenter();
 }
diff --git a/libs/ui/kis_paintop_box.h b/libs/ui/kis_paintop_box.h
index 3442814726..aa01ec03a8 100644
--- a/libs/ui/kis_paintop_box.h
+++ b/libs/ui/kis_paintop_box.h
@@ -1,246 +1,249 @@
 /*
  *  kis_paintop_box.h - part of KImageShop/Krayon/Krita
  *
  *  Copyright (c) 2004-2008 Boudewijn Rempt (boud@valdyas.org)
  *  Copyright (C) 2011      Silvio Heinrich <plassy@web.de>
  *
  *  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_PAINTOP_BOX_H_
 #define KIS_PAINTOP_BOX_H_
 
 #include <QMap>
 #include <QWidget>
 #include <QList>
 
 
 #include <KoID.h>
 #include <KoInputDevice.h>
 
 #include <kis_types.h>
 #include <brushengine/kis_paintop_settings.h>
 #include <brushengine/kis_locked_properties_proxy.h>
 #include <brushengine/kis_locked_properties_server.h>
 #include <brushengine/kis_locked_properties.h>
 #include "kritaui_export.h"
+#include "kis_signal_auto_connection.h"
+#include "kis_signal_compressor.h"
+
 
 
 class QToolButton;
 class QString;
 class QHBoxLayout;
 
 class KoColorSpace;
 class KoResource;
 class KoCanvasController;
 
 class KisViewManager;
 class KisCanvasResourceProvider;
 class KisPopupButton;
 class KisToolOptionsPopup;
 class KisPaintOpPresetsPopup;
 class KisPaintOpPresetsChooserPopup;
 class KisPaintOpConfigWidget;
 class KisCompositeOpComboBox;
 class KisWidgetChooser;
 class KisFavoriteResourceManager;
 class KisAction;
 
 /**
  * This widget presents all paintops that a user can paint with.
  * Paintops represent real-world tools or the well-known Shoup
  * computer equivalents that do nothing but change color.
  *
  * To incorporate the dirty preset functionality and locked settings
  * the following slots are added
  *  void slotReloadPreset();
     void slotGuiChangedCurrentPreset();
     void slotSaveLockedOptionToPreset(KisPropertiesConfiguration* p);
     void slotDropLockedOption(KisPropertiesConfiguration* p);
     void slotDirtyPresetToggled(bool);
     Everytime a value is changed in a preset, the preset is made dirty through the onChange() function.
     For Locked Settings however, a changed Locked Setting will not cause a preset to become dirty. That is
     becuase it borrows its values from the KisLockedPropertiesServer.
     Hence the dirty state of the Preset is kept consistent before and after a writeConfiguration operation in  most cases.
  * XXX: When we have a lot of paintops, replace the listbox
  * with a table, and for every category a combobox.
  *
  * XXX: instead of text, use pretty pictures.
  */
 class KRITAUI_EXPORT KisPaintopBox : public QWidget
 {
     Q_OBJECT
 
     enum {
         ENABLE_PRESETS      = 0x0001,
         DISABLE_PRESETS     = 0x0002,
         ENABLE_COMPOSITEOP  = 0x0004,
         DISABLE_COMPOSITEOP = 0x0008,
         ENABLE_OPACITY      = 0x0010,
         DISABLE_OPACITY     = 0x0020,
         ENABLE_FLOW         = 0x0040,
         DISABLE_FLOW        = 0x0080,
         ENABLE_SIZE         = 0x0100,
         DISABLE_SIZE        = 0x0200,
         ENABLE_ALL          = 0x5555,
         DISABLE_ALL         = 0xAAAA
     };
 
 public:
 
     KisPaintopBox(KisViewManager* view, QWidget* parent, const char* name);
     ~KisPaintopBox();
 
     void restoreResource(KoResource* resource);
     /**
      * Update the option widgets to the argument ones, removing the currently set widgets.
      */
     void newOptionWidgets(const QList<QPointer<QWidget> > & optionWidgetList);
 
     KisFavoriteResourceManager *favoriteResourcesManager() { return m_favoriteResourceManager; }
 
 public Q_SLOTS:
 
     void slotColorSpaceChanged(const KoColorSpace* colorSpace);
     void slotInputDeviceChanged(const KoInputDevice & inputDevice);
     void slotCanvasResourceChanged(int key, const QVariant& v);
     void resourceSelected(KoResource* resource);
 
 private:
 
     void setCurrentPaintop(const KoID& paintop, KisPaintOpPresetSP preset = 0);
     void setCurrentPaintopAndReload(const KoID& paintop, KisPaintOpPresetSP preset);
 
     KisPaintOpPresetSP defaultPreset(const KoID& paintOp);
     KisPaintOpPresetSP activePreset(const KoID& paintOp);
     void updateCompositeOp(QString compositeOpID);
     void setWidgetState(int flags);
     void setSliderValue(const QString& sliderID, qreal value);
     void sliderChanged(int n);
 
 private Q_SLOTS:
 
     void slotSaveActivePreset();
     void slotUpdatePreset();
     void slotSetupDefaultPreset();
     void slotNodeChanged(const KisNodeSP node);
     void slotToggleEraseMode(bool checked);
     void slotSetCompositeMode(int index);
     void slotSetPaintop(const QString& paintOpId);
     void slotHorizontalMirrorChanged(bool value);
     void slotVerticalMirrorChanged(bool value);
     void slotSlider1Changed();
     void slotSlider2Changed();
     void slotSlider3Changed();
     void slotToolChanged(KoCanvasController* canvas, int toolId);
-    void slotOpacityChanged(qreal);
     void slotPreviousFavoritePreset();
     void slotNextFavoritePreset();
     void slotSwitchToPreviousPreset();
     void slotUnsetEraseMode();
     void slotToggleAlphaLockMode(bool);
 
     void slotReloadPreset();
     void slotGuiChangedCurrentPreset();
     void slotSaveLockedOptionToPreset(KisPropertiesConfiguration* p);
     void slotDropLockedOption(KisPropertiesConfiguration* p);
     void slotDirtyPresetToggled(bool);
     void slotEraserBrushSizeToggled(bool);    
     void slotUpdateSelectionIcon();
 
     void slotLockXMirrorToggle(bool);
     void slotLockYMirrorToggle(bool);
     void slotMoveToCenterMirrorX();
     void slotMoveToCenterMirrorY();
     void slotHideDecorationMirrorX(bool);
     void slotHideDecorationMirrorY(bool);
 
-
+    void slotUpdateOptionsWidget();
 
 private:
     KisCanvasResourceProvider*          m_resourceProvider;
     QHBoxLayout*                        m_layout;
     QWidget*                            m_paintopWidget;
     KisPaintOpConfigWidget*             m_optionWidget;
     KisPopupButton*                     m_toolOptionsPopupButton;
     KisPopupButton*                     m_brushEditorPopupButton;
     KisPopupButton*                     m_presetSelectorPopupButton;
     KisCompositeOpComboBox*             m_cmbCompositeOp;
     QToolButton*                        m_eraseModeButton;
     QToolButton*                        m_alphaLockButton;
     QToolButton*                        m_hMirrorButton;
     QToolButton*                        m_vMirrorButton;
     KisToolOptionsPopup*                m_toolOptionsPopup;
     KisPaintOpPresetsPopup*             m_presetsPopup;
     KisPaintOpPresetsChooserPopup*      m_presetsChooserPopup;
     KisViewManager*                     m_viewManager;
     KisPopupButton*                     m_workspaceWidget;
     KisWidgetChooser*                   m_sliderChooser[3];
     QMap<KoID, KisPaintOpConfigWidget*> m_paintopOptionWidgets;
     KisFavoriteResourceManager*         m_favoriteResourceManager;
     QToolButton*                        m_reloadButton;
     KisAction*                          m_eraseAction;
     KisAction*                          m_reloadAction;
 
     QString             m_currCompositeOpID;
     KisNodeWSP          m_previousNode;
 
     KisAction* m_hMirrorAction;
     KisAction* m_vMirrorAction;
 
     struct TabletToolID {
         TabletToolID(const KoInputDevice& dev) {
             uniqueID = dev.uniqueTabletId();
             // Only the eraser is special, and we don't look at Cursor
             pointer = QTabletEvent::Pen;
             if (dev.pointer() == QTabletEvent::Eraser) {
                 pointer = QTabletEvent::Eraser;
             }
         }
 
         bool operator == (const TabletToolID& id) const {
             return pointer == id.pointer && uniqueID == id.uniqueID;
         }
 
         bool operator < (const TabletToolID& id) const {
             if (uniqueID == id.uniqueID)
                 return pointer < id.pointer;
             return uniqueID < id.uniqueID;
         }
 
         QTabletEvent::PointerType  pointer;
         qint64                     uniqueID;
     };
 
     struct TabletToolData {
         KoID               paintOpID;
         KisPaintOpPresetSP preset;
     };
 
     typedef QMap<TabletToolID, TabletToolData> TabletToolMap;
     typedef QMap<KoID, KisPaintOpPresetSP>     PaintOpPresetMap;
 
     TabletToolMap    m_tabletToolMap;
     PaintOpPresetMap m_paintOpPresetMap;
     TabletToolID     m_currTabletToolID;
     bool             m_presetsEnabled;
     bool             m_blockUpdate;
     bool             m_dirtyPresetsEnabled;
     bool             m_eraserBrushSizeEnabled;
 
-
+    KisSignalAutoConnectionsStore m_presetConnections;
+    KisSignalCompressor m_presetUpdateCompressor;
 };
 
 #endif //KIS_PAINTOP_BOX_H_
diff --git a/libs/ui/kis_popup_palette.cpp b/libs/ui/kis_popup_palette.cpp
index 86e0dc9883..e7c8988417 100644
--- a/libs/ui/kis_popup_palette.cpp
+++ b/libs/ui/kis_popup_palette.cpp
@@ -1,574 +1,610 @@
 /* This file is part of the KDE project
    Copyright 2009 Vera Lukman <shicmap@gmail.com>
    Copyright 2011 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 version 2 as published by the Free Software Foundation.
 
    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_config.h"
 #include "kis_popup_palette.h"
 #include "kis_paintop_box.h"
 #include "kis_favorite_resource_manager.h"
 #include "kis_icon_utils.h"
 #include <brushengine/kis_paintop_preset.h>
 #include "kis_resource_server_provider.h"
 #include <KoTriangleColorSelector.h>
 #include "KoColorSpaceRegistry.h"
 #include <kis_types.h>
 #include <QtGui>
 #include <kis_debug.h>
 #include <QQueue>
 #include <QMenu>
 #include <QWhatsThis>
 #include <QDebug>
 #include <math.h>
 #include "kis_signal_compressor.h"
 #include <QApplication>
+#include "brushhud/kis_brush_hud.h"
+#include "brushhud/kis_round_hud_button.h"
 
 
 #define colorInnerRadius 72.0
 #define colorOuterRadius 92.0
 #define maxbrushRadius 42.0
 #define widgetSize (colorOuterRadius*2+maxbrushRadius*4)
+#define widgetMargin 20.0
+#define hudMargin 30.0
+
+#define _USE_MATH_DEFINES 1
+#include <cmath>
+
 
 class PopupColorTriangle : public KoTriangleColorSelector
 {
 public:
     PopupColorTriangle(const KoColorDisplayRendererInterface *displayRenderer, QWidget* parent)
         : KoTriangleColorSelector(displayRenderer, parent)
         , m_dragging(false) {
     }
 
     virtual ~PopupColorTriangle() {}
 
     void tabletEvent(QTabletEvent* event) {
         event->accept();
         QMouseEvent* mouseEvent = 0;
         switch (event->type()) {
         case QEvent::TabletPress:
             mouseEvent = new QMouseEvent(QEvent::MouseButtonPress, event->pos(),
                                          Qt::LeftButton, Qt::LeftButton, event->modifiers());
             m_dragging = true;
             mousePressEvent(mouseEvent);
             break;
         case QEvent::TabletMove:
             mouseEvent = new QMouseEvent(QEvent::MouseMove, event->pos(),
                                          (m_dragging) ? Qt::LeftButton : Qt::NoButton,
                                          (m_dragging) ? Qt::LeftButton : Qt::NoButton, event->modifiers());
             mouseMoveEvent(mouseEvent);
             break;
         case QEvent::TabletRelease:
             mouseEvent = new QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
                                          Qt::LeftButton,
                                          Qt::LeftButton,
                                          event->modifiers());
             m_dragging = false;
             mouseReleaseEvent(mouseEvent);
             break;
         default: break;
         }
         delete mouseEvent;
     }
 
 private:
     bool m_dragging;
 };
 
-KisPopupPalette::KisPopupPalette(KisFavoriteResourceManager* manager, const KoColorDisplayRendererInterface *displayRenderer, QWidget *parent)
+KisPopupPalette::KisPopupPalette(KisFavoriteResourceManager* manager, const KoColorDisplayRendererInterface *displayRenderer, KisCanvasResourceProvider *provider, QWidget *parent)
     : QWidget(parent, Qt::FramelessWindowHint)
     , m_resourceManager(manager)
     , m_triangleColorSelector(0)
     , m_timer(0)
     , m_displayRenderer(displayRenderer)
     , m_colorChangeCompressor(new KisSignalCompressor(50, KisSignalCompressor::POSTPONE))
+    , m_brushHud(0)
 {
 
     const int borderWidth = 3;
     m_triangleColorSelector  = new PopupColorTriangle(displayRenderer, this);
     m_triangleColorSelector->move(widgetSize/2-colorInnerRadius+borderWidth, widgetSize/2-colorInnerRadius+borderWidth);
     m_triangleColorSelector->resize(colorInnerRadius*2-borderWidth*2, colorInnerRadius*2-borderWidth*2);
     m_triangleColorSelector->setVisible(true);
 
     QRegion maskedRegion(0, 0, m_triangleColorSelector->width(), m_triangleColorSelector->height(), QRegion::Ellipse );
     m_triangleColorSelector->setMask(maskedRegion);
 
-    setAttribute(Qt::WA_ContentsPropagated, true);
     //setAttribute(Qt::WA_TranslucentBackground, true);
 
     connect(m_triangleColorSelector, SIGNAL(realColorChanged(KoColor)),
             m_colorChangeCompressor.data(), SLOT(start()));
     connect(m_colorChangeCompressor.data(), SIGNAL(timeout()),
             SLOT(slotEmitColorChanged()));
 
     connect(m_resourceManager, SIGNAL(sigChangeFGColorSelector(KoColor)),
             SLOT(slotExternalFgColorChanged(KoColor)));
     connect(this, SIGNAL(sigChangefGColor(KoColor)),
             m_resourceManager, SIGNAL(sigSetFGColor(KoColor)));
 
 
     connect(this, SIGNAL(sigChangeActivePaintop(int)), m_resourceManager, SLOT(slotChangeActivePaintop(int)));
     connect(this, SIGNAL(sigUpdateRecentColor(int)), m_resourceManager, SLOT(slotUpdateRecentColor(int)));
 
     connect(m_resourceManager, SIGNAL(setSelectedColor(int)), SLOT(slotSetSelectedColor(int)));
     connect(m_resourceManager, SIGNAL(updatePalettes()), SLOT(slotUpdate()));
     connect(m_resourceManager, SIGNAL(hidePalettes()), SLOT(slotHide()));
 
     // This is used to handle a bug:
     // If pop up palette is visible and a new colour is selected, the new colour
     // will be added when the user clicks on the canvas to hide the palette
     // In general, we want to be able to store recent color if the pop up palette
     // is not visible
     m_timer = new QTimer(this);
     m_timer->setSingleShot(true);
     connect(this, SIGNAL(sigTriggerTimer()), this, SLOT(slotTriggerTimer()));
     connect(m_timer, SIGNAL(timeout()), this, SLOT(slotEnableChangeFGColor()));
     connect(this, SIGNAL(sigEnableChangeFGColor(bool)), m_resourceManager, SIGNAL(sigEnableChangeColor(bool)));
 
     setCursor(Qt::ArrowCursor);
     setMouseTracking(true);
     setHoveredPreset(-1);
     setHoveredColor(-1);
     setSelectedColor(-1);
 
+    m_brushHud = new KisBrushHud(provider, parent);
+    m_brushHud->setMaximumHeight(widgetSize);
+    m_brushHud->setVisible(false);
+
+    const int auxButtonSize = 35;
+
+    m_settingsButton = new KisRoundHudButton(this);
+    m_settingsButton->setIcon(KisIconUtils::loadIcon("configure"));
+    m_settingsButton->setGeometry(widgetSize - 2.2 * auxButtonSize, widgetSize - auxButtonSize,
+                                  auxButtonSize, auxButtonSize);
+
+    connect(m_settingsButton, SIGNAL(clicked()), SLOT(slotShowTagsPopup()));
+
+    KisConfig cfg;
+    m_brushHudButton = new KisRoundHudButton(this);
+    m_brushHudButton->setCheckable(true);
+    m_brushHudButton->setOnOffIcons(KisIconUtils::loadIcon("arrow-left"), KisIconUtils::loadIcon("arrow-right"));
+    m_brushHudButton->setGeometry(widgetSize - 1.0 * auxButtonSize, widgetSize - auxButtonSize,
+                                  auxButtonSize, auxButtonSize);
+    connect(m_brushHudButton, SIGNAL(toggled(bool)), SLOT(showHudWidget(bool)));
+    m_brushHudButton->setChecked(cfg.showBrushHud());
+
     setVisible(true);
     setVisible(false);
 }
 
 void KisPopupPalette::slotExternalFgColorChanged(const KoColor &color)
 {
     m_triangleColorSelector->setRealColor(color);
 }
 
 void KisPopupPalette::slotEmitColorChanged()
 {
     if (isVisible()) {
         update();
         emit sigChangefGColor(m_triangleColorSelector->realColor());
     }
 }
 
 //setting KisPopupPalette properties
 int KisPopupPalette::hoveredPreset() const
 {
     return m_hoveredPreset;
 }
 
 void KisPopupPalette::setHoveredPreset(int x)
 {
     m_hoveredPreset = x;
 }
 
 int KisPopupPalette::hoveredColor() const
 {
     return m_hoveredColor;
 }
 
 void KisPopupPalette::setHoveredColor(int x)
 {
     m_hoveredColor = x;
 }
 
 int KisPopupPalette::selectedColor() const
 {
     return m_selectedColor;
 }
 
 void KisPopupPalette::setSelectedColor(int x)
 {
     m_selectedColor = x;
 }
 
 void KisPopupPalette::slotTriggerTimer()
 {
     m_timer->start(750);
 }
 
 void KisPopupPalette::slotEnableChangeFGColor()
 {
     emit sigEnableChangeFGColor(true);
 }
 
-void KisPopupPalette::showPopupPalette(const QPoint &p)
+void KisPopupPalette::adjustLayout(const QPoint &p)
 {
-    if (!isVisible() && parentWidget())  {
-        QSize parentSize(parentWidget()->size());
-        QPoint pointPalette(p.x() - width() / 2, p.y() - height() / 2);
+    KIS_ASSERT_RECOVER_RETURN(m_brushHud);
 
-        //setting offset point in case the widget is shown outside of canvas region
-        int offsetX = 0, offsetY = 0;
+    if (isVisible() && parentWidget())  {
+        const QRect fitRect = kisGrowRect(parentWidget()->rect(), -widgetMargin);
 
-        if ((offsetX = pointPalette.x() + width() - parentSize.width()) > 0 || (offsetX = pointPalette.x()) < 0) {
-            pointPalette.setX(pointPalette.x() - offsetX);
-        }
+        const QPoint paletteCenterOffset(width() / 2, height() / 2);
+        QRect paletteRect = rect();
+        paletteRect.moveTo(p - paletteCenterOffset);
 
-        if ((offsetY = pointPalette.y() + height() - parentSize.height()) > 0 || (offsetY = pointPalette.y()) < 0) {
-            pointPalette.setY(pointPalette.y() - offsetY);
+        if (m_brushHudButton->isChecked()) {
+            m_brushHud->updateGeometry();
+            paletteRect.adjust(0, 0, m_brushHud->width() + hudMargin, 0);
         }
 
-        move(pointPalette);
+        paletteRect = kisEnsureInRect(paletteRect, fitRect);
 
+        move(paletteRect.topLeft());
+        m_brushHud->move(paletteRect.topLeft() + QPoint(widgetSize + hudMargin, 0));
+        m_lastCenterPoint = p;
     }
-    showPopupPalette(!isVisible());
+}
+
+void KisPopupPalette::showHudWidget(bool visible)
+{
+    KIS_ASSERT_RECOVER_RETURN(m_brushHud);
+
+    const bool reallyVisible = visible && m_brushHudButton->isChecked();
+
+    if (reallyVisible) {
+        m_brushHud->updateProperties();
+    }
+
+    m_brushHud->setVisible(reallyVisible);
+    adjustLayout(m_lastCenterPoint);
+
+    KisConfig cfg;
+    cfg.setShowBrushHud(visible);
+}
 
+void KisPopupPalette::showPopupPalette(const QPoint &p)
+{
+    showPopupPalette(!isVisible());
+    adjustLayout(p);
 }
 
 void KisPopupPalette::showPopupPalette(bool show)
 {
     if (show) {
         emit sigEnableChangeFGColor(!show);
     } else {
         emit sigTriggerTimer();
     }
     setVisible(show);
+    m_brushHud->setVisible(show && m_brushHudButton->isChecked());
 }
 
 //redefinition of setVariable function to change the scope to private
 void KisPopupPalette::setVisible(bool b)
 {
     QWidget::setVisible(b);
 }
 
 QSize KisPopupPalette::sizeHint() const
 {
     return QSize(widgetSize, widgetSize);
 }
 
 void KisPopupPalette::resizeEvent(QResizeEvent*)
 {
 }
 
 void KisPopupPalette::paintEvent(QPaintEvent* e)
 {
-    Q_UNUSED(e)
+    Q_UNUSED(e);
 
     float rotationAngle = 0.0;
 
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
     painter.setRenderHint(QPainter::SmoothPixmapTransform);
 
     painter.translate(width() / 2, height() / 2);
 
     //painting background color
     QPainterPath bgColor;
     bgColor.addEllipse(QPoint(-width() / 2 + 24, -height() / 2 + 60), 20, 20);
     painter.fillPath(bgColor, m_displayRenderer->toQColor(m_resourceManager->bgColor()));
     painter.drawPath(bgColor);
 
     //painting foreground color
     QPainterPath fgColor;
     fgColor.addEllipse(QPoint(-width() / 2 + 50, -height() / 2 + 32), 30, 30);
     painter.fillPath(fgColor, m_displayRenderer->toQColor(m_triangleColorSelector->realColor()));
     painter.drawPath(fgColor);
 
     // create an ellipse for the background that is slightly
     // smaller than the clipping mask. This will prevent aliasing
     QPainterPath backgroundContainer;
     backgroundContainer.addEllipse( -colorOuterRadius, -colorOuterRadius,
                                     colorOuterRadius*2, colorOuterRadius*2 );
     painter.fillPath(backgroundContainer,palette().brush(QPalette::Window));
     painter.drawPath(backgroundContainer);
 
     //painting favorite brushes
     QList<QImage> images(m_resourceManager->favoritePresetImages());
 
     //painting favorite brushes pixmap/icon
     QPainterPath path;
     for (int pos = 0; pos < numSlots(); pos++) {
         painter.save();
 
         path = pathFromPresetIndex(pos);
 
         if (pos < images.size()) {
             painter.setClipPath(path);
 
             QRect bounds = path.boundingRect().toAlignedRect();
             painter.drawImage(bounds.topLeft() , images.at(pos).scaled(bounds.size() , Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
         }
         else {
             painter.fillPath(path, palette().brush(QPalette::Window));
         }
         QPen pen = painter.pen();
         pen.setWidth(3);
         painter.setPen(pen);
         painter.drawPath(path);
 
         painter.restore();
     }
     if (hoveredPreset() > -1) {
         path = pathFromPresetIndex(hoveredPreset());
         QPen pen(palette().color(QPalette::Highlight));
         pen.setWidth(3);
         painter.setPen(pen);
         painter.drawPath(path);
     }
 
     //painting recent colors
     painter.setPen(Qt::NoPen);
     rotationAngle = -360.0 / m_resourceManager->recentColorsTotal();
 
     KoColor kocolor;
 
     for (int pos = 0; pos < m_resourceManager->recentColorsTotal(); pos++) {
         QPainterPath path(drawDonutPathAngle(colorInnerRadius, colorOuterRadius, m_resourceManager->recentColorsTotal()));
 
         //accessing recent color of index pos
         kocolor = m_resourceManager->recentColorAt(pos);
         painter.fillPath(path, m_displayRenderer->toQColor(kocolor));
 
         painter.drawPath(path);
         painter.rotate(rotationAngle);
     }
 
     painter.setBrush(Qt::transparent);
 
     if (m_resourceManager->recentColorsTotal() == 0) {
         QPainterPath path_ColorDonut(drawDonutPathFull(0, 0, colorInnerRadius, colorOuterRadius));
         painter.setPen(QPen(palette().color(QPalette::Window).darker(130), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
         painter.drawPath(path_ColorDonut);
     }
 
     //painting hovered color
     if (hoveredColor() > -1) {
         painter.setPen(QPen(palette().color(QPalette::Highlight), 2, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
 
         if (m_resourceManager->recentColorsTotal() == 1) {
             QPainterPath path_ColorDonut(drawDonutPathFull(0, 0, colorInnerRadius, colorOuterRadius));
             painter.drawPath(path_ColorDonut);
         } else {
             painter.rotate((m_resourceManager->recentColorsTotal() + hoveredColor()) *rotationAngle);
             QPainterPath path(drawDonutPathAngle(colorInnerRadius, colorOuterRadius, m_resourceManager->recentColorsTotal()));
             painter.drawPath(path);
             painter.rotate(hoveredColor() * -1 * rotationAngle);
         }
     }
 
     //painting selected color
     if (selectedColor() > -1) {
         painter.setPen(QPen(palette().color(QPalette::Highlight).darker(130), 2, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
 
         if (m_resourceManager->recentColorsTotal() == 1) {
             QPainterPath path_ColorDonut(drawDonutPathFull(0, 0, colorInnerRadius, colorOuterRadius));
             painter.drawPath(path_ColorDonut);
         } else {
             painter.rotate((m_resourceManager->recentColorsTotal() + selectedColor()) *rotationAngle);
             QPainterPath path(drawDonutPathAngle(colorInnerRadius, colorOuterRadius, m_resourceManager->recentColorsTotal()));
             painter.drawPath(path);
             painter.rotate(selectedColor() * -1 * rotationAngle);
         }
     }
-
-
-    //painting configure background, then icon
-    QPainterPath configureContainer;
-    int side = qMin(width(), height());
-
-
-    configureContainer.addEllipse( side / 2 - 38 , side / 2 - 38 , 35 , 35 );
-    painter.fillPath(configureContainer,palette().brush(QPalette::Window));
-    painter.drawPath(configureContainer);
-
-
-    QPixmap settingIcon = KisIconUtils::loadIcon("configure").pixmap(QSize(22,22));
-    painter.drawPixmap(side / 2 - 40 + 9, side / 2 - 40 + 9, settingIcon);
-
 }
 
 QPainterPath KisPopupPalette::drawDonutPathFull(int x, int y, int inner_radius, int outer_radius)
 {
     QPainterPath path;
     path.addEllipse(QPointF(x, y), outer_radius, outer_radius);
     path.addEllipse(QPointF(x, y), inner_radius, inner_radius);
     path.setFillRule(Qt::OddEvenFill);
 
     return path;
 }
 
 QPainterPath KisPopupPalette::drawDonutPathAngle(int inner_radius, int outer_radius, int limit)
 {
     QPainterPath path;
     path.moveTo(-0.999 * outer_radius * sin(M_PI / limit), 0.999 * outer_radius * cos(M_PI / limit));
     path.arcTo(-1 * outer_radius, -1 * outer_radius, 2 * outer_radius, 2 * outer_radius, -90.0 - 180.0 / limit,
                360.0 / limit);
     path.arcTo(-1 * inner_radius, -1 * inner_radius, 2 * inner_radius, 2 * inner_radius, -90.0 + 180.0 / limit,
                - 360.0 / limit);
     path.closeSubpath();
 
     return path;
 }
 
 void KisPopupPalette::mouseMoveEvent(QMouseEvent* event)
 {
     QPointF point = event->posF();
     event->accept();
 
     QPainterPath pathColor(drawDonutPathFull(width() / 2, height() / 2, colorInnerRadius, colorOuterRadius));
 
     setToolTip("");
     setHoveredPreset(-1);
     setHoveredColor(-1);
 
     {
         int pos = calculatePresetIndex(point, m_resourceManager->numFavoritePresets());
 
         if (pos >= 0 && pos < m_resourceManager->numFavoritePresets()) {
             setToolTip(m_resourceManager->favoritePresetList().at(pos).data()->name());
             setHoveredPreset(pos);
         }
     }
     if (pathColor.contains(point)) {
         int pos = calculateIndex(point, m_resourceManager->recentColorsTotal());
 
         if (pos >= 0 && pos < m_resourceManager->recentColorsTotal()) {
             setHoveredColor(pos);
         }
     }
     update();
 }
 
 void KisPopupPalette::mousePressEvent(QMouseEvent* event)
 {
     QPointF point = event->posF();
     event->accept();
 
     if (event->button() == Qt::LeftButton) {
 
         //in favorite brushes area
         int pos = calculateIndex(point, m_resourceManager->numFavoritePresets());
         if (pos >= 0 && pos < m_resourceManager->numFavoritePresets()
                 && isPointInPixmap(point, pos)) {
             //setSelectedBrush(pos);
             update();
         }
-
-        int side = qMin(width(), height());
-        QPainterPath settingCircle;
-        settingCircle.addEllipse(width() / 2 + side / 2 - 40, height() / 2 + side / 2 - 40, 40, 40);
-        if (settingCircle.contains(point)) {
-            KisPaintOpPresetResourceServer* rServer = KisResourceServerProvider::instance()->paintOpPresetServer();
-            QStringList tags = rServer->tagNamesList();
-            qSort(tags);
-
-            if (!tags.isEmpty()) {
-                QMenu menu;
-                Q_FOREACH (const QString& tag, tags) {
-                    menu.addAction(tag);
-                }
-                QAction* action = menu.exec(event->globalPos());
-                if (action) {
-                    m_resourceManager->setCurrentTag(action->text());
-                }
-            } else {
-                QWhatsThis::showText(event->globalPos(),
-                                        i18n("There are no tags available to show in this popup. To add presets, you need to tag them and then select the tag here."));
-            }
-        }
     }
 }
 
+void KisPopupPalette::slotShowTagsPopup()
+{
+    KisPaintOpPresetResourceServer* rServer = KisResourceServerProvider::instance()->paintOpPresetServer();
+    QStringList tags = rServer->tagNamesList();
+    qSort(tags);
+
+    if (!tags.isEmpty()) {
+        QMenu menu;
+        Q_FOREACH (const QString& tag, tags) {
+            menu.addAction(tag);
+        }
 
+        QAction* action = menu.exec(QCursor::pos());
+        if (action) {
+            m_resourceManager->setCurrentTag(action->text());
+        }
+    } else {
+        QWhatsThis::showText(QCursor::pos(),
+                             i18n("There are no tags available to show in this popup. To add presets, you need to tag them and then select the tag here."));
+    }
+}
 
 void KisPopupPalette::tabletEvent(QTabletEvent* /*event*/) {
 }
 
 
 void KisPopupPalette::mouseReleaseEvent(QMouseEvent * event)
 {
     QPointF point = event->posF();
     event->accept();
 
     if (event->button() == Qt::LeftButton || event->button() == Qt::RightButton) {
         QPainterPath pathColor(drawDonutPathFull(width() / 2, height() / 2, colorInnerRadius, colorOuterRadius));
 
         //in favorite brushes area
         if (hoveredPreset() > -1) {
             //setSelectedBrush(hoveredBrush());
             emit sigChangeActivePaintop(hoveredPreset());
         }
         if (pathColor.contains(point)) {
             int pos = calculateIndex(point, m_resourceManager->recentColorsTotal());
 
             if (pos >= 0 && pos < m_resourceManager->recentColorsTotal()) {
                 emit sigUpdateRecentColor(pos);
             }
         }
     }
 }
 
 int KisPopupPalette::calculateIndex(QPointF point, int n)
 {
     calculatePresetIndex(point, n);
     //translate to (0,0)
     point.setX(point.x() - width() / 2);
     point.setY(point.y() - height() / 2);
 
     //rotate
     float smallerAngle = M_PI / 2 + M_PI / n - atan2(point.y(), point.x());
     float radius = sqrt((float)point.x() * point.x() + point.y() * point.y());
     point.setX(radius * cos(smallerAngle));
     point.setY(radius * sin(smallerAngle));
 
     //calculate brush index
     int pos = floor(acos(point.x() / radius) * n / (2 * M_PI));
     if (point.y() < 0) pos =  n - pos - 1;
 
     return pos;
 }
 
 bool KisPopupPalette::isPointInPixmap(QPointF& point, int pos)
 {
     if (pathFromPresetIndex(pos).contains(point + QPointF(-width() / 2, -height() / 2))) {
         return true;
     }
     return false;
 }
 
 KisPopupPalette::~KisPopupPalette()
 {
 }
 
 QPainterPath KisPopupPalette::pathFromPresetIndex(int index)
 {
     qreal angleLength = 360.0 / numSlots() / 180 * M_PI;
     qreal angle = index * angleLength;
 
     qreal r = colorOuterRadius * sin(angleLength/2) / ( 1 - sin(angleLength/2));
 
     QPainterPath path;
     path.addEllipse((colorOuterRadius+r) * cos(angle)-r, -(colorOuterRadius+r) * sin(angle)-r, 2*r, 2*r);
     path.closeSubpath();
     return path;
 }
 
 int KisPopupPalette::calculatePresetIndex(QPointF point, int /*n*/)
 {
     for(int i = 0; i < numSlots(); i++)
     {
         QPointF adujustedPoint = point - QPointF(width()/2, height()/2);
         if(pathFromPresetIndex(i).contains(adujustedPoint))
         {
             return i;
         }
     }
     return -1;
 }
 
 int KisPopupPalette::numSlots()
 {
     KisConfig config;
     return qMax(config.favoritePresets(), 10);
 }
 
diff --git a/libs/ui/kis_popup_palette.h b/libs/ui/kis_popup_palette.h
index 2128216cb1..0c6f73faf1 100644
--- a/libs/ui/kis_popup_palette.h
+++ b/libs/ui/kis_popup_palette.h
@@ -1,128 +1,138 @@
 /* This file is part of the KDE project
    Copyright 2009 Vera Lukman <shicmap@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 version 2 as published by the Free Software Foundation.
 
    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.
 */
 
 #ifndef KIS_POPUP_PALETTE_H
 #define KIS_POPUP_PALETTE_H
 
 #include <kis_types.h>
 #include <QWidget>
 #include <QQueue>
 #include <KoColorDisplayRendererInterface.h>
 
 
 class KisFavoriteResourceManager;
 class QWidget;
 class KoColor;
 class KoTriangleColorSelector;
 class KisSignalCompressor;
+class KisBrushHud;
+class KisRoundHudButton;
+class KisCanvasResourceProvider;
 
 class KisPopupPalette : public QWidget
 {
     Q_OBJECT
 
     Q_PROPERTY(int hoveredPreset READ hoveredPreset WRITE setHoveredPreset)
     Q_PROPERTY(int hoveredColor READ hoveredColor WRITE setHoveredColor)
     Q_PROPERTY(int selectedColor READ selectedColor WRITE setSelectedColor)
 
 public:
-    KisPopupPalette(KisFavoriteResourceManager*, const KoColorDisplayRendererInterface *displayRenderer = KoDumbColorDisplayRenderer::instance(), QWidget *parent = 0);
+    KisPopupPalette(KisFavoriteResourceManager*, const KoColorDisplayRendererInterface *displayRenderer, KisCanvasResourceProvider *provider, QWidget *parent = 0);
     ~KisPopupPalette();
     QSize sizeHint() const;
 
     void showPopupPalette(const QPoint&);
     void showPopupPalette(bool b);
 
     //functions to set up selectedBrush
     void setSelectedBrush(int x);
     int selectedBrush() const;
     //functions to set up selectedColor
     void setSelectedColor(int x);
     int selectedColor() const;
 
     virtual void tabletEvent(QTabletEvent * event);
 
 protected:
 
     void paintEvent(QPaintEvent*);
     void resizeEvent(QResizeEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void mouseMoveEvent(QMouseEvent*);
     void mousePressEvent(QMouseEvent*);
 
     //functions to calculate index of favorite brush or recent color in array
     //n is the total number of favorite brushes or recent colors
     int calculateIndex(QPointF, int n);
 
     int calculatePresetIndex(QPointF, int n);
 
     //functions to set up hoveredBrush
     void setHoveredPreset(int x);
     int hoveredPreset() const;
     //functions to set up hoveredColor
     void setHoveredColor(int x);
     int hoveredColor() const;
 
 
 private:
     void setVisible(bool b);
 
     QPainterPath drawDonutPathFull(int, int, int, int);
     QPainterPath drawDonutPathAngle(int, int, int);
     bool isPointInPixmap(QPointF&, int pos);
 
     QPainterPath pathFromPresetIndex(int index);
 
     int numSlots();
+    void adjustLayout(const QPoint &p);
 private:
 
     int m_hoveredPreset;
     int m_hoveredColor;
     int m_selectedColor;
     KisFavoriteResourceManager* m_resourceManager;
     KoTriangleColorSelector* m_triangleColorSelector;
 
     QTimer* m_timer;
 
     const KoColorDisplayRendererInterface *m_displayRenderer;
 
     QScopedPointer<KisSignalCompressor> m_colorChangeCompressor;
+    KisBrushHud *m_brushHud;
+    KisRoundHudButton *m_settingsButton;
+    KisRoundHudButton *m_brushHudButton;
+    QPoint m_lastCenterPoint;
 
 Q_SIGNALS:
     void sigChangeActivePaintop(int);
     void sigUpdateRecentColor(int);
     void sigChangefGColor(const KoColor&);
 
     // These are used to handle a bug:
     // If pop up palette is visible and a new colour is selected, the new colour
     // will be added when the user clicks on the canvas to hide the palette
     // In general, we want to be able to store recent color if the pop up palette
     // is not visible
     void sigEnableChangeFGColor(bool);
     void sigTriggerTimer();
 
 private Q_SLOTS:
     void slotExternalFgColorChanged(const KoColor &color);
     void slotEmitColorChanged();
     void slotSetSelectedColor(int x) { setSelectedColor(x); update(); }
     void slotTriggerTimer();
     void slotEnableChangeFGColor();
     void slotUpdate() { update(); }
     void slotHide() { showPopupPalette(false); }
+    void slotShowTagsPopup();
+    void showHudWidget(bool visible);
 };
 
 #endif // KIS_POPUP_PALETTE_H
diff --git a/libs/ui/layerstyles/WdgGradientOverlay.ui b/libs/ui/layerstyles/WdgGradientOverlay.ui
index 5abf47ab2a..5fb0c6e772 100644
--- a/libs/ui/layerstyles/WdgGradientOverlay.ui
+++ b/libs/ui/layerstyles/WdgGradientOverlay.ui
@@ -1,281 +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>400</width>
-    <height>266</height>
+    <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>&amp;Opacity:</string>
+            <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>Gradient:</string>
+            <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="QSpinBox" name="intAngle">
+            <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>KisCompositeOpComboBox</class>
-   <extends>QComboBox</extends>
-   <header location="global">kis_cmb_composite.h</header>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <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 b97f26a525..d40f0c8632 100644
--- a/libs/ui/layerstyles/WdgSatin.ui
+++ b/libs/ui/layerstyles/WdgSatin.ui
@@ -1,274 +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>337</height>
+    <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>&amp;Opacity:</string>
+            <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>&amp;Angle:</string>
+            <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="QSpinBox" name="intAngle">
+            <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>&amp;Size:</string>
+            <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_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>KisSliderSpinBox</class>
-   <extends>QWidget</extends>
-   <header location="global">kis_slider_spin_box.h</header>
-   <container>1</container>
-  </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 1603dc72be..513eff70e9 100644
--- a/libs/ui/layerstyles/WdgStroke.ui
+++ b/libs/ui/layerstyles/WdgStroke.ui
@@ -1,436 +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>400</width>
+    <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>&amp;Size:</string>
+            <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">
+          <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>&amp;Position:</string>
+            <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>O&amp;pacity:</string>
+            <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">
+          <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>0</number>
+            <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>Gradient:</string>
+                <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="QSpinBox" name="intAngle">
+                <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">
+              <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">
+              <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_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 b0779a2e90..1f918c085f 100644
--- a/libs/ui/layerstyles/wdgBevelAndEmboss.ui
+++ b/libs/ui/layerstyles/wdgBevelAndEmboss.ui
@@ -1,477 +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>354</width>
-    <height>471</height>
+    <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>&amp;Style:</string>
+            <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">
+          <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">
+          <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>Sof&amp;ten:</string>
+            <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">
+          <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="QSpinBox" name="intAngle">
+            <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="QSpinBox" name="intAltitude">
+          <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>Gloss Contour:</string>
+            <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">
+          <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">
+          <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_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>KisSliderSpinBox</class>
-   <extends>QWidget</extends>
-   <header location="global">kis_slider_spin_box.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/layerstyles/wdgdropshadow.ui b/libs/ui/layerstyles/wdgdropshadow.ui
index 27fc98d09e..d1f81dc6cd 100644
--- a/libs/ui/layerstyles/wdgdropshadow.ui
+++ b/libs/ui/layerstyles/wdgdropshadow.ui
@@ -1,314 +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>367</width>
-    <height>350</height>
+    <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>Ble&amp;nd Mode:</string>
+            <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>&amp;Opacity:</string>
+            <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>&amp;Angle:</string>
+            <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="QSpinBox" name="intAngle">
+            <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>&amp;Size:</string>
+            <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_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>KisSliderSpinBox</class>
-   <extends>QWidget</extends>
-   <header location="global">kis_slider_spin_box.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>KisCmbContour</class>
    <extends>QWidget</extends>
    <header>kis_cmb_contour.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/ui/recorder/kis_recorded_paint_action_editor.cc b/libs/ui/recorder/kis_recorded_paint_action_editor.cc
index d336a2efd2..00816b3354 100644
--- a/libs/ui/recorder/kis_recorded_paint_action_editor.cc
+++ b/libs/ui/recorder/kis_recorded_paint_action_editor.cc
@@ -1,176 +1,176 @@
 /*
  *  Copyright (c) 2010 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.
  */
 
 #include "kis_recorded_paint_action_editor.h"
 
 #include <QLabel>
 #include <QGridLayout>
 
 #include <KoColor.h>
 #include <KoColorPopupAction.h>
 
 
 #include "recorder/kis_recorded_paint_action.h"
 #include <brushengine/kis_paintop_preset.h>
 #include <brushengine/kis_paintop_registry.h>
 #include <brushengine/kis_paintop_config_widget.h>
 
 #include "ui_wdgpaintactioneditor.h"
 #include <KoColorSpaceRegistry.h>
 #include <KoResourcePaths.h>
 #include "kis_node_query_path_editor.h"
 #include <recorder/kis_node_query_path.h>
 
 KisRecordedPaintActionEditor::KisRecordedPaintActionEditor(QWidget* parent, KisRecordedAction* action) : QWidget(parent),
         m_action(dynamic_cast<KisRecordedPaintAction*>(action)),
         m_actionEditor(new Ui_WdgPaintActionEditor),
         m_configWidget(0)
 {
     Q_ASSERT(m_action);
     m_actionEditor->setupUi(this);
 
     // Setup paint color editor
     m_paintColorPopup = new KoColorPopupAction(this);
     m_paintColorPopup->setCurrentColor(m_action->paintColor());
     m_actionEditor->paintColor->setDefaultAction(m_paintColorPopup);
     connect(m_paintColorPopup, SIGNAL(colorChanged(const KoColor &)),
             this, SLOT(configurationUpdated()));
 
     // Setup background color editor
     m_backgroundColorPopup = new KoColorPopupAction(this);
     m_backgroundColorPopup->setCurrentColor(m_action->backgroundColor());
     m_actionEditor->backgroundColor->setDefaultAction(m_backgroundColorPopup);
     connect(m_backgroundColorPopup, SIGNAL(colorChanged(const KoColor &)),
             this, SLOT(configurationUpdated()));
 
     // Setup opacity
     m_actionEditor->opacity->setValue(m_action->opacity() * 100.0);
     connect(m_actionEditor->opacity, SIGNAL(valueChanged(int)), SLOT(configurationUpdated()));
 
     // Setup paint ops
 
     QList<KoID> keys = KisPaintOpRegistry::instance()->listKeys();
     Q_FOREACH (const KoID& paintopId, keys) {
         QString pixmapName = KisPaintOpRegistry::instance()->pixmap(paintopId);
 
         QPixmap pm;
         if (!pixmapName.isEmpty()) {
             QString fname = KoResourcePaths::findResource("kis_images", pixmapName);
             pm = QPixmap(fname);
         }
 
 
         if (pm.isNull()) {
             pm = QPixmap(16, 16);
             pm.fill();
         }
 
         m_actionEditor->paintOps->addItem(QIcon(pm), paintopId.name());
         m_paintops.append(paintopId.id());
     }
     connect(m_actionEditor->paintOps, SIGNAL(activated(int)), SLOT(paintOpChanged(int)));
 
     // Setup configuration widget for paint op settings
     m_gridLayout = new QGridLayout(m_actionEditor->frmOptionWidgetContainer);
     setPaintOpPreset();
     m_actionEditor->paintOps->setCurrentIndex(m_paintops.indexOf(m_action->paintOpPreset()->paintOp().id()));
     m_paintOpsToPreset[m_action->paintOpPreset()->paintOp().id()] = m_action->paintOpPreset();
     connect(m_actionEditor->wdgPresetChooser, SIGNAL(resourceSelected(KoResource*)), SLOT(resourceSelected(KoResource*)));
 
     // Setup the query path editor
     m_actionEditor->nodeQueryPathEditor->setNodeQueryPath(m_action->nodeQueryPath());
     connect(m_actionEditor->nodeQueryPathEditor, SIGNAL(nodeQueryPathChanged()), SLOT(nodeQueryPathChanged()));
     
 }
 
 KisRecordedPaintActionEditor::~KisRecordedPaintActionEditor()
 {
     delete m_actionEditor;
 }
 
 void KisRecordedPaintActionEditor::configurationUpdated()
 {
-    m_configWidget->writeConfiguration(const_cast<KisPaintOpSettings*>(m_action->paintOpPreset()->settings().data()));
+    m_configWidget->writeConfigurationSafe(const_cast<KisPaintOpSettings*>(m_action->paintOpPreset()->settings().data()));
 
     m_action->setPaintColor(m_paintColorPopup->currentKoColor());
     m_action->setBackgroundColor(m_backgroundColorPopup->currentKoColor());
     m_action->setOpacity(m_actionEditor->opacity->value() / qreal(100.0));
 
     emit(actionEdited());
 }
 
 void KisRecordedPaintActionEditor::paintOpChanged(int index)
 {
     QString id = m_paintops[index];
     KisPaintOpPresetSP preset = m_paintOpsToPreset[id];
     if (!preset) {
         preset = KisPaintOpRegistry::instance()->defaultPreset(KoID(id, ""));
         m_paintOpsToPreset[id] = preset;
     }
     m_action->setPaintOpPreset(preset);
     setPaintOpPreset();
 }
 
 void KisRecordedPaintActionEditor::resourceSelected(KoResource* resource)
 {
     KisPaintOpPresetSP preset = static_cast<KisPaintOpPreset*>(resource);
 
     m_paintOpsToPreset[preset->paintOp().id()] = preset;
     m_action->setPaintOpPreset(preset);
     setPaintOpPreset();
 }
 
 void KisRecordedPaintActionEditor::nodeQueryPathChanged()
 {
     m_action->setNodeQueryPath(m_actionEditor->nodeQueryPathEditor->nodeQueryPath());
     emit(actionEdited());
 }
 
 
 void KisRecordedPaintActionEditor::setPaintOpPreset()
 {
     delete m_configWidget;
     m_configWidget = KisPaintOpRegistry::instance()->get(m_action->paintOpPreset()->paintOp().id())->createConfigWidget(m_actionEditor->frmOptionWidgetContainer);
     if (m_configWidget) {
         m_gridLayout->addWidget(m_configWidget);
         //TODO use default configuration instead?
         //m_configWidget->setConfiguration(m_action->paintOpPreset()->settings());
         connect(m_configWidget, SIGNAL(sigConfigurationUpdated()), SLOT(configurationUpdated()));
     } else {
         m_gridLayout->addWidget(new QLabel(i18n("No configuration option."), this));
     }
 }
 
 KisRecordedPaintActionEditorFactory::KisRecordedPaintActionEditorFactory()
 {
 }
 
 KisRecordedPaintActionEditorFactory::~KisRecordedPaintActionEditorFactory()
 {
 }
 
 QWidget* KisRecordedPaintActionEditorFactory::createEditor(QWidget* parent, KisRecordedAction* action) const
 {
     return new KisRecordedPaintActionEditor(parent, action);
 }
 
 bool KisRecordedPaintActionEditorFactory::canEdit(const KisRecordedAction* action) const
 {
     return dynamic_cast<const KisRecordedPaintAction*>(action);
 }
 
diff --git a/libs/ui/tests/CMakeLists.txt b/libs/ui/tests/CMakeLists.txt
index 7219220ac3..44d6c9549e 100644
--- a/libs/ui/tests/CMakeLists.txt
+++ b/libs/ui/tests/CMakeLists.txt
@@ -1,261 +1,274 @@
 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_derived_resources_test_SRCS kis_derived_resources_test.cpp)
+kde4_add_unit_test(KisDerivedResourcesTest TESTNAME krita-ui-DerivedResourcesTest ${kis_derived_resources_test_SRCS})
+target_link_libraries(KisDerivedResourcesTest kritaui Qt5::Test)
+
+########### next target ###############
+
+set(kis_brush_hud_properties_config_test_SRCS kis_brush_hud_properties_config_test.cpp)
+kde4_add_unit_test(KisBrushHudPropertiesConfigTest TESTNAME krita-ui-BrushHudPropertiesConfigTest ${kis_brush_hud_properties_config_test_SRCS})
+target_link_libraries(KisBrushHudPropertiesConfigTest kritaui Qt5::Test)
+
diff --git a/libs/ui/tests/kis_brush_hud_properties_config_test.cpp b/libs/ui/tests/kis_brush_hud_properties_config_test.cpp
new file mode 100644
index 0000000000..6a66ccfcb1
--- /dev/null
+++ b/libs/ui/tests/kis_brush_hud_properties_config_test.cpp
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2016 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_brush_hud_properties_config_test.h"
+
+#include <QTest>
+#include "brushhud/kis_brush_hud_properties_config.h"
+#include <QDomDocument>
+
+#include "kis_debug.h"
+
+
+void KisBrushHudPropertiesConfigTest::test()
+{
+    {
+        KisBrushHudPropertiesConfig cfg;
+
+        QList<QString> properties1;
+        properties1 << "prop1";
+        properties1 << "prop2";
+        properties1 << "prop3";
+        cfg.setSelectedProperties("brush1", properties1);
+
+        QList<QString> properties2;
+        properties2 << "prop4";
+        properties2 << "prop5";
+        properties2 << "prop6";
+        cfg.setSelectedProperties("brush2", properties2);
+
+        // {
+        //     qDebug() << "===========================";
+        //     QString str = cfg.testingGetDocument()->toString(4);
+        //     printf(str.toLatin1());
+        // }
+
+        properties1.clear();
+        properties1 << "prop7";
+        properties1 << "prop8";
+        cfg.setSelectedProperties("brush1", properties1);
+
+        // {
+        //     qDebug() << "===========================";
+        //     QString str = cfg.testingGetDocument()->toString(4);
+        //     printf(str.toLatin1());
+        // }
+
+        properties1.clear();
+        properties1 = cfg.selectedProperties("brush1");
+
+        QCOMPARE(properties1.size(), 2);
+        QCOMPARE(properties1[0], QString("prop7"));
+        QCOMPARE(properties1[1], QString("prop8"));
+    }
+
+    {
+        KisBrushHudPropertiesConfig cfg;
+        QList<QString> properties1;
+        properties1 = cfg.selectedProperties("brush1");
+
+        // qDebug() << "===========================";
+        // qDebug() << ppVar(properties1);
+
+        QCOMPARE(properties1.size(), 2);
+        QCOMPARE(properties1[0], QString("prop7"));
+        QCOMPARE(properties1[1], QString("prop8"));
+    }
+}
+
+QTEST_MAIN(KisBrushHudPropertiesConfigTest)
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp b/libs/ui/tests/kis_brush_hud_properties_config_test.h
similarity index 68%
copy from plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
copy to libs/ui/tests/kis_brush_hud_properties_config_test.h
index 52e27bc653..378bff87f5 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
+++ b/libs/ui/tests/kis_brush_hud_properties_config_test.h
@@ -1,28 +1,31 @@
 /*
- *  Copyright (c) 2008,2009 Lukáš Tvrdý <lukast.dev@gmail.com>
+ *  Copyright (c) 2016 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_curve_paintop_settings.h>
-#include <kis_paint_action_type_option.h>
 
-KisCurvePaintOpSettings::KisCurvePaintOpSettings()
-{
-}
+#ifndef __KIS_BRUSH_HUD_PROPERTIES_CONFIG_TEST_H
+#define __KIS_BRUSH_HUD_PROPERTIES_CONFIG_TEST_H
+
+#include <QtTest/QtTest>
 
-bool KisCurvePaintOpSettings::paintIncremental()
+class KisBrushHudPropertiesConfigTest : public QObject
 {
-    return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
-}
+    Q_OBJECT
+private Q_SLOTS:
+    void test();
+};
+
+#endif /* __KIS_BRUSH_HUD_PROPERTIES_CONFIG_TEST_H */
diff --git a/libs/ui/tests/kis_derived_resources_test.cpp b/libs/ui/tests/kis_derived_resources_test.cpp
new file mode 100644
index 0000000000..a19198426e
--- /dev/null
+++ b/libs/ui/tests/kis_derived_resources_test.cpp
@@ -0,0 +1,106 @@
+/*
+ *  Copyright (c) 2016 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_derived_resources_test.h"
+
+#include <QTest>
+#include <brushengine/kis_paintop_preset.h>
+
+#include <QApplication>
+
+#include <KoCanvasResourceManager.h>
+
+#include "kis_canvas_resource_provider.h"
+#include <util.h>
+#include <KisMainWindow.h>
+#include <KisDocument.h>
+#include <KisPart.h>
+#include <KisView.h>
+#include <KisViewManager.h>
+#include <kis_paintop_settings.h>
+
+
+#include "testutil.h"
+
+
+
+void KisDerivedResourcesTest::test()
+{
+    KisDocument* doc = createEmptyDocument();
+    KisMainWindow* mainWindow = KisPart::instance()->createMainWindow();
+    QPointer<KisView> view = new KisView(doc, mainWindow->resourceManager(), mainWindow->actionCollection(), mainWindow);
+    KisViewManager *viewManager = new KisViewManager(mainWindow, mainWindow->actionCollection());
+    KoCanvasResourceManager *manager = viewManager->resourceProvider()->resourceManager();
+
+    QApplication::processEvents();
+
+    QString presetFileName = "autobrush_300px.kpp";
+
+    QVariant i;
+
+    KisPaintOpPresetSP preset;
+    if (!presetFileName.isEmpty()) {
+        QString fullFileName = TestUtil::fetchDataFileLazy(presetFileName);
+        preset = new KisPaintOpPreset(fullFileName);
+        bool presetValid = preset->load();
+        Q_ASSERT(presetValid); Q_UNUSED(presetValid);
+
+        i.setValue(preset);
+
+    }
+
+    QVERIFY(i.isValid());
+
+    QSignalSpy spy(manager, SIGNAL(canvasResourceChanged(int, const QVariant &)));
+
+    manager->setResource(KisCanvasResourceProvider::CurrentPaintOpPreset, i);
+
+    QCOMPARE(spy[0][0].toInt(), (int)KisCanvasResourceProvider::CurrentPaintOpPreset);
+    QCOMPARE(spy[0][1].value<KisPaintOpPresetSP>(), preset);
+
+    QCOMPARE(spy[1][0].toInt(), (int)KisCanvasResourceProvider::EraserMode);
+    QCOMPARE(spy[1][1].toBool(), false);
+
+    QCOMPARE(spy[2][0].toInt(), (int)KisCanvasResourceProvider::LodAvailability);
+    QCOMPARE(spy[2][1].toBool(), true);
+
+    QCOMPARE(spy[3][0].toInt(), (int)KisCanvasResourceProvider::Opacity);
+    QCOMPARE(spy[3][1].toDouble(), 1.0);
+
+    QCOMPARE(spy[4][0].toInt(), (int)KisCanvasResourceProvider::CurrentEffectiveCompositeOp);
+    QCOMPARE(spy[4][1].toString(), COMPOSITE_OVER);
+
+    spy.clear();
+
+    preset->settings()->setPaintOpOpacity(0.8);
+
+    QCOMPARE(spy.size(), 1);
+    QCOMPARE(spy[0][0].toInt(), (int)KisCanvasResourceProvider::Opacity);
+    QCOMPARE(spy[0][1].toDouble(), 0.8);
+    spy.clear();
+
+
+    mainWindow->hide();
+    QApplication::processEvents();
+
+    delete view;
+    delete doc;
+    delete mainWindow;
+}
+
+QTEST_MAIN(KisDerivedResourcesTest)
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp b/libs/ui/tests/kis_derived_resources_test.h
similarity index 69%
copy from plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
copy to libs/ui/tests/kis_derived_resources_test.h
index 52e27bc653..813c9821ec 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
+++ b/libs/ui/tests/kis_derived_resources_test.h
@@ -1,28 +1,31 @@
 /*
- *  Copyright (c) 2008,2009 Lukáš Tvrdý <lukast.dev@gmail.com>
+ *  Copyright (c) 2016 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_curve_paintop_settings.h>
-#include <kis_paint_action_type_option.h>
 
-KisCurvePaintOpSettings::KisCurvePaintOpSettings()
-{
-}
+#ifndef __KIS_DERIVED_RESOURCES_TEST_H
+#define __KIS_DERIVED_RESOURCES_TEST_H
+
+#include <QtTest/QtTest>
 
-bool KisCurvePaintOpSettings::paintIncremental()
+class KisDerivedResourcesTest : public QObject
 {
-    return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
-}
+    Q_OBJECT
+private Q_SLOTS:
+    void test();
+};
+
+#endif /* __KIS_DERIVED_RESOURCES_TEST_H */
diff --git a/libs/ui/tool/kis_tool_freehand.cc b/libs/ui/tool/kis_tool_freehand.cc
index 9db40f76cf..23f19ec06c 100644
--- a/libs/ui/tool/kis_tool_freehand.cc
+++ b/libs/ui/tool/kis_tool_freehand.cc
@@ -1,431 +1,433 @@
 /*
  *  kis_tool_freehand.cc - part of Krita
  *
  *  Copyright (c) 2003-2007 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2004 Bart Coppens <kde@bartcoppens.be>
  *  Copyright (c) 2007,2008,2010 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2009 Lukáš Tvrdý <lukast.dev@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_tool_freehand.h"
 
 #include <QPainter>
 #include <QRect>
 #include <QThreadPool>
 
 #include <kis_icon.h>
 #include <KoPointerEvent.h>
 #include <KoViewConverter.h>
 #include <KoCanvasController.h>
 
 //pop up palette
 #include <kis_canvas_resource_provider.h>
 
 // Krita/image
 #include <kis_layer.h>
 #include <kis_paint_layer.h>
 #include <kis_painter.h>
 #include <brushengine/kis_paintop.h>
 #include <kis_selection.h>
 #include <brushengine/kis_paintop_preset.h>
 
 
 // Krita/ui
 #include "kis_abstract_perspective_grid.h"
 #include "kis_config.h"
 #include "canvas/kis_canvas2.h"
 #include "kis_cursor.h"
 #include <KisViewManager.h>
 #include <kis_painting_assistants_decoration.h>
 #include "kis_painting_information_builder.h"
 #include "kis_tool_freehand_helper.h"
 #include "kis_recording_adapter.h"
 #include "strokes/freehand_stroke.h"
 
 
 KisToolFreehand::KisToolFreehand(KoCanvasBase * canvas, const QCursor & cursor, const KUndo2MagicString &transactionText)
     : KisToolPaint(canvas, cursor),
       m_paintopBasedPickingInAction(false)
 {
     m_assistant = false;
     m_magnetism = 1.0;
     m_only_one_assistant = true;
 
     setSupportOutline(true);
     setMaskSyntheticEvents(true); // Disallow mouse events from finger presses.
 
     m_infoBuilder = new KisToolFreehandPaintingInformationBuilder(this);
     m_recordingAdapter = new KisRecordingAdapter();
     m_helper = new KisToolFreehandHelper(m_infoBuilder, transactionText, m_recordingAdapter);
 
     connect(m_helper, SIGNAL(requestExplicitUpdateOutline()),
             SLOT(explicitUpdateOutline()));
 }
 
 KisToolFreehand::~KisToolFreehand()
 {
     delete m_helper;
     delete m_recordingAdapter;
     delete m_infoBuilder;
 }
 
 KisSmoothingOptionsSP KisToolFreehand::smoothingOptions() const
 {
     return m_helper->smoothingOptions();
 }
 
 void KisToolFreehand::resetCursorStyle()
 {
     KisConfig cfg;
 
     switch (cfg.newCursorStyle()) {
     case CURSOR_STYLE_NO_CURSOR:
         useCursor(KisCursor::blankCursor());
         break;
     case CURSOR_STYLE_POINTER:
         useCursor(KisCursor::arrowCursor());
         break;
     case CURSOR_STYLE_SMALL_ROUND:
         useCursor(KisCursor::roundCursor());
         break;
     case CURSOR_STYLE_CROSSHAIR:
         useCursor(KisCursor::crossCursor());
         break;
     case CURSOR_STYLE_TRIANGLE_RIGHTHANDED:
         useCursor(KisCursor::triangleRightHandedCursor());
         break;
     case CURSOR_STYLE_TRIANGLE_LEFTHANDED:
         useCursor(KisCursor::triangleLeftHandedCursor());
         break;
     case CURSOR_STYLE_BLACK_PIXEL:
         useCursor(KisCursor::pixelBlackCursor());
         break;
     case CURSOR_STYLE_WHITE_PIXEL:
         useCursor(KisCursor::pixelWhiteCursor());
         break;
     case CURSOR_STYLE_TOOLICON:
     default:
         KisToolPaint::resetCursorStyle();
         break;
     }
 }
 
 KisPaintingInformationBuilder* KisToolFreehand::paintingInformationBuilder() const
 {
     return m_infoBuilder;
 }
 
 KisRecordingAdapter* KisToolFreehand::recordingAdapter() const
 {
     return m_recordingAdapter;
 }
 
 void KisToolFreehand::resetHelper(KisToolFreehandHelper *helper)
 {
     delete m_helper;
     m_helper = helper;
 }
 
 int KisToolFreehand::flags() const
 {
     return KisTool::FLAG_USES_CUSTOM_COMPOSITEOP|KisTool::FLAG_USES_CUSTOM_PRESET;
 }
 
 void KisToolFreehand::activate(ToolActivation activation, const QSet<KoShape*> &shapes)
 {
     KisToolPaint::activate(activation, shapes);
 }
 
 void KisToolFreehand::deactivate()
 {
     if (mode() == PAINT_MODE) {
         endStroke();
         setMode(KisTool::HOVER_MODE);
     }
     KisToolPaint::deactivate();
 }
 
 void KisToolFreehand::initStroke(KoPointerEvent *event)
 {
     setCurrentNodeLocked(true);
 
     m_helper->initPaint(event, canvas()->resourceManager(),
                         image(),
                         currentNode(),
                         image().data(),
                         image()->postExecutionUndoAdapter());
 }
 
 void KisToolFreehand::doStroke(KoPointerEvent *event)
 {
     //set canvas information here?//
     KisCanvas2 *canvas2 = dynamic_cast<KisCanvas2 *>(canvas());
     if (canvas2) {
         m_helper->setCanvasHorizontalMirrorState(canvas2->xAxisMirrored());
         m_helper->setCanvasRotation(canvas2->rotationAngle());
     }
     m_helper->paint(event);
 }
 
 void KisToolFreehand::endStroke()
 {
     m_helper->endPaint();
     setCurrentNodeLocked(false);
 }
 
 bool KisToolFreehand::primaryActionSupportsHiResEvents() const
 {
     return true;
 }
 
 void KisToolFreehand::beginPrimaryAction(KoPointerEvent *event)
 {
     // FIXME: workaround for the Duplicate Op
     tryPickByPaintOp(event, PickFgImage);
 
     requestUpdateOutline(event->point, event);
 
     NodePaintAbility paintability = nodePaintAbility();
     if (!nodeEditable() || paintability != PAINT) {
         if(paintability == KisToolPaint::VECTOR){
             KisCanvas2 * kiscanvas = static_cast<KisCanvas2*>(canvas());
             QString message = i18n("The brush tool cannot paint on this layer.  Please select a paint layer or mask.");
             kiscanvas->viewManager()->showFloatingMessage(message, koIcon("object-locked"));
         }
         event->ignore();
 
         return;
     }
 
     setMode(KisTool::PAINT_MODE);
 
     KisCanvas2 *canvas2 = dynamic_cast<KisCanvas2 *>(canvas());
     if (canvas2) {
         canvas2->viewManager()->disableControls();
     }
 
     initStroke(event);
 }
 
 void KisToolFreehand::continuePrimaryAction(KoPointerEvent *event)
 {
     CHECK_MODE_SANITY_OR_RETURN(KisTool::PAINT_MODE);
 
     requestUpdateOutline(event->point, event);
 
     /**
      * Actual painting
      */
     doStroke(event);
 }
 
 void KisToolFreehand::endPrimaryAction(KoPointerEvent *event)
 {
     Q_UNUSED(event);
     CHECK_MODE_SANITY_OR_RETURN(KisTool::PAINT_MODE);
 
     endStroke();
 
     if (m_assistant && static_cast<KisCanvas2*>(canvas())->paintingAssistantsDecoration()) {
         static_cast<KisCanvas2*>(canvas())->paintingAssistantsDecoration()->endStroke();
     }
 
     notifyModified();
     KisCanvas2 *canvas2 = dynamic_cast<KisCanvas2 *>(canvas());
     if (canvas2) {
         canvas2->viewManager()->enableControls();
     }
 
     setMode(KisTool::HOVER_MODE);
 }
 
 bool KisToolFreehand::tryPickByPaintOp(KoPointerEvent *event, AlternateAction action)
 {
     if (action != PickFgNode && action != PickFgImage) return false;
 
     /**
      * FIXME: we need some better way to implement modifiers
      * for a paintop level. This method is used in DuplicateOp only!
      */
     QPointF pos = adjustPosition(event->point, event->point);
     qreal perspective = 1.0;
     Q_FOREACH (const QPointer<KisAbstractPerspectiveGrid> grid, static_cast<KisCanvas2*>(canvas())->viewManager()->resourceProvider()->perspectiveGrids()) {
         if (grid && grid->contains(pos)) {
             perspective = grid->distance(pos);
             break;
         }
     }
     if (!currentPaintOpPreset()) {
         return false;
     }
     bool paintOpIgnoredEvent = currentPaintOpPreset()->settings()->
         mousePressEvent(KisPaintInformation(convertToPixelCoord(event->point),
                                             pressureToCurve(event->pressure()),
                                             event->xTilt(), event->yTilt(),
                                             event->rotation(),
                                             event->tangentialPressure(),
                                             perspective, 0, 0),
                         event->modifiers(),
                         currentNode());
     return !paintOpIgnoredEvent;
 }
 
 void KisToolFreehand::activateAlternateAction(AlternateAction action)
 {
     if (action != ChangeSize) {
         KisToolPaint::activateAlternateAction(action);
         return;
     }
 
     useCursor(KisCursor::blankCursor());
     setOutlineEnabled(true);
 }
 
 void KisToolFreehand::deactivateAlternateAction(AlternateAction action)
 {
     if (action != ChangeSize) {
         KisToolPaint::deactivateAlternateAction(action);
         return;
     }
 
     resetCursorStyle();
     setOutlineEnabled(false);
 }
 
 void KisToolFreehand::beginAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (tryPickByPaintOp(event, action)) {
         m_paintopBasedPickingInAction = true;
         return;
     }
 
     if (action != ChangeSize) {
         KisToolPaint::beginAlternateAction(event, action);
         return;
     }
 
     setMode(GESTURE_MODE);
     m_initialGestureDocPoint = event->point;
     m_initialGestureGlobalPoint = QCursor::pos();
 
     m_lastDocumentPoint = event->point;
 }
 
 void KisToolFreehand::continueAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (tryPickByPaintOp(event, action) || m_paintopBasedPickingInAction) return;
 
     if (action != ChangeSize) {
         KisToolPaint::continueAlternateAction(event, action);
         return;
     }
 
     QPointF lastWidgetPosition = convertDocumentToWidget(m_lastDocumentPoint);
     QPointF actualWidgetPosition = convertDocumentToWidget(event->point);
 
     QPointF offset = actualWidgetPosition - lastWidgetPosition;
 
     /**
      * view pixels != widget pixels, but we do this anyway, we only
      * need to scale the gesture down, not rotate or anything
      */
     QPointF scaledOffset = canvas()->viewConverter()->viewToDocument(offset);
 
     if (qRound(scaledOffset.x()) != 0) {
-        currentPaintOpPreset()->settings()->changePaintOpSize(scaledOffset.x(), scaledOffset.y());
+        KisPaintOpSettingsSP settings = currentPaintOpPreset()->settings();
+        const qreal newSize = settings->paintOpSize() + scaledOffset.x();
+        settings->setPaintOpSize(newSize);
         requestUpdateOutline(m_initialGestureDocPoint, 0);
 
         m_lastDocumentPoint = event->point;
     }
 }
 
 void KisToolFreehand::endAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (tryPickByPaintOp(event, action) || m_paintopBasedPickingInAction) {
         m_paintopBasedPickingInAction = false;
         return;
     }
 
     if (action != ChangeSize) {
         KisToolPaint::endAlternateAction(event, action);
         return;
     }
 
     QCursor::setPos(m_initialGestureGlobalPoint);
     requestUpdateOutline(m_initialGestureDocPoint, 0);
 
     setMode(HOVER_MODE);
 }
 
 bool KisToolFreehand::wantsAutoScroll() const
 {
     return false;
 }
 
 void KisToolFreehand::setAssistant(bool assistant)
 {
     m_assistant = assistant;
 }
 
 void KisToolFreehand::setOnlyOneAssistantSnap(bool assistant)
 {
     m_only_one_assistant = assistant;
 }
 
 QPointF KisToolFreehand::adjustPosition(const QPointF& point, const QPointF& strokeBegin)
 {
     if (m_assistant && static_cast<KisCanvas2*>(canvas())->paintingAssistantsDecoration()) {
         static_cast<KisCanvas2*>(canvas())->paintingAssistantsDecoration()->setOnlyOneAssistantSnap(m_only_one_assistant);
         QPointF ap = static_cast<KisCanvas2*>(canvas())->paintingAssistantsDecoration()->adjustPosition(point, strokeBegin);
         return (1.0 - m_magnetism) * point + m_magnetism * ap;
     }
     return point;
 }
 
 qreal KisToolFreehand::calculatePerspective(const QPointF &documentPoint)
 {
     qreal perspective = 1.0;
     Q_FOREACH (const QPointer<KisAbstractPerspectiveGrid> grid, static_cast<KisCanvas2*>(canvas())->viewManager()->resourceProvider()->perspectiveGrids()) {
         if (grid && grid->contains(documentPoint)) {
             perspective = grid->distance(documentPoint);
             break;
         }
     }
     return perspective;
 }
 
 void KisToolFreehand::explicitUpdateOutline()
 {
     requestUpdateOutline(m_outlineDocPoint, 0);
 }
 
 QPainterPath KisToolFreehand::getOutlinePath(const QPointF &documentPos,
                                              const KoPointerEvent *event,
                                              KisPaintOpSettings::OutlineMode outlineMode)
 {
     QPointF imagePos = currentImage()->documentToPixel(documentPos);
 
     if (currentPaintOpPreset())
         return m_helper->paintOpOutline(imagePos,
                                         event,
                                         currentPaintOpPreset()->settings(),
                                         outlineMode);
     else
         return QPainterPath();
 }
 
 
diff --git a/libs/ui/tool/kis_tool_paint.cc b/libs/ui/tool/kis_tool_paint.cc
index 8f99784fa4..27147a937c 100644
--- a/libs/ui/tool/kis_tool_paint.cc
+++ b/libs/ui/tool/kis_tool_paint.cc
@@ -1,775 +1,772 @@
 /*
  *  Copyright (c) 2003-2009 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2015 Moritz Molch <kde@moritzmolch.de>
  *
  *  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_tool_paint.h"
 
 #include <algorithm>
 
 #include <QWidget>
 #include <QRect>
 #include <QLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QWhatsThis>
 #include <QCheckBox>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QKeyEvent>
 #include <QEvent>
 #include <QVariant>
 #include <QAction>
 #include <kis_debug.h>
 #include <QPoint>
 
 #include <kis_debug.h>
 #include <klocalizedstring.h>
 #include <kactioncollection.h>
 #include <QAction>
 
 #include <kis_icon.h>
 #include <KoShape.h>
 #include <KoCanvasResourceManager.h>
 #include <KoColorSpace.h>
 #include <KoPointerEvent.h>
 #include <KoColor.h>
 #include <KoCanvasBase.h>
 #include <KoCanvasController.h>
 
 #include <kis_types.h>
 #include <kis_global.h>
 #include <kis_image.h>
 #include <kis_paint_device.h>
 #include <kis_layer.h>
 #include <KisViewManager.h>
 #include <kis_canvas2.h>
 #include <kis_cubic_curve.h>
 #include "kis_display_color_converter.h"
 
 #include "kis_config.h"
 #include "kis_config_notifier.h"
 #include "kis_cursor.h"
 #include "widgets/kis_cmb_composite.h"
 #include "widgets/kis_slider_spin_box.h"
 #include "kis_canvas_resource_provider.h"
 #include <recorder/kis_recorded_paint_action.h>
 #include "kis_tool_utils.h"
 #include <brushengine/kis_paintop.h>
 #include <brushengine/kis_paintop_preset.h>
 #include <kis_action_manager.h>
 #include <kis_action.h>
 #include "strokes/kis_color_picker_stroke_strategy.h"
 
 
 KisToolPaint::KisToolPaint(KoCanvasBase * canvas, const QCursor & cursor)
     : KisTool(canvas, cursor),
       m_showColorPreview(false),
       m_colorPreviewShowComparePlate(false),
       m_colorPickerDelayTimer(),
       m_isOutlineEnabled(true)
 {
     m_specialHoverModifier = false;
     m_optionsWidgetLayout = 0;
 
     m_opacity = OPACITY_OPAQUE_U8;
 
     updateTabletPressureSamples();
 
     m_supportOutline = false;
 
     {
         const int maxSize = 1000;
 
         int brushSize = 1;
         do {
             m_standardBrushSizes.push_back(brushSize);
             int increment = qMax(1, int(std::ceil(qreal(brushSize) / 15)));
             brushSize += increment;
         } while (brushSize < maxSize);
 
         m_standardBrushSizes.push_back(maxSize);
     }
 
     KisCanvas2 * kiscanvas = dynamic_cast<KisCanvas2*>(canvas);
     KisActionManager *actionManager = kiscanvas->viewManager()->actionManager();
 
     // XXX: Perhaps a better place for these?
     if (!actionManager->actionByName("increase_brush_size")) {
         KisAction *increaseBrushSize = new KisAction(i18n("Increase Brush Size"));
         increaseBrushSize->setShortcut(Qt::Key_BracketRight);
         actionManager->addAction("increase_brush_size", increaseBrushSize);
     }
 
     if (!actionManager->actionByName("decrease_brush_size")) {
         KisAction *decreaseBrushSize = new KisAction(i18n("Decrease Brush Size"));
         decreaseBrushSize->setShortcut(Qt::Key_BracketLeft);
         actionManager->addAction("decrease_brush_size", decreaseBrushSize);
     }
 
     addAction("increase_brush_size", dynamic_cast<QAction *>(actionManager->actionByName("increase_brush_size")));
     addAction("decrease_brush_size", dynamic_cast<QAction *>(actionManager->actionByName("decrease_brush_size")));
 
     if (kiscanvas && kiscanvas->viewManager()) {
         connect(this, SIGNAL(sigPaintingFinished()), kiscanvas->viewManager()->resourceProvider(), SLOT(slotPainting()));
     }
 
     m_colorPickerDelayTimer.setSingleShot(true);
     connect(&m_colorPickerDelayTimer, SIGNAL(timeout()), this, SLOT(activatePickColorDelayed()));
 
     using namespace std::placeholders; // For _1 placeholder
     std::function<void(PickingJob)> callback =
         std::bind(&KisToolPaint::addPickerJob, this, _1);
     m_colorPickingCompressor.reset(
         new PickingCompressor(100, callback, KisSignalCompressor::FIRST_ACTIVE));
 }
 
 
 KisToolPaint::~KisToolPaint()
 {
 }
 
 int KisToolPaint::flags() const
 {
     return KisTool::FLAG_USES_CUSTOM_COMPOSITEOP;
 }
 
 void KisToolPaint::canvasResourceChanged(int key, const QVariant& v)
 {
     KisTool::canvasResourceChanged(key, v);
 
     switch(key) {
     case(KisCanvasResourceProvider::Opacity):
         setOpacity(v.toDouble());
         break;
     default: //nothing
         break;
     }
 
     connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(resetCursorStyle()), Qt::UniqueConnection);
     connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(updateTabletPressureSamples()), Qt::UniqueConnection);
 
 }
 
 
 void KisToolPaint::activate(ToolActivation toolActivation, const QSet<KoShape*> &shapes)
 {
     if (currentPaintOpPreset()) emit statusTextChanged(currentPaintOpPreset()->name());
     KisTool::activate(toolActivation, shapes);
     connect(actions().value("increase_brush_size"), SIGNAL(triggered()), SLOT(increaseBrushSize()), Qt::UniqueConnection);
     connect(actions().value("decrease_brush_size"), SIGNAL(triggered()), SLOT(decreaseBrushSize()), Qt::UniqueConnection);
 }
 
 void KisToolPaint::deactivate()
 {
     disconnect(actions().value("increase_brush_size"), 0, this, 0);
     disconnect(actions().value("decrease_brush_size"), 0, this, 0);
     KisTool::deactivate();
 }
 
 QPainterPath KisToolPaint::tryFixBrushOutline(const QPainterPath &originalOutline)
 {
     KisConfig cfg;
     if (cfg.newOutlineStyle() == OUTLINE_NONE) return originalOutline;
 
     const qreal minThresholdSize = cfg.outlineSizeMinimum();
 
     /**
      * If the brush outline is bigger than the canvas itself (which
      * would make it invisible for a user in most of the cases) just
      * add a cross in the center of it
      */
 
     QSize widgetSize = canvas()->canvasWidget()->size();
     const int maxThresholdSum = widgetSize.width() + widgetSize.height();
 
     QPainterPath outline = originalOutline;
     QRectF boundingRect = outline.boundingRect();
     const qreal sum = boundingRect.width() + boundingRect.height();
 
     QPointF center = boundingRect.center();
 
     if (sum > maxThresholdSum) {
         const int hairOffset = 7;
 
         outline.moveTo(center.x(), center.y() - hairOffset);
         outline.lineTo(center.x(), center.y() + hairOffset);
 
         outline.moveTo(center.x() - hairOffset, center.y());
         outline.lineTo(center.x() + hairOffset, center.y());
     } else if (sum < minThresholdSize && !outline.isEmpty()) {
         outline = QPainterPath();
         outline.addEllipse(center, 0.5 * minThresholdSize, 0.5 * minThresholdSize);
     }
 
     return outline;
 }
 
 void KisToolPaint::paint(QPainter &gc, const KoViewConverter &converter)
 {
     Q_UNUSED(converter);
 
     QPainterPath path = tryFixBrushOutline(pixelToView(m_currentOutline));
     paintToolOutline(&gc, path);
 
     if (m_showColorPreview) {
         QRectF viewRect = converter.documentToView(m_oldColorPreviewRect);
         gc.fillRect(viewRect, m_colorPreviewCurrentColor);
 
         if (m_colorPreviewShowComparePlate) {
             QRectF baseColorRect = viewRect.translated(viewRect.width(), 0);
             gc.fillRect(baseColorRect, m_colorPreviewBaseColor);
         }
     }
 }
 
 void KisToolPaint::setMode(ToolMode mode)
 {
     if(this->mode() == KisTool::PAINT_MODE &&
             mode != KisTool::PAINT_MODE) {
 
         // Let's add history information about recently used colors
         emit sigPaintingFinished();
     }
 
     KisTool::setMode(mode);
 }
 
 void KisToolPaint::activatePickColor(AlternateAction action)
 {
     m_showColorPreview = true;
 
     requestUpdateOutline(m_outlineDocPoint, 0);
 
     int resource = colorPreviewResourceId(action);
     KoColor color = canvas()->resourceManager()->koColorResource(resource);
 
     KisCanvas2 * kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
     KIS_ASSERT_RECOVER_RETURN(kisCanvas);
 
     m_colorPreviewCurrentColor = kisCanvas->displayColorConverter()->toQColor(color);
 
     if (!m_colorPreviewBaseColor.isValid()) {
         m_colorPreviewBaseColor = m_colorPreviewCurrentColor;
     }
 }
 
 void KisToolPaint::deactivatePickColor(AlternateAction action)
 {
     Q_UNUSED(action);
 
     m_showColorPreview = false;
     m_oldColorPreviewRect = QRect();
     m_oldColorPreviewUpdateRect = QRect();
     m_colorPreviewCurrentColor = QColor();
 }
 
 void KisToolPaint::pickColorWasOverridden()
 {
     m_colorPreviewShowComparePlate = false;
     m_colorPreviewBaseColor = QColor();
 }
 
 void KisToolPaint::activateAlternateAction(AlternateAction action)
 {
     switch (action) {
     case PickFgNode:
     case PickBgNode:
     case PickFgImage:
     case PickBgImage:
         delayedAction = action;
         m_colorPickerDelayTimer.start(100);
     default:
         pickColorWasOverridden();
         KisTool::activateAlternateAction(action);
     };
 }
 
 void KisToolPaint::activatePickColorDelayed()
 {
     switch (delayedAction) {
         case PickFgNode:
         useCursor(KisCursor::pickerLayerForegroundCursor());
         activatePickColor(delayedAction);
         break;
     case PickBgNode:
         useCursor(KisCursor::pickerLayerBackgroundCursor());
         activatePickColor(delayedAction);
         break;
     case PickFgImage:
         useCursor(KisCursor::pickerImageForegroundCursor());
         activatePickColor(delayedAction);
         break;
     case PickBgImage:
         useCursor(KisCursor::pickerImageBackgroundCursor());
         activatePickColor(delayedAction);
         break;
     default:
         break;
     };
 
     repaintDecorations();
 
 }
 
 bool KisToolPaint::isPickingAction(AlternateAction action) {
     return action == PickFgNode ||
         action == PickBgNode ||
         action == PickFgImage ||
         action == PickBgImage;
 }
 
 void KisToolPaint::deactivateAlternateAction(AlternateAction action)
 {
     if (!isPickingAction(action)) {
         KisTool::deactivateAlternateAction(action);
         return;
     }
 
     delayedAction = KisTool::NONE;
     m_colorPickerDelayTimer.stop();
 
     resetCursorStyle();
     deactivatePickColor(action);
 }
 
 void KisToolPaint::addPickerJob(const PickingJob &pickingJob)
 {
     /**
      * The actual picking is delayed by a compressor, so we can get this
      * event when the stroke is already closed
      */
     if (!m_pickerStrokeId) return;
 
     KIS_ASSERT_RECOVER_RETURN(isPickingAction(pickingJob.action));
 
     const QPoint imagePoint = image()->documentToIntPixel(pickingJob.documentPixel);
     const bool fromCurrentNode = pickingJob.action == PickFgNode || pickingJob.action == PickBgNode;
     m_pickingResource = colorPreviewResourceId(pickingJob.action);
 
     KisPaintDeviceSP device = fromCurrentNode ?
         currentNode()->projection() : image()->projection();
 
     image()->addJob(m_pickerStrokeId,
                     new KisColorPickerStrokeStrategy::Data(device, imagePoint));
 }
 
 void KisToolPaint::beginAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (isPickingAction(action)) {
         KIS_ASSERT_RECOVER_RETURN(!m_pickerStrokeId);
         setMode(SECONDARY_PAINT_MODE);
 
         KisColorPickerStrokeStrategy *strategy = new KisColorPickerStrokeStrategy();
         connect(strategy, &KisColorPickerStrokeStrategy::sigColorUpdated,
                 this, &KisToolPaint::slotColorPickingFinished);
 
         m_pickerStrokeId = image()->startStroke(strategy);
         m_colorPickingCompressor->start(PickingJob(event->point, action));
         requestUpdateOutline(event->point, event);
     } else {
         KisTool::beginAlternateAction(event, action);
     }
 }
 
 void KisToolPaint::continueAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (isPickingAction(action)) {
         KIS_ASSERT_RECOVER_RETURN(m_pickerStrokeId);
         m_colorPickingCompressor->start(PickingJob(event->point, action));
         requestUpdateOutline(event->point, event);
     } else {
         KisTool::continueAlternateAction(event, action);
     }
 }
 
 void KisToolPaint::endAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     if (isPickingAction(action)) {
         KIS_ASSERT_RECOVER_RETURN(m_pickerStrokeId);
         image()->endStroke(m_pickerStrokeId);
         m_pickerStrokeId.clear();
         requestUpdateOutline(event->point, event);
         setMode(HOVER_MODE);
     } else {
         KisTool::endAlternateAction(event, action);
     }
 }
 
 int KisToolPaint::colorPreviewResourceId(AlternateAction action)
 {
     bool toForegroundColor = action == PickFgNode || action == PickFgImage;
     int resource = toForegroundColor ?
         KoCanvasResourceManager::ForegroundColor : KoCanvasResourceManager::BackgroundColor;
 
     return resource;
 }
 
 void KisToolPaint::slotColorPickingFinished(const KoColor &color)
 {
     canvas()->resourceManager()->setResource(m_pickingResource, color);
 
     if (!m_showColorPreview) return;
 
     KisCanvas2 * kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
     KIS_ASSERT_RECOVER_RETURN(kisCanvas);
     QColor previewColor = kisCanvas->displayColorConverter()->toQColor(color);
 
     m_colorPreviewShowComparePlate = true;
     m_colorPreviewCurrentColor = previewColor;
 
     requestUpdateOutline(m_outlineDocPoint, 0);
 }
 
 void KisToolPaint::mousePressEvent(KoPointerEvent *event)
 {
     KisTool::mousePressEvent(event);
     if (mode() == KisTool::HOVER_MODE) {
         requestUpdateOutline(event->point, event);
     }
 }
 
 void KisToolPaint::mouseMoveEvent(KoPointerEvent *event)
 {
     KisTool::mouseMoveEvent(event);
     if (mode() == KisTool::HOVER_MODE) {
         requestUpdateOutline(event->point, event);
     }
 }
 
 void KisToolPaint::mouseReleaseEvent(KoPointerEvent *event)
 {
     KisTool::mouseReleaseEvent(event);
     if (mode() == KisTool::HOVER_MODE) {
         requestUpdateOutline(event->point, event);
     }
 }
 
 QWidget * KisToolPaint::createOptionWidget()
 {
     QWidget * optionWidget = new QWidget();
     optionWidget->setObjectName(toolId());
 
     QVBoxLayout* verticalLayout = new QVBoxLayout(optionWidget);
     verticalLayout->setObjectName("KisToolPaint::OptionWidget::VerticalLayout");
     verticalLayout->setContentsMargins(0,0,0,0);
     verticalLayout->setSpacing(1);
 
     // See https://bugs.kde.org/show_bug.cgi?id=316896
     QWidget *specialSpacer = new QWidget(optionWidget);
     specialSpacer->setObjectName("SpecialSpacer");
     specialSpacer->setFixedSize(0, 0);
     verticalLayout->addWidget(specialSpacer);
     verticalLayout->addWidget(specialSpacer);
 
     m_optionsWidgetLayout = new QGridLayout();
     m_optionsWidgetLayout->setColumnStretch(1, 1);
 
     verticalLayout->addLayout(m_optionsWidgetLayout);
     m_optionsWidgetLayout->setContentsMargins(0,0,0,0);
     m_optionsWidgetLayout->setSpacing(1);
 
     if (!quickHelp().isEmpty()) {
         QPushButton* push = new QPushButton(KisIconUtils::loadIcon("help-contents"), QString(), optionWidget);
         connect(push, SIGNAL(clicked()), this, SLOT(slotPopupQuickHelp()));
 
         QHBoxLayout* hLayout = new QHBoxLayout(optionWidget);
         hLayout->addWidget(push);
         hLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed));
         verticalLayout->addLayout(hLayout);
     }
 
     return optionWidget;
 }
 
 QWidget* findLabelWidget(QGridLayout *layout, QWidget *control)
 {
     QWidget *result = 0;
 
     int index = layout->indexOf(control);
 
     int row, col, rowSpan, colSpan;
     layout->getItemPosition(index, &row, &col, &rowSpan, &colSpan);
 
     if (col > 0) {
         QLayoutItem *item = layout->itemAtPosition(row, col - 1);
 
         if (item) {
             result = item->widget();
         }
     } else {
         QLayoutItem *item = layout->itemAtPosition(row, col + 1);
         if (item) {
             result = item->widget();
         }
     }
 
     return result;
 }
 
 void KisToolPaint::showControl(QWidget *control, bool value)
 {
     control->setVisible(value);
     QWidget *label = findLabelWidget(m_optionsWidgetLayout, control);
     if (label) {
         label->setVisible(value);
     }
 }
 
 void KisToolPaint::enableControl(QWidget *control, bool value)
 {
     control->setEnabled(value);
     QWidget *label = findLabelWidget(m_optionsWidgetLayout, control);
     if (label) {
         label->setEnabled(value);
     }
 }
 
 void KisToolPaint::addOptionWidgetLayout(QLayout *layout)
 {
     Q_ASSERT(m_optionsWidgetLayout != 0);
     int rowCount = m_optionsWidgetLayout->rowCount();
     m_optionsWidgetLayout->addLayout(layout, rowCount, 0, 1, 2);
 }
 
 
 void KisToolPaint::addOptionWidgetOption(QWidget *control, QWidget *label)
 {
     Q_ASSERT(m_optionsWidgetLayout != 0);
     if (label) {
         m_optionsWidgetLayout->addWidget(label, m_optionsWidgetLayout->rowCount(), 0);
         m_optionsWidgetLayout->addWidget(control, m_optionsWidgetLayout->rowCount() - 1, 1);
     }
     else {
         m_optionsWidgetLayout->addWidget(control, m_optionsWidgetLayout->rowCount(), 0, 1, 2);
     }
 }
 
 
 void KisToolPaint::setOpacity(qreal opacity)
 {
     m_opacity = quint8(opacity * OPACITY_OPAQUE_U8);
 }
 
 const KoCompositeOp* KisToolPaint::compositeOp()
 {
     if (currentNode()) {
         KisPaintDeviceSP device = currentNode()->paintDevice();
         if (device) {
             QString op = canvas()->resourceManager()->resource(KisCanvasResourceProvider::CurrentCompositeOp).toString();
             return device->colorSpace()->compositeOp(op);
         }
     }
     return 0;
 }
 
 void KisToolPaint::slotPopupQuickHelp()
 {
     QWhatsThis::showText(QCursor::pos(), quickHelp());
 }
 
 void KisToolPaint::updateTabletPressureSamples()
 {
     KisConfig cfg;
     KisCubicCurve curve;
     curve.fromString(cfg.pressureTabletCurve());
     m_pressureSamples = curve.floatTransfer(LEVEL_OF_PRESSURE_RESOLUTION + 1);
 }
 
 void KisToolPaint::setupPaintAction(KisRecordedPaintAction* action)
 {
     KisTool::setupPaintAction(action);
     action->setOpacity(m_opacity / qreal(255.0));
     const KoCompositeOp* op = compositeOp();
     if (op) {
         action->setCompositeOp(op->id());
     }
 }
 
 KisToolPaint::NodePaintAbility KisToolPaint::nodePaintAbility()
 {
     KisNodeSP node = currentNode();
     if (!node || node->systemLocked()) {
         return NONE;
     }
     if (node->inherits("KisShapeLayer")) {
         return VECTOR;
     }
     if (node->paintDevice()) {
         return PAINT;
     }
     return NONE;
 }
 
 void KisToolPaint::activatePrimaryAction()
 {
     pickColorWasOverridden();
     setOutlineEnabled(true);
     KisTool::activatePrimaryAction();
 }
 
 void KisToolPaint::deactivatePrimaryAction()
 {
     setOutlineEnabled(false);
     KisTool::deactivatePrimaryAction();
 }
 
 bool KisToolPaint::isOutlineEnabled() const
 {
     return m_isOutlineEnabled;
 }
 
 void KisToolPaint::setOutlineEnabled(bool value)
 {
     m_isOutlineEnabled = value;
     requestUpdateOutline(m_outlineDocPoint, 0);
 }
 
 void KisToolPaint::increaseBrushSize()
 {
-    qreal paintopSize = currentPaintOpPreset()->settings()->paintOpSize().width();
+    qreal paintopSize = currentPaintOpPreset()->settings()->paintOpSize();
 
     std::vector<int>::iterator result =
         std::upper_bound(m_standardBrushSizes.begin(),
                          m_standardBrushSizes.end(),
                          qRound(paintopSize));
 
     int newValue = result != m_standardBrushSizes.end() ? *result : m_standardBrushSizes.back();
 
-    qreal increment = newValue - paintopSize;
-
-    currentPaintOpPreset()->settings()->changePaintOpSize(increment, 0);
+    currentPaintOpPreset()->settings()->setPaintOpSize(newValue);
     requestUpdateOutline(m_outlineDocPoint, 0);
 }
 
 void KisToolPaint::decreaseBrushSize()
 {
-    qreal paintopSize = currentPaintOpPreset()->settings()->paintOpSize().width();
+    qreal paintopSize = currentPaintOpPreset()->settings()->paintOpSize();
 
     std::vector<int>::reverse_iterator result =
         std::upper_bound(m_standardBrushSizes.rbegin(),
                          m_standardBrushSizes.rend(),
                          (int)paintopSize,
                          std::greater<int>());
 
     int newValue = result != m_standardBrushSizes.rend() ? *result : m_standardBrushSizes.front();
-    qreal decrement = newValue - paintopSize;
 
-    currentPaintOpPreset()->settings()->changePaintOpSize(decrement, 0);
+    currentPaintOpPreset()->settings()->setPaintOpSize(newValue);
     requestUpdateOutline(m_outlineDocPoint, 0);
 }
 
 QRectF KisToolPaint::colorPreviewDocRect(const QPointF &outlineDocPoint)
 {
     if (!m_showColorPreview) return QRect();
 
     KisConfig cfg;
 
     const QRectF colorPreviewViewRect = cfg.colorPreviewRect();
     const QRectF colorPreviewDocumentRect = canvas()->viewConverter()->viewToDocument(colorPreviewViewRect);
 
     return colorPreviewDocumentRect.translated(outlineDocPoint);
 }
 
 void KisToolPaint::requestUpdateOutline(const QPointF &outlineDocPoint, const KoPointerEvent *event)
 {
     if (!m_supportOutline) return;
 
     KisConfig cfg;
     KisPaintOpSettings::OutlineMode outlineMode;
     outlineMode = KisPaintOpSettings::CursorNoOutline;
 
     if (isOutlineEnabled() &&
         (mode() == KisTool::GESTURE_MODE ||
          ((cfg.newOutlineStyle() == OUTLINE_FULL ||
            cfg.newOutlineStyle() == OUTLINE_CIRCLE ||
            cfg.newOutlineStyle() == OUTLINE_TILT ||
            cfg.newOutlineStyle() == OUTLINE_COLOR ) &&
           ((mode() == HOVER_MODE) ||
            (mode() == PAINT_MODE && cfg.showOutlineWhilePainting()))))) { // lisp forever!
 
         if(cfg.newOutlineStyle() == OUTLINE_CIRCLE) {
             outlineMode = KisPaintOpSettings::CursorIsCircleOutline;
         } else if(cfg.newOutlineStyle() == OUTLINE_TILT) {
             outlineMode = KisPaintOpSettings::CursorTiltOutline;
         } else if(cfg.newOutlineStyle() == OUTLINE_COLOR) {
             outlineMode = KisPaintOpSettings::CursorColorOutline;
         } else {
             outlineMode = KisPaintOpSettings::CursorIsOutline;
         }
     }
 
     m_outlineDocPoint = outlineDocPoint;
     m_currentOutline = getOutlinePath(m_outlineDocPoint, event, outlineMode);
 
     QRectF outlinePixelRect = m_currentOutline.boundingRect();
     QRectF outlineDocRect = currentImage()->pixelToDocument(outlinePixelRect);
 
     // This adjusted call is needed as we paint with a 3 pixel wide brush and the pen is outside the bounds of the path
     // Pen uses view coordinates so we have to zoom the document value to match 2 pixel in view coordiates
     // See BUG 275829
     qreal zoomX;
     qreal zoomY;
     canvas()->viewConverter()->zoom(&zoomX, &zoomY);
     qreal xoffset = 2.0/zoomX;
     qreal yoffset = 2.0/zoomY;
 
     if (!outlineDocRect.isEmpty()) {
         outlineDocRect.adjust(-xoffset,-yoffset,xoffset,yoffset);
     }
 
     QRectF colorPreviewDocRect = this->colorPreviewDocRect(m_outlineDocPoint);
     QRectF colorPreviewDocUpdateRect;
     if (!colorPreviewDocRect.isEmpty()) {
         colorPreviewDocUpdateRect.adjust(-xoffset,-yoffset,xoffset,yoffset);
     }
 
     if (!m_oldColorPreviewUpdateRect.isEmpty()) {
         canvas()->updateCanvas(m_oldColorPreviewUpdateRect);
     }
 
     if (!m_oldOutlineRect.isEmpty()) {
         canvas()->updateCanvas(m_oldOutlineRect);
     }
 
     if (!outlineDocRect.isEmpty()) {
         canvas()->updateCanvas(outlineDocRect);
     }
 
     if (!colorPreviewDocUpdateRect.isEmpty()) {
         canvas()->updateCanvas(colorPreviewDocUpdateRect);
     }
 
     m_oldOutlineRect = outlineDocRect;
     m_oldColorPreviewRect = colorPreviewDocRect;
     m_oldColorPreviewUpdateRect = colorPreviewDocUpdateRect;
 }
 
 QPainterPath KisToolPaint::getOutlinePath(const QPointF &documentPos,
                                           const KoPointerEvent *event,
                                           KisPaintOpSettings::OutlineMode outlineMode)
 {
     Q_UNUSED(event);
 
     QPointF imagePos = currentImage()->documentToPixel(documentPos);
     QPainterPath path = currentPaintOpPreset()->settings()->
         brushOutline(KisPaintInformation(imagePos), outlineMode);
 
     return path;
 }
 
diff --git a/libs/ui/widgets/kis_double_widget.cc b/libs/ui/widgets/kis_double_widget.cc
index 6cbcae1f94..ffad82827e 100644
--- a/libs/ui/widgets/kis_double_widget.cc
+++ b/libs/ui/widgets/kis_double_widget.cc
@@ -1,161 +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_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 QDoubleSpinBox(this);
+    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_double_widget.h b/libs/ui/widgets/kis_double_widget.h
index 39a5bef8ce..c7001e8ea6 100644
--- a/libs/ui/widgets/kis_double_widget.h
+++ b/libs/ui/widgets/kis_double_widget.h
@@ -1,77 +1,78 @@
 /*
  *  widgets/kis_double_widget.h - 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.
  */
 
 #ifndef KIS_DOUBLE_WIDGET_H
 #define KIS_DOUBLE_WIDGET_H
 
 #include <QWidget>
 #include <QSlider>
 #include <kritaui_export.h>
 
 class QHBoxLayout;
 class QDoubleSpinBox;
+class KisDoubleParseSpinBox;
 
 class KRITAUI_EXPORT KisDoubleWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     KisDoubleWidget(QWidget* parent = 0, const char* name = 0);
     KisDoubleWidget(double min, double max, QWidget* parent = 0, const char* name = 0);
     ~KisDoubleWidget();
 
     double value() const;
     void setRange(double min, double max);
 
     void setTickPosition(QSlider::TickPosition tickPosition);
     void setTickInterval(double tickInterval);
     double tickInterval() const;
 
     void setPrecision(int precision);
     void setSingleStep(double step);
     void setPageStep(double step);
 
     void setTracking(bool tracking);
     bool hasTracking() const;
 
 Q_SIGNALS:
     void valueChanged(double);
     void sliderPressed();
     void sliderReleased();
 
 public Q_SLOTS:
     void setValue(double value);
 
 protected Q_SLOTS:
     void setSliderValue(double);
     void sliderValueChanged(int);
 
 private:
     void init(double min, double max);
 
 protected:
     QHBoxLayout* m_layout;
     QSlider* m_slider;
-    QDoubleSpinBox *m_spinBox;
+    KisDoubleParseSpinBox *m_spinBox;
 };
 
 #endif // KIS_DOUBLE_WIDGET_H
 
diff --git a/libs/flake/KoDerivedResourceConverter.cpp b/libs/ui/widgets/kis_elided_label.cpp
similarity index 53%
copy from libs/flake/KoDerivedResourceConverter.cpp
copy to libs/ui/widgets/kis_elided_label.cpp
index 1ae9f1c111..08ae0a3f16 100644
--- a/libs/flake/KoDerivedResourceConverter.cpp
+++ b/libs/ui/widgets/kis_elided_label.cpp
@@ -1,52 +1,56 @@
 /*
  *  Copyright (c) 2016 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 "KoDerivedResourceConverter.h"
+#include "kis_elided_label.h"
 
-#include "QVariant"
-
-
-struct KoDerivedResourceConverter::Private
+struct KisElidedLabel::Private
 {
-    Private(int _key, int _sourceKey)
-        : key(_key), sourceKey(_sourceKey) {}
-
-    int key;
-    int sourceKey;
+    QString longText;
+    Qt::TextElideMode mode;
 };
 
-
-KoDerivedResourceConverter::KoDerivedResourceConverter(int key, int sourceKey)
-    : m_d(new Private(key, sourceKey))
+KisElidedLabel::KisElidedLabel(const QString &text, Qt::TextElideMode mode, QWidget *parent)
+    : QLabel(text, parent),
+      m_d(new Private)
 {
+    m_d->mode = mode;
+    m_d->longText = text;
 }
 
-KoDerivedResourceConverter::~KoDerivedResourceConverter()
+KisElidedLabel::~KisElidedLabel()
 {
 }
 
-int KoDerivedResourceConverter::key() const
+void KisElidedLabel::setLongText(const QString &text)
 {
-    return m_d->key;
+    m_d->longText = text;
+    updateText();
 }
 
-int KoDerivedResourceConverter::sourceKey() const
+void KisElidedLabel::resizeEvent(QResizeEvent *event)
 {
-    return m_d->sourceKey;
+    QLabel::resizeEvent(event);
+    updateText();
 }
 
+void KisElidedLabel::updateText()
+{
+    QFontMetrics metrics(font());
+    QString elidedText = metrics.elidedText(m_d->longText, m_d->mode, width());
+    setText(elidedText);
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/libs/ui/widgets/kis_elided_label.h
similarity index 61%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to libs/ui/widgets/kis_elided_label.h
index 191461c149..bf6cd727c6 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/libs/ui/widgets/kis_elided_label.h
@@ -1,53 +1,55 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_ELIDED_LABEL_H
+#define __KIS_ELIDED_LABEL_H
 
 #include <QScopedPointer>
-#include <QObject>
+#include <QLabel>
+
 #include "kritaui_export.h"
 
-class QSpinBox;
-class KoAspectButton;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+/**
+ * A special QLabel subclass that makes the text elidable.
+ *
+ * Please use setLongText() instead of setText(). The latter one will
+ * not work!
+ */
+
+class KRITAUI_EXPORT KisElidedLabel : public QLabel
 {
-    Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
-
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
+    KisElidedLabel(const QString &text, Qt::TextElideMode mode, QWidget *parent = 0);
+    ~KisElidedLabel();
 
+    void setLongText(const QString &text);
 
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+protected:
+    void resizeEvent(QResizeEvent *event);
 
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+private:
+    void updateText();
+    using QLabel::setText;
 
 private:
     struct Private;
     const QScopedPointer<Private> m_d;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_ELIDED_LABEL_H */
diff --git a/libs/ui/widgets/kis_gradient_slider.cpp b/libs/ui/widgets/kis_gradient_slider.cpp
index 360ec5be5d..b2580eeeb5 100644
--- a/libs/ui/widgets/kis_gradient_slider.cpp
+++ b/libs/ui/widgets/kis_gradient_slider.cpp
@@ -1,361 +1,371 @@
 /*
  * This file is part of Krita
  *
  * Copyright (c) 2006 Frederic Coiffier <fcoiffie@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.
  */
 
 // Local includes.
 #include "kis_gradient_slider.h"
 
 // C++ includes.
 
 #include <cmath>
 #include <cstdlib>
 
 // Qt includes.
 #include <kis_debug.h>
 #include <QtGlobal>
 #include <QPainter>
 #include <QPoint>
 #include <QPen>
 #include <QMouseEvent>
 #include <QBrush>
 #include <QLinearGradient>
 
 #define MARGIN 5
 #define HANDLE_SIZE 10
 
 KisGradientSlider::KisGradientSlider(QWidget *parent)
     : QWidget(parent)
     , m_leftmost(0)
     , m_rightmost(0)
     , m_scalingFactor(0)
     , m_blackCursor(0)
     , m_whiteCursor(0)
     , m_gammaCursor(0)
     , m_black(0)
     , m_white(255)
     , m_gamma(1.0)
     , m_gammaEnabled(false)
+    , m_whiteEnabled(true)
     , m_feedback(false)
 {
     m_grabCursor = None;
 
     setMouseTracking(true);
     setFocusPolicy(Qt::StrongFocus);
 }
 
 KisGradientSlider::~KisGradientSlider()
 {
 }
 
 int KisGradientSlider::black() const
 {
     return m_black;
 }
 
 int KisGradientSlider::white() const
 {
     return m_white;
 }
 
 void KisGradientSlider::paintEvent(QPaintEvent *e)
 {
     QWidget::paintEvent(e);
 
     int x, y;
     int wWidth = width() - (2 * MARGIN);
     int wHeight = height();
 
     const int gradientHeight = qRound((double)wHeight / 7.0 * 2);
 
     QPainter p1(this);
     p1.fillRect(rect(), palette().background());
     p1.setPen(Qt::black);
     p1.drawRect(MARGIN, MARGIN, wWidth, height() - 2 * MARGIN - HANDLE_SIZE);
 
     // Draw first gradient
     QLinearGradient grayGradient(MARGIN, 0, wWidth, gradientHeight);
     grayGradient.setColorAt(0, Qt::black);
     grayGradient.setColorAt(1, Qt::white);
     p1.fillRect(MARGIN, 0, wWidth, gradientHeight, QBrush(grayGradient));
 
     // Draw second gradient
     y = gradientHeight;
     p1.fillRect(MARGIN, y, wWidth, gradientHeight, Qt::white);
 
     if (m_blackCursor > 0) {
         p1.fillRect(MARGIN, y, m_blackCursor, gradientHeight, Qt::black);
     }
 
     for (x = (int)m_blackCursor + MARGIN; x < (int)m_whiteCursor - MARGIN; ++x) {
         double inten = (double)(x - (m_blackCursor + MARGIN)) / (double)((m_whiteCursor - MARGIN) - (m_blackCursor + MARGIN));
         inten = pow(inten, (1.0 / m_gamma));
         int gray = (int)(255 * inten);
         p1.setPen(QColor(gray, gray, gray));
         p1.drawLine(x, y, x, y + gradientHeight - 1);
     }
 
     // Draw cursors
     y += gradientHeight;
     QPoint a[3];
     p1.setPen(Qt::darkGray);
     p1.setRenderHint(QPainter::Antialiasing, true);
 
     const int cursorHalfBase = (int)(gradientHeight / 1.5);
 
     a[0] = QPoint(m_blackCursor + MARGIN, y);
     a[1] = QPoint(m_blackCursor + MARGIN + cursorHalfBase, wHeight - 1);
     a[2] = QPoint(m_blackCursor + MARGIN - cursorHalfBase, wHeight - 1);
     p1.setBrush(Qt::black);
     p1.drawPolygon(a, 3);
 
     p1.setPen(Qt::black);
     if (m_gammaEnabled) {
         a[0] = QPoint(m_gammaCursor, y);
         a[1] = QPoint(m_gammaCursor + cursorHalfBase, wHeight - 1);
         a[2] = QPoint(m_gammaCursor - cursorHalfBase, wHeight - 1);
         p1.setBrush(Qt::gray);
         p1.drawPolygon(a, 3);
     }
 
-    a[0] = QPoint(m_whiteCursor - MARGIN, y);
-    a[1] = QPoint(m_whiteCursor - MARGIN + cursorHalfBase, wHeight - 1);
-    a[2] = QPoint(m_whiteCursor - MARGIN - cursorHalfBase, wHeight - 1);
-    p1.setBrush(Qt::white);
-    p1.drawPolygon(a, 3);
+    if (m_whiteEnabled) {
+        a[0] = QPoint(m_whiteCursor - MARGIN, y);
+        a[1] = QPoint(m_whiteCursor - MARGIN + cursorHalfBase, wHeight - 1);
+        a[2] = QPoint(m_whiteCursor - MARGIN - cursorHalfBase, wHeight - 1);
+        p1.setBrush(Qt::white);
+        p1.drawPolygon(a, 3);
+    }
 }
 
 void KisGradientSlider::resizeEvent(QResizeEvent *)
 {
     m_scalingFactor = (double)(width() - MARGIN) / 255;
     calculateCursorPositions();
     update();
 }
 
 void KisGradientSlider::mousePressEvent(QMouseEvent * e)
 {
     eCursor closest_cursor;
     int distance;
 
     if (e->button() != Qt::LeftButton)
         return;
 
     unsigned int x = e->pos().x();
     int xPlusMargin = x + MARGIN;
 
     distance = width() + 1; // just a big number
 
     if (abs((int)(xPlusMargin - m_blackCursor)) < distance) {
         distance = abs((int)(xPlusMargin - m_blackCursor));
         closest_cursor = BlackCursor;
     }
 
     if (abs((int)(xPlusMargin - m_whiteCursor)) < distance) {
         distance = abs((int)(xPlusMargin - m_whiteCursor));
         closest_cursor = WhiteCursor;
     }
 
     if (m_gammaEnabled) {
         int gammaDistance = (int)xPlusMargin - m_gammaCursor;
 
         if (abs(gammaDistance) < distance) {
             distance = abs((int)xPlusMargin - m_gammaCursor);
             closest_cursor = GammaCursor;
         } else if (abs(gammaDistance) == distance) {
             if ((closest_cursor == BlackCursor) && (gammaDistance > 0)) {
                 distance = abs(gammaDistance);
                 closest_cursor = GammaCursor;
             } else if ((closest_cursor == WhiteCursor) && (gammaDistance < 0)) {
                 distance = abs(gammaDistance);
                 closest_cursor = GammaCursor;
             }
         }
     }
 
     if (distance > 20) {
         m_grabCursor = None;
         return;
     }
 
     // Determine cursor values and the leftmost and rightmost points.
 
     switch (closest_cursor) {
     case BlackCursor:
         m_blackCursor = x - MARGIN;
         m_grabCursor = closest_cursor;
         m_leftmost = 0;
         m_rightmost = m_whiteCursor - ((MARGIN + 1) * m_scalingFactor);
         if (m_gammaEnabled)
             m_gammaCursor = calculateGammaCursor();
         break;
     case WhiteCursor:
         m_whiteCursor = x + MARGIN;
         m_grabCursor = closest_cursor;
         m_leftmost = m_blackCursor + (MARGIN * m_scalingFactor);
         m_rightmost = width() - MARGIN ;
         if (m_gammaEnabled)
             m_gammaCursor = calculateGammaCursor();
         break;
     case GammaCursor:
         m_gammaCursor = x;
         m_grabCursor = closest_cursor;
         m_leftmost = m_blackCursor + (MARGIN * m_scalingFactor);
         m_rightmost = m_whiteCursor - (MARGIN * m_scalingFactor);
     {
         double delta = (double)(m_whiteCursor - m_blackCursor) / 2.0;
         double mid = (double)m_blackCursor + delta + MARGIN;
         double tmp = (x - mid) / delta;
         m_gamma = 1.0 / pow(10, tmp);
     }
         break;
     default:
         break;
     }
     update();
 }
 
 void KisGradientSlider::mouseReleaseEvent(QMouseEvent * e)
 {
     if (e->button() != Qt::LeftButton)
         return;
 
     update();
 
     switch (m_grabCursor) {
     case BlackCursor:
         m_black = qRound( m_blackCursor / m_scalingFactor);
         m_feedback = true;
         emit sigModifiedBlack(m_black);
         break;
     case WhiteCursor:
         m_white = qRound( (m_whiteCursor - MARGIN) / m_scalingFactor);
         m_feedback = true;
         emit sigModifiedWhite(m_white);
         break;
     case GammaCursor:
         emit sigModifiedGamma(m_gamma);
         break;
     default:
         break;
     }
 
     m_grabCursor = None;
     m_feedback = false;
 }
 
 void KisGradientSlider::mouseMoveEvent(QMouseEvent * e)
 {
     int x = e->pos().x();
 
     if (m_grabCursor != None) { // Else, drag the selected point
         if (x + MARGIN <= m_leftmost)
             x = m_leftmost;
 
         if (x >= m_rightmost)
             x = m_rightmost;
 
         switch (m_grabCursor) {
         case BlackCursor:
             if (m_blackCursor != x) {
                 m_blackCursor = x;
                 if (m_gammaEnabled) {
                     m_gammaCursor = calculateGammaCursor();
                 }
             }
             break;
         case WhiteCursor:
             if (m_whiteCursor != x) {
                 m_whiteCursor = x + MARGIN;
                 if (m_gammaEnabled) {
                     m_gammaCursor = calculateGammaCursor();
                 }
             }
             break;
         case GammaCursor:
             if (m_gammaCursor != x) {
                 m_gammaCursor = x;
                 double delta = (double)(m_whiteCursor - m_blackCursor) / 2.0;
                 double mid = (double)m_blackCursor + delta;
                 double tmp = (x - mid) / delta;
                 m_gamma = 1.0 / pow(10, tmp);
             }
             break;
         default:
             break;
         }
     }
 
     update();
 }
 
 void KisGradientSlider::calculateCursorPositions()
 {
     m_blackCursor = qRound(m_black * m_scalingFactor);
     m_whiteCursor = qRound(m_white * m_scalingFactor + MARGIN);
 
     m_gammaCursor = calculateGammaCursor();
 }
 
 unsigned int KisGradientSlider::calculateGammaCursor()
 {
     double delta = (double)(m_whiteCursor - m_blackCursor) / 2.0;
     double mid   = (double)m_blackCursor + delta;
     double tmp   = log10(1.0 / m_gamma);
     return (unsigned int)qRound(mid + delta * tmp);
 }
 
 
 void KisGradientSlider::enableGamma(bool b)
 {
     m_gammaEnabled = b;
     update();
 }
 
 double KisGradientSlider::getGamma(void)
 {
     return m_gamma;
 }
 
+
+void KisGradientSlider::enableWhite(bool b)
+{
+    m_whiteEnabled = b;
+    update();
+}
+
 void KisGradientSlider::slotModifyBlack(int v)
 {
     if (v >= 0 && v <= (int)m_white && !m_feedback) {
         m_black = v;
         m_blackCursor = qRound(m_black * m_scalingFactor);
         m_gammaCursor = calculateGammaCursor();
         update();
     }
 }
 void KisGradientSlider::slotModifyWhite(int v)
 {
     if (v >= (int)m_black && v <= width() && !m_feedback) {
         m_white = v;
         m_whiteCursor = qRound(m_white * m_scalingFactor + MARGIN);
         m_gammaCursor = calculateGammaCursor();
         update();
     }
 }
 void KisGradientSlider::slotModifyGamma(double v)
 {
     if (m_gamma != v) {
         emit sigModifiedGamma(v);
     }
     m_gamma = v;
     m_gammaCursor = calculateGammaCursor();
     update();
 }
 
diff --git a/libs/ui/widgets/kis_gradient_slider.h b/libs/ui/widgets/kis_gradient_slider.h
index 2d15e5b4a8..97295fb684 100644
--- a/libs/ui/widgets/kis_gradient_slider.h
+++ b/libs/ui/widgets/kis_gradient_slider.h
@@ -1,97 +1,98 @@
 /*
  * This file is part of Krita
  *
  * Copyright (c) 2006 Frederic Coiffier <fcoiffie@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.
  */
 
 #ifndef KIS_GRADIENT_SLIDER_H
 #define KIS_GRADIENT_SLIDER_H
 
 // Qt includes.
 
 #include <QWidget>
 #include <QColor>
 #include <QList>
 #include <QPair>
 
 #include <kritaui_export.h>
 
 class KRITAUI_EXPORT KisGradientSlider : public QWidget
 {
     Q_OBJECT
 
     typedef enum {
         BlackCursor,
         GammaCursor,
         WhiteCursor,
         None
     } eCursor;
 
 public:
     KisGradientSlider(QWidget *parent = 0);
 
     virtual ~KisGradientSlider();
 
     int black() const;
     int white() const;
 
 public Q_SLOTS:
     void slotModifyBlack(int);
     void slotModifyWhite(int);
     void slotModifyGamma(double);
 
 Q_SIGNALS:
     void sigModifiedBlack(int);
     void sigModifiedWhite(int);
     void sigModifiedGamma(double);
 
 protected:
     void paintEvent(QPaintEvent *);
     void resizeEvent(QResizeEvent *);
     void mousePressEvent(QMouseEvent * e);
     void mouseReleaseEvent(QMouseEvent * e);
     void mouseMoveEvent(QMouseEvent * e);
 
 private:
     void calculateCursorPositions();
     unsigned int calculateGammaCursor();
 
 public:
     void enableGamma(bool b);
     double getGamma(void);
 
+    void enableWhite(bool b);
+
 private:
     int m_leftmost;
     int m_rightmost;
     eCursor m_grabCursor;
     double m_scalingFactor;
 
     int m_blackCursor;
     int m_whiteCursor;
     int m_gammaCursor;
 
     int m_black;
     int m_white;
 
     double m_gamma;
     bool m_gammaEnabled;
-
+    bool m_whiteEnabled;
     bool m_feedback;
 };
 
-
 #endif /* KIS_GRADIENT_SLIDER_H */
diff --git a/libs/ui/widgets/kis_multi_double_filter_widget.cc b/libs/ui/widgets/kis_multi_double_filter_widget.cc
index d7efe4ae9f..4a7fd922eb 100644
--- a/libs/ui/widgets/kis_multi_double_filter_widget.cc
+++ b/libs/ui/widgets/kis_multi_double_filter_widget.cc
@@ -1,122 +1,122 @@
 /*
  *  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.
  */
 
 #include "widgets/kis_multi_double_filter_widget.h"
 #include <QLabel>
 #include <QLayout>
 #include <QTimer>
 #include <QGridLayout>
 #include <QSpinBox>
 
 #include <kis_config_widget.h>
 #include <filter/kis_filter_configuration.h>
 #include <klocalizedstring.h>
 
 KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(QWidget * parent, const QString & name)
-    : QDoubleSpinBox(parent)
+    : KisDoubleParseSpinBox(parent)
 {
     setObjectName(name);
     m_timer = new QTimer(this);
     m_timer->setObjectName(name);
     m_timer->setSingleShot(true);
     connect(m_timer, SIGNAL(timeout()), SLOT(slotValueChanged()));
     connect(this, SIGNAL(valueChanged(double)), SLOT(slotTimeToUpdate()));
 }
 
 void KisDelayedActionDoubleInput::slotTimeToUpdate()
 {
     m_timer->start(50);
 }
 
 void KisDelayedActionDoubleInput::slotValueChanged()
 {
     emit valueChangedDelayed(value());
 }
 
 void KisDelayedActionDoubleInput::cancelDelayedSignal()
 {
     m_timer->stop();
 }
 
 KisDoubleWidgetParam::KisDoubleWidgetParam(double nmin, double nmax, double ninitvalue, const QString & nlabel, const QString & nname) :
         min(nmin),
         max(nmax),
         initvalue(ninitvalue),
         label(nlabel),
         name(nname)
 {
 
 }
 
 KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(const QString & filterid, QWidget * parent, const QString & caption, vKisDoubleWidgetParam dwparam)
         : KisConfigWidget(parent), m_filterid(filterid)
 {
     m_nbdoubleWidgets = dwparam.size();
 
     this->setWindowTitle(caption);
 
     QGridLayout *widgetLayout = new QGridLayout(this);
     widgetLayout->setColumnStretch(1, 1);
     widgetLayout->setContentsMargins(0,0,0,0);
     widgetLayout->setHorizontalSpacing(0);
 
     m_doubleWidgets = new KisDelayedActionDoubleInput*[ m_nbdoubleWidgets ];
 
     for (qint32 i = 0; i < m_nbdoubleWidgets; ++i) {
         m_doubleWidgets[i] = new KisDelayedActionDoubleInput(this, dwparam[i].name);
         m_doubleWidgets[i]->setRange(dwparam[i].min, dwparam[i].max);
         m_doubleWidgets[i]->setValue(dwparam[i].initvalue);
         m_doubleWidgets[i]->cancelDelayedSignal();
 
         connect(m_doubleWidgets[i], SIGNAL(valueChangedDelayed(double)), SIGNAL(sigConfigurationItemChanged()));
 
         QLabel* lbl = new QLabel(dwparam[i].label + ':', this);
         widgetLayout->addWidget(lbl, i , 0);
 
         widgetLayout->addWidget(m_doubleWidgets[i], i , 1);
     }
     widgetLayout->setRowStretch(m_nbdoubleWidgets,1);
 
     QSpacerItem * sp = new QSpacerItem(1, 1);
     widgetLayout->addItem(sp, m_nbdoubleWidgets, 0);
 
 }
 
 void KisMultiDoubleFilterWidget::setConfiguration(const KisPropertiesConfiguration * config)
 {
     if (!config) return;
 
     for (int i = 0; i < m_nbdoubleWidgets ; ++i) {
         KisDelayedActionDoubleInput *  w = m_doubleWidgets[i];
         if (w) {
             double val = config->getDouble(m_doubleWidgets[i]->objectName());
             m_doubleWidgets[i]->setValue(val);
             m_doubleWidgets[i]->cancelDelayedSignal();
         }
     }
 }
 
 KisPropertiesConfiguration* KisMultiDoubleFilterWidget::configuration() const
 {
     KisFilterConfiguration* config = new KisFilterConfiguration(m_filterid, 0);
     for (int i = 0; i < nbValues(); ++i) {
         config->setProperty(m_doubleWidgets[i]->objectName(), m_doubleWidgets[i]->value());
     }
     return config;
 }
 
diff --git a/libs/ui/widgets/kis_multi_double_filter_widget.h b/libs/ui/widgets/kis_multi_double_filter_widget.h
index 90b4fe7efd..88b63c2163 100644
--- a/libs/ui/widgets/kis_multi_double_filter_widget.h
+++ b/libs/ui/widgets/kis_multi_double_filter_widget.h
@@ -1,82 +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"
 
-class KisDelayedActionDoubleInput : public QDoubleSpinBox
+#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.cc b/libs/ui/widgets/kis_multi_integer_filter_widget.cc
index d5666bea97..ba8d7415f5 100644
--- a/libs/ui/widgets/kis_multi_integer_filter_widget.cc
+++ b/libs/ui/widgets/kis_multi_integer_filter_widget.cc
@@ -1,155 +1,155 @@
 /*
  *  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.
  */
 
 #include "widgets/kis_multi_integer_filter_widget.h"
 #include <QLabel>
 #include <QLayout>
 #include <QTimer>
 #include <QSpinBox>
 #include <QGridLayout>
 
 #include <filter/kis_filter_configuration.h>
 #include <klocalizedstring.h>
 
 KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(QWidget * parent, const QString & name)
-    : QSpinBox(parent)
+    : KisIntParseSpinBox(parent)
 {
     setObjectName(name);
     m_timer = new QTimer(this);
     m_timer->setObjectName(name);
     m_timer->setSingleShot(true);
     connect(m_timer, SIGNAL(timeout()), SLOT(slotValueChanged()));
     connect(this, SIGNAL(valueChanged(int)), SLOT(slotTimeToUpdate()));
 }
 
 void KisDelayedActionIntegerInput::slotTimeToUpdate()
 {
     m_timer->start(50);
 }
 
 void KisDelayedActionIntegerInput::slotValueChanged()
 {
     emit valueChangedDelayed(value());
 }
 
 void KisDelayedActionIntegerInput::cancelDelayedSignal()
 {
     m_timer->stop();
 }
 
 KisIntegerWidgetParam::KisIntegerWidgetParam(qint32 nmin, qint32 nmax, qint32 ninitvalue, const QString & label, const QString & nname)
     : min(nmin)
     , max(nmax)
     , initvalue(ninitvalue)
     , label(label)
     , name(nname)
 {
 }
 
 KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(const QString& filterid,
                                                          QWidget* parent,
                                                          const QString& caption,
                                                          vKisIntegerWidgetParam iwparam)
     : KisConfigWidget(parent)
     , m_filterid(filterid)
     , m_config(new KisFilterConfiguration(filterid, 0))
 {
     this->setWindowTitle(caption);
 
     QGridLayout *widgetLayout = new QGridLayout(this);
     widgetLayout->setColumnStretch(1, 1);
     widgetLayout->setContentsMargins(0,0,0,0);
     widgetLayout->setHorizontalSpacing(0);
 
     for (uint i = 0; i < iwparam.size(); ++i) {
         KisDelayedActionIntegerInput *widget = new KisDelayedActionIntegerInput(this, iwparam[i].name);
 
         widget->setRange(iwparam[i].min, iwparam[i].max);
         widget->setValue(iwparam[i].initvalue);
         widget->cancelDelayedSignal();
 
         connect(widget, SIGNAL(valueChangedDelayed(int)), SIGNAL(sigConfigurationItemChanged()));
 
         QLabel* lbl = new QLabel(iwparam[i].label + ':', this);
         widgetLayout->addWidget(lbl, i , 0);
 
         widgetLayout->addWidget(widget, i , 1);
 
         m_integerWidgets.append(widget);
     }
     widgetLayout->setRowStretch(iwparam.size(),1);
 
     QSpacerItem * sp = new QSpacerItem(1, 1);
     widgetLayout->addItem(sp, iwparam.size(), 0);
 }
 
 KisMultiIntegerFilterWidget::~KisMultiIntegerFilterWidget()
 {
     delete m_config;
 }
 
 void KisMultiIntegerFilterWidget::setConfiguration(const KisPropertiesConfiguration* config)
 {
     if (!config) return;
 
     if (!m_config) {
         m_config = new KisFilterConfiguration(m_filterid, 0);
     }
 
     m_config->fromXML(config->toXML());
     for (int i = 0; i < nbValues(); ++i) {
         KisDelayedActionIntegerInput*  w = m_integerWidgets[i];
         if (w) {
             int val = config->getInt(m_integerWidgets[i]->objectName());
             m_integerWidgets[i]->setValue(val);
             m_integerWidgets[i]->cancelDelayedSignal();
         }
     }
 }
 
 KisPropertiesConfiguration* KisMultiIntegerFilterWidget::configuration() const
 {
     KisFilterConfiguration *config = new KisFilterConfiguration(m_filterid, 0);
     if (m_config) {
         config->fromXML(m_config->toXML());
     }
 
     for (int i = 0; i < nbValues(); ++i) {
         KisDelayedActionIntegerInput*  w = m_integerWidgets[i];
         if (w) {
             config->setProperty(w->objectName(), w->value());
         }
     }
     return config;
 }
 
 qint32 KisMultiIntegerFilterWidget::nbValues() const {
     return m_integerWidgets.size();
 }
 
 qint32 KisMultiIntegerFilterWidget::valueAt(qint32 i) {
     if (i < m_integerWidgets.size()) {
         return m_integerWidgets[i]->value();
     }
     else {
         warnKrita << "Trying to access integer widget" << i << "but there are only" << m_integerWidgets.size() << "widgets";
         return 0;
     }
 }
 
 
diff --git a/libs/ui/widgets/kis_multi_integer_filter_widget.h b/libs/ui/widgets/kis_multi_integer_filter_widget.h
index 119d04537d..81d1fc3d0d 100644
--- a/libs/ui/widgets/kis_multi_integer_filter_widget.h
+++ b/libs/ui/widgets/kis_multi_integer_filter_widget.h
@@ -1,83 +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_int_parse_spin_box.h"
+
 #include <vector>
 
-class KisDelayedActionIntegerInput : public QSpinBox
+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_paintop_presets_popup.cpp b/libs/ui/widgets/kis_paintop_presets_popup.cpp
index 566507c82a..d19cecae81 100644
--- a/libs/ui/widgets/kis_paintop_presets_popup.cpp
+++ b/libs/ui/widgets/kis_paintop_presets_popup.cpp
@@ -1,409 +1,411 @@
 /* This file is part of the KDE project
  * Copyright (C) 2008 Boudewijn Rempt <boud@valdyas.org>
  * Copyright (C) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
  * Copyright (C) 2011 Silvio Heinrich <plassy@web.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 "widgets/kis_paintop_presets_popup.h"
 
 #include <QList>
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QGridLayout>
 #include <QFont>
 #include <QMenu>
 #include <QAction>
 #include <QShowEvent>
 #include <QFontDatabase>
 
 #include <kconfig.h>
 #include <klocalizedstring.h>
 
 #include <KoDockRegistry.h>
 
 #include <kis_icon.h>
 #include <kis_icon.h>
 #include <brushengine/kis_paintop_preset.h>
 #include <brushengine/kis_paintop_config_widget.h>
 #include <kis_canvas_resource_provider.h>
 #include <widgets/kis_preset_chooser.h>
 #include <widgets/kis_preset_selector_strip.h>
 
 #include <ui_wdgpaintopsettings.h>
 #include <kis_node.h>
 #include "kis_config.h"
 
 #include "kis_resource_server_provider.h"
 #include "kis_lod_availability_widget.h"
 
 #include "kis_signal_auto_connection.h"
 
 
 struct KisPaintOpPresetsPopup::Private
 {
 
 public:
 
     Ui_WdgPaintOpSettings uiWdgPaintOpPresetSettings;
     QGridLayout *layout;
     KisPaintOpConfigWidget *settingsWidget;
     QFont smallFont;
     KisCanvasResourceProvider *resourceProvider;
     bool detached;
     bool ignoreHideEvents;
     QSize minimumSettingsWidgetSize;
     QRect detachedGeometry;
 
     KisSignalAutoConnectionsStore widgetConnections;
 };
 
 KisPaintOpPresetsPopup::KisPaintOpPresetsPopup(KisCanvasResourceProvider * resourceProvider, QWidget * parent)
     : QWidget(parent)
     , m_d(new Private())
 {
     setObjectName("KisPaintOpPresetsPopup");
     setFont(KoDockRegistry::dockFont());
 
     m_d->resourceProvider = resourceProvider;
 
     m_d->uiWdgPaintOpPresetSettings.setupUi(this);
 
     m_d->layout = new QGridLayout(m_d->uiWdgPaintOpPresetSettings.frmOptionWidgetContainer);
     m_d->layout->setSizeConstraint(QLayout::SetFixedSize);
 
     m_d->uiWdgPaintOpPresetSettings.scratchPad->setupScratchPad(resourceProvider, Qt::white);
     m_d->uiWdgPaintOpPresetSettings.scratchPad->setCutoutOverlayRect(QRect(25, 25, 200, 200));
     m_d->uiWdgPaintOpPresetSettings.fillLayer->setIcon(KisIconUtils::loadIcon("document-new"));
     m_d->uiWdgPaintOpPresetSettings.fillLayer->hide();
     m_d->uiWdgPaintOpPresetSettings.fillGradient->setIcon(KisIconUtils::loadIcon("krita_tool_gradient"));
     m_d->uiWdgPaintOpPresetSettings.fillSolid->setIcon(KisIconUtils::loadIcon("krita_tool_color_fill"));
     m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setIcon(KisIconUtils::loadIcon("edit-delete"));
     m_d->uiWdgPaintOpPresetSettings.paintPresetIcon->setIcon(KisIconUtils::loadIcon("krita_tool_freehand"));
 
     connect(m_d->uiWdgPaintOpPresetSettings.eraseScratchPad, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.scratchPad, SLOT(fillDefault()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.fillLayer, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.scratchPad, SLOT(fillLayer()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.fillGradient, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.scratchPad, SLOT(fillGradient()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.fillSolid, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.scratchPad, SLOT(fillBackground()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.paintPresetIcon, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.scratchPad, SLOT(paintPresetImage()));
 
     m_d->settingsWidget = 0;
     setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 
     connect(m_d->uiWdgPaintOpPresetSettings.bnSave, SIGNAL(clicked()),
             this, SIGNAL(savePresetClicked()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.reload, SIGNAL(clicked()),
             this, SIGNAL(reloadPresetClicked()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.bnDefaultPreset, SIGNAL(clicked()),
             this, SIGNAL(defaultPresetClicked()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.dirtyPresetCheckBox, SIGNAL(toggled(bool)),
             this, SIGNAL(dirtyPresetToggled(bool)));
 
     connect(m_d->uiWdgPaintOpPresetSettings.eraserBrushSizeCheckBox, SIGNAL(toggled(bool)),
             this, SIGNAL(eraserBrushSizeToggled(bool)));
 
     connect(m_d->uiWdgPaintOpPresetSettings.bnDefaultPreset, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.txtPreset, SLOT(clear()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.txtPreset, SIGNAL(textChanged(QString)),
             SLOT(slotWatchPresetNameLineEdit()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.paintopList, SIGNAL(activated(QString)),
             this, SIGNAL(paintopActivated(QString)));
 
     connect(m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SIGNAL(resourceSelected(KoResource*)),
             this, SIGNAL(signalResourceSelected(KoResource*)));
 
     connect(m_d->uiWdgPaintOpPresetSettings.bnSave, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SLOT(updateViewSettings()));
 
     connect(m_d->uiWdgPaintOpPresetSettings.reload, SIGNAL(clicked()),
             m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SLOT(updateViewSettings()));
 
     KisConfig cfg;
     m_d->detached = !cfg.paintopPopupDetached();
     m_d->ignoreHideEvents = false;
     m_d->minimumSettingsWidgetSize = QSize(0, 0);
     m_d->uiWdgPaintOpPresetSettings.presetWidget->setVisible(cfg.presetStripVisible());
     m_d->uiWdgPaintOpPresetSettings.scratchpadControls->setVisible(cfg.scratchpadVisible());
     m_d->detachedGeometry = QRect(100, 100, 0, 0);
     m_d->uiWdgPaintOpPresetSettings.dirtyPresetCheckBox->setChecked(cfg.useDirtyPresets());
     m_d->uiWdgPaintOpPresetSettings.eraserBrushSizeCheckBox->setChecked(cfg.useEraserBrushSize());
 
     m_d->uiWdgPaintOpPresetSettings.wdgLodAvailability->setCanvasResourceManager(resourceProvider->resourceManager());
 }
 
 
 KisPaintOpPresetsPopup::~KisPaintOpPresetsPopup()
 {
     if (m_d->settingsWidget) {
         m_d->layout->removeWidget(m_d->settingsWidget);
         m_d->settingsWidget->hide();
         m_d->settingsWidget->setParent(0);
         m_d->settingsWidget = 0;
     }
     delete m_d;
 }
 
 void KisPaintOpPresetsPopup::setPaintOpSettingsWidget(QWidget * widget)
 {
     if (m_d->settingsWidget) {
         m_d->layout->removeWidget(m_d->settingsWidget);
         m_d->uiWdgPaintOpPresetSettings.frmOptionWidgetContainer->updateGeometry();
     }
     m_d->layout->update();
     updateGeometry();
 
     m_d->widgetConnections.clear();
     m_d->settingsWidget = 0;
 
     if (widget) {
 
         m_d->settingsWidget = dynamic_cast<KisPaintOpConfigWidget*>(widget);
         KIS_ASSERT_RECOVER_RETURN(m_d->settingsWidget);
 
         if (m_d->settingsWidget->supportScratchBox()) {
             showScratchPad();
         } else {
             hideScratchPad();
         }
 
         m_d->widgetConnections.addConnection(m_d->uiWdgPaintOpPresetSettings.wdgLodAvailability, SIGNAL(sigUserChangedLodAvailability(bool)),
                                              m_d->settingsWidget, SLOT(slotUserChangedLodAvailability(bool)));
         m_d->widgetConnections.addConnection(m_d->settingsWidget, SIGNAL(sigUserChangedLodAvailability(bool)),
                                              m_d->uiWdgPaintOpPresetSettings.wdgLodAvailability, SLOT(slotUserChangedLodAvailability(bool)));
         m_d->widgetConnections.addConnection(m_d->settingsWidget, SIGNAL(sigConfigurationItemChanged()),
                                              this, SLOT(slotUpdateLodAvailability()));
 
         m_d->settingsWidget->coldInitExternalLodAvailabilityWidget();
 
 
         widget->setFont(m_d->smallFont);
 
         QSize hint = widget->sizeHint();
         m_d->minimumSettingsWidgetSize = QSize(qMax(hint.width(), m_d->minimumSettingsWidgetSize.width()),
                                                qMax(hint.height(), m_d->minimumSettingsWidgetSize.height()));
         widget->setMinimumSize(m_d->minimumSettingsWidgetSize);
         m_d->layout->addWidget(widget);
 
         m_d->layout->update();
         widget->show();
 
     }
 }
 
 void KisPaintOpPresetsPopup::slotUpdateLodAvailability()
 {
     if (!m_d->settingsWidget) return;
 
     KisPaintopLodLimitations l = m_d->settingsWidget->lodLimitations();
     m_d->uiWdgPaintOpPresetSettings.wdgLodAvailability->setLimitations(l);
 }
 
 void KisPaintOpPresetsPopup::slotWatchPresetNameLineEdit()
 {
     QString text = m_d->uiWdgPaintOpPresetSettings.txtPreset->text();
 
     KisPaintOpPresetResourceServer * rServer = KisResourceServerProvider::instance()->paintOpPresetServer();
     bool overwrite = rServer->resourceByName(text) != 0;
 
     KisPaintOpPresetSP preset = m_d->resourceProvider->currentPreset();
 
     bool btnSaveAvailable = preset->valid() &&
         (preset->isPresetDirty() | !overwrite);
 
     QString btnText = overwrite ? i18n("Overwrite Preset") : i18n("Save to Presets");
 
     m_d->uiWdgPaintOpPresetSettings.bnSave->setText(btnText);
     m_d->uiWdgPaintOpPresetSettings.bnSave->setEnabled(btnSaveAvailable);
 
     m_d->uiWdgPaintOpPresetSettings.reload->setVisible(true);
     m_d->uiWdgPaintOpPresetSettings.reload->setEnabled(btnSaveAvailable && overwrite);
 
     QFont font = m_d->uiWdgPaintOpPresetSettings.txtPreset->font();
     font.setItalic(btnSaveAvailable);
     m_d->uiWdgPaintOpPresetSettings.txtPreset->setFont(font);
 }
 
 QString KisPaintOpPresetsPopup::getPresetName() const
 {
     return m_d->uiWdgPaintOpPresetSettings.txtPreset->text();
 }
 
 QImage KisPaintOpPresetsPopup::cutOutOverlay()
 {
     return m_d->uiWdgPaintOpPresetSettings.scratchPad->cutoutOverlay();
 }
 
 void KisPaintOpPresetsPopup::contextMenuEvent(QContextMenuEvent *e)
 {
+    Q_UNUSED(e);
+
 #if 0
     QMenu menu(this);
     QAction* action = menu.addAction(m_d->detached ? i18n("Attach to Toolbar") : i18n("Detach from Toolbar"));
     connect(action, SIGNAL(triggered()), this, SLOT(switchDetached()));
     QAction* showPresetStrip = menu.addAction(i18n("Show Preset Strip"));
     showPresetStrip->setCheckable(true);
     showPresetStrip->setChecked(m_d->uiWdgPaintOpPresetSettings.presetWidget->isVisible());
     connect(showPresetStrip, SIGNAL(triggered(bool)), this, SLOT(slotSwitchPresetStrip(bool)));
     QAction* showScratchPad = menu.addAction(i18n("Show Scratchpad"));
     showScratchPad->setCheckable(true);
     showScratchPad->setChecked(m_d->uiWdgPaintOpPresetSettings.scratchPad->isVisible());
     connect(showScratchPad, SIGNAL(triggered(bool)), this, SLOT(slotSwitchScratchpad(bool)));
     menu.exec(e->globalPos());
 #endif
 }
 
 void KisPaintOpPresetsPopup::switchDetached(bool show)
 {
     if (parentWidget()) {
 
         m_d->detached = !m_d->detached;
 
         if (m_d->detached) {
             m_d->ignoreHideEvents = true;
             parentWidget()->setWindowFlags(Qt::Tool);
             m_d->uiWdgPaintOpPresetSettings.scratchpadControls->setVisible(false);
             if (show) {
                 parentWidget()->show();
             }
             m_d->ignoreHideEvents = false;
         }
         else {
             parentWidget()->setWindowFlags(Qt::Popup);
             KisConfig cfg;
             m_d->uiWdgPaintOpPresetSettings.scratchpadControls->setVisible(cfg.scratchpadVisible());
             parentWidget()->hide();
         }
 
         KisConfig cfg;
         cfg.setPaintopPopupDetached(m_d->detached);
     }
 }
 
 void KisPaintOpPresetsPopup::hideScratchPad()
 {
     m_d->uiWdgPaintOpPresetSettings.scratchPad->setEnabled(false);
     m_d->uiWdgPaintOpPresetSettings.fillGradient->setEnabled(false);
     m_d->uiWdgPaintOpPresetSettings.fillSolid->setEnabled(false);
     m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setEnabled(false);
 }
 
 void KisPaintOpPresetsPopup::showScratchPad()
 {
     m_d->uiWdgPaintOpPresetSettings.scratchPad->setEnabled(true);
     m_d->uiWdgPaintOpPresetSettings.fillGradient->setEnabled(true);
     m_d->uiWdgPaintOpPresetSettings.fillSolid->setEnabled(true);
     m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setEnabled(true);
 }
 
 void KisPaintOpPresetsPopup::resourceSelected(KoResource* resource)
 {
     m_d->uiWdgPaintOpPresetSettings.txtPreset->setText(resource->name());
     slotWatchPresetNameLineEdit();
 }
 
 void KisPaintOpPresetsPopup::setPaintOpList(const QList< KisPaintOpFactory* >& list)
 {
    m_d->uiWdgPaintOpPresetSettings.paintopList->setPaintOpList(list);
 }
 
 void KisPaintOpPresetsPopup::setCurrentPaintOp(const QString& paintOpId)
 {
     m_d->uiWdgPaintOpPresetSettings.paintopList->setCurrent(paintOpId);
     m_d->uiWdgPaintOpPresetSettings.presetWidget->setPresetFilter(paintOpId);
 }
 
 QString KisPaintOpPresetsPopup::currentPaintOp()
 {
     return m_d->uiWdgPaintOpPresetSettings.paintopList->currentItem();
 }
 
 void KisPaintOpPresetsPopup::setPresetImage(const QImage& image)
 {
     m_d->uiWdgPaintOpPresetSettings.scratchPad->setPresetImage(image);
 }
 
 void KisPaintOpPresetsPopup::hideEvent(QHideEvent *event)
 {
     if (m_d->ignoreHideEvents) {
         return;
     }
     if (m_d->detached) {
         m_d->detachedGeometry = window()->geometry();
     }
     QWidget::hideEvent(event);
 }
 
 void KisPaintOpPresetsPopup::showEvent(QShowEvent *)
 {
     if (m_d->detached) {
         window()->setGeometry(m_d->detachedGeometry);
     }
 }
 
 void KisPaintOpPresetsPopup::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
     emit sizeChanged();
 }
 
 bool KisPaintOpPresetsPopup::detached() const
 {
     return m_d->detached;
 }
 
 void KisPaintOpPresetsPopup::slotSwitchPresetStrip(bool visible)
 {
     m_d->uiWdgPaintOpPresetSettings.presetWidget->setVisible(visible);
     KisConfig cfg;
     cfg.setPresetStripVisible(visible);
 }
 
 void KisPaintOpPresetsPopup::slotSwitchScratchpad(bool visible)
 {
     m_d->uiWdgPaintOpPresetSettings.scratchpadControls->setVisible(visible);
     KisConfig cfg;
     cfg.setScratchpadVisible(visible);
 }
 
 void KisPaintOpPresetsPopup::updateViewSettings()
 {
     m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser->updateViewSettings();
 }
 
 void KisPaintOpPresetsPopup::updateThemedIcons()
  {
     m_d->uiWdgPaintOpPresetSettings.fillLayer->setIcon(KisIconUtils::loadIcon("document-new"));
     m_d->uiWdgPaintOpPresetSettings.fillLayer->hide();
     m_d->uiWdgPaintOpPresetSettings.fillGradient->setIcon(KisIconUtils::loadIcon("krita_tool_gradient"));
     m_d->uiWdgPaintOpPresetSettings.fillSolid->setIcon(KisIconUtils::loadIcon("krita_tool_color_fill"));
     m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setIcon(KisIconUtils::loadIcon("edit-delete"));
     m_d->uiWdgPaintOpPresetSettings.paintPresetIcon->setIcon(KisIconUtils::loadIcon("krita_tool_freehand"));
 }
diff --git a/libs/ui/widgets/kis_slider_spin_box.cpp b/libs/ui/widgets/kis_slider_spin_box.cpp
index 2e80d7a6df..356ce77487 100644
--- a/libs/ui/widgets/kis_slider_spin_box.cpp
+++ b/libs/ui/widgets/kis_slider_spin_box.cpp
@@ -1,1000 +1,1029 @@
 /* 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_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 isDragging;
+    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->isDragging = 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();
 
+    d->isDragging = false;
+
     //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)) {
+        d->isDragging = true;
         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;
+    //QLocale locale;
     bool ok = false;
 
-    qreal value = locale.toDouble(d->edit->text(), &ok) * d->factor;
+    //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);
 }
 
+bool KisAbstractSliderSpinBox::isDragging() const
+{
+    Q_D(const KisAbstractSliderSpinBox);
+    return d->isDragging;
+}
+
 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/ui/widgets/kis_slider_spin_box.h b/libs/ui/widgets/kis_slider_spin_box.h
index d468c8d48e..448fa0bc32 100644
--- a/libs/ui/widgets/kis_slider_spin_box.h
+++ b/libs/ui/widgets/kis_slider_spin_box.h
@@ -1,175 +1,179 @@
 /* This file is part of the KDE project
  * Copyright (c) 2010 Justin Noel <justin@ics.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.
  */
 #ifndef KISSLIDERSPINBOX_H
 #define KISSLIDERSPINBOX_H
 
 #include <QAbstractSpinBox>
 
 #include <QStyleOptionSpinBox>
 #include <QStyleOptionProgressBar>
 #include <kritaui_export.h>
 
 class KisAbstractSliderSpinBoxPrivate;
 class KisSliderSpinBoxPrivate;
 class KisDoubleSliderSpinBoxPrivate;
 
 /**
  * XXX: when inactive, also show the progress bar part as inactive!
  */
 class KRITAUI_EXPORT KisAbstractSliderSpinBox : public QWidget
 {
     Q_OBJECT
     Q_DISABLE_COPY(KisAbstractSliderSpinBox)
     Q_DECLARE_PRIVATE(KisAbstractSliderSpinBox)
 protected:
     explicit KisAbstractSliderSpinBox(QWidget* parent, KisAbstractSliderSpinBoxPrivate*);
 public:
     virtual ~KisAbstractSliderSpinBox();
 
     void showEdit();
     void hideEdit();
 
     void setPrefix(const QString& prefix);
     void setSuffix(const QString& suffix);
 
     void setExponentRatio(qreal dbl);
 
     /**
      * If set to block, it informs inheriting classes that they shouldn't emit signals
      * if the update comes from a mouse dragging the slider.
      * Set this to true when dragging the slider and updates during the drag are not needed.
      */
     void setBlockUpdateSignalOnDrag(bool block);
 
     virtual QSize sizeHint() const;
     virtual QSize minimumSizeHint() const;
     virtual QSize minimumSize() const;
 
+    bool isDragging() const;
+
 protected:
     virtual void paintEvent(QPaintEvent* e);
     virtual void mousePressEvent(QMouseEvent* e);
     virtual void mouseReleaseEvent(QMouseEvent* e);
     virtual void mouseMoveEvent(QMouseEvent* e);
     virtual void keyPressEvent(QKeyEvent* e);
     virtual void wheelEvent(QWheelEvent *);
 
     virtual bool eventFilter(QObject* recv, QEvent* e);
 
     QStyleOptionSpinBox spinBoxOptions() const;
     QStyleOptionProgressBar progressBarOptions() const;
 
     QRect progressRect(const QStyleOptionSpinBox& spinBoxOptions) const;
     QRect upButtonRect(const QStyleOptionSpinBox& spinBoxOptions) const;
     QRect downButtonRect(const QStyleOptionSpinBox& spinBoxOptions) const;
 
     int valueForX(int x, Qt::KeyboardModifiers modifiers = Qt::NoModifier) const;
 
     void commitEnteredValue();
 
     virtual QString valueString() const = 0;
     /**
      * Sets the slider internal value. Inheriting classes should respect blockUpdateSignal
      * so that, in specific cases, we have a performance improvement. See setIgnoreMouseMoveEvents.
      */
     virtual void setInternalValue(int value, bool blockUpdateSignal) = 0;
 
 protected Q_SLOTS:
     void contextMenuEvent(QContextMenuEvent * event);
     void editLostFocus();
 protected:
     KisAbstractSliderSpinBoxPrivate* const d_ptr;
 
     // QWidget interface
 protected:
     virtual void changeEvent(QEvent *e);
     void paint(QPainter& painter);
     void paintFusion(QPainter& painter);
     void paintPlastique(QPainter& painter);
     void paintBreeze(QPainter& painter);
 
 private:
     void setInternalValue(int value);
 };
 
 class KRITAUI_EXPORT KisSliderSpinBox : public KisAbstractSliderSpinBox
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(KisSliderSpinBox)
     Q_PROPERTY( int minimum READ minimum WRITE setMinimum )
     Q_PROPERTY( int maximum READ maximum WRITE setMaximum )
 public:
     KisSliderSpinBox(QWidget* parent = 0);
     ~KisSliderSpinBox();
 
     void setRange(int minimum, int maximum);
 
     int minimum() const;
     void setMinimum(int minimum);
     int maximum() const;
     void setMaximum(int maximum);
     int fastSliderStep() const;
     void setFastSliderStep(int step);
 
     ///Get the value, don't use value()
     int value();
 
     void setSingleStep(int value);
     void setPageStep(int value);
 
 public Q_SLOTS:
 
     ///Set the value, don't use setValue()
     void setValue(int value);
 
 protected:
     virtual QString valueString() const;
     virtual void setInternalValue(int value, bool blockUpdateSignal);
 Q_SIGNALS:
     void valueChanged(int value);
 };
 
 class KRITAUI_EXPORT KisDoubleSliderSpinBox : public KisAbstractSliderSpinBox
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(KisDoubleSliderSpinBox)
 public:
     KisDoubleSliderSpinBox(QWidget* parent = 0);
     ~KisDoubleSliderSpinBox();
 
     void setRange(qreal minimum, qreal maximum, int decimals = 0);
 
     qreal minimum() const;
     void setMinimum(qreal minimum);
     qreal maximum() const;
     void setMaximum(qreal maximum);
     qreal fastSliderStep() const;
     void setFastSliderStep(qreal step);
 
     qreal value();
+    void setSingleStep(qreal value);
+
+public Q_SLOTS:
     void setValue(qreal value);
 
-    void setSingleStep(qreal value);
 protected:
     virtual QString valueString() const;
     virtual void setInternalValue(int value, bool blockUpdateSignal);
 Q_SIGNALS:
     void valueChanged(qreal value);
 };
 
 #endif //kISSLIDERSPINBOX_H
diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
index e8fdcbdf01..6d53be629a 100644
--- a/libs/widgets/CMakeLists.txt
+++ b/libs/widgets/CMakeLists.txt
@@ -1,106 +1,112 @@
 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
-    KoPageLayoutDialog.cpp
-    KoPageLayoutWidget.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
     KoEditColorSetDialog.cpp
     KoTriangleColorSelector.cpp
     KoResourcePopupAction.cpp
-    KoStrokeConfigWidget.cpp
     KoFillConfigWidget.cpp
-    KoShadowConfigWidget.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
-    KoMarkerModel.cpp
-    KoMarkerItemDelegate.cpp
-    KoMarkerSelector.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
     KoPageLayoutWidget.ui
     KoShadowConfigWidget.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/widgets/KoPageLayoutWidget.ui b/libs/widgets/KoPageLayoutWidget.ui
index 2b52b99a66..a20ef5debc 100644
--- a/libs/widgets/KoPageLayoutWidget.ui
+++ b/libs/widgets/KoPageLayoutWidget.ui
@@ -1,326 +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="margin">
+   <property name="leftMargin">
     <number>0</number>
    </property>
-   <item>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,1">
-   <property name="margin">
+   <property name="topMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="unitsLabel">
-     <property name="text">
-      <string>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"/>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="stylesLabel">
-     <property name="text">
-      <string>Follow style:</string>
-     </property>
-     <property name="buddy">
-      <cstring>pageStyle</cstring>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </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>Size:</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 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="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-     <property name="buddy">
-      <cstring>width</cstring>
+     <property name="rightMargin">
+      <number>0</number>
      </property>
-    </widget>
-   </item>
-   <item row="3" column="1" colspan="2">
-    <layout class="QHBoxLayout">
-     <property name="margin">
+     <property name="bottomMargin">
       <number>0</number>
      </property>
-     <item>
-      <widget class="KoUnitDoubleSpinBox" name="width"/>
+     <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>
-      <widget class="QLabel">
+     <item row="0" column="1" colspan="2">
+      <widget class="QComboBox" name="units">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+        <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>Height:</string>
+        <string>&amp;Follow style:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
-        <cstring>height</cstring>
+        <cstring>pageStyle</cstring>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="KoUnitDoubleSpinBox" name="height"/>
+     <item row="1" column="1" colspan="2">
+      <widget class="QComboBox" name="pageStyle"/>
      </item>
-    </layout>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel">
-     <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>Portrait</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>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">
+     <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"/>
+        <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>
+    </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">
+       <widget class="QLabel" name="label">
         <property name="text">
          <string>Top:</string>
         </property>
-        <property name="buddy">
-         <cstring>topMargin</cstring>
-        </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="KoUnitDoubleSpinBox" name="topMargin">
+       <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>Binding edge:</string>
-        </property>
-        <property name="buddy">
-         <cstring>bindingEdgeMargin</cstring>
+         <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="KoUnitDoubleSpinBox" name="bindingEdgeMargin">
+       <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>Page edge:</string>
-        </property>
-        <property name="buddy">
-         <cstring>pageEdgeMargin</cstring>
+         <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="KoUnitDoubleSpinBox" name="pageEdgeMargin">
+       <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>Bottom:</string>
-        </property>
-        <property name="buddy">
-         <cstring>bottomMargin</cstring>
+         <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="KoUnitDoubleSpinBox" name="bottomMargin">
+       <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>KoUnitDoubleSpinBox</class>
+   <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>KoUnitDoubleSpinBox.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/widgets/KoShadowConfigWidget.ui b/libs/widgets/KoShadowConfigWidget.ui
index 742567f792..72cb42e8e6 100644
--- a/libs/widgets/KoShadowConfigWidget.ui
+++ b/libs/widgets/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>221</width>
-    <height>78</height>
+    <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="KoUnitDoubleSpinBox" name="shadowBlur"/>
+      <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="KoUnitDoubleSpinBox" name="shadowOffset"/>
+      <widget class="KisDoubleParseUnitSpinBox" name="shadowOffset"/>
      </item>
     </layout>
    </item>
    <item row="2" column="1">
-    <widget class="QWidget" name="SpecialSpacer">
+    <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>KoUnitDoubleSpinBox</class>
+   <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global">KoUnitDoubleSpinBox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/widgets/KoStrokeConfigWidget.cpp b/libs/widgets/KoStrokeConfigWidget.cpp
index 1c576e0078..c2308b0539 100644
--- a/libs/widgets/KoStrokeConfigWidget.cpp
+++ b/libs/widgets/KoStrokeConfigWidget.cpp
@@ -1,549 +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_double_parse_unit_spin_box.h"
+
 class CapNJoinMenu : public QMenu
 {
 public:
     CapNJoinMenu(QWidget *parent = 0);
     virtual QSize sizeHint() const;
 
-    KoUnitDoubleSpinBox *miterLimit;
+    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 KoUnitDoubleSpinBox(this);
+    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;
-    KoUnitDoubleSpinBox *lineWidth;
+    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 KoUnitDoubleSpinBox(this);
+    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/widgets/KoUnitDoubleSpinBox.h b/libs/widgets/KoUnitDoubleSpinBox.h
index 3b3fcc840d..8224b1405d 100644
--- a/libs/widgets/KoUnitDoubleSpinBox.h
+++ b/libs/widgets/KoUnitDoubleSpinBox.h
@@ -1,117 +1,119 @@
 /* This file is part of the KDE project
    Copyright (C) 2002, Rob Buis(buis@kde.org)
    Copyright (C) 2004, Nicolas GOUTTE <goutte@kde.org>
    Copyright (C) 2007, Thomas Zander <zander@kde.org>
 
    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.
 */
 
 #ifndef KOUNITDOUBLESPINBOX_H
 #define KOUNITDOUBLESPINBOX_H
 
 #include "kritawidgets_export.h"
 
 #include <QDoubleSpinBox>
 
 class KoUnit;
 
 /**
  * Spin box for double precision numbers with unit display.
  * Use this widget for any value that represents a real measurable value for consistency throughout
  * Krita.
  * This widget shows the value in the user-selected units (inch, milimeters, etc) but keeps the
  * Krita-widget default measurement unit internally. This has the advantage that just setting and
  * getting a value will not change the value due to conversions.
  * The KoDocument class has a unit() method for consistent (document wide) configuration of the
  * used unit.
  * It is adviced to use a QDoubleSpinBox in QtDesigner and then use the context-menu item: 'Promote to Custom Widget' and use the values: 'classname=KoUnitDoubleSpinBox', 'headerfile=KoUnitDoubleSpinBox.h'
  * This will generate code that uses this spinbox in the correct manner.
+ *
+ * This class need to be replaced as much as possible with \see KisDoubleParseUnitSpinBox to add math parsing ability.
  */
 class KRITAWIDGETS_EXPORT KoUnitDoubleSpinBox : public QDoubleSpinBox
 {
     Q_OBJECT
 public:
     /**
      * Constructor
      * Create a new spinBox with very broad range predefined.
      * This spinbox will have min and max borders of 10000 points and use
      * the default unit of points.
      * @param parent the parent widget
      */
     explicit KoUnitDoubleSpinBox( QWidget *parent = 0);
     ~KoUnitDoubleSpinBox();
 
     /**
      * 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 &);
 
     /// @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
 
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..50bee97f30
--- /dev/null
+++ b/libs/widgets/kis_double_parse_spin_box.cpp
@@ -0,0 +1,245 @@
+/*
+ *  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>
+#include <qnumeric.h> // for qIsNaN
+
+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(qIsNaN(ret) || qIsInf(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/widgets/tests/kis_parse_spin_boxes_test.cpp b/libs/widgets/tests/kis_parse_spin_boxes_test.cpp
new file mode 100644
index 0000000000..3b11abbdf1
--- /dev/null
+++ b/libs/widgets/tests/kis_parse_spin_boxes_test.cpp
@@ -0,0 +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_parse_spin_boxes_test.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/image/kis_idle_watcher.h b/libs/widgets/tests/kis_parse_spin_boxes_test.h
similarity index 52%
copy from libs/image/kis_idle_watcher.h
copy to libs/widgets/tests/kis_parse_spin_boxes_test.h
index 221249bb54..509f039036 100644
--- a/libs/image/kis_idle_watcher.h
+++ b/libs/widgets/tests/kis_parse_spin_boxes_test.h
@@ -1,59 +1,51 @@
 /*
- *  Copyright (c) 2015 Dmitry Kazakov <dimula73@gmail.com>
+ *  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_IDLE_WATCHER_H
-#define __KIS_IDLE_WATCHER_H
+#ifndef KISPARSESPINBOXESTEST_H
+#define KISPARSESPINBOXESTEST_H
 
-#include "kritaimage_export.h"
-
-#include <QScopedPointer>
 #include <QObject>
-#include <QString>
-
-#include "kis_types.h"
-
+#include <QStringList>
 
-class KRITAIMAGE_EXPORT KisIdleWatcher : public QObject
+class KisParseSpinBoxesTest : public QObject
 {
     Q_OBJECT
-public:
-    KisIdleWatcher(int delay);
-    ~KisIdleWatcher();
-
-    bool isIdle() const;
 
-    void setTrackedImages(const QVector<KisImageSP> &images);
-    void setTrackedImage(KisImageSP image);
-
-
-Q_SIGNALS:
-    void startedIdleMode();
+public:
+    explicit KisParseSpinBoxesTest();
 
 private Q_SLOTS:
-    void slotImageModified();
-    void slotIdleCheckTick();
 
-    void startIdleCheck();
-    void stopIdleCheck();
+    void testDoubleParseNormal();
+    void testDoubleParseProblem();
+    void testDoubleParseWithSuffix();
+    void testDoubleParseWithPrefix();
+    void testIntParseNormal();
+    void testIntParseProblem();
+    void testIntParseWithSuffix();
+    void testIntParseWithPrefix();
 
 private:
-    struct Private;
-    const QScopedPointer<Private> m_d;
+
+    const static QStringList doubleExprs;
+    const static QStringList doubleWrongExprs;
+    const static QStringList intExprs;
+    const static QStringList intWrongExprs;
 };
 
-#endif /* __KIS_IDLE_WATCHER_H */
+#endif // KISPARSESPINBOXESTEST_H
diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
index f54a46ee49..182db0ab80 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..774167bf89
--- /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 <qnumeric.h> // for qIsNaN
+#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) || qIsNaN(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/widgetutils/kis_num_parser.h b/libs/widgetutils/kis_num_parser.h
new file mode 100644
index 0000000000..21080a5b47
--- /dev/null
+++ b/libs/widgetutils/kis_num_parser.h
@@ -0,0 +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 "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.
+    KRITAWIDGETUTILS_EXPORT double parseSimpleMathExpr(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/widgetutils/tests/kis_simple_math_parser_test.cpp b/libs/widgetutils/tests/kis_simple_math_parser_test.cpp
new file mode 100644
index 0000000000..cb726f193d
--- /dev/null
+++ b/libs/widgetutils/tests/kis_simple_math_parser_test.cpp
@@ -0,0 +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_simple_math_parser_test.h"
+
+#include "kis_num_parser.h"
+#include <qnumeric.h> // for qIsNaN
+#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 || (qIsNaN(result) && qIsNaN(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/plugins/paintops/particle/kis_particle_paintop_settings.h b/libs/widgetutils/tests/kis_simple_math_parser_test.h
similarity index 65%
copy from plugins/paintops/particle/kis_particle_paintop_settings.h
copy to libs/widgetutils/tests/kis_simple_math_parser_test.h
index bdc68793c8..793bed4aaa 100644
--- a/plugins/paintops/particle/kis_particle_paintop_settings.h
+++ b/libs/widgetutils/tests/kis_simple_math_parser_test.h
@@ -1,35 +1,37 @@
 /*
- *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
+ *  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_PARTICLE_PAINTOP_SETTINGS_H_
-#define KIS_PARTICLE_PAINTOP_SETTINGS_H_
+#ifndef KISSIMPLEMATHPARSERTEST_H
+#define KISSIMPLEMATHPARSERTEST_H
 
-#include <brushengine/kis_paintop_settings.h>
-#include <kis_types.h>
+#include <QObject>
 
-class KisParticlePaintOpSettings : public KisPaintOpSettings
+class KisSimpleMathParserTest : public QObject
 {
+    Q_OBJECT
 
 public:
-    bool paintIncremental();
-    bool isAirbrushing() const;
-    int rate() const;
+    KisSimpleMathParserTest();
 
+private Q_SLOTS:
+    void testDoubleComputation();
+    void testIntComputation();
+    void testIntFlooring();
 };
 
-#endif
+#endif // KISSIMPLEMATHPARSERTEST_H
diff --git a/packaging/linux/appimage/build-deps.sh b/packaging/linux/appimage/build-deps.sh
index 10aa1e727a..72a8896748 100644
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -1,123 +1,124 @@
 #!/bin/bash
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 git_pull_rebase_helper()
 {
 	git reset --hard HEAD
         git pull
 }
 
 yum -y install epel-release 
 # we need to be up to date in order to install the xcb-keysyms dependency
 yum -y update
 # base dependencies and Qt5.
-yum -y install wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake libtool mesa-libEGL cppunit-devel cmake glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel libxcb libxcb-devel xcb-util xcb-util-devel
+yum -y install wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake libtool mesa-libEGL cppunit-devel cmake3 glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel libxcb libxcb-devel xcb-util xcb-util-devel
+
 
 # Newer compiler than what comes with CentOS 6
-yum install centos-release-scl-rh
-yum install devtoolset-3-gcc devtoolset-3-gcc-c++
-scl enable devtoolset-3 bash
+yum -y install centos-release-scl-rh
+yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++
+. /opt/rh/devtoolset-3/enable
 
 # Make sure we build from the /, parts of this script depends on that. We also need to run as root...
 cd  /
 
 # Build AppImageKit
 if [ ! -d AppImageKit ] ; then
   git clone  --depth 1 https://github.com/probonopd/AppImageKit.git /AppImageKit
 fi
 
 cd /AppImageKit/
 git_pull_rebase_helper
 ./build.sh
 cd /
 
 
 # Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
 # However, this is where .pc files get installed when bulding libraries... (FIXME)
 # I found this by comparing the output of librevenge's "make install" command
 # between Ubuntu and CentOS 6
 ln -sf /usr/share/pkgconfig /usr/lib/pkgconfig
 
 
 # A krita build layout looks like this:
 # krita/ -- the source directory
-# krita/3rdparty -- the cmake definitions for the dependencies
+# krita/3rdparty -- the cmake3 definitions for the dependencies
 # d -- downloads of the dependencies from files.kde.org
 # b -- build directory for the dependencies
 # krita_build -- build directory for krita itself
 # krita.appdir -- install directory for krita and the dependencies
 
 # Get Krita
 if [ ! -d /krita ] ; then
 	git clone  --depth 1 https://github.com/KDE/krita.git /krita
 fi
 
 cd /krita/
 git_pull_rebase_helper
 
 # Create the build dir for the 3rdparty deps
 if [ ! -d /b ] ; then
     mkdir /b
 fi    
 if [ ! -d /d ] ; then
     mkdir /d
 fi
 
 # start building the deps
 cd /b
 
 rm -rf /b/* || true
 
-cmake /krita/3rdparty \
+cmake3 /krita/3rdparty \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DINSTALL_ROOT=/usr \
     -DEXTERNALS_DOWNLOAD_DIR=/d
     
-cmake --build . --config RelWithDebInfo --target ext_qt
-cmake --build . --config RelWithDebInfo --target ext_boost
-cmake --build . --config RelWithDebInfo --target ext_eigen3
-cmake --build . --config RelWithDebInfo --target ext_exiv2
-cmake --build . --config RelWithDebInfo --target ext_fftw3
-cmake --build . --config RelWithDebInfo --target ext_lcms2
-cmake --build . --config RelWithDebInfo --target ext_ocio
-cmake --build . --config RelWithDebInfo --target ext_openexr
-cmake --build . --config RelWithDebInfo --target ext_vc
-#cmake --build . --config RelWithDebInfo --target ext_png
-cmake --build . --config RelWithDebInfo --target ext_tiff
-cmake --build . --config RelWithDebInfo --target ext_jpeg
-cmake --build . --config RelWithDebInfo --target ext_libraw
-# XXX: this builds, but cmake never manages to find the library
-#cmake --build . --config RelWithDebInfo --target ext_openjpeg
-cmake --build . --config RelWithDebInfo --target ext_kcrash
-cmake --build . --config RelWithDebInfo --target ext_poppler
-cmake --build . --config RelWithDebInfo --target ext_gsl
+cmake3 --build . --config RelWithDebInfo --target ext_qt
+cmake3 --build . --config RelWithDebInfo --target ext_boost
+cmake3 --build . --config RelWithDebInfo --target ext_eigen3
+cmake3 --build . --config RelWithDebInfo --target ext_exiv2
+cmake3 --build . --config RelWithDebInfo --target ext_fftw3
+cmake3 --build . --config RelWithDebInfo --target ext_lcms2
+cmake3 --build . --config RelWithDebInfo --target ext_ocio
+cmake3 --build . --config RelWithDebInfo --target ext_openexr
+cmake3 --build . --config RelWithDebInfo --target ext_vc
+#cmake3 --build . --config RelWithDebInfo --target ext_png
+cmake3 --build . --config RelWithDebInfo --target ext_tiff
+cmake3 --build . --config RelWithDebInfo --target ext_jpeg
+cmake3 --build . --config RelWithDebInfo --target ext_libraw
+# XXX: this builds, but cmake3 never manages to find the library
+#cmake3 --build . --config RelWithDebInfo --target ext_openjpeg
+cmake3 --build . --config RelWithDebInfo --target ext_kcrash
+cmake3 --build . --config RelWithDebInfo --target ext_poppler
+cmake3 --build . --config RelWithDebInfo --target ext_gsl
 
diff --git a/packaging/linux/appimage/build-image.sh b/packaging/linux/appimage/build-image.sh
index 39622a9b17..fd53c7d0e7 100644
--- a/packaging/linux/appimage/build-image.sh
+++ b/packaging/linux/appimage/build-image.sh
@@ -1,245 +1,255 @@
 #!/bin/bash
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # If we are running inside Travis CI, then we want to build Krita
 # and we remove the $DO_NOT_BUILD_KRITA environment variable
 # that was used in the process of generating the Docker image.
 # Also we do not want to download and build the dependencies every
 # time we build Krita on travis in the docker image. In order to
 # use newer dependencies, we re-build the docker image instead.
 #unset DO_NOT_BUILD_KRITA
 #NO_DOWNLOAD=1
 
 # clean up
 rm -f krita-3.0-l10n-win-current.tar.gz
 rm -rf /out/*
 rm -rf /krita.appdir
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 cd /
 
 # Prepare the install location
 rm -rf /krita.appdir/ || true
 mkdir -p /krita.appdir/usr/bin
 
 # make sure lib and lib64 are the same thing
 mkdir -p /krita.appdir/usr/lib
 cd  /krita.appdir/usr
 ln -s lib lib64
 
 cd /krita_build
 make -j4 install
 
 cd /krita.appdir
 
 # FIXME: How to find out which subset of plugins is really needed? I used strace when running the binary
 cp -r /usr/plugins ./usr/bin/
 # copy the Qt translation
 cp -r /usr/translations ./usr
 
 cp $(ldconfig -p | grep libsasl2.so.2 | cut -d ">" -f 2 | xargs) ./usr/lib/
 cp $(ldconfig -p | grep libGL.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # otherwise segfaults!?
 cp $(ldconfig -p | grep libGLU.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # otherwise segfaults!?
 # Fedora 23 seemed to be missing SOMETHING from the Centos 6.7. The only message was:
 # This application failed to start because it could not find or load the Qt platform plugin "xcb".
 # Setting export QT_DEBUG_PLUGINS=1 revealed the cause.
 # QLibraryPrivate::loadPlugin failed on "/usr/lib64/qt5/plugins/platforms/libqxcb.so" : 
 # "Cannot load library /usr/lib64/qt5/plugins/platforms/libqxcb.so: (/lib64/libEGL.so.1: undefined symbol: drmGetNodeTypeFromFd)"
 # Which means that we have to copy libEGL.so.1 in too
 cp $(ldconfig -p | grep libEGL.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # Otherwise F23 cannot load the Qt platform plugin "xcb"
 # let's not copy xcb itself, that breaks on dri3 systems https://bugs.kde.org/show_bug.cgi?id=360552
 #cp $(ldconfig -p | grep libxcb.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ 
 cp $(ldconfig -p | grep libfreetype.so.6 | cut -d ">" -f 2 | xargs) ./usr/lib/ # For Fedora 20
 
 ldd usr/bin/krita | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 #ldd usr/lib64/krita/*.so  | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 #ldd usr/lib64/plugins/imageformats/*.so  | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 
 ldd usr/bin/plugins/platforms/libqxcb.so | grep "=>" | awk '{print $3}'  |  xargs -I '{}' cp -v '{}' ./usr/lib || true
 
 # Copy in the indirect dependencies
 FILES=$(find . -type f -executable)
 
 for FILE in $FILES ; do
 	ldd "${FILE}" | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' usr/lib || true
 done
 
 #DEPS=""
 #for FILE in $FILES ; do
 #  ldd "${FILE}" | grep "=>" | awk '{print $3}' | xargs -I '{}' echo '{}' > DEPSFILE
 #done
 #DEPS=$(cat DEPSFILE  |sort | uniq)
 #for FILE in $DEPS ; do
 #  if [ -f $FILE ] ; then
 #    echo $FILE
 #    cp --parents -rfL $FILE ./
 #  fi
 #done
 #rm -f DEPSFILE
 
 
 # The following are assumed to be part of the base system
 rm -f usr/lib/libcom_err.so.2 || true
 rm -f usr/lib/libcrypt.so.1 || true
 rm -f usr/lib/libdl.so.2 || true
 rm -f usr/lib/libexpat.so.1 || true
 #rm -f usr/lib/libfontconfig.so.1 || true
 rm -f usr/lib/libgcc_s.so.1 || true
 rm -f usr/lib/libglib-2.0.so.0 || true
 rm -f usr/lib/libgpg-error.so.0 || true
 rm -f usr/lib/libgssapi_krb5.so.2 || true
 rm -f usr/lib/libgssapi.so.3 || true
 rm -f usr/lib/libhcrypto.so.4 || true
 rm -f usr/lib/libheimbase.so.1 || true
 rm -f usr/lib/libheimntlm.so.0 || true
 rm -f usr/lib/libhx509.so.5 || true
 rm -f usr/lib/libICE.so.6 || true
 rm -f usr/lib/libidn.so.11 || true
 rm -f usr/lib/libk5crypto.so.3 || true
 rm -f usr/lib/libkeyutils.so.1 || true
 rm -f usr/lib/libkrb5.so.26 || true
 rm -f usr/lib/libkrb5.so.3 || true
 rm -f usr/lib/libkrb5support.so.0 || true
 # rm -f usr/lib/liblber-2.4.so.2 || true # needed for debian wheezy
 # rm -f usr/lib/libldap_r-2.4.so.2 || true # needed for debian wheezy
 rm -f usr/lib/libm.so.6 || true
 rm -f usr/lib/libp11-kit.so.0 || true
 rm -f usr/lib/libpcre.so.3 || true
 rm -f usr/lib/libpthread.so.0 || true
 rm -f usr/lib/libresolv.so.2 || true
 rm -f usr/lib/libroken.so.18 || true
 rm -f usr/lib/librt.so.1 || true
 rm -f usr/lib/libsasl2.so.2 || true
 rm -f usr/lib/libSM.so.6 || true
 rm -f usr/lib/libusb-1.0.so.0 || true
 rm -f usr/lib/libuuid.so.1 || true
 rm -f usr/lib/libwind.so.0 || true
 rm -f usr/lib/libfontconfig.so.* || true
 
 # Remove these libraries, we need to use the system versions; this means 11.04 is not supported (12.04 is our baseline)
 rm -f usr/lib/libGL.so.* || true
 rm -f usr/lib/libdrm.so.* || true
 rm -f usr/lib/libX11.so.* || true
 #rm -f usr/lib/libz.so.1 || true
 
 # These seem to be available on most systems but not Ubuntu 11.04
 # rm -f usr/lib/libffi.so.6 usr/lib/libGL.so.1 usr/lib/libglapi.so.0 usr/lib/libxcb.so.1 usr/lib/libxcb-glx.so.0 || true
 
 # Delete potentially dangerous libraries
 rm -f usr/lib/libstdc* usr/lib/libgobject* usr/lib/libc.so.* || true
 rm -f usr/lib/libxcb.so.1
 
 # Do NOT delete libX* because otherwise on Ubuntu 11.04:
 # loaded library "Xcursor" malloc.c:3096: sYSMALLOc: Assertion (...) Aborted
 
 # We don't bundle the developer stuff
 rm -rf usr/include || true
-rm -rf usr/lib/cmake || true
+rm -rf usr/lib/cmake3 || true
 rm -rf usr/lib/pkgconfig || true
 rm -rf usr/share/ECM/ || true
 rm -rf usr/share/gettext || true
 rm -rf usr/share/pkgconfig || true
 
 strip usr/lib/kritaplugins/* usr/bin/* usr/lib/* || true
 
 # Since we set /krita.appdir as the prefix, we need to patch it away too (FIXME)
 # Probably it would be better to use /app as a prefix because it has the same length for all apps
 cd usr/ ; find . -type f -exec sed -i -e 's|/krita.appdir/usr/|./././././././././|g' {} \; ; cd  ..
 
 # On openSUSE Qt is picking up the wrong libqxcb.so
 # (the one from the system when in fact it should use the bundled one) - is this a Qt bug?
 # Also, Krita has a hardcoded /usr which we patch away
 cd usr/ ; find . -type f -exec sed -i -e 's|/usr|././|g' {} \; ; cd ..
 
 # We do not bundle this, so let's not search that inside the AppImage. 
 # Fixes "Qt: Failed to create XKB context!" and lets us enter text
 sed -i -e 's|././/share/X11/|/usr/share/X11/|g' ./usr/bin/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
 sed -i -e 's|././/share/X11/|/usr/share/X11/|g' ./usr/lib/libQt5XcbQpa.so.5
 
 # Workaround for:
 # D-Bus library appears to be incorrectly set up;
 # failed to read machine uuid: Failed to open
 # The file is more commonly in /etc/machine-id
 # sed -i -e 's|/var/lib/dbus/machine-id|//././././etc/machine-id|g' ./usr/lib/libdbus-1.so.3
 # or
 rm -f ./usr/lib/libdbus-1.so.3 || true
 
 cp ../AppImageKit/AppRun .
-cp ./usr/share/applications/krita.desktop krita.desktop
+cp ./usr/share/applications/org.kde.krita.desktop krita.desktop
 cp /krita/krita/pics/app/64-apps-calligrakrita.png calligrakrita.png
 
 #
 # Fetch and install the translations
 #
 cd /
 rm -f krita-3.0-l10-win-current.tar.gz || true
 wget http://files.kde.org/krita/build/krita-3.0-l10n-win-current.tar.gz
 tar -xf krita-3.0-l10n-win-current.tar.gz
 cd /krita.appdir/usr/share
 tar -xf /krita-3.0-l10n-win-current.tar.gz
 
 # replace krita with the lib-checking startup script.
 #cd /krita.appdir/usr/bin
 #mv krita krita.real
 #wget https://raw.githubusercontent.com/boudewijnrempt/AppImages/master/recipes/krita/krita
 #chmod a+rx krita
 cd / 
 
 APP=krita
 
+# Source functions
+wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
+. ./functions.sh
+
+# Install desktopintegration in usr/bin/krita.wrapper -- feel free to edit it
+cd /krita.appdir
+get_desktopintegration krita
+
+cd /
+
 VER=$(grep "#define KRITA_VERSION_STRING" krita_build/libs/version/kritaversion.h | cut -d '"' -f 2)
-cd krita
-BRANCH=$( git branch | cut -d ' ' -f 2)
+cd /krita
 REVISION=$(git rev-parse --short HEAD)
 cd ..
-VERSION=$VER-$BRANCH-$REVISION
+VERSION=$VER-$REVISION
 VERSION="$(sed s/\ /-/g <<<$VERSION)"
 echo $VERSION
 
 if [[ "$ARCH" = "x86_64" ]] ; then
 	APPIMAGE=$APP"-"$VERSION"-x86_64.appimage"
 fi
 if [[ "$ARCH" = "i686" ]] ; then
 	APPIMAGE=$APP"-"$VERSION"-i386.appimage"
 fi
 echo $APPIMAGE
 
 mkdir -p /out
 
 rm -f /out/*.AppImage || true
 AppImageKit/AppImageAssistant.AppDir/package /krita.appdir/ /out/$APPIMAGE
 
 chmod a+rwx /out/$APPIMAGE # So that we can edit the AppImage outside of the Docker container
 
 cd /krita.appdir
 mv AppRun krita
 cd /
 mv krita.appdir $APP"-"$VERSION"-x86_64
+tar -czf $APP"-"$VERSION"-x86_64.tgz $APP"-"$VERSION"-x86_64
diff --git a/packaging/linux/appimage/build-krita.sh b/packaging/linux/appimage/build-krita.sh
index 42f210d84b..fbde58da0e 100644
--- a/packaging/linux/appimage/build-krita.sh
+++ b/packaging/linux/appimage/build-krita.sh
@@ -1,88 +1,88 @@
 #!/bin/bash
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 git_pull_rebase_helper()
 {
 	git reset --hard HEAD
         git pull
 }
 
 # Use the new compiler
-. /opt/rh/devtoolset-2/enable
+. /opt/rh/devtoolset-3/enable
 
 
 # Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
 # However, this is where .pc files get installed when bulding libraries... (FIXME)
 # I found this by comparing the output of librevenge's "make install" command
 # between Ubuntu and CentOS 6
 ln -sf /usr/share/pkgconfig /usr/lib/pkgconfig
 
 
 # A krita build layout looks like this:
 # krita/ -- the source directory
-# krita/3rdparty -- the cmake definitions for the dependencies
+# krita/3rdparty -- the cmake3 definitions for the dependencies
 # d -- downloads of the dependencies from files.kde.org
 # b -- build directory for the dependencies
 # krita_build -- build directory for krita itself
 # krita.appdir -- install directory for krita and the dependencies
 
 # Get Krita
 if [ ! -d /krita ] ; then
 	git clone  --depth 1 https://github.com/KDE/krita.git /krita
 fi
 
 cd /krita/
 git_pull_rebase_helper
 
 cd /
 
 # If the environment variable DO_NOT_BUILD_KRITA is set to something,
 # then stop here. This is for docker hub which has a timeout that
 # prevents us from building in one go.
 # if [ ! -z "$DO_NOT_BUILD_KRITA" ] ; then
 #  exit 0
 # fi
 
 mkdir -p /krita_build
 cd /krita_build
-cmake ../krita \
+cmake3 ../krita \
     -DCMAKE_INSTALL_PREFIX:PATH=/krita.appdir/usr \
     -DDEFINE_NO_DEPRECATED=1 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DPACKAGERS_BUILD=1 \
     -DBUILD_TESTING=FALSE \
     -DKDE4_BUILD_TESTS=FALSE \
     -DHAVE_MEMORY_LEAK_TRACKER=FALSE
     
 # build
 make -j4 
 
diff --git a/packaging/linux/snap/setup/gui/krita.desktop b/packaging/linux/snap/setup/gui/krita.desktop
index dd37508856..f0365710b0 100755
--- a/packaging/linux/snap/setup/gui/krita.desktop
+++ b/packaging/linux/snap/setup/gui/krita.desktop
@@ -1,117 +1,119 @@
 [Desktop Entry]
 Name=Krita
 Name[af]=Krita
 Name[bg]=Krita
 Name[br]=Krita
 Name[bs]=Krita
 Name[ca]=Krita
 Name[ca@valencia]=Krita
 Name[cs]=Krita
 Name[cy]=Krita
 Name[da]=Krita
 Name[de]=Krita
 Name[el]=Krita
 Name[en_GB]=Krita
 Name[eo]=Krita
 Name[es]=Krita
 Name[et]=Krita
 Name[eu]=Krita
 Name[fi]=Krita
 Name[fr]=Krita
 Name[fy]=Krita
 Name[ga]=Krita
 Name[gl]=Krita
 Name[he]=Krita
 Name[hi]=केरिता
 Name[hne]=केरिता
 Name[hr]=Krita
 Name[hu]=Krita
 Name[ia]=Krita
 Name[is]=Krita
 Name[it]=Krita
 Name[kk]=Krita
 Name[ko]=Krita
 Name[lt]=Krita
 Name[lv]=Krita
 Name[mr]=क्रिटा
 Name[ms]=Krita
 Name[nb]=Krita
 Name[nds]=Krita
 Name[ne]=क्रिता
 Name[nl]=Krita
 Name[pl]=Krita
 Name[pt]=Krita
 Name[pt_BR]=Krita
 Name[ro]=Krita
 Name[ru]=Krita
 Name[se]=Krita
 Name[sk]=Krita
 Name[sl]=Krita
 Name[sv]=Krita
 Name[ta]=கிரிட்டா
 Name[tg]=Krita
 Name[tr]=Krita
 Name[ug]=Krita
 Name[uk]=Krita
 Name[uz]=Krita
 Name[uz@cyrillic]=Krita
 Name[wa]=Krita
 Name[xh]=Krita
 Name[x-test]=xxKritaxx
 Name[zh_CN]=Krita
 Name[zh_TW]=繪圖_Krita
 Exec=krita %U
 GenericName=Digital Painting
 GenericName[bs]=Digitalno Bojenje
 GenericName[ca]=Dibuix digital
 GenericName[ca@valencia]=Dibuix digital
 GenericName[da]=Digital tegning
 GenericName[de]=Digitales Malen
 GenericName[el]=Ψηφιακή ζωγραφική
 GenericName[en_GB]=Digital Painting
 GenericName[es]=Pintura digital
 GenericName[et]=Digitaalne joonistamine
 GenericName[eu]=Pintura digitala
 GenericName[fi]=Digitaalimaalaus
 GenericName[fr]=Peinture numérique
 GenericName[gl]=Debuxo dixital
 GenericName[hu]=Digitális festészet
 GenericName[ia]=Pintura Digital
 GenericName[it]=Pittura digitale
 GenericName[kk]=Цифрлық сурет салу
 GenericName[lt]=Skaitmeninis piešimas
 GenericName[mr]=डिजिटल पेंटिंग
 GenericName[nb]=Digital maling
 GenericName[nl]=Digitaal schilderen
 GenericName[pl]=Cyfrowe malowanie
 GenericName[pt]=Pintura Digital
 GenericName[pt_BR]=Pintura digital
 GenericName[ru]=Цифровая живопись
 GenericName[sk]=Digitálne maľovanie
 GenericName[sl]=Digitalno slikanje
 GenericName[sv]=Digital målning
 GenericName[tr]=Sayısal Boyama
 GenericName[ug]=سىفىرلىق رەسىم سىزغۇ
 GenericName[uk]=Цифрове малювання
 GenericName[x-test]=xxDigital Paintingxx
 MimeType=application/x-krita;image/openraster;application/x-krita-paintoppreset;
 Comment=Pixel-based image manipulation program for the Calligra Suite
 Comment[ca]=Programa de manipulació d'imatges basades en píxels per a la Suite Calligra
 Comment[ca@valencia]=Programa de manipulació d'imatges basades en píxels per a la Suite Calligra
 Comment[de]=Pixelbasiertes Bildbearbeitungsprogramm für die Calligra-Suite
 Comment[en_GB]=Pixel-based image manipulation program for the Calligra Suite
 Comment[es]=Programa de manipulación de imágenes basado en píxeles para la suite Calligra
+Comment[et]=Calligra pikslipõhine pilditöötluse rakendus
 Comment[it]=Programma di manipolazione delle immagini basato su pixel per Calligra Suite
 Comment[nl]=Afbeeldingsbewerkingsprogramma gebaseerd op pixels voor de Calligra Suite
 Comment[pl]=Program do obróbki obrazów na poziomie pikseli dla Pakietu Calligra
 Comment[pt]='Plugin' de manipulação de imagens em pixels para o Calligra Stage
+Comment[sk]=Program na manipuláciu s pixelmi pre Calligra Suite
 Comment[sv]=Bildpunktsbaserat bildbehandlingsprogram för Calligra-sviten
 Comment[uk]=Програма для роботи із растровими зображеннями для комплексу програм Calligra
 Comment[x-test]=xxPixel-based image manipulation program for the Calligra Suitexx
 Type=Application
 Icon=${SNAP}/meta/gui/calligrakrita.png
 Categories=Qt;KDE;Graphics;
 X-KDE-NativeMimeType=application/x-krita
 X-KDE-ExtraNativeMimeTypes=
 StartupNotify=true
 X-Krita-Version=28
diff --git a/packaging/linux/snap/snapcraft.yaml b/packaging/linux/snap/snapcraft.yaml
index c0486c12f5..3a88c74ddd 100644
--- a/packaging/linux/snap/snapcraft.yaml
+++ b/packaging/linux/snap/snapcraft.yaml
@@ -1,143 +1,144 @@
 name: krita
-version: 3.0-snap11
+version: 3.0.1-alpha-snap11
 summary: Krita is the digital painting studio for artists
 description: Krita is a creative application for raster images. Whether you want to create
  from scratch or work with existing images, Krita is for you. You can work with
  photos or scanned images, or start with a blank slate. Krita supports most
  graphics tablets out of the box.
 
 
 apps:
   krita:
     command: qt5-launch usr/bin/krita
     plugs: [x11, unity7, home, opengl, network, network-bind]
 
 parts:
   qt:
     plugin: nil
     stage-packages:
         - libqt5concurrent5
         - libqt5core5a
         - libqt5dbus5
         - libqt5gui5
         - libqt5network5
         - libqt5printsupport5
         - libqt5svg5
         - libqt5widgets5
         - libqt5x11extras5
         - libqt5xml5
     
   kdeframeworks:
     plugin: nil
     stage-packages:
         - libkf5archive5
         - libkf5completion5
         - libkf5configcore5
         - libkf5configgui5
         - libkf5coreaddons5
         - libkf5guiaddons5
         - libkf5i18n5
         - libkf5itemviews5
         - libkf5widgetsaddons5
         - libkf5windowsystem5
+        - libkf5crash5
     after: [qt]
     
   krita:
     plugin: cmake
 # Using -DKDE_NO_DEBUG_OUTPUT was causing compilation failure for some reason
 #    configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DQT_NO_DEBUG=1, -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT"]
     configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DQT_NO_DEBUG=1]
     source: ../../../
 # Use these instead to build from the git source
 #    source: git://anongit.kde.org/krita.git
 #    source-type: git
 #    source-branch: krita/3.0
     build-packages:
         - build-essential
         - cmake
         - libboost-dev
         - libboost-system-dev
         - libeigen3-dev
         - libexiv2-dev
         - libfftw3-dev
         - libfontconfig1-dev
         - libfreetype6-dev
         - libgl1-mesa-dev
         - libglew-dev
         - libglib2.0-dev
         - libglu1-mesa-dev
         - libgsf-1-dev
         - libgsl-dev
         - libjpeg-dev
         - liblcms2-dev
         - libopenexr-dev
         - libopenjpeg-dev
         - libpng12-dev
         - libpoppler-qt4-dev
         - libtiff5-dev
         - libvc-dev
         - libopencolorio-dev
         - libx11-dev
         - libxml2-dev
         - libxslt1-dev
         - libxi-dev
         - pkg-config
         - pkg-kde-tools
         - vc-dev
         - zlib1g-dev
         - libkdcraw-dev
         - shared-mime-info
         - libopenimageio-dev
         - extra-cmake-modules
         - libkf5archive-dev
         - libkf5coreaddons-dev
         - libkf5guiaddons-dev
         - libkf5itemmodels-dev
         - libkf5itemviews-dev
         - libkf5widgetsaddons-dev
         - libkf5i18n-dev
         - libkf5windowsystem-dev
         - libkf5completion-dev
         - libkf5iconthemes-dev
         - libkf5kiocore5
         - libqt5svg5-dev
         - libqt5x11extras5-dev
         - libqt5opengl5-dev
     stage-packages:      
         - libboost-system1.58.0
         - libexiv2-14
         - libfftw3-double3
         - libgomp1
         - libgsl2
         - libilmbase12
         - libjpeg8
         - liblcms2-2
         - libopencolorio1v5
         - libopenexr22
         - libopenjpeg5
         - libpng12-0
         - libstdc++6
         - libtiff5
         - libx11-6
         - libxcb1
         - libxi6
         - zlib1g
         - libraw15
         - libkf5crash5
         - libpoppler-qt5-1
         - curl
     after: [qt, kdeframeworks]
     
   integration:
     plugin: nil
     stage-packages:
       - ttf-ubuntu-font-family
     snap:
       - usr/share
       - -usr/share/doc
 
   launcher:
     plugin: copy
     files:
       qt5-launch: bin/qt5-launch
 
diff --git a/packaging/windows/makepkg-64.sh b/packaging/windows/makepkg-64.sh
index aa2a3f09f1..6cad7a2b44 100644
--- a/packaging/windows/makepkg-64.sh
+++ b/packaging/windows/makepkg-64.sh
@@ -1,90 +1,90 @@
 #!/bin/bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
-BUILDROOT=/data2/cross
-MXEROOT=/data2/cross/mxe/usr/x86_64-w64-mingw32.shared
+BUILDROOT=/data2/cross2
+MXEROOT=/data2/cross2/mxe/usr/x86_64-w64-mingw32.shared
 APP=krita
 
 cd $BUILDROOT
 
 VER=$(grep "#define KRITA_VERSION_STRING" $BUILDROOT/build/libs/version/kritaversion.h | cut -d '"' -f 2)
 cd $BUILDROOT/krita
 BRANCH=$( git branch | cut -d ' ' -f 2)
 BRANCH="$(sed s/\ /-/g <<<$VERSION)"
 REVISION=$(git rev-parse --short HEAD)
 cd ..
 VERSION=$VER$BRANCH-$REVISION
 VERSION="$(sed s/\ /-/g <<<$VERSION)"
 echo $VERSION
 
 PACKAGENAME=$APP"-"$VERSION"-x64"
 
+rm -rf $BUILDROOT/out/$PACKAGENAME
 mkdir -p $BUILDROOT/out/$PACKAGENAME
 mkdir -p $BUILDROOT/out/$PACKAGENAME/bin/data
 mkdir -p $BUILDROOT/out/$PACKAGENAME/lib
 mkdir -p $BUILDROOT/out/$PACKAGENAME/share
 
 cp $BUILDROOT/krita/packaging/windows/krita.lnk  $BUILDROOT/out/$PACKAGENAME
 cp $BUILDROOT/krita/packaging/windows/qt.conf  $BUILDROOT/out/$PACKAGENAME/bin
 
 cp $MXEROOT/bin/krita.exe $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/bin/*.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/bin/*.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/lib/libOpenColorIO.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp -r $MXEROOT/lib/kritaplugins $BUILDROOT/out/$PACKAGENAME/lib
 
 cp $MXEROOT/qt5/bin/Qt5Concurrent.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Core.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Gui.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Network.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5OpenGL.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5PrintSupport.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Qml.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Quick.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Script.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5ScriptTools.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Svg.dll $BUILDROOT/out/$PACKAGENAME/bin
-cp $MXEROOT/qt5/bin/Qt5SystemInfo.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Widgets.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5WinExtras.dll $BUILDROOT/out/$PACKAGENAME/bin
 cp $MXEROOT/qt5/bin/Qt5Xml.dll $BUILDROOT/out/$PACKAGENAME/bin
 
 cp -r $MXEROOT/qt5/plugins/iconengines $BUILDROOT/out/$PACKAGENAME/bin/
 cp -r $MXEROOT/qt5/plugins/imageformats $BUILDROOT/out/$PACKAGENAME/bin/
 cp -r $MXEROOT/qt5/plugins/printsupport $BUILDROOT/out/$PACKAGENAME/bin/
 cp -r $MXEROOT/qt5/plugins/platforms $BUILDROOT/out/$PACKAGENAME/bin/
 cp -r $MXEROOT/lib/plugins/imageformats/* $BUILDROOT/out/$PACKAGENAME/bin/imageformats/
 
 mkdir $BUILDROOT/out/$PACKAGENAME/bin/translations
 cp -r $BUILDROOT/qt-translations/qt_* $BUILDROOT/out/$PACKAGENAME/bin/translations
 
-cp -r $MXEROOT/share/color $BUILDROOT/out/$PACKAGENAME/share
-cp -r $MXEROOT/share/color-schemes $BUILDROOT/out/$PACKAGENAME/share
-cp -r $MXEROOT/share/kf5 $BUILDROOT/out/$PACKAGENAME/share
-cp -r $MXEROOT/share/krita $BUILDROOT/out/$PACKAGENAME/share
-cp -r $MXEROOT/share/locale $BUILDROOT/out/$PACKAGENAME/bin/data
+cp -r $MXEROOT/bin/data/color $BUILDROOT/out/$PACKAGENAME/bin/data
+cp -r $MXEROOT/bin/data/color-schemes $BUILDROOT/out/$PACKAGENAME/bin/data
+cp -r $MXEROOT/bin/data/kf5 $BUILDROOT/out/$PACKAGENAME/bin/data
+cp -r $MXEROOT/bin/data/krita $BUILDROOT/out/$PACKAGENAME/share
+cp -r $MXEROOT/bin/data/locale $BUILDROOT/out/$PACKAGENAME/bin/data
 cp -r $MXEROOT/share/ocio $BUILDROOT/out/$PACKAGENAME/share
 
 cd $BUILDROOT
 rm krita-3.0-l10n-win-current.tar.gz || true
 rm -rf locale
 
 wget http://files.kde.org/krita/build/krita-3.0-l10n-win-current.tar.gz
 tar -xf krita-3.0-l10n-win-current.tar.gz
 cp -r $BUILDROOT/locale $BUILDROOT/out/$PACKAGENAME/bin/data
 
 cd $BUILDROOT/out/
 
 zip -r $PACKAGENAME-dbg.zip $PACKAGENAME
 
 find $BUILDROOT/out/$PACKAGENAME/bin -name \*exe | xargs $BUILDROOT/mxe/usr/bin/x86_64-w64-mingw32.shared-strip
 find $BUILDROOT/out/$PACKAGENAME/bin -name \*dll | xargs $BUILDROOT/mxe/usr/bin/x86_64-w64-mingw32.shared-strip
 find $BUILDROOT/out/$PACKAGENAME/lib -name \*dll | xargs $BUILDROOT/mxe/usr/bin/x86_64-w64-mingw32.shared-strip
 
 zip -r $PACKAGENAME.zip $PACKAGENAME
 
diff --git a/packaging/windows/mxe.txt b/packaging/windows/mxe.txt
index 8ef80d4106..a69222cce6 100644
--- a/packaging/windows/mxe.txt
+++ b/packaging/windows/mxe.txt
@@ -1,44 +1,49 @@
 # Where are you building?
 export BUILDROOT=????
 
 cd $BUILDROOT
 mkdir cross
 mkdir cross/b
 mkdir cross/d
 mkdir cross/krita-build
 
 git clone git@github.com:boudewijnrempt/mxe.git
 cd mxe
 export PATH=$BUILDROOT/mxe/usr/bin:$BUILDROOT/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin:$PATH
 
 # note: poppler-qt5 and gsl don't work yet
 # Use  i686-w64-mingw32.shared for 32 bits builds
 # note: vc is 1.2, so we either need zagge's branch, or you need to build Vc 0.75
 # yourself. Make sure you use -DBUILD_TESTING=OFF for Vc
 make MXE_TARGETS=x86_64-w64-mingw32.shared gcc boost curl eigen exiv2 expat fftw fontconfig freetype gettext ilmbase openexr jpeg lcms libpng libraw opencolorio openjpeg qt5 qtscript tiff vc zlib gsl
 
 cd $BUILDROOT
 git clone git://anongit.kde.org/krita.git
 
 
 # build the deps that aren't in mxe
 
 cd b
 
 x86_64-w64-mingw32.shared-cmake ../krita/3rdparty/ -DEXTERNALS_DOWNLOAD_DIR=$BUILDROOT/d -DINSTALL_ROOT=$BUILDROOT/mxe/usr/x86_64-w64-mingw32.shared -DMXE_TOOLCHAIN=${BUILDROOT}/mxe/usr/x86_64-w64-mingw32.shared/share/cmake/mxe-conf.cmake
 
-x86_64-w64-mingw32.shared-cmake  --build . --target ext_kwindowsystem
+x86_64-w64-mingw32.shared-cmake  --build . --target ext_kcrash
 x86_64-w64-mingw32.shared-cmake  --build . --target ext_poppler
 
 # You might want to build gsl and vc 0.75 manually
 
 
 # build krita
 cd ../build
 x86_64-w64-mingw32.shared-cmake ../krita  -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DPACKAGERS_BUILD=ON 
 make -j4 install
 
 # to test, configure wine
 # WINEARCH=win64 WINEPREFIX=~/.wine64 winecfg
 # Go to the bin directory and test krita:
 # WINEPREFIX=~/.wine64 wine ./krita.exe
+
+
+NOTE: Windragon's patch to vc does not work when cross-building vc from
+ext_vc. The patch also needs to be added to mxe/vc. The reason is wrong
+defines for determining whether we're using mingw.
diff --git a/pics/16_dark_warning.svg b/pics/16_dark_warning.svg
new file mode 100644
index 0000000000..9df70559ff
--- /dev/null
+++ b/pics/16_dark_warning.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="16_dark_warning.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-9.0611907"
+     inkscape:cy="11.806452"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-176.29465,-380.67742)">
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.20599997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path8068"
+       sodipodi:sides="3"
+       sodipodi:cx="185.56091"
+       sodipodi:cy="391.30777"
+       sodipodi:r1="10.709662"
+       sodipodi:r2="5.3548312"
+       sodipodi:arg1="0.52200053"
+       sodipodi:arg2="1.5691981"
+       inkscape:flatsided="false"
+       inkscape:rounded="-3.469447e-18"
+       inkscape:randomized="0"
+       d="m 194.8443,396.64777 -9.27483,0.0148 -9.27483,0.0148 4.62458,-8.03965 4.62458,-8.03965 4.65025,8.02483 z"
+       inkscape:transform-center-x="0.03785892"
+       inkscape:transform-center-y="-2.4009558"
+       transform="matrix(0.8625497,0,0,0.90178074,24.231758,37.961365)" />
+    <g
+       transform="scale(0.9780062,1.0224884)"
+       style="font-style:normal;font-weight:normal;font-size:12.54406357px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text8070">
+      <path
+         d="m 187.77021,384.36273 1.24338,0 0,1.55576 -1.24338,0 0,-1.55576 z m 0,-7.58891 1.24338,0 0,4.01189 -0.1225,2.18664 -0.99225,0 -0.12863,-2.18664 0,-4.01189 z"
+         style="fill:#ffffff;fill-opacity:1"
+         id="path8069" />
+    </g>
+  </g>
+</svg>
diff --git a/pics/16_light_warning.svg b/pics/16_light_warning.svg
new file mode 100644
index 0000000000..0d8ef2b3cc
--- /dev/null
+++ b/pics/16_light_warning.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="16_light_warning.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-9.0611907"
+     inkscape:cy="11.806452"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-176.29465,-380.67742)">
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.20599997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path8068"
+       sodipodi:sides="3"
+       sodipodi:cx="185.56091"
+       sodipodi:cy="391.30777"
+       sodipodi:r1="10.709662"
+       sodipodi:r2="5.3548312"
+       sodipodi:arg1="0.52200053"
+       sodipodi:arg2="1.5691981"
+       inkscape:flatsided="false"
+       inkscape:rounded="-3.469447e-18"
+       inkscape:randomized="0"
+       d="m 194.8443,396.64777 -9.27483,0.0148 -9.27483,0.0148 4.62458,-8.03965 4.62458,-8.03965 4.65025,8.02483 z"
+       inkscape:transform-center-x="0.03785892"
+       inkscape:transform-center-y="-2.4009558"
+       transform="matrix(0.8625497,0,0,0.90178074,24.231758,37.961365)" />
+    <g
+       transform="scale(0.9780062,1.0224884)"
+       style="font-style:normal;font-weight:normal;font-size:12.54406357px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text8070">
+      <path
+         d="m 187.77021,384.36273 1.24338,0 0,1.55576 -1.24338,0 0,-1.55576 z m 0,-7.58891 1.24338,0 0,4.01189 -0.1225,2.18664 -0.99225,0 -0.12863,-2.18664 0,-4.01189 z"
+         style="fill:#000000;fill-opacity:1"
+         id="path8069" />
+    </g>
+  </g>
+</svg>
diff --git a/pics/icons.qrc b/pics/icons.qrc
index cfbd8d3fc4..d2286d8893 100644
--- a/pics/icons.qrc
+++ b/pics/icons.qrc
@@ -1,304 +1,305 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-	<qresource>
-		<file>16_dark_align-horizontal-center.svg</file>
-		<file>22_dark_align-horizontal-center.svg</file>
-		<file>24_dark_align-horizontal-center.svg</file>
-		<file>16_light_align-horizontal-center.svg</file>
-		<file>22_light_align-horizontal-center.svg</file>
-		<file>24_light_align-horizontal-center.svg</file>
-		<file>16_dark_align-horizontal-left.svg</file>
-		<file>22_dark_align-horizontal-left.svg</file>
-		<file>24_dark_align-horizontal-left.svg</file>
-		<file>16_light_align-horizontal-left.svg</file>
-		<file>22_light_align-horizontal-left.svg</file>
-		<file>24_light_align-horizontal-left.svg</file>
-		<file>16_dark_align-horizontal-right.svg</file>
-		<file>22_dark_align-horizontal-right.svg</file>
-		<file>24_dark_align-horizontal-right.svg</file>
-		<file>16_light_align-horizontal-right.svg</file>
-		<file>22_light_align-horizontal-right.svg</file>
-		<file>24_light_align-horizontal-right.svg</file>
-		<file>16_dark_align-vertical-bottom.svg</file>
-		<file>22_dark_align-vertical-bottom.svg</file>
-		<file>24_dark_align-vertical-bottom.svg</file>
-		<file>16_light_align-vertical-bottom.svg</file>
-		<file>22_light_align-vertical-bottom.svg</file>
-		<file>24_light_align-vertical-bottom.svg</file>
-		<file>16_dark_align-vertical-center.svg</file>
-		<file>22_dark_align-vertical-center.svg</file>
-		<file>24_dark_align-vertical-center.svg</file>
-		<file>16_light_align-vertical-center.svg</file>
-		<file>22_light_align-vertical-center.svg</file>
-		<file>24_light_align-vertical-center.svg</file>
-		<file>16_dark_align-vertical-top.svg</file>
-		<file>22_dark_align-vertical-top.svg</file>
-		<file>24_dark_align-vertical-top.svg</file>
-		<file>16_light_align-vertical-top.svg</file>
-		<file>22_light_align-vertical-top.svg</file>
-		<file>24_light_align-vertical-top.svg</file>
-		<file>16_dark_application-x-krita.svg</file>
-		<file>22_dark_application-x-krita.svg</file>
-		<file>32_dark_application-x-krita.svg</file>
-		<file>64_dark_application-x-krita.svg</file>
-		<file>16_light_application-x-krita.svg</file>
-		<file>22_light_application-x-krita.svg</file>
-		<file>32_light_application-x-krita.svg</file>
-		<file>64_light_application-x-krita.svg</file>
-		<file>16_dark_application-x-wmf.svg</file>
-		<file>22_dark_application-x-wmf.svg</file>
-		<file>32_dark_application-x-wmf.svg</file>
-		<file>64_dark_application-x-wmf.svg</file>
-		<file>16_light_application-x-wmf.svg</file>
-		<file>22_light_application-x-wmf.svg</file>
-		<file>32_light_application-x-wmf.svg</file>
-		<file>64_light_application-x-wmf.svg</file>
-		<file>calligrakrita.png</file>
-		<file>16_dark_character-set.svg</file>
-		<file>22_dark_character-set.svg</file>
-		<file>24_dark_character-set.svg</file>
-		<file>16_light_character-set.svg</file>
-		<file>22_light_character-set.svg</file>
-		<file>24_light_character-set.svg</file>
-		<file>16_dark_draw-arrow-back.svg</file>
-		<file>22_dark_draw-arrow-back.svg</file>
-		<file>24_dark_draw-arrow-back.svg</file>
-		<file>16_light_draw-arrow-back.svg</file>
-		<file>22_light_draw-arrow-back.svg</file>
-		<file>24_light_draw-arrow-back.svg</file>
-		<file>16_dark_draw-arrow-down.svg</file>
-		<file>22_dark_draw-arrow-down.svg</file>
-		<file>24_dark_draw-arrow-down.svg</file>
-		<file>16_light_draw-arrow-down.svg</file>
-		<file>22_light_draw-arrow-down.svg</file>
-		<file>24_light_draw-arrow-down.svg</file>
-		<file>16_dark_draw-arrow-forward.svg</file>
-		<file>22_dark_draw-arrow-forward.svg</file>
-		<file>24_dark_draw-arrow-forward.svg</file>
-		<file>16_light_draw-arrow-forward.svg</file>
-		<file>22_light_draw-arrow-forward.svg</file>
-		<file>24_light_draw-arrow-forward.svg</file>
-		<file>16_dark_draw-arrow-up.svg</file>
-		<file>22_dark_draw-arrow-up.svg</file>
-		<file>24_dark_draw-arrow-up.svg</file>
-		<file>16_light_draw-arrow-up.svg</file>
-		<file>22_light_draw-arrow-up.svg</file>
-		<file>24_light_draw-arrow-up.svg</file>
-		<file>16_dark_draw-freehand.svg</file>
-		<file>22_dark_draw-freehand.svg</file>
-		<file>24_dark_draw-freehand.svg</file>
-		<file>16_light_draw-freehand.svg</file>
-		<file>22_light_draw-freehand.svg</file>
-		<file>24_light_draw-freehand.svg</file>
-		<file>16_dark_edit-rename.svg</file>
-		<file>22_dark_edit-rename.svg</file>
-		<file>24_dark_edit-rename.svg</file>
-		<file>16_light_edit-rename.svg</file>
-		<file>22_light_edit-rename.svg</file>
-		<file>24_light_edit-rename.svg</file>
-		<file>16_dark_edit-select-all.svg</file>
-		<file>22_dark_edit-select-all.svg</file>
-		<file>24_dark_edit-select-all.svg</file>
-		<file>16_light_edit-select-all.svg</file>
-		<file>22_light_edit-select-all.svg</file>
-		<file>24_light_edit-select-all.svg</file>
-		<file>16_dark_format-indent-less.svg</file>
-		<file>22_dark_format-indent-less.svg</file>
-		<file>24_dark_format-indent-less.svg</file>
-		<file>16_light_format-indent-less.svg</file>
-		<file>22_light_format-indent-less.svg</file>
-		<file>24_light_format-indent-less.svg</file>
-		<file>16_dark_format-indent-more.svg</file>
-		<file>22_dark_format-indent-more.svg</file>
-		<file>24_dark_format-indent-more.svg</file>
-		<file>16_light_format-indent-more.svg</file>
-		<file>22_light_format-indent-more.svg</file>
-		<file>24_light_format-indent-more.svg</file>
-		<file>16_dark_format-justify-center.svg</file>
-		<file>22_dark_format-justify-center.svg</file>
-		<file>24_dark_format-justify-center.svg</file>
-		<file>16_light_format-justify-center.svg</file>
-		<file>22_light_format-justify-center.svg</file>
-		<file>24_light_format-justify-center.svg</file>
-		<file>16_dark_format-justify-fill.svg</file>
-		<file>22_dark_format-justify-fill.svg</file>
-		<file>24_dark_format-justify-fill.svg</file>
-		<file>16_light_format-justify-fill.svg</file>
-		<file>22_light_format-justify-fill.svg</file>
-		<file>24_light_format-justify-fill.svg</file>
-		<file>16_dark_format-justify-left.svg</file>
-		<file>22_dark_format-justify-left.svg</file>
-		<file>24_dark_format-justify-left.svg</file>
-		<file>16_light_format-justify-left.svg</file>
-		<file>22_light_format-justify-left.svg</file>
-		<file>24_light_format-justify-left.svg</file>
-		<file>16_dark_format-justify-right.svg</file>
-		<file>22_dark_format-justify-right.svg</file>
-		<file>24_dark_format-justify-right.svg</file>
-		<file>16_light_format-justify-right.svg</file>
-		<file>22_light_format-justify-right.svg</file>
-		<file>24_light_format-justify-right.svg</file>
-		<file>16_dark_format-list-ordered.svg</file>
-		<file>22_dark_format-list-ordered.svg</file>
-		<file>24_dark_format-list-ordered.svg</file>
-		<file>16_light_format-list-ordered.svg</file>
-		<file>22_light_format-list-ordered.svg</file>
-		<file>24_light_format-list-ordered.svg</file>
-		<file>16_dark_format-stroke-color.svg</file>
-		<file>22_dark_format-stroke-color.svg</file>
-		<file>24_dark_format-stroke-color.svg</file>
-		<file>16_light_format-stroke-color.svg</file>
-		<file>22_light_format-stroke-color.svg</file>
-		<file>24_light_format-stroke-color.svg</file>
-		<file>16_dark_format-text-bold.svg</file>
-		<file>22_dark_format-text-bold.svg</file>
-		<file>24_dark_format-text-bold.svg</file>
-		<file>16_light_format-text-bold.svg</file>
-		<file>22_light_format-text-bold.svg</file>
-		<file>24_light_format-text-bold.svg</file>
-		<file>16_dark_format-text-color.svg</file>
-		<file>22_dark_format-text-color.svg</file>
-		<file>24_dark_format-text-color.svg</file>
-		<file>16_light_format-text-color.svg</file>
-		<file>22_light_format-text-color.svg</file>
-		<file>24_light_format-text-color.svg</file>
-		<file>16_dark_format-text-direction-rtl.svg</file>
-		<file>22_dark_format-text-direction-rtl.svg</file>
-		<file>24_dark_format-text-direction-rtl.svg</file>
-		<file>16_light_format-text-direction-rtl.svg</file>
-		<file>22_light_format-text-direction-rtl.svg</file>
-		<file>24_light_format-text-direction-rtl.svg</file>
-		<file>16_dark_format-text-italic.svg</file>
-		<file>22_dark_format-text-italic.svg</file>
-		<file>24_dark_format-text-italic.svg</file>
-		<file>16_light_format-text-italic.svg</file>
-		<file>22_light_format-text-italic.svg</file>
-		<file>24_light_format-text-italic.svg</file>
-		<file>16_dark_format-text-strikethrough.svg</file>
-		<file>22_dark_format-text-strikethrough.svg</file>
-		<file>24_dark_format-text-strikethrough.svg</file>
-		<file>16_light_format-text-strikethrough.svg</file>
-		<file>22_light_format-text-strikethrough.svg</file>
-		<file>24_light_format-text-strikethrough.svg</file>
-		<file>16_dark_format-text-subscript.svg</file>
-		<file>22_dark_format-text-subscript.svg</file>
-		<file>24_dark_format-text-subscript.svg</file>
-		<file>16_light_format-text-subscript.svg</file>
-		<file>22_light_format-text-subscript.svg</file>
-		<file>24_light_format-text-subscript.svg</file>
-		<file>16_dark_format-text-superscript.svg</file>
-		<file>22_dark_format-text-superscript.svg</file>
-		<file>24_dark_format-text-superscript.svg</file>
-		<file>16_light_format-text-superscript.svg</file>
-		<file>22_light_format-text-superscript.svg</file>
-		<file>24_light_format-text-superscript.svg</file>
-		<file>16_dark_format-text-underline.svg</file>
-		<file>22_dark_format-text-underline.svg</file>
-		<file>24_dark_format-text-underline.svg</file>
-		<file>16_light_format-text-underline.svg</file>
-		<file>22_light_format-text-underline.svg</file>
-		<file>24_light_format-text-underline.svg</file>
-		<file>16_dark_insert-text.svg</file>
-		<file>22_dark_insert-text.svg</file>
-		<file>24_dark_insert-text.svg</file>
-		<file>16_light_insert-text.svg</file>
-		<file>22_light_insert-text.svg</file>
-		<file>24_light_insert-text.svg</file>
-		<file>48_dark_klipper.svg</file>
-		<file>48_light_klipper.svg</file>
-		<file>16_dark_list-remove.svg</file>
-		<file>22_dark_list-remove.svg</file>
-		<file>24_dark_list-remove.svg</file>
-		<file>16_light_list-remove.svg</file>
-		<file>22_light_list-remove.svg</file>
-		<file>24_light_list-remove.svg</file>
-		<file>16_dark_media-floppy.svg</file>
-		<file>22_dark_media-floppy.svg</file>
-		<file>16_light_media-floppy.svg</file>
-		<file>22_light_media-floppy.svg</file>
-		<file>16_dark_object-align-horizontal-center-calligra.svg</file>
-		<file>22_dark_object-align-horizontal-center-calligra.svg</file>
-		<file>16_light_object-align-horizontal-center-calligra.svg</file>
-		<file>22_light_object-align-horizontal-center-calligra.svg</file>
-		<file>16_dark_object-align-horizontal-left-calligra.svg</file>
-		<file>22_dark_object-align-horizontal-left-calligra.svg</file>
-		<file>16_light_object-align-horizontal-left-calligra.svg</file>
-		<file>22_light_object-align-horizontal-left-calligra.svg</file>
-		<file>16_dark_object-align-vertical-top-calligra.svg</file>
-		<file>22_dark_object-align-vertical-top-calligra.svg</file>
-		<file>16_light_object-align-vertical-top-calligra.svg</file>
-		<file>22_light_object-align-vertical-top-calligra.svg</file>
-		<file>16_dark_object-group-calligra.svg</file>
-		<file>22_dark_object-group-calligra.svg</file>
-		<file>16_light_object-group-calligra.svg</file>
-		<file>22_light_object-group-calligra.svg</file>
-		<file>16_dark_shape-choose.svg</file>
-		<file>22_dark_shape-choose.svg</file>
-		<file>16_light_shape-choose.svg</file>
-		<file>22_light_shape-choose.svg</file>
-		<file>16_dark_snap-extension.svg</file>
-		<file>22_dark_snap-extension.svg</file>
-		<file>24_dark_snap-extension.svg</file>
-		<file>16_light_snap-extension.svg</file>
-		<file>22_light_snap-extension.svg</file>
-		<file>24_light_snap-extension.svg</file>
-		<file>16_dark_snap-guideline.svg</file>
-		<file>22_dark_snap-guideline.svg</file>
-		<file>24_dark_snap-guideline.svg</file>
-		<file>16_light_snap-guideline.svg</file>
-		<file>22_light_snap-guideline.svg</file>
-		<file>24_light_snap-guideline.svg</file>
-		<file>16_dark_snap-intersection.svg</file>
-		<file>22_dark_snap-intersection.svg</file>
-		<file>24_dark_snap-intersection.svg</file>
-		<file>16_light_snap-intersection.svg</file>
-		<file>22_light_snap-intersection.svg</file>
-		<file>24_light_snap-intersection.svg</file>
-		<file>16_dark_snap-node.svg</file>
-		<file>22_dark_snap-node.svg</file>
-		<file>24_dark_snap-node.svg</file>
-		<file>16_light_snap-node.svg</file>
-		<file>22_light_snap-node.svg</file>
-		<file>24_light_snap-node.svg</file>
-		<file>22_dark_snap-orthogonal.svg</file>
-		<file>24_dark_snap-orthogonal.svg</file>
-		<file>22_light_snap-orthogonal.svg</file>
-		<file>24_light_snap-orthogonal.svg</file>
-		<file>16_dark_split.svg</file>
-		<file>22_dark_split.svg</file>
-		<file>24_dark_split.svg</file>
-		<file>16_light_split.svg</file>
-		<file>22_light_split.svg</file>
-		<file>24_light_split.svg</file>
-		<file>16_dark_tab-close.svg</file>
-		<file>22_dark_tab-close.svg</file>
-		<file>24_dark_tab-close.svg</file>
-		<file>16_light_tab-close.svg</file>
-		<file>22_light_tab-close.svg</file>
-		<file>24_light_tab-close.svg</file>
-		<file>16_dark_tab-new.svg</file>
-		<file>22_dark_tab-new.svg</file>
-		<file>24_dark_tab-new.svg</file>
-		<file>16_light_tab-new.svg</file>
-		<file>22_light_tab-new.svg</file>
-		<file>24_light_tab-new.svg</file>
-		<file>16_dark_transform-move.svg</file>
-		<file>22_dark_transform-move.svg</file>
-		<file>24_dark_transform-move.svg</file>
-		<file>16_light_transform-move.svg</file>
-		<file>22_light_transform-move.svg</file>
-		<file>24_light_transform-move.svg</file>
-		<file>16_dark_trash-empty.svg</file>
-		<file>22_dark_trash-empty.svg</file>
-		<file>24_dark_trash-empty.svg</file>
-		<file>16_light_trash-empty.svg</file>
-		<file>22_light_trash-empty.svg</file>
-		<file>24_light_trash-empty.svg</file>
-		<file>16_dark_zoom-fit-best.svg</file>
-		<file>22_dark_zoom-fit-best.svg</file>
-		<file>24_dark_zoom-fit-best.svg</file>
-		<file>16_light_zoom-fit-best.svg</file>
-		<file>22_light_zoom-fit-best.svg</file>
-		<file>24_light_zoom-fit-best.svg</file>
-	</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>16_dark_align-horizontal-center.svg</file>
+        <file>22_dark_align-horizontal-center.svg</file>
+        <file>24_dark_align-horizontal-center.svg</file>
+        <file>16_light_align-horizontal-center.svg</file>
+        <file>22_light_align-horizontal-center.svg</file>
+        <file>24_light_align-horizontal-center.svg</file>
+        <file>16_dark_align-horizontal-left.svg</file>
+        <file>22_dark_align-horizontal-left.svg</file>
+        <file>24_dark_align-horizontal-left.svg</file>
+        <file>16_light_align-horizontal-left.svg</file>
+        <file>22_light_align-horizontal-left.svg</file>
+        <file>24_light_align-horizontal-left.svg</file>
+        <file>16_dark_align-horizontal-right.svg</file>
+        <file>22_dark_align-horizontal-right.svg</file>
+        <file>24_dark_align-horizontal-right.svg</file>
+        <file>16_light_align-horizontal-right.svg</file>
+        <file>22_light_align-horizontal-right.svg</file>
+        <file>24_light_align-horizontal-right.svg</file>
+        <file>16_dark_align-vertical-bottom.svg</file>
+        <file>22_dark_align-vertical-bottom.svg</file>
+        <file>24_dark_align-vertical-bottom.svg</file>
+        <file>16_light_align-vertical-bottom.svg</file>
+        <file>22_light_align-vertical-bottom.svg</file>
+        <file>24_light_align-vertical-bottom.svg</file>
+        <file>16_dark_align-vertical-center.svg</file>
+        <file>22_dark_align-vertical-center.svg</file>
+        <file>24_dark_align-vertical-center.svg</file>
+        <file>16_light_align-vertical-center.svg</file>
+        <file>22_light_align-vertical-center.svg</file>
+        <file>24_light_align-vertical-center.svg</file>
+        <file>16_dark_align-vertical-top.svg</file>
+        <file>22_dark_align-vertical-top.svg</file>
+        <file>24_dark_align-vertical-top.svg</file>
+        <file>16_light_align-vertical-top.svg</file>
+        <file>22_light_align-vertical-top.svg</file>
+        <file>24_light_align-vertical-top.svg</file>
+        <file>16_dark_application-x-krita.svg</file>
+        <file>22_dark_application-x-krita.svg</file>
+        <file>32_dark_application-x-krita.svg</file>
+        <file>64_dark_application-x-krita.svg</file>
+        <file>16_light_application-x-krita.svg</file>
+        <file>22_light_application-x-krita.svg</file>
+        <file>32_light_application-x-krita.svg</file>
+        <file>64_light_application-x-krita.svg</file>
+        <file>16_dark_application-x-wmf.svg</file>
+        <file>22_dark_application-x-wmf.svg</file>
+        <file>32_dark_application-x-wmf.svg</file>
+        <file>64_dark_application-x-wmf.svg</file>
+        <file>16_light_application-x-wmf.svg</file>
+        <file>22_light_application-x-wmf.svg</file>
+        <file>32_light_application-x-wmf.svg</file>
+        <file>64_light_application-x-wmf.svg</file>
+        <file>calligrakrita.png</file>
+        <file>16_dark_character-set.svg</file>
+        <file>22_dark_character-set.svg</file>
+        <file>24_dark_character-set.svg</file>
+        <file>16_light_character-set.svg</file>
+        <file>22_light_character-set.svg</file>
+        <file>24_light_character-set.svg</file>
+        <file>16_dark_draw-arrow-back.svg</file>
+        <file>22_dark_draw-arrow-back.svg</file>
+        <file>24_dark_draw-arrow-back.svg</file>
+        <file>16_light_draw-arrow-back.svg</file>
+        <file>22_light_draw-arrow-back.svg</file>
+        <file>24_light_draw-arrow-back.svg</file>
+        <file>16_dark_draw-arrow-down.svg</file>
+        <file>22_dark_draw-arrow-down.svg</file>
+        <file>24_dark_draw-arrow-down.svg</file>
+        <file>16_light_draw-arrow-down.svg</file>
+        <file>22_light_draw-arrow-down.svg</file>
+        <file>24_light_draw-arrow-down.svg</file>
+        <file>16_dark_draw-arrow-forward.svg</file>
+        <file>22_dark_draw-arrow-forward.svg</file>
+        <file>24_dark_draw-arrow-forward.svg</file>
+        <file>16_light_draw-arrow-forward.svg</file>
+        <file>22_light_draw-arrow-forward.svg</file>
+        <file>24_light_draw-arrow-forward.svg</file>
+        <file>16_dark_draw-arrow-up.svg</file>
+        <file>22_dark_draw-arrow-up.svg</file>
+        <file>24_dark_draw-arrow-up.svg</file>
+        <file>16_light_draw-arrow-up.svg</file>
+        <file>22_light_draw-arrow-up.svg</file>
+        <file>24_light_draw-arrow-up.svg</file>
+        <file>16_dark_draw-freehand.svg</file>
+        <file>22_dark_draw-freehand.svg</file>
+        <file>24_dark_draw-freehand.svg</file>
+        <file>16_light_draw-freehand.svg</file>
+        <file>22_light_draw-freehand.svg</file>
+        <file>24_light_draw-freehand.svg</file>
+        <file>16_dark_edit-rename.svg</file>
+        <file>22_dark_edit-rename.svg</file>
+        <file>24_dark_edit-rename.svg</file>
+        <file>16_light_edit-rename.svg</file>
+        <file>22_light_edit-rename.svg</file>
+        <file>24_light_edit-rename.svg</file>
+        <file>16_dark_edit-select-all.svg</file>
+        <file>22_dark_edit-select-all.svg</file>
+        <file>24_dark_edit-select-all.svg</file>
+        <file>16_light_edit-select-all.svg</file>
+        <file>22_light_edit-select-all.svg</file>
+        <file>24_light_edit-select-all.svg</file>
+        <file>16_dark_format-indent-less.svg</file>
+        <file>22_dark_format-indent-less.svg</file>
+        <file>24_dark_format-indent-less.svg</file>
+        <file>16_light_format-indent-less.svg</file>
+        <file>22_light_format-indent-less.svg</file>
+        <file>24_light_format-indent-less.svg</file>
+        <file>16_dark_format-indent-more.svg</file>
+        <file>22_dark_format-indent-more.svg</file>
+        <file>24_dark_format-indent-more.svg</file>
+        <file>16_light_format-indent-more.svg</file>
+        <file>22_light_format-indent-more.svg</file>
+        <file>24_light_format-indent-more.svg</file>
+        <file>16_dark_format-justify-center.svg</file>
+        <file>22_dark_format-justify-center.svg</file>
+        <file>24_dark_format-justify-center.svg</file>
+        <file>16_light_format-justify-center.svg</file>
+        <file>22_light_format-justify-center.svg</file>
+        <file>24_light_format-justify-center.svg</file>
+        <file>16_dark_format-justify-fill.svg</file>
+        <file>22_dark_format-justify-fill.svg</file>
+        <file>24_dark_format-justify-fill.svg</file>
+        <file>16_light_format-justify-fill.svg</file>
+        <file>22_light_format-justify-fill.svg</file>
+        <file>24_light_format-justify-fill.svg</file>
+        <file>16_dark_format-justify-left.svg</file>
+        <file>22_dark_format-justify-left.svg</file>
+        <file>24_dark_format-justify-left.svg</file>
+        <file>16_light_format-justify-left.svg</file>
+        <file>22_light_format-justify-left.svg</file>
+        <file>24_light_format-justify-left.svg</file>
+        <file>16_dark_format-justify-right.svg</file>
+        <file>22_dark_format-justify-right.svg</file>
+        <file>24_dark_format-justify-right.svg</file>
+        <file>16_light_format-justify-right.svg</file>
+        <file>22_light_format-justify-right.svg</file>
+        <file>24_light_format-justify-right.svg</file>
+        <file>16_dark_format-list-ordered.svg</file>
+        <file>22_dark_format-list-ordered.svg</file>
+        <file>24_dark_format-list-ordered.svg</file>
+        <file>16_light_format-list-ordered.svg</file>
+        <file>22_light_format-list-ordered.svg</file>
+        <file>24_light_format-list-ordered.svg</file>
+        <file>16_dark_format-stroke-color.svg</file>
+        <file>22_dark_format-stroke-color.svg</file>
+        <file>24_dark_format-stroke-color.svg</file>
+        <file>16_light_format-stroke-color.svg</file>
+        <file>22_light_format-stroke-color.svg</file>
+        <file>24_light_format-stroke-color.svg</file>
+        <file>16_dark_format-text-bold.svg</file>
+        <file>22_dark_format-text-bold.svg</file>
+        <file>24_dark_format-text-bold.svg</file>
+        <file>16_light_format-text-bold.svg</file>
+        <file>22_light_format-text-bold.svg</file>
+        <file>24_light_format-text-bold.svg</file>
+        <file>16_dark_format-text-color.svg</file>
+        <file>22_dark_format-text-color.svg</file>
+        <file>24_dark_format-text-color.svg</file>
+        <file>16_light_format-text-color.svg</file>
+        <file>22_light_format-text-color.svg</file>
+        <file>24_light_format-text-color.svg</file>
+        <file>16_dark_format-text-direction-rtl.svg</file>
+        <file>22_dark_format-text-direction-rtl.svg</file>
+        <file>24_dark_format-text-direction-rtl.svg</file>
+        <file>16_light_format-text-direction-rtl.svg</file>
+        <file>22_light_format-text-direction-rtl.svg</file>
+        <file>24_light_format-text-direction-rtl.svg</file>
+        <file>16_dark_format-text-italic.svg</file>
+        <file>22_dark_format-text-italic.svg</file>
+        <file>24_dark_format-text-italic.svg</file>
+        <file>16_light_format-text-italic.svg</file>
+        <file>22_light_format-text-italic.svg</file>
+        <file>24_light_format-text-italic.svg</file>
+        <file>16_dark_format-text-strikethrough.svg</file>
+        <file>22_dark_format-text-strikethrough.svg</file>
+        <file>24_dark_format-text-strikethrough.svg</file>
+        <file>16_light_format-text-strikethrough.svg</file>
+        <file>22_light_format-text-strikethrough.svg</file>
+        <file>24_light_format-text-strikethrough.svg</file>
+        <file>16_dark_format-text-subscript.svg</file>
+        <file>22_dark_format-text-subscript.svg</file>
+        <file>24_dark_format-text-subscript.svg</file>
+        <file>16_light_format-text-subscript.svg</file>
+        <file>22_light_format-text-subscript.svg</file>
+        <file>24_light_format-text-subscript.svg</file>
+        <file>16_dark_format-text-superscript.svg</file>
+        <file>22_dark_format-text-superscript.svg</file>
+        <file>24_dark_format-text-superscript.svg</file>
+        <file>16_light_format-text-superscript.svg</file>
+        <file>22_light_format-text-superscript.svg</file>
+        <file>24_light_format-text-superscript.svg</file>
+        <file>16_dark_format-text-underline.svg</file>
+        <file>22_dark_format-text-underline.svg</file>
+        <file>24_dark_format-text-underline.svg</file>
+        <file>16_light_format-text-underline.svg</file>
+        <file>22_light_format-text-underline.svg</file>
+        <file>24_light_format-text-underline.svg</file>
+        <file>16_dark_insert-text.svg</file>
+        <file>22_dark_insert-text.svg</file>
+        <file>24_dark_insert-text.svg</file>
+        <file>16_light_insert-text.svg</file>
+        <file>22_light_insert-text.svg</file>
+        <file>24_light_insert-text.svg</file>
+        <file>48_dark_klipper.svg</file>
+        <file>48_light_klipper.svg</file>
+        <file>16_dark_list-remove.svg</file>
+        <file>22_dark_list-remove.svg</file>
+        <file>24_dark_list-remove.svg</file>
+        <file>16_light_list-remove.svg</file>
+        <file>22_light_list-remove.svg</file>
+        <file>24_light_list-remove.svg</file>
+        <file>16_dark_media-floppy.svg</file>
+        <file>22_dark_media-floppy.svg</file>
+        <file>16_light_media-floppy.svg</file>
+        <file>22_light_media-floppy.svg</file>
+        <file>16_dark_object-align-horizontal-center-calligra.svg</file>
+        <file>22_dark_object-align-horizontal-center-calligra.svg</file>
+        <file>16_light_object-align-horizontal-center-calligra.svg</file>
+        <file>22_light_object-align-horizontal-center-calligra.svg</file>
+        <file>16_dark_object-align-horizontal-left-calligra.svg</file>
+        <file>22_dark_object-align-horizontal-left-calligra.svg</file>
+        <file>16_light_object-align-horizontal-left-calligra.svg</file>
+        <file>22_light_object-align-horizontal-left-calligra.svg</file>
+        <file>16_dark_object-align-vertical-top-calligra.svg</file>
+        <file>22_dark_object-align-vertical-top-calligra.svg</file>
+        <file>16_light_object-align-vertical-top-calligra.svg</file>
+        <file>22_light_object-align-vertical-top-calligra.svg</file>
+        <file>16_dark_object-group-calligra.svg</file>
+        <file>22_dark_object-group-calligra.svg</file>
+        <file>16_light_object-group-calligra.svg</file>
+        <file>22_light_object-group-calligra.svg</file>
+        <file>16_dark_shape-choose.svg</file>
+        <file>22_dark_shape-choose.svg</file>
+        <file>16_light_shape-choose.svg</file>
+        <file>22_light_shape-choose.svg</file>
+        <file>16_dark_snap-extension.svg</file>
+        <file>22_dark_snap-extension.svg</file>
+        <file>24_dark_snap-extension.svg</file>
+        <file>16_light_snap-extension.svg</file>
+        <file>22_light_snap-extension.svg</file>
+        <file>24_light_snap-extension.svg</file>
+        <file>16_dark_snap-guideline.svg</file>
+        <file>22_dark_snap-guideline.svg</file>
+        <file>24_dark_snap-guideline.svg</file>
+        <file>16_light_snap-guideline.svg</file>
+        <file>22_light_snap-guideline.svg</file>
+        <file>24_light_snap-guideline.svg</file>
+        <file>16_dark_snap-intersection.svg</file>
+        <file>22_dark_snap-intersection.svg</file>
+        <file>24_dark_snap-intersection.svg</file>
+        <file>16_light_snap-intersection.svg</file>
+        <file>22_light_snap-intersection.svg</file>
+        <file>24_light_snap-intersection.svg</file>
+        <file>16_dark_snap-node.svg</file>
+        <file>22_dark_snap-node.svg</file>
+        <file>24_dark_snap-node.svg</file>
+        <file>16_light_snap-node.svg</file>
+        <file>22_light_snap-node.svg</file>
+        <file>24_light_snap-node.svg</file>
+        <file>22_dark_snap-orthogonal.svg</file>
+        <file>24_dark_snap-orthogonal.svg</file>
+        <file>22_light_snap-orthogonal.svg</file>
+        <file>24_light_snap-orthogonal.svg</file>
+        <file>16_dark_split.svg</file>
+        <file>22_dark_split.svg</file>
+        <file>24_dark_split.svg</file>
+        <file>16_light_split.svg</file>
+        <file>22_light_split.svg</file>
+        <file>24_light_split.svg</file>
+        <file>16_dark_tab-close.svg</file>
+        <file>22_dark_tab-close.svg</file>
+        <file>24_dark_tab-close.svg</file>
+        <file>16_light_tab-close.svg</file>
+        <file>22_light_tab-close.svg</file>
+        <file>24_light_tab-close.svg</file>
+        <file>16_dark_tab-new.svg</file>
+        <file>22_dark_tab-new.svg</file>
+        <file>24_dark_tab-new.svg</file>
+        <file>16_light_tab-new.svg</file>
+        <file>22_light_tab-new.svg</file>
+        <file>24_light_tab-new.svg</file>
+        <file>16_dark_transform-move.svg</file>
+        <file>22_dark_transform-move.svg</file>
+        <file>24_dark_transform-move.svg</file>
+        <file>16_light_transform-move.svg</file>
+        <file>22_light_transform-move.svg</file>
+        <file>24_light_transform-move.svg</file>
+        <file>16_dark_trash-empty.svg</file>
+        <file>22_dark_trash-empty.svg</file>
+        <file>24_dark_trash-empty.svg</file>
+        <file>16_light_trash-empty.svg</file>
+        <file>22_light_trash-empty.svg</file>
+        <file>24_light_trash-empty.svg</file>
+        <file>16_dark_zoom-fit-best.svg</file>
+        <file>22_dark_zoom-fit-best.svg</file>
+        <file>24_dark_zoom-fit-best.svg</file>
+        <file>16_light_zoom-fit-best.svg</file>
+        <file>22_light_zoom-fit-best.svg</file>
+        <file>24_light_zoom-fit-best.svg</file>
+        <file>16_dark_warning.svg</file>
+        <file>16_light_warning.svg</file>
+    </qresource>
 </RCC>
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index 2261d4e162..a2c02809e8 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -1,24 +1,24 @@
 add_subdirectory(defaultdockers)
 add_subdirectory(smallcolorselector)
 add_subdirectory(specificcolorselector)
 add_subdirectory(digitalmixer)
 add_subdirectory(advancedcolorselector)
 add_subdirectory(presetdocker)
 add_subdirectory(historydocker)
 add_subdirectory(channeldocker)
 add_subdirectory(imagedocker)
 add_subdirectory(artisticcolorselector)
 add_subdirectory(tasksetdocker)
 add_subdirectory(compositiondocker)
 add_subdirectory(patterndocker)
 add_subdirectory(griddocker)
 if(HAVE_OCIO)
     add_subdirectory(lut)
 endif()
 add_subdirectory(overview)
 add_subdirectory(palettedocker)
 add_subdirectory(colorslider)
 add_subdirectory(animation)
 add_subdirectory(presethistory)
 add_subdirectory(shapedockers)
-#add_subdirectory(histogram)
+add_subdirectory(histogram)
diff --git a/plugins/dockers/advancedcolorselector/kis_common_colors.cpp b/plugins/dockers/advancedcolorselector/kis_common_colors.cpp
index 863afcc84e..357386f3d2 100644
--- a/plugins/dockers/advancedcolorselector/kis_common_colors.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_common_colors.cpp
@@ -1,139 +1,139 @@
 /*
  *  Copyright (c) 2010 Adam Celarek <kdedev at xibo dot at>
  *
  *  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_common_colors.h"
 #include <QImage>
 #include <QList>
 #include <QPushButton>
 #include <QColor>
 #include <QRunnable>
 #include <QThreadPool>
 #include <QApplication>
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
 #include <klocalizedstring.h>
 
 #include <kis_icon.h>
 #include "KoColor.h"
 #include "kis_canvas2.h"
 #include "kis_image.h"
 #include "kis_paint_device.h"
 #include "kis_config.h"
 #include "kis_common_colors_recalculation_runner.h"
 
 
 KisCommonColors::KisCommonColors(QWidget *parent) :
     KisColorPatches("commonColors", parent)
 {
     m_reloadButton = new QPushButton();
     m_reloadButton->setIcon(KisIconUtils::loadIcon("view-refresh"));
     m_reloadButton->setToolTip(i18n("Create a list of colors from the image"));
     connect(m_reloadButton, SIGNAL(clicked()), this, SLOT(recalculate()));
 
     QList<QWidget*> tmpList;
     tmpList.append(m_reloadButton);
     setAdditionalButtons(tmpList);
     updateSettings();
 
     m_recalculationTimer.setInterval(2000);
     m_recalculationTimer.setSingleShot(true);
 
     connect(&m_recalculationTimer, SIGNAL(timeout()),
             this,                  SLOT(recalculate()));
 
 }
 
 void KisCommonColors::setCanvas(KisCanvas2 *canvas)
 {
     KisColorPatches::setCanvas(canvas);
 
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     if (cfg.readEntry("commonColorsAutoUpdate", false)) {
         if (m_image) {
             m_image->disconnect(this);
         }
         if (m_canvas) {
             connect(m_canvas->image(), SIGNAL(sigImageUpdated(const QRect &)),
                     &m_recalculationTimer, SLOT(start()), Qt::UniqueConnection);
             m_image = m_canvas->image();
         }
         else {
             m_image = 0;
         }
     }
 }
 
 KisColorSelectorBase* KisCommonColors::createPopup() const
 {
     KisCommonColors* ret = new KisCommonColors();
     ret->setCanvas(m_canvas);
     ret->setColors(colors());
     return ret;
 }
 
 void KisCommonColors::updateSettings()
 {
     KisColorPatches::updateSettings();
 
     if(!(m_canvas && m_canvas->image()))
         return;
 
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     if(cfg.readEntry("commonColorsAutoUpdate", false)) {
         connect(m_canvas->image(),     SIGNAL(sigImageUpdated(const QRect &)),
                 &m_recalculationTimer, SLOT(start()), Qt::UniqueConnection);
     }
     else {
         disconnect(m_canvas->image(),     SIGNAL(sigImageUpdated(const QRect &)),
                 &m_recalculationTimer, SLOT(start()));
     }
 
     m_reloadButton->setEnabled(true);
 }
 
 void KisCommonColors::setColors(QList<KoColor> colors)
 {
     QMutexLocker locker(&m_mutex);
 	KisColorPatches::setColors(colors);
 	m_reloadButton->setEnabled(true);
     m_calculatedColors = colors;
 }
 
 void KisCommonColors::recalculate()
 {
     if (!m_canvas) {
         return;
     }
     if(m_reloadButton->isEnabled()==false) {
         // on old computation is still running
         // try later to recalculate
         m_recalculationTimer.start();
         return;
     }
     m_reloadButton->setEnabled(false);
     qApp->processEvents();
 
     KisImageWSP kisImage = m_canvas->image();
 
-    QImage image = kisImage->projection()->createThumbnail(1024, 1024, kisImage->bounds(), KoColorConversionTransformation::internalRenderingIntent(), KoColorConversionTransformation::internalConversionFlags());
+    QImage image = kisImage->projection()->createThumbnail(1024, 1024, kisImage->bounds(), 1, KoColorConversionTransformation::internalRenderingIntent(), KoColorConversionTransformation::internalConversionFlags());
 
     KisCommonColorsRecalculationRunner* runner = new KisCommonColorsRecalculationRunner(image, patchCount(), this);
     QThreadPool::globalInstance()->start(runner);
 }
 
diff --git a/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
index 0d192a1acf..d799f1e2d8 100644
--- a/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.cpp
@@ -1,100 +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_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 QDoubleSpinBox();
+    m_hueDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_hueDelta);
-    m_saturationDelta = new QDoubleSpinBox();
+    m_saturationDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_saturationDelta);
-    m_valueDelta = new QDoubleSpinBox();
+    m_valueDelta = new KisDoubleParseSpinBox();
     lineOne->addWidget(m_valueDelta);
 
     QHBoxLayout* lineTwo = new QHBoxLayout();
     layout->addLayout(lineTwo);
     lineTwo->addWidget(new QLabel(i18n("Shift: ")));
 
-    m_hueShift = new QDoubleSpinBox();
+    m_hueShift = new KisDoubleParseSpinBox();
     lineTwo->addWidget(m_hueShift);
-    m_saturationShift = new QDoubleSpinBox();
+    m_saturationShift = new KisDoubleParseSpinBox();
     lineTwo->addWidget(m_saturationShift);
-    m_valueShift = new QDoubleSpinBox();
+    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/kis_shade_selector_line_editor.h b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.h
index c39c7e7c9f..53bdd91a57 100644
--- a/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.h
+++ b/plugins/dockers/advancedcolorselector/kis_shade_selector_line_editor.h
@@ -1,56 +1,57 @@
 /*
  *  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.
  */
 
 #ifndef __KIS_SHADE_SELECTOR_LINE_EDITOR_H
 #define __KIS_SHADE_SELECTOR_LINE_EDITOR_H
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QDoubleSpinBox>
 #include <QLabel>
 
 #include <klocalizedstring.h>
 
 #include "kis_shade_selector_line.h"
 
+class KisDoubleParseSpinBox;
 
 class KisShadeSelectorLineEditor : public KisShadeSelectorLineBase {
     Q_OBJECT
 public:
     KisShadeSelectorLineEditor(QWidget* parent);
 
     QString toString() const;
     void fromString(const QString &string);
 
 private Q_SLOTS:
     void valueChanged();
 
 Q_SIGNALS:
     void requestActivateLine(QWidget *widget);
 
 private:
-    QDoubleSpinBox* m_hueDelta;
-    QDoubleSpinBox* m_saturationDelta;
-    QDoubleSpinBox* m_valueDelta;
-    QDoubleSpinBox* m_hueShift;
-    QDoubleSpinBox* m_saturationShift;
-    QDoubleSpinBox* m_valueShift;
+    KisDoubleParseSpinBox* m_hueDelta;
+    KisDoubleParseSpinBox* m_saturationDelta;
+    KisDoubleParseSpinBox* m_valueDelta;
+    KisDoubleParseSpinBox* m_hueShift;
+    KisDoubleParseSpinBox* m_saturationShift;
+    KisDoubleParseSpinBox* m_valueShift;
 };
 
 #endif /* __KIS_SHADE_SELECTOR_LINE_EDITOR_H */
diff --git a/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui b/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
index e105b5a676..a2fd23de57 100644
--- a/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
+++ b/plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
@@ -1,1463 +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 Model Type: </string>
+              <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="QDoubleSpinBox" name="l_lumaG">
+                 <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="QDoubleSpinBox" name="l_lumaR">
+                 <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="QDoubleSpinBox" name="l_lumaB">
+                 <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="QDoubleSpinBox" name="SP_Gamma">
+                 <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 Image</string>
+          <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="QSpinBox" name="popupSize">
+        <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>Gradient</string>
+                 <string>&amp;Gradient</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="minimalShadeSelectorAsColorPatches">
                 <property name="text">
-                 <string>Color Patches</string>
+                 <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="QSpinBox" name="minimalShadeSelectorLineCount">
+             <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="QSpinBox" name="minimalShadeSelectorLineHeight">
+             <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="QSpinBox" name="minimalShadeSelectorPatchesPerLine"/>
+             <widget class="KisIntParseSpinBox" name="minimalShadeSelectorPatchesPerLine"/>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
-      <zorder>label_7</zorder>
-      <zorder>shadeSelectorUpdateOnRightClick</zorder>
-      <zorder>shadeSelectorUpdateOnLeftClick</zorder>
-      <zorder>shadeSelectorUpdateOnForeground</zorder>
-      <zorder>shadeSelectorUpdateOnBackground</zorder>
-      <zorder>myPaintColorModelLabel</zorder>
       <zorder>minimalShadeSelectorGroup</zorder>
-      <zorder>ACSshadeSelectorMyPaintColorModelComboBox</zorder>
-      <zorder>ACSShadeSelectorTypeComboBox</zorder>
-      <zorder>label_16</zorder>
-      <zorder>verticalSpacer_3</zorder>
       <zorder></zorder>
-      <zorder>verticalSpacer_4</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 History</string>
+          <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="QSpinBox" name="lastUsedColorsWidth">
+                <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="QSpinBox" name="lastUsedColorsHeight">
+                <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="QSpinBox" name="lastUsedColorsPatchCount">
+                <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>Vertical</string>
+                  <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>Columns:</string>
+                  <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="QSpinBox" name="lastUsedColorsNumCols">
+                <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>Horizontal</string>
+                  <string>&amp;Horizontal</string>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="QLabel" name="lbl_lastUsedNumRows">
                  <property name="text">
-                  <string>Rows:</string>
+                  <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="QSpinBox" name="lastUsedColorsNumRows">
+                <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 image</string>
+          <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="QSpinBox" name="commonColorsWidth">
+                <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="QSpinBox" name="commonColorsHeight">
+                <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="QSpinBox" name="commonColorsPatchCount">
+                <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>Vertical</string>
+                  <string>&amp;Vertical</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QLabel" name="lbl_commonColorsNumCols">
                  <property name="text">
-                  <string>Columns:</string>
+                  <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="QSpinBox" name="commonColorsNumCols">
+                <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>Horizontal</string>
+                  <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>Rows:</string>
+                  <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="QSpinBox" name="commonColorsNumRows">
+                <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="QSpinBox" name="sb_lightness">
+          <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="QSpinBox" name="sb_saturation">
+          <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="QSpinBox" name="sb_hue">
+          <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="QSpinBox" name="sb_rg">
+          <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="QSpinBox" name="sb_by">
+          <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 64a8c78320..782d6908d1 100644
--- a/plugins/dockers/animation/tests/timeline_model_test.cpp
+++ b/plugins/dockers/animation/tests/timeline_model_test.cpp
@@ -1,296 +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_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 QSpinBox(&dlg);
+    QSpinBox *intFps = new KisIntParseSpinBox(&dlg);
     intFps->setValue(12);
 
-    QSpinBox *intTime = new QSpinBox(&dlg);
+    QSpinBox *intTime = new KisIntParseSpinBox(&dlg);
     intTime->setValue(0);
     intTime->setMaximum(10000);
 
-    QSpinBox *intLayer = new QSpinBox(&dlg);
+    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 92c7b19283..00f3e3d618 100644
--- a/plugins/dockers/animation/wdg_animation.ui
+++ b/plugins/dockers/animation/wdg_animation.ui
@@ -1,519 +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="QSpinBox" name="intCurrentTime">
+      <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="QSpinBox" name="spinFromFrame">
+        <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="QSpinBox" name="spinToFrame">
+        <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="QDoubleSpinBox" name="doublePlaySpeed">
+        <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="QSpinBox" name="intFramerate">
+        <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_double_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kis_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/dockers/channeldocker/channeldocker_dock.cpp b/plugins/dockers/channeldocker/channeldocker_dock.cpp
index d7ad261229..d86c038aad 100644
--- a/plugins/dockers/channeldocker/channeldocker_dock.cpp
+++ b/plugins/dockers/channeldocker/channeldocker_dock.cpp
@@ -1,68 +1,121 @@
 /*
  *  Copyright (c) 2011 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 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 "channeldocker_dock.h"
 
 #include <QGridLayout>
 #include <QTableView>
 #include <QHeaderView>
 #include <klocalizedstring.h>
 
 #include <KoCanvasBase.h>
 #include "channelmodel.h"
 #include <KisViewManager.h>
 #include <kis_canvas2.h>
 #include <kis_layer.h>
 #include <kis_node_manager.h>
 #include <kis_image.h>
 #include <kis_group_layer.h>
 #include <kis_layer.h>
 #include <kis_paint_device.h>
+#include "kis_signal_compressor.h"
 #include <KisView.h>
+#include <kis_idle_watcher.h>
 
-ChannelDockerDock::ChannelDockerDock( ) : QDockWidget(i18n("Channels")), m_canvas(0)
+ChannelDockerDock::ChannelDockerDock( ) :
+    QDockWidget(i18n("Channels")),
+    m_imageIdleWatcher(new KisIdleWatcher(250, this)),
+    m_canvas(0)
 {
     m_channelTable = new QTableView(this);
     m_model = new ChannelModel(this);
     m_channelTable->setModel(m_model);
     m_channelTable->setShowGrid(false);
+    m_channelTable->horizontalHeader()->setStretchLastSection(true);
     m_channelTable->verticalHeader()->setVisible(false);
+    m_channelTable->horizontalHeader()->setVisible(false);
+    m_channelTable->setSelectionBehavior( QAbstractItemView::SelectRows );
+
     setWidget(m_channelTable);
+
+    connect(m_channelTable,&QTableView::activated, m_model, &ChannelModel::rowActivated);
 }
 
 void ChannelDockerDock::setCanvas(KoCanvasBase * canvas)
 {
+    if(m_canvas == canvas)
+        return;
+
     setEnabled(canvas != 0);
 
+    if (m_canvas) {
+        m_canvas->disconnectCanvasObserver(this);
+        m_canvas->image()->disconnect(this);
+    }
+
     if (!canvas) {
         m_canvas = 0;
         return;
     }
+
     m_canvas = dynamic_cast<KisCanvas2*>(canvas);
-    if (m_canvas && m_canvas->imageView() && m_canvas->imageView()->image()) {
-        QPointer<KisView> view = m_canvas->imageView();
-        m_model->slotLayerActivated(view->image()->rootLayer());
-        KisPaintDeviceSP dev = view->image()->projection();
+    if ( m_canvas && m_canvas->image() ) {
+        m_model->slotSetCanvas(m_canvas);
+
+        KisPaintDeviceSP dev = m_canvas->image()->projection();
+
+        m_imageIdleWatcher->setTrackedImage(m_canvas->image());
+        connect(m_imageIdleWatcher, &KisIdleWatcher::startedIdleMode, this, &ChannelDockerDock::updateChannelTable);
+
         connect(dev, SIGNAL(colorSpaceChanged(const KoColorSpace*)), m_model, SLOT(slotColorSpaceChanged(const KoColorSpace*)));
         connect(dev, SIGNAL(colorSpaceChanged(const KoColorSpace*)), m_canvas, SLOT(channelSelectionChanged()));
+        connect(m_model, SIGNAL(channelFlagsChanged()), m_canvas, SLOT(channelSelectionChanged()));
+        m_imageIdleWatcher->startCountdown();
     }
 
-    connect(m_model, SIGNAL(channelFlagsChanged()), m_canvas, SLOT(channelSelectionChanged()));
 }
 
+void ChannelDockerDock::unsetCanvas()
+{
+    setEnabled(false);
+    m_canvas = 0;
+    m_model->unsetCanvas();
+}
+
+void ChannelDockerDock::showEvent(QShowEvent *event)
+{
+    Q_UNUSED(event);
+    m_imageIdleWatcher->startCountdown();
+}
+
+void ChannelDockerDock::startUpdateCanvasProjection()
+{
+    m_imageIdleWatcher->startCountdown();
+}
+
+void ChannelDockerDock::updateChannelTable()
+{
+    if (isVisible() && m_canvas && m_canvas->image()){
+        m_model->updateData(m_canvas);
+        m_channelTable->resizeRowsToContents();
+        m_channelTable->resizeColumnsToContents();
+    }
+}
+
+
 
 
diff --git a/plugins/dockers/channeldocker/channeldocker_dock.h b/plugins/dockers/channeldocker/channeldocker_dock.h
index c8426a2cd2..e2ba26cf12 100644
--- a/plugins/dockers/channeldocker/channeldocker_dock.h
+++ b/plugins/dockers/channeldocker/channeldocker_dock.h
@@ -1,42 +1,55 @@
 /*
  *  Copyright (c) 2011 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 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.
  */
 
 #ifndef CHANNELDOCKER_DOCK_H
 #define CHANNELDOCKER_DOCK_H
 
 #include <QDockWidget>
 #include <KoCanvasObserverBase.h>
 
 class ChannelModel;
 class QTableView;
 class KisCanvas2;
+class KisSignalCompressor;
+class KisIdleWatcher;
 
 class ChannelDockerDock : public QDockWidget, public KoCanvasObserverBase {
     Q_OBJECT
 public:
     ChannelDockerDock();
+
     QString observerName() { return "ChannelDockerDock"; }
-    virtual void setCanvas(KoCanvasBase *canvas);
-    virtual void unsetCanvas() { m_canvas = 0; setEnabled(false);}
+    void setCanvas(KoCanvasBase *canvas);
+    void unsetCanvas();
+    void showEvent(QShowEvent *event);
+
+public Q_SLOTS:
+    void startUpdateCanvasProjection();
+
+private Q_SLOTS:
+    void updateChannelTable(void);
+
 private:
+    KisIdleWatcher* m_imageIdleWatcher;
+    KisSignalCompressor *m_compressor;
     KisCanvas2 *m_canvas;
     QTableView *m_channelTable;
     ChannelModel *m_model;
 };
 
 
 #endif
diff --git a/plugins/dockers/channeldocker/channelmodel.cpp b/plugins/dockers/channeldocker/channelmodel.cpp
index ab1c5f9d41..1dcefb5882 100644
--- a/plugins/dockers/channeldocker/channelmodel.cpp
+++ b/plugins/dockers/channeldocker/channelmodel.cpp
@@ -1,142 +1,254 @@
 /*
  *  Copyright (c) 2011 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 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 "channelmodel.h"
-
+#include <QImage>
 #include <KoColorSpace.h>
 #include <KoChannelInfo.h>
-#include <kis_layer.h>
-#include <kis_paint_layer.h>
+#include <kis_painter.h>
+
+#include <kis_group_layer.h>
+#include <kis_paint_device.h>
+#include <kis_iterator_ng.h>
+#include <kis_default_bounds.h>
+
+#include <kis_canvas2.h>
 
-ChannelModel::ChannelModel(QObject* parent): QAbstractTableModel(parent), m_currentLayer(0)
+ChannelModel::ChannelModel(QObject* parent):
+    QAbstractTableModel(parent),
+    m_canvas(nullptr), m_oversampleRatio(2), m_channelCount(0)
 {
+    setThumbnailSizeLimit(QSize(64, 64));
 }
 
 ChannelModel::~ChannelModel()
 {
 }
 
 QVariant ChannelModel::data(const QModelIndex& index, int role) const
 {
-    if (m_currentLayer.isValid() && index.isValid())
-    {
-        QList<KoChannelInfo*> channels = m_currentLayer->colorSpace()->channels();
-        int channelIndex = KoChannelInfo::displayPositionToChannelIndex(index.row(), channels);
+    if (m_canvas && index.isValid()) {
+        KisGroupLayerSP rootLayer = m_canvas->image()->rootLayer();
+        const KoColorSpace* cs = rootLayer->colorSpace();
+        QList<KoChannelInfo*> channels = cs->channels();
+
+        int channelIndex = index.row();
 
         switch (role) {
-        case Qt::DisplayRole:
-        {
-            return channels.at(channelIndex)->name();
-        }   
+        case Qt::DisplayRole: {
+            if (index.column() == 2) {
+                return channels.at(channelIndex)->name();
+            }
+            return QVariant();
+        }
+        case Qt::DecorationRole: {
+            if (index.column() == 1) {
+                Q_ASSERT(m_thumbnails.count() > index.row());
+                return QVariant(m_thumbnails.at(index.row()));
+            }
+            return QVariant();
+        }
         case Qt::CheckStateRole: {
             Q_ASSERT(index.row() < rowCount());
             Q_ASSERT(index.column() < columnCount());
-            
+
             if (index.column() == 0) {
-                QBitArray flags = m_currentLayer->channelFlags();
+                QBitArray flags = rootLayer->channelFlags();
                 return (flags.isEmpty() || flags.testBit(channelIndex)) ? Qt::Checked : Qt::Unchecked;
             }
-            
-            QBitArray flags = dynamic_cast<const KisPaintLayer*>(m_currentLayer.data())->channelLockFlags();
-            return (flags.isEmpty() || flags.testBit(channelIndex)) ? Qt::Unchecked : Qt::Checked;
+            return QVariant();
         }
         }
     }
     return QVariant();
 }
 
 QVariant ChannelModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if(orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-        if(section == 0)
-            return i18n("Enabled");
-        
-        return i18n("Locked");
-    }
-    
-    return QAbstractItemModel::headerData(section, orientation, role);
+    Q_UNUSED(section); Q_UNUSED(orientation); Q_UNUSED(role);
+    return QVariant();
 }
 
 
 int ChannelModel::rowCount(const QModelIndex& /*parent*/) const
 {
-    if (!m_currentLayer) return 0;
+    if (!m_canvas) return 0;
 
-    return m_currentLayer.isValid() ? m_currentLayer->colorSpace()->channelCount() : 0;
+    return m_channelCount;
 }
 
 int ChannelModel::columnCount(const QModelIndex& /*parent*/) const
 {
-    if (!m_currentLayer) return 0;
+    if (!m_canvas) return 0;
 
-    return dynamic_cast<const KisPaintLayer*>(m_currentLayer.data()) ? 2 : 1;
+    //columns are: checkbox, thumbnail, channel name
+    return 3;
 }
 
 
 bool ChannelModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
-    if (m_currentLayer.isValid() && index.isValid())
-    {
-        QList<KoChannelInfo*> channels = m_currentLayer->colorSpace()->channels();
-        int channelIndex = KoChannelInfo::displayPositionToChannelIndex(index.row(), channels);
-        
+    if (m_canvas && m_canvas->image()) {
+        KisGroupLayerSP rootLayer = m_canvas->image()->rootLayer();
+        const KoColorSpace* cs = rootLayer->colorSpace();
+        QList<KoChannelInfo*> channels = cs->channels();
+        Q_ASSERT(index.row() <= channels.count());
+
+        int channelIndex = index.row();
+
         if (role == Qt::CheckStateRole) {
-            Q_ASSERT(index.row() < rowCount());
-            Q_ASSERT(index.column() < columnCount());
-            
-            if (index.column() == 0) {
-                QBitArray flags = m_currentLayer->channelFlags();
+            QBitArray flags = rootLayer->channelFlags();
+            flags = flags.isEmpty() ? cs->channelFlags(true, true) : flags;
+            Q_ASSERT(!flags.isEmpty());
+
+            flags.setBit(channelIndex, value.toInt() == Qt::Checked);
+            rootLayer->setChannelFlags(flags);
 
-                flags = flags.isEmpty() ? m_currentLayer->colorSpace()->channelFlags(true, true) : flags;
-                flags.setBit(channelIndex, value.toInt() == Qt::Checked);
-                m_currentLayer->setChannelFlags(flags);
-            }
-            else { //if (index.column() == 1)
-                KisPaintLayer* paintLayer = dynamic_cast<KisPaintLayer*>(m_currentLayer.data());
-                QBitArray      flags      = paintLayer->channelLockFlags();
-                flags = flags.isEmpty() ? m_currentLayer->colorSpace()->channelFlags(true, true) : flags;
-                flags.setBit(channelIndex, value.toInt() == Qt::Unchecked);
-                paintLayer->setChannelLockFlags(flags);
-            }
-            
             emit channelFlagsChanged();
+            emit dataChanged(this->index(0, 0), this->index(channels.count(), 0));
             return true;
         }
     }
     return false;
 }
 
+
+//User double clicked on a row (but on channel checkbox)
+//we select this channel, and deselect all other channels (except alpha, which we don't touch)
+//this makes it fast to select single color channel
+void ChannelModel::rowActivated(const QModelIndex &index)
+{
+    if (m_canvas && m_canvas->image()) {
+        KisGroupLayerWSP rootLayer = m_canvas->image()->rootLayer();
+        const KoColorSpace* cs = rootLayer->colorSpace();
+        QList<KoChannelInfo*> channels = cs->channels();
+        Q_ASSERT(index.row() <= channels.count());
+
+        int channelIndex = index.row();
+
+        QBitArray flags = rootLayer->channelFlags();
+        flags = flags.isEmpty() ? cs->channelFlags(true, true) : flags;
+        Q_ASSERT(!flags.isEmpty());
+
+        for (int i = 0; i < channels.count(); ++i) {
+            if (channels[i]->channelType() != KoChannelInfo::ALPHA) {
+                flags.setBit(i, (i == channelIndex));
+            }
+        }
+
+        rootLayer->setChannelFlags(flags);
+
+        emit channelFlagsChanged();
+        emit dataChanged(this->index(0, 0), this->index(channels.count(), 0));
+    }
+}
+
+
 Qt::ItemFlags ChannelModel::flags(const QModelIndex& /*index*/) const
 {
     Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
     return flags;
 }
 
-void ChannelModel::slotLayerActivated(KisLayerSP layer)
+void ChannelModel::unsetCanvas()
 {
-    beginResetModel();
-    m_currentLayer = layer;
-    endResetModel();
+    m_canvas = 0;
+}
+
+void ChannelModel::setThumbnailSizeLimit(QSize size)
+{
+    m_thumbnailSizeLimit = size;
+    updateData(m_canvas);
+}
+
+void ChannelModel::slotSetCanvas(KisCanvas2 *canvas)
+{
+    if (m_canvas != canvas) {
+        beginResetModel();
+        m_canvas = canvas;
+        if (m_canvas && m_canvas->image()) {
+            m_channelCount = m_canvas->image()->colorSpace()->channelCount();
+            updateThumbnails();
+        } else {
+            m_channelCount = 0;
+        }
+        endResetModel();
+    }
 }
 
 void ChannelModel::slotColorSpaceChanged(const KoColorSpace *colorSpace)
 {
     Q_UNUSED(colorSpace);
-    slotLayerActivated(m_currentLayer);
+    beginResetModel();
+    updateThumbnails();
+    endResetModel();
+}
+
+void ChannelModel::updateData(KisCanvas2 *canvas)
+{
+    beginResetModel();
+    m_canvas = canvas;
+    m_channelCount = (m_canvas) ? m_canvas->image()->colorSpace()->channelCount() : 0;
+    updateThumbnails();
+    endResetModel();
+}
+
+
+
+//Create thumbnails from full image.
+//Assumptions: thumbnail size is small compared to the original image and thumbnail quality
+//doesn't need to be high, so we use fast but not very accurate algorithm.
+void ChannelModel::updateThumbnails(void)
+{
+    if (m_canvas && m_canvas->image()) {
+        KisImageSP canvas_image = m_canvas->image();
+        const KoColorSpace* cs = canvas_image->colorSpace();
+        m_channelCount = cs->channelCount();
+
+        KisPaintDeviceSP dev = canvas_image->projection();
+
+        //make sure thumbnail maintains aspect ratio of the original image
+        QSize thumbnailSize(canvas_image->bounds().size());
+        thumbnailSize.scale(m_thumbnailSizeLimit, Qt::KeepAspectRatio);
+
+        KisPaintDeviceSP thumbnailDev = dev->createThumbnailDeviceOversampled(thumbnailSize.width(), thumbnailSize.height(),
+                                        m_oversampleRatio, canvas_image->bounds());
+
+        m_thumbnails.resize(m_channelCount);
+
+        for (quint32 i = 0; i < m_channelCount; ++i) {
+            m_thumbnails[i] = QImage(thumbnailSize, QImage::Format_Grayscale8);
+        }
+
+        KisSequentialConstIterator it(thumbnailDev, QRect(0, 0, thumbnailSize.width(), thumbnailSize.height()));
+
+        for (int y = 0; y < thumbnailSize.height(); y++) {
+            for (int x = 0; x < thumbnailSize.width(); x++) {
+                const quint8* pixel = it.rawDataConst();
+                for (int chan = 0; chan < m_channelCount; ++chan) {
+                    QImage &img = m_thumbnails[chan];
+                    *(img.scanLine(y) + x) = cs->scaleToU8(pixel, chan);
+                }
+                it.nextPixel();
+            }
+        }
+    } else {
+        m_channelCount = 0;
+    }
 }
 
 #include "moc_channelmodel.cpp"
diff --git a/plugins/dockers/channeldocker/channelmodel.h b/plugins/dockers/channeldocker/channelmodel.h
index ec5856ae2d..7e7a09014f 100644
--- a/plugins/dockers/channeldocker/channelmodel.h
+++ b/plugins/dockers/channeldocker/channelmodel.h
@@ -1,50 +1,67 @@
 /*
  *  Copyright (c) 2011 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 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.
  */
 
 #ifndef CHANNELMODEL_H
 #define CHANNELMODEL_H
 
 #include <QModelIndex>
+#include <QSize>
+#include <kis_types.h>
 
 class KoColorSpace;
-
-#include <kis_types.h>
+class KisCanvas2;
 
 class ChannelModel : public QAbstractTableModel
 {
     Q_OBJECT
 public:
     ChannelModel(QObject* parent = 0);
     virtual ~ChannelModel();
-    
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+    Qt::ItemFlags flags(const QModelIndex& index) const;
+    void unsetCanvas( void );
+
+    //set maximum size of the thumbnail image. This should be set based on screen resolution, etc.
+    void setThumbnailSizeLimit(QSize size);
 
 public Q_SLOTS:
-    void slotLayerActivated(KisLayerSP layer);
+    void slotSetCanvas(KisCanvas2* canvas);
     void slotColorSpaceChanged(const KoColorSpace *colorSpace);
+    void updateData(KisCanvas2 *canvas);
+    void rowActivated(const QModelIndex &index);
+
 Q_SIGNALS:
     void channelFlagsChanged();
+
 private:
-    KisLayerWSP m_currentLayer;
+    void updateThumbnails();
+
+private:
+    KisCanvas2* m_canvas;
+    QVector<QImage> m_thumbnails;
+    QSize m_thumbnailSizeLimit;
+    int m_oversampleRatio;
+    int m_channelCount;
 };
 
+
 #endif // CHANNELMODEL_H
diff --git a/plugins/dockers/colorslider/kis_color_slider_input.cpp b/plugins/dockers/colorslider/kis_color_slider_input.cpp
index 8e0a460668..4e76de0adb 100644
--- a/plugins/dockers/colorslider/kis_color_slider_input.cpp
+++ b/plugins/dockers/colorslider/kis_color_slider_input.cpp
@@ -1,710 +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_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 QDoubleSpinBox(this);
+    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/colorslider/kis_color_slider_input.h b/plugins/dockers/colorslider/kis_color_slider_input.h
index eecb8e2f44..2b4b0c7f70 100644
--- a/plugins/dockers/colorslider/kis_color_slider_input.h
+++ b/plugins/dockers/colorslider/kis_color_slider_input.h
@@ -1,90 +1,91 @@
 /*
  *  Copyright (c) 2008 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2014 Wolthera van Hövell <griffinvalley@gmail.com>    
  *
  *  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.
  */
 
 #ifndef _KIS_COLOR_SLIDER_INPUT_H_
 #define _KIS_COLOR_SLIDER_INPUT_H_
 
 #include <QWidget>
 #include "KoColorDisplayRendererInterface.h"
 #include "kis_canvas2.h"
 
 
 class KoColor;
 class QWidget;
 class QDoubleSpinBox;
+class KisDoubleParseSpinBox;
 class KisHSVSlider;
 class KisDisplayColorConverter;
 
 
 
 class KisColorSliderInput : public QWidget
 {
     Q_OBJECT
 public:
     KisColorSliderInput(QWidget* parent, KoColor* color, const int type, KoColorDisplayRendererInterface *displayRenderer, KisCanvas2* canvas);
 protected:
     void init();
     virtual QWidget* createInput() = 0;
 Q_SIGNALS:
     void updated();
     
 protected:
     const int m_type;
     KoColor* m_color;
     KoColorDisplayRendererInterface *m_displayRenderer;
     KisCanvas2* m_canvas;
     KisHSVSlider* m_hsvSlider;
 };
 
 class KisHSXColorSliderInput : public KisColorSliderInput
 {
     Q_OBJECT
 public:
     KisHSXColorSliderInput(QWidget* parent, const int type, KoColor* color, KoColorDisplayRendererInterface *displayRenderer, KisCanvas2* canvas);
     
     KisDisplayColorConverter* converter() const;
 protected:
     virtual QWidget* createInput();
     KisCanvas2* m_canvas;
 public Q_SLOTS:
     void setValue(double);
     void update();
     void hueUpdate(int h);
     void satUpdate(int s, int type);
     void toneUpdate(int l, int type);
     void sliderChanged(int i);
     void sliderIn();
     void sliderOut();
     void numInputChanged(double v);
 Q_SIGNALS:
     void hueUpdated(int);
     void satUpdated(int, int);
     void toneUpdated(int, int);
 private:
-    QDoubleSpinBox* m_NumInput;
+    KisDoubleParseSpinBox* m_NumInput;
     qreal m_hue;
     qreal m_sat;
     qreal m_val;
     qreal R, G, B, Gamma;
     bool m_hueupdating;
     bool m_satupdating;
     bool m_toneupdating;
     bool m_sliderisupdating;
 };
 
 #endif
diff --git a/plugins/dockers/griddocker/grid_config_widget.cpp b/plugins/dockers/griddocker/grid_config_widget.cpp
index 208685428f..49cece4bb2 100644
--- a/plugins/dockers/griddocker/grid_config_widget.cpp
+++ b/plugins/dockers/griddocker/grid_config_widget.cpp
@@ -1,237 +1,238 @@
 /*
  *  Copyright (c) 2016 Dmitry Kazakov <dimula73@gmail.com>
  *
  *  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 "grid_config_widget.h"
 #include "ui_grid_config_widget.h"
 
 #include "kis_grid_config.h"
 #include "kis_guides_config.h"
 #include "kis_debug.h"
 #include "kis_aspect_ratio_locker.h"
+#include "kis_int_parse_spin_box.h"
 
 
 struct GridConfigWidget::Private
 {
     Private() : guiSignalsBlocked(false) {}
 
     KisGridConfig gridConfig;
     KisGuidesConfig guidesConfig;
     bool guiSignalsBlocked;
 };
 
 GridConfigWidget::GridConfigWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::GridConfigWidget),
     m_d(new Private)
 {
     ui->setupUi(this);
 
     ui->colorMain->setAlphaChannelEnabled(true);
     ui->colorSubdivision->setAlphaChannelEnabled(true);
     ui->colorGuides->setAlphaChannelEnabled(true);
 
     setGridConfig(m_d->gridConfig);
     setGuidesConfig(m_d->guidesConfig);
 
     connect(ui->chkOffset, SIGNAL(toggled(bool)), ui->lblXOffset, SLOT(setVisible(bool)));
     connect(ui->chkOffset, SIGNAL(toggled(bool)), ui->lblYOffset, SLOT(setVisible(bool)));
     connect(ui->chkOffset, SIGNAL(toggled(bool)), ui->intXOffset, SLOT(setVisible(bool)));
     connect(ui->chkOffset, SIGNAL(toggled(bool)), ui->intYOffset, SLOT(setVisible(bool)));
     connect(ui->chkOffset, SIGNAL(toggled(bool)), ui->offsetAspectButton, SLOT(setVisible(bool)));
 
 
     ui->lblXOffset->setVisible(false);
     ui->lblYOffset->setVisible(false);
     ui->intXOffset->setVisible(false);
     ui->intYOffset->setVisible(false);
     ui->offsetAspectButton->setVisible(false);
 
     connect(ui->chkShowGrid, SIGNAL(stateChanged(int)), SLOT(slotGridGuiChanged()));
     connect(ui->chkSnapToGrid, SIGNAL(stateChanged(int)), SLOT(slotGridGuiChanged()));
 
     connect(ui->chkShowGuides, SIGNAL(stateChanged(int)), SLOT(slotGuidesGuiChanged()));
     connect(ui->chkSnapToGuides, SIGNAL(stateChanged(int)), SLOT(slotGuidesGuiChanged()));
     connect(ui->chkLockGuides, SIGNAL(stateChanged(int)), SLOT(slotGuidesGuiChanged()));
 
     connect(ui->intSubdivision, SIGNAL(valueChanged(int)), SLOT(slotGridGuiChanged()));
 
     connect(ui->selectMainStyle, SIGNAL(currentIndexChanged(int)), SLOT(slotGridGuiChanged()));
     connect(ui->colorMain, SIGNAL(changed(const QColor&)), SLOT(slotGridGuiChanged()));
     connect(ui->selectSubdivisionStyle, SIGNAL(currentIndexChanged(int)), SLOT(slotGridGuiChanged()));
     connect(ui->colorSubdivision, SIGNAL(changed(const QColor&)), SLOT(slotGridGuiChanged()));
     connect(ui->selectGuidesStyle, SIGNAL(currentIndexChanged(int)), SLOT(slotGuidesGuiChanged()));
     connect(ui->colorGuides, SIGNAL(changed(const QColor&)), SLOT(slotGuidesGuiChanged()));
 
     ui->chkOffset->setChecked(false);
 
     KisAspectRatioLocker *offsetLocker = new KisAspectRatioLocker(this);
     offsetLocker->connectSpinBoxes(ui->intXOffset, ui->intYOffset, ui->offsetAspectButton);
 
     KisAspectRatioLocker *spacingLocker = new KisAspectRatioLocker(this);
     spacingLocker->connectSpinBoxes(ui->intHSpacing, ui->intVSpacing, ui->spacingAspectButton);
 
     connect(offsetLocker, SIGNAL(sliderValueChanged()), SLOT(slotGridGuiChanged()));
     connect(offsetLocker, SIGNAL(aspectButtonChanged()), SLOT(slotGridGuiChanged()));
 
     connect(spacingLocker, SIGNAL(sliderValueChanged()), SLOT(slotGridGuiChanged()));
     connect(spacingLocker, SIGNAL(aspectButtonChanged()), SLOT(slotGridGuiChanged()));
 }
 
 GridConfigWidget::~GridConfigWidget()
 {
     delete ui;
 }
 
 void GridConfigWidget::setGridConfig(const KisGridConfig &value)
 {
     KisGridConfig currentConfig = fetchGuiGridConfig();
     if (currentConfig == value) return;
 
     setGridConfigImpl(value);
 }
 
 void GridConfigWidget::setGuidesConfig(const KisGuidesConfig &value)
 {
     KisGuidesConfig currentConfig = fetchGuiGuidesConfig();
     if (currentConfig == value) return;
 
     setGuidesConfigImpl(value);
 }
 
 void GridConfigWidget::setGridConfigImpl(const KisGridConfig &value)
 {
     m_d->gridConfig = value;
     m_d->guiSignalsBlocked = true;
 
     ui->offsetAspectButton->setKeepAspectRatio(m_d->gridConfig.offsetAspectLocked());
     ui->spacingAspectButton->setKeepAspectRatio(m_d->gridConfig.spacingAspectLocked());
     ui->chkShowGrid->setChecked(m_d->gridConfig.showGrid());
     ui->chkSnapToGrid->setChecked(m_d->gridConfig.snapToGrid());
     ui->intHSpacing->setValue(m_d->gridConfig.spacing().x());
     ui->intVSpacing->setValue(m_d->gridConfig.spacing().y());
     ui->intXOffset->setValue(m_d->gridConfig.offset().x());
     ui->intYOffset->setValue(m_d->gridConfig.offset().y());
     ui->intSubdivision->setValue(m_d->gridConfig.subdivision());
 
     ui->selectMainStyle->setCurrentIndex(int(m_d->gridConfig.lineTypeMain()));
     ui->selectSubdivisionStyle->setCurrentIndex(int(m_d->gridConfig.lineTypeSubdivision()));
 
     ui->colorMain->setColor(m_d->gridConfig.colorMain());
     ui->colorSubdivision->setColor(m_d->gridConfig.colorSubdivision());
 
     m_d->guiSignalsBlocked = false;
 
     emit gridValueChanged();
 }
 
 void GridConfigWidget::setGuidesConfigImpl(const KisGuidesConfig &value)
 {
     m_d->guidesConfig = value;
     m_d->guiSignalsBlocked = true;
 
     ui->chkShowGuides->setChecked(m_d->guidesConfig.showGuides());
     ui->chkSnapToGuides->setChecked(m_d->guidesConfig.snapToGuides());
     ui->chkLockGuides->setChecked(m_d->guidesConfig.lockGuides());
 
     ui->selectGuidesStyle->setCurrentIndex(int(m_d->guidesConfig.guidesLineType()));
     ui->colorGuides->setColor(m_d->guidesConfig.guidesColor());
 
     m_d->guiSignalsBlocked = false;
 
     emit guidesValueChanged();
 }
 
 KisGridConfig GridConfigWidget::gridConfig() const
 {
     return m_d->gridConfig;
 }
 
 KisGuidesConfig GridConfigWidget::guidesConfig() const
 {
     return m_d->guidesConfig;
 }
 
 void GridConfigWidget::setGridDivision(int w, int h)
 {
     ui->intHSpacing->setMaximum(w);
     ui->intVSpacing->setMaximum(h);
 }
 
 KisGridConfig GridConfigWidget::fetchGuiGridConfig() const
 {
     KisGridConfig config;
 
     config.setShowGrid(ui->chkShowGrid->isChecked());
     config.setSnapToGrid(ui->chkSnapToGrid->isChecked());
 
     QPoint pt;
 
     pt.rx() = ui->intHSpacing->value();
     pt.ry() = ui->intVSpacing->value();
     config.setSpacing(pt);
 
     pt.rx() = ui->intXOffset->value();
     pt.ry() = ui->intYOffset->value();
     config.setOffset(pt);
 
     config.setSubdivision(ui->intSubdivision->value());
 
     config.setOffsetAspectLocked(ui->offsetAspectButton->keepAspectRatio());
     config.setSpacingAspectLocked(ui->spacingAspectButton->keepAspectRatio());
 
     config.setLineTypeMain(KisGridConfig::LineTypeInternal(ui->selectMainStyle->currentIndex()));
     config.setLineTypeSubdivision(KisGridConfig::LineTypeInternal(ui->selectSubdivisionStyle->currentIndex()));
 
     config.setColorMain(ui->colorMain->color());
     config.setColorSubdivision(ui->colorSubdivision->color());
 
     return config;
 }
 
 KisGuidesConfig GridConfigWidget::fetchGuiGuidesConfig() const
 {
     KisGuidesConfig config = m_d->guidesConfig;
 
     config.setShowGuides(ui->chkShowGuides->isChecked());
     config.setSnapToGuides(ui->chkSnapToGuides->isChecked());
     config.setLockGuides(ui->chkLockGuides->isChecked());
 
     config.setGuidesLineType(KisGuidesConfig::LineTypeInternal(ui->selectGuidesStyle->currentIndex()));
     config.setGuidesColor(ui->colorGuides->color());
 
     return config;
 }
 
 void GridConfigWidget::slotGridGuiChanged()
 {
     if (m_d->guiSignalsBlocked) return;
 
     KisGridConfig currentConfig = fetchGuiGridConfig();
     if (currentConfig == m_d->gridConfig) return;
 
     setGridConfigImpl(currentConfig);
 }
 
 void GridConfigWidget::slotGuidesGuiChanged()
 {
     if (m_d->guiSignalsBlocked) return;
 
     KisGuidesConfig currentConfig = fetchGuiGuidesConfig();
     if (currentConfig == m_d->guidesConfig) return;
 
     setGuidesConfigImpl(currentConfig);
 }
diff --git a/plugins/dockers/griddocker/grid_config_widget.ui b/plugins/dockers/griddocker/grid_config_widget.ui
index ede7f471c1..e1c884d440 100644
--- a/plugins/dockers/griddocker/grid_config_widget.ui
+++ b/plugins/dockers/griddocker/grid_config_widget.ui
@@ -1,493 +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="QSpinBox" name="intHSpacing">
+            <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="QSpinBox" name="intVSpacing">
+            <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="QSpinBox" name="intSubdivision">
+          <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="QSpinBox" name="intXOffset">
+          <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="QSpinBox" name="intYOffset">
+          <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_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>
-  <customwidget>
-   <class>KoAspectButton</class>
-   <extends>QWidget</extends>
-   <header>KoAspectButton.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/dockers/histogram/CMakeLists.txt b/plugins/dockers/histogram/CMakeLists.txt
index a7a7536491..b78477c8d2 100644
--- a/plugins/dockers/histogram/CMakeLists.txt
+++ b/plugins/dockers/histogram/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(KRITA_HISTOGRAMDOCKER_SOURCES histogramdocker.cpp histogramdocker_dock.cpp )
+set(KRITA_HISTOGRAMDOCKER_SOURCES histogramdocker.cpp histogramdocker_dock.cpp histogramdockerwidget.cpp)
 add_library(kritahistogramdocker MODULE ${KRITA_HISTOGRAMDOCKER_SOURCES})
 target_link_libraries(kritahistogramdocker kritaui)
-#install(TARGETS kritahistogramdocker  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+install(TARGETS kritahistogramdocker  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/dockers/histogram/histogramdocker_dock.cpp b/plugins/dockers/histogram/histogramdocker_dock.cpp
index 7744a8b62f..3632e8b2d3 100644
--- a/plugins/dockers/histogram/histogramdocker_dock.cpp
+++ b/plugins/dockers/histogram/histogramdocker_dock.cpp
@@ -1,94 +1,108 @@
 /*
  *  Copyright (c) 2016 Eugene Ingerman <geneing at gmail dot com>
  *
  *  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 "histogramdocker_dock.h"
 
 #include <QLabel>
 #include <QVBoxLayout>
 #include <klocalizedstring.h>
 
 #include "kis_canvas2.h"
 #include <KisViewManager.h>
 #include <kis_zoom_manager.h>
 #include "kis_image.h"
 #include "kis_paint_device.h"
-#include "kis_signal_compressor.h"
-#include "kis_histogram_view.h"
+#include "kis_idle_watcher.h"
+#include "histogramdockerwidget.h"
 
-HistogramDockerDock::HistogramDockerDock( )
+HistogramDockerDock::HistogramDockerDock()
     : QDockWidget(i18n("Histogram")),
-      m_compressor(new KisSignalCompressor(200, KisSignalCompressor::POSTPONE, this)),
-      m_canvas(0), m_producer(nullptr)
+      m_imageIdleWatcher(new KisIdleWatcher(250, this)),
+      m_canvas(0)
 {
     QWidget *page = new QWidget(this);
     m_layout = new QVBoxLayout(page);
 
-    m_histogramWidget = new KisHistogramView(this);
+    m_histogramWidget = new HistogramDockerWidget(this);
+
     m_histogramWidget->setMinimumHeight(50);
-    m_histogramWidget->setSmoothHistogram(true);
+    //m_histogramWidget->setSmoothHistogram(false);
     m_layout->addWidget(m_histogramWidget, 1);
     setWidget(page);
-    connect(m_compressor,SIGNAL(timeout()),SLOT(startUpdateCanvasProjection()));
+    connect(m_imageIdleWatcher, &KisIdleWatcher::startedIdleMode, this, &HistogramDockerDock::updateHistogram);
 }
 
 
 void HistogramDockerDock::setCanvas(KoCanvasBase * canvas)
 {
-    if(m_canvas == canvas)
+    if (m_canvas == canvas)
         return;
 
     setEnabled(canvas != 0);
 
     if (m_canvas) {
         m_canvas->disconnectCanvasObserver(this);
         m_canvas->image()->disconnect(this);
     }
-    m_canvas = dynamic_cast<KisCanvas2*>(canvas);
-    if (m_canvas && m_canvas->imageView() && m_canvas->imageView()->image() ) {
 
-        KisPaintDeviceSP dev = m_canvas->image()->projection();
-        auto cs = m_canvas->image()->colorSpace();
+    m_canvas = dynamic_cast<KisCanvas2*>(canvas);
+    if (m_canvas) {
+        m_histogramWidget->setPaintDevice(m_canvas);
 
-        QList<QString> producers = KoHistogramProducerFactoryRegistry::instance()->keysCompatibleWith(cs,true);
-        m_producer = KoHistogramProducerFactoryRegistry::instance()->get(producers.at(0))->generate();
-        m_histogramWidget->setPaintDevice( dev, m_producer, m_canvas->image()->bounds() );
+        m_imageIdleWatcher->setTrackedImage(m_canvas->image());
 
-        connect(m_canvas->image(), SIGNAL(sigImageUpdated(QRect)), m_compressor, SLOT(start()), Qt::UniqueConnection);
+        connect(m_canvas->image(), SIGNAL(sigImageUpdated(QRect)), this, SLOT(startUpdateCanvasProjection()), Qt::UniqueConnection);
         connect(m_canvas->image(), SIGNAL(sigColorSpaceChanged(const KoColorSpace*)), this, SLOT(sigColorSpaceChanged(const KoColorSpace*)), Qt::UniqueConnection);
-
-        m_compressor->start();
+        m_imageIdleWatcher->startCountdown();
     }
 }
 
 void HistogramDockerDock::unsetCanvas()
 {
     setEnabled(false);
     m_canvas = 0;
+    m_histogramWidget->setPaintDevice(m_canvas);
+    m_imageIdleWatcher->startCountdown();
 }
 
 void HistogramDockerDock::startUpdateCanvasProjection()
 {
-    m_histogramWidget->startUpdateCanvasProjection();
+    if (isVisible()) {
+        m_imageIdleWatcher->startCountdown();
+    }
+}
+
+void HistogramDockerDock::showEvent(QShowEvent *event)
+{
+    Q_UNUSED(event);
+    m_imageIdleWatcher->startCountdown();
 }
 
+
 void HistogramDockerDock::sigColorSpaceChanged(const KoColorSpace *cs)
 {
-    QList<QString> producers = KoHistogramProducerFactoryRegistry::instance()->keysCompatibleWith(cs,true);
-    m_producer = KoHistogramProducerFactoryRegistry::instance()->get(producers.at(0))->generate();
-    m_histogramWidget->setProducer(m_producer);
+    if (isVisible()) {
+        m_imageIdleWatcher->startCountdown();
+    }
 }
 
+void HistogramDockerDock::updateHistogram()
+{
+    if (isVisible()) {
+        m_histogramWidget->updateHistogram();
+    }
+}
diff --git a/plugins/dockers/histogram/histogramdocker_dock.h b/plugins/dockers/histogram/histogramdocker_dock.h
index 31150553fa..62bd11bdb6 100644
--- a/plugins/dockers/histogram/histogramdocker_dock.h
+++ b/plugins/dockers/histogram/histogramdocker_dock.h
@@ -1,54 +1,57 @@
 /*
  *  Copyright (c) 2016 Eugene Ingerman <geneing at gmail dot com>
  *
  *  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.
  */
 
 #ifndef _HISTOGRAM_DOCK_H_
 #define _HISTOGRAM_DOCK_H_
 
 #include <QDockWidget>
 #include <KoCanvasObserverBase.h>
 #include <kis_paint_device.h>
 
 class QVBoxLayout;
 class KisCanvas2;
 class KisHistogramView;
-class KisSignalCompressor;
+class KisIdleWatcher;
 class KoHistogramProducer;
+class HistogramDockerWidget;
 
 class HistogramDockerDock : public QDockWidget, public KoCanvasObserverBase {
     Q_OBJECT
 public:
     HistogramDockerDock();
 
     QString observerName() { return "HistogramDockerDock"; }
     virtual void setCanvas(KoCanvasBase *canvas);
     virtual void unsetCanvas();
 
 public Q_SLOTS:
-    virtual void startUpdateCanvasProjection();
-    //virtual void sigProfileChanged(const KoColorProfile* cp);
-    virtual void sigColorSpaceChanged(const KoColorSpace* cs);
+    void startUpdateCanvasProjection();
+    void sigColorSpaceChanged(const KoColorSpace* cs);
+    void updateHistogram();
+
+protected:
+    void showEvent(QShowEvent *event);
 
 private:
     QVBoxLayout *m_layout;
-    KisSignalCompressor *m_compressor;
-    KisHistogramView *m_histogramWidget;
+    KisIdleWatcher *m_imageIdleWatcher;
+    HistogramDockerWidget *m_histogramWidget;
     KisCanvas2 *m_canvas;
-    KoHistogramProducer *m_producer;
 };
 
 
 #endif
diff --git a/plugins/dockers/histogram/histogramdockerwidget.cpp b/plugins/dockers/histogram/histogramdockerwidget.cpp
new file mode 100644
index 0000000000..f418485efa
--- /dev/null
+++ b/plugins/dockers/histogram/histogramdockerwidget.cpp
@@ -0,0 +1,194 @@
+/*
+ *  Copyright (c) 2016 Eugene Ingerman <geneing at gmail dot com>
+ *
+ *  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 "histogramdockerwidget.h"
+
+#include <QThread>
+#include <QVector>
+#include <limits>
+#include <algorithm>
+#include <QTime>
+#include <QPainter>
+
+#include "KoChannelInfo.h"
+#include "kis_paint_device.h"
+#include "KoColorSpace.h"
+#include "kis_iterator_ng.h"
+#include "kis_canvas2.h"
+
+HistogramDockerWidget::HistogramDockerWidget(QWidget *parent, const char *name, Qt::WindowFlags f)
+    : QLabel(parent, f), m_paintDevice(nullptr), m_smoothHistogram(true)
+{
+    setObjectName(name);
+}
+
+HistogramDockerWidget::~HistogramDockerWidget()
+{
+
+}
+
+void HistogramDockerWidget::setPaintDevice(KisCanvas2* canvas)
+{
+    if (canvas) {
+        m_paintDevice = canvas->image()->projection();
+        m_bounds = canvas->image()->bounds();
+    } else {
+        m_paintDevice.clear();
+        m_bounds = QRect();
+        m_histogramData.clear();
+    }
+}
+
+void HistogramDockerWidget::updateHistogram()
+{
+    if (!m_paintDevice.isNull()) {
+        KisPaintDeviceSP m_devClone = new KisPaintDevice(m_paintDevice->colorSpace());
+
+        m_devClone->makeCloneFrom(m_paintDevice, m_bounds);
+
+        HistogramComputationThread *workerThread = new HistogramComputationThread(m_devClone, m_bounds);
+        connect(workerThread, &HistogramComputationThread::resultReady, this, &HistogramDockerWidget::receiveNewHistogram);
+        connect(workerThread, &HistogramComputationThread::finished, workerThread, &QObject::deleteLater);
+        workerThread->start();
+    } else {
+        m_histogramData.clear();
+        update();
+    }
+}
+
+void HistogramDockerWidget::receiveNewHistogram(HistVector *histogramData)
+{
+    m_histogramData = *histogramData;
+    update();
+}
+
+void HistogramDockerWidget::paintEvent(QPaintEvent *event)
+{
+    if (!m_histogramData.empty()) {
+        int nBins = m_histogramData.at(0).size();
+        const KoColorSpace* cs = m_paintDevice->colorSpace();
+
+        QLabel::paintEvent(event);
+        QPainter painter(this);
+        painter.setPen(this->palette().light().color());
+
+        const int NGRID = 4;
+        for (int i = 0; i <= NGRID; ++i) {
+            painter.drawLine(this->width()*i / NGRID, 0., this->width()*i / NGRID, this->height());
+            painter.drawLine(0., this->height()*i / NGRID, this->width(), this->height()*i / NGRID);
+        }
+
+        unsigned int nChannels = cs->channelCount();
+        QList<KoChannelInfo *> channels = cs->channels();
+        unsigned int highest = 0;
+        //find the most populous bin in the histogram to scale it properly
+        for (int chan = 0; chan < channels.size(); chan++) {
+            if (channels.at(chan)->channelType() != KoChannelInfo::ALPHA) {
+                std::vector<quint32> histogramTemp = m_histogramData.at(chan);
+                //use 98th percentile, rather than max for better visual appearance
+                int nthPercentile = 2 * histogramTemp.size() / 100;
+                //unsigned int max = *std::max_element(m_histogramData.at(chan).begin(),m_histogramData.at(chan).end());
+                std::nth_element(histogramTemp.begin(),
+                                 histogramTemp.begin() + nthPercentile, histogramTemp.end(), std::greater<int>());
+                unsigned int max = *(histogramTemp.begin() + nthPercentile);
+
+                highest = std::max(max, highest);
+            }
+        }
+
+        painter.setWindow(QRect(-1, 0, nBins + 1, highest));
+        painter.setCompositionMode(QPainter::CompositionMode_Plus);
+
+        for (int chan = 0; chan < nChannels; chan++) {
+            if (channels.at(chan)->channelType() != KoChannelInfo::ALPHA) {
+                QColor color = channels.at(chan)->color();
+
+                //special handling of grayscale color spaces. can't use color returned above.
+                if(cs->colorChannelCount()==1){
+                    color = QColor(Qt::gray);
+                }
+
+                QColor fill_color = color;
+                fill_color.setAlphaF(.25);
+                painter.setBrush(fill_color);
+                QPen pen = QPen(color);
+                pen.setWidth(0);
+                painter.setPen(pen);
+
+                if (m_smoothHistogram) {
+                    QPainterPath path;
+                    path.moveTo(QPointF(-1, highest));
+                    for (qint32 i = 0; i < nBins; ++i) {
+                        float v = std::max((float)highest - m_histogramData[chan][i], 0.f);
+                        path.lineTo(QPointF(i, v));
+
+                    }
+                    path.lineTo(QPointF(nBins + 1, highest));
+                    path.closeSubpath();
+                    painter.drawPath(path);
+                } else {
+                    pen.setWidth(1);
+                    painter.setPen(pen);
+                    for (qint32 i = 0; i < nBins; ++i) {
+                        float v = std::max((float)highest - m_histogramData[chan][i], 0.f);
+                        painter.drawLine(QPointF(i, highest), QPointF(i, v));
+                    }
+                }
+            }
+        }
+    }
+}
+
+void HistogramComputationThread::run()
+{
+    const KoColorSpace *cs = m_dev->colorSpace();
+    quint32 channelCount = m_dev->channelCount();
+    quint32 pixelSize = m_dev->pixelSize();
+
+    quint32 imageSize = m_bounds.width() * m_bounds.height();
+    quint32 nSkip = 1 + (imageSize >> 20); //for speed use about 1M pixels for computing histograms
+
+    //allocate space for the histogram data
+    bins.resize((int)channelCount);
+    for (auto &bin : bins) {
+        bin.resize(std::numeric_limits<quint8>::max() + 1);
+    }
+
+    QRect bounds = m_dev->exactBounds();
+    if (bounds.isEmpty())
+        return;
+
+    KisSequentialConstIterator it(m_dev, m_dev->exactBounds());
+    int i;
+    quint32 toSkip = nSkip;
+
+    do {
+        i = it.nConseqPixels();
+        const quint8* pixel = it.rawDataConst();
+        for (int k = 0; k < i; ++k) {
+            if (--toSkip == 0) {
+                for (int chan = 0; chan < (int)channelCount; ++chan) {
+                    bins[chan][cs->scaleToU8(pixel, chan)]++;
+                }
+                toSkip = nSkip;
+            }
+            pixel += pixelSize;
+        }
+    } while (it.nextPixels(i));
+
+    emit resultReady(&bins);
+}
diff --git a/plugins/dockers/histogram/histogramdockerwidget.h b/plugins/dockers/histogram/histogramdockerwidget.h
new file mode 100644
index 0000000000..d2c94cf233
--- /dev/null
+++ b/plugins/dockers/histogram/histogramdockerwidget.h
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2016 Eugene Ingerman <geneing at gmail dot com>
+ *
+ *  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.
+ */
+
+
+#ifndef HISTOGRAMDOCKERWIDGET_H
+#define HISTOGRAMDOCKERWIDGET_H
+
+#include <QObject>
+#include <QWidget>
+#include <QLabel>
+#include <QThread>
+#include "kis_types.h"
+#include <vector>
+
+class KisCanvas2;
+
+typedef std::vector<std::vector<quint32> > HistVector; //Don't use QVector here - it's too slow for this purpose
+
+
+class HistogramComputationThread : public QThread
+{
+    Q_OBJECT
+public:
+    HistogramComputationThread(KisPaintDeviceSP _dev, const QRect& _bounds) : m_dev(_dev), m_bounds(_bounds)
+    {}
+
+    void run() Q_DECL_OVERRIDE;
+
+Q_SIGNALS:
+    void resultReady(HistVector*);
+
+private:
+    KisPaintDeviceSP m_dev;
+    QRect m_bounds;
+    HistVector bins;
+};
+
+
+class HistogramDockerWidget : public QLabel
+{
+    Q_OBJECT
+
+public:
+    HistogramDockerWidget(QWidget *parent = 0, const char *name = 0, Qt::WindowFlags f = 0);
+    ~HistogramDockerWidget();
+    void setPaintDevice(KisCanvas2* canvas);
+    void paintEvent(QPaintEvent *event);
+
+public Q_SLOTS:
+    void updateHistogram();
+    void receiveNewHistogram(HistVector*);
+
+private:
+    KisPaintDeviceSP m_paintDevice;
+    HistVector m_histogramData;
+    QRect m_bounds;
+    bool m_smoothHistogram;
+};
+
+#endif // HISTOGRAMDOCKERWIDGET_H
diff --git a/plugins/dockers/historydocker/KisUndoModel.cpp b/plugins/dockers/historydocker/KisUndoModel.cpp
index 31a5394d8e..89d56f914e 100644
--- a/plugins/dockers/historydocker/KisUndoModel.cpp
+++ b/plugins/dockers/historydocker/KisUndoModel.cpp
@@ -1,282 +1,282 @@
 /* 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 "KisUndoModel.h"
 #include <klocalizedstring.h>
 
 KisUndoModel::KisUndoModel(QObject *parent)
     : QAbstractItemModel(parent)
 {
     m_blockOutgoingHistoryChange = false;
     m_stack = 0;
     m_canvas = 0;
     m_sel_model = new QItemSelectionModel(this, this);
     connect(m_sel_model, SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(setStackCurrentIndex(QModelIndex)));
     m_empty_label = i18n("<empty>");
 }
 
 QItemSelectionModel *KisUndoModel::selectionModel() const
 {
     return m_sel_model;
 }
 
 KUndo2QStack *KisUndoModel::stack() const
 {
     return m_stack;
 }
 
 void KisUndoModel::setStack(KUndo2QStack *stack)
 {
     if (m_stack == stack)
         return;
 
     if (m_stack != 0) {
         disconnect(m_stack, SIGNAL(canRedoChanged(bool)), this, SLOT(stackChanged()));
         disconnect(m_stack, SIGNAL(cleanChanged(bool)), this, SLOT(stackChanged()));
         disconnect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(stackChanged()));
         disconnect(m_stack, SIGNAL(destroyed(QObject*)), this, SLOT(stackDestroyed(QObject*)));
         disconnect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(addImage(int)));
     }
 
     m_stack = stack;
 
     if (m_stack != 0) {
         connect(m_stack, SIGNAL(canRedoChanged(bool)), this, SLOT(stackChanged()));
         connect(m_stack, SIGNAL(cleanChanged(bool)), this, SLOT(stackChanged()));
         connect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(stackChanged()));
         connect(m_stack, SIGNAL(destroyed(QObject*)), this, SLOT(stackDestroyed(QObject*)));
         connect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(addImage(int)));
     }
 
     stackChanged();
 }
 
 void KisUndoModel::stackDestroyed(QObject *obj)
 {
     if (obj != m_stack)
         return;
     m_stack = 0;
 
     stackChanged();
 }
 
 void KisUndoModel::stackChanged()
 {
     reset();
 
     m_blockOutgoingHistoryChange = true;
     m_sel_model->setCurrentIndex(selectedIndex(), QItemSelectionModel::ClearAndSelect);
     m_blockOutgoingHistoryChange = false;
 }
 
 void KisUndoModel::setStackCurrentIndex(const QModelIndex &index)
 {
     if (m_blockOutgoingHistoryChange)
         return;
 
     if (m_stack == 0)
         return;
 
     if (index == selectedIndex())
         return;
 
     if (index.column() != 0)
         return;
 
     m_stack->setIndex(index.row());
 }
 
 QModelIndex KisUndoModel::selectedIndex() const
 {
     return m_stack == 0 ? QModelIndex() : createIndex(m_stack->index(), 0);
 }
 
 QModelIndex KisUndoModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (m_stack == 0)
         return QModelIndex();
 
     if (parent.isValid())
         return QModelIndex();
 
     if (column != 0)
         return QModelIndex();
 
     if (row < 0 || row > m_stack->count())
         return QModelIndex();
 
     return createIndex(row, column);
 }
 
 QModelIndex KisUndoModel::parent(const QModelIndex&) const
 {
     return QModelIndex();
 }
 
 int KisUndoModel::rowCount(const QModelIndex &parent) const
 {
     if (m_stack == 0)
         return 0;
 
     if (parent.isValid())
         return 0;
 
     return m_stack->count() + 1;
 }
 
 int KisUndoModel::columnCount(const QModelIndex&) const
 {
     return 1;
 }
 
 QVariant KisUndoModel::data(const QModelIndex &index, int role) const
 {
     if (m_stack == 0){
         return QVariant();
     }
 
     if (index.column() != 0){
         return QVariant();
     }
 
     if (index.row() < 0 || index.row() > m_stack->count()){
         return QVariant();
     }
 
     if (role == Qt::DisplayRole) {
         if (index.row() == 0){
             return m_empty_label;
         }
         KUndo2Command* currentCommand = const_cast<KUndo2Command*>(m_stack->command(index.row() - 1));
         return currentCommand->isMerged()?m_stack->text(index.row() - 1)+"(Merged)":m_stack->text(index.row() - 1);
     }
     else if (role == Qt::DecorationRole) {
         if (index.row() > 0) {
             const KUndo2Command* currentCommand = m_stack->command(index.row() - 1);
             if (m_imageMap.contains(currentCommand)) {
                 return m_imageMap[currentCommand];
             }
         }
     }
     return QVariant();
 }
 
 QString KisUndoModel::emptyLabel() const
 {
     return m_empty_label;
 }
 
 void KisUndoModel::setEmptyLabel(const QString &label)
 {
     m_empty_label = label;
     stackChanged();
 }
 
 void KisUndoModel::setCleanIcon(const QIcon &icon)
 {
     m_clean_icon = icon;
     stackChanged();
 }
 
 QIcon KisUndoModel::cleanIcon() const
 {
     return m_clean_icon;
 }
 
 void KisUndoModel::setCanvas(KisCanvas2 *canvas)
 {
     m_canvas = canvas;
 }
 
 void KisUndoModel::addImage(int idx)
 {
 
     if (m_stack == 0 || m_stack->count() == 0) {
         return;
     }
 
     const KUndo2Command* currentCommand = m_stack->command(idx-1);
     if (m_stack->count() == idx && !m_imageMap.contains(currentCommand)) {
         KisImageWSP historyImage = m_canvas->viewManager()->image();
         KisPaintDeviceSP paintDevice = historyImage->projection();
-        QImage image = paintDevice->createThumbnail(32, 32,
+        QImage image = paintDevice->createThumbnail(32, 32, 1,
                                                     KoColorConversionTransformation::internalRenderingIntent(),
                                                     KoColorConversionTransformation::internalConversionFlags());
         m_imageMap[currentCommand] = image;
     }
 
     QList<const KUndo2Command*> list;
 
     for (int i = 0; i < m_stack->count(); ++i) {
         list << m_stack->command(i);
     }
 
     for (QMap<const KUndo2Command*, QImage>:: iterator it = m_imageMap.begin(); it != m_imageMap.end();) {
         if (!list.contains(it.key())) {
             it = m_imageMap.erase(it);
         }
         else {
             ++it;
         }
     }
 }
 bool KisUndoModel::checkMergedCommand(int index)
 {
     Q_UNUSED(index)
     return false;
 }
diff --git a/plugins/dockers/historydocker/KisUndoView.cpp b/plugins/dockers/historydocker/KisUndoView.cpp
index d7d352726d..defbf500e8 100644
--- a/plugins/dockers/historydocker/KisUndoView.cpp
+++ b/plugins/dockers/historydocker/KisUndoView.cpp
@@ -1,391 +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_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 QDoubleSpinBox();
+        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 QDoubleSpinBox();
+        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 QSpinBox();
+        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/overview/overviewwidget.cc b/plugins/dockers/overview/overviewwidget.cc
index 0d8af9dc2b..43115f4166 100644
--- a/plugins/dockers/overview/overviewwidget.cc
+++ b/plugins/dockers/overview/overviewwidget.cc
@@ -1,219 +1,378 @@
 /*
  *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2014 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 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 "overviewwidget.h"
 
 #include <QMouseEvent>
 #include <QPainter>
 #include <QCursor>
+#include <QMutex>
 
 #include <KoCanvasController.h>
 #include <KoZoomController.h>
 
 #include <kis_canvas2.h>
 #include <KisViewManager.h>
 #include <kis_image.h>
 #include <kis_paint_device.h>
 #include <kis_signal_compressor.h>
 #include <kis_config.h>
+#include "kis_idle_watcher.h"
+#include "krita_utils.h"
+#include "kis_painter.h"
+#include <KoUpdater.h>
+#include "kis_transform_worker.h"
+#include "kis_filter_strategy.h"
+#include <KoColorSpaceRegistry.h>
+
+const qreal oversample = 2.;
+const int thumbnailTileDim = 128;
+
+struct OverviewThumbnailStrokeStrategy::Private {
+
+    class InitData : public KisStrokeJobData
+    {
+    public:
+        InitData(KisPaintDeviceSP _device)
+            : KisStrokeJobData(SEQUENTIAL),
+              device(_device)
+        {}
+
+        KisPaintDeviceSP device;
+    };
+
+    class ProcessData : public KisStrokeJobData
+    {
+    public:
+        ProcessData(KisPaintDeviceSP _dev, KisPaintDeviceSP _thumbDev, const QSize& _thumbnailSize, const QRect &_rect)
+            : KisStrokeJobData(CONCURRENT),
+              dev(_dev), thumbDev(_thumbDev), thumbnailSize(_thumbnailSize), tileRect(_rect)
+        {}
+
+        KisPaintDeviceSP dev;
+        KisPaintDeviceSP thumbDev;
+        QSize thumbnailSize;
+        QRect tileRect;
+    };
+    class FinishProcessing : public KisStrokeJobData
+    {
+    public:
+        FinishProcessing(KisPaintDeviceSP _thumbDev)
+            : KisStrokeJobData(SEQUENTIAL),
+              thumbDev(_thumbDev)
+        {}
+        KisPaintDeviceSP thumbDev;
+    };
+};
 
 OverviewWidget::OverviewWidget(QWidget * parent)
     : QWidget(parent)
-    , m_compressor(new KisSignalCompressor(500, KisSignalCompressor::POSTPONE, this))
     , m_canvas(0)
     , m_dragging(false)
+    , m_imageIdleWatcher(250)
 {
     setMouseTracking(true);
-    connect(m_compressor, SIGNAL(timeout()), SLOT(startUpdateCanvasProjection()));
     KisConfig cfg;
     QRgb c = cfg.readEntry("OverviewWidgetColor", 0xFF454C);
     m_outlineColor = QColor(c);
 }
 
 OverviewWidget::~OverviewWidget()
 {
 }
 
 void OverviewWidget::setCanvas(KoCanvasBase * canvas)
 {
     if (m_canvas) {
         m_canvas->image()->disconnect(this);
     }
 
     m_canvas = dynamic_cast<KisCanvas2*>(canvas);
 
     if (m_canvas) {
-        connect(m_canvas->image(), SIGNAL(sigImageUpdated(QRect)), m_compressor, SLOT(start()), Qt::UniqueConnection);
-        connect(m_canvas->image(), SIGNAL(sigSizeChanged(QPointF, QPointF)), m_compressor, SLOT(start()), Qt::UniqueConnection);
+        m_imageIdleWatcher.setTrackedImage(m_canvas->image());
+
+        connect(&m_imageIdleWatcher, &KisIdleWatcher::startedIdleMode, this, &OverviewWidget::generateThumbnail);
+
+        connect(m_canvas->image(), SIGNAL(sigImageUpdated(QRect)),SLOT(startUpdateCanvasProjection()));
+        connect(m_canvas->image(), SIGNAL(sigSizeChanged(QPointF, QPointF)),SLOT(startUpdateCanvasProjection()));
+
         connect(m_canvas->canvasController()->proxyObject, SIGNAL(canvasOffsetXChanged(int)), this, SLOT(update()), Qt::UniqueConnection);
-        m_compressor->start();
+        generateThumbnail();
     }
 }
 
 QSize OverviewWidget::calculatePreviewSize()
 {
     QSize imageSize(m_canvas->image()->bounds().size());
     imageSize.scale(size(), Qt::KeepAspectRatio);
     return imageSize;
 }
 
 QPointF OverviewWidget::previewOrigin()
 {
-    return QPointF((width() - m_pixmap.width())/2.0f, (height() - m_pixmap.height())/2.0f);
+    return QPointF((width() - m_pixmap.width()) / 2.0f, (height() - m_pixmap.height()) / 2.0f);
 }
 
 QPolygonF OverviewWidget::previewPolygon()
 {
     if (m_canvas) {
         const KisCoordinatesConverter* converter = m_canvas->coordinatesConverter();
         QPolygonF canvasPoly = QPolygonF(QRectF(m_canvas->canvasWidget()->rect()));
         QPolygonF imagePoly = converter->widgetToImage<QPolygonF>(canvasPoly);
 
         QTransform imageToPreview = imageToPreviewTransform();
 
         return imageToPreview.map(imagePoly);
     }
     return QPolygonF();
 }
 
 QTransform OverviewWidget::imageToPreviewTransform()
 {
     QTransform imageToPreview;
-    imageToPreview.scale(calculatePreviewSize().width()/(float)m_canvas->image()->width(),
-                            calculatePreviewSize().height()/(float)m_canvas->image()->height());
+    imageToPreview.scale(calculatePreviewSize().width() / (float)m_canvas->image()->width(),
+                         calculatePreviewSize().height() / (float)m_canvas->image()->height());
     return imageToPreview;
 }
 
 void OverviewWidget::startUpdateCanvasProjection()
 {
-    if (!m_canvas) return;
-
-    KisImageSP image = m_canvas->image();
-    QSize previewSize = calculatePreviewSize();
-
-    if (isVisible() && previewSize.isValid()) {
-        QImage img =
-            image->projection()->
-            createThumbnail(previewSize.width(), previewSize.height(), image->bounds());
-
-        m_pixmap = QPixmap::fromImage(img);
-    }
-    update();
+    m_imageIdleWatcher.startCountdown();
 }
 
 void OverviewWidget::showEvent(QShowEvent *event)
 {
     Q_UNUSED(event);
-    m_compressor->start();
+    m_imageIdleWatcher.startCountdown();
 }
 
 void OverviewWidget::resizeEvent(QResizeEvent *event)
 {
     Q_UNUSED(event);
     if (m_canvas) {
         if (!m_pixmap.isNull()) {
             QSize newSize = calculatePreviewSize();
             m_pixmap = m_pixmap.scaled(newSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         }
-        m_compressor->start();
+        m_imageIdleWatcher.startCountdown();
     }
 }
 
 void OverviewWidget::mousePressEvent(QMouseEvent* event)
 {
     if (m_canvas) {
         QPointF previewPos = event->pos() - previewOrigin();
 
         if (previewPolygon().containsPoint(previewPos, Qt::WindingFill)) {
             m_lastPos = previewPos;
             m_dragging = true;
         }
     }
     event->accept();
     update();
 }
 
 void OverviewWidget::mouseMoveEvent(QMouseEvent* event)
 {
     if (m_dragging) {
         QPointF previewPos = event->pos() - previewOrigin();
 
         // position is mapped from preview image->image->canvas coordinates
         QTransform previewToImage = imageToPreviewTransform().inverted();
         const KisCoordinatesConverter* converter = m_canvas->coordinatesConverter();
 
         QPointF lastImagePos = previewToImage.map(m_lastPos);
         QPointF newImagePos = previewToImage.map(previewPos);
 
         QPointF lastWidgetPos = converter->imageToWidget<QPointF>(lastImagePos);
         QPointF newWidgetPos = converter->imageToWidget<QPointF>(newImagePos);
 
         QPointF diff = newWidgetPos - lastWidgetPos;
         m_canvas->canvasController()->pan(diff.toPoint());
         m_lastPos = previewPos;
     }
     event->accept();
 }
 
 void OverviewWidget::mouseReleaseEvent(QMouseEvent* event)
 {
     m_dragging = false;
     event->accept();
     update();
 }
 
 void OverviewWidget::wheelEvent(QWheelEvent* event)
 {
     float delta = event->delta();
 
     if (delta > 0) {
         m_canvas->viewManager()->zoomController()->zoomAction()->zoomIn();
     } else {
         m_canvas->viewManager()->zoomController()->zoomAction()->zoomOut();
     }
 }
 
+void OverviewWidget::generateThumbnail()
+{
+    if (isVisible()) {
+        QMutexLocker locker(&mutex);
+        if (m_canvas) {
+            QSize previewSize = calculatePreviewSize();
+            if(previewSize.isValid()){
+                KisImageSP image = m_canvas->image();
+
+                if (!strokeId.isNull()) {
+                    image->cancelStroke(strokeId);
+                    image->waitForDone();
+                }
+
+                OverviewThumbnailStrokeStrategy* stroke = new OverviewThumbnailStrokeStrategy(image);
+                connect(stroke, SIGNAL(thumbnailUpdated(QImage)), this, SLOT(updateThumbnail(QImage)));
+
+                strokeId = image->startStroke(stroke);
+                KisPaintDeviceSP dev = image->projection();
+                KisPaintDeviceSP thumbDev = new KisPaintDevice(dev->colorSpace());
+
+                //creating a special stroke that computes thumbnail image in small chunks that can be quickly interrupted
+                //if user starts painting
+                QList<KisStrokeJobData*> jobs = OverviewThumbnailStrokeStrategy::createJobsData(dev, image->bounds(), thumbDev, previewSize);
+
+                Q_FOREACH (KisStrokeJobData *jd, jobs) {
+                    image->addJob(strokeId, jd);
+                }
+                image->endStroke(strokeId);
+            }
+        }
+    }
+}
+
+void OverviewWidget::updateThumbnail(QImage pixmap)
+{
+    m_pixmap = QPixmap::fromImage(pixmap);
+    update();
+}
+
 
 void OverviewWidget::paintEvent(QPaintEvent* event)
 {
     QWidget::paintEvent(event);
 
     if (m_canvas) {
         QPainter p(this);
         p.translate(previewOrigin());
 
         p.drawPixmap(0, 0, m_pixmap.width(), m_pixmap.height(), m_pixmap);
 
         QRect r = rect().translated(-previewOrigin().toPoint());
         QPolygonF outline;
         outline << r.topLeft() << r.topRight() << r.bottomRight() << r.bottomLeft();
 
         QPen pen;
         pen.setColor(m_outlineColor);
         pen.setStyle(Qt::DashLine);
 
         p.setPen(pen);
         p.drawPolygon(outline.intersected(previewPolygon()));
 
         pen.setStyle(Qt::SolidLine);
         p.setPen(pen);
         p.drawPolygon(previewPolygon());
     }
 }
 
+OverviewThumbnailStrokeStrategy::OverviewThumbnailStrokeStrategy(KisImageWSP image)
+    : KisSimpleStrokeStrategy("OverviewThumbnail"), m_image(image)
+{
+    enableJob(KisSimpleStrokeStrategy::JOB_INIT, true, KisStrokeJobData::BARRIER, KisStrokeJobData::EXCLUSIVE);
+    enableJob(KisSimpleStrokeStrategy::JOB_DOSTROKE);
+    //enableJob(KisSimpleStrokeStrategy::JOB_FINISH);
+    enableJob(KisSimpleStrokeStrategy::JOB_CANCEL, true, KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE);
+
+    setRequestsOtherStrokesToEnd(false);
+    setClearsRedoOnStart(false);
+    setCanForgetAboutMe(true);
+}
+
+QList<KisStrokeJobData *> OverviewThumbnailStrokeStrategy::createJobsData(KisPaintDeviceSP dev, const QRect& imageRect, KisPaintDeviceSP thumbDev, const QSize& thumbnailSize)
+{
+    QSize thumbnailOversampledSize = oversample * thumbnailSize;
+
+    if ((thumbnailOversampledSize.width() > imageRect.width()) || (thumbnailOversampledSize.height() > imageRect.height())) {
+        thumbnailOversampledSize.scale(imageRect.size(), Qt::KeepAspectRatio);
+    }
+
+    QVector<QRect> tileRects = KritaUtils::splitRectIntoPatches(QRect(QPoint(0, 0), thumbnailOversampledSize), QSize(thumbnailTileDim, thumbnailTileDim));
+    QList<KisStrokeJobData*> jobsData;
+
+    Q_FOREACH (const QRect &tileRectangle, tileRects) {
+        jobsData << new OverviewThumbnailStrokeStrategy::Private::ProcessData(dev, thumbDev, thumbnailOversampledSize, tileRectangle);
+    }
+    jobsData << new OverviewThumbnailStrokeStrategy::Private::FinishProcessing(thumbDev);
+
+    return jobsData;
+}
+
+OverviewThumbnailStrokeStrategy::~OverviewThumbnailStrokeStrategy()
+{
+}
+
+
+void OverviewThumbnailStrokeStrategy::initStrokeCallback()
+{
+}
+
+void OverviewThumbnailStrokeStrategy::doStrokeCallback(KisStrokeJobData *data)
+{
+    Private::ProcessData *d_pd = dynamic_cast<Private::ProcessData*>(data);
+    if (d_pd) {
+        //we aren't going to use oversample capability of createThumbnailDevice because it recomputes exact bounds for each small patch, which is
+        //slow. We'll handle scaling separately.
+        KisPaintDeviceSP thumbnailTile = d_pd->dev->createThumbnailDeviceOversampled(d_pd->thumbnailSize.width(), d_pd->thumbnailSize.height(), 1, m_image->bounds(), d_pd->tileRect);
+        {
+            QMutexLocker locker(&m_thumbnailMergeMutex);
+            KisPainter gc(d_pd->thumbDev);
+            gc.bitBlt(QPoint(d_pd->tileRect.x(), d_pd->tileRect.y()), thumbnailTile, d_pd->tileRect);
+        }
+        return;
+    }
+
+
+    Private::FinishProcessing *d_fp = dynamic_cast<Private::FinishProcessing*>(data);
+    if (d_fp) {
+        QImage overviewImage;
+
+        KoDummyUpdater updater;
+        KisTransformWorker worker(d_fp->thumbDev, 1 / oversample, 1 / oversample, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+                                  &updater, KisFilterStrategyRegistry::instance()->value("Bilinear"));
+        worker.run();
+
+        overviewImage = d_fp->thumbDev->convertToQImage(KoColorSpaceRegistry::instance()->rgb8()->profile());
+        emit thumbnailUpdated(overviewImage);
+        return;
+    }
+}
+
+void OverviewThumbnailStrokeStrategy::finishStrokeCallback()
+{
+}
+
+void OverviewThumbnailStrokeStrategy::cancelStrokeCallback()
+{
+}
diff --git a/plugins/dockers/overview/overviewwidget.h b/plugins/dockers/overview/overviewwidget.h
index 3f92d3a66d..fa76f68536 100644
--- a/plugins/dockers/overview/overviewwidget.h
+++ b/plugins/dockers/overview/overviewwidget.h
@@ -1,72 +1,110 @@
 /*
  *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2014 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 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.
  */
 
 
 #ifndef OVERVIEWWIDGET_H
 #define OVERVIEWWIDGET_H
-
+#include <QObject>
 #include <QWidget>
 #include <QPixmap>
+#include <QMutex>
+#include "kis_idle_watcher.h"
+#include "kis_simple_stroke_strategy.h"
 
 class KisCanvas2;
 class KisSignalCompressor;
 class KoCanvasBase;
 
+class OverviewThumbnailStrokeStrategy : public QObject, public KisSimpleStrokeStrategy
+{
+    Q_OBJECT
+public:
+    OverviewThumbnailStrokeStrategy(KisImageWSP image);
+    ~OverviewThumbnailStrokeStrategy();
+
+    static QList<KisStrokeJobData*> createJobsData(KisPaintDeviceSP dev, const QRect& imageRect, KisPaintDeviceSP thumbDev, const QSize &thumbnailSize);
+
+private:
+    void initStrokeCallback();
+    void doStrokeCallback(KisStrokeJobData *data);
+    void finishStrokeCallback();
+    void cancelStrokeCallback();
+
+Q_SIGNALS:
+    //Emitted when thumbnail is updated and overviewImage is fully generated.
+    void thumbnailUpdated(QImage pixmap);
+
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
+    QMutex m_thumbnailMergeMutex;
+    KisImageSP m_image;
+};
+
 class OverviewWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     OverviewWidget(QWidget * parent = 0);
 
     virtual ~OverviewWidget();
 
     virtual void setCanvas(KoCanvasBase *canvas);
-    virtual void unsetCanvas() { m_canvas = 0; }   
+    virtual void unsetCanvas()
+    {
+        m_canvas = 0;
+    }
 
 public Q_SLOTS:
     void startUpdateCanvasProjection();
+    void generateThumbnail();
+    void updateThumbnail(QImage pixmap);
 
 protected:
     void resizeEvent(QResizeEvent *event);
     void showEvent(QShowEvent *event);
     void paintEvent(QPaintEvent *event);
-    
+
     virtual void mousePressEvent(QMouseEvent* event);
     virtual void mouseMoveEvent(QMouseEvent* event);
     virtual void mouseReleaseEvent(QMouseEvent* event);
     virtual void wheelEvent(QWheelEvent* event);
-    
+
 private:
     QSize calculatePreviewSize();
     QPointF previewOrigin();
     QTransform imageToPreviewTransform();
     QPolygonF previewPolygon();
-    
-    KisSignalCompressor *m_compressor;
+
     QPixmap m_pixmap;
     KisCanvas2 *m_canvas;
 
     bool m_dragging;
     QPointF m_lastPos;
 
     QColor m_outlineColor;
+    KisIdleWatcher m_imageIdleWatcher;
+    KisStrokeId strokeId;
+    QMutex mutex;
 };
 
 
+
 #endif /* OVERVIEWWIDGET_H */
diff --git a/plugins/dockers/specificcolorselector/kis_color_input.cc b/plugins/dockers/specificcolorselector/kis_color_input.cc
index ff4a7d67b3..092941b8a8 100644
--- a/plugins/dockers/specificcolorselector/kis_color_input.cc
+++ b/plugins/dockers/specificcolorselector/kis_color_input.cc
@@ -1,299 +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_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 QSpinBox(this);
+    m_intNumInput = new KisIntParseSpinBox(this);
     m_intNumInput->setMinimum(0);
-    m_colorSlider->setMaximum(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 QDoubleSpinBox(this);
+    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/dockers/specificcolorselector/kis_color_input.h b/plugins/dockers/specificcolorselector/kis_color_input.h
index 9016cb75c9..45a3267c46 100644
--- a/plugins/dockers/specificcolorselector/kis_color_input.h
+++ b/plugins/dockers/specificcolorselector/kis_color_input.h
@@ -1,96 +1,98 @@
 /*
  *  Copyright (c) 2008 Cyrille Berger <cberger@cberger.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; 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.
  */
 
 #ifndef _KIS_COLOR_INPUT_H_
 #define _KIS_COLOR_INPUT_H_
 
 #include <QWidget>
 
 class KoChannelInfo;
 class KoColor;
 class QWidget;
 class QSpinBox;
 class QDoubleSpinBox;
+class KisIntParseSpinBox;
+class KisDoubleParseSpinBox;
 class KoColorSlider;
 class QLineEdit;
 #include "KoColorDisplayRendererInterface.h"
 
 
 class KisColorInput : public QWidget
 {
     Q_OBJECT
 public:
     KisColorInput(QWidget* parent, const KoChannelInfo*, KoColor* color, KoColorDisplayRendererInterface *displayRenderer);
 protected:
     void init();
     virtual QWidget* createInput() = 0;
 Q_SIGNALS:
     void updated();
 protected:
     const KoChannelInfo* m_channelInfo;
     KoColor* m_color;
     KoColorSlider* m_colorSlider;
     KoColorDisplayRendererInterface *m_displayRenderer;
 };
 
 class KisIntegerColorInput : public KisColorInput
 {
     Q_OBJECT
 public:
     KisIntegerColorInput(QWidget* parent, const KoChannelInfo*, KoColor* color, KoColorDisplayRendererInterface *displayRenderer);
 protected:
     virtual QWidget* createInput();
 public Q_SLOTS:
     void setValue(int);
     void update();
 private:
-    QSpinBox* m_intNumInput;
+    KisIntParseSpinBox* m_intNumInput;
 };
 
 
 class KisFloatColorInput : public KisColorInput
 {
     Q_OBJECT
 public:
     KisFloatColorInput(QWidget* parent, const KoChannelInfo*, KoColor* color, KoColorDisplayRendererInterface *displayRenderer);
 protected:
     virtual QWidget* createInput();
 public Q_SLOTS:
     void setValue(double);
     void sliderChanged(int);
     void update();
 private:
-    QDoubleSpinBox* m_dblNumInput;
+    KisDoubleParseSpinBox* m_dblNumInput;
     qreal m_minValue;
     qreal m_maxValue;
 };
 
 class KisHexColorInput : public KisColorInput
 {
     Q_OBJECT
 public:
     KisHexColorInput(QWidget* parent, KoColor* color, KoColorDisplayRendererInterface *displayRenderer);
 protected:
     virtual QWidget* createInput();
 public Q_SLOTS:
     void setValue();
     void update();
 private:
     QLineEdit* m_hexInput;
 };
 
 #endif
diff --git a/plugins/extensions/clonesarray/wdg_clonesarray.ui b/plugins/extensions/clonesarray/wdg_clonesarray.ui
index 9e70f6d5d2..a932096279 100644
--- a/plugins/extensions/clonesarray/wdg_clonesarray.ui
+++ b/plugins/extensions/clonesarray/wdg_clonesarray.ui
@@ -1,368 +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>644</width>
+    <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="QSpinBox" name="numNegativeColumns"/>
+      <widget class="KisIntParseSpinBox" name="numNegativeColumns"/>
      </item>
      <item row="1" column="3">
-      <widget class="QSpinBox" name="numPositiveColumns">
+      <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="QSpinBox" name="columnXOffset">
+      <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="QSpinBox" name="columnYOffset">
+      <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="QSpinBox" name="numNegativeRows"/>
+      <widget class="KisIntParseSpinBox" name="numNegativeRows"/>
      </item>
      <item row="2" column="3">
-      <widget class="QSpinBox" name="numPositiveRows">
+      <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="QSpinBox" name="rowXOffset">
+      <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="QSpinBox" name="rowYOffset">
+      <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="QDoubleSpinBox" name="columnAngle">
+      <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="QDoubleSpinBox" name="rowAngle">
+      <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="QDoubleSpinBox" name="columnDistance">
+      <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="QDoubleSpinBox" name="rowDistance">
+      <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 9628325bc2..858140b589 100644
--- a/plugins/extensions/imagesize/wdg_canvassize.ui
+++ b/plugins/extensions/imagesize/wdg_canvassize.ui
@@ -1,682 +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>367</width>
-    <height>380</height>
+    <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="QSpinBox" name="newWidth">
+       <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"/>
+       <widget class="KoAspectButton" name="aspectRatioBtn" native="true"/>
       </item>
       <item row="1" column="2">
-       <widget class="QSpinBox" name="newHeight">
+       <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="QDoubleSpinBox" name="newWidthDouble">
+       <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="QDoubleSpinBox" name="newHeightDouble">
+       <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="QSpinBox" name="xOffset">
+       <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="QDoubleSpinBox" name="xOffsetDouble">
+       <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="QSpinBox" name="yOffset">
+       <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="QDoubleSpinBox" name="yOffsetDouble">
+       <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"/>
+          <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_double_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <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 072f3f71b5..8a45fdf251 100644
--- a/plugins/extensions/imagesize/wdg_imagesize.ui
+++ b/plugins/extensions/imagesize/wdg_imagesize.ui
@@ -1,437 +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>372</width>
-    <height>379</height>
+    <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="QDoubleSpinBox" name="pixelHeightDouble">
+       <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="QSpinBox" name="pixelHeight">
+       <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>Width:</string>
+         <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>Filter:</string>
+         <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">
+       <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>Height:</string>
+         <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="QDoubleSpinBox" name="pixelWidthDouble">
+       <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="QSpinBox" name="pixelWidth">
+       <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"/>
+       <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>Height:</string>
+         <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="QDoubleSpinBox" name="printWidth">
+       <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>Width:</string>
+         <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="QDoubleSpinBox" name="printHeight">
+       <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">
+       <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="QDoubleSpinBox" name="printResolution">
+       <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 10e035b097..58170c58ad 100644
--- a/plugins/extensions/imagesize/wdg_layersize.ui
+++ b/plugins/extensions/imagesize/wdg_layersize.ui
@@ -1,238 +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>348</width>
-    <height>198</height>
+    <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">
+       <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>Width:</string>
+         <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="QDoubleSpinBox" name="newWidthDouble">
+       <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="QDoubleSpinBox" name="newHeightDouble">
+       <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="QSpinBox" name="newHeight">
+       <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="QSpinBox" name="newWidth">
+       <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"/>
+       <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>Height:</string>
+         <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 afd3f158b7..4fd7708036 100644
--- a/plugins/extensions/imagesplit/wdg_imagesplit.ui
+++ b/plugins/extensions/imagesplit/wdg_imagesplit.ui
@@ -1,117 +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="QSpinBox" name="intHorizontalSplitLines"/>
+        <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="QSpinBox" name="intVerticalSplitLines"/>
+        <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_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 646dd864e5..2f12c4579e 100644
--- a/plugins/extensions/metadataeditor/editors/exif.ui
+++ b/plugins/extensions/metadataeditor/editors/exif.ui
@@ -1,1102 +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>Brightness value:</string>
+            <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>ISO:</string>
+            <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="QSpinBox" name="editISO">
+          <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 time:</string>
+            <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>Exposure mode:</string>
+            <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 program:</string>
+            <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>Aperture:</string>
+            <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>F Number:</string>
+            <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>Focal length:</string>
+            <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="QSpinBox" name="editFocalLength">
+          <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 (35mm equivalent):</string>
+            <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="QSpinBox" name="editFocalLengthIn35mmFilm">
+          <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>Subject distance:</string>
+            <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>Metering mode:</string>
+            <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>Distance range:</string>
+            <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>Strobe return:</string>
+            <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 energy:</string>
+            <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>Gain control:</string>
+            <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>Light source:</string>
+            <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 balance:</string>
+            <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 type:</string>
+            <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>Maker:</string>
+            <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>Sensing method type:</string>
+            <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_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 1b7031bf89..f53f94bd8e 100644
--- a/plugins/extensions/modify_selection/wdg_border_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_border_selection.ui
@@ -1,124 +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>333</width>
-    <height>86</height>
+    <width>364</width>
+    <height>89</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="2">
-    <widget class="QSpinBox" name="spbWidth">
+    <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="QDoubleSpinBox" name="spbWidthDouble">
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 bdfc4d8f7f..57f044f5c6 100644
--- a/plugins/extensions/modify_selection/wdg_feather_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_feather_selection.ui
@@ -1,132 +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>354</width>
-    <height>86</height>
+    <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="QSpinBox" name="spbRadius">
+    <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="QDoubleSpinBox" name="spbRadiusDouble">
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 a8241e2573..b97777f2e3 100644
--- a/plugins/extensions/modify_selection/wdg_grow_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_grow_selection.ui
@@ -1,129 +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>302</width>
-    <height>86</height>
+    <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="QSpinBox" name="spbGrowValue">
+    <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="QDoubleSpinBox" name="spbGrowValueDouble">
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 90f93f300c..b6a4707d1a 100644
--- a/plugins/extensions/modify_selection/wdg_shrink_selection.ui
+++ b/plugins/extensions/modify_selection/wdg_shrink_selection.ui
@@ -1,140 +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>308</width>
-    <height>113</height>
+    <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="QSpinBox" name="spbShrinkValue">
+    <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="QDoubleSpinBox" name="spbShrinkValueDouble">
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 63d99998ab..dbcf84b6bd 100644
--- a/plugins/extensions/offsetimage/wdg_offsetimage.ui
+++ b/plugins/extensions/offsetimage/wdg_offsetimage.ui
@@ -1,119 +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="QSpinBox" name="offsetXspinBox">
+         <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="QSpinBox" name="offsetYspinBox">
+         <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_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 f4dce45d84..4d6f38abbc 100644
--- a/plugins/extensions/rotateimage/wdg_rotateimage.ui
+++ b/plugins/extensions/rotateimage/wdg_rotateimage.ui
@@ -1,120 +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>180 d&amp;egrees</string>
+         <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="margin">
+        <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="QDoubleSpinBox" name="doubleCustom">
+         <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_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 c43a9b0e84..0ae5c5c422 100644
--- a/plugins/extensions/shearimage/wdg_shearimage.ui
+++ b/plugins/extensions/shearimage/wdg_shearimage.ui
@@ -1,73 +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>64</height>
+    <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="QSpinBox" name="shearAngleX">
-     <property name="minimum" stdset="0">
+    <widget class="KisIntParseSpinBox" name="shearAngleX">
+     <property name="suffix">
+      <string>°</string>
+     </property>
+     <property name="minimum">
       <number>-45</number>
      </property>
-     <property name="maximum" stdset="0">
+     <property name="maximum">
       <number>45</number>
      </property>
-     <property name="suffix" stdset="0">
-      <string>°</string>
-     </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="QSpinBox" name="shearAngleY">
+    <widget class="KisIntParseSpinBox" name="shearAngleY">
      <property name="maximumSize">
       <size>
        <width>32767</width>
        <height>100</height>
       </size>
      </property>
-     <property name="minimum" stdset="0">
+     <property name="suffix">
+      <string>°</string>
+     </property>
+     <property name="minimum">
       <number>-45</number>
      </property>
-     <property name="maximum" stdset="0">
+     <property name="maximum">
       <number>45</number>
      </property>
-     <property name="suffix" stdset="0">
-      <string>°</string>
-     </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kis_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt
index 16e9c72cc6..55f1526b60 100644
--- a/plugins/filters/CMakeLists.txt
+++ b/plugins/filters/CMakeLists.txt
@@ -1,26 +1,27 @@
 add_subdirectory( tests )
 add_subdirectory( blur )
 add_subdirectory( colors )
 add_subdirectory( colorsfilters )
 add_subdirectory( convolutionfilters )
 add_subdirectory( embossfilter )
 add_subdirectory( example )
 add_subdirectory( fastcolortransfer )
 add_subdirectory( imageenhancement )
 add_subdirectory( noisefilter )
 add_subdirectory( oilpaintfilter )
 add_subdirectory( pixelizefilter )
 add_subdirectory( raindropsfilter )
 add_subdirectory( randompickfilter )
 add_subdirectory( roundcorners )
 add_subdirectory( smalltilesfilter )
 add_subdirectory( sobelfilter )
 add_subdirectory( unsharp )
 add_subdirectory( wavefilter )
 add_subdirectory( levelfilter )
 add_subdirectory( dodgeburn )
 add_subdirectory( phongbumpmap )
 add_subdirectory( posterize )
 add_subdirectory( indexcolors )
 add_subdirectory( normalize )
 add_subdirectory( gradientmap )
+add_subdirectory( threshold )
diff --git a/plugins/filters/blur/wdg_lens_blur.ui b/plugins/filters/blur/wdg_lens_blur.ui
index 343af1fcdd..dddf13e920 100644
--- a/plugins/filters/blur/wdg_lens_blur.ui
+++ b/plugins/filters/blur/wdg_lens_blur.ui
@@ -1,156 +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>199</width>
-    <height>123</height>
+    <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="QSpinBox" name="irisRadiusSlider">
+       <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="QSpinBox" name="irisRotationSlider">
+       <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_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 18ee5aa1a8..5a31c8e4fa 100644
--- a/plugins/filters/blur/wdg_motion_blur.ui
+++ b/plugins/filters/blur/wdg_motion_blur.ui
@@ -1,159 +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="QSpinBox" name="blurAngleSlider">
+      <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="QSpinBox" name="blurLength">
+      <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_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 c053583025..85f18312a5 100644
--- a/plugins/filters/blur/wdgblur.ui
+++ b/plugins/filters/blur/wdgblur.ui
@@ -1,210 +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="QSpinBox" name="intHalfWidth">
+    <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="QSpinBox" name="intHalfHeight">
+    <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="QSpinBox" name="intStrength">
+    <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="QSpinBox" name="intAngle">
+    <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>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.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_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 9045ecb679..0f93f79c80 100644
--- a/plugins/filters/colorsfilters/wdg_color_balance.ui
+++ b/plugins/filters/colorsfilters/wdg_color_balance.ui
@@ -1,756 +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="margin">
+   <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="QSpinBox" name="magentaGreenShadowsSpinbox"/>
+      <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="QSpinBox" name="yellowBlueShadowsSpinbox"/>
+      <widget class="KisIntParseSpinBox" name="yellowBlueShadowsSpinbox"/>
      </item>
      <item row="0" column="3">
-      <widget class="QSpinBox" name="cyanRedShadowsSpinbox"/>
+      <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="QSpinBox" name="cyanRedMidtonesSpinbox"/>
+      <widget class="KisIntParseSpinBox" name="cyanRedMidtonesSpinbox"/>
      </item>
      <item row="2" column="3">
-      <widget class="QSpinBox" name="yellowBlueMidtonesSpinbox"/>
+      <widget class="KisIntParseSpinBox" name="yellowBlueMidtonesSpinbox"/>
      </item>
      <item row="1" column="3">
-      <widget class="QSpinBox" name="magentaGreenMidtonesSpinbox"/>
+      <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="verticalSpacing">
-      <number>3</number>
-     </property>
      <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="QSpinBox" name="cyanRedHighlightsSpinbox"/>
+      <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="QSpinBox" name="magentaGreenHighlightsSpinbox"/>
+      <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="QSpinBox" name="yellowBlueHighlightsSpinbox"/>
+      <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_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 337f1420b9..4c02b1243e 100644
--- a/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
+++ b/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
@@ -1,228 +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>395</width>
+    <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>Type:</string>
+      <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="QSpinBox" name="saturationSpinBox">
+    <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="QSpinBox" name="valueSpinBox">
+    <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="QSpinBox" name="hueSpinBox">
+    <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_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 e205982319..f53aa0fd38 100644
--- a/plugins/filters/colorsfilters/wdg_perchannel.ui
+++ b/plugins/filters/colorsfilters/wdg_perchannel.ui
@@ -1,333 +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>395</height>
+    <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">
+         <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="QSpinBox" name="intOut">
+      <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="QSpinBox" name="intIn">
+      <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_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 8fc6501ebf..22a57c9ff9 100644
--- a/plugins/filters/indexcolors/kiswdgindexcolors.cpp
+++ b/plugins/filters/indexcolors/kiswdgindexcolors.cpp
@@ -1,188 +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_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);
+        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 QSpinBox();
+        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 728fcbd217..b467fa3b77 100644
--- a/plugins/filters/indexcolors/kiswdgindexcolors.ui
+++ b/plugins/filters/indexcolors/kiswdgindexcolors.ui
@@ -1,324 +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="margin">
+   <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">
+       <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="horizontalSpacing">
-          <number>6</number>
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-         <property name="margin">
+         <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="QSpinBox" name="colorLimit">
+       <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="QSpinBox" name="inbetweenSpinBox">
+       <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">
-       <widget class="QWidget" name="widget">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>20</height>
-         </size>
+       <layout class="QGridLayout" name="layoutRowSteps">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetMinimumSize</enum>
         </property>
-        <layout class="QGridLayout" name="layoutRowSteps">
-         <property name="sizeConstraint">
-          <enum>QLayout::SetMinimumSize</enum>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
+        <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="QSpinBox" name="alphaStepsSpinBox">
+       <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_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 88f70c44e6..6661c6655c 100644
--- a/plugins/filters/levelfilter/wdg_level.ui
+++ b/plugins/filters/levelfilter/wdg_level.ui
@@ -1,323 +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">
+    <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="QSpinBox" name="blackspin">
+      <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="QDoubleSpinBox" name="gammaspin">
+      <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="QSpinBox" name="whitespin">
+      <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">
+    <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="QSpinBox" name="outblackspin">
+      <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="QSpinBox" name="outwhitespin">
+      <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_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_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 80153c76f3..5432c8838f 100644
--- a/plugins/filters/noisefilter/wdgnoiseoptions.ui
+++ b/plugins/filters/noisefilter/wdgnoiseoptions.ui
@@ -1,94 +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>63</height>
+    <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="QSpinBox" name="intOpacity"/>
+    <widget class="KisIntParseSpinBox" name="intOpacity"/>
    </item>
    <item row="0" column="1">
-    <widget class="QSpinBox" name="intLevel"/>
+    <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_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 18f09bba02..7c1e8438ff 100644
--- a/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
+++ b/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
@@ -1,1229 +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>Specular</string>
+             <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">
+              <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">
+              <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>Diffuse</string>
+             <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">
+              <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">
+              <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 4</string>
+          <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="QSpinBox" name="azimuthSpinBox4">
+             <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="QSpinBox" name="inclinationSpinBox4">
+             <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 2</string>
+          <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="QSpinBox" name="azimuthSpinBox2">
+             <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="QSpinBox" name="inclinationSpinBox2">
+             <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 1</string>
+          <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="QSpinBox" name="azimuthSpinBox1">
+             <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="QSpinBox" name="inclinationSpinBox1">
+             <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 3</string>
+          <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="QSpinBox" name="azimuthSpinBox3">
+             <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="QSpinBox" name="inclinationSpinBox3">
+             <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_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 a847a1fa3e..4fb0469491 100644
--- a/plugins/filters/randompickfilter/wdgrandompickoptions.ui
+++ b/plugins/filters/randompickfilter/wdgrandompickoptions.ui
@@ -1,98 +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="QSpinBox" name="intLevel"/>
+    <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="QSpinBox" name="intWindowSize"/>
+    <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="QSpinBox" name="intOpacity"/>
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filters/threshold/CMakeLists.txt b/plugins/filters/threshold/CMakeLists.txt
new file mode 100644
index 0000000000..1be74c1da3
--- /dev/null
+++ b/plugins/filters/threshold/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(kritathreshold_SOURCES threshold.cpp )
+
+ki18n_wrap_ui(kritathreshold_SOURCES
+    wdg_threshold.ui
+    )
+
+add_library(kritathreshold MODULE ${kritathreshold_SOURCES})
+target_link_libraries(kritathreshold kritaui)
+install(TARGETS kritathreshold  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/filters/threshold/kritathreshold.json b/plugins/filters/threshold/kritathreshold.json
new file mode 100644
index 0000000000..aa00e9c8b8
--- /dev/null
+++ b/plugins/filters/threshold/kritathreshold.json
@@ -0,0 +1,9 @@
+{
+    "Id": "Threshold Filter",
+    "Type": "Service",
+    "X-KDE-Library": "kritathreshold",
+    "X-KDE-ServiceTypes": [
+        "Krita/Filter"
+    ],
+    "X-Krita-Version": "28"
+}
diff --git a/plugins/filters/threshold/threshold.cpp b/plugins/filters/threshold/threshold.cpp
new file mode 100644
index 0000000000..6f588f8e38
--- /dev/null
+++ b/plugins/filters/threshold/threshold.cpp
@@ -0,0 +1,220 @@
+/*
+ * This file is part of the KDE project
+ *
+ * Copyright (c) 2016 Boudewijn Rempt <boud@valdyas.org>
+ *
+ * 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 "threshold.h"
+#include <stdlib.h>
+#include <vector>
+
+#include <QPoint>
+#include <QTime>
+
+#include <klocalizedstring.h>
+
+#include <kis_debug.h>
+#include <kpluginfactory.h>
+
+#include <filter/kis_filter_registry.h>
+#include <kis_global.h>
+#include "kis_gradient_slider.h"
+#include "kis_histogram.h"
+#include <kis_layer.h>
+#include "kis_paint_device.h"
+#include "kis_painter.h"
+#include <kis_processing_information.h>
+#include <kis_selection.h>
+#include <kis_types.h>
+#include <kis_iterator_ng.h>
+
+#include <KoBasicHistogramProducers.h>
+#include "KoColorModelStandardIds.h"
+#include <KoColorSpace.h>
+#include <KoColorTransformation.h>
+#include <KoUpdater.h>
+
+K_PLUGIN_FACTORY_WITH_JSON(KritaThresholdFactory, "kritathreshold.json", registerPlugin<KritaThreshold>();)
+
+KritaThreshold::KritaThreshold(QObject *parent, const QVariantList &)
+    : QObject(parent)
+{
+    KisFilterRegistry::instance()->add(new KisFilterThreshold());
+}
+
+KritaThreshold::~KritaThreshold()
+{
+}
+
+KisFilterThreshold::KisFilterThreshold()
+    : KisFilter(id(), categoryAdjust(), i18n("&Threshold..."))
+{
+    setColorSpaceIndependence(FULLY_INDEPENDENT);
+
+    setSupportsPainting(false);
+    setShowConfigurationWidget(true);
+    setSupportsLevelOfDetail(true);
+    setSupportsAdjustmentLayers(true);
+    setSupportsThreading(true);
+}
+
+void KisFilterThreshold::processImpl(KisPaintDeviceSP device,
+                 const QRect& applyRect,
+                 const KisFilterConfiguration *config,
+                 KoUpdater *progressUpdater) const
+{
+    Q_ASSERT(!device.isNull());
+
+    if (progressUpdater) {
+        progressUpdater->setRange(0, applyRect.height() * applyRect.width());
+    }
+
+    int threshold = config->getInt("threshold");
+
+    KoColor white(Qt::white, device->colorSpace());
+    KoColor black(Qt::black, device->colorSpace());
+
+    KisSequentialIterator it(device, applyRect);
+    int p = 0;
+    const int pixelSize = device->colorSpace()->pixelSize();
+    do {
+        if (device->colorSpace()->intensity8(it.oldRawData()) > threshold) {
+            memcpy(it.rawData(), white.data(), pixelSize);
+        }
+        else {
+            memcpy(it.rawData(), black.data(), pixelSize);
+        }
+
+        if (progressUpdater) progressUpdater->setValue(p++);
+
+    } while (it.nextPixel());
+
+}
+
+
+KisFilterConfiguration *KisFilterThreshold::factoryConfiguration(const KisPaintDeviceSP) const
+{
+    KisFilterConfiguration *config = new KisFilterConfiguration("threshold", 1);
+    config->setProperty("threshold", 128);
+    return config;
+}
+
+KisConfigWidget *KisFilterThreshold::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const
+{
+    return new KisThresholdConfigWidget(parent, dev);
+}
+
+KisThresholdConfigWidget::KisThresholdConfigWidget(QWidget * parent, KisPaintDeviceSP dev)
+    : KisConfigWidget(parent)
+{
+    Q_ASSERT(dev);
+    m_page.setupUi(this);
+
+    m_page.thresholdGradient->enableGamma(false);
+    m_page.thresholdGradient->enableWhite(false);
+    m_page.intThreshold->setValue(128);
+
+    connect(m_page.intThreshold, SIGNAL(valueChanged(int)), SIGNAL(sigConfigurationItemChanged()));
+    connect(m_page.thresholdGradient, SIGNAL(sigModifiedGamma(double)), SIGNAL(sigConfigurationItemChanged()));
+
+    connect(m_page.intThreshold, SIGNAL(valueChanged(int)), m_page.thresholdGradient, SLOT(slotModifyBlack(int)));
+
+    connect(m_page.thresholdGradient, SIGNAL(sigModifiedBlack(int)), m_page.intThreshold, SLOT(setValue(int)));
+
+    connect((QObject*)(m_page.chkLogarithmic), SIGNAL(toggled(bool)), this, SLOT(slotDrawHistogram(bool)));
+
+    KoHistogramProducer *producer = new KoGenericLabHistogramProducer();
+    m_histogram.reset( new KisHistogram(dev, dev->exactBounds(), producer, LINEAR) );
+    m_histlog = false;
+    m_page.histview->resize(288,100);
+    slotDrawHistogram();
+
+}
+
+KisThresholdConfigWidget::~KisThresholdConfigWidget()
+{
+}
+
+void KisThresholdConfigWidget::slotDrawHistogram(bool logarithmic)
+{
+    int wHeight = m_page.histview->height();
+    int wHeightMinusOne = wHeight - 1;
+    int wWidth = m_page.histview->width();
+
+    if (m_histlog != logarithmic) {
+        // Update the m_histogram
+        if (logarithmic)
+            m_histogram->setHistogramType(LOGARITHMIC);
+        else
+            m_histogram->setHistogramType(LINEAR);
+        m_histlog = logarithmic;
+    }
+
+    QPalette appPalette = QApplication::palette();
+    QPixmap pix(wWidth-100, wHeight);
+
+    pix.fill(QColor(appPalette.color(QPalette::Base)));
+    QPainter p(&pix);
+
+    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+
+    double highest = (double)m_histogram->calculations().getHighest();
+    qint32 bins = m_histogram->producer()->numberOfBins();
+
+    // use nearest neighbour interpolation
+    if (m_histogram->getHistogramType() == LINEAR) {
+        double factor = (double)(wHeight - wHeight / 5.0) / highest;
+        for (int i = 0; i < wWidth; i++) {
+            int binNo = qRound((double)i / wWidth * (bins - 1));
+            if ((int)m_histogram->getValue(binNo) != 0)
+                p.drawLine(i, wHeightMinusOne, i, wHeightMinusOne - (int)m_histogram->getValue(binNo) * factor);
+        }
+    } else {
+        double factor = (double)(wHeight - wHeight / 5.0) / (double)log(highest);
+        for (int i = 0; i < wWidth; i++) {
+            int binNo = qRound((double)i / wWidth * (bins - 1)) ;
+            if ((int)m_histogram->getValue(binNo) != 0)
+                p.drawLine(i, wHeightMinusOne, i, wHeightMinusOne - log((double)m_histogram->getValue(binNo)) * factor);
+        }
+    }
+
+    m_page.histview->setPixmap(pix);
+}
+
+void KisThresholdConfigWidget::slotSetThreshold(int limit)
+{
+    m_page.intThreshold->setMaximum(limit - 1);
+}
+
+KisPropertiesConfiguration *KisThresholdConfigWidget::configuration() const
+{
+    KisFilterConfiguration *config = new KisFilterConfiguration("threshold", 1);
+    config->setProperty("threshold", m_page.intThreshold->value());
+    return config;
+}
+
+void KisThresholdConfigWidget::setConfiguration(const KisPropertiesConfiguration * config)
+{
+    QVariant value;
+    if (config->getProperty("threshold", value)) {
+        m_page.intThreshold->setValue(value.toUInt());
+        m_page.thresholdGradient->slotModifyBlack(value.toUInt());
+    }
+}
+
+
+#include "threshold.moc"
diff --git a/plugins/filters/threshold/threshold.h b/plugins/filters/threshold/threshold.h
new file mode 100644
index 0000000000..f050019bd8
--- /dev/null
+++ b/plugins/filters/threshold/threshold.h
@@ -0,0 +1,91 @@
+/*
+ * This file is part of Krita
+ *
+ * Copyright (c) 2016 Boudewijn Rempt <boud@valdyas.org>
+ *
+ *  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 THRESHOLD_H
+#define THRESHOLD_H
+
+#include <QObject>
+#include <QVariant>
+#include <filter/kis_filter.h>
+#include <kis_filter_configuration.h>
+#include <kis_config_widget.h>
+
+#include "ui_wdg_threshold.h"
+
+class WdgThreshold;
+class QWidget;
+class KisHistogram;
+
+
+
+class KritaThreshold : public QObject
+{
+    Q_OBJECT
+public:
+    KritaThreshold(QObject *parent, const QVariantList &);
+    virtual ~KritaThreshold();
+};
+
+class KisFilterThreshold : public KisFilter
+{
+public:
+    KisFilterThreshold();
+public:
+
+    static inline KoID id() {
+        return KoID("threshold", i18n("Threshold"));
+    }
+
+    virtual void processImpl(KisPaintDeviceSP device,
+                     const QRect& applyRect,
+                     const KisFilterConfiguration* config,
+                     KoUpdater *progressUpdater) const;
+
+    virtual KisFilterConfiguration *factoryConfiguration(const KisPaintDeviceSP) const;
+
+    virtual KisConfigWidget *createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const;
+
+};
+
+class KisThresholdConfigWidget : public KisConfigWidget
+{
+    Q_OBJECT
+public:
+    KisThresholdConfigWidget(QWidget *parent, KisPaintDeviceSP dev);
+    virtual ~KisThresholdConfigWidget();
+
+    virtual KisPropertiesConfiguration *configuration() const;
+    void setConfiguration(const KisPropertiesConfiguration *config);
+    Ui::WdgThreshold m_page;
+
+private Q_SLOTS:
+    void slotDrawHistogram(bool logarithmic = false);
+
+    void slotSetThreshold(int);
+
+
+protected:
+    QScopedPointer<KisHistogram> m_histogram;
+    bool m_histlog;
+};
+
+
+#endif
+
diff --git a/plugins/filters/threshold/wdg_threshold.ui b/plugins/filters/threshold/wdg_threshold.ui
new file mode 100644
index 0000000000..c70c12e9cc
--- /dev/null
+++ b/plugins/filters/threshold/wdg_threshold.ui
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WdgThreshold</class>
+ <widget class="QWidget" name="WdgThreshold">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>352</width>
+    <height>355</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="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="thresholdGradient" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>24</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Threshold &amp;level:</string>
+       </property>
+       <property name="buddy">
+        <cstring>intThreshold</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="intThreshold">
+       <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>
+    <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>KisGradientSlider</class>
+   <extends>QWidget</extends>
+   <header>kis_gradient_slider.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/unsharp/wdgunsharp.ui b/plugins/filters/unsharp/wdgunsharp.ui
index ec4b08095b..bc3ad24aaf 100644
--- a/plugins/filters/unsharp/wdgunsharp.ui
+++ b/plugins/filters/unsharp/wdgunsharp.ui
@@ -1,163 +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="QDoubleSpinBox" name="doubleHalfSize">
+    <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="QDoubleSpinBox" name="doubleAmount">
+    <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="QSpinBox" name="intThreshold">
+    <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 c08388d7b2..2ca31c5e87 100644
--- a/plugins/filters/wavefilter/wdgwaveoptions.ui
+++ b/plugins/filters/wavefilter/wdgwaveoptions.ui
@@ -1,281 +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="margin">
+   <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="margin">
+      <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="QSpinBox" name="intHAmplitude"/>
+       <widget class="KisIntParseSpinBox" name="intHAmplitude"/>
       </item>
       <item row="1" column="3">
-       <widget class="QSpinBox" name="intHShift"/>
+       <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="QSpinBox" name="intHWavelength"/>
+       <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="margin">
+      <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="QSpinBox" name="intVShift"/>
+       <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="QSpinBox" name="intVWavelength"/>
+       <widget class="KisIntParseSpinBox" name="intVWavelength"/>
       </item>
       <item row="2" column="3">
-       <widget class="QSpinBox" name="intVAmplitude"/>
+       <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_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 657a35fce4..b081e19102 100644
--- a/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
+++ b/plugins/flake/artistictextshape/ArtisticTextShapeConfigWidget.ui
@@ -1,152 +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="margin">
+   <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="QSpinBox" name="fontSize">
+    <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>QSpinBox</class>
+   <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>knuminput.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/artistictextshape/CMakeLists.txt b/plugins/flake/artistictextshape/CMakeLists.txt
index f1f2b9b423..5d6d9f656f 100644
--- a/plugins/flake/artistictextshape/CMakeLists.txt
+++ b/plugins/flake/artistictextshape/CMakeLists.txt
@@ -1,42 +1,42 @@
 project( artistictextshape )
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/libs/widgets
 )
 
 set ( ArtisticTextShape_SRCS
     ArtisticTextShapePlugin.cpp
     ArtisticTextShape.cpp
     ArtisticTextRange.cpp
     ArtisticTextShapeFactory.cpp
     ArtisticTextTool.cpp
     ArtisticTextToolFactory.cpp
     ArtisticTextToolSelection.cpp
     ArtisticTextShapeConfigWidget.cpp
     ArtisticTextShapeOnPathWidget.cpp
     ArtisticTextShapeLoadingUpdater.cpp
     ArtisticTextLoadingContext.cpp
     AttachTextToPathCommand.cpp
     DetachTextFromPathCommand.cpp
     ChangeTextOffsetCommand.cpp
     ChangeTextFontCommand.cpp
     ChangeTextAnchorCommand.cpp
     AddTextRangeCommand.cpp
     RemoveTextRangeCommand.cpp
     MoveStartOffsetStrategy.cpp
     SelectTextStrategy.cpp
     ReplaceTextRangeCommand.cpp
 )
 
 ki18n_wrap_ui( ArtisticTextShape_SRCS
     ArtisticTextShapeConfigWidget.ui
     ArtisticTextShapeOnPathWidget.ui
 )
 
 qt5_add_resources(ArtisticTextShape_SRCS artistictextshape.qrc)
 
 add_library(krita_shape_artistictext MODULE ${ArtisticTextShape_SRCS} )
 
-target_link_libraries(krita_shape_artistictext kritaflake)
+target_link_libraries(krita_shape_artistictext kritaflake kritaui)
 
 install( TARGETS krita_shape_artistictext DESTINATION ${KRITA_PLUGIN_INSTALL_DIR} )
diff --git a/plugins/flake/pathshapes/CMakeLists.txt b/plugins/flake/pathshapes/CMakeLists.txt
index 3345a7eaf6..a771105a68 100644
--- a/plugins/flake/pathshapes/CMakeLists.txt
+++ b/plugins/flake/pathshapes/CMakeLists.txt
@@ -1,40 +1,40 @@
 set(pathshapes_SOURCES
     ellipse/EllipseShape.cpp
     ellipse/EllipseShapeFactory.cpp
     ellipse/EllipseShapeConfigWidget.cpp
     ellipse/EllipseShapeConfigCommand.cpp
     spiral/SpiralShape.cpp
     spiral/SpiralShapeFactory.cpp
     spiral/SpiralShapeConfigWidget.cpp
     spiral/SpiralShapeConfigCommand.cpp
     star/StarShape.cpp
     star/StarShapeFactory.cpp
     star/StarShapeConfigWidget.cpp
     star/StarShapeConfigCommand.cpp
     rectangle/RectangleShape.cpp
     rectangle/RectangleShapeFactory.cpp
     rectangle/RectangleShapeConfigWidget.cpp
     rectangle/RectangleShapeConfigCommand.cpp
     enhancedpath/EnhancedPathShape.cpp
     enhancedpath/EnhancedPathShapeFactory.cpp
     enhancedpath/EnhancedPathCommand.cpp
     enhancedpath/EnhancedPathParameter.cpp
     enhancedpath/EnhancedPathFormula.cpp
     enhancedpath/EnhancedPathHandle.cpp
     PathShapesPlugin.cpp
 )
 
 ki18n_wrap_ui(pathshapes_SOURCES
     star/StarShapeConfigWidget.ui
     rectangle/RectangleShapeConfigWidget.ui
     ellipse/EllipseShapeConfigWidget.ui
     spiral/SpiralShapeConfigWidget.ui
 )
 
 qt5_add_resources(pathshapes_SOURCES pathshapes.qrc)
 
 add_library(krita_shape_paths MODULE ${pathshapes_SOURCES})
 
-target_link_libraries(krita_shape_paths kritaflake kritawidgets)
+target_link_libraries(krita_shape_paths kritaflake kritawidgets kritaui)
 
 install(TARGETS krita_shape_paths  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui b/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
index 8ae2fb5916..22ae46b850 100644
--- a/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
@@ -1,84 +1,92 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>EllipseShapeConfigWidget</class>
- <widget class="QWidget" name="EllipseShapeConfigWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="EllipseShapeConfigWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>187</width>
+    <width>188</width>
     <height>173</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <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" >
+  <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 row="0" column="1">
+    <widget class="QComboBox" name="ellipseType"/>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <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="QDoubleSpinBox" name="startAngle" >
-     <property name="alignment" >
+   <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" >
+     <property name="suffix">
       <string>°</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
+   <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="QDoubleSpinBox" name="endAngle" >
-     <property name="alignment" >
+   <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" >
+     <property name="suffix">
       <string>°</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QPushButton" name="closeEllipse" >
-     <property name="text" >
+   <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" >
+   <item row="4" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <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_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 990eea1287..88af5754e4 100644
--- a/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/rectangle/RectangleShapeConfigWidget.ui
@@ -1,60 +1,61 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>RectangleShapeConfigWidget</class>
- <widget class="QWidget" name="RectangleShapeConfigWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="RectangleShapeConfigWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>198</width>
+    <width>200</width>
     <height>108</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Rectangle Shape</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+  <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="KoUnitDoubleSpinBox" name="cornerRadiusX" />
+   <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" >
+   <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="KoUnitDoubleSpinBox" name="cornerRadiusY" />
+   <item row="1" column="1">
+    <widget class="KisDoubleParseUnitSpinBox" name="cornerRadiusY"/>
    </item>
-   <item row="2" column="0" >
+   <item row="2" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KoUnitDoubleSpinBox</class>
+   <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >KoUnitDoubleSpinBox.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 3f36f47ca1..bf26673702 100644
--- a/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/spiral/SpiralShapeConfigWidget.ui
@@ -1,79 +1,87 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SpiralShapeConfigWidget</class>
- <widget class="QWidget" name="SpiralShapeConfigWidget" >
-  <property name="geometry" >
+ <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" >
+  <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" >
+  <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 row="0" column="1">
+    <widget class="QComboBox" name="spiralType"/>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <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="QDoubleSpinBox" name="fade" >
-     <property name="alignment" >
+   <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" >
+     <property name="suffix">
       <string/>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>1.000000000000000</double>
      </property>
-     <property name="singleStep" >
+     <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
-     <property name="value" >
+     <property name="value">
       <double>0.500000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
+   <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 row="2" column="1">
+    <widget class="QComboBox" name="clockWise"/>
    </item>
-   <item row="3" column="0" >
+   <item row="3" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <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_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 c207c6e52d..6301134967 100644
--- a/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
+++ b/plugins/flake/pathshapes/star/StarShapeConfigWidget.ui
@@ -1,100 +1,101 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>StarShapeConfigWidget</class>
- <widget class="QWidget" name="StarShapeConfigWidget" >
-  <property name="geometry" >
+ <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" >
+  <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" >
+  <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" >
+   <item row="0" column="1">
+    <widget class="QCheckBox" name="convex">
+     <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
      </property>
-     <property name="text" >
+     <property name="text">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <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="QSpinBox" name="corners" />
+   <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" >
+   <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="KoUnitDoubleSpinBox" name="innerRadius" >
-     <property name="alignment" >
+   <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" >
+   <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="KoUnitDoubleSpinBox" name="outerRadius" >
-     <property name="alignment" >
+   <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" >
+   <item row="4" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QSpinBox</class>
+   <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
+   <header>kis_int_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
-   <class>KoUnitDoubleSpinBox</class>
+   <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >KoUnitDoubleSpinBox.h</header>
+   <header>kis_double_parse_unit_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt
index 9b44d8c1a6..4b3db50779 100644
--- a/plugins/impex/CMakeLists.txt
+++ b/plugins/impex/CMakeLists.txt
@@ -1,47 +1,43 @@
 project(kritafilters)
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 4)
   add_definitions( -DCPU_32_BITS )
 endif()
 
 if(JPEG_FOUND AND HAVE_LCMS2)
 	add_subdirectory(jpeg)
 endif()
 
 if(TIFF_FOUND)
 	add_subdirectory(tiff)
 endif()
 
 if(PNG_FOUND)
     add_subdirectory(png)
     add_subdirectory(csv)
 endif()
 
 if(OPENEXR_FOUND)
     add_subdirectory(exr)
 endif()
 
 if(POPPLER_FOUND)
     add_subdirectory(pdf)
 endif()
 
-if(OPENJPEG_FOUND)
-    add_subdirectory(jp2)
-endif()
-
 if(LIBRAW_FOUND)
     add_subdirectory(raw)
 endif()
 
 add_subdirectory(bmp)
 add_subdirectory(ora)
 add_subdirectory(ppm)
 add_subdirectory(xcf)
 add_subdirectory(psd)
 add_subdirectory(odg)
 add_subdirectory(qml)
 add_subdirectory(tga)
 add_subdirectory(heightmap)
 add_subdirectory(brush)
 add_subdirectory(spriter)
-add_subdirectory(video)
+#add_subdirectory(video)
diff --git a/plugins/impex/heightmap/kis_wdg_options_heightmap.ui b/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
index 2e5d967b43..9805b040f1 100644
--- a/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
+++ b/plugins/impex/heightmap/kis_wdg_options_heightmap.ui
@@ -1,88 +1,95 @@
 <?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>177</width>
-    <height>100</height>
+    <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="QSpinBox" name="intSize">
+    <widget class="KisIntParseSpinBox" name="intSize">
      <property name="maximum">
       <number>1000000</number>
      </property>
     </widget>
    </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>Mac</string>
+           <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_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt
deleted file mode 100644
index 0b885a99a7..0000000000
--- a/plugins/impex/jp2/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-include_directories(SYSTEM ${OPENJPEG_INCLUDE_DIR})
-
-set(libkritaconverter_LIB_SRCS
-    jp2_converter.cc
-)
-
-set(kritajp2import_SOURCES
-    jp2_import.cc
-    ${libkritaconverter_LIB_SRCS}
-    )
-
-add_library(kritajp2import MODULE ${kritajp2import_SOURCES})
-
-target_link_libraries(kritajp2import kritaui  ${OPENJPEG_LIBRARIES} )
-
-install(TARGETS kritajp2import  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-
-set(kritajp2export_SOURCES
-    jp2_export.cc
-    ${libkritaconverter_LIB_SRCS}
-)
-
-ki18n_wrap_ui(kritajp2export_SOURCES kis_wdg_options_jp2.ui )
-
-add_library(kritajp2export MODULE ${kritajp2export_SOURCES})
-
-target_link_libraries(kritajp2export kritaui  ${OPENJPEG_LIBRARIES} )
-
-install(TARGETS kritajp2export  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-install( PROGRAMS  krita_jp2.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/plugins/impex/jp2/jp2_converter.cc b/plugins/impex/jp2/jp2_converter.cc
deleted file mode 100644
index 11cc175634..0000000000
--- a/plugins/impex/jp2/jp2_converter.cc
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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 "jp2_converter.h"
-
-#include <openjpeg.h>
-
-#include <QFileInfo>
-#include <QApplication>
-
-#include <QMessageBox>
-
-#include <QFileInfo>
-
-#include <KoColorSpaceRegistry.h>
-#include <KoColorSpaceTraits.h>
-#include <KoColorSpaceConstants.h>
-#include <KisImportExportManager.h>
-#include <KoColorSpace.h>
-#include <KoColorModelStandardIds.h>
-
-#include <KisDocument.h>
-#include <kis_image.h>
-#include <kis_group_layer.h>
-#include <kis_paint_layer.h>
-#include <kis_paint_device.h>
-#include <kis_transaction.h>
-#include "kis_iterator_ng.h"
-
-jp2Converter::jp2Converter(KisDocument *doc)
-{
-    m_doc = doc;
-    m_stop = false;
-}
-
-jp2Converter::~jp2Converter()
-{
-}
-
-/**
- * sample error callback expecting a FILE* client object
- * */
-void
-error_callback(const char *msg, void *client_data)
-{
-    FILE *stream = (FILE *) client_data;
-    fprintf(stream, "[ERROR] %s", msg);
-}
-
-/**
- * sample warning callback expecting a FILE* client object
- * */
-void
-warning_callback(const char *msg, void *client_data)
-{
-    FILE *stream = (FILE *) client_data;
-    fprintf(stream, "[WARNING] %s", msg);
-}
-
-/**
- * sample debug callback expecting no client object
- * */
-void
-info_callback(const char *msg, void *client_data)
-{
-    Q_UNUSED(client_data);
-    fprintf(stdout, "[INFO] %s", msg);
-}
-
-KisImageBuilder_Result jp2Converter::decode(const QString &filename)
-{
-    // decompression parameters
-    opj_dparameters_t parameters;
-    opj_set_default_decoder_parameters(&parameters);
-    // Determine the type
-    parameters.decod_format = getFileFormat(filename); // TODO isn't there some magic code ?
-    if (parameters.decod_format == -1) {
-        return KisImageBuilder_RESULT_UNSUPPORTED;
-    }
-    // open the file
-    QFile fp(filename);
-    fp.open(QIODevice::ReadOnly);
-    QByteArray src = fp.readAll();
-    fp.close();
-    // Decode the file
-    opj_dinfo_t *dinfo = 0;
-
-    bool hasColorSpaceInfo = false;
-    /* get a decoder handle */
-    switch (parameters.decod_format) {
-    case J2K_CFMT: {
-        dinfo = opj_create_decompress(CODEC_J2K);
-        break;
-    }
-    case JP2_CFMT: {
-        dinfo = opj_create_decompress(CODEC_JP2);
-        hasColorSpaceInfo = true;
-        break;
-    }
-    case JPT_CFMT: {
-        dinfo = opj_create_decompress(CODEC_JPT);
-        break;
-    }
-    }
-    Q_ASSERT(dinfo);
-
-    /* setup the decoder decoding parameters using user parameters */
-    opj_setup_decoder(dinfo, &parameters);
-
-    /* open a byte stream */
-    opj_cio_t *cio = opj_cio_open((opj_common_ptr) dinfo, (unsigned char*)src.data(), src.length());
-
-    // Setup an event manager
-    opj_event_mgr_t event_mgr;    /* event manager */
-    memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
-    event_mgr.error_handler = error_callback;
-    event_mgr.warning_handler = warning_callback;
-    event_mgr.info_handler = info_callback;
-
-    /* catch events using our callbacks and give a local context */
-    opj_set_event_mgr((opj_common_ptr) dinfo, &event_mgr, stderr);
-
-    /* decode the stream and fill the image structure */
-    opj_image_t *image = opj_decode(dinfo, cio);
-
-    /* close the byte stream */
-    opj_cio_close(cio);
-    if (!image) {
-        opj_destroy_decompress(dinfo);
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    // Look for the colorspace
-    int components = image->numcomps;
-    if (image->numcomps == 0) {
-        opj_destroy_decompress(dinfo);
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-    int bitdepth = image->comps[0].bpp;
-    for (int i = 1; i < components; ++i) {
-        if (image->comps[i].bpp != bitdepth) {
-            opj_destroy_decompress(dinfo);
-            return KisImageBuilder_RESULT_FAILURE;
-        }
-    }
-    dbgFile << "Image has " << components << " components and a bit depth of " << bitdepth << " for color space " << image->color_space;
-    if (bitdepth == 0) {
-        bitdepth = 8;
-    }
-    const KoColorSpace* colorSpace = 0;
-    QVector<int> channelorder(components);
-    if (!hasColorSpaceInfo) {
-        if (components == 3) {
-            image->color_space = CLRSPC_SRGB;
-        } else if (components == 1) {
-            image->color_space = CLRSPC_GRAY;
-        }
-    }
-    switch (image->color_space) {
-    case CLRSPC_UNKNOWN:
-        break;
-    case CLRSPC_SRGB: {
-        if (bitdepth == 16) {
-            colorSpace = KoColorSpaceRegistry::instance()->rgb16();
-        } else if (bitdepth == 8) {
-            colorSpace = KoColorSpaceRegistry::instance()->rgb8();
-        }
-        if (components != 3) {
-            opj_destroy_decompress(dinfo);
-            return KisImageBuilder_RESULT_FAILURE;
-        }
-        channelorder[0] = KoBgrU16Traits::red_pos;
-        channelorder[1] = KoBgrU16Traits::green_pos;
-        channelorder[2] = KoBgrU16Traits::blue_pos;
-        break;
-    }
-    case CLRSPC_GRAY: {
-        if (bitdepth == 16) {
-            colorSpace = KoColorSpaceRegistry::instance()->colorSpace( GrayAColorModelID.id(), Integer16BitsColorDepthID.id(), "");
-        } else if (bitdepth == 8) {
-            colorSpace = KoColorSpaceRegistry::instance()->colorSpace(GrayAColorModelID.id(), Integer8BitsColorDepthID.id(), "");
-        }
-        if (components != 1) {
-            opj_destroy_decompress(dinfo);
-            return KisImageBuilder_RESULT_FAILURE;
-        }
-        channelorder[0] = 0;
-        break;
-    }
-    case CLRSPC_SYCC: {
-        if (bitdepth == 16) {
-            colorSpace = KoColorSpaceRegistry::instance()->colorSpace( "YUV", Integer16BitsColorDepthID.id(), "");
-        } else if (bitdepth == 8) {
-            colorSpace = KoColorSpaceRegistry::instance()->colorSpace("YUV", Integer8BitsColorDepthID.id(), "");
-        }
-        if (components != 3) {
-            opj_destroy_decompress(dinfo);
-            return KisImageBuilder_RESULT_FAILURE;
-        }
-        channelorder[0] = 0;
-        channelorder[1] = 1;
-        channelorder[2] = 2;
-        break;
-    }
-    default:
-        ;
-    }
-    if (!colorSpace) {
-        dbgFile << "No colors space found for that image";
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    // Create the image
-    if (m_image == 0) {
-        m_image = new KisImage(m_doc->createUndoStore(), image->x1, image->y1, colorSpace, "built image");
-    }
-
-    // Create the layer
-    KisPaintLayerSP layer = new KisPaintLayer(m_image.data(), m_image->nextLayerName(), OPACITY_OPAQUE_U8);
-    m_image->addNode(layer.data(), m_image->rootLayer().data());
-
-    // Set the data
-    int pos = 0;
-    KisHLineIteratorSP it = layer->paintDevice()->createHLineIteratorNG(0, 0, image->x1);
-    for (int v = 0; v < image->y1; ++v) {
-        if (bitdepth == 16) {
-            do {
-                quint16* px = reinterpret_cast<quint16*>(it->rawData());
-                for (int i = 0; i < components; ++i) {
-                    px[channelorder[i]] = image->comps[i].data[pos];
-                }
-                colorSpace->setOpacity(it->rawData(), OPACITY_OPAQUE_U8, 1);
-                ++pos;
-
-            } while (it->nextPixel());
-        } else if (bitdepth == 8) {
-            do {
-                quint8* px = reinterpret_cast<quint8*>(it->rawData());
-                for (int i = 0; i < components; ++i) {
-                    px[channelorder[i]] = image->comps[i].data[pos];
-                }
-                colorSpace->setOpacity(px, OPACITY_OPAQUE_U8, 1);
-                ++pos;
-
-            } while (it->nextPixel());
-        }
-        it->nextRow();
-    }
-
-    return KisImageBuilder_RESULT_OK;
-}
-
-
-
-KisImageBuilder_Result jp2Converter::buildImage(const QString &filename)
-{
-    return decode(filename);
-}
-
-
-KisImageWSP jp2Converter::getImage()
-{
-    return m_image;
-}
-
-
-KisImageBuilder_Result jp2Converter::buildFile(const QString &filename, KisPaintLayerSP layer, const JP2ConvertOptions& options)
-{
-    if (!layer)
-        return KisImageBuilder_RESULT_INVALID_ARG;
-
-    KisImageWSP kisimage = layer->image();
-    if (!kisimage)
-        return KisImageBuilder_RESULT_EMPTY;
-
-    // Init parameters
-    opj_cparameters_t parameters;
-    opj_set_default_encoder_parameters(&parameters);
-    parameters.cp_comment = (char*)"Created by Krita";
-    parameters.subsampling_dx = 1;
-    parameters.subsampling_dy = 1;
-    parameters.cp_disto_alloc = 1;
-    parameters.tcp_numlayers = 1;
-    parameters.numresolution = options.numberresolution;
-    dbgFile << 100 - options.rate;
-    parameters.tcp_rates[0] = options.rate;
-
-
-    // Set the colorspace information
-    OPJ_COLOR_SPACE clrspc;
-    int components;
-    QVector<int> channelorder;
-    if (layer->colorSpace()->colorModelId() == GrayAColorModelID || layer->colorSpace()->colorModelId() == GrayColorModelID) {
-        clrspc = CLRSPC_GRAY;
-        components = 1;
-        channelorder.resize(components);
-        channelorder[0] = 0;
-    } else if (layer->colorSpace()->colorModelId() == RGBAColorModelID) {
-        clrspc = CLRSPC_SRGB;
-        components = 3;
-        channelorder.resize(components);
-        channelorder[0] = KoBgrU16Traits::red_pos;
-        channelorder[1] = KoBgrU16Traits::green_pos;
-        channelorder[2] = KoBgrU16Traits::blue_pos;
-    } else {
-        QMessageBox::critical(0, i18nc("@title:window", "Krita"), i18n("Cannot export images in %1.\n", layer->colorSpace()->name())) ;
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    int bitdepth;
-    if (layer->colorSpace()->colorDepthId() == Integer8BitsColorDepthID) {
-        bitdepth = 8;
-//      TODO OpenJpeg does not really support 16bits yet
-//     } else if (layer->colorSpace()->colorDepthId() == Integer16BitsColorDepthID) {
-//         bitdepth = 16;
-    } else {
-        QMessageBox::critical(0, i18nc("@title:window", "Krita"), i18n("Cannot export images in %1.\n", layer->colorSpace()->name())) ;
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    // Init the image
-    opj_image_cmptparm_t image_info[3];
-
-    int width = kisimage->width();
-    int height = kisimage->height();
-    for (int k = 0; k < components; k++) {
-        image_info[k].dx = 1;
-        image_info[k].dy = 1;
-        image_info[k].w = width;
-        image_info[k].h = height;
-        image_info[k].x0 = 0;
-        image_info[k].y0 = 0;
-        image_info[k].prec = 8;
-        image_info[k].bpp = bitdepth;
-        image_info[k].sgnd = 0;
-    }
-    opj_image_t *image = opj_image_create(components, image_info, clrspc);
-    image->x1 = width;
-    image->y1 = height;
-    image->x0 = 0;
-    image->y0 = 0;
-
-    // Copy the data in the image
-    int pos = 0;
-    KisHLineIteratorSP it = layer->paintDevice()->createHLineIteratorNG(0, 0, image->x1);
-    for (int v = 0; v < height; ++v) {
-        if (bitdepth == 16) {
-            do {
-                quint16* px = reinterpret_cast<quint16*>(it->rawData());
-                for (int i = 0; i < components; ++i) {
-                    image->comps[i].data[pos] = px[channelorder[i]];
-                }
-                ++pos;
-
-            } while (it->nextPixel());
-        } else if (bitdepth == 8) {
-            do {
-                quint8* px = reinterpret_cast<quint8*>(it->rawData());
-                for (int i = 0; i < components; ++i) {
-                    image->comps[i].data[pos] = px[channelorder[i]];
-                }
-                ++pos;
-
-            } while (it->nextPixel());
-        }
-        it->nextRow();
-    }
-
-    // coding format
-    parameters.decod_format = getFileFormat(filename); // TODO isn't there some magic code ?
-
-    // Decode the file
-    opj_cinfo_t *cinfo = 0;
-
-    /* get a decoder handle */
-    switch (parameters.decod_format) {
-    case J2K_CFMT: {
-        cinfo = opj_create_compress(CODEC_J2K);
-        break;
-    }
-    case JP2_CFMT: {
-        cinfo = opj_create_compress(CODEC_JP2);
-        break;
-    }
-    case JPT_CFMT: {
-        cinfo = opj_create_compress(CODEC_JPT);
-        break;
-    }
-    }
-
-    if (!cinfo) {
-        // Could not create compression info object
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    // Setup an event manager
-    opj_event_mgr_t event_mgr;    /* event manager */
-    memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
-    event_mgr.error_handler = error_callback;
-    event_mgr.warning_handler = warning_callback;
-    event_mgr.info_handler = info_callback;
-
-    /* catch events using our callbacks and give a local context */
-    opj_set_event_mgr((opj_common_ptr) cinfo, &event_mgr, stderr);
-
-
-    /* setup the encoder parameters using the current image and using user parameters */
-    opj_setup_encoder(cinfo, &parameters, image);
-
-    opj_cio_t* cio = opj_cio_open((opj_common_ptr) cinfo, 0, 0);
-
-
-    /* encode the image */
-    if (!opj_encode(cinfo, cio, image, parameters.index)) {
-        opj_cio_close(cio);
-        opj_destroy_compress(cinfo);
-        return KisImageBuilder_RESULT_FAILURE;
-    }
-
-    // Write to the file
-    QFile fp(filename);
-    fp.open(QIODevice::WriteOnly);
-    int length = cio_tell(cio);
-    dbgFile << "Length of the file to save: " << length;
-    fp.write((char*)cio->buffer, length);
-    fp.close();
-
-    opj_cio_close(cio);
-    opj_destroy_compress(cinfo);
-
-    return KisImageBuilder_RESULT_OK;
-}
-
-
-void jp2Converter::cancel()
-{
-    m_stop = true;
-}
-
-int jp2Converter::getFileFormat(const QString &filename) const
-{
-    QString extension = QFileInfo(filename).suffix().toLower();
-    if (extension == "j2k" || extension == "j2c") {
-        return J2K_CFMT;
-    } else if (extension == "jp2") {
-        return JP2_CFMT;
-    } else if (extension == "jpt") {
-        return JPT_CFMT;
-    }
-    return -1;
-}
-
-
diff --git a/plugins/impex/jp2/jp2_converter.h b/plugins/impex/jp2/jp2_converter.h
deleted file mode 100644
index cb24aa7b24..0000000000
--- a/plugins/impex/jp2/jp2_converter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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.
- */
-
-#ifndef _JP2_CONVERTER_H_
-#define _JP2_CONVERTER_H_
-
-#include <stdio.h>
-
-#include <QObject>
-
-#include "kis_types.h"
-#include <KisImageBuilderResult.h>
-class KisDocument;
-
-struct JP2ConvertOptions {
-  int rate;
-  int numberresolution;
-};
-
-class jp2Converter : public QObject
-{
-    Q_OBJECT
-private:
-    enum {
-        J2K_CFMT = 0,
-        JP2_CFMT = 1,
-        JPT_CFMT = 2
-    };
-public:
-    jp2Converter(KisDocument *doc);
-    virtual ~jp2Converter();
-public:
-    KisImageBuilder_Result buildImage(const QString &filename);
-    KisImageBuilder_Result buildFile(const QString &filename, KisPaintLayerSP layer, const JP2ConvertOptions& options);
-    /**
-     * Retrieve the constructed image
-     */
-    KisImageWSP getImage();
-private:
-    KisImageBuilder_Result decode(const QString &filename);
-public Q_SLOTS:
-    virtual void cancel();
-private:
-    int getFileFormat(const QString &filename) const;
-private:
-    KisImageWSP m_image;
-    KisDocument *m_doc;
-    bool m_stop;
-};
-
-#endif
diff --git a/plugins/impex/jp2/jp2_export.cc b/plugins/impex/jp2/jp2_export.cc
deleted file mode 100644
index a7f92b35a2..0000000000
--- a/plugins/impex/jp2/jp2_export.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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 "jp2_export.h"
-
-#include <QCheckBox>
-#include <QSlider>
-#include <QApplication>
-
-#include <KoDialog.h>
-#include <kpluginfactory.h>
-#include <QFileInfo>
-
-#include <KoColorSpaceConstants.h>
-#include <KisFilterChain.h>
-#include <KisImportExportManager.h>
-
-#include <kis_properties_configuration.h>
-#include <kis_config.h>
-#include <KisDocument.h>
-#include <kis_image.h>
-#include <kis_group_layer.h>
-#include <kis_paint_layer.h>
-#include <kis_paint_device.h>
-
-#include "jp2_converter.h"
-
-#include "ui_kis_wdg_options_jp2.h"
-
-class KisExternalLayer;
-
-K_PLUGIN_FACTORY_WITH_JSON(ExportFactory, "krita_jp2_export.json", registerPlugin<jp2Export>();)
-
-jp2Export::jp2Export(QObject *parent, const QVariantList &) : KisImportExportFilter(parent)
-{
-}
-
-jp2Export::~jp2Export()
-{
-}
-
-KisImportExportFilter::ConversionStatus jp2Export::convert(const QByteArray& from, const QByteArray& to)
-{
-    dbgFile << "JP2 export! From:" << from << ", To:" << to << "";
-
-    if (from != "application/x-krita")
-        return KisImportExportFilter::NotImplemented;
-
-    KisDocument *input = inputDocument();
-    QString filename = outputFile();
-
-    if (!input)
-        return KisImportExportFilter::NoDocumentCreated;
-
-    KisImageWSP image = input->image();
-    Q_CHECK_PTR(image);
-
-    if (filename.isEmpty()) return KisImportExportFilter::FileNotFound;
-
-    KoDialog* kdb = new KoDialog(0);
-    kdb->setWindowTitle(i18n("JPEG 2000 Export Options"));
-    kdb->setButtons(KoDialog::Ok | KoDialog::Cancel);
-
-    Ui::WdgOptionsJP2 optionsJP2;
-
-    QWidget* wdg = new QWidget(kdb);
-    optionsJP2.setupUi(wdg);
-
-    QString filterConfig = KisConfig().exportConfiguration("JP2");
-    KisPropertiesConfiguration cfg;
-    cfg.fromXML(filterConfig);
-    optionsJP2.numberResolutions->setValue(cfg.getInt("number_resolutions", 6));
-    optionsJP2.qualityLevel->setValue(cfg.getInt("quality", 100));
-
-    kdb->setMainWidget(wdg);
-    QApplication::restoreOverrideCursor();
-
-    if (!getBatchMode()) {
-        if (kdb->exec() == QDialog::Rejected) {
-            return KisImportExportFilter::UserCancelled;
-        }
-    }
-
-    JP2ConvertOptions options;
-    options.numberresolution = optionsJP2.numberResolutions->value();
-    cfg.setProperty("number_resolutions", options.numberresolution);
-    options.rate = optionsJP2.qualityLevel->value();
-    cfg.setProperty("quality", options.rate);
-
-    KisConfig().setExportConfiguration("JP2", cfg);
-
-
-    // the image must be locked at the higher levels
-    KIS_SAFE_ASSERT_RECOVER_NOOP(input->image()->locked());
-    jp2Converter kpc(input);
-
-    KisPaintDeviceSP pd = new KisPaintDevice(*image->projection());
-    KisPaintLayerSP l = new KisPaintLayer(image, "projection", OPACITY_OPAQUE_U8, pd);
-
-    KisImageBuilder_Result res;
-
-    if ((res = kpc.buildFile(filename, l, options)) == KisImageBuilder_RESULT_OK) {
-        dbgFile << "success !";
-        return KisImportExportFilter::OK;
-    }
-    dbgFile << " Result =" << res;
-    return KisImportExportFilter::InternalError;
-}
-
-#include <jp2_export.moc>
-
diff --git a/plugins/impex/jp2/jp2_export.h b/plugins/impex/jp2/jp2_export.h
deleted file mode 100644
index d55ef897fe..0000000000
--- a/plugins/impex/jp2/jp2_export.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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.
- */
-
-#ifndef _JP2_EXPORT_H_
-#define _JP2_EXPORT_H_
-
-#include <QVariant>
-
-#include <KisImportExportFilter.h>
-
-class jp2Export : public KisImportExportFilter
-{
-    Q_OBJECT
-public:
-    jp2Export(QObject *parent, const QVariantList &);
-    virtual ~jp2Export();
-public:
-    virtual KisImportExportFilter::ConversionStatus convert(const QByteArray& from, const QByteArray& to);
-};
-
-#endif
diff --git a/plugins/impex/jp2/jp2_import.cc b/plugins/impex/jp2/jp2_import.cc
deleted file mode 100644
index 2cf66afa54..0000000000
--- a/plugins/impex/jp2/jp2_import.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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 "jp2_import.h"
-
-#include <kpluginfactory.h>
-#include <QFileInfo>
-
-#include <KisFilterChain.h>
-
-#include <KisDocument.h>
-#include <kis_image.h>
-
-#include "jp2_converter.h"
-
-K_PLUGIN_FACTORY_WITH_JSON(ImportFactory, "krita_jp2_import.json", registerPlugin<jp2Import>();)
-
-jp2Import::jp2Import(QObject *parent, const QVariantList &) : KisImportExportFilter(parent)
-{
-}
-
-jp2Import::~jp2Import()
-{
-}
-
-KisImportExportFilter::ConversionStatus jp2Import::convert(const QByteArray&, const QByteArray& to)
-{
-    dbgFile << "Importing using JP2Import!";
-
-    if (to != "application/x-krita")
-        return KisImportExportFilter::BadMimeType;
-
-    KisDocument * doc = outputDocument();
-
-    if (!doc)
-        return KisImportExportFilter::NoDocumentCreated;
-
-    QString filename = inputFile();
-
-    doc->prepareForImport();
-
-    if (!filename.isEmpty()) {
-
-        jp2Converter ib(doc);
-
-        switch (ib.buildImage(filename)) {
-        case KisImageBuilder_RESULT_UNSUPPORTED:
-            return KisImportExportFilter::NotImplemented;
-            break;
-        case KisImageBuilder_RESULT_INVALID_ARG:
-            return KisImportExportFilter::BadMimeType;
-            break;
-        case KisImageBuilder_RESULT_NO_URI:
-        case KisImageBuilder_RESULT_NOT_LOCAL:
-            return KisImportExportFilter::FileNotFound;
-            break;
-        case KisImageBuilder_RESULT_BAD_FETCH:
-        case KisImageBuilder_RESULT_EMPTY:
-            return KisImportExportFilter::ParsingError;
-            break;
-        case KisImageBuilder_RESULT_FAILURE:
-            return KisImportExportFilter::InternalError;
-            break;
-        case KisImageBuilder_RESULT_OK:
-            doc -> setCurrentImage(ib.getImage());
-            return KisImportExportFilter::OK;
-        default:
-            break;
-        }
-
-    }
-    return KisImportExportFilter::StorageCreationError;
-}
-
-#include <jp2_import.moc>
-
diff --git a/plugins/impex/jp2/jp2_import.h b/plugins/impex/jp2/jp2_import.h
deleted file mode 100644
index fd51b67f40..0000000000
--- a/plugins/impex/jp2/jp2_import.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2009 Cyrille Berger <cberger@cberger.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; 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.
- */
-
-#ifndef JP2_IMPORT_H_
-#define JP2_IMPORT_H_
-
-#include <QVariant>
-
-#include <KisImportExportFilter.h>
-
-class jp2Import : public KisImportExportFilter
-{
-    Q_OBJECT
-public:
-    jp2Import(QObject *parent, const QVariantList &);
-    virtual ~jp2Import();
-public:
-    virtual KisImportExportFilter::ConversionStatus convert(const QByteArray& from, const QByteArray& to);
-};
-
-#endif
diff --git a/plugins/impex/jp2/kis_wdg_options_jp2.ui b/plugins/impex/jp2/kis_wdg_options_jp2.ui
deleted file mode 100644
index da40c9d2ea..0000000000
--- a/plugins/impex/jp2/kis_wdg_options_jp2.ui
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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="QSpinBox" name="intQuality">
-       <property name="value">
-        <number>100</number>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</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="QSpinBox" 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>
- <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/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop
deleted file mode 100644
index e7ca394f71..0000000000
--- a/plugins/impex/jp2/krita_jp2.desktop
+++ /dev/null
@@ -1,120 +0,0 @@
-[Desktop Entry]
-Categories=Qt;KDE;Office;Graphics;
-Exec=krita %u
-GenericName=Application for Drawing and Handling of Images
-GenericName[bg]=Приложение за рисуване и обработка на изображения
-GenericName[bs]=Aplikacija za crtanje i upravljanje slikom
-GenericName[ca]=Aplicació per a dibuix i modificació d'imatges
-GenericName[ca@valencia]=Aplicació per a dibuix i modificació d'imatges
-GenericName[da]=Tegne- og billedbehandlingsprogram
-GenericName[de]=Programm zum Zeichnen und Bearbeiten von Bildern
-GenericName[el]=Εφαρμογή για επεξεργασία και χειρισμό εικόνων
-GenericName[en_GB]=Application for Drawing and Handling of Images
-GenericName[eo]=Aplikaĵo por Desegnado kaj Mastrumado de Bildoj
-GenericName[es]=Aplicación para dibujo y manipulación de imágenes
-GenericName[et]=Joonistamise ja pilditöötluse rakendus
-GenericName[eu]=Irudiak marrazteko eta manipulatzeko aplikazioa
-GenericName[fa]=کاربرد برای ترسیم و به کار بردن تصاویر
-GenericName[fi]=Ohjelma kuvien piirtämiseen ja käsittelyyn
-GenericName[fr]=Application pour dessiner et manipuler des images
-GenericName[fy]=Aplikaasje om ôfbyldings mei te tekenjen en te bewurkjen
-GenericName[ga]=Feidhmchlár le haghaidh Líníochta agus Láimhseála Íomhánna
-GenericName[gl]=Aplicativo de debuxo e edición de imaxes
-GenericName[he]=יישום לצביעה וניהול תמונות
-GenericName[hi]=छवियों को ड्रा करने तथा उन्हें प्रबन्धित करने का अनुप्रयोग
-GenericName[hne]=फोटू मन ल ड्रा करे अउ ओ मन ल प्रबन्धित करे के अनुपरयोग
-GenericName[hu]=Rajzoló és képkezelő
-GenericName[is]=Teikni og myndvinnsluforrit
-GenericName[it]=Applicazione di disegno e gestione di immagini
-GenericName[kk]=Кескінді салу және өңдеу бағдарламасы
-GenericName[ko]=그림 그리기 및 처리 프로그램
-GenericName[lv]=Programma zīmēšanai un attēlu apstrādei
-GenericName[nb]=Program for tegning og bildehåndtering
-GenericName[nds]=Programm för't Teken un Bildhanteren
-GenericName[ne]=रेखाचित्र बनाउन र छविको ह्यान्डल गर्नका लागि अनुप्रयोग
-GenericName[nl]=Toepassing om afbeeldingen te tekenen en te bewerken
-GenericName[pl]=Program do rysowania i obróbki obrazów
-GenericName[pt]=Aplicação de Desenho e Manipulação de Imagens
-GenericName[pt_BR]=Aplicativo de desenho e manipulação de imagens
-GenericName[ru]=Растровые изображения
-GenericName[sk]=Aplikácia na kresnenie a manilupáciu s obrázkami
-GenericName[sl]=Program za risanje in rokovanje s slikami
-GenericName[sv]=Program för att rita och hantera bilder
-GenericName[ta]=பிம்பங்களை கையாளுதல் மற்றும் வரைதலுக்கான பயன்னாடு
-GenericName[tr]=Çizim ve Resim İşleme Uygulaması
-GenericName[uk]=Програма для малювання і обробки зображень
-GenericName[uz]=Rasm chizish dasturi
-GenericName[uz@cyrillic]=Расм чизиш дастури
-GenericName[wa]=Programe po dessiner et apougnî des imådjes
-GenericName[x-test]=xxApplication for Drawing and Handling of Imagesxx
-GenericName[zh_CN]=绘制和操纵图像的应用程序
-GenericName[zh_TW]=影像繪製與處理應用程式
-Icon=calligrakrita
-MimeType=image/jp2;
-Name=Krita
-Name[af]=Krita
-Name[bg]=Krita
-Name[br]=Krita
-Name[bs]=Krita
-Name[ca]=Krita
-Name[ca@valencia]=Krita
-Name[cs]=Krita
-Name[cy]=Krita
-Name[da]=Krita
-Name[de]=Krita
-Name[el]=Krita
-Name[en_GB]=Krita
-Name[eo]=Krita
-Name[es]=Krita
-Name[et]=Krita
-Name[eu]=Krita
-Name[fi]=Krita
-Name[fr]=Krita
-Name[fy]=Krita
-Name[ga]=Krita
-Name[gl]=Krita
-Name[he]=Krita
-Name[hi]=केरिता
-Name[hne]=केरिता
-Name[hr]=Krita
-Name[hu]=Krita
-Name[ia]=Krita
-Name[is]=Krita
-Name[it]=Krita
-Name[kk]=Krita
-Name[ko]=Krita
-Name[lt]=Krita
-Name[lv]=Krita
-Name[mr]=क्रिटा
-Name[ms]=Krita
-Name[nb]=Krita
-Name[nds]=Krita
-Name[ne]=क्रिता
-Name[nl]=Krita
-Name[pl]=Krita
-Name[pt]=Krita
-Name[pt_BR]=Krita
-Name[ro]=Krita
-Name[ru]=Krita
-Name[se]=Krita
-Name[sk]=Krita
-Name[sl]=Krita
-Name[sv]=Krita
-Name[ta]=கிரிட்டா
-Name[tg]=Krita
-Name[tr]=Krita
-Name[ug]=Krita
-Name[uk]=Krita
-Name[uz]=Krita
-Name[uz@cyrillic]=Krita
-Name[wa]=Krita
-Name[xh]=Krita
-Name[x-test]=xxKritaxx
-Name[zh_CN]=Krita
-Name[zh_TW]=繪圖_Krita
-StartupNotify=true
-Terminal=false
-Type=Application
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-NoDisplay=true
diff --git a/plugins/impex/jp2/krita_jp2_export.json b/plugins/impex/jp2/krita_jp2_export.json
deleted file mode 100644
index 5b91b4d7b0..0000000000
--- a/plugins/impex/jp2/krita_jp2_export.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "Icon": "",
-    "Id": "Krita jp2 Export Filter",
-    "Type": "Service",
-    "X-KDE-Export": "image/jp2",
-    "X-KDE-Import": "application/x-krita",
-    "X-KDE-Library": "kritajp2export",
-    "X-KDE-ServiceTypes": [
-        "Krita/FileFilter"
-    ],
-    "X-KDE-Weight": "1",
-    "X-KDE-Extensions" : "jp2"
-}
diff --git a/plugins/impex/jp2/krita_jp2_import.json b/plugins/impex/jp2/krita_jp2_import.json
deleted file mode 100644
index ade36b72cd..0000000000
--- a/plugins/impex/jp2/krita_jp2_import.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "Icon": "",
-    "Id": "Krita jp2 Import Filter",
-    "Type": "Service",
-    "X-KDE-Export": "application/x-krita",
-    "X-KDE-Import": "image/jp2",
-    "X-KDE-Library": "kritajp2import",
-    "X-KDE-ServiceTypes": [
-        "Krita/FileFilter"
-    ],
-    "X-KDE-Weight": "1",
-    "X-KDE-Extensions" : "jp2"
-}
diff --git a/plugins/impex/pdf/pdfimportwidgetbase.ui b/plugins/impex/pdf/pdfimportwidgetbase.ui
index 18077ee520..63eda628ac 100644
--- a/plugins/impex/pdf/pdfimportwidgetbase.ui
+++ b/plugins/impex/pdf/pdfimportwidgetbase.ui
@@ -1,367 +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>&amp;All pages</string>
+         <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>&amp;Selection of page</string>
+         <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="QSpinBox" name="intHeight">
+           <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="QSpinBox" name="intWidth">
+           <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">
+         <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="QSpinBox" name="intResolution">
+           <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_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/impex/video/CMakeLists.txt b/plugins/impex/video/CMakeLists.txt
index 768cfed851..9172d2f8d3 100644
--- a/plugins/impex/video/CMakeLists.txt
+++ b/plugins/impex/video/CMakeLists.txt
@@ -1,19 +1,21 @@
+include_directories(${Boost_INCLUDE_DIRS})
+
 add_subdirectory(tests)
 
 # export
 
 set(kritavideoexport_SOURCES
     kis_video_export.cpp
     video_saver.cpp
     video_export_options_dialog.cpp
     )
 
 ki18n_wrap_ui(kritavideoexport_SOURCES video_export_options_dialog.ui )
 
 add_library(kritavideoexport MODULE ${kritavideoexport_SOURCES})
 
 generate_export_header(kritavideoexport BASE_NAME kritavideoexport)
 
 target_link_libraries(kritavideoexport kritaui)
 
 install(TARGETS kritavideoexport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt
index 0e900ad51e..34cfedf8d6 100644
--- a/plugins/impex/xcf/CMakeLists.txt
+++ b/plugins/impex/xcf/CMakeLists.txt
@@ -1,33 +1,33 @@
 add_subdirectory(tests)
 
 set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
 
 include_directories( ${XCFTOOLS_SOURCE_DIR})
 
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
-    add_definitions(-Wno-undef -Wno-missing-format-attribute -Wno-sign-compare)
+    list(APPEND COMPILE_FLAGS -Wno-undef -Wno-missing-format-attribute -Wno-sign-compare)
 endif ()
 
 set(kritaxcfimport_SOURCES
     kis_xcf_import.cpp
     ${XCFTOOLS_SOURCE_DIR}/xcf-general.c
     ${XCFTOOLS_SOURCE_DIR}/utils.c
     ${XCFTOOLS_SOURCE_DIR}/enums.c
     ${XCFTOOLS_SOURCE_DIR}/pixels.c
     ${XCFTOOLS_SOURCE_DIR}/scaletab.c
     ${XCFTOOLS_SOURCE_DIR}/table.c
     ${XCFTOOLS_SOURCE_DIR}/enums.c
     ${XCFTOOLS_SOURCE_DIR}/flatspec.c
     ${XCFTOOLS_SOURCE_DIR}/flatten.c  
     )
 
 add_library(kritaxcfimport MODULE ${kritaxcfimport_SOURCES})
 
 target_link_libraries(kritaxcfimport kritaui )
 
 if (WIN32)
     target_link_libraries(kritaxcfimport kritaui ${WIN32_PLATFORM_NET_LIBS})
 endif ()
 
 install(TARGETS kritaxcfimport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
 install( PROGRAMS  krita_xcf.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/plugins/paintops/colorsmudge/CMakeLists.txt b/plugins/paintops/colorsmudge/CMakeLists.txt
index 5715994f95..0df794f349 100644
--- a/plugins/paintops/colorsmudge/CMakeLists.txt
+++ b/plugins/paintops/colorsmudge/CMakeLists.txt
@@ -1,17 +1,18 @@
 set(kritacolorsmudgepaintop_SOURCES
     colorsmudge_paintop_plugin.cpp
     kis_colorsmudgeop.cpp
+    kis_colorsmudgeop_settings.cpp
     kis_colorsmudgeop_settings_widget.cpp
     kis_rate_option.cpp
     kis_smudge_option.cpp
     kis_smudge_option_widget.cpp
     kis_smudge_radius_option.cpp
 )
 
 add_library(kritacolorsmudgepaintop MODULE ${kritacolorsmudgepaintop_SOURCES})
 
 target_link_libraries(kritacolorsmudgepaintop kritalibpaintop)
 
 install(TARGETS kritacolorsmudgepaintop DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
 install( FILES  krita-colorsmudge.png DESTINATION ${DATA_INSTALL_DIR}/krita/images)
 
diff --git a/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp b/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp
index 6bb778b78f..a8c54b1447 100644
--- a/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp
+++ b/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp
@@ -1,49 +1,49 @@
 /*
  *  Copyright (c) 2011 Silvio Heinrich <plassy@web.de>
  *
  *  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 "colorsmudge_paintop_plugin.h"
 
 #include <klocalizedstring.h>
 
 #include <kis_debug.h>
 #include <kpluginfactory.h>
 
 #include <brushengine/kis_paintop_registry.h>
-#include <kis_brush_based_paintop_settings.h>
+#include "kis_colorsmudgeop_settings.h"
 
 #include "kis_colorsmudgeop.h"
 #include "kis_colorsmudgeop_settings_widget.h"
 #include "kis_simple_paintop_factory.h"
 
 #include "kis_global.h"
 
 K_PLUGIN_FACTORY_WITH_JSON(ColorSmudgePaintOpPluginFactory, "kritacolorsmudgepaintop.json", registerPlugin<ColorSmudgePaintOpPlugin>();)
 
 
 ColorSmudgePaintOpPlugin::ColorSmudgePaintOpPlugin(QObject* parent, const QVariantList&):
     QObject(parent)
 {
-    KisPaintOpRegistry::instance()->add(new KisSimplePaintOpFactory<KisColorSmudgeOp, KisBrushBasedPaintOpSettings, KisColorSmudgeOpSettingsWidget>(
+    KisPaintOpRegistry::instance()->add(new KisSimplePaintOpFactory<KisColorSmudgeOp, KisColorSmudgeOpSettings, KisColorSmudgeOpSettingsWidget>(
                                             "colorsmudge", i18n("Color Smudge"), KisPaintOpFactory::categoryStable(), "krita-colorsmudge.png",
                                             QString(), QStringList(), 2)
                                        );
 }
 
 ColorSmudgePaintOpPlugin::~ColorSmudgePaintOpPlugin() { }
 
 #include "colorsmudge_paintop_plugin.moc"
diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp
new file mode 100644
index 0000000000..6ea69861d8
--- /dev/null
+++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp
@@ -0,0 +1,123 @@
+/*
+ *  Copyright (c) 2016 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_colorsmudgeop_settings.h"
+
+#include "kis_smudge_option.h"
+
+struct KisColorSmudgeOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+KisColorSmudgeOpSettings::KisColorSmudgeOpSettings()
+    : m_d(new Private)
+{
+}
+
+KisColorSmudgeOpSettings::~KisColorSmudgeOpSettings()
+{
+}
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include <brushengine/kis_combo_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_curve_option_uniform_property.h"
+#include "kis_smudge_radius_option.h"
+
+typedef KisCallbackBasedPaintopProperty<KisComboBasedPaintOpProperty> KisComboBasedPaintOpPropertyCallback;
+
+QList<KisUniformPaintOpPropertySP> KisColorSmudgeOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisComboBasedPaintOpPropertyCallback *prop =
+                new KisComboBasedPaintOpPropertyCallback(
+                    "smudge_mode",
+                    i18n("Smudge Mode"),
+                    this, 0);
+
+            QList<QString> modes;
+            modes << i18n("Smearing");
+            modes << i18n("Dulling");
+
+            prop->setItems(modes);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSmudgeOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.getMode()));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSmudgeOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.setMode(KisSmudgeOption::Mode(prop->value().toInt()));
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisCurveOptionUniformProperty *prop =
+                new KisCurveOptionUniformProperty(
+                    "smudge_length",
+                    new KisSmudgeOption(),
+                    this, 0);
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisCurveOptionUniformProperty *prop =
+                new KisCurveOptionUniformProperty(
+                    "smudge_radius",
+                    new KisSmudgeRadiusOption(),
+                    this, 0);
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisCurveOptionUniformProperty *prop =
+                new KisCurveOptionUniformProperty(
+                    "smudge_color_rate",
+                    new KisRateOption("ColorRate", KisPaintOpOption::GENERAL, false),
+                    this, 0);
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    return KisBrushBasedPaintOpSettings::uniformProperties() + props;
+}
+
diff --git a/plugins/paintops/particle/kis_particle_paintop_settings.h b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
similarity index 59%
copy from plugins/paintops/particle/kis_particle_paintop_settings.h
copy to plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
index bdc68793c8..eebe6d216d 100644
--- a/plugins/paintops/particle/kis_particle_paintop_settings.h
+++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
@@ -1,35 +1,39 @@
 /*
- *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
+ *  Copyright (c) 2016 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.
  */
 
-#ifndef KIS_PARTICLE_PAINTOP_SETTINGS_H_
-#define KIS_PARTICLE_PAINTOP_SETTINGS_H_
+#ifndef __KIS_COLORSMUDGEOP_SETTINGS_H
+#define __KIS_COLORSMUDGEOP_SETTINGS_H
 
-#include <brushengine/kis_paintop_settings.h>
-#include <kis_types.h>
+#include <QScopedPointer>
+#include <kis_brush_based_paintop_settings.h>
 
-class KisParticlePaintOpSettings : public KisPaintOpSettings
-{
 
+class KisColorSmudgeOpSettings : public KisBrushBasedPaintOpSettings
+{
 public:
-    bool paintIncremental();
-    bool isAirbrushing() const;
-    int rate() const;
+    KisColorSmudgeOpSettings();
+    ~KisColorSmudgeOpSettings();
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
 
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
-#endif
+#endif /* __KIS_COLORSMUDGEOP_SETTINGS_H */
diff --git a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
index 286bcc7c1d..dc3e978714 100644
--- a/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
+++ b/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
@@ -1,88 +1,89 @@
 /*
  *  Copyright (C) 2011 Silvio Heinrich <plassy@web.de>
  *
  *  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_colorsmudgeop_settings_widget.h"
 #include "kis_brush_based_paintop_settings.h"
 #include "kis_overlay_mode_option.h"
 #include "kis_rate_option.h"
 #include "kis_smudge_option_widget.h"
 #include "kis_smudge_radius_option.h"
 
 #include <kis_properties_configuration.h>
 #include <kis_paintop_settings_widget.h>
 #include <kis_pressure_size_option.h>
 #include <kis_curve_option_widget.h>
 #include <kis_pressure_rotation_option.h>
 #include <kis_pressure_scatter_option_widget.h>
 #include <kis_pressure_opacity_option.h>
 #include <kis_pressure_gradient_option.h>
 #include <kis_airbrush_option.h>
 #include <kis_compositeop_option.h>
 #include <kis_pressure_spacing_option_widget.h>
 #include "kis_texture_option.h"
 #include "kis_curve_option_widget.h"
 #include <kis_pressure_mirror_option_widget.h>
 #include "kis_pressure_texture_strength_option.h"
+#include "kis_colorsmudgeop_settings.h"
 
 
 KisColorSmudgeOpSettingsWidget::KisColorSmudgeOpSettingsWidget(QWidget* parent):
     KisBrushBasedPaintopOptionWidget(parent)
 {
     setObjectName("brush option widget");
     setPrecisionEnabled(true);
 
     addPaintOpOption(new KisCompositeOpOption(true), i18n("Blending Mode"));
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureOpacityOption(), i18n("Transparent"), i18n("Opaque")), i18n("Opacity"));
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureSizeOption(), i18n("0%"), i18n("100%")), i18n("Size"));
     addPaintOpOption(new KisPressureSpacingOptionWidget(), i18n("Spacing"));
     addPaintOpOption(new KisPressureMirrorOptionWidget(), i18n("Mirror"));
 
     m_smudgeOptionWidget = new KisSmudgeOptionWidget();
 
     addPaintOpOption(m_smudgeOptionWidget, i18n("Smudge Length"));
     addPaintOpOption(new KisCurveOptionWidget(new KisSmudgeRadiusOption(), i18n("0.0"), i18n("1.0")), i18n("Smudge Radius"));
     addPaintOpOption(new KisCurveOptionWidget(new KisRateOption("ColorRate", KisPaintOpOption::GENERAL, false), i18n("0.0"), i18n("1.0")), i18n("Color Rate"));
 
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureRotationOption(), i18n("-180°"), i18n("180°")), i18n("Rotation"));
     addPaintOpOption(new KisPressureScatterOptionWidget(), i18n("Scatter"));
     addPaintOpOption(new KisOverlayModeOptionWidget(), i18n("Overlay Mode"));
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureGradientOption(), i18n("0%"), i18n("100%")), i18n("Gradient"));
 
     addPaintOpOption(new KisTextureOption(), i18n("Pattern"));
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureTextureStrengthOption(), i18n("Weak"), i18n("Strong")), i18n("Strength"));
 
 }
 
 KisColorSmudgeOpSettingsWidget::~KisColorSmudgeOpSettingsWidget() { }
 
 KisPropertiesConfiguration* KisColorSmudgeOpSettingsWidget::configuration() const
 {
-    KisBrushBasedPaintOpSettings *config = new KisBrushBasedPaintOpSettings();
+    KisColorSmudgeOpSettings *config = new KisColorSmudgeOpSettings();
     config->setOptionsWidget(const_cast<KisColorSmudgeOpSettingsWidget*>(this));
     config->setProperty("paintop", "colorsmudge");
     writeConfiguration(config);
     return config;
 }
 
 void KisColorSmudgeOpSettingsWidget::notifyPageChanged()
 {
     KisBrushSP brush = this->brush();
     bool pierced =  brush ? brush->isPiercedApprox() : false;
     m_smudgeOptionWidget->updateBrushPierced(pierced);
 }
 
diff --git a/plugins/paintops/curvebrush/kis_curve_line_option.cpp b/plugins/paintops/curvebrush/kis_curve_line_option.cpp
index f7f3be88c7..c13924a81a 100644
--- a/plugins/paintops/curvebrush/kis_curve_line_option.cpp
+++ b/plugins/paintops/curvebrush/kis_curve_line_option.cpp
@@ -1,79 +1,86 @@
 /*
  *  Copyright (c) 2011 Lukáš Tvrdý <lukast.dev@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_curve_line_option.h"
 
 #include "ui_wdgcurveoptions.h"
 
 class KisCurveOpOptionsWidget: public QWidget, public Ui::WdgCurveOptions
 {
 
 public:
     KisCurveOpOptionsWidget(QWidget *parent = 0) : QWidget(parent) {
         setupUi(this);
         historySizeSlider->setRange(2, 300);
         historySizeSlider->setValue(30);
 
         lineWidthSlider->setRange(1, 100);
         lineWidthSlider->setValue(1);
         lineWidthSlider->setSuffix(i18n(" px"));
 
         curvesOpacitySlider->setRange(0.0, 1.0, 2);
         curvesOpacitySlider->setValue(1.0);
     }
 };
 
 KisCurveOpOption::KisCurveOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     m_checkable = false;
     m_options = new KisCurveOpOptionsWidget();
 
     connect(m_options->connectionCHBox, SIGNAL(toggled(bool)), this, SLOT(emitSettingChanged()));
     connect(m_options->smoothingCHBox, SIGNAL(toggled(bool)), this, SLOT(emitSettingChanged()));
     connect(m_options->historySizeSlider, SIGNAL(valueChanged(qreal)), this, SLOT(emitSettingChanged()));
     connect(m_options->lineWidthSlider, SIGNAL(valueChanged(qreal)), this, SLOT(emitSettingChanged()));
     connect(m_options->curvesOpacitySlider, SIGNAL(valueChanged(qreal)), this, SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 
     setObjectName("KisCurveOpOption");
 }
 
 KisCurveOpOption::~KisCurveOpOption()
 {
 }
 
 void KisCurveOpOption::writeOptionSetting(KisPropertiesConfiguration* config) const
 {
-    config->setProperty(CURVE_PAINT_CONNECTION_LINE, m_options->connectionCHBox->isChecked());
-    config->setProperty(CURVE_SMOOTHING, m_options->smoothingCHBox->isChecked());
-    config->setProperty(CURVE_STROKE_HISTORY_SIZE, m_options->historySizeSlider->value());
-    config->setProperty(CURVE_LINE_WIDTH, m_options->lineWidthSlider->value());
-    config->setProperty(CURVE_CURVES_OPACITY, m_options->curvesOpacitySlider->value());
+    CurveOption op;
+
+    op.curve_paint_connection_line = m_options->connectionCHBox->isChecked();
+    op.curve_smoothing = m_options->smoothingCHBox->isChecked();
+    op.curve_stroke_history_size = m_options->historySizeSlider->value();
+    op.curve_line_width = m_options->lineWidthSlider->value();
+    op.curve_curves_opacity = m_options->curvesOpacitySlider->value();
+
+    op.writeOptionSetting(config);
 }
 
 void KisCurveOpOption::readOptionSetting(const KisPropertiesConfiguration* config)
 {
-    m_options->connectionCHBox->setChecked(config->getBool(CURVE_PAINT_CONNECTION_LINE));
-    m_options->smoothingCHBox->setChecked(config->getBool(CURVE_SMOOTHING));
-    m_options->historySizeSlider->setValue(config->getInt(CURVE_STROKE_HISTORY_SIZE));
-    m_options->lineWidthSlider->setValue(config->getInt(CURVE_LINE_WIDTH));
-    m_options->curvesOpacitySlider->setValue(config->getDouble(CURVE_CURVES_OPACITY));
+    CurveOption op;
+    op.readOptionSetting(config);
+
+    m_options->connectionCHBox->setChecked(op.curve_paint_connection_line);
+    m_options->smoothingCHBox->setChecked(op.curve_smoothing);
+    m_options->historySizeSlider->setValue(op.curve_stroke_history_size);
+    m_options->lineWidthSlider->setValue(op.curve_line_width);
+    m_options->curvesOpacitySlider->setValue(op.curve_curves_opacity);
 }
 
 
diff --git a/plugins/paintops/curvebrush/kis_curve_line_option.h b/plugins/paintops/curvebrush/kis_curve_line_option.h
index 6c045bf619..504797a2bc 100644
--- a/plugins/paintops/curvebrush/kis_curve_line_option.h
+++ b/plugins/paintops/curvebrush/kis_curve_line_option.h
@@ -1,64 +1,72 @@
 /*
  *  Copyright (c) 2011 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_CURVE_LINE_OPTION_H
 #define KIS_CURVE_LINE_OPTION_H
 
 #include <kis_paintop_option.h>
 
 class KisCurveOpOptionsWidget;
 
 // new rewrite
 const QString CURVE_LINE_WIDTH = "Curve/lineWidth"; // same as in sketch
 const QString CURVE_PAINT_CONNECTION_LINE = "Curve/makeConnection"; // same as in sketch
 const QString CURVE_STROKE_HISTORY_SIZE = "Curve/strokeHistorySize";
 const QString CURVE_SMOOTHING = "Curve/smoothing";
 const QString CURVE_CURVES_OPACITY = "Curve/curvesOpacity";
 
 class KisCurveOpOption : public KisPaintOpOption
 {
 public:
     KisCurveOpOption();
     ~KisCurveOpOption();
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
 private:
     KisCurveOpOptionsWidget * m_options;
 
 };
 
-class CurveProperties
+class CurveOption
 {
 public:
-    int lineWidth;
-    int historySize;
-    qreal curvesOpacity;
-    bool paintConnectionLine;
-    bool smoothing;
+    bool curve_paint_connection_line;
+    bool curve_smoothing;
+    int curve_stroke_history_size;
+    int curve_line_width;
+    qreal curve_curves_opacity;
 
-    void readOptionSetting(const KisPropertiesConfiguration* settings) {
-        lineWidth = settings->getInt(CURVE_LINE_WIDTH);
-        historySize = settings->getInt(CURVE_STROKE_HISTORY_SIZE);
-        paintConnectionLine = settings->getBool(CURVE_PAINT_CONNECTION_LINE);
-        smoothing = settings->getBool(CURVE_SMOOTHING);
-        curvesOpacity = settings->getDouble(CURVE_CURVES_OPACITY);
+    void readOptionSetting(const KisPropertiesConfiguration* config) {
+        curve_paint_connection_line = config->getBool(CURVE_PAINT_CONNECTION_LINE);
+        curve_smoothing = config->getBool(CURVE_SMOOTHING);
+        curve_stroke_history_size = config->getInt(CURVE_STROKE_HISTORY_SIZE);
+        curve_line_width = config->getInt(CURVE_LINE_WIDTH);
+        curve_curves_opacity = config->getDouble(CURVE_CURVES_OPACITY);
+    }
+
+    void writeOptionSetting(KisPropertiesConfiguration* config) const {
+        config->setProperty(CURVE_PAINT_CONNECTION_LINE, curve_paint_connection_line);
+        config->setProperty(CURVE_SMOOTHING, curve_smoothing);
+        config->setProperty(CURVE_STROKE_HISTORY_SIZE, curve_stroke_history_size);
+        config->setProperty(CURVE_LINE_WIDTH, curve_line_width);
+        config->setProperty(CURVE_CURVES_OPACITY, curve_curves_opacity);
     }
 };
 
 #endif
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop.cpp b/plugins/paintops/curvebrush/kis_curve_paintop.cpp
index 57d9ad23ca..a9f59a2026 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop.cpp
+++ b/plugins/paintops/curvebrush/kis_curve_paintop.cpp
@@ -1,127 +1,127 @@
 /*
  *  Copyright (c) 2008-2011 Lukáš Tvrdý <lukast.dev@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_curve_paintop.h"
 
 #include <cmath>
 
 #include <QRect>
 
 #include <kis_image.h>
 #include <kis_debug.h>
 #include "kis_global.h"
 #include "kis_paint_device.h"
 #include "kis_painter.h"
 #include "kis_types.h"
 #include <kis_lod_transform.h>
 
 
 KisCurvePaintOp::KisCurvePaintOp(const KisCurvePaintOpSettings *settings, KisPainter * painter, KisNodeSP node, KisImageSP image)
     : KisPaintOp(painter), m_painter(0)
 {
     Q_ASSERT(settings);
     Q_UNUSED(image);
     Q_UNUSED(node);
 
     m_curveProperties.readOptionSetting(settings);
     m_opacityOption.readOptionSetting(settings);
     m_lineWidthOption.readOptionSetting(settings);
     m_curvesOpacityOption.readOptionSetting(settings);
 }
 
 KisCurvePaintOp::~KisCurvePaintOp()
 {
     delete m_painter;
 }
 
 KisSpacingInformation KisCurvePaintOp::paintAt(const KisPaintInformation& info)
 {
     Q_UNUSED(info);
     return KisSpacingInformation(1.0);
 }
 
 
 void KisCurvePaintOp::paintLine(const KisPaintInformation &pi1, const KisPaintInformation &pi2, KisDistanceInformation *currentDistance)
 {
     Q_UNUSED(currentDistance);
     if (!painter()) return;
 
     if (!m_dab) {
         m_dab = source()->createCompositionSourceDevice();
     }
     else {
         m_dab->clear();
     }
 
     paintLine(m_dab, pi1, pi2);
 
     QRect rc = m_dab->extent();
 
     quint8 origOpacity = m_opacityOption.apply(painter(), pi2);
     painter()->bitBlt(rc.topLeft(), m_dab, rc);
     painter()->renderMirrorMask(rc, m_dab);
     painter()->setOpacity(origOpacity);
 }
 
 void KisCurvePaintOp::paintLine(KisPaintDeviceSP dab, const KisPaintInformation &pi1, const KisPaintInformation &pi2)
 {
     if (!m_painter) {
         m_painter = new KisPainter(dab);
         m_painter->setPaintColor(painter()->paintColor());
     }
 
-    int maxPoints = m_curveProperties.historySize;
+    int maxPoints = m_curveProperties.curve_stroke_history_size;
 
     m_points.append(pi2.pos());
 
     while (m_points.length() > maxPoints) {
         m_points.removeFirst();
     }
 
     const qreal additionalScale = KisLodTransform::lodToScale(painter()->device());
-    const qreal lineWidth = additionalScale * m_lineWidthOption.apply(pi2, m_curveProperties.lineWidth);
+    const qreal lineWidth = additionalScale * m_lineWidthOption.apply(pi2, m_curveProperties.curve_line_width);
 
     QPen pen(QBrush(Qt::white), lineWidth);
     QPainterPath path;
 
-    if (m_curveProperties.paintConnectionLine) {
+    if (m_curveProperties.curve_paint_connection_line) {
         path.moveTo(pi1.pos());
         path.lineTo(pi2.pos());
         m_painter->drawPainterPath(path, pen);
         path = QPainterPath();
     }
 
     if (m_points.length() >= maxPoints) {
         // alpha * 0.2;
         path.moveTo(m_points.first());
 
-        if (m_curveProperties.smoothing) {
+        if (m_curveProperties.curve_smoothing) {
             path.quadTo(m_points.at(maxPoints / 2), m_points.last());
         }
         else {
             // control point is at 1/3 of the history, 2/3 of the history and endpoint at 3/3
             int step = maxPoints / 3;
             path.cubicTo(m_points.at(step), m_points.at(step + step), m_points.last());
         }
 
-        qreal curveOpacity = m_curvesOpacityOption.apply(pi2, m_curveProperties.curvesOpacity);
+        qreal curveOpacity = m_curvesOpacityOption.apply(pi2, m_curveProperties.curve_curves_opacity);
         m_painter->setOpacity(qRound(255.0 * curveOpacity));
         m_painter->drawPainterPath(path, pen);
         m_painter->setOpacity(255); // full
     }
 }
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop.h b/plugins/paintops/curvebrush/kis_curve_paintop.h
index d74e1505f2..d9b471329c 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop.h
+++ b/plugins/paintops/curvebrush/kis_curve_paintop.h
@@ -1,60 +1,60 @@
 /*
  *  Copyright (c) 2008-2011 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_CURVEPAINTOP_H_
 #define KIS_CURVEPAINTOP_H_
 
 #include <brushengine/kis_paintop.h>
 #include <kis_types.h>
 #include "curve_brush.h"
 #include "kis_curve_line_option.h"
 #include "kis_curve_paintop_settings.h"
 #include <kis_pressure_opacity_option.h>
 #include "kis_linewidth_option.h"
 #include "kis_curves_opacity_option.h"
 
 class KisPainter;
 
 class KisCurvePaintOp : public KisPaintOp
 {
 
 public:
     KisCurvePaintOp(const KisCurvePaintOpSettings *settings, KisPainter * painter, KisNodeSP node, KisImageSP image);
     virtual ~KisCurvePaintOp();
 
     KisSpacingInformation paintAt(const KisPaintInformation& info);
     void paintLine(const KisPaintInformation &pi1, const KisPaintInformation &pi2, KisDistanceInformation *currentDistance);
 
 private:
     void paintLine(KisPaintDeviceSP dab, const KisPaintInformation &pi1, const KisPaintInformation &pi2);
 
 private:
     KisPaintDeviceSP m_dab;
     KisPaintDeviceSP m_dev;
 
-    CurveProperties m_curveProperties;
+    CurveOption m_curveProperties;
     KisPressureOpacityOption m_opacityOption;
     KisLineWidthOption m_lineWidthOption;
     KisCurvesOpacityOption m_curvesOpacityOption;
 
     QList<QPointF> m_points;
     KisPainter * m_painter;
 
 };
 
 #endif // KIS_CURVEPAINTOP_H_
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp b/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
index 52e27bc653..ed5368e761 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
+++ b/plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
@@ -1,28 +1,189 @@
 /*
  *  Copyright (c) 2008,2009 Lukáš Tvrdý <lukast.dev@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_curve_paintop_settings.h>
 #include <kis_paint_action_type_option.h>
 
+struct KisCurvePaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
 KisCurvePaintOpSettings::KisCurvePaintOpSettings()
+    : m_d(new Private)
+{
+}
+
+KisCurvePaintOpSettings::~KisCurvePaintOpSettings()
 {
 }
 
 bool KisCurvePaintOpSettings::paintIncremental()
 {
     return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
 }
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_curve_line_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "curve_linewidth",
+                    i18n("Line Width"),
+                    this, 0);
+
+            prop->setRange(1, 100);
+            prop->setSingleStep(1);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.curve_line_width);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.curve_line_width = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "curve_historysize",
+                    i18n("History Size"),
+                    this, 0);
+
+            prop->setRange(2, 300);
+            prop->setSingleStep(1);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.curve_stroke_history_size);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.curve_stroke_history_size = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "curve_lineopacity",
+                    i18n("Line Opacity"),
+                    this, 0);
+
+            prop->setRange(0, 100.0);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setSuffix(i18n("%"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.curve_curves_opacity * 100.0);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.curve_curves_opacity = prop->value().toReal() / 100.0;
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "curve_connectionline",
+                    i18n("Connection Line"),
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.curve_paint_connection_line);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    CurveOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.curve_paint_connection_line = prop->value().toBool();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id()) {
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop_settings.h b/plugins/paintops/curvebrush/kis_curve_paintop_settings.h
index 9a81306360..485c9fe35d 100644
--- a/plugins/paintops/curvebrush/kis_curve_paintop_settings.h
+++ b/plugins/paintops/curvebrush/kis_curve_paintop_settings.h
@@ -1,33 +1,40 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2008 Lukas Tvrdy <lukast.dev@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.
  */
 #ifndef KIS_CURVE_PAINTOP_SETTINGS_H_
 #define KIS_CURVE_PAINTOP_SETTINGS_H_
 
+#include <QScopedPointer>
 #include <brushengine/kis_paintop_settings.h>
 
 class KisCurvePaintOpSettings : public KisPaintOpSettings
 {
 
 public:
     KisCurvePaintOpSettings();
-    virtual ~KisCurvePaintOpSettings() {}
+    virtual ~KisCurvePaintOpSettings();
 
     virtual bool paintIncremental();
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 #endif
diff --git a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
index 214dd7f094..9bac6b0410 100644
--- a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
+++ b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
@@ -1,124 +1,131 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_duplicateop_option.h"
 #include <klocalizedstring.h>
 
 #include <QWidget>
 #include <QRadioButton>
 
 #include "ui_wdgduplicateop.h"
 #include <kis_image.h>
 
 class KisDuplicateOpOptionsWidget: public QWidget, public Ui::DuplicateOpOptionsWidget
 {
 public:
     KisDuplicateOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
     }
     KisImageWSP m_image;
 protected:
     void showEvent(QShowEvent* event) {
         QWidget::showEvent(event);
         //cbPerspective->setEnabled(m_image && m_image->perspectiveGrid() && m_image->perspectiveGrid()->countSubGrids() == 1);
         cbPerspective->setVisible(false); // XXX: Until perspective cloning works again!
     }
 };
 
 
 KisDuplicateOpOption::KisDuplicateOpOption()
     : KisPaintOpOption(KisPaintOpOption::COLOR, false)
 {
     setObjectName("KisDuplicateOpOption");
 
     m_checkable = false;
     m_optionWidget = new KisDuplicateOpOptionsWidget();
 
     connect(m_optionWidget->cbHealing, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_optionWidget->cbPerspective, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_optionWidget->cbSourcePoint, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_optionWidget->chkCloneProjection, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_optionWidget);
 }
 
 
 KisDuplicateOpOption::~KisDuplicateOpOption()
 {
 }
 
 bool KisDuplicateOpOption::healing() const
 {
     return m_optionWidget->cbHealing->isChecked();
 }
 
 void KisDuplicateOpOption::setHealing(bool healing)
 {
     m_optionWidget->cbHealing->setChecked(healing);
 }
 
 bool KisDuplicateOpOption::correctPerspective() const
 {
     return m_optionWidget->cbPerspective->isChecked();
 }
 
 void KisDuplicateOpOption::setPerspective(bool perspective)
 {
     m_optionWidget->cbPerspective->setChecked(perspective);
 }
 
 bool KisDuplicateOpOption::moveSourcePoint() const
 {
     return m_optionWidget->cbSourcePoint->isChecked();
 }
 
 void KisDuplicateOpOption::setMoveSourcePoint(bool move)
 {
     m_optionWidget->cbSourcePoint->setChecked(move);
 }
 
 bool KisDuplicateOpOption::cloneFromProjection() const
 {
     return m_optionWidget->chkCloneProjection->isChecked();
 }
 
 void KisDuplicateOpOption::setCloneFromProjection(bool cloneFromProjection)
 {
     m_optionWidget->chkCloneProjection->setChecked(cloneFromProjection);
 }
 
 void KisDuplicateOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
+    DuplicateOption op;
+
     setting->setProperty(DUPLICATE_HEALING, healing());
     setting->setProperty(DUPLICATE_CORRECT_PERSPECTIVE, correctPerspective());
     setting->setProperty(DUPLICATE_MOVE_SOURCE_POINT, moveSourcePoint());
     setting->setProperty(DUPLICATE_CLONE_FROM_PROJECTION, cloneFromProjection());
+
+    op.writeOptionSetting(setting);
 }
 
 void KisDuplicateOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    m_optionWidget->cbHealing->setChecked(setting->getBool(DUPLICATE_HEALING, false));
-    m_optionWidget->cbPerspective->setChecked(setting->getBool(DUPLICATE_CORRECT_PERSPECTIVE, false));
-    m_optionWidget->cbSourcePoint->setChecked(setting->getBool(DUPLICATE_MOVE_SOURCE_POINT, true));
-    m_optionWidget->chkCloneProjection->setChecked(setting->getBool(DUPLICATE_CLONE_FROM_PROJECTION, false));
+    DuplicateOption op;
+    op.readOptionSetting(setting);
+
+    m_optionWidget->cbHealing->setChecked(op.duplicate_healing);
+    m_optionWidget->cbPerspective->setChecked(op.duplicate_correct_perspective);
+    m_optionWidget->cbSourcePoint->setChecked(op.duplicate_move_source_point);
+    m_optionWidget->chkCloneProjection->setChecked(op.duplicate_clone_from_projection);
 }
 
 void KisDuplicateOpOption::setImage(KisImageWSP image)
 {
     m_optionWidget->m_image = image;
 }
diff --git a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
index e0a3a63ac4..f31347ea37 100644
--- a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
+++ b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
@@ -1,61 +1,82 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *
  *  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_DUPLICATEOP_OPTION_H
 #define KIS_DUPLICATEOP_OPTION_H
 
 #include <kis_paintop_option.h>
 
 const QString DUPLICATE_HEALING = "Duplicateop/Healing";
 const QString DUPLICATE_CORRECT_PERSPECTIVE = "Duplicateop/CorrectPerspective";
 const QString DUPLICATE_MOVE_SOURCE_POINT = "Duplicateop/MoveSourcePoint";
 const QString DUPLICATE_CLONE_FROM_PROJECTION = "Duplicateop/CloneFromProjection";
 
 class KisDuplicateOpOptionsWidget;
 
 class KisDuplicateOpOption : public KisPaintOpOption
 {
 public:
     KisDuplicateOpOption();
 
     ~KisDuplicateOpOption();
 private:
     bool healing() const;
     void setHealing(bool healing);
 
     bool correctPerspective() const;
     void setPerspective(bool perspective);
 
     bool moveSourcePoint() const;
     void setMoveSourcePoint(bool move);
 
     bool cloneFromProjection() const;
     void setCloneFromProjection(bool cloneFromProjection);
 public:
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
 
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
     void setImage(KisImageWSP image);
 
 private:
 
     KisDuplicateOpOptionsWidget * m_optionWidget;
 
 };
 
+struct DuplicateOption {
+    bool duplicate_healing;
+    bool duplicate_correct_perspective;
+    bool duplicate_move_source_point;
+    bool duplicate_clone_from_projection;
+
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        duplicate_healing = setting->getBool(DUPLICATE_HEALING, false);
+        duplicate_correct_perspective = setting->getBool(DUPLICATE_CORRECT_PERSPECTIVE, false);
+        duplicate_move_source_point = setting->getBool(DUPLICATE_MOVE_SOURCE_POINT, true);
+        duplicate_clone_from_projection = setting->getBool(DUPLICATE_CLONE_FROM_PROJECTION, false);
+    }
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(DUPLICATE_HEALING, duplicate_healing);
+        setting->setProperty(DUPLICATE_CORRECT_PERSPECTIVE, duplicate_correct_perspective);
+        setting->setProperty(DUPLICATE_MOVE_SOURCE_POINT, duplicate_move_source_point);
+        setting->setProperty(DUPLICATE_CLONE_FROM_PROJECTION, duplicate_clone_from_projection);
+    }
+};
+
 #endif
diff --git a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
index add376f274..c66caeb5a9 100644
--- a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
+++ b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
@@ -1,165 +1,241 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *  Copyright (c) 2004-2008 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2004 Clarence Dang <dang@kde.org>
  *  Copyright (c) 2004 Adrian Page <adrian@pagenet.plus.com>
  *  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.
  */
 
 #include "kis_duplicateop_settings.h"
 #include "kis_duplicateop_option.h"
 #include "kis_duplicateop_settings_widget.h"
 
 #include <QDomElement>
 #include <QDomDocument>
 
 #include <KoPointerEvent.h>
 #include <KoCompositeOpRegistry.h>
 
 #include <kis_image.h>
 #include <kis_brush_option_widget.h>
 #include <kis_paintop_settings_widget.h>
 #include <kis_pressure_darken_option.h>
 #include <kis_pressure_opacity_option.h>
 #include <kis_pressure_size_option.h>
 #include <kis_paint_action_type_option.h>
 #include <kis_dom_utils.h>
 
 KisDuplicateOpSettings::KisDuplicateOpSettings()
     : m_isOffsetNotUptodate(false)
 {
 }
 
 KisDuplicateOpSettings::~KisDuplicateOpSettings()
 {
 }
 
 bool KisDuplicateOpSettings::paintIncremental()
 {
     return false;
 }
 
 QString KisDuplicateOpSettings::indirectPaintingCompositeOp() const
 {
     return COMPOSITE_COPY;
 }
 
 QPointF KisDuplicateOpSettings::offset() const
 {
     return m_offset;
 }
 
 QPointF KisDuplicateOpSettings::position() const
 {
     return m_position;
 }
 
 bool KisDuplicateOpSettings::mousePressEvent(const KisPaintInformation &info, Qt::KeyboardModifiers modifiers, KisNodeWSP currentNode)
 {
     bool ignoreEvent = true;
 
     if (modifiers & Qt::ControlModifier) {
         if (!m_sourceNode || !(modifiers & Qt::AltModifier)) {
             m_sourceNode = currentNode;
         }
         m_position = info.pos();
         m_isOffsetNotUptodate = true;
         ignoreEvent = false;
     }
     else {
         if (m_isOffsetNotUptodate) {
             m_offset = info.pos() - m_position;
             m_isOffsetNotUptodate = false;
         }
         ignoreEvent = true;
     }
 
     return ignoreEvent;
 }
 
 KisNodeWSP KisDuplicateOpSettings::sourceNode() const
 {
     return m_sourceNode;
 }
 
 void KisDuplicateOpSettings::activate()
 {
 }
 
 void KisDuplicateOpSettings::fromXML(const QDomElement& elt)
 {
     // First, call the parent class fromXML to make sure all the
     // properties are saved to the map
     KisPaintOpSettings::fromXML(elt);
 
     m_offset.setX(KisDomUtils::toDouble(elt.attribute("OffsetX", "0.0")));
     m_offset.setY(KisDomUtils::toDouble(elt.attribute("OffsetY", "0.0")));
     m_isOffsetNotUptodate = false;
 }
 
 void KisDuplicateOpSettings::toXML(QDomDocument& doc, QDomElement& rootElt) const
 {
     // Then call the parent class fromXML
     KisPropertiesConfiguration::toXML(doc, rootElt);
 
     rootElt.setAttribute("OffsetX", QString::number(m_offset.x()));
     rootElt.setAttribute("OffsetY", QString::number(m_offset.y()));
 }
 
 
 KisPaintOpSettingsSP KisDuplicateOpSettings::clone() const
 {
     KisPaintOpSettingsSP setting = KisBrushBasedPaintOpSettings::clone();
     KisDuplicateOpSettings* s = dynamic_cast<KisDuplicateOpSettings*>(setting.data());
     s->m_offset = m_offset;
     s->m_isOffsetNotUptodate = m_isOffsetNotUptodate;
     s->m_position = m_position;
 
     return setting;
 }
 
 QPainterPath KisDuplicateOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     QPainterPath path;
 
     // clone tool should always show an outline
     path = KisBrushBasedPaintOpSettings::brushOutlineImpl(info, mode, 1.0, true);
 
     QPainterPath copy(path);
     QRectF rect2 = copy.boundingRect();
     if (m_isOffsetNotUptodate || !getBool(DUPLICATE_MOVE_SOURCE_POINT)) {
         copy.translate(m_position - info.pos());
     }
     else {
         copy.translate(-m_offset);
     }
 
     path.addPath(copy);
 
     qreal dx = rect2.width() / 4.0;
     qreal dy = rect2.height() / 4.0;
     rect2.adjust(dx, dy, -dx, -dy);
 
     path.moveTo(rect2.topLeft());
     path.lineTo(rect2.bottomRight());
 
     path.moveTo(rect2.topRight());
     path.lineTo(rect2.bottomLeft());
 
     return path;
 }
 
+
+#include <brushengine/kis_uniform_paintop_property.h>
+#include <brushengine/kis_callback_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_duplicateop_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisDuplicateOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "clone_healing",
+                    i18n("Healing"),
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DuplicateOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.duplicate_healing);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DuplicateOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.duplicate_healing = prop->value().toBool();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "clone_movesource",
+                    i18n("Move Source"),
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DuplicateOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.duplicate_move_source_point);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DuplicateOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.duplicate_move_source_point = prop->value().toBool();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    return KisPaintOpSettings::uniformProperties() + props;
+}
+
+
diff --git a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
index 7ee846d5ee..f4a15e2292 100644
--- a/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
+++ b/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
@@ -1,66 +1,69 @@
 /*
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
  *  Copyright (c) 2004-2008 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2004 Clarence Dang <dang@kde.org>
  *  Copyright (c) 2004 Adrian Page <adrian@pagenet.plus.com>
  *  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_DUPLICATEOP_SETTINGS_H_
 #define KIS_DUPLICATEOP_SETTINGS_H_
 
 #include <kis_brush_based_paintop_settings.h>
 #include <kis_types.h>
 #include <QPointF>
 
 class QDomElement;
 class KisDuplicateOpSettings : public KisBrushBasedPaintOpSettings
 {
 
 public:
     using KisPaintOpSettings::fromXML;
     using KisPaintOpSettings::toXML;
 
     KisDuplicateOpSettings();
 
     virtual ~KisDuplicateOpSettings();
     bool paintIncremental();
     QString indirectPaintingCompositeOp() const;
 
     QPointF offset() const;
     QPointF position() const;
     virtual bool mousePressEvent(const KisPaintInformation& pos, Qt::KeyboardModifiers modifiers, KisNodeWSP currentNode);
     void activate();
 
     void fromXML(const QDomElement& elt);
     void toXML(QDomDocument& doc, QDomElement& rootElt) const;
 
     KisPaintOpSettingsSP clone() const;
     QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
 
     KisNodeWSP sourceNode() const;
 
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
 public:
 
     QPointF m_offset;
     bool m_isOffsetNotUptodate;
     QPointF m_position; // Give the position of the last alt-click
     KisNodeWSP m_sourceNode;
+    QList<KisUniformPaintOpPropertyWSP> m_uniformProperties;
 };
 
 
 #endif // KIS_DUPLICATEOP_SETTINGS_H_
diff --git a/plugins/paintops/deform/deform_brush.cpp b/plugins/paintops/deform/deform_brush.cpp
index c25c432754..569c720df9 100644
--- a/plugins/paintops/deform/deform_brush.cpp
+++ b/plugins/paintops/deform/deform_brush.cpp
@@ -1,294 +1,294 @@
 /*
  *  Copyright (c) 2008,2010 Lukáš Tvrdý <lukast.dev@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 "deform_brush.h"
 #include "kis_painter.h"
 
 #include "kis_fixed_paint_device.h"
 
 #include <KoColor.h>
 #include <KoColorSpace.h>
 
 #include <QRect>
 
 #include <kis_types.h>
 #include <kis_iterator_ng.h>
 #include <kis_cross_device_color_picker.h>
 
 #include <cmath>
 #include <ctime>
 #include <KoColorSpaceRegistry.h>
 
 const qreal degToRad = M_PI / 180.0;
 
 
 DeformBrush::DeformBrush()
 {
     m_firstPaint = false;
     m_counter = 1;
     m_deformAction = 0;
 }
 
 DeformBrush::~DeformBrush()
 {
     delete m_deformAction;
 }
 
 void DeformBrush::initDeformAction()
 {
-    DeformModes mode = DeformModes(m_properties->action - 1);
+    DeformModes mode = DeformModes(m_properties->deform_action - 1);
 
     switch (mode) {
     case GROW:
     case SHRINK: {
         m_deformAction = new DeformScale();
         break;
     }
     case SWIRL_CW:
     case SWIRL_CCW: {
         m_deformAction = new DeformRotation();
         break;
     }
 
     case MOVE: {
         m_deformAction = new DeformMove();
-        static_cast<DeformMove*>(m_deformAction)->setFactor(m_properties->deformAmount);
+        static_cast<DeformMove*>(m_deformAction)->setFactor(m_properties->deform_amount);
         break;
     }
     case LENS_IN:
     case LENS_OUT: {
         m_deformAction = new DeformLens();
-        static_cast<DeformLens*>(m_deformAction)->setLensFactor(m_properties->deformAmount, 0.0);
+        static_cast<DeformLens*>(m_deformAction)->setLensFactor(m_properties->deform_amount, 0.0);
         static_cast<DeformLens*>(m_deformAction)->setMode(mode == LENS_OUT);
         break;
     }
     case DEFORM_COLOR: {
         m_deformAction = new DeformColor();
-        static_cast<DeformColor*>(m_deformAction)->setFactor(m_properties->deformAmount);
+        static_cast<DeformColor*>(m_deformAction)->setFactor(m_properties->deform_amount);
         break;
     }
     default: {
         m_deformAction = new DeformBase();
         break;
     }
     }
 }
 
 bool DeformBrush::setupAction(
     DeformModes mode, const QPointF& pos, QTransform const& rotation)
 {
 
     switch (mode) {
     case GROW:
     case SHRINK: {
         // grow or shrink, the sign decide
         qreal sign = (mode == GROW) ? 1.0 : -1.0;
         qreal factor;
-        if (m_properties->useCounter) {
+        if (m_properties->deform_use_counter) {
             factor = (1.0 + sign * (m_counter * m_counter / 100.0));
         }
         else {
-            factor = (1.0 + sign * (m_properties->deformAmount));
+            factor = (1.0 + sign * (m_properties->deform_amount));
         }
         dynamic_cast<DeformScale*>(m_deformAction)->setFactor(factor);
         break;
     }
     case SWIRL_CW:
     case SWIRL_CCW: {
         // CW or CCW, the sign decide
         qreal sign = (mode == SWIRL_CW) ? 1.0 : -1.0;
         qreal factor;
-        if (m_properties->useCounter) {
+        if (m_properties->deform_use_counter) {
             factor = m_counter * sign * degToRad;
         }
         else {
-            factor = (360 * m_properties->deformAmount * 0.5) * sign * degToRad;
+            factor = (360 * m_properties->deform_amount * 0.5) * sign * degToRad;
         }
         dynamic_cast<DeformRotation*>(m_deformAction)->setAlpha(factor);
         break;
     }
     case MOVE: {
         if (m_firstPaint == false) {
             m_prevX = pos.x();
             m_prevY = pos.y();
             static_cast<DeformMove*>(m_deformAction)->setDistance(0.0, 0.0);
             m_firstPaint = true;
             return false;
         }
         else {
             qreal xDistance = pos.x() - m_prevX;
             qreal yDistance = pos.y() - m_prevY;
             rotation.map(xDistance, yDistance, &xDistance, &yDistance);
             static_cast<DeformMove*>(m_deformAction)->setDistance(xDistance, yDistance);
             m_prevX = pos.x();
             m_prevY = pos.y();
         }
         break;
     }
     case LENS_IN:
     case LENS_OUT: {
-        static_cast<DeformLens*>(m_deformAction)->setMaxDistance(m_sizeProperties->diameter * 0.5, m_sizeProperties->diameter * 0.5);
+        static_cast<DeformLens*>(m_deformAction)->setMaxDistance(m_sizeProperties->brush_diameter * 0.5, m_sizeProperties->brush_diameter * 0.5);
         break;
     }
     case DEFORM_COLOR: {
         // no run-time setup
         break;
     }
     default: {
         break;
     }
     }
     return true;
 }
 
 KisFixedPaintDeviceSP DeformBrush::paintMask(KisFixedPaintDeviceSP dab,
         KisPaintDeviceSP layer,
         qreal scale,
         qreal rotation,
         QPointF pos, qreal subPixelX, qreal subPixelY, int dabX, int dabY)
 {
     KisFixedPaintDeviceSP mask = new KisFixedPaintDevice(KoColorSpaceRegistry::instance()->alpha8());
     KisCrossDeviceColorPicker colorPicker(layer, dab);
 
     qreal fWidth = maskWidth(scale);
     qreal fHeight = maskHeight(scale);
 
     int dstWidth =  qRound(m_maskRect.width());
     int dstHeight = qRound(m_maskRect.height());
 
     // clear
     if (dab->bounds().width() != dstWidth || dab->bounds().height() != dstHeight) {
         dab->setRect(m_maskRect.toRect());
         dab->initialize();
     }
     else {
         dab->clear(m_maskRect.toRect());
     }
 
     qreal const centerX = dstWidth  * 0.5  + subPixelX;
     qreal const centerY = dstHeight * 0.5  + subPixelY;
 
     qreal const majorAxis = 2.0 / fWidth;
     qreal const minorAxis = 2.0 / fHeight;
 
     qreal distance;
 
     QTransform forwardRotationMatrix;
     forwardRotationMatrix.rotateRadians(-rotation);
     QTransform reverseRotationMatrix;
     reverseRotationMatrix.rotateRadians(rotation);
 
     // if can't paint, stop
-    if (!setupAction(DeformModes(m_properties->action - 1),
+    if (!setupAction(DeformModes(m_properties->deform_action - 1),
                      pos, forwardRotationMatrix))
     {
         return 0;
     }
 
     mask->setRect(dab->bounds());
     mask->initialize();
     quint8* maskPointer = mask->data();
     qint8 maskPixelSize = mask->pixelSize();
 
     quint8* dabPointer = dab->data();
     int dabPixelSize = dab->colorSpace()->pixelSize();
 
     for (int y = 0; y <  dstHeight; y++) {
         for (int x = 0; x < dstWidth; x++) {
             qreal maskX = x - centerX;
             qreal maskY = y - centerY;
             forwardRotationMatrix.map(maskX, maskY, &maskX, &maskY);
             distance = norme(maskX * majorAxis, maskY * minorAxis);
 
             if (distance > 1.0) {
                 // leave there OPACITY TRANSPARENT pixel (default pixel)
 
                 colorPicker.pickOldColor(x + dabX, y + dabY, dabPointer);
                 dabPointer += dabPixelSize;
 
                 *maskPointer = OPACITY_TRANSPARENT_U8;
                 maskPointer += maskPixelSize;
                 continue;
             }
 
-            if (m_sizeProperties->density != 1.0) {
-                if (m_sizeProperties->density < drand48()) {
+            if (m_sizeProperties->brush_density != 1.0) {
+                if (m_sizeProperties->brush_density < drand48()) {
                     dabPointer += dabPixelSize;
                     *maskPointer = OPACITY_TRANSPARENT_U8;
                     maskPointer += maskPixelSize;
                     continue;
                 }
             }
 
             m_deformAction->transform(&maskX, &maskY, distance);
             reverseRotationMatrix.map(maskX, maskY, &maskX, &maskY);
 
             maskX += pos.x();
             maskY += pos.y();
 
-            if (!m_properties->useBilinear) {
+            if (!m_properties->deform_use_bilinear) {
                 maskX = qRound(maskX);
                 maskY = qRound(maskY);
             }
 
-            if (m_properties->useOldData) {
+            if (m_properties->deform_use_old_data) {
                 colorPicker.pickOldColor(maskX, maskY, dabPointer);
             }
             else {
                 colorPicker.pickColor(maskX, maskY, dabPointer);
             }
 
             dabPointer += dabPixelSize;
 
             *maskPointer = OPACITY_OPAQUE_U8;
             maskPointer += maskPixelSize;
 
         }
     }
     m_counter++;
 
     return mask;
 
 }
 
 void DeformBrush::debugColor(const quint8* data, KoColorSpace * cs)
 {
     QColor rgbcolor;
     cs->toQColor(data, &rgbcolor);
     dbgPlugins << "RGBA: ("
                << rgbcolor.red()
                << ", " << rgbcolor.green()
                << ", " << rgbcolor.blue()
                << ", " << rgbcolor.alpha() << ")";
 }
 
 QPointF DeformBrush::hotSpot(qreal scale, qreal rotation)
 {
     qreal fWidth = maskWidth(scale);
     qreal fHeight = maskHeight(scale);
 
     QTransform m;
     m.reset();
     m.rotateRadians(rotation);
 
     m_maskRect = QRect(0, 0, fWidth, fHeight);
     m_maskRect.translate(-m_maskRect.center());
     m_maskRect = m.mapRect(m_maskRect);
     m_maskRect.translate(-m_maskRect.topLeft());
     return m_maskRect.center();
 }
diff --git a/plugins/paintops/deform/deform_brush.h b/plugins/paintops/deform/deform_brush.h
index e856517b6f..8ef4139360 100644
--- a/plugins/paintops/deform/deform_brush.h
+++ b/plugins/paintops/deform/deform_brush.h
@@ -1,251 +1,252 @@
 /*
  *  Copyright (c) 2008, 2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef _DEFORM_BRUSH_H_
 #define _DEFORM_BRUSH_H_
 
 #include <kis_paint_device.h>
 #include <brushengine/kis_paint_information.h>
 
 #include <kis_brush_size_option.h>
+#include <kis_deform_option.h>
 
 #include <time.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 #define srand48 srand
 inline double drand48()
 {
     return double(rand()) / RAND_MAX;
 }
 #endif
 
 enum DeformModes {GROW, SHRINK, SWIRL_CW, SWIRL_CCW, MOVE, LENS_IN, LENS_OUT, DEFORM_COLOR};
 
 class DeformProperties
 {
 public:
     int action;
     qreal deformAmount;
     bool useBilinear;
     bool useCounter;
     bool useOldData;
 };
 
 
 class DeformBase
 {
 public:
     DeformBase() {}
     virtual ~DeformBase() {}
     virtual void transform(qreal * x, qreal * y, qreal distance) {
         Q_UNUSED(x);
         Q_UNUSED(y);
         Q_UNUSED(distance);
     }
 };
 
 /// Inverse weighted inverse scaling - grow&shrink
 class DeformScale : public DeformBase
 {
 
 public:
     void setFactor(qreal factor) {
         m_factor = factor;
     }
     qreal factor() {
         return m_factor;
     }
     virtual void transform(qreal* x, qreal* y, qreal distance) {
         qreal scaleFactor = (1.0 - distance) * m_factor + distance;
         *x = *x / scaleFactor;
         *y = *y / scaleFactor;
     }
 
 private:
     qreal m_factor;
 };
 
 /// Inverse weighted rotation - swirlCW&&swirlCWW
 class DeformRotation : public DeformBase
 {
 
 public:
     void setAlpha(qreal alpha) {
         m_alpha = alpha;
     }
     virtual void transform(qreal* maskX, qreal* maskY, qreal distance) {
         distance = 1.0 - distance;
         qreal rotX = cos(-m_alpha * distance) * (*maskX) - sin(-m_alpha * distance) * (*maskY);
         qreal rotY = sin(-m_alpha * distance) * (*maskX) + cos(-m_alpha * distance) * (*maskY);
 
         *maskX = rotX;
         *maskY = rotY;
     }
 
 private:
     qreal m_alpha;
 };
 
 /// Inverse move
 class DeformMove : public DeformBase
 {
 public:
     void setFactor(qreal factor) {
         m_factor = factor;
     }
     void setDistance(qreal dx, qreal dy) {
         m_dx = dx;
         m_dy = dy;
     }
     virtual void transform(qreal* maskX, qreal* maskY, qreal distance) {
         *maskX -= m_dx * m_factor * (1.0 - distance);
         *maskY -= m_dy * m_factor * (1.0 - distance);
     }
 
 private:
     qreal m_dx;
     qreal m_dy;
     qreal m_factor;
 };
 
 /// Inverse lens distortion
 class DeformLens : public DeformBase
 {
 public:
     void setLensFactor(qreal k1, qreal k2) {
         m_k1 = k1;
         m_k2 = k2;
     }
     void setMaxDistance(qreal maxX, qreal maxY) {
         m_maxX = maxX;
         m_maxY = maxY;
     }
     void setMode(bool out) {
         m_out = out;
     }
 
     virtual void transform(qreal* maskX, qreal* maskY, qreal distance) {
         Q_UNUSED(distance);
         //normalize
         qreal normX = *maskX / m_maxX;
         qreal normY = *maskY / m_maxY;
 
         qreal radius_2 = normX * normX  + normY * normY;
         qreal radius_4 = radius_2 * radius_2;
 
         if (m_out) {
             *maskX = normX * (1.0 + m_k1 * radius_2 + m_k2 * radius_4);
             *maskY = normY * (1.0 + m_k1 * radius_2 + m_k2 * radius_4);
         }
         else {
             *maskX = normX / (1.0 + m_k1 * radius_2 + m_k2 * radius_4);
             *maskY = normY / (1.0 + m_k1 * radius_2 + m_k2 * radius_4);
         }
 
         *maskX = m_maxX * (*maskX);
         *maskY = m_maxY * (*maskY);
     }
 
 private:
     qreal m_k1, m_k2;
     qreal m_maxX, m_maxY;
     bool m_out;
 };
 
 /// Randomly disturb the pixels
 class DeformColor : public DeformBase
 {
 public:
     DeformColor() {
         srand48(time(0));
     }
 
     void setFactor(qreal factor) {
         m_factor = factor;
     }
     virtual void transform(qreal* x, qreal* y, qreal distance) {
         Q_UNUSED(distance);
         qreal randomX = m_factor * ((drand48() * 2.0) - 1.0);
         qreal randomY = m_factor * ((drand48() * 2.0) - 1.0);
         *x += randomX;
         *y += randomY;
     }
 
 private:
     qreal m_factor;
 };
 
 
 
 
 
 class DeformBrush
 {
 
 public:
     DeformBrush();
     ~DeformBrush();
 
     KisFixedPaintDeviceSP paintMask(KisFixedPaintDeviceSP dab, KisPaintDeviceSP layer,
                                     qreal scale, qreal rotation, QPointF pos,
                                     qreal subPixelX, qreal subPixelY, int dabX, int dabY);
 
-    void setSizeProperties(KisBrushSizeProperties * properties) {
+    void setSizeProperties(BrushSizeOption * properties) {
         m_sizeProperties = properties;
     }
-    void setProperties(DeformProperties * properties) {
+    void setProperties(DeformOption * properties) {
         m_properties = properties;
     }
     void initDeformAction();
     QPointF hotSpot(qreal scale, qreal rotation);
 
 private:
     // return true if can paint
     bool setupAction(
         DeformModes mode, const QPointF& pos, QTransform const& rotation);
     void debugColor(const quint8* data, KoColorSpace * cs);
 
     qreal maskWidth(qreal scale) {
-        return m_sizeProperties->diameter * scale;
+        return m_sizeProperties->brush_diameter * scale;
     }
 
     qreal maskHeight(qreal scale) {
-        return m_sizeProperties->diameter * m_sizeProperties->aspect  * scale;
+        return m_sizeProperties->brush_diameter * m_sizeProperties->brush_aspect  * scale;
     }
 
     inline qreal norme(qreal x, qreal y) {
         return x * x + y * y;
     }
 
 
 private:
     KisRandomSubAccessorSP m_srcAcc;
     bool m_firstPaint;
     qreal m_prevX, m_prevY;
     int m_counter;
 
     QRectF m_maskRect;
 
     DeformBase * m_deformAction;
 
-    DeformProperties * m_properties;
-    KisBrushSizeProperties * m_sizeProperties;
+    DeformOption * m_properties;
+    BrushSizeOption * m_sizeProperties;
 };
 
 
 #endif
diff --git a/plugins/paintops/deform/kis_brush_size_option.cpp b/plugins/paintops/deform/kis_brush_size_option.cpp
index 183aa97456..6a6c4afa99 100644
--- a/plugins/paintops/deform/kis_brush_size_option.cpp
+++ b/plugins/paintops/deform/kis_brush_size_option.cpp
@@ -1,147 +1,154 @@
 /*
  *  Copyright (c) 2009,2010 Lukáš Tvrdý <lukast.dev@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_brush_size_option.h"
 #include <klocalizedstring.h>
 
 #include <QWidget>
 #include <QRadioButton>
 
 #include "ui_wdgBrushSizeOptions.h"
 
 class KisBrushSizeOptionsWidget: public QWidget, public Ui::WdgBrushSizeOptions
 {
 public:
     KisBrushSizeOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
     }
 
 };
 
 
 KisBrushSizeOption::KisBrushSizeOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisBrushSizeOption");
 
     m_checkable = false;
     m_options = new KisBrushSizeOptionsWidget();
 
 
     // init slider values
     m_options->diameter->setRange(1.0, 1000, 0);
     m_options->diameter->setValue(20);
     m_options->diameter->setExponentRatio(3.0);
     m_options->diameter->setSuffix(i18n(" px"));
 
     m_options->aspectBox->setRange(0.01, 2.0, 2);
     m_options->aspectBox->setValue(1.0);
     m_options->aspectBox->setExponentRatio(1.0);
 
 
     m_options->scale->setRange(0.01, 10.0, 2);
     m_options->scale->setValue(1.0);
 
     m_options->spacing->setRange(0.01, 5.0, 2);
     m_options->spacing->setValue(0.3);
 
 
     m_options->rotationBox->setRange(0.0, 360.0, 0);
     m_options->rotationBox->setValue(0.0);
     m_options->rotationBox->setSuffix(QChar(Qt::Key_degree));
 
 
     m_options->densityBox->setRange(0.0, 100.0, 0);
     m_options->densityBox->setValue(100);
     m_options->densityBox->setSuffix("%");
 
 
     m_options->jitterMove->setRange(0.0, 5.0, 2);
     m_options->jitterMove->setValue(0.0);
 
     connect(m_options->diameter, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->scale, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->aspectBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->spacing, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->rotationBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->densityBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->jitterMove, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->jitterMoveBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
 
     connect(m_options->jitterMoveBox, SIGNAL(toggled(bool)), m_options->jitterMove, SLOT(setEnabled(bool)));
     setConfigurationPage(m_options);
 }
 
 KisBrushSizeOption::~KisBrushSizeOption()
 {
     delete m_options;
 }
 
 
 int KisBrushSizeOption::diameter() const
 {
     return qRound(m_options->diameter->value());
 }
 
 
 void KisBrushSizeOption::setDiameter(int diameter)
 {
     m_options->diameter->setValue(diameter);
 }
 
 qreal KisBrushSizeOption::brushAspect() const
 {
     return m_options->aspectBox->value();
 }
 
 
 void KisBrushSizeOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(BRUSH_DIAMETER, m_options->diameter->value());
-    setting->setProperty(BRUSH_ASPECT, m_options->aspectBox->value());
-    setting->setProperty(BRUSH_ROTATION, m_options->rotationBox->value());
-    setting->setProperty(BRUSH_SCALE, m_options->scale->value());
-    setting->setProperty(BRUSH_SPACING, m_options->spacing->value());
-    setting->setProperty(BRUSH_DENSITY, m_options->densityBox->value());
-    setting->setProperty(BRUSH_JITTER_MOVEMENT, m_options->jitterMove->value());
-    setting->setProperty(BRUSH_JITTER_MOVEMENT_ENABLED, m_options->jitterMoveBox->isChecked());
+    BrushSizeOption op;
+
+    op.brush_diameter = m_options->diameter->value();
+    op.brush_aspect = m_options->aspectBox->value();
+    op.brush_rotation = m_options->rotationBox->value();
+    op.brush_scale = m_options->scale->value();
+    op.brush_spacing = m_options->spacing->value();
+    op.brush_density = m_options->densityBox->value() / 100.0;
+    op.brush_jitter_movement = m_options->jitterMove->value();
+    op.brush_jitter_movement_enabled = m_options->jitterMoveBox->isChecked();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisBrushSizeOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    m_options->diameter->setValue(setting->getDouble(BRUSH_DIAMETER));
-    m_options->aspectBox->setValue(setting->getDouble(BRUSH_ASPECT));
-    m_options->rotationBox->setValue(setting->getDouble(BRUSH_ROTATION));
-    m_options->scale->setValue(setting->getDouble(BRUSH_SCALE));
-    m_options->spacing->setValue(setting->getDouble(BRUSH_SPACING));
-    m_options->densityBox->setValue(setting->getDouble(BRUSH_DENSITY));
-    m_options->jitterMove->setValue(setting->getDouble(BRUSH_JITTER_MOVEMENT));
-    m_options->jitterMoveBox->setChecked(setting->getBool(BRUSH_JITTER_MOVEMENT_ENABLED));
+    BrushSizeOption op;
+    op.readOptionSetting(setting);
+
+    m_options->diameter->setValue(op.brush_diameter);
+    m_options->aspectBox->setValue(op.brush_aspect);
+    m_options->rotationBox->setValue(op.brush_rotation);
+    m_options->scale->setValue(op.brush_scale);
+    m_options->spacing->setValue(op.brush_spacing);
+    m_options->densityBox->setValue(op.brush_density * 100.0);
+    m_options->jitterMove->setValue(op.brush_jitter_movement);
+    m_options->jitterMoveBox->setChecked(op.brush_jitter_movement_enabled);
 
 }
 
 void KisBrushSizeOption::setSpacing(qreal spacing)
 {
     m_options->spacing->setValue(spacing);
 }
 
 qreal KisBrushSizeOption::spacing() const
 {
     return m_options->spacing->value();
 }
 
diff --git a/plugins/paintops/deform/kis_brush_size_option.h b/plugins/paintops/deform/kis_brush_size_option.h
index 3727dc205d..62cd3f2855 100644
--- a/plugins/paintops/deform/kis_brush_size_option.h
+++ b/plugins/paintops/deform/kis_brush_size_option.h
@@ -1,95 +1,97 @@
 /*
  *  Copyright (c) 2009,2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_SIZE_OPTION_H_
 #define KIS_SIZE_OPTION_H_
 
 #include <cmath>
 #include <QtGlobal>
 
 #include <kis_paintop_option.h>
 
 class KisBrushSizeOptionsWidget;
 
 const QString BRUSH_SHAPE = "Brush/shape";
 const QString BRUSH_DIAMETER = "Brush/diameter";
 const QString BRUSH_ASPECT = "Brush/aspect";
 const QString BRUSH_SCALE = "Brush/scale";
 const QString BRUSH_ROTATION = "Brush/rotation";
 const QString BRUSH_SPACING = "Brush/spacing";
 const QString BRUSH_DENSITY = "Brush/density";
 const QString BRUSH_JITTER_MOVEMENT = "Brush/jitterMovement";
 const QString BRUSH_JITTER_MOVEMENT_ENABLED = "Brush/jitterMovementEnabled";
 
 class KisBrushSizeOption : public KisPaintOpOption
 {
 public:
     KisBrushSizeOption();
     ~KisBrushSizeOption();
 
     int diameter() const;
     void setDiameter(int diameter);
 
     void setSpacing(qreal spacing);
     qreal spacing() const;
 
     qreal brushAspect() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
 private:
     KisBrushSizeOptionsWidget * m_options;
 };
 
-class KisBrushSizeProperties
+class BrushSizeOption
 {
 
 public:
-    quint16 shape;
-    quint16 diameter;
-    qreal aspect;
-    qreal scale;
-    qreal rotation;
-    qreal spacing;
-    qreal density;
-
-    qreal jitterMovementAmount;
-    bool jitterEnabled;
+    qreal brush_diameter;
+    qreal brush_aspect;
+    qreal brush_rotation;
+    qreal brush_scale;
+    qreal brush_spacing;
+    qreal brush_density;
+    qreal brush_jitter_movement;
+    bool brush_jitter_movement_enabled;
 
 public:
-    void readOptionSetting(const KisPropertiesConfiguration * settings) {
-        //TODO: shape
-        shape = 0;
-        diameter = quint16(settings->getDouble(BRUSH_DIAMETER));
-        aspect = settings->getDouble(BRUSH_ASPECT);
-        rotation = settings->getDouble(BRUSH_ROTATION) * (M_PI / 180.0);
-        scale = settings->getDouble(BRUSH_SCALE);
-        density = settings->getDouble(BRUSH_DENSITY) * 0.01;
-        spacing = settings->getDouble(BRUSH_SPACING);
-        
-        if ((jitterEnabled = settings->getBool(BRUSH_JITTER_MOVEMENT_ENABLED))) {
-            jitterMovementAmount = settings->getDouble(BRUSH_JITTER_MOVEMENT);
-        }
-        else {
-            jitterMovementAmount = 0.0;
-        }
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        brush_diameter = setting->getDouble(BRUSH_DIAMETER);
+        brush_aspect = setting->getDouble(BRUSH_ASPECT);
+        brush_rotation = setting->getDouble(BRUSH_ROTATION);
+        brush_scale = setting->getDouble(BRUSH_SCALE);
+        brush_spacing = setting->getDouble(BRUSH_SPACING);
+        brush_density = setting->getDouble(BRUSH_DENSITY);
+        brush_jitter_movement = setting->getDouble(BRUSH_JITTER_MOVEMENT);
+        brush_jitter_movement_enabled = setting->getBool(BRUSH_JITTER_MOVEMENT_ENABLED);
+    }
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(BRUSH_DIAMETER, brush_diameter);
+        setting->setProperty(BRUSH_ASPECT, brush_aspect);
+        setting->setProperty(BRUSH_ROTATION, brush_rotation);
+        setting->setProperty(BRUSH_SCALE, brush_scale);
+        setting->setProperty(BRUSH_SPACING, brush_spacing);
+        setting->setProperty(BRUSH_DENSITY, brush_density);
+        setting->setProperty(BRUSH_JITTER_MOVEMENT, brush_jitter_movement);
+        setting->setProperty(BRUSH_JITTER_MOVEMENT_ENABLED, brush_jitter_movement_enabled);
     }
 };
 
 
 #endif
diff --git a/plugins/paintops/deform/kis_deform_option.cpp b/plugins/paintops/deform/kis_deform_option.cpp
index 037ec04f1c..dd17a0098f 100644
--- a/plugins/paintops/deform/kis_deform_option.cpp
+++ b/plugins/paintops/deform/kis_deform_option.cpp
@@ -1,146 +1,154 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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_deform_option.h"
 #include "ui_wdgdeformoptions.h"
 
 #include <brushengine/kis_paintop_lod_limitations.h>
 
 
 class KisDeformOptionsWidget: public QWidget, public Ui::WdgDeformOptions
 {
 public:
     KisDeformOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
 
         deformAmount->setRange(0.0, 1.0, 2);
         deformAmount->setValue(0.20);
     }
 };
 
 KisDeformOption::KisDeformOption()
     : KisPaintOpOption(KisPaintOpOption::COLOR, false)
 {
     setObjectName("KisDeformOption");
 
     m_checkable = false;
     m_options = new KisDeformOptionsWidget();
 
     connect(m_options->deformAmount, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->interpolationChBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->useCounter, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->useOldData, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
 
     connect(m_options->growBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->shrinkBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->swirlCWBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->swirlCCWBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->moveBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->lensBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->lensOutBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->colorBtn, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 }
 
 KisDeformOption::~KisDeformOption()
 {
     delete m_options;
 }
 
-void  KisDeformOption::readOptionSetting(const KisPropertiesConfiguration * config)
+void  KisDeformOption::readOptionSetting(const KisPropertiesConfiguration * setting)
 {
-    m_options->deformAmount->setValue(config->getDouble(DEFORM_AMOUNT));
-    m_options->interpolationChBox->setChecked(config->getBool(DEFORM_USE_BILINEAR));
-    m_options->useCounter->setChecked(config->getBool(DEFORM_USE_COUNTER));
-    m_options->useOldData->setChecked(config->getBool(DEFORM_USE_OLD_DATA));
+    DeformOption op;
+    op.readOptionSetting(setting);
 
-    int deformAction = config->getInt(DEFORM_ACTION);
+
+    m_options->deformAmount->setValue(op.deform_amount);
+    m_options->interpolationChBox->setChecked(op.deform_use_bilinear);
+    m_options->useCounter->setChecked(op.deform_use_counter);
+    m_options->useOldData->setChecked(op.deform_use_old_data);
+
+    int deformAction = op.deform_action;
     if (deformAction == 1) {
         m_options->growBtn->setChecked(true);
     }
     else if (deformAction == 2) {
         m_options->shrinkBtn->setChecked(true);
     }
     else if (deformAction == 3) {
         m_options->swirlCWBtn->setChecked(true);
     }
     else if (deformAction == 4) {
         m_options->swirlCCWBtn->setChecked(true);
     }
     else if (deformAction == 5) {
         m_options->moveBtn->setChecked(true);
     }
     else if (deformAction == 6) {
         m_options->lensBtn->setChecked(true);
     }
     else if (deformAction == 7) {
         m_options->lensOutBtn->setChecked(true);
     }
     else if (deformAction == 8) {
         m_options->colorBtn->setChecked(true);
     }
 }
 
 
-void KisDeformOption::writeOptionSetting(KisPropertiesConfiguration* config) const
+void KisDeformOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    config->setProperty(DEFORM_AMOUNT, m_options->deformAmount->value());
-    config->setProperty(DEFORM_ACTION, deformAction());
-    config->setProperty(DEFORM_USE_BILINEAR, m_options->interpolationChBox->isChecked());
-    config->setProperty(DEFORM_USE_COUNTER, m_options->useCounter->isChecked());
-    config->setProperty(DEFORM_USE_OLD_DATA, m_options->useOldData->isChecked());
+    DeformOption op;
+
+    op.deform_amount = m_options->deformAmount->value();
+    op.deform_action = deformAction();
+    op.deform_use_bilinear = m_options->interpolationChBox->isChecked();
+    op.deform_use_counter = m_options->useCounter->isChecked();
+    op.deform_use_old_data = m_options->useOldData->isChecked();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisDeformOption::lodLimitations(KisPaintopLodLimitations *l) const
 {
     l->blockers << KoID("deform-brush", i18nc("PaintOp instant preview limitation", "Deform Brush (unsupported)"));
 }
 
 int  KisDeformOption::deformAction() const
 {
     //TODO: make it nicer using enums or something
     if (m_options->growBtn->isChecked()) {
         return 1;
     }
     else if (m_options->shrinkBtn->isChecked()) {
         return 2;
     }
     else if (m_options->swirlCWBtn->isChecked()) {
         return 3;
     }
     else if (m_options->swirlCCWBtn->isChecked()) {
         return 4;
     }
     else if (m_options->moveBtn->isChecked()) {
         return 5;
     }
     else if (m_options->lensBtn->isChecked()) {
         return 6;
     }
     else if (m_options->lensOutBtn->isChecked()) {
         return 7;
     }
     else if (m_options->colorBtn->isChecked()) {
         return 8;
     }
     else {
         return -1;
     }
 }
 
diff --git a/plugins/paintops/deform/kis_deform_option.h b/plugins/paintops/deform/kis_deform_option.h
index d5bc30a0f3..af901f36e9 100644
--- a/plugins/paintops/deform/kis_deform_option.h
+++ b/plugins/paintops/deform/kis_deform_option.h
@@ -1,56 +1,81 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_DEFORM_OPTION_H
 #define KIS_DEFORM_OPTION_H
 
 #include <kis_paintop_option.h>
 
 class KisDeformOptionsWidget;
 class KisPaintopLodLimitations;
 
 const QString DEFORM_AMOUNT = "Deform/deformAmount";
 const QString DEFORM_ACTION = "Deform/deformAction";
 const QString DEFORM_USE_BILINEAR = "Deform/bilinear";
 const QString DEFORM_USE_MOVEMENT_PAINT = "Deform/useMovementPaint";
 const QString DEFORM_USE_COUNTER = "Deform/useCounter";
 const QString DEFORM_USE_OLD_DATA = "Deform/useOldData";
 
 class KisDeformOption : public KisPaintOpOption
 {
 public:
     KisDeformOption();
     ~KisDeformOption();
 
     double deformAmount() const;
     int deformAction() const;
     bool bilinear() const;
     bool useMovementPaint() const;
     bool useCounter() const;
     bool useOldData() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
     void lodLimitations(KisPaintopLodLimitations *l) const;
 
 private:
     KisDeformOptionsWidget * m_options;
 
 };
 
+struct DeformOption {
+    qreal deform_amount;
+    bool deform_use_bilinear;
+    bool deform_use_counter;
+    bool deform_use_old_data;
+    int deform_action;
+
+    void readOptionSetting(const KisPropertiesConfiguration * config) {
+        deform_amount = config->getDouble(DEFORM_AMOUNT);
+        deform_use_bilinear = config->getBool(DEFORM_USE_BILINEAR);
+        deform_use_counter = config->getBool(DEFORM_USE_COUNTER);
+        deform_use_old_data = config->getBool(DEFORM_USE_OLD_DATA);
+        deform_action = config->getInt(DEFORM_ACTION);
+    }
+
+
+    void writeOptionSetting(KisPropertiesConfiguration* config) const {
+        config->setProperty(DEFORM_AMOUNT, deform_amount);
+        config->setProperty(DEFORM_ACTION, deform_action);
+        config->setProperty(DEFORM_USE_BILINEAR, deform_use_bilinear);
+        config->setProperty(DEFORM_USE_COUNTER, deform_use_counter);
+        config->setProperty(DEFORM_USE_OLD_DATA, deform_use_old_data);
+    }
+};
+
 #endif
diff --git a/plugins/paintops/deform/kis_deform_paintop.cpp b/plugins/paintops/deform/kis_deform_paintop.cpp
index 2c3a9cb593..78e32b94b9 100644
--- a/plugins/paintops/deform/kis_deform_paintop.cpp
+++ b/plugins/paintops/deform/kis_deform_paintop.cpp
@@ -1,150 +1,145 @@
 /*
  *  Copyright (c) 2008-2010 Lukáš Tvrdý <lukast.dev@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_deform_paintop.h"
 #include "kis_deform_paintop_settings.h"
 
 #include <cmath>
 
 #include <QtGlobal>
 #include <QRect>
 
 #include <kis_image.h>
 #include <kis_debug.h>
 
 #include "kis_global.h"
 #include "kis_paint_device.h"
 #include "kis_painter.h"
 #include "kis_selection.h"
 #include "kis_random_accessor_ng.h"
 
 #include <kis_fixed_paint_device.h>
 
 #include "kis_deform_option.h"
 #include "kis_brush_size_option.h"
 #include <KoColorSpaceRegistry.h>
 #include <KoCompositeOp.h>
 
 #ifdef Q_OS_WIN
 // quoting DRAND48(3) man-page:
 // These functions are declared obsolete by  SVID  3,
 // which  states  that rand(3) should be used instead.
 #define drand48() (static_cast<double>(qrand()) / static_cast<double>(RAND_MAX))
 #endif
 
 KisDeformPaintOp::KisDeformPaintOp(const KisDeformPaintOpSettings *settings, KisPainter * painter, KisNodeSP node, KisImageSP image)
     : KisPaintOp(painter)
 {
     Q_UNUSED(image);
     Q_UNUSED(node);
     Q_ASSERT(settings);
 
     m_sizeProperties.readOptionSetting(settings);
+    m_properties.readOptionSetting(settings);
 
     // sensors
     m_sizeOption.readOptionSetting(settings);
     m_opacityOption.readOptionSetting(settings);
     m_rotationOption.readOptionSetting(settings);
     m_sizeOption.resetAllSensors();
     m_opacityOption.resetAllSensors();
     m_rotationOption.resetAllSensors();
 
-    m_properties.action = settings->getInt(DEFORM_ACTION);
-    m_properties.deformAmount = settings->getDouble(DEFORM_AMOUNT);
-    m_properties.useBilinear = settings->getBool(DEFORM_USE_BILINEAR);
-    m_properties.useCounter = settings->getBool(DEFORM_USE_COUNTER);
-    m_properties.useOldData = settings->getBool(DEFORM_USE_OLD_DATA);
-
     m_deformBrush.setProperties(&m_properties);
     m_deformBrush.setSizeProperties(&m_sizeProperties);
 
     m_deformBrush.initDeformAction();
 
     m_dev = source();
 
-    if ((m_sizeProperties.diameter * 0.5) > 1) {
-        m_ySpacing = m_xSpacing = m_sizeProperties.diameter * 0.5 * m_sizeProperties.spacing;
+    if ((m_sizeProperties.brush_diameter * 0.5) > 1) {
+        m_ySpacing = m_xSpacing = m_sizeProperties.brush_diameter * 0.5 * m_sizeProperties.brush_spacing;
     }
     else {
         m_ySpacing = m_xSpacing = 1.0;
     }
     m_spacing = m_xSpacing;
 
 
 
 }
 
 KisDeformPaintOp::~KisDeformPaintOp()
 {
 }
 
 KisSpacingInformation KisDeformPaintOp::paintAt(const KisPaintInformation& info)
 {
     if (!painter()) return KisSpacingInformation(m_spacing);
     if (!m_dev) return KisSpacingInformation(m_spacing);
 
     KisFixedPaintDeviceSP dab = cachedDab(source()->compositionSourceColorSpace());
 
     qint32 x;
     qreal subPixelX;
     qint32 y;
     qreal subPixelY;
 
     QPointF pt = info.pos();
-    if (m_sizeProperties.jitterEnabled) {
-        pt.setX(pt.x() + ((m_sizeProperties.diameter * drand48()) - m_sizeProperties.diameter * 0.5) * m_sizeProperties.jitterMovementAmount);
-        pt.setY(pt.y() + ((m_sizeProperties.diameter * drand48()) - m_sizeProperties.diameter * 0.5) * m_sizeProperties.jitterMovementAmount);
+    if (m_sizeProperties.brush_jitter_movement_enabled) {
+        pt.setX(pt.x() + ((m_sizeProperties.brush_diameter * drand48()) - m_sizeProperties.brush_diameter * 0.5) * m_sizeProperties.brush_jitter_movement);
+        pt.setY(pt.y() + ((m_sizeProperties.brush_diameter * drand48()) - m_sizeProperties.brush_diameter * 0.5) * m_sizeProperties.brush_jitter_movement);
     }
 
     qreal rotation = m_rotationOption.apply(info);
 
     // Deform Brush is capable of working with zero scale,
     // so no additional checks for 'zero'ness are needed
     qreal scale = m_sizeOption.apply(info);
 
 
-    rotation += m_sizeProperties.rotation;
-    scale *= m_sizeProperties.scale;
+    rotation += m_sizeProperties.brush_rotation;
+    scale *= m_sizeProperties.brush_scale;
 
     QPointF pos = pt - m_deformBrush.hotSpot(scale, rotation);
 
     splitCoordinate(pos.x(), &x, &subPixelX);
     splitCoordinate(pos.y(), &y, &subPixelY);
 
     KisFixedPaintDeviceSP mask = m_deformBrush.paintMask(dab, m_dev,
                                  scale, rotation,
                                  info.pos(),
                                  subPixelX, subPixelY,
                                  x, y
                                                         );
 
     // this happens for the first dab of the move mode, we need more information for being able to move
     if (!mask) {
         return KisSpacingInformation(m_spacing);
     }
 
     quint8 origOpacity = m_opacityOption.apply(painter(), info);
     painter()->bltFixedWithFixedSelection(x, y, dab, mask, mask->bounds().width() , mask->bounds().height());
     painter()->renderMirrorMask(QRect(QPoint(x, y), QSize(mask->bounds().width() , mask->bounds().height())), dab, mask);
     painter()->setOpacity(origOpacity);
 
     return KisSpacingInformation(m_spacing);
 }
 
 
 
diff --git a/plugins/paintops/deform/kis_deform_paintop.h b/plugins/paintops/deform/kis_deform_paintop.h
index ef7c2fa2cf..372d31d46c 100644
--- a/plugins/paintops/deform/kis_deform_paintop.h
+++ b/plugins/paintops/deform/kis_deform_paintop.h
@@ -1,63 +1,63 @@
 /*
  *  Copyright (c) 2008,2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_DEFORMPAINTOP_H_
 #define KIS_DEFORMPAINTOP_H_
 
 #include <brushengine/kis_paintop.h>
 #include <kis_types.h>
 
 #include <kis_pressure_size_option.h>
 #include <kis_pressure_opacity_option.h>
 #include <kis_pressure_rotation_option.h>
 
 #include "deform_brush.h"
 
 #include "kis_deform_paintop_settings.h"
+#include "kis_deform_option.h"
 
 class KisPainter;
-class KisBrushSizeProperties;
 
 class KisDeformPaintOp : public KisPaintOp
 {
 
 public:
     KisDeformPaintOp(const KisDeformPaintOpSettings *settings, KisPainter * painter, KisNodeSP node, KisImageSP image);
     virtual ~KisDeformPaintOp();
 
     KisSpacingInformation paintAt(const KisPaintInformation& info);
 
 private:
 
     KisPaintDeviceSP m_dab;
     KisPaintDeviceSP m_dev;
 
     DeformBrush m_deformBrush;
-    DeformProperties m_properties;
-    KisBrushSizeProperties m_sizeProperties;
+    DeformOption m_properties;
+    BrushSizeOption m_sizeProperties;
 
     KisPressureSizeOption m_sizeOption;
     KisPressureOpacityOption m_opacityOption;
     KisPressureRotationOption m_rotationOption;
 
     qreal m_xSpacing;
     qreal m_ySpacing;
     qreal m_spacing;
 };
 
 #endif // KIS_DEFORMPAINTOP_H_
diff --git a/plugins/paintops/deform/kis_deform_paintop_settings.cpp b/plugins/paintops/deform/kis_deform_paintop_settings.cpp
index 302f848b18..508081a01f 100644
--- a/plugins/paintops/deform/kis_deform_paintop_settings.cpp
+++ b/plugins/paintops/deform/kis_deform_paintop_settings.cpp
@@ -1,74 +1,220 @@
 /*
  *  Copyright (c) 2008,2009,2010 Lukáš Tvrdý <lukast.dev@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_deform_paintop_settings.h>
 #include <kis_deform_paintop_settings_widget.h>
 
 #include <kis_brush_size_option.h>
 
 #include <kis_airbrush_option.h>
 #include <kis_deform_option.h>
 
+struct KisDeformPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
 KisDeformPaintOpSettings::KisDeformPaintOpSettings()
     : KisOutlineGenerationPolicy<KisPaintOpSettings>(KisCurrentOutlineFetcher::SIZE_OPTION |
-            KisCurrentOutlineFetcher::ROTATION_OPTION)
+                                                     KisCurrentOutlineFetcher::ROTATION_OPTION),
+    m_d(new Private)
+{
+}
+
+KisDeformPaintOpSettings::~KisDeformPaintOpSettings()
 {
 }
 
 bool KisDeformPaintOpSettings::paintIncremental()
 {
     return true;
 }
 
 bool KisDeformPaintOpSettings::isAirbrushing() const
 {
     // version 2.3
     if (hasProperty(AIRBRUSH_ENABLED)) {
         return getBool(AIRBRUSH_ENABLED);
     }
     else {
         return getBool(DEFORM_USE_MOVEMENT_PAINT);
     }
 }
 
 int KisDeformPaintOpSettings::rate() const
 {
     if (hasProperty(AIRBRUSH_RATE)) {
         return getInt(AIRBRUSH_RATE);
     }
     else {
         return KisPaintOpSettings::rate();
     }
 }
 
 QPainterPath KisDeformPaintOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     QPainterPath path;
     if (mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
         qreal width = getInt(BRUSH_DIAMETER);
         qreal height = getInt(BRUSH_DIAMETER) * getDouble(BRUSH_ASPECT);
         path = ellipseOutline(width, height, getDouble(BRUSH_SCALE), getDouble(BRUSH_ROTATION));
         path = outlineFetcher()->fetchOutline(info, this, path);
 
         if (mode == CursorTiltOutline) {
             QPainterPath tiltLine = makeTiltIndicator(info, QPointF(0.0, 0.0), width * 0.5, 3.0);
             path.addPath(outlineFetcher()->fetchOutline(info, this, tiltLine, 1.0, 0.0, true, 0, 0));
         }
     }
     return path;
 }
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include <brushengine/kis_combo_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_brush_size_option.h"
+#include "kis_deform_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+typedef KisCallbackBasedPaintopProperty<KisComboBasedPaintOpProperty> KisComboBasedPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisDeformPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "deform_amount",
+                    i18n("Amount"),
+                    this, 0);
+
+            prop->setRange(0.01, 1.0);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DeformOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.deform_amount);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DeformOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.deform_amount = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisComboBasedPaintOpPropertyCallback *prop =
+                new KisComboBasedPaintOpPropertyCallback(
+                    "deform_mode",
+                    i18n("Deform Mode"),
+                    this, 0);
+
+            QList<QString> modes;
+            modes << i18n("Grow");
+            modes << i18n("Shrink");
+            modes << i18n("Swirl CW");
+            modes << i18n("Swirl CCW");
+            modes << i18n("Move");
+            modes << i18n("Lens Zoom In");
+            modes << i18n("Lens Zoom Out");
+            modes << i18n("Color Deformation");
+
+            prop->setItems(modes);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DeformOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(int(option.deform_action - 1));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DeformOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.deform_action = prop->value().toInt() + 1;
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "deform_angle",
+                    i18n("Angle"),
+                    this, 0);
+
+            const QString degree = QChar(Qt::Key_degree);
+            prop->setRange(0, 360);
+            prop->setSingleStep(1);
+            prop->setSuffix(degree);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    BrushSizeOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.brush_rotation));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    BrushSizeOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.brush_rotation = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id() ||
+                prop->id() == size.id()) {
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/deform/kis_deform_paintop_settings.h b/plugins/paintops/deform/kis_deform_paintop_settings.h
index bc1d691415..c4d885548c 100644
--- a/plugins/paintops/deform/kis_deform_paintop_settings.h
+++ b/plugins/paintops/deform/kis_deform_paintop_settings.h
@@ -1,40 +1,46 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2008,2009 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_DEFORM_PAINTOP_SETTINGS_H_
 #define KIS_DEFORM_PAINTOP_SETTINGS_H_
 
-
+#include <QScopedPointer>
 #include <brushengine/kis_paintop_settings.h>
 #include <kis_types.h>
 #include <kis_outline_generation_policy.h>
 
 class KisDeformPaintOpSettings : public KisOutlineGenerationPolicy<KisPaintOpSettings>
 {
 
 public:
     KisDeformPaintOpSettings();
+    ~KisDeformPaintOpSettings();
 
     QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
 
     bool paintIncremental();
     bool isAirbrushing() const;
     int rate() const;
 
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 #endif
diff --git a/plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp b/plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
index b274a00dd5..8915c1e13f 100644
--- a/plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
+++ b/plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
@@ -1,36 +1,250 @@
 /*
  *  Copyright (c) 2009-2010 Lukáš Tvrdý <lukast.dev@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_dyna_paintop_settings.h"
 #include <kis_paint_action_type_option.h>
 #include <kis_airbrush_option.h>
 
+struct KisDynaPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+KisDynaPaintOpSettings::KisDynaPaintOpSettings()
+    : m_d(new Private)
+{
+}
+
+KisDynaPaintOpSettings::~KisDynaPaintOpSettings()
+{
+}
+
 bool KisDynaPaintOpSettings::paintIncremental()
 {
     return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
 }
 
 bool KisDynaPaintOpSettings::isAirbrushing() const
 {
     return getBool(AIRBRUSH_ENABLED);
 }
 
 int KisDynaPaintOpSettings::rate() const
 {
     return getInt(AIRBRUSH_RATE);
 }
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include <brushengine/kis_combo_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_dynaop_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+
+
+typedef KisCallbackBasedPaintopProperty<KisComboBasedPaintOpProperty> KisComboBasedPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisDynaPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "dyna_diameter",
+                    i18n("Diameter"),
+                    this, 0);
+
+            prop->setRange(0, 1000);
+            prop->setSingleStep(1);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.dyna_diameter);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.dyna_diameter = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "dyna_angle",
+                    i18n("Angle"),
+                    this, 0);
+
+            const QString degree = QChar(Qt::Key_degree);
+            prop->setRange(0, 360);
+            prop->setSingleStep(1);
+            prop->setSuffix(degree);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.dyna_angle));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.dyna_angle = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    return option.dyna_use_fixed_angle;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "dyna_mass",
+                    i18n("Mass"),
+                    this, 0);
+
+            prop->setRange(0.01, 3);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setExponentRatio(3);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.dyna_mass);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.dyna_mass = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "dyna_drag",
+                    i18n("Drag"),
+                    this, 0);
+
+            prop->setRange(0, 0.99);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setExponentRatio(3);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.dyna_drag);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.dyna_drag = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisComboBasedPaintOpPropertyCallback *prop =
+                new KisComboBasedPaintOpPropertyCallback(
+                    "dyna_shape",
+                    i18n("Shape"),
+                    this, 0);
+
+            QList<QString> shapes;
+            shapes << i18n("Circle");
+            shapes << i18n("Polygon");
+            shapes << i18n("Wire");
+            shapes << i18n("Lines");
+
+            prop->setItems(shapes);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.dyna_action);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    DynaOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.dyna_action = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id() ||
+                prop->id() == flow.id()) {
+
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/dynadraw/kis_dyna_paintop_settings.h b/plugins/paintops/dynadraw/kis_dyna_paintop_settings.h
index be5d130b01..96f0ce0917 100644
--- a/plugins/paintops/dynadraw/kis_dyna_paintop_settings.h
+++ b/plugins/paintops/dynadraw/kis_dyna_paintop_settings.h
@@ -1,33 +1,43 @@
 /*
  *  Copyright (c) 2009-2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_DYNA_PAINTOP_SETTINGS_H_
 #define KIS_DYNA_PAINTOP_SETTINGS_H_
 
+#include <QScopedPointer>
 #include <brushengine/kis_paintop_settings.h>
 
 class KisDynaPaintOpSettings : public KisPaintOpSettings
 {
 
 public:
+    KisDynaPaintOpSettings();
+    ~KisDynaPaintOpSettings();
+
     bool paintIncremental();
     virtual bool isAirbrushing() const;
     virtual int rate() const;
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/dynadraw/kis_dynaop_option.cpp b/plugins/paintops/dynadraw/kis_dynaop_option.cpp
index 4496afac07..3f02765d89 100644
--- a/plugins/paintops/dynadraw/kis_dynaop_option.cpp
+++ b/plugins/paintops/dynadraw/kis_dynaop_option.cpp
@@ -1,183 +1,189 @@
 /*
  *  Copyright (c) 2009-2010 Lukáš Tvrdý <lukast.dev@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_dynaop_option.h"
 #include <klocalizedstring.h>
 
 #include <brushengine/kis_paintop_lod_limitations.h>
 
 #include "ui_wdgdynaoptions.h"
 
 class KisDynaOpOptionsWidget: public QWidget, public Ui::WdgDynaOptions
 {
 public:
     KisDynaOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
         angleSlider->setRange(0, 360, 0);
         angleSlider->setValue(0);
         angleSlider->setSingleStep(1);
         angleSlider->setSuffix(QChar(Qt::Key_degree));
 
         diameterDSSB->setRange(0, 1000, 0);
         diameterDSSB->setValue(20);
         diameterDSSB->setExponentRatio(3.0);
 
     }
 };
 
 KisDynaOpOption::KisDynaOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisDynaOpOption");
 
     m_checkable = false;
     m_options = new KisDynaOpOptionsWidget();
 
     //ui
     connect(m_options->fixedAngleChBox, SIGNAL(toggled(bool)), m_options->angleSlider, SLOT(setEnabled(bool)));
 
     // preset
     connect(m_options->circleRBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->polygonRBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->wireRBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->linesRBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->initWidthSPBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
     connect(m_options->massSPBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
     connect(m_options->dragSPBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
     connect(m_options->angleSlider, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->widthRangeSPBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
     connect(m_options->diameterDSSB, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->lineCountSPBox, SIGNAL(valueChanged(int)), SLOT(emitSettingChanged()));
     connect(m_options->lineSpacingSPBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
     connect(m_options->LineCBox, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->twoCBox, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->fixedAngleChBox, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 }
 
 KisDynaOpOption::~KisDynaOpOption()
 {
     delete m_options;
 }
 
 qreal KisDynaOpOption::initWidth() const
 {
     return m_options->initWidthSPBox->value();
 }
 
 qreal KisDynaOpOption::mass() const
 {
     return m_options->massSPBox->value();
 }
 
 qreal KisDynaOpOption::drag() const
 {
     return m_options->dragSPBox->value();
 }
 
 bool KisDynaOpOption::useFixedAngle() const
 {
     return m_options->fixedAngleChBox->isChecked();
 }
 
 
 qreal KisDynaOpOption::widthRange() const
 {
     return m_options->widthRangeSPBox->value();
 }
 
 
 int KisDynaOpOption::action() const
 {
     if (m_options->circleRBox->isChecked())
         return 0;
     if (m_options->polygonRBox->isChecked())
         return 1;
     if (m_options->wireRBox->isChecked())
         return 2;
     if (m_options->linesRBox->isChecked())
         return 3;
     return 0;
 }
 
 
 bool KisDynaOpOption::enableLine() const
 {
     return m_options->LineCBox->isChecked();
 }
 
 bool KisDynaOpOption::useTwoCircles() const
 {
     return m_options->twoCBox->isChecked();
 }
 
 int KisDynaOpOption::lineCount() const
 {
     return m_options->lineCountSPBox->value();
 }
 
 qreal KisDynaOpOption::lineSpacing() const
 {
     return m_options->lineSpacingSPBox->value();
 }
 
 void KisDynaOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(DYNA_WIDTH, initWidth());
-    setting->setProperty(DYNA_MASS , mass());
-    setting->setProperty(DYNA_DRAG , drag());
-    setting->setProperty(DYNA_USE_FIXED_ANGLE , useFixedAngle());
-    setting->setProperty(DYNA_ANGLE , m_options->angleSlider->value());
-    setting->setProperty(DYNA_WIDTH_RANGE , widthRange());
-    setting->setProperty(DYNA_ACTION , action());
-    setting->setProperty(DYNA_DIAMETER , m_options->diameterDSSB->value());
-    setting->setProperty(DYNA_ENABLE_LINE , enableLine());
-    setting->setProperty(DYNA_USE_TWO_CIRCLES , useTwoCircles());
-    setting->setProperty(DYNA_LINE_COUNT , lineCount());
-    setting->setProperty(DYNA_LINE_SPACING , lineSpacing());
-
+    DynaOption op;
+
+    op.dyna_width = initWidth();
+    op.dyna_mass  = mass();
+    op.dyna_drag  = drag();
+    op.dyna_use_fixed_angle  = useFixedAngle();
+    op.dyna_angle  = m_options->angleSlider->value();
+    op.dyna_width_range  = widthRange();
+    op.dyna_action  = action();
+    op.dyna_diameter  = m_options->diameterDSSB->value();
+    op.dyna_enable_line  = enableLine();
+    op.dyna_use_two_circles  = useTwoCircles();
+    op.dyna_line_count  = lineCount();
+    op.dyna_line_spacing  = lineSpacing();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisDynaOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    switch (setting->getInt(DYNA_ACTION)) {
+    DynaOption op;
+    op.readOptionSetting(setting);
+
+    switch (op.dyna_action) {
     case 0: m_options->circleRBox->setChecked(true); break;
     case 1: m_options->polygonRBox->setChecked(true); break;
     case 2: m_options->wireRBox->setChecked(true); break;
     case 3: m_options->linesRBox->setChecked(true); break;
     default: break;
     }
 
-    m_options->initWidthSPBox->setValue(setting->getDouble(DYNA_WIDTH));
-    m_options->massSPBox->setValue(setting->getDouble(DYNA_MASS));
-    m_options->dragSPBox->setValue(setting->getDouble(DYNA_DRAG));
-    m_options->angleSlider->setValue(setting->getDouble(DYNA_ANGLE));
-    m_options->widthRangeSPBox->setValue(setting->getDouble(DYNA_WIDTH_RANGE));
-    m_options->diameterDSSB->setValue(setting->getInt(DYNA_DIAMETER));
-    m_options->lineCountSPBox->setValue(setting->getInt(DYNA_LINE_COUNT));
-    m_options->lineSpacingSPBox->setValue(setting->getDouble(DYNA_LINE_SPACING));
-    m_options->LineCBox->setChecked(setting->getBool(DYNA_ENABLE_LINE));
-    m_options->twoCBox->setChecked(setting->getBool(DYNA_USE_TWO_CIRCLES));
-    m_options->fixedAngleChBox->setChecked(setting->getBool(DYNA_USE_FIXED_ANGLE));
+    m_options->initWidthSPBox->setValue(op.dyna_width);
+    m_options->massSPBox->setValue(op.dyna_mass);
+    m_options->dragSPBox->setValue(op.dyna_drag);
+    m_options->angleSlider->setValue(op.dyna_angle);
+    m_options->widthRangeSPBox->setValue(op.dyna_width_range);
+    m_options->diameterDSSB->setValue(op.dyna_diameter);
+    m_options->lineCountSPBox->setValue(op.dyna_line_count);
+    m_options->lineSpacingSPBox->setValue(op.dyna_line_spacing);
+    m_options->LineCBox->setChecked(op.dyna_enable_line);
+    m_options->twoCBox->setChecked(op.dyna_use_two_circles);
+    m_options->fixedAngleChBox->setChecked(op.dyna_use_fixed_angle);
 }
 
 void KisDynaOpOption::lodLimitations(KisPaintopLodLimitations *l) const
 {
     l->blockers << KoID("dyna-brush", i18nc("PaintOp instant preview limitation", "Dyna Brush (not supported)"));
 }
diff --git a/plugins/paintops/dynadraw/kis_dynaop_option.h b/plugins/paintops/dynadraw/kis_dynaop_option.h
index a0d116ce24..f7f096ea2a 100644
--- a/plugins/paintops/dynadraw/kis_dynaop_option.h
+++ b/plugins/paintops/dynadraw/kis_dynaop_option.h
@@ -1,70 +1,117 @@
 /*
  *  Copyright (c) 2009-2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_DYNAOP_OPTION_H
 #define KIS_DYNAOP_OPTION_H
 
 #include <kis_paintop_option.h>
 
 const QString DYNA_DIAMETER = "Dyna/diameter";
 const QString DYNA_WIDTH = "Dyna/width";
 const QString DYNA_MASS = "Dyna/mass";
 const QString DYNA_DRAG = "Dyna/drag";
 const QString DYNA_USE_FIXED_ANGLE = "Dyna/useFixedAngle";
 const QString DYNA_ANGLE = "Dyna/angle";
 const QString DYNA_WIDTH_RANGE = "Dyna/widthRange";
 const QString DYNA_ACTION = "Dyna/action";
 const QString DYNA_USE_TWO_CIRCLES = "Dyna/useTwoCirles";
 const QString DYNA_ENABLE_LINE = "Dyna/enableLine";
 const QString DYNA_LINE_COUNT = "Dyna/lineCount";
 const QString DYNA_LINE_SPACING = "Dyna/lineSpacing";
 
 class KisDynaOpOptionsWidget;
 class KisPaintopLodLimitations;
 
 class KisDynaOpOption : public KisPaintOpOption
 {
     Q_OBJECT
 
 public:
     KisDynaOpOption();
     ~KisDynaOpOption();
 
     qreal initWidth() const;
     qreal mass() const;
     qreal drag() const;
     bool useFixedAngle() const;
     qreal widthRange() const;
 
     int action() const;
     bool enableLine() const;
     bool useTwoCircles() const;
 
     int lineCount() const;
     qreal lineSpacing() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
     void lodLimitations(KisPaintopLodLimitations *l) const;
 
 private:
     KisDynaOpOptionsWidget * m_options;
+};
+
+struct DynaOption {
+
+    int dyna_action;
 
+    qreal dyna_width;
+    qreal dyna_mass;
+    qreal dyna_drag;
+    qreal dyna_angle;
+    qreal dyna_width_range;
+    int dyna_diameter;
+    int dyna_line_count;
+    qreal dyna_line_spacing;
+    bool dyna_enable_line;
+    bool dyna_use_two_circles;
+    bool dyna_use_fixed_angle;
 
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(DYNA_WIDTH, dyna_width);
+        setting->setProperty(DYNA_MASS, dyna_mass);
+        setting->setProperty(DYNA_DRAG, dyna_drag);
+        setting->setProperty(DYNA_USE_FIXED_ANGLE, dyna_use_fixed_angle);
+        setting->setProperty(DYNA_ANGLE, dyna_angle);
+        setting->setProperty(DYNA_WIDTH_RANGE, dyna_width_range);
+        setting->setProperty(DYNA_ACTION, dyna_action);
+        setting->setProperty(DYNA_DIAMETER, dyna_diameter);
+        setting->setProperty(DYNA_ENABLE_LINE, dyna_enable_line);
+        setting->setProperty(DYNA_USE_TWO_CIRCLES, dyna_use_two_circles);
+        setting->setProperty(DYNA_LINE_COUNT, dyna_line_count);
+        setting->setProperty(DYNA_LINE_SPACING, dyna_line_spacing);
+
+    }
+
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        dyna_action = setting->getInt(DYNA_ACTION);
+        dyna_width = setting->getDouble(DYNA_WIDTH);
+        dyna_mass = setting->getDouble(DYNA_MASS);
+        dyna_drag = setting->getDouble(DYNA_DRAG);
+        dyna_angle = setting->getDouble(DYNA_ANGLE);
+        dyna_width_range = setting->getDouble(DYNA_WIDTH_RANGE);
+        dyna_diameter = setting->getInt(DYNA_DIAMETER);
+        dyna_line_count = setting->getInt(DYNA_LINE_COUNT);
+        dyna_line_spacing = setting->getDouble(DYNA_LINE_SPACING);
+        dyna_enable_line = setting->getBool(DYNA_ENABLE_LINE);
+        dyna_use_two_circles = setting->getBool(DYNA_USE_TWO_CIRCLES);
+        dyna_use_fixed_angle = setting->getBool(DYNA_USE_FIXED_ANGLE);
+    }
 };
 
+
 #endif
diff --git a/plugins/paintops/dynadraw/wdgdynaoptions.ui b/plugins/paintops/dynadraw/wdgdynaoptions.ui
index ce2cff3416..6934f1a51e 100644
--- a/plugins/paintops/dynadraw/wdgdynaoptions.ui
+++ b/plugins/paintops/dynadraw/wdgdynaoptions.ui
@@ -1,334 +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>0</number>
+      <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="QDoubleSpinBox" name="initWidthSPBox">
+          <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="QDoubleSpinBox" name="massSPBox">
+          <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="QDoubleSpinBox" name="dragSPBox">
+          <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="QDoubleSpinBox" name="widthRangeSPBox">
+          <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>Circle</string>
+              <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="QDoubleSpinBox" name="lineSpacingSPBox">
+            <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="QSpinBox" name="lineCountSPBox">
+            <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>Polygon</string>
+            <string>Poly&amp;gon</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="wireRBox">
            <property name="text">
-            <string>Wire</string>
+            <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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/experiment/kis_experiment_paintop_settings.cpp b/plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
index 6ba83141e1..3f74395519 100644
--- a/plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
+++ b/plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
@@ -1,50 +1,262 @@
 /*
  *  Copyright (c) 2009,2010 Lukáš Tvrdý <lukast.dev@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_experiment_paintop_settings.h"
 #include "kis_current_outline_fetcher.h"
 
+struct KisExperimentPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+KisExperimentPaintOpSettings::KisExperimentPaintOpSettings()
+    : m_d(new Private)
+{
+}
+
+KisExperimentPaintOpSettings::~KisExperimentPaintOpSettings()
+{
+}
+
+
 bool KisExperimentPaintOpSettings::paintIncremental()
 {
     /**
      * The experiment brush supports working in the
      * WASH mode only!
      */
     return false;
 }
 
 QPainterPath KisExperimentPaintOpSettings::brushOutline(const KisPaintInformation &info, KisPaintOpSettings::OutlineMode mode) const
 {
     QPainterPath path;
     if (mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
 
         QRectF ellipse(0, 0, 3, 3);
         ellipse.translate(-ellipse.center());
         path.addEllipse(ellipse);
         ellipse.setRect(0,0, 12, 12);
         ellipse.translate(-ellipse.center());
         path.addEllipse(ellipse);
 
         if (mode == CursorTiltOutline) {
             path.addPath(makeTiltIndicator(info, QPointF(0.0, 0.0), 0.0, 3.0));
         }
 
         path.translate(info.pos());
     }
     return path;
 }
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_experimentop_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisExperimentPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "shape_speed",
+                    i18n("Speed"),
+                    this, 0);
+
+            prop->setRange(0, 100);
+            prop->setSingleStep(1);
+            prop->setSuffix(i18n("%"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.speed));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.speed = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) -> bool {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    return option.isSpeedEnabled;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "shape_smooth",
+                    i18n("Smooth"),
+                    this, 0);
+
+            prop->setRange(0, 100);
+            prop->setSingleStep(1);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.smoothing));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.smoothing = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    return option.isSmoothingEnabled;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "shape_displace",
+                    i18n("Displace"),
+                    this, 0);
+
+            prop->setRange(0, 100);
+            prop->setSingleStep(1);
+            prop->setSuffix(i18n("%"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.displacement));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.displacement = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    return option.isDisplacementEnabled;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "shape_windingfill",
+                    i18n("Winding Fill"),
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.windingFill);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.windingFill = prop->value().toBool();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "shape_hardedge",
+                    i18n("Hard Edge"),
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.hardEdge);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ExperimentOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.hardEdge = prop->value().toBool();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id()) {
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/experiment/kis_experiment_paintop_settings.h b/plugins/paintops/experiment/kis_experiment_paintop_settings.h
index aea0b17075..9701ec4b6c 100644
--- a/plugins/paintops/experiment/kis_experiment_paintop_settings.h
+++ b/plugins/paintops/experiment/kis_experiment_paintop_settings.h
@@ -1,31 +1,41 @@
 /*
  *  Copyright (c) 2009,2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_EXPERIMENT_PAINTOP_SETTINGS_H_
 #define KIS_EXPERIMENT_PAINTOP_SETTINGS_H_
 
 #include <brushengine/kis_paintop_settings.h>
+#include <QScopedPointer>
 
 class KisExperimentPaintOpSettings : public KisPaintOpSettings
 {
 public:
+    KisExperimentPaintOpSettings();
+    ~KisExperimentPaintOpSettings();
+
     bool paintIncremental();
     QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/experiment/kis_experimentop_option.cpp b/plugins/paintops/experiment/kis_experimentop_option.cpp
index c70a8e4d5c..7ede67e258 100644
--- a/plugins/paintops/experiment/kis_experimentop_option.cpp
+++ b/plugins/paintops/experiment/kis_experimentop_option.cpp
@@ -1,131 +1,135 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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_experimentop_option.h"
 #include <klocalizedstring.h>
 
 #include <brushengine/kis_paintop_lod_limitations.h>
 
 #include "ui_wdgexperimentoptions.h"
 
 class KisExperimentOpOptionsWidget: public QWidget, public Ui::WdgExperimentOptions
 {
 public:
     KisExperimentOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
 
         speed->setRange(0.0, 100.0, 0);
         speed->setSuffix(QChar(Qt::Key_Percent));
         speed->setValue(42.0);
         speed->setSingleStep(1.0);
 
         smoothThreshold->setRange(0.0, 100.0, 0);
         smoothThreshold->setSuffix(i18n(" px"));
         smoothThreshold->setValue(20.0);
         smoothThreshold->setSingleStep(1.0);
 
         displaceStrength->setRange(0.0, 100.0, 0);
         displaceStrength->setSuffix(QChar(Qt::Key_Percent));
         displaceStrength->setValue(42.0);
         displaceStrength->setSingleStep(1.0);
     }
 };
 
 KisExperimentOpOption::KisExperimentOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisExperimentOpOption");
 
     m_checkable = false;
     m_options = new KisExperimentOpOptionsWidget();
 
     connect(m_options->displaceCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->displaceStrength, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->speedCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->speed, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->smoothCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->smoothThreshold, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
 
     connect(m_options->displaceStrength, SIGNAL(valueChanged(qreal)), SLOT(enableDisplacement(qreal)));
     connect(m_options->speed, SIGNAL(valueChanged(qreal)), SLOT(enableSpeed(qreal)));
     connect(m_options->smoothThreshold, SIGNAL(valueChanged(qreal)), SLOT(enableSmooth(qreal)));
 
     connect(m_options->windingFillCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->hardEdgeCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     setConfigurationPage(m_options);
 }
 
 KisExperimentOpOption::~KisExperimentOpOption()
 {
     delete m_options;
 }
 
 void KisExperimentOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(EXPERIMENT_DISPLACEMENT_ENABLED, m_options->displaceCHBox->isChecked());
-    setting->setProperty(EXPERIMENT_DISPLACEMENT_VALUE, m_options->displaceStrength->value());
-    setting->setProperty(EXPERIMENT_SPEED_ENABLED, m_options->speedCHBox->isChecked());
-    setting->setProperty(EXPERIMENT_SPEED_VALUE, m_options->speed->value());
-    setting->setProperty(EXPERIMENT_SMOOTHING_ENABLED, m_options->smoothCHBox->isChecked());
-    setting->setProperty(EXPERIMENT_SMOOTHING_VALUE, m_options->smoothThreshold->value());
-    setting->setProperty(EXPERIMENT_WINDING_FILL, m_options->windingFillCHBox->isChecked());
-    setting->setProperty(EXPERIMENT_HARD_EDGE, m_options->hardEdgeCHBox->isChecked());
+    ExperimentOption op;
+
+    op.isDisplacementEnabled = m_options->displaceCHBox->isChecked();
+    op.displacement = m_options->displaceStrength->value();
+    op.isSpeedEnabled = m_options->speedCHBox->isChecked();
+    op.speed = m_options->speed->value();
+    op.isSmoothingEnabled = m_options->smoothCHBox->isChecked();
+    op.smoothing = m_options->smoothThreshold->value();
+    op.windingFill = m_options->windingFillCHBox->isChecked();
+    op.hardEdge = m_options->hardEdgeCHBox->isChecked();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisExperimentOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
     ExperimentOption op;
     op.readOptionSetting(setting);
 
     m_options->displaceStrength->setValue(op.displacement);
     m_options->speed->setValue(op.speed);
     m_options->smoothThreshold->setValue(op.smoothing);
     m_options->windingFillCHBox->setChecked(op.windingFill);
     m_options->hardEdgeCHBox->setChecked(op.hardEdge);
 
     m_options->speedCHBox->setChecked(op.isSpeedEnabled);
     m_options->smoothCHBox->setChecked(op.isSmoothingEnabled);
     m_options->displaceCHBox->setChecked(op.isDisplacementEnabled);
 }
 
 inline void enableCheckBox(QCheckBox *checkBox, qreal sliderValue)
 {
     checkBox->setChecked(sliderValue > 0);
 }
 
 void KisExperimentOpOption::enableSpeed(qreal value)
 {
     enableCheckBox(m_options->speedCHBox, value);
 }
 
 void KisExperimentOpOption::enableSmooth(qreal value)
 {
     enableCheckBox(m_options->smoothCHBox, value);
 }
 
 void KisExperimentOpOption::enableDisplacement(qreal value)
 {
     enableCheckBox(m_options->displaceCHBox, value);
 }
 
 void KisExperimentOpOption::lodLimitations(KisPaintopLodLimitations *l) const
 {
     if (m_options->displaceCHBox->isChecked()) {
         l->blockers << KoID("experiment-displacement", i18nc("PaintOp instant preview limitation", "Displacement Option"));
     }
 }
diff --git a/plugins/paintops/experiment/kis_experimentop_option.h b/plugins/paintops/experiment/kis_experimentop_option.h
index 7492aab18a..6f126b52ba 100644
--- a/plugins/paintops/experiment/kis_experimentop_option.h
+++ b/plugins/paintops/experiment/kis_experimentop_option.h
@@ -1,87 +1,98 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_EXPERIMENTOP_OPTION_H
 #define KIS_EXPERIMENTOP_OPTION_H
 
 #include <kis_paintop_option.h>
 class KisPaintopLodLimitations;
 
 const QString EXPERIMENT_DISPLACEMENT_ENABLED = "Experiment/displacementEnabled";
 const QString EXPERIMENT_DISPLACEMENT_VALUE = "Experiment/displacement";
 const QString EXPERIMENT_SMOOTHING_ENABLED = "Experiment/smoothing";
 const QString EXPERIMENT_SMOOTHING_VALUE = "Experiment/smoothingValue";
 const QString EXPERIMENT_SPEED_ENABLED = "Experiment/speedEnabled";
 const QString EXPERIMENT_SPEED_VALUE = "Experiment/speed";
 const QString EXPERIMENT_WINDING_FILL = "Experiment/windingFill";
 const QString EXPERIMENT_HARD_EDGE = "Experiment/hardEdge";
 
 
 
 class KisExperimentOpOptionsWidget;
 
 class KisExperimentOpOption : public KisPaintOpOption
 {
     Q_OBJECT
 public:
     KisExperimentOpOption();
     ~KisExperimentOpOption();
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
     void lodLimitations(KisPaintopLodLimitations *l) const;
 
 private Q_SLOTS:
     void enableSpeed(qreal value);
     void enableSmooth(qreal value);
     void enableDisplacement(qreal value);
 
 private:
     KisExperimentOpOptionsWidget * m_options;
 
 };
 
 class ExperimentOption
 {
 
 public:
     bool isDisplacementEnabled;
     qreal displacement;
     bool isSpeedEnabled;
     qreal speed;
     bool isSmoothingEnabled;
     qreal smoothing;
     bool windingFill;
     bool hardEdge;
 
     void readOptionSetting(const KisPropertiesConfiguration* setting) {
         isDisplacementEnabled = setting->getBool(EXPERIMENT_DISPLACEMENT_ENABLED);
         displacement = setting->getDouble(EXPERIMENT_DISPLACEMENT_VALUE, 50.0);
         isSpeedEnabled = setting->getBool(EXPERIMENT_SPEED_ENABLED);
         speed = setting->getDouble(EXPERIMENT_SPEED_VALUE, 50.0);
         isSmoothingEnabled = setting->getBool(EXPERIMENT_SMOOTHING_ENABLED);
         smoothing = setting->getDouble(EXPERIMENT_SMOOTHING_VALUE, 20.0);
         windingFill = setting->getBool(EXPERIMENT_WINDING_FILL);
         hardEdge = setting->getBool(EXPERIMENT_HARD_EDGE);
     }
 
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(EXPERIMENT_DISPLACEMENT_ENABLED, isDisplacementEnabled);
+        setting->setProperty(EXPERIMENT_DISPLACEMENT_VALUE, displacement);
+        setting->setProperty(EXPERIMENT_SPEED_ENABLED, isSpeedEnabled);
+        setting->setProperty(EXPERIMENT_SPEED_VALUE, speed);
+        setting->setProperty(EXPERIMENT_SMOOTHING_ENABLED, isSmoothingEnabled);
+        setting->setProperty(EXPERIMENT_SMOOTHING_VALUE, smoothing);
+        setting->setProperty(EXPERIMENT_WINDING_FILL, windingFill);
+        setting->setProperty(EXPERIMENT_HARD_EDGE, hardEdge);
+    }
+
 
 
 };
 
 #endif
diff --git a/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp b/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
index 85f452e465..1cc71f0ce2 100644
--- a/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
+++ b/plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
@@ -1,55 +1,110 @@
 /*
  * Copyright (c) 2009,2010 Lukáš Tvrdý (lukast.dev@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_paint_action_type_option.h>
 
 #include "kis_grid_paintop_settings.h"
 #include "kis_grid_paintop_settings_widget.h"
 
 #include "kis_gridop_option.h"
 #include "kis_grid_shape_option.h"
 #include <kis_color_option.h>
 
+struct KisGridPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
 KisGridPaintOpSettings::KisGridPaintOpSettings()
-    : KisOutlineGenerationPolicy<KisPaintOpSettings>(KisCurrentOutlineFetcher::NO_OPTION)
+    : KisOutlineGenerationPolicy<KisPaintOpSettings>(KisCurrentOutlineFetcher::NO_OPTION),
+    m_d(new Private)
 {
 }
 
 bool KisGridPaintOpSettings::paintIncremental()
 {
     return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
 }
 
 QPainterPath KisGridPaintOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     QPainterPath path;
     if (mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
         qreal sizex = getInt(GRID_WIDTH) * getDouble(GRID_SCALE);
         qreal sizey = getInt(GRID_HEIGHT) * getDouble(GRID_SCALE);
         QRectF rc(0, 0, sizex, sizey);
         rc.translate(-rc.center());
         path.addRect(rc);
         path = outlineFetcher()->fetchOutline(info, this, path);
         
         if (mode == CursorTiltOutline) {
             QPainterPath tiltLine = makeTiltIndicator(info, QPointF(0.0, 0.0), sizex * 0.5, 3.0);
             path.addPath(outlineFetcher()->fetchOutline(info, this, tiltLine, 1.0, 0.0, true, 0, 0));
         }
     }
     return path;
 }
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_gridop_option.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisGridPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "grid_divisionlevel",
+                    i18n("Division Level"),
+                    this, 0);
+
+            prop->setRange(1, 25);
+            prop->setSingleStep(1);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    GridOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.grid_division_level));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    GridOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.grid_division_level = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    return KisPaintOpSettings::uniformProperties() + props;
+}
diff --git a/plugins/paintops/gridbrush/kis_grid_paintop_settings.h b/plugins/paintops/gridbrush/kis_grid_paintop_settings.h
index c3ee8b3fc0..c7827c0aec 100644
--- a/plugins/paintops/gridbrush/kis_grid_paintop_settings.h
+++ b/plugins/paintops/gridbrush/kis_grid_paintop_settings.h
@@ -1,40 +1,47 @@
 /*
  * Copyright (c) 2009,2010 Lukáš Tvrdý (lukast.dev@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.
  */
 
 #ifndef KIS_GRID_PAINTOP_SETTINGS_H_
 #define KIS_GRID_PAINTOP_SETTINGS_H_
 
+#include <QScopedPointer>
+
 #include <brushengine/kis_paintop_settings.h>
 #include <kis_types.h>
 
 #include <kis_outline_generation_policy.h>
 #include "kis_grid_paintop_settings_widget.h"
 
 
 
 class KisGridPaintOpSettings : public KisOutlineGenerationPolicy<KisPaintOpSettings>
 {
 public:
     KisGridPaintOpSettings();
 
     QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
     bool paintIncremental();
 
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/gridbrush/kis_gridop_option.cpp b/plugins/paintops/gridbrush/kis_gridop_option.cpp
index 754ee99865..b6bc61ccd0 100644
--- a/plugins/paintops/gridbrush/kis_gridop_option.cpp
+++ b/plugins/paintops/gridbrush/kis_gridop_option.cpp
@@ -1,168 +1,175 @@
 /*
  * Copyright (c) 2009,2010 Lukáš Tvrdý (lukast.dev@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_gridop_option.h"
 #include <klocalizedstring.h>
 
 #include "ui_wdggridoptions.h"
 
 class KisGridOpOptionsWidget: public QWidget, public Ui::WdgGridOptions
 {
 public:
     KisGridOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
     }
 };
 
 KisGridOpOption::KisGridOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisGridOpOption");
 
     m_checkable = false;
     m_options = new KisGridOpOptionsWidget();
 
     // initialize slider values
     m_options->gridWidthSPBox->setRange(1, 999, 0);
     m_options->gridWidthSPBox->setValue(25);
     m_options->gridWidthSPBox->setSuffix(i18n(" px"));
     m_options->gridWidthSPBox->setExponentRatio(3.0);
 
 
     m_options->gridHeightSPBox->setRange(1, 999, 0);
     m_options->gridHeightSPBox->setValue(25);
     m_options->gridHeightSPBox->setSuffix(i18n(" px"));
     m_options->gridHeightSPBox->setExponentRatio(3.0);
 
     m_options->divisionLevelSPBox->setRange(0, 25, 0);
     m_options->divisionLevelSPBox->setValue(2);
 
     m_options->scaleDSPBox->setRange(0.1, 10.0, 2);
     m_options->scaleDSPBox->setValue(1.0);
     m_options->scaleDSPBox->setExponentRatio(3.0);
 
     m_options->vertBorderDSPBox->setRange(0, 100, 2);
     m_options->vertBorderDSPBox->setValue(0.0);
 
 
     m_options->horizBorderDSPBox->setRange(0, 100, 2);
     m_options->vertBorderDSPBox->setValue(0.0);
 
 
     connect(m_options->gridWidthSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->gridHeightSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->divisionLevelSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->divisionPressureCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->scaleDSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->vertBorderDSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->horizBorderDSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->jitterBorderCHBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 }
 
 KisGridOpOption::~KisGridOpOption()
 {
     delete m_options;
 }
 
 
 int KisGridOpOption::divisionLevel() const
 {
     return m_options->divisionLevelSPBox->value();
 }
 
 
 int KisGridOpOption::gridWidth() const
 {
     return m_options->gridWidthSPBox->value();
 }
 
 
 void KisGridOpOption::setWidth(int width) const
 {
     m_options->gridWidthSPBox->setValue(width);
 }
 
 
 int KisGridOpOption::gridHeight() const
 {
     return m_options->gridHeightSPBox->value();
 }
 
 
 void KisGridOpOption::setHeight(int height) const
 {
     m_options->gridHeightSPBox->setValue(height);
 }
 
 
 bool KisGridOpOption::pressureDivision() const
 {
     return m_options->divisionPressureCHBox->isChecked();
 }
 
 
 
 qreal KisGridOpOption::horizBorder() const
 {
     return m_options->vertBorderDSPBox->value();
 }
 
 
 qreal KisGridOpOption::vertBorder() const
 {
     return m_options->horizBorderDSPBox->value();
 }
 
 
 
 bool KisGridOpOption::randomBorder() const
 {
     return m_options->jitterBorderCHBox->isChecked();
 }
 
 
 qreal KisGridOpOption::scale() const
 {
     return m_options->scaleDSPBox->value();
 }
 
 void KisGridOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(GRID_WIDTH, gridWidth());
-    setting->setProperty(GRID_HEIGHT, gridHeight());
-    setting->setProperty(GRID_DIVISION_LEVEL, divisionLevel());
-    setting->setProperty(GRID_PRESSURE_DIVISION, pressureDivision());
-    setting->setProperty(GRID_SCALE, scale());
-    setting->setProperty(GRID_VERTICAL_BORDER, vertBorder());
-    setting->setProperty(GRID_HORIZONTAL_BORDER, horizBorder());
-    setting->setProperty(GRID_RANDOM_BORDER, randomBorder());
+    GridOption op;
+
+    op.grid_width = gridWidth();
+    op.grid_height = gridHeight();
+    op.grid_division_level = divisionLevel();
+    op.grid_pressure_division = pressureDivision();
+    op.grid_scale = scale();
+    op.grid_vertical_border = vertBorder();
+    op.grid_horizontal_border = horizBorder();
+    op.grid_random_border = randomBorder();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisGridOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    m_options->gridWidthSPBox->setValue(setting->getInt(GRID_WIDTH));
-    m_options->gridHeightSPBox->setValue(setting->getInt(GRID_HEIGHT));
-    m_options->divisionLevelSPBox->setValue(setting->getInt(GRID_DIVISION_LEVEL));
-    m_options->divisionPressureCHBox->setChecked(setting->getBool(GRID_PRESSURE_DIVISION));
-    m_options->scaleDSPBox->setValue(setting->getDouble(GRID_SCALE));
-    m_options->vertBorderDSPBox->setValue(setting->getDouble(GRID_VERTICAL_BORDER));
-    m_options->horizBorderDSPBox->setValue(setting->getDouble(GRID_HORIZONTAL_BORDER));
-    m_options->jitterBorderCHBox->setChecked(setting->getBool(GRID_RANDOM_BORDER));
+    GridOption op;
+    op.readOptionSetting(setting);
+
+    m_options->gridWidthSPBox->setValue(op.grid_width);
+    m_options->gridHeightSPBox->setValue(op.grid_height);
+    m_options->divisionLevelSPBox->setValue(op.grid_division_level);
+    m_options->divisionPressureCHBox->setChecked(op.grid_pressure_division);
+    m_options->scaleDSPBox->setValue(op.grid_scale);
+    m_options->vertBorderDSPBox->setValue(op.grid_vertical_border);
+    m_options->horizBorderDSPBox->setValue(op.grid_horizontal_border);
+    m_options->jitterBorderCHBox->setChecked(op.grid_random_border);
 }
diff --git a/plugins/paintops/gridbrush/kis_gridop_option.h b/plugins/paintops/gridbrush/kis_gridop_option.h
index 0a9a2e22ea..3f67817b0d 100644
--- a/plugins/paintops/gridbrush/kis_gridop_option.h
+++ b/plugins/paintops/gridbrush/kis_gridop_option.h
@@ -1,65 +1,100 @@
 /*
  * Copyright (c) 2009,2010 Lukáš Tvrdý (lukast.dev@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.
  */
 
 #ifndef KIS_GRIDOP_OPTION_H
 #define KIS_GRIDOP_OPTION_H
 
 #include <kis_paintop_option.h>
 
 const QString GRID_WIDTH = "Grid/gridWidth";
 const QString GRID_HEIGHT = "Grid/gridHeight";
 const QString GRID_DIVISION_LEVEL = "Grid/divisionLevel";
 const QString GRID_PRESSURE_DIVISION = "Grid/pressureDivision";
 const QString GRID_SCALE = "Grid/scale";
 const QString GRID_VERTICAL_BORDER = "Grid/verticalBorder";
 const QString GRID_HORIZONTAL_BORDER = "Grid/horizontalBorder";
 const QString GRID_RANDOM_BORDER = "Grid/randomBorder";
 
 
 class KisGridOpOptionsWidget;
 
 class KisGridOpOption : public KisPaintOpOption
 {
 public:
     KisGridOpOption();
     ~KisGridOpOption();
 
     int gridWidth() const;
     void setWidth(int width) const;
 
     int gridHeight() const;
     void setHeight(int height) const;
 
     int divisionLevel() const;
     bool pressureDivision() const;
     qreal scale() const;
 
 
     qreal vertBorder() const;
     qreal horizBorder() const;
     bool randomBorder() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
 private:
     KisGridOpOptionsWidget * m_options;
 
 };
 
+struct GridOption
+{
+    int grid_width;
+    int grid_height;
+    int grid_division_level;
+    bool grid_pressure_division;
+    qreal grid_scale;
+    qreal grid_vertical_border;
+    qreal grid_horizontal_border;
+    bool grid_random_border;
+
+
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        grid_width = setting->getInt(GRID_WIDTH);
+        grid_height = setting->getInt(GRID_HEIGHT);
+        grid_division_level = setting->getInt(GRID_DIVISION_LEVEL);
+        grid_pressure_division = setting->getBool(GRID_PRESSURE_DIVISION);
+        grid_scale = setting->getDouble(GRID_SCALE);
+        grid_vertical_border = setting->getDouble(GRID_VERTICAL_BORDER);
+        grid_horizontal_border = setting->getDouble(GRID_HORIZONTAL_BORDER);
+        grid_random_border = setting->getBool(GRID_RANDOM_BORDER);
+    }
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(GRID_WIDTH, grid_width);
+        setting->setProperty(GRID_HEIGHT, grid_height);
+        setting->setProperty(GRID_DIVISION_LEVEL, grid_division_level);
+        setting->setProperty(GRID_PRESSURE_DIVISION, grid_pressure_division);
+        setting->setProperty(GRID_SCALE, grid_scale);
+        setting->setProperty(GRID_VERTICAL_BORDER, grid_vertical_border);
+        setting->setProperty(GRID_HORIZONTAL_BORDER, grid_horizontal_border);
+        setting->setProperty(GRID_RANDOM_BORDER, grid_random_border);
+    }
+};
+
 #endif
diff --git a/plugins/paintops/hairy/wdgInkOptions.ui b/plugins/paintops/hairy/wdgInkOptions.ui
index 5dac483b69..b78e49925e 100644
--- a/plugins/paintops/hairy/wdgInkOptions.ui
+++ b/plugins/paintops/hairy/wdgInkOptions.ui
@@ -1,251 +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>102</width>
+     <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="QSpinBox" name="inkAmountSpinBox">
+     <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">
+   <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">
+     <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">
+     <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">
+     <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">
+     <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_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 63811c02ba..ac63aef4ff 100644
--- a/plugins/paintops/hairy/wdghairyshapeoptions.ui
+++ b/plugins/paintops/hairy/wdghairyshapeoptions.ui
@@ -1,128 +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">
+  <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="QSpinBox" name="radiusSpinBox">
+     <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="QDoubleSpinBox" name="sigmaSpinBox">
+     <widget class="KisDoubleParseSpinBox" name="sigmaSpinBox">
       <property name="value">
        <double>20.000000000000000</double>
       </property>
      </widget>
     </item>
    </layout>
   </widget>
-  <widget class="QWidget">
+  <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>1D</string>
+          <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>2D</string>
+          <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>kis_double_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/paintops/hatching/kis_hatching_options.cpp b/plugins/paintops/hatching/kis_hatching_options.cpp
index 012751903e..f3b0693157 100644
--- a/plugins/paintops/hatching/kis_hatching_options.cpp
+++ b/plugins/paintops/hatching/kis_hatching_options.cpp
@@ -1,124 +1,131 @@
 /*
  *  Copyright (c) 2008 Lukas Tvrdy <lukast.dev@gmail.com>
  *  Copyright (c) 2010 José Luis Vergara <pentalis@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_hatching_options.h"
 #include <brushengine/kis_paintop_lod_limitations.h>
 
 #include "ui_wdghatchingoptions.h"
 
 class KisHatchingOptionsWidget: public QWidget, public Ui::WdgHatchingOptions
 {
 public:
     KisHatchingOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
 
         QString degree = QChar(Qt::Key_degree);
         QString px = i18n(" px");
 
         //setRange(minimum, maximum, decimals)
 
         angleKisDoubleSliderSpinBox     -> setRange(-90.0, 90.0, 1);
         separationKisDoubleSliderSpinBox-> setRange(1.0, 30.0, 1);
         thicknessKisDoubleSliderSpinBox -> setRange(1.0, 30.0, 1);
         originXKisDoubleSliderSpinBox   -> setRange(-300, 300, 0);
         originYKisDoubleSliderSpinBox   -> setRange(-300, 300, 0);
 
         angleKisDoubleSliderSpinBox     -> setValue(-60);
         separationKisDoubleSliderSpinBox-> setValue(6);
         thicknessKisDoubleSliderSpinBox -> setValue(1);
         originXKisDoubleSliderSpinBox   -> setValue(50);
         originYKisDoubleSliderSpinBox   -> setValue(50);
 
         angleKisDoubleSliderSpinBox     -> setSuffix(degree);
         separationKisDoubleSliderSpinBox-> setSuffix(px);
         thicknessKisDoubleSliderSpinBox -> setSuffix(px);
         originXKisDoubleSliderSpinBox   -> setSuffix(px);
         originYKisDoubleSliderSpinBox   -> setSuffix(px);
     }
 };
 
 KisHatchingOptions::KisHatchingOptions()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisHatchingOptions");
 
     m_checkable = false;
     m_options = new KisHatchingOptionsWidget();
 
     connect(m_options->angleKisDoubleSliderSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->separationKisDoubleSliderSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->thicknessKisDoubleSliderSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->originXKisDoubleSliderSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->originYKisDoubleSliderSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
 
     connect(m_options->noCrosshatchingRadioButton, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->perpendicularRadioButton, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->minusThenPlusRadioButton, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->plusThenMinusRadioButton, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
     connect(m_options->moirePatternRadioButton, SIGNAL(clicked(bool)), SLOT(emitSettingChanged()));
 
     connect(m_options->separationIntervalSpinBox, SIGNAL(valueChanged(int)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 }
 
 KisHatchingOptions::~KisHatchingOptions()
 {
 }
 
 void KisHatchingOptions::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty("Hatching/angle", m_options->angleKisDoubleSliderSpinBox->value());
-    setting->setProperty("Hatching/separation", m_options->separationKisDoubleSliderSpinBox->value());
-    setting->setProperty("Hatching/thickness", m_options->thicknessKisDoubleSliderSpinBox->value());
-    setting->setProperty("Hatching/origin_x", m_options->originXKisDoubleSliderSpinBox->value());
-    setting->setProperty("Hatching/origin_y", m_options->originYKisDoubleSliderSpinBox->value());
-
-    setting->setProperty("Hatching/bool_nocrosshatching", m_options->noCrosshatchingRadioButton->isChecked());
-    setting->setProperty("Hatching/bool_perpendicular", m_options->perpendicularRadioButton->isChecked());
-    setting->setProperty("Hatching/bool_minusthenplus", m_options->minusThenPlusRadioButton->isChecked());
-    setting->setProperty("Hatching/bool_plusthenminus", m_options->plusThenMinusRadioButton->isChecked());
-    setting->setProperty("Hatching/bool_moirepattern", m_options->moirePatternRadioButton->isChecked());
-
-    setting->setProperty("Hatching/separationintervals", m_options->separationIntervalSpinBox->value());
+    HatchingOption op;
+
+    op.angle = m_options->angleKisDoubleSliderSpinBox->value();
+    op.separation = m_options->separationKisDoubleSliderSpinBox->value();
+    op.thickness = m_options->thicknessKisDoubleSliderSpinBox->value();
+    op.origin_x = m_options->originXKisDoubleSliderSpinBox->value();
+    op.origin_y = m_options->originYKisDoubleSliderSpinBox->value();
+
+    op.bool_nocrosshatching = m_options->noCrosshatchingRadioButton->isChecked();
+    op.bool_perpendicular = m_options->perpendicularRadioButton->isChecked();
+    op.bool_minusthenplus = m_options->minusThenPlusRadioButton->isChecked();
+    op.bool_plusthenminus = m_options->plusThenMinusRadioButton->isChecked();
+    op.bool_moirepattern = m_options->moirePatternRadioButton->isChecked();
+
+    op.separationintervals = m_options->separationIntervalSpinBox->value();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisHatchingOptions::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    m_options->angleKisDoubleSliderSpinBox->setValue(setting->getDouble("Hatching/angle"));
-    m_options->separationKisDoubleSliderSpinBox->setValue(setting->getDouble("Hatching/separation"));
-    m_options->thicknessKisDoubleSliderSpinBox->setValue(setting->getDouble("Hatching/thickness"));
-    m_options->originXKisDoubleSliderSpinBox->setValue(setting->getDouble("Hatching/origin_x"));
-    m_options->originYKisDoubleSliderSpinBox->setValue(setting->getDouble("Hatching/origin_y"));
-
-    m_options->noCrosshatchingRadioButton->setChecked(setting->getBool("Hatching/bool_nocrosshatching"));
-    m_options->perpendicularRadioButton->setChecked(setting->getBool("Hatching/bool_perpendicular"));
-    m_options->minusThenPlusRadioButton->setChecked(setting->getBool("Hatching/bool_minusthenplus"));
-    m_options->plusThenMinusRadioButton->setChecked(setting->getBool("Hatching/bool_plusthenminus"));
-    m_options->moirePatternRadioButton->setChecked(setting->getBool("Hatching/bool_moirepattern"));
-
-    m_options->separationIntervalSpinBox->setValue(setting->getInt("Hatching/separationintervals"));
+    HatchingOption op;
+    op.readOptionSetting(setting);
+
+    m_options->angleKisDoubleSliderSpinBox->setValue(op.angle);
+    m_options->separationKisDoubleSliderSpinBox->setValue(op.separation);
+    m_options->thicknessKisDoubleSliderSpinBox->setValue(op.thickness);
+    m_options->originXKisDoubleSliderSpinBox->setValue(op.origin_x);
+    m_options->originYKisDoubleSliderSpinBox->setValue(op.origin_y);
+
+    m_options->noCrosshatchingRadioButton->setChecked(op.bool_nocrosshatching);
+    m_options->perpendicularRadioButton->setChecked(op.bool_perpendicular);
+    m_options->minusThenPlusRadioButton->setChecked(op.bool_minusthenplus);
+    m_options->plusThenMinusRadioButton->setChecked(op.bool_plusthenminus);
+    m_options->moirePatternRadioButton->setChecked(op.bool_moirepattern);
+
+    m_options->separationIntervalSpinBox->setValue(op.separationintervals);
 }
 
 void KisHatchingOptions::lodLimitations(KisPaintopLodLimitations *l) const
 {
     l->limitations << KoID("hatching-brush", i18nc("PaintOp instant preview limitation", "Hatching Brush (heavy aliasing in preview mode)"));
 }
 
diff --git a/plugins/paintops/hatching/kis_hatching_options.h b/plugins/paintops/hatching/kis_hatching_options.h
index 5fff44cd71..985735daf2 100644
--- a/plugins/paintops/hatching/kis_hatching_options.h
+++ b/plugins/paintops/hatching/kis_hatching_options.h
@@ -1,43 +1,93 @@
 /*
  *  Copyright (c) 2008 Lukas Tvrdy <lukast.dev@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.
  */
 
 #ifndef KIS_HATCHING_OPTIONS_H
 #define KIS_HATCHING_OPTIONS_H
 
 #include <kis_paintop_option.h>
 
 class KisPaintopLodLimitations;
 class KisHatchingOptionsWidget;
 
 class KisHatchingOptions : public KisPaintOpOption
 {
 
 public:
     KisHatchingOptions();
     ~KisHatchingOptions();
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
     void lodLimitations(KisPaintopLodLimitations *l) const;
 
 private:
     KisHatchingOptionsWidget * m_options;
 
 };
 
+struct HatchingOption {
+    qreal angle;
+    qreal separation;
+    qreal thickness;
+    qreal origin_x;
+    qreal origin_y;
+
+    bool bool_nocrosshatching;
+    bool bool_perpendicular;
+    bool bool_minusthenplus;
+    bool bool_plusthenminus;
+    bool bool_moirepattern;
+
+    int separationintervals;
+
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty("Hatching/angle", angle);
+        setting->setProperty("Hatching/separation", separation);
+        setting->setProperty("Hatching/thickness", thickness);
+        setting->setProperty("Hatching/origin_x", origin_x);
+        setting->setProperty("Hatching/origin_y", origin_y);
+
+        setting->setProperty("Hatching/bool_nocrosshatching", bool_nocrosshatching);
+        setting->setProperty("Hatching/bool_perpendicular", bool_perpendicular);
+        setting->setProperty("Hatching/bool_minusthenplus", bool_minusthenplus);
+        setting->setProperty("Hatching/bool_plusthenminus", bool_plusthenminus);
+        setting->setProperty("Hatching/bool_moirepattern", bool_moirepattern);
+
+        setting->setProperty("Hatching/separationintervals", separationintervals);
+    }
+
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        angle = setting->getDouble("Hatching/angle");
+        separation = setting->getDouble("Hatching/separation");
+        thickness = setting->getDouble("Hatching/thickness");
+        origin_x = setting->getDouble("Hatching/origin_x");
+        origin_y = setting->getDouble("Hatching/origin_y");
+
+        bool_nocrosshatching = setting->getBool("Hatching/bool_nocrosshatching");
+        bool_perpendicular = setting->getBool("Hatching/bool_perpendicular");
+        bool_minusthenplus = setting->getBool("Hatching/bool_minusthenplus");
+        bool_plusthenminus = setting->getBool("Hatching/bool_plusthenminus");
+        bool_moirepattern = setting->getBool("Hatching/bool_moirepattern");
+
+        separationintervals = setting->getInt("Hatching/separationintervals");
+    }
+
+};
+
 #endif
diff --git a/plugins/paintops/hatching/kis_hatching_paintop_settings.cpp b/plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
index 3e8cd99ca7..6ad92a4190 100644
--- a/plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
+++ b/plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
@@ -1,96 +1,215 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
  *  Copyright (c) 2010 José Luis Vergara <pentalis@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_hatching_paintop_settings.h"
 
 #include <kis_paint_action_type_option.h>
 
 #include <QDomDocument>
 #include <QDomElement>
 
 const QString HATCHING_VERSION = "Hatching/Version";
 
+struct KisHatchingPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+
 KisHatchingPaintOpSettings::KisHatchingPaintOpSettings()
+    : m_d(new Private)
 {
     setProperty(HATCHING_VERSION, "2");
 }
 
 KisHatchingPaintOpSettings::~KisHatchingPaintOpSettings()
 {
 }
 
 void KisHatchingPaintOpSettings::initializeTwin(KisHatchingPaintOpSettings* convenienttwin) const
 {
     /*--------DO NOT REMOVE please, use this to review the XML config tree
     QMap<QString, QVariant> rofl = QMap<QString, QVariant>(getProperties());
 
     QMap<QString, QVariant>::const_iterator i;
     for (i = rofl.constBegin(); i != rofl.constEnd(); ++i)
         dbgKrita << i.key() << ":" << i.value();
     /----------DO NOT REMOVE----------------*/
 
     convenienttwin->enabledcurvecrosshatching = getBool("PressureCrosshatching");
     convenienttwin->enabledcurveopacity = getBool("PressureOpacity");
     convenienttwin->enabledcurveseparation = getBool("PressureSeparation");
     convenienttwin->enabledcurvesize = getBool("PressureSize");
     convenienttwin->enabledcurvethickness = getBool("PressureThickness");
 
     convenienttwin->angle = getDouble("Hatching/angle");
     convenienttwin->separation = getDouble("Hatching/separation");
     convenienttwin->thickness = getDouble("Hatching/thickness");
     convenienttwin->origin_x = getDouble("Hatching/origin_x");
     convenienttwin->origin_y = getDouble("Hatching/origin_y");
 
     convenienttwin->nocrosshatching = getBool("Hatching/bool_nocrosshatching");
     convenienttwin->perpendicular = getBool("Hatching/bool_perpendicular");
     convenienttwin->minusthenplus = getBool("Hatching/bool_minusthenplus");
     convenienttwin->plusthenminus = getBool("Hatching/bool_plusthenminus");
     convenienttwin->moirepattern = getBool("Hatching/bool_moirepattern");
 
     convenienttwin->separationintervals = getInt("Hatching/separationintervals");
 
     //convenienttwin->trigonometryalgebra = getBool("Hatching/bool_trigonometryalgebra");
     //convenienttwin->scratchoff = getBool("Hatching/bool_scratchoff");
     convenienttwin->antialias = getBool("Hatching/bool_antialias");
     convenienttwin->opaquebackground = getBool("Hatching/bool_opaquebackground");
     convenienttwin->subpixelprecision = getBool("Hatching/bool_subpixelprecision");
 
     if (getBool("Hatching/bool_nocrosshatching"))
         convenienttwin->crosshatchingstyle = 0;
     else if (getBool("Hatching/bool_perpendicular"))
         convenienttwin->crosshatchingstyle = 1;
     else if (getBool("Hatching/bool_minusthenplus"))
         convenienttwin->crosshatchingstyle = 2;
     else if (getBool("Hatching/bool_plusthenminus"))
         convenienttwin->crosshatchingstyle = 3;
     if (getBool("Hatching/bool_moirepattern"))
         convenienttwin->crosshatchingstyle = 4;
 
 }
 
 void KisHatchingPaintOpSettings::fromXML(const QDomElement& elt)
 {
     setProperty(HATCHING_VERSION, "1"); // This make sure that fromXML will override HAIRY_VERSION with 2, or will default to 1
     KisBrushBasedPaintOpSettings::fromXML(elt);
     QVariant v;
     if (!getProperty(HATCHING_VERSION, v) || v == "1") {
         setProperty("Hatching/thickness", 2.0 * getDouble("Hatching/thickness"));
     }
     setProperty(HATCHING_VERSION, "2"); // make sure it's saved as version 2 next time
 }
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_hatching_options.h"
+
+
+QList<KisUniformPaintOpPropertySP> KisHatchingPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "hatching_angle",
+                    i18n("Hatching Angle"),
+                    this, 0);
+
+            const QString degree = QChar(Qt::Key_degree);
+            prop->setRange(-90, 90);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setSuffix(degree);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.angle);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.angle = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "hatching_separation",
+                    i18n("Separation"),
+                    this, 0);
+
+            prop->setRange(1.0, 30);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.separation);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.separation = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "hatching_thickness",
+                    i18n("Thickness"),
+                    this, 0);
+
+            prop->setRange(1.0, 30);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setSuffix(i18n(" px"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.thickness);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    HatchingOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.thickness = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    return KisPaintOpSettings::uniformProperties() + props;
+}
+
diff --git a/plugins/paintops/hatching/kis_hatching_paintop_settings.h b/plugins/paintops/hatching/kis_hatching_paintop_settings.h
index cabdc4b834..1d09212935 100644
--- a/plugins/paintops/hatching/kis_hatching_paintop_settings.h
+++ b/plugins/paintops/hatching/kis_hatching_paintop_settings.h
@@ -1,75 +1,82 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@gmail.com>
  *  Copyright (c) 2010 José Luis Vergara <pentalis@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.
  */
 
 #ifndef KIS_HATCHING_PAINTOP_SETTINGS_H_
 #define KIS_HATCHING_PAINTOP_SETTINGS_H_
 
 #include <brushengine/kis_paintop_settings.h>
 #include <kis_brush_based_paintop_settings.h>
 
 #include "kis_hatching_paintop_settings_widget.h"
 
+#include <QScopedPointer>
+
 
 class KisHatchingPaintOpSettings : public KisBrushBasedPaintOpSettings
 {
 
 public:
     KisHatchingPaintOpSettings();
-    virtual ~KisHatchingPaintOpSettings();
+    ~KisHatchingPaintOpSettings();
 
     //Dialogs enabled
     bool enabledcurvecrosshatching;
     bool enabledcurveopacity;
     bool enabledcurveseparation;
     bool enabledcurvesize;
     bool enabledcurvethickness;
 
     //Hatching Options
     double angle;
     double separation;
     double thickness;
     double origin_x;
     double origin_y;
     bool nocrosshatching;
     bool perpendicular;
     bool minusthenplus;
     bool plusthenminus;
     bool moirepattern;
     int crosshatchingstyle;
     int separationintervals;
 
     //Hatching Preferences
     //bool trigonometryalgebra;
     //bool scratchoff;
     bool antialias;
     bool subpixelprecision;
     bool opaquebackground;
 
     //Crosshatching, Separation and Thickness curves
     double crosshatchingsensorvalue;
     double separationsensorvalue;
     double thicknesssensorvalue;
 
     void initializeTwin(KisHatchingPaintOpSettings* convenienttwin) const;
     using KisPropertiesConfiguration::fromXML;
     virtual void fromXML(const QDomElement&);
 
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/hatching/wdghatchingoptions.ui b/plugins/paintops/hatching/wdghatchingoptions.ui
index 2d288c70bc..d0467c8098 100644
--- a/plugins/paintops/hatching/wdghatchingoptions.ui
+++ b/plugins/paintops/hatching/wdghatchingoptions.ui
@@ -1,438 +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">
+      <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">
+      <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">
+      <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">
+      <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">
+      <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 crosshatching</string>
+         <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>Perpendicular plane only</string>
+         <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>-45° plane then +45° plane</string>
+         <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 then -45° plane</string>
+         <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>Moiré pattern</string>
+         <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="QSpinBox" name="separationIntervalSpinBox">
+       <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_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/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
index c116d4b2b6..32b629bd4e 100644
--- a/plugins/paintops/libpaintop/CMakeLists.txt
+++ b/plugins/paintops/libpaintop/CMakeLists.txt
@@ -1,97 +1,98 @@
 set(kritalibpaintop_LIB_SRCS
     kis_airbrush_option.cpp
     kis_auto_brush_widget.cpp
     kis_spacing_selection_widget.cpp
     kis_bidirectional_mixing_option.cpp
     kis_bidirectional_mixing_option_widget.cpp
     kis_brush_based_paintop.cpp
     kis_brush_chooser.cpp
     kis_brush_option_widget.cpp
     kis_brush_option.cpp
     kis_brush_selection_widget.cpp
     kis_color_option.cpp
     kis_color_source.cpp
     kis_color_source_option.cpp
     kis_color_source_option_widget.cpp
     kis_curve_option.cpp
     kis_curve_option_widget.cpp
+    kis_curve_option_uniform_property.cpp
     kis_custom_brush_widget.cpp
     kis_clipboard_brush_widget.cpp
     kis_dynamic_sensor.cc
     kis_dab_cache.cpp
     kis_filter_option.cpp
     kis_multi_sensors_model_p.cpp
     kis_multi_sensors_selector.cpp
     kis_paint_action_type_option.cpp
     kis_precision_option.cpp
     kis_pressure_darken_option.cpp
     kis_pressure_hsv_option.cpp
     kis_pressure_opacity_option.cpp
     kis_pressure_flow_option.cpp
     kis_pressure_mirror_option.cpp
     kis_pressure_scatter_option.cpp
     kis_pressure_scatter_option_widget.cpp
     kis_pressure_sharpness_option.cpp
     kis_pressure_sharpness_option_widget.cpp
     kis_pressure_mirror_option_widget.cpp
     kis_pressure_rotation_option.cpp
     kis_pressure_size_option.cpp
     kis_pressure_spacing_option.cpp
     kis_pressure_softness_option.cpp
     kis_pressure_mix_option.cpp
     kis_pressure_gradient_option.cpp
     kis_pressure_flow_opacity_option.cpp
     kis_pressure_flow_opacity_option_widget.cpp
     kis_pressure_spacing_option_widget.cpp
     kis_pressure_ratio_option.cpp
     kis_current_outline_fetcher.cpp
     kis_text_brush_chooser.cpp
     kis_brush_based_paintop_options_widget.cpp
     kis_brush_based_paintop_settings.cpp
     kis_compositeop_option.cpp
     kis_texture_option.cpp
     kis_pressure_texture_strength_option.cpp
     kis_embedded_pattern_manager.cpp
     sensors/kis_dynamic_sensors.cc
     sensors/kis_dynamic_sensor_drawing_angle.cpp
     sensors/kis_dynamic_sensor_distance.cc
     sensors/kis_dynamic_sensor_time.cc
     sensors/kis_dynamic_sensor_fade.cpp
     sensors/kis_dynamic_sensor_fuzzy.cpp
 )
 
 ki18n_wrap_ui(kritalibpaintop_LIB_SRCS
     forms/wdgautobrush.ui
     forms/wdgBrushSizeOptions.ui
     forms/wdgcurveoption.ui
     forms/wdgcustombrush.ui
     forms/wdgclipboardbrush.ui
     forms/wdgtextbrush.ui
     forms/wdgincremental.ui
     forms/wdgmultisensorsselector.ui
     forms/wdgairbrush.ui
     forms/wdgfilteroption.ui
     forms/wdgcoloroptions.ui
     forms/wdgbrushchooser.ui
     forms/wdgCompositeOpOption.ui
     forms/wdgflowopacityoption.ui
     sensors/SensorDistanceConfiguration.ui
     sensors/SensorTimeConfiguration.ui
     sensors/SensorFadeConfiguration.ui
 
 )
 
 add_library(kritalibpaintop SHARED ${kritalibpaintop_LIB_SRCS} )
 generate_export_header(kritalibpaintop BASE_NAME kritapaintop EXPORT_MACRO_NAME PAINTOP_EXPORT)
 
 target_link_libraries(kritalibpaintop kritaui kritalibbrush kritawidgetutils)
 target_link_libraries(kritalibpaintop LINK_INTERFACE_LIBRARIES kritaui kritalibbrush)
 
 set_target_properties(kritalibpaintop PROPERTIES
     VERSION ${GENERIC_KRITA_LIB_VERSION} SOVERSION ${GENERIC_KRITA_LIB_SOVERSION}
 )
 
 install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 add_subdirectory(tests)
diff --git a/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui b/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
index 41455c915c..fecb0fa2dd 100644
--- a/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
+++ b/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
@@ -1,179 +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>527</width>
+    <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="QDoubleSpinBox" name="sizeToStartFromSpinBox">
+      <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="QDoubleSpinBox" name="deltaValueSpinBox">
+      <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">
+      <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_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/paintops/libpaintop/kis_auto_brush_widget.cpp b/plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
index 96733f812b..b6128b96ae 100644
--- a/plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
+++ b/plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
@@ -1,349 +1,285 @@
 /*
  *  Copyright (c) 2004,2007,2009 Cyrille Berger <cberger@cberger.net>
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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 <compositeops/KoVcMultiArchBuildSupport.h> //MSVC requires that Vc come first
 #include "kis_auto_brush_widget.h"
 
 #include <math.h>
 #include <kis_debug.h>
 #include <QSpinBox>
 #include <QToolButton>
 #include <QImage>
 #include <QComboBox>
 #include <QLabel>
 #include <QPixmap>
 #include <QResizeEvent>
 
 #include <kis_fixed_paint_device.h>
 #include <kis_mask_generator.h>
 #include <kis_slider_spin_box.h>
+#include "kis_signals_blocker.h"
+#include "kis_signal_compressor.h"
+#include "kis_aspect_ratio_locker.h"
 
 
 #define showSlider(input, step) input->setRange(input->minimum(), input->maximum(), step)
 #include <kis_cubic_curve.h>
 
 KisAutoBrushWidget::KisAutoBrushWidget(QWidget *parent, const char* name)
     : KisWdgAutobrush(parent, name)
     , m_autoBrush(0)
-    , m_linkFade(false)
+    , m_updateCompressor(new KisSignalCompressor(100, KisSignalCompressor::FIRST_ACTIVE))
+    , m_fadeAspectLocker(new KisAspectRatioLocker())
 {
+    connect(m_updateCompressor.data(), SIGNAL(timeout()), SLOT(paramChanged()));
 
-    connect(aspectButton, SIGNAL(keepAspectRatioChanged(bool)), this, SLOT(linkFadeToggled(bool)));
-    aspectButton->setKeepAspectRatio(m_linkFade);
-
-    connect((QObject*)comboBoxShape, SIGNAL(activated(int)), this, SLOT(paramChanged()));
+    connect((QObject*)comboBoxShape, SIGNAL(activated(int)), m_updateCompressor.data(), SLOT(start()));
 
     inputRadius->setRange(0, 1000, 2);
     inputRadius->setExponentRatio(3.0);
     inputRadius->setSingleStep(1);
     inputRadius->setValue(5);
     inputRadius->setSuffix(i18n(" px"));
-    connect(inputRadius, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxRadiusChanged(qreal)));
+    inputRadius->setBlockUpdateSignalOnDrag(true);
+    connect(inputRadius, SIGNAL(valueChanged(qreal)), m_updateCompressor.data(), SLOT(start()));
 
     inputRatio->setRange(0.0, 1.0, 2);
     inputRatio->setSingleStep(0.1);
     inputRatio->setValue(1.0);
-    connect(inputRatio, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxRatioChanged(qreal)));
+    inputRatio->setBlockUpdateSignalOnDrag(true);
+    connect(inputRatio, SIGNAL(valueChanged(qreal)), m_updateCompressor.data(), SLOT(start()));
 
     inputHFade->setRange(0.0, 1.0, 2);
     inputHFade->setSingleStep(0.1);
     inputHFade->setValue(0.5);
-    connect(inputHFade, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxHorizontalChanged(qreal)));
 
     inputVFade->setRange(0.0, 1.0, 2);
     inputVFade->setSingleStep(0.1);
     inputVFade->setValue(0.5);
-    connect(inputVFade, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxVerticalChanged(qreal)));
+
+    aspectButton->setKeepAspectRatio(true);
+
+    m_fadeAspectLocker->connectSpinBoxes(inputHFade, inputVFade, aspectButton);
+    m_fadeAspectLocker->setBlockUpdateSignalOnDrag(true);
+    connect(m_fadeAspectLocker.data(), SIGNAL(sliderValueChanged()), m_updateCompressor.data(), SLOT(start()));
+    connect(m_fadeAspectLocker.data(), SIGNAL(aspectButtonChanged()), m_updateCompressor.data(), SLOT(start()));
 
     inputSpikes->setRange(2, 20);
     inputSpikes->setValue(2);
-    connect(inputSpikes, SIGNAL(valueChanged(int)), this, SLOT(spinBoxSpikesChanged(int)));
+    inputSpikes->setBlockUpdateSignalOnDrag(true);
+    connect(inputSpikes, SIGNAL(valueChanged(int)), m_updateCompressor.data(), SLOT(start()));
 
     inputRandomness->setRange(0, 100);
     inputRandomness->setValue(0);
-    connect(inputRandomness, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxRandomnessChanged(qreal)));
+    inputRandomness->setBlockUpdateSignalOnDrag(true);
+    connect(inputRandomness, SIGNAL(valueChanged(qreal)), m_updateCompressor.data(), SLOT(start()));
 
     inputAngle->setRange(0, 360);
     inputAngle->setSuffix(QChar(Qt::Key_degree));
     inputAngle->setValue(0);
-    connect(inputAngle, SIGNAL(valueChanged(int)), this, SLOT(spinBoxAngleChanged(int)));
+    inputAngle->setBlockUpdateSignalOnDrag(true);
+    connect(inputAngle, SIGNAL(valueChanged(int)), m_updateCompressor.data(), SLOT(start()));
 
-    connect(spacingWidget, SIGNAL(sigSpacingChanged()), SLOT(slotSpacingChanged()));
+    connect(spacingWidget, SIGNAL(sigSpacingChanged()), m_updateCompressor.data(), SLOT(start()));
 
     density->setRange(0, 100, 0);
     density->setSingleStep(1);
     density->setValue(100);
     density->setSuffix("%");
-    connect(density, SIGNAL(valueChanged(qreal)), this, SLOT(spinBoxDensityChanged(qreal)));
+    density->setBlockUpdateSignalOnDrag(true);
+    connect(density, SIGNAL(valueChanged(qreal)), m_updateCompressor.data(), SLOT(start()));
 
     KisCubicCurve topLeftBottomRightLinearCurve;
     topLeftBottomRightLinearCurve.setPoint(0, QPointF(0.0, 1.0));
     topLeftBottomRightLinearCurve.setPoint(1, QPointF(1.0, 0.0));
     softnessCurve->setCurve(topLeftBottomRightLinearCurve);
-    connect(softnessCurve, SIGNAL(modified()), this, SLOT(paramChanged()));
+    connect(softnessCurve, SIGNAL(modified()), m_updateCompressor.data(), SLOT(start()));
 
     m_brush = QImage(1, 1, QImage::Format_RGB32);
 
-    connect(brushPreview, SIGNAL(clicked()), SLOT(paramChanged()));
+    connect(brushPreview, SIGNAL(clicked()), m_updateCompressor.data(), SLOT(start()));
 
     QList<KoID> ids = KisMaskGenerator::maskGeneratorIds();
     for (int i = 0; i < ids.size(); i++) {
         comboBoxMaskType->insertItem(i, ids[i].name());
     }
 
-    connect(comboBoxMaskType, SIGNAL(activated(int)), SLOT(paramChanged()));
+    connect(comboBoxMaskType, SIGNAL(activated(int)), m_updateCompressor.data(), SLOT(start()));
     connect(comboBoxMaskType, SIGNAL(currentIndexChanged(int)), SLOT(setStackedWidget(int)));
+    setStackedWidget(comboBoxMaskType->currentIndex());
 
     brushPreview->setIconSize(QSize(100, 100));
 
-    connect(btnAntialiasing, SIGNAL(toggled(bool)), SLOT(paramChanged()));
+    connect(btnAntialiasing, SIGNAL(toggled(bool)), m_updateCompressor.data(), SLOT(start()));
 
-    paramChanged();
+    m_updateCompressor->start();
 
 }
 
+KisAutoBrushWidget::~KisAutoBrushWidget()
+{
+}
+
 void KisAutoBrushWidget::resizeEvent(QResizeEvent *)
 {
     brushPreview->setMinimumHeight(brushPreview->width()); // dirty hack !
     brushPreview->setMaximumHeight(brushPreview->width()); // dirty hack !
 }
 
 void KisAutoBrushWidget::activate()
 {
-    paramChanged();
+    m_updateCompressor->start();
 }
 
 void KisAutoBrushWidget::paramChanged()
 {
     KisMaskGenerator* kas;
 
     bool antialiasEdges = btnAntialiasing->isChecked();
 
     if (comboBoxMaskType->currentIndex() == 2) { // gaussian brush
         if (comboBoxShape->currentIndex() == 0) {
             kas = new KisGaussCircleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), antialiasEdges);
         }
         else {
             kas = new KisGaussRectangleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), antialiasEdges);
         }
     }
     else if (comboBoxMaskType->currentIndex() == 1) { // soft brush
         if (comboBoxShape->currentIndex() == 0) {
             kas = new KisCurveCircleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), softnessCurve->curve(), antialiasEdges);
         }
         else {
             kas = new KisCurveRectangleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), softnessCurve->curve(), antialiasEdges);
         }
     }
     else {// default == 0 or any other
         if (comboBoxShape->currentIndex() == 0) { // use index compare instead of comparing a translatable string
             kas = new KisCircleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), antialiasEdges);
         }
         else {
             kas = new KisRectangleMaskGenerator(inputRadius->value(),  inputRatio->value(), inputHFade->value(), inputVFade->value(), inputSpikes->value(), antialiasEdges);
         }
     }
     Q_CHECK_PTR(kas);
 
     m_autoBrush = new KisAutoBrush(kas, inputAngle->value() / 180.0 * M_PI, inputRandomness->value() / 100.0, density->value() / 100.0);
     m_autoBrush->setSpacing(spacingWidget->spacing());
     m_autoBrush->setAutoSpacing(spacingWidget->autoSpacingActive(), spacingWidget->autoSpacingCoeff());
     m_brush = m_autoBrush->image();
 
     QImage pi(m_brush);
     double coeff = 1.0;
     int bPw = brushPreview->width() - 3;
     if (pi.width() > bPw) {
         coeff =  bPw / (double)pi.width();
     }
     int bPh = brushPreview->height() - 3;
     if (pi.height() > coeff * bPh) {
         coeff = bPh / (double)pi.height();
     }
     if (coeff < 1.0) {
         pi = pi.scaled((int)(coeff * pi.width()) , (int)(coeff * pi.height()),  Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
     }
 
     QPixmap p = QPixmap::fromImage(pi);
     brushPreview->setIcon(QIcon(p));
 
     emit sigBrushChanged();
 }
 
 void KisAutoBrushWidget::setStackedWidget(int index)
 {
     if (index == 1) {
         stackedWidget->setCurrentIndex(1);
     }
     else {
         stackedWidget->setCurrentIndex(0);
     }
 }
 
-void KisAutoBrushWidget::spinBoxHorizontalChanged(qreal a)
-{
-    if (m_linkFade) {
-        inputVFade->blockSignals(true);
-        inputVFade->setValue(a);
-        inputVFade->blockSignals(false);
-    }
-
-    inputHFade->blockSignals(true);
-    inputHFade->setValue(a);
-    inputHFade->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxVerticalChanged(qreal a)
-{
-    if (m_linkFade) {
-        inputHFade->blockSignals(true);
-        inputHFade->setValue(a);
-        inputHFade->blockSignals(false);
-    }
-
-    inputVFade->blockSignals(true);
-    inputVFade->setValue(a);
-    inputVFade->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxRatioChanged(qreal a)
-{
-    inputRatio->blockSignals(true);
-    inputRatio->setValue(a);
-    inputRatio->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxRandomnessChanged(qreal a)
-{
-    inputRandomness->blockSignals(true);
-    inputRandomness->setValue(a);
-    inputRandomness->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxRadiusChanged(qreal a)
-{
-    inputRadius->blockSignals(true);
-    inputRadius->setValue(a);
-    inputRadius->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxSpikesChanged(int a)
-{
-    inputSpikes->blockSignals(true);
-    inputSpikes->setValue(a);
-    inputSpikes->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxAngleChanged(int a)
-{
-    inputAngle->blockSignals(true);
-    inputAngle->setValue(a);
-    inputAngle->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::spinBoxDensityChanged(qreal a)
-{
-    density->blockSignals(true);
-    density->setValue(a);
-    density->blockSignals(false);
-    paramChanged();
-}
-
-void KisAutoBrushWidget::slotSpacingChanged()
-{
-    paramChanged();
-}
-
-void KisAutoBrushWidget::linkFadeToggled(bool b)
-{
-    m_linkFade = b;
-
-    if (m_linkFade)
-        inputVFade->setValue(inputHFade->value());
-}
-
 KisBrushSP KisAutoBrushWidget::brush()
 {
     return m_autoBrush;
 }
 
 void KisAutoBrushWidget::setBrush(KisBrushSP brush)
 {
     m_autoBrush = brush;
     m_brush = brush->image();
     // XXX: lock, set and unlock the widgets.
     KisAutoBrush* aBrush = dynamic_cast<KisAutoBrush*>(brush.data());
+
+    KisSignalsBlocker b1(comboBoxShape, comboBoxMaskType);
+    KisSignalsBlocker b2(inputRadius, inputRatio, inputHFade, inputVFade, inputAngle, inputSpikes);
+    KisSignalsBlocker b3(spacingWidget, inputRandomness, density, softnessCurve, btnAntialiasing);
+
     if (aBrush->maskGenerator()->type() == KisMaskGenerator::CIRCLE) {
         comboBoxShape->setCurrentIndex(0);
     }
     else if (aBrush->maskGenerator()->type() == KisMaskGenerator::RECTANGLE) {
         comboBoxShape->setCurrentIndex(1);
     }
     else {
         comboBoxShape->setCurrentIndex(2);
     }
 
-    comboBoxMaskType->setCurrentIndex(comboBoxMaskType->findText(aBrush->maskGenerator()->name()));
+    const int mastTypeIndex = comboBoxMaskType->findText(aBrush->maskGenerator()->name());
+    comboBoxMaskType->setCurrentIndex(mastTypeIndex);
+    setStackedWidget(mastTypeIndex); // adjusting manually because the signals are blocked
 
     inputRadius->setValue(aBrush->maskGenerator()->diameter());
     inputRatio->setValue(aBrush->maskGenerator()->ratio());
     inputHFade->setValue(aBrush->maskGenerator()->horizontalFade());
     inputVFade->setValue(aBrush->maskGenerator()->verticalFade());
     inputAngle->setValue(aBrush->angle() * 180 / M_PI);
     inputSpikes->setValue(aBrush->maskGenerator()->spikes());
     spacingWidget->setSpacing(aBrush->autoSpacingActive(),
                               aBrush->autoSpacingActive() ?
                               aBrush->autoSpacingCoeff() : aBrush->spacing());
     inputRandomness->setValue(aBrush->randomness() * 100);
     density->setValue(aBrush->density() * 100);
 
     if (!aBrush->maskGenerator()->curveString().isEmpty()) {
         KisCubicCurve curve;
         curve.fromString(aBrush->maskGenerator()->curveString());
         softnessCurve->setCurve(curve);
     }
 
     btnAntialiasing->setChecked(aBrush->maskGenerator()->antialiasEdges());
 }
 
 
 void KisAutoBrushWidget::setBrushSize(qreal dxPixels, qreal dyPixels)
 {
     Q_UNUSED(dyPixels);
 
     qreal newWidth = inputRadius->value() + dxPixels;
     newWidth = qMax(newWidth, qreal(0.1));
 
     inputRadius->setValue(newWidth);
 }
 
 QSizeF KisAutoBrushWidget::brushSize() const
 {
     return QSizeF(inputRadius->value(), inputRadius->value() * inputRatio->value());
 }
 
 #include "moc_kis_auto_brush_widget.cpp"
diff --git a/plugins/paintops/libpaintop/kis_auto_brush_widget.h b/plugins/paintops/libpaintop/kis_auto_brush_widget.h
index b594cbc70d..acf1c2bf4b 100644
--- a/plugins/paintops/libpaintop/kis_auto_brush_widget.h
+++ b/plugins/paintops/libpaintop/kis_auto_brush_widget.h
@@ -1,85 +1,81 @@
 /*
  *  Copyright (c) 2004,2007 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_AUTO_BRUSH_WIDGET_H_
 #define _KIS_AUTO_BRUSH_WIDGET_H_
 
 #include <QObject>
 #include <QResizeEvent>
 #include "kritapaintop_export.h"
 #include "ui_wdgautobrush.h"
 #include <kis_auto_brush.h>
 
+class KisSignalCompressor;
+class KisAspectRatioLocker;
+
+
 class PAINTOP_EXPORT KisWdgAutobrush : public QWidget, public Ui::KisWdgAutobrush
 {
     Q_OBJECT
 
 public:
     KisWdgAutobrush(QWidget *parent, const char *name) : QWidget(parent) {
         setObjectName(name); setupUi(this);
     }
 
 };
 
 class PAINTOP_EXPORT KisAutoBrushWidget : public KisWdgAutobrush
 {
     Q_OBJECT
 
 public:
 
     KisAutoBrushWidget(QWidget *parent, const char* name);
+    ~KisAutoBrushWidget();
 
     void activate();
 
     KisBrushSP brush();
 
     void setBrush(KisBrushSP brush);
 
     void setBrushSize(qreal dxPixels, qreal dyPixels);
     QSizeF brushSize() const;
 
 private Q_SLOTS:
     void paramChanged();
     void setStackedWidget(int);
-    void spinBoxHorizontalChanged(qreal);
-    void spinBoxVerticalChanged(qreal);
-    void linkFadeToggled(bool);
-    void spinBoxRatioChanged(qreal);
-    void spinBoxRandomnessChanged(qreal);
-    void spinBoxRadiusChanged(qreal);
-    void spinBoxSpikesChanged(int);
-    void spinBoxAngleChanged(int);
-    void spinBoxDensityChanged(qreal);
-
-    void slotSpacingChanged();
 
 Q_SIGNALS:
 
     void sigBrushChanged();
 
 protected:
     virtual void resizeEvent(QResizeEvent *);
 
 private:
     QImage m_brush;
     KisBrushSP m_autoBrush;
     bool m_linkFade;
+    QScopedPointer<KisSignalCompressor> m_updateCompressor;
+    QScopedPointer<KisAspectRatioLocker> m_fadeAspectLocker;
 };
 
 
 #endif
diff --git a/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp b/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
index ca6232962b..021345de34 100644
--- a/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
+++ b/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
@@ -1,125 +1,329 @@
 /*
  *  Copyright (c) 2010 Sven Langkamp <sven.langkamp@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_brush_based_paintop_settings.h"
 
 #include <kis_paint_action_type_option.h>
 #include <kis_airbrush_option.h>
 #include "kis_brush_based_paintop_options_widget.h"
 #include <kis_boundary.h>
 #include "kis_brush_server.h"
 #include <QLineF>
+#include "kis_signals_blocker.h"
 
 
 KisBrushBasedPaintOpSettings::KisBrushBasedPaintOpSettings()
     : KisOutlineGenerationPolicy<KisPaintOpSettings>(KisCurrentOutlineFetcher::SIZE_OPTION |
             KisCurrentOutlineFetcher::ROTATION_OPTION |
             KisCurrentOutlineFetcher::MIRROR_OPTION)
 {
 }
 
 bool KisBrushBasedPaintOpSettings::paintIncremental()
 {
     if (hasProperty("PaintOpAction")) {
         return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
     }
     return true;
 }
 
 bool KisBrushBasedPaintOpSettings::isAirbrushing() const
 {
     return getBool(AIRBRUSH_ENABLED);
 }
 
 
 int KisBrushBasedPaintOpSettings::rate() const
 {
     return getInt(AIRBRUSH_RATE);
 }
 
 KisPaintOpSettingsSP KisBrushBasedPaintOpSettings::clone() const
 {
     KisPaintOpSettingsSP _settings = KisOutlineGenerationPolicy<KisPaintOpSettings>::clone();
     KisBrushBasedPaintOpSettings *settings =
         dynamic_cast<KisBrushBasedPaintOpSettings*>(_settings.data());
     settings->m_savedBrush = this->brush();
     return settings;
 }
 
 KisBrushSP KisBrushBasedPaintOpSettings::brush() const
 {
     KisBrushBasedPaintopOptionWidget *widget = dynamic_cast<KisBrushBasedPaintopOptionWidget*>(optionsWidget());
     return widget ? widget->brush() : m_savedBrush;
 }
 
 QPainterPath KisBrushBasedPaintOpSettings::brushOutlineImpl(const KisPaintInformation &info,
                                                             OutlineMode mode,
                                                             qreal additionalScale,
                                                             bool forceOutline) const
 {
     QPainterPath path;
 
     if (forceOutline || mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
         KisBrushSP brush = this->brush();
         qreal finalScale = brush->scale() * additionalScale;
 
         QPainterPath realOutline = brush->outline();
 
         if (mode == CursorIsCircleOutline || mode == CursorTiltOutline ||
             (forceOutline && mode == CursorNoOutline)) {
 
             QPainterPath ellipse;
             ellipse.addEllipse(realOutline.boundingRect());
             realOutline = ellipse;
         }
 
         path = outlineFetcher()->fetchOutline(info, this, realOutline, finalScale, brush->angle());
 
         if (mode == CursorTiltOutline) {
             QPainterPath tiltLine = makeTiltIndicator(info,
                 realOutline.boundingRect().center(),
                 realOutline.boundingRect().width() * 0.5,
                 3.0);
             path.addPath(outlineFetcher()->fetchOutline(info, this, tiltLine, finalScale, 0.0, true, realOutline.boundingRect().center().x(), realOutline.boundingRect().center().y()));
         }
     }
 
     return path;
 }
 
 QPainterPath KisBrushBasedPaintOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     return brushOutlineImpl(info, mode, 1.0);
 }
 
 bool KisBrushBasedPaintOpSettings::isValid() const
 {
     QString filename = getString("requiredBrushFile", "");
     if (!filename.isEmpty()) {
         KisBrushSP brush = KisBrushServer::instance()->brushServer()->resourceByFilename(filename);
         if (!brush) {
             return false;
         }
     }
     return true;
 }
 
 bool KisBrushBasedPaintOpSettings::isLoadable()
 {
     return (KisBrushServer::instance()->brushServer()->resources().count() > 0);
 }
+
+struct BrushReader {
+    BrushReader(const KisBrushBasedPaintOpSettings *parent)
+        : m_parent(parent)
+    {
+        if (m_parent->optionsWidget()) {
+            KisSignalsBlocker b(m_parent->optionsWidget());
+            m_parent->optionsWidget()->setConfigurationSafe(m_parent);
+        } else {
+            m_parent = 0;
+        }
+    }
+
+    KisBrushSP brush() {
+        return m_parent ? m_parent->brush() : 0;
+    }
+
+    const KisBrushBasedPaintOpSettings *m_parent;
+};
+
+struct BrushWriter {
+    BrushWriter(KisBrushBasedPaintOpSettings *parent)
+        : m_parent(parent)
+    {
+        if (!m_parent->optionsWidget()) {
+            m_parent = 0;
+        }
+    }
+
+    ~BrushWriter() {
+        if (m_parent && m_parent->optionsWidget()) {
+            m_parent->optionsWidget()->writeConfigurationSafe(m_parent);
+        }
+    }
+
+    KisBrushSP brush() {
+        return m_parent ? m_parent->brush() : 0;
+    }
+
+    KisBrushBasedPaintOpSettings *m_parent;
+};
+
+void KisBrushBasedPaintOpSettings::setAngle(qreal value)
+{
+    BrushWriter w(this);
+    if (!w.brush()) return;
+    w.brush()->setAngle(value);
+}
+
+qreal KisBrushBasedPaintOpSettings::angle() const
+{
+    BrushReader w(this);
+    if (!w.brush()) return 0.0;
+    return w.brush()->angle();
+}
+
+void KisBrushBasedPaintOpSettings::setSpacing(qreal value)
+{
+    BrushWriter w(this);
+    if (!w.brush()) return;
+    w.brush()->setSpacing(value);
+}
+
+qreal KisBrushBasedPaintOpSettings::spacing() const
+{
+    BrushReader w(this);
+    if (!w.brush()) return 0.0;
+    return w.brush()->spacing();
+}
+
+void KisBrushBasedPaintOpSettings::setAutoSpacing(bool active, qreal coeff)
+{
+    BrushWriter w(this);
+    if (!w.brush()) return;
+    w.brush()->setAutoSpacing(active, coeff);
+}
+
+
+bool KisBrushBasedPaintOpSettings::autoSpacingActive() const
+{
+    BrushReader w(this);
+    if (!w.brush()) return 0.0;
+    return w.brush()->autoSpacingActive();
+}
+
+qreal KisBrushBasedPaintOpSettings::autoSpacingCoeff() const
+{
+    BrushReader w(this);
+    if (!w.brush()) return 0.0;
+    return w.brush()->autoSpacingCoeff();
+}
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+QList<KisUniformPaintOpPropertySP> KisBrushBasedPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "angle",
+                    "Angle",
+                    this, 0);
+
+            prop->setRange(0, 360);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    const qreal angleResult = kisRadiansToDegrees(s->angle());
+                    prop->setValue(angleResult);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    s->setAngle(kisDegreesToRadians(prop->value().toReal()));
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisUniformPaintOpPropertyCallback *prop =
+                new KisUniformPaintOpPropertyCallback(
+                    KisUniformPaintOpPropertyCallback::Bool,
+                    "auto_spacing",
+                    "Auto Spacing",
+                    this, 0);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    prop->setValue(s->autoSpacingActive());
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    s->setAutoSpacing(prop->value().toBool(), s->autoSpacingCoeff());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "spacing",
+                    "Spacing",
+                    this, 0);
+
+            prop->setRange(0.01, 10);
+            prop->setSingleStep(0.01);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    const qreal value = s->autoSpacingActive() ?
+                        s->autoSpacingCoeff() : s->spacing();
+                    prop->setValue(value);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisBrushBasedPaintOpSettings *s =
+                        dynamic_cast<KisBrushBasedPaintOpSettings*>(prop->settings().data());
+
+                    if (s->autoSpacingActive()) {
+                        s->setAutoSpacing(true, prop->value().toReal());
+                    } else {
+                        s->setSpacing(prop->value().toReal());
+                    }
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    return KisPaintOpSettings::uniformProperties() + props;
+}
diff --git a/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h b/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
index 85c4335380..5a6d1b6233 100644
--- a/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
+++ b/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
@@ -1,60 +1,75 @@
 /*
  *  Copyright (c) 2010 Sven Langkamp <sven.langkamp@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.
  */
 
 #ifndef KIS_BRUSH_BASED_PAINTOP_SETTINGS_H
 #define KIS_BRUSH_BASED_PAINTOP_SETTINGS_H
 
 #include <brushengine/kis_paintop_settings.h>
 #include <kritapaintop_export.h>
 #include <kis_outline_generation_policy.h>
 #include "kis_brush.h"
 
 
 class PAINTOP_EXPORT KisBrushBasedPaintOpSettings : public KisOutlineGenerationPolicy<KisPaintOpSettings>
 {
 public:
     KisBrushBasedPaintOpSettings();
 
     ///Reimplemented
     virtual bool paintIncremental();
 
     ///Reimplemented
     virtual bool isAirbrushing() const;
 
     ///Reimplemented
     virtual int rate() const;
 
     using KisPaintOpSettings::brushOutline;
     virtual QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
 
     ///Reimplemented
     virtual bool isValid() const;
 
     ///Reimplemented
     virtual bool isLoadable();
 
     KisBrushSP brush() const;
 
     KisPaintOpSettingsSP clone() const;
 
+    void setAngle(qreal value);
+    qreal angle() const;
+
+    void setSpacing(qreal spacing);
+    qreal spacing() const;
+
+    void setAutoSpacing(bool active, qreal coeff);
+
+    bool autoSpacingActive() const;
+    qreal autoSpacingCoeff() const;
+
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
 protected:
     QPainterPath brushOutlineImpl(const KisPaintInformation &info, OutlineMode mode, qreal additionalScale, bool forceOutline = false) const;
     KisBrushSP m_savedBrush;
+    QList<KisUniformPaintOpPropertyWSP> m_uniformProperties;
 };
 
 #endif // KIS_BRUSH_BASED_PAINTOP_SETTINGS_H
diff --git a/plugins/paintops/libpaintop/kis_curve_option_uniform_property.cpp b/plugins/paintops/libpaintop/kis_curve_option_uniform_property.cpp
new file mode 100644
index 0000000000..f56a7dee55
--- /dev/null
+++ b/plugins/paintops/libpaintop/kis_curve_option_uniform_property.cpp
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2016 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_curve_option_uniform_property.h"
+
+#include "kis_curve_option.h"
+#include "kis_paintop_settings.h"
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+
+
+KisCurveOptionUniformProperty::KisCurveOptionUniformProperty(const QString &name,
+                                                             KisCurveOption *option,
+                                                             KisPaintOpSettingsSP settings,
+                                                             QObject *parent)
+    : KisDoubleSliderBasedPaintOpProperty(Double,
+                                          name,
+                                          option->name(),
+                                          settings,
+                                          parent),
+      m_option(option)
+{
+    setRange(option->minValue(), option->maxValue());
+    setSingleStep(0.01);
+
+    KisPaintOpPresetSP preset = settings->preset();
+
+    KIS_SAFE_ASSERT_RECOVER_RETURN(preset);
+    connect(preset->updateProxy(), SIGNAL(sigSettingsChanged()), this, SLOT(requestReadValue()));
+
+    requestReadValue();
+}
+
+KisCurveOptionUniformProperty::~KisCurveOptionUniformProperty()
+{
+}
+
+void KisCurveOptionUniformProperty::readValueImpl()
+{
+    m_option->readOptionSetting(settings().data());
+    setValue(m_option->value());
+}
+
+void KisCurveOptionUniformProperty::writeValueImpl()
+{
+    m_option->readOptionSetting(settings().data());
+    m_option->setValue(value().toReal());
+    m_option->writeOptionSetting(settings().data());
+}
+
+bool KisCurveOptionUniformProperty::isVisible() const
+{
+    return !m_option->isCheckable() || m_option->isChecked();
+}
diff --git a/libs/ui/kis_aspect_ratio_locker.h b/plugins/paintops/libpaintop/kis_curve_option_uniform_property.h
similarity index 53%
copy from libs/ui/kis_aspect_ratio_locker.h
copy to plugins/paintops/libpaintop/kis_curve_option_uniform_property.h
index 191461c149..b6ba20f003 100644
--- a/libs/ui/kis_aspect_ratio_locker.h
+++ b/plugins/paintops/libpaintop/kis_curve_option_uniform_property.h
@@ -1,53 +1,47 @@
 /*
  *  Copyright (c) 2016 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.
  */
 
-#ifndef __KIS_ASPECT_RATIO_LOCKER_H
-#define __KIS_ASPECT_RATIO_LOCKER_H
+#ifndef __KIS_CURVE_OPTION_UNIFORM_PROPERTY_H
+#define __KIS_CURVE_OPTION_UNIFORM_PROPERTY_H
 
 #include <QScopedPointer>
-#include <QObject>
-#include "kritaui_export.h"
+#include "kis_slider_based_paintop_property.h"
+#include <kritapaintop_export.h>
 
-class QSpinBox;
-class KoAspectButton;
+class KisCurveOption;
 
-class KRITAUI_EXPORT KisAspectRatioLocker : public QObject
+
+class PAINTOP_EXPORT KisCurveOptionUniformProperty : public KisDoubleSliderBasedPaintOpProperty
 {
-    Q_OBJECT
 public:
-    KisAspectRatioLocker(QObject *parent);
-    ~KisAspectRatioLocker();
-
-    void connectSpinBoxes(QSpinBox *spinOne, QSpinBox *spinTwo, KoAspectButton *apectButton);
-
+    KisCurveOptionUniformProperty(const QString &name,
+                                  KisCurveOption *option,
+                                  KisPaintOpSettingsSP settings,
+                                  QObject *parent);
+    ~KisCurveOptionUniformProperty();
 
-private Q_SLOTS:
-    void slotSpinOneChanged();
-    void slotSpinTwoChanged();
-    void slotAspectButtonChanged();
+    virtual void readValueImpl();
+    virtual void writeValueImpl();
 
-Q_SIGNALS:
-    void sliderValueChanged();
-    void aspectButtonChanged();
+    virtual bool isVisible() const;
 
 private:
-    struct Private;
-    const QScopedPointer<Private> m_d;
+    QScopedPointer<KisCurveOption> m_option;
 };
 
-#endif /* __KIS_ASPECT_RATIO_LOCKER_H */
+#endif /* __KIS_CURVE_OPTION_UNIFORM_PROPERTY_H */
diff --git a/plugins/paintops/particle/kis_particle_paintop_settings.cpp b/plugins/paintops/particle/kis_particle_paintop_settings.cpp
index 8b9f2bd687..ce935b5a64 100644
--- a/plugins/paintops/particle/kis_particle_paintop_settings.cpp
+++ b/plugins/paintops/particle/kis_particle_paintop_settings.cpp
@@ -1,40 +1,262 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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_particle_paintop_settings.h"
 
 #include "kis_particle_paintop_settings_widget.h"
 #include "kis_particleop_option.h"
 
 #include <kis_paint_action_type_option.h>
 #include <kis_airbrush_option.h>
 
+struct KisParticlePaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+KisParticlePaintOpSettings::KisParticlePaintOpSettings()
+    : m_d(new Private)
+{
+}
+
+KisParticlePaintOpSettings::~KisParticlePaintOpSettings()
+{
+}
 
 bool KisParticlePaintOpSettings::paintIncremental()
 {
     return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
 }
 
 bool KisParticlePaintOpSettings::isAirbrushing() const
 {
     return getBool(AIRBRUSH_ENABLED);
 }
 
 int KisParticlePaintOpSettings::rate() const
 {
     return getInt(AIRBRUSH_RATE);
 }
+
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_particleop_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+
+
+QList<KisUniformPaintOpPropertySP> KisParticlePaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "particle_particles",
+                    i18n("Particles"),
+                    this, 0);
+
+            prop->setRange(1, 500);
+            prop->setSingleStep(1);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.particle_count));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_count = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "particle_opecityweight",
+                    i18n("Opacity Weight"),
+                    this, 0);
+
+            prop->setRange(0.01, 1.0);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.particle_weight);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_weight = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "particle_dx_scale",
+                    i18n("dx scale"),
+                    this, 0);
+
+            prop->setRange(-2, 2);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.particle_scale_x);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_scale_x = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "particle_dy_scale",
+                    i18n("dy scale"),
+                    this, 0);
+
+            prop->setRange(-2, 2);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.particle_scale_y);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_scale_y = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "particle_gravity",
+                    i18n("Gravity"),
+                    this, 0);
+
+            prop->setRange(0.01, 1.0);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.particle_gravity);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_gravity = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "particle_iterations",
+                    i18n("Iterations"),
+                    this, 0);
+
+            prop->setRange(1, 300);
+            prop->setSingleStep(1);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.particle_iterations));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    ParticleOption option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particle_iterations = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id()) {
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/particle/kis_particle_paintop_settings.h b/plugins/paintops/particle/kis_particle_paintop_settings.h
index bdc68793c8..706277016b 100644
--- a/plugins/paintops/particle/kis_particle_paintop_settings.h
+++ b/plugins/paintops/particle/kis_particle_paintop_settings.h
@@ -1,35 +1,45 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_PARTICLE_PAINTOP_SETTINGS_H_
 #define KIS_PARTICLE_PAINTOP_SETTINGS_H_
 
+#include <QScopedPointer>
 #include <brushengine/kis_paintop_settings.h>
 #include <kis_types.h>
 
 class KisParticlePaintOpSettings : public KisPaintOpSettings
 {
 
 public:
+
+    KisParticlePaintOpSettings();
+    ~KisParticlePaintOpSettings();
+
     bool paintIncremental();
     bool isAirbrushing() const;
     int rate() const;
 
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/particle/kis_particleop_option.cpp b/plugins/paintops/particle/kis_particleop_option.cpp
index e6b2ff17ad..10d6b1bfcd 100644
--- a/plugins/paintops/particle/kis_particleop_option.cpp
+++ b/plugins/paintops/particle/kis_particleop_option.cpp
@@ -1,133 +1,139 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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_particleop_option.h"
 #include <klocalizedstring.h>
 
 #include <QWidget>
 #include <QRadioButton>
 
 #include <brushengine/kis_paintop_lod_limitations.h>
 
 #include "ui_wdgparticleoptions.h"
 
 class KisParticleOpOptionsWidget: public QWidget, public Ui::WdgParticleOptions
 {
 public:
     KisParticleOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
     }
 };
 
 KisParticleOpOption::KisParticleOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisParticleOpOption");
 
     m_checkable = false;
     m_options = new KisParticleOpOptionsWidget();
 
     m_options->gravSPBox->setRange(-1.0, 1.0, 3);
     m_options->gravSPBox->setValue(0.989);
 
     m_options->dySPBox->setRange(-10.0, 10.0, 2);
     m_options->dySPBox->setValue(0.3);
 
     m_options->dxSPBox->setRange(-10.0, 10.0, 2);
     m_options->dxSPBox->setValue(0.3);
 
     m_options->weightSPBox->setRange(0.01, 1.0, 2);
     m_options->weightSPBox->setValue(0.2);
 
     m_options->particleSpinBox->setRange(1.0, 500.0, 0);
     m_options->particleSpinBox->setValue(50);
     m_options->particleSpinBox->setExponentRatio(3.0);
 
     m_options->itersSPBox->setRange(1, 200, 0);
     m_options->itersSPBox->setValue(10);
 
 
     connect(m_options->particleSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->itersSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->gravSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->weightSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->dxSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->dySPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
 
     setConfigurationPage(m_options);
 }
 
 KisParticleOpOption::~KisParticleOpOption()
 {
     delete m_options;
 }
 
 int KisParticleOpOption::particleCount() const
 {
     return m_options->particleSpinBox->value();
 }
 
 qreal KisParticleOpOption::weight() const
 {
     return m_options->weightSPBox->value();
 }
 
 
 QPointF KisParticleOpOption::scale() const
 {
     return QPointF(m_options->dxSPBox->value(), m_options->dySPBox->value());
 }
 
 
 int KisParticleOpOption::iterations() const
 {
     return m_options->itersSPBox->value();
 }
 
 
 
 qreal KisParticleOpOption::gravity() const
 {
     return m_options->gravSPBox->value();
 }
 
 void KisParticleOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(PARTICLE_COUNT, particleCount());
-    setting->setProperty(PARTICLE_ITERATIONS, iterations());
-    setting->setProperty(PARTICLE_GRAVITY, gravity());
-    setting->setProperty(PARTICLE_WEIGHT, weight());
-    setting->setProperty(PARTICLE_SCALE_X, scale().x());
-    setting->setProperty(PARTICLE_SCALE_Y, scale().y());
+    ParticleOption op;
+
+    op.particle_count = particleCount();
+    op.particle_iterations = iterations();
+    op.particle_gravity = gravity();
+    op.particle_weight = weight();
+    op.particle_scale_x = scale().x();
+    op.particle_scale_y = scale().y();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisParticleOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-
-    m_options->particleSpinBox->setValue((qreal)setting->getInt(PARTICLE_COUNT));
-    m_options->itersSPBox->setValue((qreal)setting->getInt(PARTICLE_ITERATIONS));
-    m_options->gravSPBox->setValue((qreal)setting->getDouble(PARTICLE_GRAVITY));
-    m_options->weightSPBox->setValue((qreal)setting->getDouble(PARTICLE_WEIGHT));
-    m_options->dxSPBox->setValue((qreal)setting->getDouble(PARTICLE_SCALE_X));
-    m_options->dySPBox->setValue((qreal)setting->getDouble(PARTICLE_SCALE_Y));
+    ParticleOption op;
+    op.readOptionSetting(setting);
+
+    m_options->particleSpinBox->setValue(op.particle_count);
+    m_options->itersSPBox->setValue(op.particle_iterations);
+    m_options->gravSPBox->setValue(op.particle_gravity);
+    m_options->weightSPBox->setValue(op.particle_weight);
+    m_options->dxSPBox->setValue(op.particle_scale_x);
+    m_options->dySPBox->setValue(op.particle_scale_y);
 }
 
 void KisParticleOpOption::lodLimitations(KisPaintopLodLimitations *l) const
 {
     l->blockers << KoID("particle-brush", i18nc("PaintOp instant preview limitation", "Particle Brush (not supported)"));
 }
diff --git a/plugins/paintops/particle/kis_particleop_option.h b/plugins/paintops/particle/kis_particleop_option.h
index 1664dd88ac..65c411da4b 100644
--- a/plugins/paintops/particle/kis_particleop_option.h
+++ b/plugins/paintops/particle/kis_particleop_option.h
@@ -1,53 +1,81 @@
 /*
  *  Copyright (c) 2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_PARTICLEOP_OPTION_H
 #define KIS_PARTICLEOP_OPTION_H
 
 #include <kis_paintop_option.h>
 
 const QString PARTICLE_COUNT = "Particle/count";
 const QString PARTICLE_GRAVITY = "Particle/gravity";
 const QString PARTICLE_WEIGHT = "Particle/weight";
 const QString PARTICLE_ITERATIONS = "Particle/iterations";
 const QString PARTICLE_SCALE_X = "Particle/scaleX";
 const QString PARTICLE_SCALE_Y = "Particle/scaleY";
 
 class KisParticleOpOptionsWidget;
 class KisPaintopLodLimitations;
 
 class KisParticleOpOption : public KisPaintOpOption
 {
 public:
     KisParticleOpOption();
     ~KisParticleOpOption();
 
     int particleCount() const;
     qreal weight() const;
     qreal gravity() const;
     int iterations() const;
     QPointF scale() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
     void lodLimitations(KisPaintopLodLimitations *l) const;
 
 private:
     KisParticleOpOptionsWidget * m_options;
 };
 
+struct ParticleOption {
+    int particle_count;
+    int particle_iterations;
+    qreal particle_gravity;
+    qreal particle_weight;
+    qreal particle_scale_x;
+    qreal particle_scale_y;
+
+
+    void readOptionSetting(const KisPropertiesConfiguration* setting) {
+        particle_count = setting->getInt(PARTICLE_COUNT);
+        particle_iterations = setting->getInt(PARTICLE_ITERATIONS);
+        particle_gravity = setting->getDouble(PARTICLE_GRAVITY);
+        particle_weight = setting->getDouble(PARTICLE_WEIGHT);
+        particle_scale_x = setting->getDouble(PARTICLE_SCALE_X);
+        particle_scale_y = setting->getDouble(PARTICLE_SCALE_Y);
+    }
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(PARTICLE_COUNT, particle_count);
+        setting->setProperty(PARTICLE_ITERATIONS, particle_iterations);
+        setting->setProperty(PARTICLE_GRAVITY, particle_gravity);
+        setting->setProperty(PARTICLE_WEIGHT, particle_weight);
+        setting->setProperty(PARTICLE_SCALE_X, particle_scale_x);
+        setting->setProperty(PARTICLE_SCALE_Y, particle_scale_y);
+    }
+};
+
 #endif
diff --git a/plugins/paintops/spray/kis_spray_paintop.cpp b/plugins/paintops/spray/kis_spray_paintop.cpp
index 3905ef3013..5d83c8ec60 100644
--- a/plugins/paintops/spray/kis_spray_paintop.cpp
+++ b/plugins/paintops/spray/kis_spray_paintop.cpp
@@ -1,131 +1,131 @@
 /*
  *  Copyright (c) 2008-2012 Lukáš Tvrdý <lukast.dev@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_spray_paintop.h"
 #include "kis_spray_paintop_settings.h"
 
 #include <cmath>
 
 #include <QRect>
 #include <kis_global.h>
 #include <kis_paint_device.h>
 #include <kis_painter.h>
 #include <kis_types.h>
 #include <brushengine/kis_paintop.h>
 #include <kis_node.h>
 
 #include <kis_pressure_rotation_option.h>
 #include <kis_pressure_opacity_option.h>
 #include <kis_pressure_size_option.h>
 #include <kis_fixed_paint_device.h>
 #include <kis_brush_option.h>
 #include <kis_sprayop_option.h>
 #include <kis_spray_shape_option.h>
 #include <kis_color_option.h>
 #include <kis_lod_transform.h>
 
 
 KisSprayPaintOp::KisSprayPaintOp(const KisSprayPaintOpSettings *settings, KisPainter *painter, KisNodeSP node, KisImageSP image)
     : KisPaintOp(painter)
     , m_settings(settings)
     , m_isPresetValid(true)
     , m_node(node)
 {
     Q_ASSERT(settings);
     Q_ASSERT(painter);
     Q_UNUSED(image);
 
     m_rotationOption.readOptionSetting(settings);
     m_opacityOption.readOptionSetting(settings);
     m_sizeOption.readOptionSetting(settings);
 
     m_rotationOption.resetAllSensors();
     m_opacityOption.resetAllSensors();
     m_sizeOption.resetAllSensors();
 
     m_brushOption.readOptionSetting(settings, true);
 
     m_colorProperties.fillProperties(settings);
-    m_properties.loadSettings(settings);
+    m_properties.readOptionSetting(settings);
     // first load tip properties as shape properties are dependent on diameter/scale/aspect
     m_shapeProperties.loadSettings(settings, m_properties.diameter * m_properties.scale, m_properties.diameter * m_properties.aspect * m_properties.scale);
 
     // TODO: what to do with proportional sizes?
     m_shapeDynamicsProperties.loadSettings(settings);
 
     if (!m_shapeProperties.enabled && !m_brushOption.brush()) {
         // in case the preset does not contain the definition for KisBrush
         m_isPresetValid = false;
         dbgKrita << "Preset is not valid. Painting is not possible. Use the preset editor to fix current brush engine preset.";
     }
 
     m_sprayBrush.setProperties(&m_properties, &m_colorProperties,
                                &m_shapeProperties, &m_shapeDynamicsProperties, m_brushOption.brush());
 
     m_sprayBrush.setFixedDab(cachedDab());
 
     // spacing
     if ((m_properties.diameter * 0.5) > 1) {
         m_ySpacing = m_xSpacing = m_properties.diameter * 0.5 * m_properties.spacing;
     }
     else {
         m_ySpacing = m_xSpacing = 1.0;
     }
     m_spacing = m_xSpacing;
 }
 
 KisSprayPaintOp::~KisSprayPaintOp()
 {
 }
 
 KisSpacingInformation KisSprayPaintOp::paintAt(const KisPaintInformation& info)
 {
     if (!painter() || !m_isPresetValid) {
         return KisSpacingInformation(m_spacing);
     }
 
     if (!m_dab) {
         m_dab = source()->createCompositionSourceDevice();
     }
     else {
         m_dab->clear();
     }
 
     qreal rotation = m_rotationOption.apply(info);
     quint8 origOpacity = m_opacityOption.apply(painter(), info);
     // Spray Brush is capable of working with zero scale,
     // so no additional checks for 'zero'ness are needed
     const qreal scale = m_sizeOption.apply(info);
     const qreal additionalScale = KisLodTransform::lodToScale(painter()->device());
 
 
     m_sprayBrush.paint(m_dab,
                        m_node->paintDevice(),
                        info,
                        rotation,
                        scale, additionalScale,
                        painter()->paintColor(),
                        painter()->backgroundColor());
 
     QRect rc = m_dab->extent();
     painter()->bitBlt(rc.topLeft(), m_dab, rc);
     painter()->renderMirrorMask(rc, m_dab);
     painter()->setOpacity(origOpacity);
 
     return KisSpacingInformation(m_spacing * additionalScale);
 }
diff --git a/plugins/paintops/spray/kis_spray_paintop_settings.cpp b/plugins/paintops/spray/kis_spray_paintop_settings.cpp
index 50f382c449..4706ba8b63 100644
--- a/plugins/paintops/spray/kis_spray_paintop_settings.cpp
+++ b/plugins/paintops/spray/kis_spray_paintop_settings.cpp
@@ -1,67 +1,212 @@
 /*
  *  Copyright (c) 2008,2009,2010 Lukáš Tvrdý <lukast.dev@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 <cmath>
 
 #include <kis_paint_action_type_option.h>
 #include <kis_color_option.h>
 
 #include "kis_spray_paintop_settings.h"
 #include "kis_sprayop_option.h"
 #include "kis_spray_shape_option.h"
 #include <kis_airbrush_option.h>
 
+struct KisSprayPaintOpSettings::Private
+{
+    QList<KisUniformPaintOpPropertyWSP> uniformProperties;
+};
+
+
 KisSprayPaintOpSettings::KisSprayPaintOpSettings()
     : KisOutlineGenerationPolicy<KisPaintOpSettings>(KisCurrentOutlineFetcher::SIZE_OPTION |
-            KisCurrentOutlineFetcher::ROTATION_OPTION)
+                                                     KisCurrentOutlineFetcher::ROTATION_OPTION),
+    m_d(new Private)
+{
+}
+
+KisSprayPaintOpSettings::~KisSprayPaintOpSettings()
 {
 }
 
 bool KisSprayPaintOpSettings::paintIncremental()
 {
     return (enumPaintActionType)getInt("PaintOpAction", WASH) == BUILDUP;
 }
 
 bool KisSprayPaintOpSettings::isAirbrushing() const
 {
     return getBool(AIRBRUSH_ENABLED);
 }
 
 int KisSprayPaintOpSettings::rate() const
 {
     return getInt(AIRBRUSH_RATE);
 }
 
 
 QPainterPath KisSprayPaintOpSettings::brushOutline(const KisPaintInformation &info, OutlineMode mode) const
 {
     QPainterPath path;
     if (mode == CursorIsOutline || mode == CursorIsCircleOutline || mode == CursorTiltOutline) {
         qreal width = getInt(SPRAY_DIAMETER);
         qreal height = getInt(SPRAY_DIAMETER) * getDouble(SPRAY_ASPECT);
         path = ellipseOutline(width, height, getDouble(SPRAY_SCALE), getDouble(SPRAY_ROTATION));
         path = outlineFetcher()->fetchOutline(info, this, path);
 
         if (mode == CursorTiltOutline) {
             QPainterPath tiltLine =
                 makeTiltIndicator(info, QPointF(0.0, 0.0), width * 0.5, 3.0);
             path.addPath(outlineFetcher()->fetchOutline(info, this, tiltLine, 1.0, 0.0, true, 0, 0));
         }
     }
     return path;
 }
+
+#include <brushengine/kis_slider_based_paintop_property.h>
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings_update_proxy.h"
+#include "kis_sprayop_option.h"
+#include "kis_standard_uniform_properties_factory.h"
+typedef KisCallbackBasedPaintopProperty<KisUniformPaintOpProperty> KisUniformPaintOpPropertyCallback;
+
+
+QList<KisUniformPaintOpPropertySP> KisSprayPaintOpSettings::uniformProperties()
+{
+    QList<KisUniformPaintOpPropertySP> props =
+        listWeakToStrong(m_d->uniformProperties);
+
+    if (props.isEmpty()) {
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "spacing",
+                    i18n("Spacing"),
+                    this, 0);
+
+            prop->setRange(0.01, 10);
+            prop->setSingleStep(0.01);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(option.spacing);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.spacing = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisIntSliderBasedPaintOpPropertyCallback *prop =
+                new KisIntSliderBasedPaintOpPropertyCallback(
+                    KisIntSliderBasedPaintOpPropertyCallback::Int,
+                    "spray_particlecount",
+                    i18n("Particle Count"),
+                    this, 0);
+
+            prop->setRange(0, 1000);
+            prop->setExponentRatio(3);
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+
+                    prop->setValue(int(option.particleCount));
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.particleCount = prop->value().toInt();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    return !option.useDensity;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+        {
+            KisDoubleSliderBasedPaintOpPropertyCallback *prop =
+                new KisDoubleSliderBasedPaintOpPropertyCallback(
+                    KisDoubleSliderBasedPaintOpPropertyCallback::Double,
+                    "spray_density",
+                    i18n("Density"),
+                    this, 0);
+
+            prop->setRange(0.1, 100);
+            prop->setSingleStep(0.01);
+            prop->setDecimals(2);
+            prop->setExponentRatio(3);
+            prop->setSuffix(i18n("%"));
+
+            prop->setReadCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    prop->setValue(option.coverage);
+                });
+            prop->setWriteCallback(
+                [](KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    option.coverage = prop->value().toReal();
+                    option.writeOptionSetting(prop->settings().data());
+                });
+            prop->setIsVisibleCallback(
+                [](const KisUniformPaintOpProperty *prop) {
+                    KisSprayProperties option;
+                    option.readOptionSetting(prop->settings().data());
+                    return option.useDensity;
+                });
+
+            QObject::connect(preset()->updateProxy(), SIGNAL(sigSettingsChanged()), prop, SLOT(requestReadValue()));
+            prop->requestReadValue();
+            props << toQShared(prop);
+        }
+    }
+    {
+        using namespace KisStandardUniformPropertiesFactory;
+
+        Q_FOREACH (KisUniformPaintOpPropertySP prop, KisPaintOpSettings::uniformProperties()) {
+            if (prop->id() == opacity.id() ||
+                prop->id() == size.id()) {
+
+                props.prepend(prop);
+            }
+        }
+    }
+
+    return props;
+}
diff --git a/plugins/paintops/spray/kis_spray_paintop_settings.h b/plugins/paintops/spray/kis_spray_paintop_settings.h
index d571929ed0..9da8eca8b0 100644
--- a/plugins/paintops/spray/kis_spray_paintop_settings.h
+++ b/plugins/paintops/spray/kis_spray_paintop_settings.h
@@ -1,46 +1,55 @@
 /*
  *  Copyright (c) 2008,2009,2010 Lukáš Tvrdý <lukast.dev@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.
  */
 
 #ifndef KIS_SPRAY_PAINTOP_SETTINGS_H_
 #define KIS_SPRAY_PAINTOP_SETTINGS_H_
 
+#include <QScopedPointer>
+
 #include <brushengine/kis_paintop_settings.h>
 #include <kis_types.h>
 
 #include <kis_outline_generation_policy.h>
 #include "kis_spray_paintop_settings_widget.h"
 
 
 class KisSprayPaintOpSettings : public KisOutlineGenerationPolicy<KisPaintOpSettings>
 {
 public:
     KisSprayPaintOpSettings();
+    ~KisSprayPaintOpSettings();
 
 
     QPainterPath brushOutline(const KisPaintInformation &info, OutlineMode mode) const;
 
     QString modelName() const {
         return "airbrush";
     }
 
     bool paintIncremental();
     bool isAirbrushing() const;
     int rate() const;
+
+    QList<KisUniformPaintOpPropertySP> uniformProperties();
+
+private:
+    struct Private;
+    const QScopedPointer<Private> m_d;
 };
 
 #endif
diff --git a/plugins/paintops/spray/kis_sprayop_option.cpp b/plugins/paintops/spray/kis_sprayop_option.cpp
index e2f5e5e306..e353bd5ed3 100644
--- a/plugins/paintops/spray/kis_sprayop_option.cpp
+++ b/plugins/paintops/spray/kis_sprayop_option.cpp
@@ -1,143 +1,151 @@
 /*
  *  Copyright (c) 2008,2009,2010 Lukáš Tvrdý <lukast.dev@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_sprayop_option.h"
 #include <klocalizedstring.h>
 
 #include "ui_wdgsprayoptions.h"
 
 class KisSprayOpOptionsWidget: public QWidget, public Ui::WdgSprayOptions
 {
 public:
     KisSprayOpOptionsWidget(QWidget *parent = 0)
         : QWidget(parent) {
         setupUi(this);
     }
 };
 
 KisSprayOpOption::KisSprayOpOption()
     : KisPaintOpOption(KisPaintOpOption::GENERAL, false)
 {
     setObjectName("KisSprayOpOption");
 
     m_checkable = false;
     m_options = new KisSprayOpOptionsWidget();
 
     m_options->diameterSpinBox->setRange(1, 1000, 0);
     m_options->diameterSpinBox->setValue(100);
     m_options->diameterSpinBox->setExponentRatio(1.5);
     m_options->diameterSpinBox->setSuffix(i18n(" px"));
 
     m_options->aspectSPBox->setRange(0.0, 2.0, 2);
     m_options->aspectSPBox->setValue(1.0);
 
     m_options->rotationSPBox->setRange(0.0, 360.0, 0);
     m_options->rotationSPBox->setValue(0.0);
     m_options->rotationSPBox->setSuffix(QChar(Qt::Key_degree));
 
     m_options->scaleSpin->setRange(0.0, 10.0, 2);
     m_options->scaleSpin->setValue(1.0);
 
     m_options->spacingSpin->setRange(0.0, 5.0, 2);
     m_options->spacingSpin->setValue(0.5);
 
-    m_options->coverageSpin->setRange(0.0, 100.0, 1);
+    m_options->coverageSpin->setRange(0.0, 100.0, 2);
     m_options->coverageSpin->setValue(0.1);
     m_options->coverageSpin->setSuffix("%");
+    m_options->coverageSpin->setExponentRatio(3);
 
 
     m_options->particlesSpinBox->setRange(1.0, 1000.0, 0);
     m_options->particlesSpinBox->setValue(12);
     m_options->particlesSpinBox->setExponentRatio(3.0);
 
     m_options->jitterMovementSpin->setRange(0.0,5.0, 1);
     m_options->jitterMovementSpin->setValue(1.0);
 
 
     connect(m_options->diameterSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->coverageSpin, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->jitterMovementSpin, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->spacingSpin, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->scaleSpin, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->particlesSpinBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->countRadioButton, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->densityRadioButton, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->gaussianBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
     connect(m_options->aspectSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->rotationSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
     connect(m_options->jitterMoveBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged()));
 
     connect(m_options->countRadioButton, SIGNAL(toggled(bool)), m_options->particlesSpinBox, SLOT(setEnabled(bool)));
     connect(m_options->densityRadioButton, SIGNAL(toggled(bool)), m_options->coverageSpin, SLOT(setEnabled(bool)));
     connect(m_options->jitterMoveBox, SIGNAL(toggled(bool)), m_options->jitterMovementSpin, SLOT(setEnabled(bool)));
 
     setConfigurationPage(m_options);
 }
 
 KisSprayOpOption::~KisSprayOpOption()
 {
     delete m_options;
 }
 
 void KisSprayOpOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    setting->setProperty(SPRAY_DIAMETER, m_options->diameterSpinBox->value());
-    setting->setProperty(SPRAY_ASPECT, m_options->aspectSPBox->value());
-    setting->setProperty(SPRAY_COVERAGE, m_options->coverageSpin->value());
-    setting->setProperty(SPRAY_SCALE, m_options->scaleSpin->value());
-    setting->setProperty(SPRAY_ROTATION, m_options->rotationSPBox->value());
-    setting->setProperty(SPRAY_PARTICLE_COUNT, m_options->particlesSpinBox->value());
-    setting->setProperty(SPRAY_JITTER_MOVE_AMOUNT, m_options->jitterMovementSpin->value());
-    setting->setProperty(SPRAY_JITTER_MOVEMENT, m_options->jitterMoveBox->isChecked());
-    setting->setProperty(SPRAY_SPACING, m_options->spacingSpin->value());
-    setting->setProperty(SPRAY_GAUSS_DISTRIBUTION, m_options->gaussianBox->isChecked());
-    setting->setProperty(SPRAY_USE_DENSITY, m_options->densityRadioButton->isChecked());
+    KisSprayProperties op;
+
+    op.diameter = m_options->diameterSpinBox->value();
+    op.particleCount = m_options->particlesSpinBox->value();
+    op.aspect = m_options->aspectSPBox->value();
+    op.coverage = m_options->coverageSpin->value();
+    op.amount = m_options->jitterMovementSpin->value();
+    op.spacing = m_options->spacingSpin->value();
+    op.scale = m_options->scaleSpin->value();
+    op.brushRotation = m_options->rotationSPBox->value();
+    op.jitterMovement = m_options->jitterMoveBox->isChecked();
+    op.useDensity = m_options->densityRadioButton->isChecked();
+    op.gaussian = m_options->gaussianBox->isChecked();
+
+    op.writeOptionSetting(setting);
 }
 
 void KisSprayOpOption::readOptionSetting(const KisPropertiesConfiguration* setting)
 {
-    m_options->diameterSpinBox->setValue(setting->getInt(SPRAY_DIAMETER));
-    m_options->aspectSPBox->setValue(setting->getDouble(SPRAY_ASPECT));
-    m_options->coverageSpin->setValue(setting->getDouble(SPRAY_COVERAGE));
-    m_options->scaleSpin->setValue(setting->getDouble(SPRAY_SCALE));
-    m_options->rotationSPBox->setValue(setting->getDouble(SPRAY_ROTATION));
-    m_options->particlesSpinBox->setValue(setting->getDouble(SPRAY_PARTICLE_COUNT));
-    m_options->jitterMovementSpin->setValue(setting->getDouble(SPRAY_JITTER_MOVE_AMOUNT));
-    m_options->jitterMoveBox->setChecked(setting->getBool(SPRAY_JITTER_MOVEMENT));
-    m_options->spacingSpin->setValue(setting->getDouble(SPRAY_SPACING));
-    m_options->gaussianBox->setChecked(setting->getBool(SPRAY_GAUSS_DISTRIBUTION));
+    KisSprayProperties op;
+    op.readOptionSetting(setting);
+
+    m_options->diameterSpinBox->setValue(op.diameter);
+    m_options->aspectSPBox->setValue(op.aspect);
+    m_options->coverageSpin->setValue(op.coverage);
+    m_options->scaleSpin->setValue(op.scale);
+    m_options->rotationSPBox->setValue(op.brushRotation);
+    m_options->particlesSpinBox->setValue(op.particleCount);
+    m_options->jitterMovementSpin->setValue(op.amount);
+    m_options->jitterMoveBox->setChecked(op.jitterMovement);
+    m_options->spacingSpin->setValue(op.spacing);
+    m_options->gaussianBox->setChecked(op.gaussian);
     //TODO: come on, do this nicer! e.g. button group or something
-    bool useDensity = setting->getBool(SPRAY_USE_DENSITY);
+    bool useDensity = op.useDensity;
     m_options->densityRadioButton->setChecked(useDensity);
     m_options->countRadioButton->setChecked(!useDensity);
 }
 
 
 void KisSprayOpOption::setDiameter(int diameter) const
 {
     m_options->diameterSpinBox->setValue(diameter);
 }
 
 int KisSprayOpOption::diameter() const
 {
     return m_options->diameterSpinBox->value();
 }
 
 qreal KisSprayOpOption::brushAspect() const
 {
     return m_options->aspectSPBox->value();
 }
diff --git a/plugins/paintops/spray/kis_sprayop_option.h b/plugins/paintops/spray/kis_sprayop_option.h
index 6ec3a9d2a2..a91300b697 100644
--- a/plugins/paintops/spray/kis_sprayop_option.h
+++ b/plugins/paintops/spray/kis_sprayop_option.h
@@ -1,89 +1,105 @@
 /*
  *  Copyright (c) 2008,2009,2010 Lukáš Tvrdý <lukast.dev@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.
  */
 #ifndef KIS_SPRAYOP_OPTION_H
 #define KIS_SPRAYOP_OPTION_H
 
 #include <kis_paintop_option.h>
 
 const QString SPRAY_DIAMETER = "Spray/diameter";
 const QString SPRAY_ASPECT = "Spray/aspect";
 const QString SPRAY_COVERAGE = "Spray/coverage";
 const QString SPRAY_SCALE = "Spray/scale";
 const QString SPRAY_ROTATION = "Spray/rotation";
 const QString SPRAY_PARTICLE_COUNT = "Spray/particleCount";
 const QString SPRAY_JITTER_MOVE_AMOUNT = "Spray/jitterMoveAmount";
 const QString SPRAY_JITTER_MOVEMENT = "Spray/jitterMovement";
 const QString SPRAY_SPACING = "Spray/spacing";
 const QString SPRAY_GAUSS_DISTRIBUTION = "Spray/gaussianDistribution";
 const QString SPRAY_USE_DENSITY = "Spray/useDensity";
 
 class KisSprayOpOptionsWidget;
 
 class KisSprayOpOption : public KisPaintOpOption
 {
 public:
     KisSprayOpOption();
     ~KisSprayOpOption();
 
     void setDiameter(int diameter) const;
     int diameter() const;
 
     qreal brushAspect() const;
 
     void writeOptionSetting(KisPropertiesConfiguration* setting) const;
     void readOptionSetting(const KisPropertiesConfiguration* setting);
 
 private:
     KisSprayOpOptionsWidget * m_options;
 
 };
 
 class KisSprayProperties
 {
 public:
     quint16 diameter;
-    quint16 radius;
     quint16 particleCount;
     qreal aspect;
     qreal coverage;
     qreal amount;
     qreal spacing;
     qreal scale;
     qreal brushRotation;
     bool jitterMovement;
     bool useDensity;
     bool gaussian;
 
+    int radius() const {
+        return diameter / 2;
+    }
+
 public:
-    void loadSettings(const KisPropertiesConfiguration* settings) {
+    void readOptionSetting(const KisPropertiesConfiguration* settings) {
         diameter = settings->getInt(SPRAY_DIAMETER);
-        radius =  qRound(0.5 * diameter);
         aspect = settings->getDouble(SPRAY_ASPECT);
         particleCount = settings->getDouble(SPRAY_PARTICLE_COUNT);
         coverage = (settings->getDouble(SPRAY_COVERAGE) / 100.0);
         amount = settings->getDouble(SPRAY_JITTER_MOVE_AMOUNT);
         spacing = settings->getDouble(SPRAY_SPACING);
         scale = settings->getDouble(SPRAY_SCALE);
         brushRotation = settings->getDouble(SPRAY_ROTATION);
         jitterMovement = settings->getBool(SPRAY_JITTER_MOVEMENT);
         useDensity = settings->getBool(SPRAY_USE_DENSITY);
         gaussian = settings->getBool(SPRAY_GAUSS_DISTRIBUTION);
     }
+
+    void writeOptionSetting(KisPropertiesConfiguration* setting) const {
+        setting->setProperty(SPRAY_DIAMETER, diameter);
+        setting->setProperty(SPRAY_ASPECT, aspect);
+        setting->setProperty(SPRAY_COVERAGE, coverage * 100.0);
+        setting->setProperty(SPRAY_SCALE, scale);
+        setting->setProperty(SPRAY_ROTATION, brushRotation);
+        setting->setProperty(SPRAY_PARTICLE_COUNT, particleCount);
+        setting->setProperty(SPRAY_JITTER_MOVE_AMOUNT, amount);
+        setting->setProperty(SPRAY_JITTER_MOVEMENT, jitterMovement);
+        setting->setProperty(SPRAY_SPACING, spacing);
+        setting->setProperty(SPRAY_GAUSS_DISTRIBUTION, gaussian);
+        setting->setProperty(SPRAY_USE_DENSITY, useDensity);
+    }
 };
 
 #endif
diff --git a/plugins/paintops/spray/spray_brush.cpp b/plugins/paintops/spray/spray_brush.cpp
index 4449215e65..7d3e07bd2e 100644
--- a/plugins/paintops/spray/spray_brush.cpp
+++ b/plugins/paintops/spray/spray_brush.cpp
@@ -1,531 +1,531 @@
 /*
  *  Copyright (c) 2008-2010 Lukáš Tvrdý <lukast.dev@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 "spray_brush.h"
 
 #include <KoColor.h>
 #include <KoColorSpace.h>
 #include <KoColorTransformation.h>
 #include <KoCompositeOp.h>
 #include <KoMixColorsOp.h>
 
 #include <brushengine/kis_paintop.h>
 
 #include <QVariant>
 #include <QHash>
 #include <QTransform>
 #include <QImage>
 
 #include <kis_random_accessor_ng.h>
 #include <kis_random_sub_accessor.h>
 
 #include <kis_paint_device.h>
 
 #include <kis_painter.h>
 #include <brushengine/kis_paint_information.h>
 #include <kis_fixed_paint_device.h>
 #include <kis_cross_device_color_picker.h>
 
 #include "kis_spray_paintop_settings.h"
 
 #include <cmath>
 #include <ctime>
 
 #include "random_gauss.h"
 
 #include <QtGlobal>
 
 SprayBrush::SprayBrush()
 {
     m_painter = 0;
     m_transfo = 0;
     m_rand = new RandomGauss(time(0));
 }
 
 SprayBrush::~SprayBrush()
 {
     delete m_painter;
     delete m_transfo;
     delete m_rand;
 }
 
 void SprayBrush::setProperties(KisSprayProperties * properties,
                                KisColorProperties * colorProperties,
                                KisShapeProperties * shapeProperties,
                                KisShapeDynamicsProperties * shapeDynamicsProperties,
                                KisBrushSP brush)
 {
     m_properties = properties;
     m_colorProperties = colorProperties;
     m_shapeProperties = shapeProperties;
     m_shapeDynamicsProperties = shapeDynamicsProperties;
     m_brush = brush;
     if (m_brush) {
         m_brush->notifyStrokeStarted();
     }
 }
 
 qreal SprayBrush::rotationAngle(KisRandomSourceSP randomSource)
 {
     qreal rotation = 0.0;
 
     if (m_shapeDynamicsProperties->fixedRotation) {
         rotation = deg2rad(m_shapeDynamicsProperties->fixedAngle);
     }
 
     if (m_shapeDynamicsProperties->randomRotation) {
 
         if (m_properties->gaussian) {
             rotation = linearInterpolation(rotation , M_PI * 2.0 * qBound<qreal>(0.0, m_rand->nextGaussian(0.0, 0.50) , 1.0), m_shapeDynamicsProperties->randomRotationWeight);
         }
         else {
             rotation = linearInterpolation(rotation, M_PI * 2.0 * randomSource->generateNormalized(), m_shapeDynamicsProperties->randomRotationWeight);
         }
     }
 
     return rotation;
 }
 
 
 
 void SprayBrush::paint(KisPaintDeviceSP dab, KisPaintDeviceSP source,
                        const KisPaintInformation& info,
                        qreal rotation, qreal scale,
                        qreal additionalScale,
                        const KoColor &color, const KoColor &bgColor)
 {
     KisRandomSourceSP randomSource = info.randomSource();
 
     // initializing painter
     if (!m_painter) {
         m_painter = new KisPainter(dab);
         m_painter->setFillStyle(KisPainter::FillStyleForegroundColor);
         m_painter->setMaskImageSize(m_shapeProperties->width, m_shapeProperties->height);
         m_dabPixelSize = dab->colorSpace()->pixelSize();
         if (m_colorProperties->useRandomHSV) {
             m_transfo = dab->colorSpace()->createColorTransformation("hsv_adjustment", QHash<QString, QVariant>());
         }
 
         m_brushQImage = m_shapeProperties->image;
         if (!m_brushQImage.isNull()) {
             m_brushQImage = m_brushQImage.scaled(m_shapeProperties->width, m_shapeProperties->height);
         }
         m_imageDevice = new KisPaintDevice(dab->colorSpace());
     }
 
 
     qreal x = info.pos().x();
     qreal y = info.pos().y();
     KisRandomAccessorSP accessor = dab->createRandomAccessorNG(qRound(x), qRound(y));
 
     Q_ASSERT(color.colorSpace()->pixelSize() == dab->pixelSize());
     m_inkColor = color;
     KisCrossDeviceColorPicker colorPicker(source, m_inkColor);
 
     // apply size sensor
-    m_radius = m_properties->radius * scale * additionalScale;
+    m_radius = m_properties->radius() * scale * additionalScale;
 
     // jitter movement
     if (m_properties->jitterMovement) {
         x = x + ((2 * m_radius * randomSource->generateNormalized()) - m_radius) * m_properties->amount;
         y = y + ((2 * m_radius * randomSource->generateNormalized()) - m_radius) * m_properties->amount;
     }
 
     // this is wrong for every shape except pixel and anti-aliased pixel
 
 
     if (m_properties->useDensity) {
         m_particlesCount = (m_properties->coverage * (M_PI * pow2(m_radius)) / pow2(additionalScale));
     }
     else {
         m_particlesCount = m_properties->particleCount;
     }
 
     QHash<QString, QVariant> params;
     qreal nx, ny;
     int ix, iy;
 
     qreal angle;
     qreal length;
     qreal rotationZ = 0.0;
     qreal particleScale = 1.0;
 
     bool shouldColor = true;
     if (m_colorProperties->fillBackground) {
         m_painter->setPaintColor(bgColor);
         paintCircle(m_painter, x, y, m_radius);
     }
 
     QTransform m;
     m.reset();
     m.rotateRadians(-rotation + deg2rad(m_properties->brushRotation));
     m.scale(m_properties->scale, m_properties->scale);
 
     for (quint32 i = 0; i < m_particlesCount; i++) {
         // generate random angle
         angle = randomSource->generateNormalized() * M_PI * 2;
 
         // generate random length
         if (m_properties->gaussian) {
             length = qBound<qreal>(0.0, m_rand->nextGaussian(0.0, 0.50) , 1.0);
         }
         else {
             length = randomSource->generateNormalized();
         }
 
         if (m_shapeDynamicsProperties->enabled) {
             // rotation
             rotationZ = rotationAngle(randomSource);
 
             if (m_shapeDynamicsProperties->followCursor) {
 
                 rotationZ = linearInterpolation(rotationZ, angle, m_shapeDynamicsProperties->followCursorWeigth);
             }
 
 
             if (m_shapeDynamicsProperties->followDrawingAngle) {
 
                 rotationZ = linearInterpolation(rotationZ, info.drawingAngle(), m_shapeDynamicsProperties->followDrawingAngleWeight);
             }
 
             // random size - scale
             if (m_shapeDynamicsProperties->randomSize) {
                 particleScale = randomSource->generateNormalized();
             }
         }
         // generate polar coordinate
         nx = (m_radius * cos(angle)  * length);
         ny = (m_radius * sin(angle)  * length);
 
         // compute the height of the ellipse
         ny *= m_properties->aspect;
 
         // transform
         m.map(nx, ny, &nx, &ny);
 
         // color transformation
 
         if (shouldColor) {
             if (m_colorProperties->sampleInputColor) {
                 colorPicker.pickOldColor(nx + x, ny + y, m_inkColor.data());
             }
 
             // mix the color with background color
             if (m_colorProperties->mixBgColor) {
                 KoMixColorsOp * mixOp = dab->colorSpace()->mixColorsOp();
 
                 const quint8 *colors[2];
                 colors[0] = m_inkColor.data();
                 colors[1] = bgColor.data();
 
                 qint16 colorWeights[2];
                 int MAX_16BIT = 255;
                 qreal blend = info.pressure();
 
                 colorWeights[0] = static_cast<quint16>(blend * MAX_16BIT);
                 colorWeights[1] = static_cast<quint16>((1.0 - blend) * MAX_16BIT);
                 mixOp->mixColors(colors, colorWeights, 2, m_inkColor.data());
             }
 
             if (m_colorProperties->useRandomHSV && m_transfo) {
                 params["h"] = (m_colorProperties->hue / 180.0) * randomSource->generateNormalized();
                 params["s"] = (m_colorProperties->saturation / 100.0) * randomSource->generateNormalized();
                 params["v"] = (m_colorProperties->value / 100.0) * randomSource->generateNormalized();
                 m_transfo->setParameters(params);
                 m_transfo->setParameter(3, 1);//sets the type to HSV. For some reason 0 is not an option.
                 m_transfo->setParameter(4, false);//sets the colorize to false.
                 m_transfo->transform(m_inkColor.data(), m_inkColor.data() , 1);
             }
 
             if (m_colorProperties->useRandomOpacity) {
                 quint8 alpha = qRound(randomSource->generateNormalized() * OPACITY_OPAQUE_U8);
                 m_inkColor.setOpacity(alpha);
                 m_painter->setOpacity(alpha);
             }
 
             if (!m_colorProperties->colorPerParticle) {
                 shouldColor = false;
             }
 
             m_painter->setPaintColor(m_inkColor);
         }
 
         qreal jitteredWidth = qMax(1.0 * additionalScale, m_shapeProperties->width * particleScale * additionalScale);
         qreal jitteredHeight = qMax(1.0 * additionalScale, m_shapeProperties->height * particleScale * additionalScale);
 
         if (m_shapeProperties->enabled){
         switch (m_shapeProperties->shape){
             // ellipse
             case 0:
             {
                 if (m_shapeProperties->width == m_shapeProperties->height){
                     paintCircle(m_painter, nx + x, ny + y, jitteredWidth * 0.5);
                 }
                 else {
                     paintEllipse(m_painter, nx + x, ny + y, jitteredWidth * 0.5 , jitteredHeight * 0.5, rotationZ);
                 }
                 break;
             }
             // rectangle
             case 1:
             {
                 paintRectangle(m_painter, nx + x, ny + y, qRound(jitteredWidth) , qRound(jitteredHeight), rotationZ);
                 break;
             }
             // wu-particle
             case 2: {
                 paintParticle(accessor, m_inkColor, nx + x, ny + y);
                 break;
             }
             // pixel
             case 3: {
                 ix = qRound(nx + x);
                 iy = qRound(ny + y);
                 accessor->moveTo(ix, iy);
                 memcpy(accessor->rawData(), m_inkColor.data(), m_dabPixelSize);
                 break;
             }
             case 4: {
                 if (!m_brushQImage.isNull()) {
 
                     QTransform m;
                     m.rotate(rad2deg(rotationZ));
                     m.scale(additionalScale, additionalScale);
 
                     if (m_shapeDynamicsProperties->randomSize) {
                         m.scale(particleScale, particleScale);
                     }
                     m_transformed = m_brushQImage.transformed(m, Qt::SmoothTransformation);
                     m_imageDevice->convertFromQImage(m_transformed, 0);
                     KisRandomAccessorSP ac = m_imageDevice->createRandomAccessorNG(0, 0);
                     QRect rc = m_transformed.rect();
 
                     if (m_colorProperties->useRandomHSV && m_transfo) {
 
                         for (int y = rc.y(); y < rc.y() + rc.height(); y++) {
                             for (int x = rc.x(); x < rc.x() + rc.width(); x++) {
                                 ac->moveTo(x, y);
                                 m_transfo->transform(ac->rawData(), ac->rawData() , 1);
                             }
                         }
                     }
 
                     ix = qRound(nx + x - rc.width() * 0.5);
                     iy = qRound(ny + y - rc.height() * 0.5);
                     m_painter->bitBlt(QPoint(ix, iy), m_imageDevice, rc);
                     m_imageDevice->clear();
                     break;
                 }
             }
             }
             // Auto-brush
         }
         else {
             KisDabShape shape(particleScale * additionalScale, 1.0, -rotationZ);
             QPointF hotSpot = m_brush->hotSpot(shape, info);
             QPointF pos(nx + x, ny + y);
             QPointF pt = pos - hotSpot;
 
             qint32 ix;
             qreal xFraction;
             qint32 iy;
             qreal yFraction;
 
             KisPaintOp::splitCoordinate(pt.x(), &ix, &xFraction);
             KisPaintOp::splitCoordinate(pt.y(), &iy, &yFraction);
 
             //KisFixedPaintDeviceSP dab;
             if (m_brush->brushType() == IMAGE ||
                     m_brush->brushType() == PIPE_IMAGE) {
                 m_fixedDab = m_brush->paintDevice(m_fixedDab->colorSpace(),
                           shape, info, xFraction, yFraction);
 
                 if (m_colorProperties->useRandomHSV && m_transfo) {
                     quint8 * dabPointer = m_fixedDab->data();
                     int pixelCount = m_fixedDab->bounds().width() * m_fixedDab->bounds().height();
                     m_transfo->transform(dabPointer, dabPointer, pixelCount);
                 }
 
             }
             else {
                 m_brush->mask(m_fixedDab, m_inkColor, shape,
                               info, xFraction, yFraction);
             }
             m_painter->bltFixed(QPoint(ix, iy), m_fixedDab, m_fixedDab->bounds());
         }
         if (m_colorProperties->colorPerParticle){
             m_inkColor=color;//reset color//
         }
     }
     // recover from jittering of color,
     // m_inkColor.opacity is recovered with every paint
 }
 
 
 
 void SprayBrush::paintParticle(KisRandomAccessorSP &writeAccessor, const KoColor &color, qreal rx, qreal ry)
 {
     // opacity top left, right, bottom left, right
     KoColor pcolor(color);
     //int opacity = pcolor.opacityU8();
 
     int ipx = int (rx);
     int ipy = int (ry);
     qreal fx = rx - ipx;
     qreal fy = ry - ipy;
 
     qreal btl = (1 - fx) * (1 - fy);
     qreal btr = (fx)  * (1 - fy);
     qreal bbl = (1 - fx) * (fy);
     qreal bbr = (fx)  * (fy);
 
     // this version overwrite pixels, e.g. when it sprays two particle next
     // to each other, the pixel with lower opacity can override other pixel.
     // Maybe some kind of compositing using here would be cool
 
     pcolor.setOpacity(btl);
     writeAccessor->moveTo(ipx  , ipy);
     memcpy(writeAccessor->rawData(), pcolor.data(), m_dabPixelSize);
 
     pcolor.setOpacity(btr);
     writeAccessor->moveTo(ipx + 1, ipy);
     memcpy(writeAccessor->rawData(), pcolor.data(), m_dabPixelSize);
 
     pcolor.setOpacity(bbl);
     writeAccessor->moveTo(ipx, ipy + 1);
     memcpy(writeAccessor->rawData(), pcolor.data(), m_dabPixelSize);
 
     pcolor.setOpacity(bbr);
     writeAccessor->moveTo(ipx + 1, ipy + 1);
     memcpy(writeAccessor->rawData(), pcolor.data(), m_dabPixelSize);
 }
 
 void SprayBrush::paintCircle(KisPainter* painter, qreal x, qreal y, qreal radius)
 {
     QPainterPath path;
     path.addEllipse(QPointF(x,y),radius,radius);
     painter->fillPainterPath(path);
 }
 
 
 void SprayBrush::paintEllipse(KisPainter* painter, qreal x, qreal y, qreal a, qreal b, qreal angle)
 {
     QPainterPath path;
     path.addEllipse(QPointF(), a, b);
     QTransform t;
     t.translate(x, y);
     t.rotateRadians(angle);
     path = t.map(path);
     painter->fillPainterPath(path);
 }
 
 void SprayBrush::paintRectangle(KisPainter* painter, qreal x, qreal y, qreal width, qreal height, qreal angle)
 {
     QPainterPath path;
     path.addRect(QRectF(-0.5 * width, -0.5 * height, width, height));
     QTransform t;
     t.translate(x, y);
     t.rotateRadians(angle);
     path = t.map(path);
     painter->fillPainterPath(path);
 }
 
 
 void SprayBrush::paintOutline(KisPaintDeviceSP dev , const KoColor &outlineColor, qreal posX, qreal posY, qreal radius)
 {
     QList<QPointF> antiPixels;
     KisRandomAccessorSP accessor = dev->createRandomAccessorNG(qRound(posX), qRound(posY));
 
     for (int y = -radius + posY; y <= radius + posY; y++) {
         for (int x = -radius + posX; x <= radius + posX; x++) {
             accessor->moveTo(x, y);
             qreal alpha = dev->colorSpace()->opacityU8(accessor->rawData());
 
             if (alpha != 0) {
                 // top left
                 accessor->moveTo(x - 1, y - 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x - 1, y - 1));
                     //continue;
                 }
 
                 // top
                 accessor->moveTo(x, y - 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x, y - 1));
                     //continue;
                 }
 
                 // top right
                 accessor->moveTo(x + 1, y - 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x + 1, y - 1));
                     //continue;
                 }
 
                 //left
                 accessor->moveTo(x - 1, y);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x - 1, y));
                     //continue;
                 }
 
                 //right
                 accessor->moveTo(x + 1, y);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x + 1, y));
                     //continue;
                 }
 
                 // bottom left
                 accessor->moveTo(x - 1, y + 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x - 1, y + 1));
                     //continue;
                 }
 
                 // bottom
                 accessor->moveTo(x, y + 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x, y + 1));
                     //continue;
                 }
 
                 // bottom right
                 accessor->moveTo(x + 1, y + 1);
                 if (dev->colorSpace()->opacityU8(accessor->rawData()) == 0) {
                     antiPixels.append(QPointF(x + 1, y + 1));
                     //continue;
                 }
             }
 
         }
     }
 
     // anti-alias it
     int size = antiPixels.size();
     for (int i = 0; i < size; i++) {
         accessor->moveTo(antiPixels[i].x(), antiPixels[i].y());
         memcpy(accessor->rawData(), outlineColor.data(), dev->colorSpace()->pixelSize());
     }
 }
 
 void SprayBrush::setFixedDab(KisFixedPaintDeviceSP dab)
 {
     m_fixedDab = dab;
 }
diff --git a/plugins/tools/basictools/wdgcolorpicker.ui b/plugins/tools/basictools/wdgcolorpicker.ui
index 86c4c1cdc6..c213ba02fe 100644
--- a/plugins/tools/basictools/wdgcolorpicker.ui
+++ b/plugins/tools/basictools/wdgcolorpicker.ui
@@ -1,162 +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="QSpinBox" name="radius">
+      <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_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 262b0c89b2..f2e90aa34e 100644
--- a/plugins/tools/basictools/wdgmovetool.ui
+++ b/plugins/tools/basictools/wdgmovetool.ui
@@ -1,246 +1,261 @@
 <?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>269</width>
+    <width>271</width>
     <height>394</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>Move current layer</string>
+         <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>Move layer with content</string>
+         <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 the whole group</string>
+         <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="QDoubleSpinBox" name="spinMoveStep">
+       <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="QDoubleSpinBox" name="spinMoveScale">
+       <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>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QCheckBox" name="chkShowCoordinates">
      <property name="toolTip">
       <string>Show coordinates on canvas</string>
      </property>
      <property name="text">
       <string>Show coordinates</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <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>
+           <string>&amp;x:</string>
           </property>
           <property name="buddy">
            <cstring>translateXBox</cstring>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="QSpinBox" name="translateXBox">
+         <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="QSpinBox" name="translateYBox">
+         <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>
+           <string>&amp;y:</string>
           </property>
           <property name="buddy">
            <cstring>translateYBox</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QWidget" name="SpecialSpacer" native="true"/>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>kis_double_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kis_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/tools/defaulttool/CMakeLists.txt b/plugins/tools/defaulttool/CMakeLists.txt
index f76760b624..4417ac60bd 100644
--- a/plugins/tools/defaulttool/CMakeLists.txt
+++ b/plugins/tools/defaulttool/CMakeLists.txt
@@ -1,37 +1,37 @@
 project( defaulttools )
 
 set ( defaulttools_SRCS
     Plugin.cpp
     defaulttool/DefaultTool.cpp
     defaulttool/DefaultToolFactory.cpp
     defaulttool/DefaultToolWidget.cpp
     defaulttool/DefaultToolArrangeWidget.cpp
     defaulttool/DefaultToolTransformWidget.cpp
     defaulttool/ShapeMoveStrategy.cpp
     defaulttool/ShapeResizeStrategy.cpp
     defaulttool/ShapeRotateStrategy.cpp
     defaulttool/ShapeShearStrategy.cpp
     defaulttool/SelectionDecorator.cpp
     defaulttool/SelectionTransformCommand.cpp
 
     connectionTool/ConnectionTool.cpp
     connectionTool/ConnectionToolFactory.cpp
     connectionTool/AddConnectionPointCommand.cpp
     connectionTool/RemoveConnectionPointCommand.cpp
     connectionTool/ChangeConnectionPointCommand.cpp
     connectionTool/MoveConnectionPointStrategy.cpp
     connectionTool/ConnectionPointWidget.cpp
 )
 
 ki18n_wrap_ui(defaulttools_SRCS
     defaulttool/DefaultToolWidget.ui
     defaulttool/DefaultToolArrangeWidget.ui
     defaulttool/DefaultToolTransformWidget.ui
     connectionTool/ConnectionPointWidget.ui
 )
 
 qt5_add_resources(defaulttools_SRCS defaulttools.qrc)
 
 add_library(krita_flaketools MODULE ${defaulttools_SRCS})
-target_link_libraries(krita_flaketools kritaflake kritawidgets)
+target_link_libraries(krita_flaketools kritaflake kritawidgets kritaui)
 install(TARGETS krita_flaketools DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui b/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
index 0cbca752d1..9a35520290 100644
--- a/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
+++ b/plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.ui
@@ -1,202 +1,211 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DefaultToolTransformWidget</class>
- <widget class="QMenu" name="DefaultToolTransformWidget" >
-  <property name="geometry" >
+ <widget class="QMenu" name="DefaultToolTransformWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>222</width>
     <height>293</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QDoubleSpinBox" name="rotateSpinBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+  <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" >
+     <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
-     <property name="suffix" >
+     <property name="suffix">
       <string>°</string>
      </property>
-     <property name="minimum" >
+     <property name="minimum">
       <double>-360.000000000000000</double>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>360.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QPushButton" name="rotateButton" >
-     <property name="text" >
+   <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="KoUnitDoubleSpinBox" name="shearXSpinBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+   <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" >
+     <property name="minimum">
       <double>-100.000000000000000</double>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>100.000000000000000</double>
      </property>
-     <property name="singleStep" >
+     <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="shearXButton" >
-     <property name="text" >
+   <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="KoUnitDoubleSpinBox" name="shearYSpinBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+   <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" >
+     <property name="minimum">
       <double>-100.000000000000000</double>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>100.000000000000000</double>
      </property>
-     <property name="singleStep" >
+     <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="shearYButton" >
-     <property name="text" >
+   <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="QDoubleSpinBox" name="scaleXSpinBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+   <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" >
+     <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
-     <property name="suffix" >
+     <property name="suffix">
       <string>%</string>
      </property>
-     <property name="minimum" >
+     <property name="minimum">
       <double>-1000.000000000000000</double>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>1000.000000000000000</double>
      </property>
-     <property name="value" >
+     <property name="value">
       <double>100.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
-    <widget class="QPushButton" name="scaleXButton" >
-     <property name="text" >
+   <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="QDoubleSpinBox" name="scaleYSpinBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+   <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" >
+     <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
-     <property name="suffix" >
+     <property name="suffix">
       <string>%</string>
      </property>
-     <property name="minimum" >
+     <property name="minimum">
       <double>-1000.000000000000000</double>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <double>1000.000000000000000</double>
      </property>
-     <property name="value" >
+     <property name="value">
       <double>100.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" >
-    <widget class="QPushButton" name="scaleYButton" >
-     <property name="text" >
+   <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" >
+   <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 vsizetype="Fixed" hsizetype="Fixed" >
+   <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" >
+     <property name="text">
       <string>Reset Transformations</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2" >
-    <spacer name="spacer" >
-     <property name="orientation" >
+   <item row="7" column="0" colspan="2">
+    <spacer name="spacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>191</width>
        <height>58</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KoUnitDoubleSpinBox</class>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>kis_double_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseUnitSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header>KoUnitDoubleSpinBox.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 25994dcd33..c5efcee49c 100644
--- a/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
+++ b/plugins/tools/defaulttool/defaulttool/DefaultToolWidget.ui
@@ -1,165 +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>158</width>
-    <height>64</height>
+    <width>256</width>
+    <height>76</height>
    </rect>
   </property>
   <property name="focusPolicy">
    <enum>Qt::NoFocus</enum>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <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="KoUnitDoubleSpinBox" name="positionXSpinBox">
+    <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="KoUnitDoubleSpinBox" name="widthSpinBox">
+    <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">
+    <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">
+     <property name="text" stdset="0">
       <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="0" rowspan="2">
-    <widget class="KoPositionSelector" name="positionSelector">
+    <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="KoUnitDoubleSpinBox" name="positionYSpinBox">
+    <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="KoUnitDoubleSpinBox" name="heightSpinBox">
+    <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">
+    <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>KoUnitDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>KoUnitDoubleSpinBox.h</header>
-  </customwidget>
   <customwidget>
    <class>KoAspectButton</class>
-   <extends>QLabel</extends>
+   <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseUnitSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 ee4bd55eb2..85b57cdba5 100644
--- a/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/BlurEffectConfigWidget.cpp
@@ -1,65 +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_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 QDoubleSpinBox(this);
+    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/CMakeLists.txt b/plugins/tools/karbonplugins/filtereffects/CMakeLists.txt
index 9bdf94e0af..10e9997ab5 100644
--- a/plugins/tools/karbonplugins/filtereffects/CMakeLists.txt
+++ b/plugins/tools/karbonplugins/filtereffects/CMakeLists.txt
@@ -1,43 +1,43 @@
 set(karbon_filtereffects_SOURCES
     FilterEffectsPlugin.cpp
     BlurEffect.cpp
     BlurEffectFactory.cpp
     BlurEffectConfigWidget.cpp
     OffsetEffect.cpp
     OffsetEffectFactory.cpp
     OffsetEffectConfigWidget.cpp
     MergeEffect.cpp
     MergeEffectFactory.cpp
     MergeEffectConfigWidget.cpp
     ColorMatrixEffect.cpp
     ColorMatrixEffectFactory.cpp
     ColorMatrixEffectConfigWidget.cpp
     FloodEffect.cpp
     FloodEffectFactory.cpp
     FloodEffectConfigWidget.cpp
     CompositeEffect.cpp
     CompositeEffectFactory.cpp
     CompositeEffectConfigWidget.cpp
     BlendEffect.cpp
     BlendEffectFactory.cpp
     BlendEffectConfigWidget.cpp
     ComponentTransferEffect.cpp
     ComponentTransferEffectFactory.cpp
     ComponentTransferEffectConfigWidget.cpp
     ImageEffect.cpp
     ImageEffectFactory.cpp
     ImageEffectConfigWidget.cpp
     MorphologyEffect.cpp
     MorphologyEffectFactory.cpp
     MorphologyEffectConfigWidget.cpp
     ConvolveMatrixEffect.cpp
     ConvolveMatrixEffectFactory.cpp
     ConvolveMatrixEffectConfigWidget.cpp
     MatrixDataModel.cpp
     )
 
 add_library(krita_filtereffects MODULE ${karbon_filtereffects_SOURCES})
 
-target_link_libraries(krita_filtereffects kritaflake kritawidgets KF5::Completion)
+target_link_libraries(krita_filtereffects kritaflake kritawidgets kritaui KF5::Completion)
 
 install(TARGETS krita_filtereffects  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp b/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
index 7a669ba835..b1880cd462 100644
--- a/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
@@ -1,179 +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_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 QDoubleSpinBox(saturateWidget);
+    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 QDoubleSpinBox(hueRotateWidget);
+    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 21335b226f..a47c1e1eb4 100644
--- a/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
@@ -1,303 +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_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 QDoubleSpinBox(linearWidget);
+    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 QDoubleSpinBox(linearWidget);
+    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 QDoubleSpinBox(gammaWidget);
+    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 QDoubleSpinBox(gammaWidget);
+    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 QDoubleSpinBox(gammaWidget);
+    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 5277de7a00..53ea1d4a0e 100644
--- a/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/CompositeEffectConfigWidget.cpp
@@ -1,107 +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_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 QDoubleSpinBox(m_arithmeticWidget);
+        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 1e8c1575fe..6bacd30a5a 100644
--- a/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
@@ -1,259 +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_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 QSpinBox(this);
+    m_orderX = new KisIntParseSpinBox(this);
     m_orderX->setRange(1, 30);
-    m_orderY = new QSpinBox(this);
+    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 QSpinBox(this);
+    m_targetX = new KisIntParseSpinBox(this);
     m_targetX->setRange(0, 30);
-    m_targetY = new QSpinBox(this);
+    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 QDoubleSpinBox(this);
-    m_bias = new QDoubleSpinBox(this);
+    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 542feef32e..ace47513cf 100644
--- a/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
@@ -1,84 +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_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 = value.toDouble(&valid);
+    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 4be93505f9..242a5ff688 100644
--- a/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/MorphologyEffectConfigWidget.cpp
@@ -1,129 +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_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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 5141ab321f..5c60535ec8 100644
--- a/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
+++ b/plugins/tools/karbonplugins/filtereffects/OffsetEffectConfigWidget.cpp
@@ -1,78 +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_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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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/CMakeLists.txt b/plugins/tools/karbonplugins/tools/CMakeLists.txt
index 83e14f9763..2bdf67690f 100644
--- a/plugins/tools/karbonplugins/tools/CMakeLists.txt
+++ b/plugins/tools/karbonplugins/tools/CMakeLists.txt
@@ -1,50 +1,50 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/filterEffectTool
 )
 
 ########### next target ###############
 
 set(karbon_tools_SOURCES
    KarbonToolsPlugin.cpp
    KarbonCursor.cpp
    CalligraphyTool/KarbonCalligraphyTool.cpp
    CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
    CalligraphyTool/KarbonCalligraphyToolFactory.cpp
    CalligraphyTool/KarbonCalligraphicShape.cpp
    CalligraphyTool/KarbonCalligraphicShapeFactory.cpp
    CalligraphyTool/KarbonSimplifyPath.cpp
    KarbonGradientTool.cpp
    KarbonGradientToolFactory.cpp
    KarbonGradientEditStrategy.cpp
    KarbonPatternTool.cpp
    KarbonPatternToolFactory.cpp
    KarbonPatternEditStrategy.cpp
    filterEffectTool/KarbonFilterEffectsTool.cpp
    filterEffectTool/KarbonFilterEffectsToolFactory.cpp
    filterEffectTool/FilterEffectEditWidget.cpp
    filterEffectTool/FilterEffectScene.cpp
    filterEffectTool/FilterEffectSceneItems.cpp
    filterEffectTool/FilterInputChangeCommand.cpp
    filterEffectTool/FilterAddCommand.cpp
    filterEffectTool/FilterRemoveCommand.cpp
    filterEffectTool/FilterStackSetCommand.cpp
    filterEffectTool/FilterRegionChangeCommand.cpp
    filterEffectTool/FilterEffectResource.cpp
    filterEffectTool/FilterResourceServerProvider.cpp
    filterEffectTool/FilterRegionEditStrategy.cpp
     KarbonPatternOptionsWidget.cpp
 )
 
 ki18n_wrap_ui(karbon_tools_SOURCES
     filterEffectTool/FilterEffectEditWidget.ui
     KarbonPatternOptionsWidget.ui
 )
 
 qt5_add_resources(karbon_tools_SOURCES karbontools.qrc)
 
 add_library(krita_karbontools MODULE ${karbon_tools_SOURCES})
 
-target_link_libraries(krita_karbontools kritawidgets KF5::Completion)
+target_link_libraries(krita_karbontools kritaui kritawidgets KF5::Completion)
 
 install(TARGETS krita_karbontools DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
 
diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
index c81e93cc67..23ef45af46 100644
--- a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
+++ b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
@@ -1,629 +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_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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 QSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 QDoubleSpinBox(this);
+    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 ab606eca6f..ddd78a06cc 100644
--- a/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
+++ b/plugins/tools/karbonplugins/tools/KarbonPatternOptionsWidget.ui
@@ -1,141 +1,161 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PatternOptionsWidget</class>
- <widget class="QWidget" name="PatternOptionsWidget" >
-  <property name="geometry" >
+ <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="margin" >
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0" colspan="3" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <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 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" >
+   <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 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" >
+   <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" >
+   <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="QDoubleSpinBox" name="refPointOffsetX" />
+   <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" >
+   <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="QDoubleSpinBox" name="refPointOffsetY" />
+   <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" >
+   <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" >
+   <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="QDoubleSpinBox" name="tileOffsetX" />
+   <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" >
+   <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="QDoubleSpinBox" name="tileOffsetY" />
+   <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" >
+   <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" >
+   <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="QSpinBox" name="patternWidth" />
+   <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" >
+   <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="QSpinBox" name="patternHeight" />
+   <item row="7" column="4">
+    <widget class="KisIntParseSpinBox" name="patternHeight"/>
    </item>
-   <item row="8" column="1" colspan="3" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+   <item row="8" column="1" colspan="3">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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 d5e5e98922..2804161e05 100644
--- a/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
+++ b/plugins/tools/karbonplugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
@@ -1,552 +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_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 QDoubleSpinBox(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 QDoubleSpinBox(filterRegionWidget);
+    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 QDoubleSpinBox(filterRegionWidget);
+    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 QDoubleSpinBox(filterRegionWidget);
+    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 0f182e6771..962cde2a92 100644
--- a/plugins/tools/tool_crop/wdg_tool_crop.ui
+++ b/plugins/tools/tool_crop/wdg_tool_crop.ui
@@ -1,485 +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>230</width>
-    <height>200</height>
+    <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>Y:</string>
+            <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>X:</string>
+            <string>&amp;X:</string>
            </property>
            <property name="buddy">
             <cstring>intX</cstring>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="QSpinBox" name="intX">
+          <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="QSpinBox" name="intY">
+          <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="QSpinBox" name="intHeight">
+        <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="QSpinBox" name="intWidth">
+        <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="QDoubleSpinBox" name="doubleRatio">
+        <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_int_parse_spin_box.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KisDoubleParseSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <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/kis_tool_transform.cc b/plugins/tools/tool_transform2/kis_tool_transform.cc
index 3dd31a2869..bb9f911bc7 100644
--- a/plugins/tools/tool_transform2/kis_tool_transform.cc
+++ b/plugins/tools/tool_transform2/kis_tool_transform.cc
@@ -1,1178 +1,1178 @@
 /*
  *  kis_tool_transform.cc -- part of Krita
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 C. Boemann <cbo@boemann.dk>
  *  Copyright (c) 2010 Marc Pegon <pe.marc@free.fr>
  *  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_tool_transform.h"
 
 
 #include <math.h>
 #include <limits>
 
 #include <QPainter>
 #include <QPen>
 #include <QPushButton>
 #include <QObject>
 #include <QLabel>
 #include <QComboBox>
 #include <QApplication>
 #include <QMatrix4x4>
 
 #include <kis_debug.h>
 #include <klocalizedstring.h>
 
 #include <KoPointerEvent.h>
 #include <KoID.h>
 #include <KoCanvasBase.h>
 #include <KoViewConverter.h>
 #include <KoSelection.h>
 #include <KoCompositeOp.h>
 
 #include <kis_global.h>
 #include <canvas/kis_canvas2.h>
 #include <KisViewManager.h>
 #include <kis_painter.h>
 #include <kis_cursor.h>
 #include <kis_image.h>
 #include <kis_undo_adapter.h>
 #include <kis_transaction.h>
 #include <kis_selection.h>
 #include <kis_filter_strategy.h>
 #include <widgets/kis_cmb_idlist.h>
 #include <kis_statusbar.h>
 #include <kis_transform_worker.h>
 #include <kis_perspectivetransform_worker.h>
 #include <kis_warptransform_worker.h>
 #include <kis_pixel_selection.h>
 #include <kis_shape_selection.h>
 #include <kis_selection_manager.h>
 #include <kis_system_locker.h>
 #include <krita_utils.h>
 #include <kis_resources_snapshot.h>
 
 #include <KoShapeTransformCommand.h>
 
 #include "widgets/kis_progress_widget.h"
 
 #include "kis_transform_utils.h"
 #include "kis_warp_transform_strategy.h"
 #include "kis_cage_transform_strategy.h"
 #include "kis_liquify_transform_strategy.h"
 #include "kis_free_transform_strategy.h"
 #include "kis_perspective_transform_strategy.h"
 
 #include "kis_transform_mask.h"
 #include "kis_transform_mask_adapter.h"
 
 #include "strokes/transform_stroke_strategy.h"
 
 KisToolTransform::KisToolTransform(KoCanvasBase * canvas)
     : KisTool(canvas, KisCursor::rotateCursor())
     , m_workRecursively(true)
     , m_changesTracker(&m_transaction)
     , m_warpStrategy(
         new KisWarpTransformStrategy(
             dynamic_cast<KisCanvas2*>(canvas)->coordinatesConverter(),
             m_currentArgs, m_transaction))
     , m_cageStrategy(
         new KisCageTransformStrategy(
             dynamic_cast<KisCanvas2*>(canvas)->coordinatesConverter(),
             m_currentArgs, m_transaction))
     , m_liquifyStrategy(
         new KisLiquifyTransformStrategy(
             dynamic_cast<KisCanvas2*>(canvas)->coordinatesConverter(),
             m_currentArgs, m_transaction))
     , m_freeStrategy(
         new KisFreeTransformStrategy(
             dynamic_cast<KisCanvas2*>(canvas)->coordinatesConverter(),
             dynamic_cast<KisCanvas2*>(canvas)->snapGuide(),
             m_currentArgs, m_transaction))
     , m_perspectiveStrategy(
         new KisPerspectiveTransformStrategy(
             dynamic_cast<KisCanvas2*>(canvas)->coordinatesConverter(),
             dynamic_cast<KisCanvas2*>(canvas)->snapGuide(),
             m_currentArgs, m_transaction))
 {
     m_canvas = dynamic_cast<KisCanvas2*>(canvas);
     Q_ASSERT(m_canvas);
 
     setObjectName("tool_transform");
     useCursor(KisCursor::selectCursor());
     m_optionsWidget = 0;
 
     connect(m_warpStrategy.data(), SIGNAL(requestCanvasUpdate()), SLOT(canvasUpdateRequested()));
     connect(m_cageStrategy.data(), SIGNAL(requestCanvasUpdate()), SLOT(canvasUpdateRequested()));
     connect(m_liquifyStrategy.data(), SIGNAL(requestCanvasUpdate()), SLOT(canvasUpdateRequested()));
     connect(m_liquifyStrategy.data(), SIGNAL(requestCursorOutlineUpdate(const QPointF&)), SLOT(cursorOutlineUpdateRequested(const QPointF&)));
     connect(m_liquifyStrategy.data(), SIGNAL(requestUpdateOptionWidget()), SLOT(updateOptionWidget()));
     connect(m_freeStrategy.data(), SIGNAL(requestCanvasUpdate()), SLOT(canvasUpdateRequested()));
     connect(m_freeStrategy.data(), SIGNAL(requestResetRotationCenterButtons()), SLOT(resetRotationCenterButtonsRequested()));
     connect(m_freeStrategy.data(), SIGNAL(requestShowImageTooBig(bool)), SLOT(imageTooBigRequested(bool)));
     connect(m_perspectiveStrategy.data(), SIGNAL(requestCanvasUpdate()), SLOT(canvasUpdateRequested()));
     connect(m_perspectiveStrategy.data(), SIGNAL(requestShowImageTooBig(bool)), SLOT(imageTooBigRequested(bool)));
 
     connect(&m_changesTracker, SIGNAL(sigConfigChanged()),
             this, SLOT(slotTrackerChangedConfig()));
 }
 
 KisToolTransform::~KisToolTransform()
 {
     cancelStroke();
 }
 
 void KisToolTransform::outlineChanged()
 {
     emit freeTransformChanged();
     m_canvas->updateCanvas();
 }
 
 void KisToolTransform::canvasUpdateRequested()
 {
     m_canvas->updateCanvas();
 }
 
 void KisToolTransform::resetCursorStyle()
 {
     KisTool::resetCursorStyle();
 
     overrideCursorIfNotEditable();
 }
 
 void KisToolTransform::resetRotationCenterButtonsRequested()
 {
     if (!m_optionsWidget) return;
     m_optionsWidget->resetRotationCenterButtons();
 }
 
 void KisToolTransform::imageTooBigRequested(bool value)
 {
     if (!m_optionsWidget) return;
     m_optionsWidget->setTooBigLabelVisible(value);
 }
 
 KisTransformStrategyBase* KisToolTransform::currentStrategy() const
 {
     if (m_currentArgs.mode() == ToolTransformArgs::FREE_TRANSFORM) {
         return m_freeStrategy.data();
     } else if (m_currentArgs.mode() == ToolTransformArgs::WARP) {
         return m_warpStrategy.data();
     } else if (m_currentArgs.mode() == ToolTransformArgs::CAGE) {
         return m_cageStrategy.data();
     } else if (m_currentArgs.mode() == ToolTransformArgs::LIQUIFY) {
         return m_liquifyStrategy.data();
     } else /* if (m_currentArgs.mode() == ToolTransformArgs::PERSPECTIVE_4POINT) */ {
         return m_perspectiveStrategy.data();
     }
 }
 
 void KisToolTransform::paint(QPainter& gc, const KoViewConverter &converter)
 {
     Q_UNUSED(converter);
 
     if (!m_strokeData.strokeId()) return;
 
     QRectF newRefRect = KisTransformUtils::imageToFlake(m_canvas->coordinatesConverter(), QRectF(0.0,0.0,1.0,1.0));
     if (m_refRect != newRefRect) {
         m_refRect = newRefRect;
         currentStrategy()->externalConfigChanged();
     }
 
     gc.save();
     if (m_optionsWidget && m_optionsWidget->showDecorations()) {
         gc.setOpacity(0.3);
         gc.fillPath(m_selectionPath, Qt::black);
     }
     gc.restore();
 
     currentStrategy()->paint(gc);
 
 
     if (!m_cursorOutline.isEmpty()) {
         QPainterPath mappedOutline =
             KisTransformUtils::imageToFlakeTransform(
                 m_canvas->coordinatesConverter()).map(m_cursorOutline);
         paintToolOutline(&gc, mappedOutline);
     }
 }
 
 void KisToolTransform::setFunctionalCursor()
 {
     if (overrideCursorIfNotEditable()) {
         return;
     }
 
     if (!m_strokeData.strokeId()) {
         useCursor(KisCursor::pointingHandCursor());
     } else {
         useCursor(currentStrategy()->getCurrentCursor());
     }
 }
 
 void KisToolTransform::cursorOutlineUpdateRequested(const QPointF &imagePos)
 {
     QRect canvasUpdateRect;
 
     if (!m_cursorOutline.isEmpty()) {
         canvasUpdateRect = m_canvas->coordinatesConverter()->
             imageToDocument(m_cursorOutline.boundingRect()).toAlignedRect();
     }
 
     m_cursorOutline = currentStrategy()->
         getCursorOutline().translated(imagePos);
 
     if (!m_cursorOutline.isEmpty()) {
         canvasUpdateRect |=
             m_canvas->coordinatesConverter()->
             imageToDocument(m_cursorOutline.boundingRect()).toAlignedRect();
     }
 
     if (!canvasUpdateRect.isEmpty()) {
         // grow rect a bit to follow interpolation fuzziness
         canvasUpdateRect = kisGrowRect(canvasUpdateRect, 2);
         m_canvas->updateCanvas(canvasUpdateRect);
     }
 }
 
 void KisToolTransform::beginActionImpl(KoPointerEvent *event, bool usePrimaryAction, KisTool::AlternateAction action)
 {
     if (!nodeEditable()) {
         event->ignore();
         return;
     }
 
     if (!m_strokeData.strokeId()) {
         startStroke(m_currentArgs.mode(), false);
     } else {
         bool result = false;
 
         if (usePrimaryAction) {
             result = currentStrategy()->beginPrimaryAction(event);
         } else {
             result = currentStrategy()->beginAlternateAction(event, action);
         }
 
         if (result) {
             setMode(KisTool::PAINT_MODE);
         }
     }
 
     m_actuallyMoveWhileSelected = false;
 
     outlineChanged();
 }
 
 void KisToolTransform::continueActionImpl(KoPointerEvent *event, bool usePrimaryAction, KisTool::AlternateAction action)
 {
     if (mode() != KisTool::PAINT_MODE) return;
 
     m_actuallyMoveWhileSelected = true;
 
     if (usePrimaryAction) {
         currentStrategy()->continuePrimaryAction(event);
     } else {
         currentStrategy()->continueAlternateAction(event, action);
     }
 
     updateOptionWidget();
     outlineChanged();
 }
 
 void KisToolTransform::endActionImpl(KoPointerEvent *event, bool usePrimaryAction, KisTool::AlternateAction action)
 {
     if (mode() != KisTool::PAINT_MODE) return;
 
     setMode(KisTool::HOVER_MODE);
 
     if (m_actuallyMoveWhileSelected ||
         currentStrategy()->acceptsClicks()) {
 
         bool result = false;
 
         if (usePrimaryAction) {
             result = currentStrategy()->endPrimaryAction(event);
         } else {
             result = currentStrategy()->endAlternateAction(event, action);
         }
 
         if (result) {
             commitChanges();
         }
 
         outlineChanged();
     }
 
     updateOptionWidget();
     updateApplyResetAvailability();
 }
 
 void KisToolTransform::beginPrimaryAction(KoPointerEvent *event)
 {
     beginActionImpl(event, true, KisTool::NONE);
 }
 
 void KisToolTransform::continuePrimaryAction(KoPointerEvent *event)
 {
     continueActionImpl(event, true, KisTool::NONE);
 }
 
 void KisToolTransform::endPrimaryAction(KoPointerEvent *event)
 {
     endActionImpl(event, true, KisTool::NONE);
 }
 
 void KisToolTransform::activateAlternateAction(AlternateAction action)
 {
     currentStrategy()->activateAlternateAction(action);
 }
 
 void KisToolTransform::deactivateAlternateAction(AlternateAction action)
 {
     currentStrategy()->deactivateAlternateAction(action);
 }
 
 void KisToolTransform::beginAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     beginActionImpl(event, false, action);
 }
 
 void KisToolTransform::continueAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     continueActionImpl(event, false, action);
 }
 
 void KisToolTransform::endAlternateAction(KoPointerEvent *event, AlternateAction action)
 {
     endActionImpl(event, false, action);
 }
 
 void KisToolTransform::mousePressEvent(KoPointerEvent *event)
 {
     KisTool::mousePressEvent(event);
 }
 
 void KisToolTransform::mouseMoveEvent(KoPointerEvent *event)
 {
     QPointF mousePos = m_canvas->coordinatesConverter()->documentToImage(event->point);
 
     cursorOutlineUpdateRequested(mousePos);
 
     if (!MOVE_CONDITION(event, KisTool::PAINT_MODE)) {
         currentStrategy()->hoverActionCommon(event);
         setFunctionalCursor();
         KisTool::mouseMoveEvent(event);
         return;
     }
 }
 
 void KisToolTransform::mouseReleaseEvent(KoPointerEvent *event)
 {
     KisTool::mouseReleaseEvent(event);
 }
 
 void KisToolTransform::touchEvent( QTouchEvent* event )
 {
     //Count all moving touch points
     int touchCount = 0;
     Q_FOREACH ( QTouchEvent::TouchPoint tp, event->touchPoints() ) {
         if( tp.state() == Qt::TouchPointMoved ) {
             touchCount++;
         }
     }
 
     //Use the touch point count to determine the gesture
     switch( touchCount ) {
     case 1: { //Panning
         QTouchEvent::TouchPoint tp = event->touchPoints().at( 0 );
         QPointF diff = tp.screenPos() - tp.lastScreenPos();
 
         m_currentArgs.setTransformedCenter( m_currentArgs.transformedCenter() + diff );
         outlineChanged();
         break;
     }
     case 2: { //Scaling
         QTouchEvent::TouchPoint tp1 = event->touchPoints().at( 0 );
         QTouchEvent::TouchPoint tp2 = event->touchPoints().at( 1 );
 
         float lastZoom = (tp1.lastScreenPos() - tp2.lastScreenPos()).manhattanLength();
         float newZoom = (tp1.screenPos() - tp2.screenPos()).manhattanLength();
 
         float diff = (newZoom - lastZoom) / 100;
 
         m_currentArgs.setScaleX( m_currentArgs.scaleX() + diff );
         m_currentArgs.setScaleY( m_currentArgs.scaleY() + diff );
 
         outlineChanged();
         break;
     }
     case 3: { //Rotation
 
 /* TODO: implement touch-based rotation.
 
             Vector2f center;
             Q_FOREACH ( const QTouchEvent::TouchPoint &tp, event->touchPoints() ) {
                 if( tp.state() == Qt::TouchPointMoved ) {
                     center += Vector2f( tp.screenPos().x(), tp.screenPos().y() );
                 }
             }
             center /= touchCount;
 
             QTouchEvent::TouchPoint tp = event->touchPoints().at(0);
 
             Vector2f oldPosition = (Vector2f( tp.lastScreenPos().x(), tp.lastScreenPos().y() ) - center).normalized();
             Vector2f newPosition = (Vector2f( tp.screenPos().x(), tp.screenPos().y() ) - center).normalized();
 
             float oldAngle = qAcos( oldPosition.dot( Vector2f( 0.0f, 0.0f ) ) );
             float newAngle = qAcos( newPosition.dot( Vector2f( 0.0f, 0.0f ) ) );
 
             float diff = newAngle - oldAngle;
 
             m_currentArgs.setAZ( m_currentArgs.aZ() + diff );
 
             outlineChanged();
 */
         break;
     }
     }
 }
 
 void KisToolTransform::applyTransform()
 {
     slotApplyTransform();
 }
 
 KisToolTransform::TransformToolMode KisToolTransform::transformMode() const
 {
     TransformToolMode mode = FreeTransformMode;
 
     switch (m_currentArgs.mode())
     {
     case ToolTransformArgs::FREE_TRANSFORM:
         mode = FreeTransformMode;
         break;
     case ToolTransformArgs::WARP:
         mode = WarpTransformMode;
         break;
     case ToolTransformArgs::CAGE:
         mode = CageTransformMode;
         break;
     case ToolTransformArgs::LIQUIFY:
         mode = LiquifyTransformMode;
         break;
     case ToolTransformArgs::PERSPECTIVE_4POINT:
         mode = PerspectiveTransformMode;
         break;
     default:
         KIS_ASSERT_RECOVER_NOOP(0 && "unexpected transform mode");
     }
 
     return mode;
 }
 
 double KisToolTransform::translateX() const
 {
     return m_currentArgs.transformedCenter().x();
 }
 
 double KisToolTransform::translateY() const
 {
     return m_currentArgs.transformedCenter().y();
 }
 
 double KisToolTransform::rotateX() const
 {
     return m_currentArgs.aX();
 }
 
 double KisToolTransform::rotateY() const
 {
     return m_currentArgs.aY();
 }
 
 double KisToolTransform::rotateZ() const
 {
     return m_currentArgs.aZ();
 }
 
 double KisToolTransform::scaleX() const
 {
     return m_currentArgs.scaleX();
 }
 
 double KisToolTransform::scaleY() const
 {
     return m_currentArgs.scaleY();
 }
 
 double KisToolTransform::shearX() const
 {
     return m_currentArgs.shearX();
 }
 
 double KisToolTransform::shearY() const
 {
     return m_currentArgs.shearY();
 }
 
 KisToolTransform::WarpType KisToolTransform::warpType() const
 {
     switch(m_currentArgs.warpType()) {
     case KisWarpTransformWorker::AFFINE_TRANSFORM:
         return AffineWarpType;
     case KisWarpTransformWorker::RIGID_TRANSFORM:
         return RigidWarpType;
     case KisWarpTransformWorker::SIMILITUDE_TRANSFORM:
         return SimilitudeWarpType;
     default:
         return RigidWarpType;
     }
 }
 
 double KisToolTransform::warpFlexibility() const
 {
     return m_currentArgs.alpha();
 }
 
 int KisToolTransform::warpPointDensity() const
 {
     return m_currentArgs.numPoints();
 }
 
 void KisToolTransform::setTransformMode(KisToolTransform::TransformToolMode newMode)
 {
     ToolTransformArgs::TransformMode mode = ToolTransformArgs::FREE_TRANSFORM;
 
     switch (newMode) {
     case FreeTransformMode:
         mode = ToolTransformArgs::FREE_TRANSFORM;
         break;
     case WarpTransformMode:
         mode = ToolTransformArgs::WARP;
         break;
     case CageTransformMode:
         mode = ToolTransformArgs::CAGE;
         break;
     case LiquifyTransformMode:
         mode = ToolTransformArgs::LIQUIFY;
         break;
     case PerspectiveTransformMode:
         mode = ToolTransformArgs::PERSPECTIVE_4POINT;
         break;
     default:
         KIS_ASSERT_RECOVER_NOOP(0 && "unexpected transform mode");
     }
 
     if( mode != m_currentArgs.mode() ) {
         if( newMode == FreeTransformMode ) {
             m_optionsWidget->slotSetFreeTransformModeButtonClicked( true );
         } else if( newMode == WarpTransformMode ) {
             m_optionsWidget->slotSetWarpModeButtonClicked( true );
         } else if( newMode == CageTransformMode ) {
             m_optionsWidget->slotSetCageModeButtonClicked( true );
         } else if( newMode == LiquifyTransformMode ) {
             m_optionsWidget->slotSetLiquifyModeButtonClicked( true );
         } else if( newMode == PerspectiveTransformMode ) {
             m_optionsWidget->slotSetPerspectiveModeButtonClicked( true );
         }
         emit transformModeChanged();
     }
 }
 
 void KisToolTransform::setRotateX( double rotation )
 {
     m_currentArgs.setAX( normalizeAngle(rotation) );
 }
 
 void KisToolTransform::setRotateY( double rotation )
 {
     m_currentArgs.setAY( normalizeAngle(rotation) );
 }
 
 void KisToolTransform::setRotateZ( double rotation )
 {
     m_currentArgs.setAZ( normalizeAngle(rotation) );
 }
 
 void KisToolTransform::setWarpType( KisToolTransform::WarpType type )
 {
     switch( type ) {
     case RigidWarpType:
         m_currentArgs.setWarpType(KisWarpTransformWorker::RIGID_TRANSFORM);
         break;
     case AffineWarpType:
         m_currentArgs.setWarpType(KisWarpTransformWorker::AFFINE_TRANSFORM);
         break;
     case SimilitudeWarpType:
         m_currentArgs.setWarpType(KisWarpTransformWorker::SIMILITUDE_TRANSFORM);
         break;
     default:
         break;
     }
 }
 
 void KisToolTransform::setWarpFlexibility( double flexibility )
 {
     m_currentArgs.setAlpha( flexibility );
 }
 
 void KisToolTransform::setWarpPointDensity( int density )
 {
     m_optionsWidget->slotSetWarpDensity(density);
 }
 
 bool KisToolTransform::tryInitTransformModeFromNode(KisNodeSP node)
 {
     bool result = false;
 
     if (KisTransformMaskSP mask =
         dynamic_cast<KisTransformMask*>(node.data())) {
 
         KisTransformMaskParamsInterfaceSP savedParams =
             mask->transformParams();
 
         KisTransformMaskAdapter *adapter =
             dynamic_cast<KisTransformMaskAdapter*>(savedParams.data());
 
         if (adapter) {
             m_currentArgs = adapter->savedArgs();
             initGuiAfterTransformMode();
             result = true;
         }
     }
 
     return result;
 }
 
 bool KisToolTransform::tryFetchArgsFromCommandAndUndo(ToolTransformArgs *args, ToolTransformArgs::TransformMode mode, KisNodeSP currentNode)
 {
     bool result = false;
 
     const KUndo2Command *lastCommand = image()->undoAdapter()->presentCommand();
     KisNodeSP oldRootNode;
 
     if (lastCommand &&
         TransformStrokeStrategy::fetchArgsFromCommand(lastCommand, args, &oldRootNode) &&
         args->mode() == mode &&
         oldRootNode == currentNode) {
 
         args->saveContinuedState();
 
         image()->undoAdapter()->undoLastCommand();
         // FIXME: can we make it async?
         image()->waitForDone();
 
         result = true;
     }
 
     return result;
 }
 
 void KisToolTransform::initTransformMode(ToolTransformArgs::TransformMode mode)
 {
     // NOTE: we are requesting an old value of m_currentArgs variable
     //       here, which is global, don't forget about this on higher
     //       levels.
     QString filterId = m_currentArgs.filterId();
 
     m_currentArgs = ToolTransformArgs();
     m_currentArgs.setOriginalCenter(m_transaction.originalCenterGeometric());
     m_currentArgs.setTransformedCenter(m_transaction.originalCenterGeometric());
 
     if (mode == ToolTransformArgs::FREE_TRANSFORM) {
         m_currentArgs.setMode(ToolTransformArgs::FREE_TRANSFORM);
     } else if (mode == ToolTransformArgs::WARP) {
         m_currentArgs.setMode(ToolTransformArgs::WARP);
         m_optionsWidget->setDefaultWarpPoints();
         m_currentArgs.setEditingTransformPoints(false);
     } else if (mode == ToolTransformArgs::CAGE) {
         m_currentArgs.setMode(ToolTransformArgs::CAGE);
         m_currentArgs.setEditingTransformPoints(true);
     } else if (mode == ToolTransformArgs::LIQUIFY) {
         m_currentArgs.setMode(ToolTransformArgs::LIQUIFY);
         const QRect srcRect = m_transaction.originalRect().toAlignedRect();
         if (!srcRect.isEmpty()) {
             m_currentArgs.initLiquifyTransformMode(m_transaction.originalRect().toAlignedRect());
         }
     } else if (mode == ToolTransformArgs::PERSPECTIVE_4POINT) {
         m_currentArgs.setMode(ToolTransformArgs::PERSPECTIVE_4POINT);
     }
 
     initGuiAfterTransformMode();
 }
 
 void KisToolTransform::initGuiAfterTransformMode()
 {
     currentStrategy()->externalConfigChanged();
     outlineChanged();
     updateOptionWidget();
     updateApplyResetAvailability();
 }
 
 void KisToolTransform::updateSelectionPath()
 {
     m_selectionPath = QPainterPath();
 
     KisResourcesSnapshotSP resources =
         new KisResourcesSnapshot(image(), currentNode(), 0, this->canvas()->resourceManager());
 
     QPainterPath selectionOutline;
     KisSelectionSP selection = resources->activeSelection();
 
     if (selection && selection->outlineCacheValid()) {
         selectionOutline = selection->outlineCache();
     } else {
         selectionOutline.addRect(m_selectedPortionCache->exactBounds());
     }
 
     const KisCoordinatesConverter *converter = m_canvas->coordinatesConverter();
     QTransform i2f = converter->imageToDocumentTransform() * converter->documentToFlakeTransform();
 
     m_selectionPath = i2f.map(selectionOutline);
 }
 
 void KisToolTransform::initThumbnailImage(KisPaintDeviceSP previewDevice)
 {
     QImage origImg;
     m_selectedPortionCache = previewDevice;
 
     QTransform thumbToImageTransform;
 
     const int maxSize = 2000;
 
     QRect srcRect(m_transaction.originalRect().toAlignedRect());
     int x, y, w, h;
     srcRect.getRect(&x, &y, &w, &h);
 
     if (w > maxSize || h > maxSize) {
         qreal scale = qreal(maxSize) / (w > h ? w : h);
         QTransform scaleTransform = QTransform::fromScale(scale, scale);
 
         QRect thumbRect = scaleTransform.mapRect(m_transaction.originalRect()).toAlignedRect();
 
         origImg = m_selectedPortionCache->
             createThumbnail(thumbRect.width(),
                             thumbRect.height(),
-                            srcRect,
+                            srcRect, 1,
                             KoColorConversionTransformation::internalRenderingIntent(),
                             KoColorConversionTransformation::internalConversionFlags());
         thumbToImageTransform = scaleTransform.inverted();
 
     } else {
         origImg = m_selectedPortionCache->convertToQImage(0, x, y, w, h,
                                                             KoColorConversionTransformation::internalRenderingIntent(),
                                                             KoColorConversionTransformation::internalConversionFlags());
         thumbToImageTransform = QTransform();
     }
 
     // init both strokes since the thumbnail is initialized only once
     // during the stroke
     m_freeStrategy->setThumbnailImage(origImg, thumbToImageTransform);
     m_perspectiveStrategy->setThumbnailImage(origImg, thumbToImageTransform);
     m_warpStrategy->setThumbnailImage(origImg, thumbToImageTransform);
     m_cageStrategy->setThumbnailImage(origImg, thumbToImageTransform);
     m_liquifyStrategy->setThumbnailImage(origImg, thumbToImageTransform);
 }
 
 void KisToolTransform::activate(ToolActivation toolActivation, const QSet<KoShape*> &shapes)
 {
     KisTool::activate(toolActivation, shapes);
 
     if (currentNode()) {
         m_transaction = TransformTransactionProperties(QRectF(), &m_currentArgs, currentNode());
     }
 
     startStroke(ToolTransformArgs::FREE_TRANSFORM, false);
 }
 
 void KisToolTransform::deactivate()
 {
     endStroke();
     m_canvas->updateCanvas();
     KisTool::deactivate();
 }
 
 void KisToolTransform::requestUndoDuringStroke()
 {
     if (!m_strokeData.strokeId()) return;
 
     m_changesTracker.requestUndo();
 }
 
 void KisToolTransform::requestStrokeEnd()
 {
     endStroke();
 }
 
 void KisToolTransform::requestStrokeCancellation()
 {
     cancelStroke();
 }
 
 void KisToolTransform::startStroke(ToolTransformArgs::TransformMode mode, bool forceReset)
 {
     Q_ASSERT(!m_strokeData.strokeId());
 
     KisPaintDeviceSP dev;
 
     KisResourcesSnapshotSP resources =
             new KisResourcesSnapshot(image(), currentNode(), 0, this->canvas()->resourceManager());
 
     KisNodeSP currentNode = resources->currentNode();
 
     if (!currentNode || !currentNode->isEditable()) {
         return;
     }
 
     /**
      * FIXME: The transform tool is not completely asynchronous, it
      * needs the content of the layer for creation of the stroke
      * strategy. It means that we cannot start a new stroke until the
      * previous one is finished. Ideally, we should create the
      * m_selectedPortionCache and m_selectionPath somewhere in the
      * stroke and pass it to the tool somehow. But currently, we will
      * just disable starting a new stroke asynchronously
      */
     if (image()->tryBarrierLock()) {
         image()->unlock();
     } else {
         return;
     }
 
     ToolTransformArgs fetchedArgs;
     bool fetchedFromCommand = false;
 
     if (!forceReset) {
         fetchedFromCommand = tryFetchArgsFromCommandAndUndo(&fetchedArgs, mode, currentNode);
     }
 
     if (m_optionsWidget) {
         m_workRecursively = m_optionsWidget->workRecursively() ||
             !currentNode->paintDevice();
     }
 
     TransformStrokeStrategy *strategy = new TransformStrokeStrategy(currentNode, resources->activeSelection(), image()->postExecutionUndoAdapter());
     KisPaintDeviceSP previewDevice = strategy->previewDevice();
 
     KisSelectionSP selection = strategy->realSelection();
     QRect srcRect = selection ? selection->selectedExactRect() : previewDevice->exactBounds();
 
     if (!selection && resources->activeSelection()) {
         KisCanvas2 *kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
         kisCanvas->viewManager()->
             showFloatingMessage(
                 i18nc("floating message in transformation tool",
                       "Selections are not used when editing transform masks "),
                 QIcon(), 4000, KisFloatingMessage::Low);
     }
 
     if (srcRect.isEmpty()) {
         delete strategy;
 
         KisCanvas2 *kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
         kisCanvas->viewManager()->
             showFloatingMessage(
                 i18nc("floating message in transformation tool",
                       "Cannot transform empty layer "),
                 QIcon(), 1000, KisFloatingMessage::Medium);
 
         return;
     }
 
     m_transaction = TransformTransactionProperties(srcRect, &m_currentArgs, currentNode);
 
     initThumbnailImage(previewDevice);
     updateSelectionPath();
 
     if (!forceReset && fetchedFromCommand) {
         m_currentArgs = fetchedArgs;
         initGuiAfterTransformMode();
     } else if (forceReset || !tryInitTransformModeFromNode(currentNode)) {
         initTransformMode(mode);
     }
 
     m_strokeData = StrokeData(image()->startStroke(strategy));
 
     bool haveInvisibleNodes = clearDevices(m_transaction.rootNode(), m_workRecursively);
     if (haveInvisibleNodes) {
         KisCanvas2 *kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
         kisCanvas->viewManager()->
             showFloatingMessage(
                 i18nc("floating message in transformation tool",
                       "Invisible sublayers will also be transformed. Lock layers if you do not want them to be transformed "),
                 QIcon(), 4000, KisFloatingMessage::Low);
     }
 
 
     Q_ASSERT(m_changesTracker.isEmpty());
     commitChanges();
 }
 
 void KisToolTransform::endStroke()
 {
     if (!m_strokeData.strokeId()) return;
 
     if (!m_currentArgs.isIdentity()) {
         transformDevices(m_transaction.rootNode(), m_workRecursively);
 
         image()->addJob(m_strokeData.strokeId(),
                         new TransformStrokeStrategy::TransformData(
                             TransformStrokeStrategy::TransformData::SELECTION,
                             m_currentArgs,
                             m_transaction.rootNode()));
 
         image()->endStroke(m_strokeData.strokeId());
     } else {
         image()->cancelStroke(m_strokeData.strokeId());
     }
 
     m_strokeData.clear();
     m_changesTracker.reset();
 }
 
 void KisToolTransform::cancelStroke()
 {
     if (!m_strokeData.strokeId()) return;
 
     if (m_currentArgs.continuedTransform()) {
         m_currentArgs.restoreContinuedState();
         endStroke();
     } else {
         image()->cancelStroke(m_strokeData.strokeId());
         m_strokeData.clear();
         m_changesTracker.reset();
     }
 }
 
 void KisToolTransform::commitChanges()
 {
     if (!m_strokeData.strokeId()) return;
 
     m_changesTracker.commitConfig(m_currentArgs);
 }
 
 void KisToolTransform::slotTrackerChangedConfig()
 {
     slotUiChangedConfig();
     updateOptionWidget();
 }
 
 bool KisToolTransform::clearDevices(KisNodeSP node, bool recursive)
 {
     bool haveInvisibleNodes = false;
     if (!node->isEditable(false)) return haveInvisibleNodes;
 
     haveInvisibleNodes = !node->visible(false);
 
     if (recursive) {
         // simple tail-recursive iteration
         KisNodeSP prevNode = node->lastChild();
         while(prevNode) {
             haveInvisibleNodes |= clearDevices(prevNode, recursive);
             prevNode = prevNode->prevSibling();
         }
     }
 
     image()->addJob(m_strokeData.strokeId(),
                     new TransformStrokeStrategy::ClearSelectionData(node));
 
     /**
      * It might happen that the editablity state of the node would
      * change during the stroke, so we need to save the set of
      * applicable nodes right in the beginning of the processing
      */
     m_strokeData.addClearedNode(node);
 
     return haveInvisibleNodes;
 }
 
 void KisToolTransform::transformDevices(KisNodeSP node, bool recursive)
 {
     if (!node->isEditable()) return;
 
     KIS_ASSERT_RECOVER_RETURN(recursive ||
                               (m_strokeData.clearedNodes().size() == 1 &&
                                KisNodeSP(m_strokeData.clearedNodes().first()) == node));
 
     Q_FOREACH (KisNodeSP currentNode, m_strokeData.clearedNodes()) {
         KIS_ASSERT_RECOVER_RETURN(currentNode);
 
         image()->addJob(m_strokeData.strokeId(),
                         new TransformStrokeStrategy::TransformData(
                             TransformStrokeStrategy::TransformData::PAINT_DEVICE,
                             m_currentArgs,
                             currentNode));
     }
 }
 
 QWidget* KisToolTransform::createOptionWidget() {
     m_optionsWidget = new KisToolTransformConfigWidget(&m_transaction, m_canvas, m_workRecursively, 0);
     Q_CHECK_PTR(m_optionsWidget);
     m_optionsWidget->setObjectName(toolId() + " option widget");
 
     // See https://bugs.kde.org/show_bug.cgi?id=316896
     QWidget *specialSpacer = new QWidget(m_optionsWidget);
     specialSpacer->setObjectName("SpecialSpacer");
     specialSpacer->setFixedSize(0, 0);
     m_optionsWidget->layout()->addWidget(specialSpacer);
 
 
     connect(m_optionsWidget, SIGNAL(sigConfigChanged()),
             this, SLOT(slotUiChangedConfig()));
 
     connect(m_optionsWidget, SIGNAL(sigApplyTransform()),
             this, SLOT(slotApplyTransform()));
 
     connect(m_optionsWidget, SIGNAL(sigResetTransform()),
             this, SLOT(slotResetTransform()));
 
     connect(m_optionsWidget, SIGNAL(sigRestartTransform()),
             this, SLOT(slotRestartTransform()));
 
     connect(m_optionsWidget, SIGNAL(sigEditingFinished()),
             this, SLOT(slotEditingFinished()));
 
     updateOptionWidget();
 
     return m_optionsWidget;
 }
 
 void KisToolTransform::updateOptionWidget()
 {
     if (!m_optionsWidget) return;
 
     if (!currentNode()) {
         m_optionsWidget->setEnabled(false);
         return;
     }
     else {
         m_optionsWidget->setEnabled(true);
         m_optionsWidget->updateConfig(m_currentArgs);
     }
 }
 
 void KisToolTransform::updateApplyResetAvailability()
 {
     if (m_optionsWidget) {
         m_optionsWidget->setApplyResetDisabled(m_currentArgs.isIdentity());
     }
 }
 
 void KisToolTransform::slotUiChangedConfig()
 {
     if (mode() == KisTool::PAINT_MODE) return;
 
     currentStrategy()->externalConfigChanged();
 
     if (m_currentArgs.mode() == ToolTransformArgs::LIQUIFY) {
         m_currentArgs.saveLiquifyTransformMode();
     }
 
     outlineChanged();
     updateApplyResetAvailability();
 }
 
 void KisToolTransform::slotApplyTransform()
 {
     QApplication::setOverrideCursor(KisCursor::waitCursor());
     endStroke();
     QApplication::restoreOverrideCursor();
 }
 
 void KisToolTransform::slotResetTransform()
 {
     if (m_currentArgs.continuedTransform()) {
         ToolTransformArgs::TransformMode savedMode = m_currentArgs.mode();
 
         /**
          * Our reset transform button can be used for two purposes:
          *
          * 1) Reset current transform to the initial one, which was
          *    loaded from the previous user action.
          *
          * 2) Reset transform frame to infinity when the frame is unchanged
          */
 
         const bool transformDiffers = !m_currentArgs.continuedTransform()->isSameMode(m_currentArgs);
 
         if (transformDiffers &&
             m_currentArgs.continuedTransform()->mode() == savedMode) {
 
             m_currentArgs.restoreContinuedState();
             initGuiAfterTransformMode();
             slotEditingFinished();
 
         } else {
             cancelStroke();
             image()->waitForDone();
             startStroke(savedMode, true);
 
             KIS_ASSERT_RECOVER_NOOP(!m_currentArgs.continuedTransform());
         }
     } else {
         initTransformMode(m_currentArgs.mode());
         slotEditingFinished();
     }
 }
 
 void KisToolTransform::slotRestartTransform()
 {
     if (!m_strokeData.strokeId()) return;
 
     ToolTransformArgs savedArgs(m_currentArgs);
     cancelStroke();
     image()->waitForDone();
     startStroke(savedArgs.mode(), true);
 }
 
 void KisToolTransform::slotEditingFinished()
 {
     commitChanges();
 }
 
 void KisToolTransform::setShearY(double shear)
 {
     m_optionsWidget->slotSetShearY(shear);
 }
 
 void KisToolTransform::setShearX(double shear)
 {
     m_optionsWidget->slotSetShearX(shear);
 }
 
 void KisToolTransform::setScaleY(double scale)
 {
     m_optionsWidget->slotSetScaleY(scale);
 }
 
 void KisToolTransform::setScaleX(double scale)
 {
     m_optionsWidget->slotSetScaleX(scale);
 }
 
 void KisToolTransform::setTranslateY(double translation)
 {
     m_optionsWidget->slotSetTranslateY(translation);
 }
 
 void KisToolTransform::setTranslateX(double translation)
 {
     m_optionsWidget->slotSetTranslateX(translation);
 }
 
diff --git a/plugins/tools/tool_transform2/wdg_tool_transform.ui b/plugins/tools/tool_transform2/wdg_tool_transform.ui
index ab0b96f5aa..c46c98b77e 100755
--- a/plugins/tools/tool_transform2/wdg_tool_transform.ui
+++ b/plugins/tools/tool_transform2/wdg_tool_transform.ui
@@ -1,2184 +1,2189 @@
 <?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>424</width>
-    <height>558</height>
+    <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>Filter:</string>
+              <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">
+            <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>Position</string>
+              <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>Rotate</string>
+              <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>x:</string>
+               <string>&amp;x:</string>
               </property>
               <property name="buddy">
                <cstring>aXBox</cstring>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="KisDoubleSliderSpinBox" name="aXBox">
+             <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>y:</string>
+               <string>&amp;y:</string>
               </property>
               <property name="buddy">
                <cstring>aYBox</cstring>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
-             <widget class="KisDoubleSliderSpinBox" name="aYBox">
+             <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">
+             <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>z:</string>
+               <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>width:</string>
+                 <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="QSpinBox" name="scaleXBox">
+               <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" stdset="0">
+                <property name="suffix">
                  <string> %</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="1">
-               <widget class="QSpinBox" name="scaleYBox">
+               <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" stdset="0">
+                <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>height:</string>
+                 <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">
+             <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="QSpinBox" name="translateXBox">
+             <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="QSpinBox" name="translateYBox">
+             <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">
+             <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">
+             <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>
        <item><widget class="QGroupBox" name="quickTransformGroup"> <!-- Quick transform buttons -->
         <layout class="QHBoxLayout" name="quickTransformLayout">
          <property name="spacing">
           <number>6</number>
          </property>
          <!-- flipXButton -->
          <item><widget class="QPushButton" name="flipXButton">
           <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>Flip selection horizontally</string>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget></item> <!-- END flipXButton -->
          <!-- flipYButton -->
          <item><widget class="QPushButton" name="flipYButton">
           <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>Flip selection vertically</string>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget></item> <!-- END flipYButton -->
          <item>
           <spacer name="horizontalFlipRotateSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</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>
          <!-- rotateCW -->
          <item><widget class="QPushButton" name="rotateCCWButton">
           <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>Rotate selection counter-clockwise 90 degrees</string>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget></item> <!-- END rotateCW -->
          <!-- rotateCCW -->
          <item><widget class="QPushButton" name="rotateCWButton">
           <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>Rotate the selection clockwise 90 degrees</string>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget></item> <!-- END rotateCCW -->
          <item>
           <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>20</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </widget></item> <!-- Quick transform buttons -->
        <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">
+         <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>Flexibility:</string>
+           <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>Anchor Strength:</string>
+           <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>26</height>
+          <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>Subdivide</string>
+            <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="QSpinBox" name="densityBox">
+          <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>241</width>
-          <height>31</height>
+          <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">
+          <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/Edit Anchor Points</string>
+          <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>Deform Layer</string>
+          <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"/>
+            <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"/>
+            <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"/>
+            <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"/>
+            <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"/>
+    <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>KisCmbIDList</class>
-   <extends>QComboBox</extends>
-   <header>widgets/kis_cmb_idlist.h</header>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <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"/>
-  <buttongroup name="cageTransformButtonGroup"/>
  </buttongroups>
 </ui>