Commit 4ca6b98a authored by Dmitry Kazakov's avatar Dmitry Kazakov

Merge remote-tracking branch 'origin/master' into krita-chili-kazakov

parents 6f9ca930 a102154e
/**
* \mainpage
* These are copies of 3rd-party libs without real own releases.
*/
EXCLUDE=3rdparty/google-breakpad
// DOXYGEN_SET_IGNORE_PREFIX = KD K
IGNORE_PREFIX = KD K
......@@ -248,7 +248,7 @@ endif (APPLE)
## Test for sqlite
##
set(SQLITE_MIN_VERSION 3.6.16)
set(SQLITE_RECOMMENDED_VERSION 3.8.5)
set(SQLITE_RECOMMENDED_VERSION 3.8.6)
set(SQLITE_LOAD_EXTENSION_REQUIRED ON)
macro_optional_find_package(CalligraSqlite ${SQLITE_MIN_VERSION})
macro_bool_to_01(SQLITE_FOUND HAVE_SQLITE)
......
/**
* \mainpage
*/
#IF (DCMTK_INCLUDE_DIR AND DCMTK_LIBRARIES )
#
# SET(DCMTK_FOUND TRUE)
# MESSAGE(STATUS "Found DCMTK-SR: ${DCMTK_LIBRARIES}" )
#
#ELSE (DCMTK_INCLUDE_DIR AND DCMTK_LIBRARIES)
FIND_PATH(DCMTK_INCLUDE_DIR NAMES dcmtk PATH /usr/include /usr/local/include)
FIND_LIBRARY(DCMSR_LIBRARY NAMES dcmsr)
FIND_LIBRARY(DCMDATA_LIBRARY NAMES dcmdata)
FIND_LIBRARY(OFSTD_LIBRARY NAMES ofstd)
#MESSAGE(STATUS "Found DCMTK-SR: ${DCMSR_LIBRARY} ${DCMDATA_LIBRARY} ${OFSTD_LIBRARY}" )
IF(DCMSR_LIBRARY AND DCMDATA_LIBRARY AND OFSTD_LIBRARY AND DCMTK_INCLUDE_DIR)
SET(DCMTK_FOUND TRUE)
#set(DCMTK_LIBS ${DCMSR_LIBRARY} ${DCMDATA_LIBRARY} ${OFSTD_LIBRARY})
set(DCMTK_LIBRARIES ${DCMSR_LIBRARY} ${DCMDATA_LIBRARY} ${OFSTD_LIBRARY} )#CACHE STRINGS "Libraries needed for DICOM Structured Report Words filter")
MESSAGE(STATUS "Found DCMTK: ${DCMTK_LIBRARIES}" )
ENDIF(DCMSR_LIBRARY AND DCMDATA_LIBRARY AND OFSTD_LIBRARY AND DCMTK_INCLUDE_DIR)
#ENDIF (DCMTK_INCLUDE_DIR AND DCMTK_LIBRARIES )
# XXX: this is a copy of CMake's findGIF to override KDE's findGIF which gives an
# an error:
# CMake Error at /usr/share/kde4/apps/cmake/modules/FindGIF.cmake:24 (CHECK_STRUCT_MEMBER):
# Unknown CMake command "CHECK_STRUCT_MEMBER"
#
# This module defines
# GIF_LIBRARIES - libraries to link to in order to use GIF
# GIF_FOUND, if false, do not try to link
# GIF_INCLUDE_DIR, where to find the headers
#
# $GIF_DIR is an environment variable that would
# correspond to the ./configure --prefix=$GIF_DIR
# Created by Eric Wing.
# Modifications by Alexander Neundorf
FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
HINTS
$ENV{GIF_DIR}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw/include # Fink
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
/usr/freeware/include
)
# the gif library can have many names :-/
SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib)
FIND_LIBRARY(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS}
HINTS
$ENV{GIF_DIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
/usr/freeware
)
# see readme.txt
SET(GIF_LIBRARIES ${GIF_LIBRARY})
# handle the QUIETLY and REQUIRED arguments and set GIF_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF DEFAULT_MSG GIF_LIBRARY GIF_INCLUDE_DIR)
MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARY)
if (GLPK_INCLUDE_DIR)
# in cache already
set(GLPK_FOUND TRUE)
else (GLPK_INCLUDE_DIR)
find_path(GLPK_INCLUDE_DIR NAMES glpk.h
PATHS
${INCLUDE_INSTALL_DIR}
${GLPK_INCLUDE_PATH}
)
find_library(GLPK_LIBRARY glpk)
if(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
set(GLPK_FOUND TRUE)
endif(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
if(GLPK_FOUND)
# Try to find the version using glp_version(), which was introduced in 4.16
set(FIND_GLPK_VERSION_SOURCE
"#include <stdio.h>\n#include <glpk.h>\n int main()\n {\n printf(\"FOUND_GLPK_VERSION %s\\n\", glp_version());\n return 0;\n}\n")
set(FIND_GLPK_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindGLPK.cxx)
file(WRITE "${FIND_GLPK_VERSION_SOURCE_FILE}" "${FIND_GLPK_VERSION_SOURCE}")
try_run(GLPK_RUN_RESULT GLPK_COMPILE_RESULT
${CMAKE_BINARY_DIR}
${FIND_GLPK_VERSION_SOURCE_FILE}
CMAKE_FLAGS -DLINK_LIBRARIES:STRING=${GLPK_LIBRARY}
-DINCLUDE_DIRECTORIES:STRING=${GLPK_INCLUDE_DIR}
OUTPUT_VARIABLE GLPK_VERSION_OUTPUT)
if(GLPK_COMPILE_RESULT AND NOT GLPK_RUN_RESULT STREQUAL FAILED_TO_RUN)
string(REGEX REPLACE ".*FOUND_GLPK_VERSION ([0-9]+\\.[0-9]+).*" "\\1" GLPK_VERSION_STRING "${GLPK_VERSION_OUTPUT}")
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+.*" "\\1" MAJOR_VERSION "${GLPK_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" MINOR_VERSION "${GLPK_VERSION_STRING}")
if(NOT GLPK_FIND_QUIETLY)
message(STATUS "Found GLPK version ${MAJOR_VERSION}.${MINOR_VERSION}: ${GLPK_INCLUDE_DIR} ${GLPK_LIBRARY}")
endif(NOT GLPK_FIND_QUIETLY)
else(GLPK_COMPILE_RESULT AND NOT GLPK_RUN_RESULT STREQUAL FAILED_TO_RUN)
if(NOT GLPK_FIND_QUIETLY)
message(STATUS "Found GLPK but failed to find version (likely earlier than 4.16): ${GLPK_INCLUDE_DIR} ${GLPK_LIBRARY}")
file(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Find GLPK version failed with the following output:\n${GLPK_VERSION_OUTPUT}\nFindGLPK.cxx:\n${FIND_GLPK_VERSION_SOURCE}\n\n")
endif(NOT GLPK_FIND_QUIETLY)
set(MAJOR_VERSION 0)
set(MINOR_VERSION 0)
endif(GLPK_COMPILE_RESULT AND NOT GLPK_RUN_RESULT STREQUAL FAILED_TO_RUN)
math(EXPR VERSION "${MAJOR_VERSION}*100 + ${MINOR_VERSION}")
set(GLPK_MAJOR_VERSION ${MAJOR_VERSION} CACHE STRING "glpk major version")
set(GLPK_MINOR_VERSION ${MINOR_VERSION} CACHE STRING "glpk minor version")
set(GLPK_VERSION ${VERSION} CACHE STRING "glpk version")
else(GLPK_FOUND)
if(GLPK_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find GLPK")
endif(GLPK_FIND_REQUIRED)
endif(GLPK_FOUND)
mark_as_advanced(GLPK_INCLUDE_DIR)
mark_as_advanced(GLPK_LIBRARY)
mark_as_advanced(GLPK_MAJOR_VERSION)
mark_as_advanced(GLPK_MINOR_VERSION)
mark_as_advanced(GLPK_VERSION)
endif(GLPK_INCLUDE_DIR)
if (GMM_INCLUDE_DIR)
# in cache already
set(GMM_FOUND TRUE)
else (GMM_INCLUDE_DIR)
find_path(GMM_INCLUDE_DIR NAMES gmm/gmm.h
PATHS
${INCLUDE_INSTALL_DIR}
${GMM_INCLUDE_PATH}
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMM DEFAULT_MSG GMM_INCLUDE_DIR )
mark_as_advanced(GMM_INCLUDE_DIR)
endif(GMM_INCLUDE_DIR)
# - Try to find the kunittest directory library
# Once done this will define
#
# KUNITTEST_FOUND - system has kunittest
# KUNITTEST_INCLUDE_DIR - the kunittest include directory
# KUNITTEST_LIBRARIES - The libraries needed to use kunittest
FIND_PATH(KUNITTEST_INCLUDE_DIR kunittest/tester.h
${KDE4_INCLUDE_DIR}
)
FIND_LIBRARY(KUNITTEST_LIBRARIES NAMES kunittest
PATHS
${KDE4_LIB_DIR}
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Kunittest DEFAULT_MSG KUNITTEST_INCLUDE_DIR KUNITTEST_LIBRARIES )
MARK_AS_ADVANCED(KUNITTEST_INCLUDE_DIR KUNITTEST_LIBRARIES)
# - Try to find libGSF
#
# Once done this will define
#
# LIBGSF_FOUND - System has LibGSF
# LIBGSF_INCLUDE_DIR - The LibGSF include directory
# LIBGSF_LIBRARIES - The libraries needed to use LibGSF
# LIBGSF_DEFINITIONS - Compiler switches required for using LibGSF
# LIBGSF_GSF_EXECUTABLE - The archive utility
# LIBGSF_GSFOFFICETHUMBNAILER_EXECUTABLE - The office files thumbnailer for the GNOME desktop
# LIBGSF_GSFVBADUMP_EXECUTABLE - The utility to extract Visual Basic for Applications macros
# Copyright (c) 2009, Pau Garcia i Quiles <pgquiles@elpauer.org>
# Based off FindLibXml2.cmake from CMake 2.6.4 by Alexander Neundorf <neundorf@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
IF (LIBGSF_INCLUDE_DIR AND LIBGSF_LIBRARIES)
# in cache already
SET(LIBGSF_FIND_QUIETLY TRUE)
ENDIF (LIBGSF_INCLUDE_DIR AND LIBGSF_LIBRARIES)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_LIBGSF libgsf-1)
SET(LIBGSF_DEFINITIONS ${PC_LIBGSF_CFLAGS_OTHER})
ENDIF (NOT WIN32)
FIND_PATH(LIBGSF_INCLUDE_DIR gsf/gsf.h
HINTS
${PC_LIBGSF_INCLUDEDIR}
${PC_LIBGSF_INCLUDE_DIRS}
PATH_SUFFIXES libgsf-1
)
FIND_LIBRARY(LIBGSF_LIBRARIES NAMES gsf-1 libgsf-1
HINTS
${PC_LIBGSF_LIBDIR}
${PC_LIBGSF_LIBRARY_DIRS}
)
FIND_PROGRAM(LIBGSF_GSF_EXECUTABLE gsf)
FIND_PROGRAM(LIBGSF_GSFOFFICETHUMBNAILER_EXECUTABLE gsf-office-thumbnailer)
FIND_PROGRAM(LIBGSF_GSFVBADUMP_EXECUTABLE gsf-vba-dump)
INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LIBGSF_FOUND to TRUE if
# all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGSF DEFAULT_MSG LIBGSF_LIBRARIES LIBGSF_INCLUDE_DIR)
MARK_AS_ADVANCED(LIBGSF_INCLUDE_DIR LIBGSF_LIBRARIES LIBGSF_GSF_EXECUTABLE LIBGSF_GSFOFFICETHUMBNAILER_EXECUTABLE LIBGSF_GSFVBADUMP_EXECUTABLE )
......@@ -54,3 +54,6 @@
consult the plugin writers' manual for more information.
*/
// DOXYGEN_SET_PROJECT_NAME = Krita
IGNORE_PREFIX = Kis Ko K
......@@ -6,6 +6,12 @@ target_link_libraries(kritaanimationpart kritaui)
install(TARGETS kritaanimationpart DESTINATION ${PLUGIN_INSTALL_DIR})
set(kritaanimation_KDEINIT_SRCS main.cpp "${CMAKE_CURRENT_SOURCE_DIR}/../kis_splash_screen.cpp")
if(WIN32 AND USE_BREAKPAD)
set(kritaanimation_KDEINIT_SRCS ${kritaanimation_KDEINIT_SRCS} ../kis_crash_handler.cpp)
set(BREAKPAD_LIBS breakpad)
endif(WIN32 AND USE_BREAKPAD)
kde4_add_ui_files(kritaanimation_KDEINIT_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/../wdgsplash.ui"
)
......@@ -14,7 +20,7 @@ kde4_add_app_icon(kritaanimation_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pi
kde4_add_kdeinit_executable(kritaanimation ${kritaanimation_KDEINIT_SRCS})
target_link_libraries(kdeinit_kritaanimation kritaui)
target_link_libraries(kritaanimation kdeinit_kritaanimation)
target_link_libraries(kritaanimation ${BREAKPAD_LIBS} kdeinit_kritaanimation)
install(TARGETS kritaanimation ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kdeinit_kritaanimation ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -2,7 +2,9 @@
Type=ServiceType
X-KDE-ServiceType=Krita/AnimationDock
Comment=Animation Docker for Krita
Comment[ca]=Acoblador d'animació per al Krita
Comment[cs]=Dok animace pro Kritu
Comment[de]=Animations-Docker für Krita
Comment[en_GB]=Animation Docker for Krita
Comment[es]=Ventana acoplable de animación para Krita
Comment[it]=Area di aggancio delle animazioni di Krita
......
[Desktop Entry]
Name=Krita Animation
Name[ca]=Animació del Krita
Name[cs]=Animace Krita
Name[de]=Krita-Animation
Name[en_GB]=Krita Animation
Name[es]=Krita animación
Name[ia]=Krita Animation
Name[it]=Animazione di Krita
Name[ja]=Krita Animation
Name[nl]=Animatie van Krita
......
[Desktop Entry]
Name=Calligra Animation Editor
Name[ca]=Aplicació d'animació del Calligra
Name[cs]=Editor animací v Calligra
Name[de]=Calligra-Animations-Editor
Name[en_GB]=Calligra Animation Editor
Name[es]=Editor de animaciones de Calligra
Name[ia]=Editor de animation de Calligra
Name[it]=Editor delle animazioni di Calligra
Name[ja]=Calligra アニメーションエディタ
Name[nl]=Animatiebewerker van Calligra
......
......@@ -58,6 +58,7 @@
#include <KoFileDialog.h>
#include <KoDocumentEntry.h>
#include <KoFilterManager.h>
#include <KoIcon.h>
#include "filter/kis_filter.h"
#include "filter/kis_filter_registry.h"
......@@ -249,7 +250,7 @@ MainWindow::MainWindow(QStringList fileNames, QWidget* parent, Qt::WindowFlags f
qApp->setActiveWindow( this );
setWindowTitle(i18n("Krita Gemini"));
setWindowIcon(KIcon("kritagemini"));
setWindowIcon(koIcon("kritagemini"));
// Load filters and other plugins in the gui thread
Q_UNUSED(KisFilterRegistry::instance());
......
/*
* \mainpage Krita Core library called: 'image'
*/
IGNORE_PREFIX = Kis Ko K
......@@ -32,8 +32,8 @@
#include "kis_serializable_configuration.h"
const char* KisBookmarkedConfigurationManager::ConfigDefault = "Default";
const char* KisBookmarkedConfigurationManager::ConfigLastUsed = "Last Used";
const char* const KisBookmarkedConfigurationManager::ConfigDefault = "Default";
const char* const KisBookmarkedConfigurationManager::ConfigLastUsed = "Last Used";
struct KisBookmarkedConfigurationManager::Private {
......
......@@ -32,8 +32,8 @@ class KLocalizedString;
class KRITAIMAGE_EXPORT KisBookmarkedConfigurationManager
{
public:
static const char* ConfigDefault;
static const char* ConfigLastUsed;
static const char* const ConfigDefault;
static const char* const ConfigLastUsed;
public:
/**
* @param configEntryGroup name of the configuration entry with the
......
......@@ -116,7 +116,7 @@ inline qreal incrementInDirection(qreal a, qreal inc, qreal direction) {
}
template<typename T>
inline T pow2(T x) {
inline T pow2(const T& x) {
return x * x;
}
......
......@@ -170,9 +170,10 @@ void KisTileData::releaseInternalPools()
(void)system(command);
#endif /* DEBUG_POOL_RELEASE */
} else {
qWarning() << "WARNING: trying to purge pool memory while there are used tiles present!";
qWarning() << " The memory will *NOT* be returned to the system, though it will";
qWarning() << " be reused by Krita internally. Please report to developers!";
}
// else {
// qWarning() << "WARNING: trying to purge pool memory while there are used tiles present!";
// qWarning() << " The memory will *NOT* be returned to the system, though it will";
// qWarning() << " be reused by Krita internally. Please report to developers!";
// }
}
......@@ -57,7 +57,7 @@ KisSplashScreen::KisSplashScreen(const QString &version, const QPixmap &pixmap,
"<body>"
"<p align=\"center\"><b>Links</b></p>"
"<p><a href=\"http://krita.org/support-krita#general\"><span style=\" text-decoration: underline; color:#FFFFFF;\">Donations</span></a></p>"
"<p><a href=\"https://krita.org/support-us/donations/\"><span style=\" text-decoration: underline; color:#FFFFFF;\">Donations</span></a></p>"
"<p><a href=\"http://www.zazzle.com/kritashop\"><span style=\" text-decoration: underline; color:#FFFFFF;\">Merchandise</span></a></p>"
"<p><a href=\"http://krita.org/resources\"><span style=\" text-decoration: underline; color:#FFFFFF;\">Getting Started</span></a></p>"
......
......@@ -111,3 +111,4 @@ independent brush plugins or use libbrush from other places, like some filters,
we need to move the widgets in here.
*/
IGNORE_PREFIX = Kis Ko K
......@@ -54,3 +54,5 @@ There are several kinds of plugins for Krita:
Assistants are plugins that constrain the freehand tool when painting in a
certain way
*/
IGNORE_PREFIX = Kis Ko K
......@@ -18,3 +18,4 @@ if(HAVE_OCIO)
endif(HAVE_OCIO)
add_subdirectory(overview)
add_subdirectory(palettedocker)
add_subdirectory(colorslider)
......@@ -39,38 +39,43 @@ public:
QGridLayout* layout = new QGridLayout(this);
layout->setSpacing(spacing);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Triangle, KisColorSelector::Ring, KisColorSelector::SL , KisColorSelector::H), this), 0,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SL , KisColorSelector::H), this), 0,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SV , KisColorSelector::H), this), 0,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SV2, KisColorSelector::H), this), 0,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SI , KisColorSelector::H), this), 0,4);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SY , KisColorSelector::H), this), 0,5);
//qDebug()<<"Created list";
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Triangle, KisColorSelector::Ring, KisColorSelector::SL , KisColorSelector::H), this), 0,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SV , KisColorSelector::H), this), 0,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SV2, KisColorSelector::H), this), 0,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::VH, KisColorSelector::hsvS), this), 0,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hsvSH, KisColorSelector::V), this), 0,4);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SV2, KisColorSelector::H), this), 1,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SV, KisColorSelector::H), this), 1,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::VH, KisColorSelector::hsvS), this), 1,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::hsvSH, KisColorSelector::V), this), 1,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SV, KisColorSelector::H), this), 1,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SL, KisColorSelector::H), this), 1,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SV2, KisColorSelector::H), this), 1,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SI, KisColorSelector::H), this), 1,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SY, KisColorSelector::H), this), 1,4);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::VH, KisColorSelector::hsvS), this), 2,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::LH, KisColorSelector::hslS), this), 2,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::hsvSH, KisColorSelector::V), this), 2,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::hslSH, KisColorSelector::L), this), 2,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::IH, KisColorSelector::hsiS), this), 2,4);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::YH, KisColorSelector::hsyS), this), 2,5);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::VH, KisColorSelector::hsvS), this), 3,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::LH, KisColorSelector::hslS), this), 3,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hsvSH, KisColorSelector::V), this), 3,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hslSH, KisColorSelector::L), this), 3,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::IH, KisColorSelector::hsiS), this), 4,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::YH, KisColorSelector::hsyS), this), 4,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hsiSH, KisColorSelector::I), this), 4,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hsySH, KisColorSelector::Y), this), 4,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SL , KisColorSelector::H), this), 0,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::LH, KisColorSelector::hslS), this), 0,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hslSH, KisColorSelector::L), this), 0,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::SL, KisColorSelector::H), this), 1,0);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::LH, KisColorSelector::hslS), this), 1,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Slider, KisColorSelector::hslSH, KisColorSelector::L), this), 1,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square, KisColorSelector::Ring, KisColorSelector::SI , KisColorSelector::H), this), 0,1);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::IH, KisColorSelector::hsiS), this), 0,2);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Wheel, KisColorSelector::Slider, KisColorSelector::hsiSH, KisColorSelector::I), this), 0,3);
layout->addWidget(new KisColorSelector(KisColorSelector::Configuration(KisColorSelector::Square,<