Commit ed649432 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Add the kiscolorbutton in more places

parent d635b53e
......@@ -68,18 +68,19 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageWSP image, QWidget *parent,
m_page->lblResolutionValue->setText(QLocale().toString(image->xRes()*72, 2)); // XXX: separate values for x & y?
//Set the canvas projection color:
m_defaultColorAction = new KoColorPopupAction(this);
m_defaultColorAction->setCurrentColor(m_image->defaultProjectionColor());
m_defaultColorAction->setToolTip(i18n("Change the background color of the image"));
m_page->bnBackgroundColor->setDefaultAction(m_defaultColorAction);
//Set the canvas projection color: backgroundColor
KoColor background = m_image->defaultProjectionColor();
background.setOpacity(1.0);
m_page->bnBackgroundColor->setColor(background);
m_page->sldBackgroundColor->setRange(0.0,1.0,2);
m_page->sldBackgroundColor->setSingleStep(0.05);
m_page->sldBackgroundColor->setValue(m_image->defaultProjectionColor().opacityF());
KisSignalCompressor *compressor = new KisSignalCompressor(500 /* ms */, KisSignalCompressor::POSTPONE, this);
connect(m_defaultColorAction, SIGNAL(colorChanged(const KoColor&)), compressor, SLOT(start()));
connect(m_page->bnBackgroundColor, SIGNAL(changed(KoColor)), compressor, SLOT(start()));
connect(m_page->sldBackgroundColor, SIGNAL(valueChanged(qreal)), compressor, SLOT(start()));
connect(compressor, SIGNAL(timeout()), this, SLOT(setCurrentColor()));
connect(m_defaultColorAction, SIGNAL(colorChanged(const KoColor&)), this, SLOT(setCurrentColor()));
//Set the color space
m_page->colorSpaceSelector->setCurrentColorSpace(image->colorSpace());
......@@ -91,17 +92,15 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageWSP image, QWidget *parent,
m_page->ckbBlackPointComp->setChecked(m_proofingConfig->conversionFlags.testFlag(KoColorConversionTransformation::BlackpointCompensation));
m_gamutWarning = new KoColorPopupAction(this);
m_gamutWarning->setCurrentColor(m_proofingConfig->warningColor);
m_gamutWarning->setToolTip(i18n("Set color used for warning"));
m_page->gamutAlarm->setDefaultAction(m_gamutWarning);
m_page->gamutAlarm->setColor(m_proofingConfig->warningColor);
m_page->gamutAlarm->setToolTip(i18n("Set color used for warning"));
m_page->sldAdaptationState->setMaximum(20);
m_page->sldAdaptationState->setMinimum(0);
m_page->sldAdaptationState->setValue((int)m_proofingConfig->adaptationState*20);
KisSignalCompressor *softProofConfigCompressor = new KisSignalCompressor(500, KisSignalCompressor::POSTPONE,this);
connect(m_gamutWarning, SIGNAL(colorChanged(KoColor)), softProofConfigCompressor, SLOT(start()));
connect(m_page->gamutAlarm, SIGNAL(changed(KoColor)), softProofConfigCompressor, SLOT(start()));
connect(m_page->proofSpaceSelector, SIGNAL(colorSpaceChanged(const KoColorSpace*)), softProofConfigCompressor, SLOT(start()));
connect(m_page->cmbIntent, SIGNAL(currentIndexChanged(int)), softProofConfigCompressor, SLOT(start()));
connect(m_page->ckbBlackPointComp, SIGNAL(stateChanged(int)), softProofConfigCompressor, SLOT(start()));
......@@ -142,7 +141,9 @@ const KoColorSpace * KisDlgImageProperties::colorSpace()
void KisDlgImageProperties::setCurrentColor()
{
KisLayerUtils::changeImageDefaultProjectionColor(m_image, m_defaultColorAction->currentKoColor());
KoColor background = m_page->bnBackgroundColor->color();
background.setOpacity(m_page->sldBackgroundColor->value());
KisLayerUtils::changeImageDefaultProjectionColor(m_image, background);
}
void KisDlgImageProperties::setProofingConfig()
......@@ -153,7 +154,7 @@ void KisDlgImageProperties::setProofingConfig()
m_proofingConfig->proofingProfile = m_page->proofSpaceSelector->currentColorSpace()->profile()->name();
m_proofingConfig->proofingModel = m_page->proofSpaceSelector->currentColorSpace()->colorModelId().id();
m_proofingConfig->proofingDepth = "U8";//default to this
m_proofingConfig->warningColor = m_gamutWarning->currentKoColor();
m_proofingConfig->warningColor = m_page->gamutAlarm->color();
m_proofingConfig->adaptationState = (double)m_page->sldAdaptationState->value()/20.0;
qDebug()<<"set proofing config in properties: "<<m_proofingConfig->proofingProfile;
m_image->setProofingConfiguration(m_proofingConfig);
......
......@@ -24,8 +24,6 @@
#include "ui_wdgimageproperties.h"
class KoColorSpace;
class KoColorPopupAction;
class WdgImageProperties : public QWidget, public Ui::WdgImageProperties
{
Q_OBJECT
......@@ -58,8 +56,6 @@ private:
WdgImageProperties * m_page;
KisImageWSP m_image;
KoColorPopupAction *m_defaultColorAction;
KoColorPopupAction *m_gamutWarning;
KisProofingConfiguration *m_proofingConfig;
};
......
......@@ -31,6 +31,7 @@
#include <KoColorPopupButton.h>
#include <KoColorSpaceRegistry.h>
#include <KoResourceServerProvider.h>
#include "kis_config.h"
......@@ -619,10 +620,10 @@ BevelAndEmboss::BevelAndEmboss(Contour *contour, Texture *texture, QWidget *pare
connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
connect(ui.cmbHighlightMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.bnHighlightColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnHighlightColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.cmbShadowMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.bnShadowColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnShadowColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.intOpacity2, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));;
// Contour
......@@ -664,10 +665,13 @@ void BevelAndEmboss::setBevelAndEmboss(const psd_layer_effects_bevel_emboss *bev
// ui.cmbContour;
ui.chkAntiAliased->setChecked(bevelAndEmboss->glossAntiAliased());
ui.cmbHighlightMode->selectCompositeOp(KoID(bevelAndEmboss->highlightBlendMode()));
ui.bnHighlightColor->setColor(bevelAndEmboss->highlightColor());
KoColor highlightshadow(KoColorSpaceRegistry::instance()->rgb8());
highlightshadow.fromQColor(bevelAndEmboss->highlightColor());
ui.bnHighlightColor->setColor(highlightshadow);
ui.intOpacity->setValue(bevelAndEmboss->highlightOpacity());
ui.cmbShadowMode->selectCompositeOp(KoID(bevelAndEmboss->shadowBlendMode()));
ui.bnShadowColor->setColor(bevelAndEmboss->shadowColor());
highlightshadow.fromQColor(bevelAndEmboss->shadowColor());
ui.bnShadowColor->setColor(highlightshadow);
ui.intOpacity2->setValue(bevelAndEmboss->shadowOpacity());
// FIXME: curve editing
......@@ -696,10 +700,10 @@ void BevelAndEmboss::fetchBevelAndEmboss(psd_layer_effects_bevel_emboss *bevelAn
bevelAndEmboss->setAltitude(ui.intAltitude->value());
bevelAndEmboss->setGlossAntiAliased(ui.chkAntiAliased->isChecked());
bevelAndEmboss->setHighlightBlendMode(ui.cmbHighlightMode->selectedCompositeOp().id());
bevelAndEmboss->setHighlightColor(ui.bnHighlightColor->color());
bevelAndEmboss->setHighlightColor(ui.bnHighlightColor->color().toQColor());
bevelAndEmboss->setHighlightOpacity(ui.intOpacity->value());
bevelAndEmboss->setShadowBlendMode(ui.cmbShadowMode->selectedCompositeOp().id());
bevelAndEmboss->setShadowColor(ui.bnShadowColor->color());
bevelAndEmboss->setShadowColor(ui.bnShadowColor->color().toQColor());
bevelAndEmboss->setShadowOpacity(ui.intOpacity2->value());
// FIXME: curve editing
......@@ -792,21 +796,23 @@ ColorOverlay::ColorOverlay(QWidget *parent)
connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
}
void ColorOverlay::setColorOverlay(const psd_layer_effects_color_overlay *colorOverlay)
{
ui.cmbCompositeOp->selectCompositeOp(KoID(colorOverlay->blendMode()));
ui.intOpacity->setValue(colorOverlay->opacity());
ui.bnColor->setColor(colorOverlay->color());
KoColor color(KoColorSpaceRegistry::instance()->rgb8());
color.fromQColor(colorOverlay->color());
ui.bnColor->setColor(color);
}
void ColorOverlay::fetchColorOverlay(psd_layer_effects_color_overlay *colorOverlay) const
{
colorOverlay->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
colorOverlay->setOpacity(ui.intOpacity->value());
colorOverlay->setColor(ui.bnColor->color());
colorOverlay->setColor(ui.bnColor->color().toQColor());
}
......@@ -843,7 +849,7 @@ DropShadow::DropShadow(Mode mode, QWidget *parent)
// connect everything to configChanged() signal
connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
......@@ -897,7 +903,9 @@ void DropShadow::setShadow(const psd_layer_effects_shadow_common *shadow)
{
ui.cmbCompositeOp->selectCompositeOp(KoID(shadow->blendMode()));
ui.intOpacity->setValue(shadow->opacity());
ui.bnColor->setColor(shadow->color());
KoColor color(KoColorSpaceRegistry::instance()->rgb8());
color.fromQColor(shadow->color());
ui.bnColor->setColor(color);
ui.dialAngle->setValue(shadow->angle());
ui.intAngle->setValue(shadow->angle());
......@@ -925,7 +933,7 @@ void DropShadow::fetchShadow(psd_layer_effects_shadow_common *shadow) const
{
shadow->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
shadow->setOpacity(ui.intOpacity->value());
shadow->setColor(ui.bnColor->color());
shadow->setColor(ui.bnColor->color().toQColor());
shadow->setAngle(ui.dialAngle->value());
shadow->setUseGlobalLight(ui.chkUseGlobalLight->isChecked());
......@@ -1092,7 +1100,7 @@ InnerGlow::InnerGlow(Mode mode, KisCanvasResourceProvider *resourceProvider, QWi
connect(ui.intNoise, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.radioColor, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.radioGradient, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged()));
......@@ -1121,7 +1129,9 @@ void InnerGlow::setConfig(const psd_layer_effects_glow_common *config)
ui.intNoise->setValue(config->noise());
ui.radioColor->setChecked(config->fillType() == psd_fill_solid_color);
ui.bnColor->setColor(config->color());
KoColor color(KoColorSpaceRegistry::instance()->rgb8());
color.fromQColor(config->color());
ui.bnColor->setColor(color);
ui.radioGradient->setChecked(config->fillType() == psd_fill_gradient);
KoAbstractGradient *gradient = fetchGradientLazy(
......@@ -1164,7 +1174,7 @@ void InnerGlow::fetchConfig(psd_layer_effects_glow_common *config) const
config->setFillType(psd_fill_gradient);
}
config->setColor(ui.bnColor->color());
config->setColor(ui.bnColor->color().toQColor());
config->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient()));
config->setTechnique((psd_technique_type)ui.cmbTechnique->currentIndex());
config->setSpread(ui.intChoke->value());
......@@ -1251,7 +1261,7 @@ Satin::Satin(QWidget *parent)
connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
......@@ -1280,7 +1290,9 @@ void Satin::slotIntAngleChanged(int value)
void Satin::setSatin(const psd_layer_effects_satin *satin)
{
ui.cmbCompositeOp->selectCompositeOp(KoID(satin->blendMode()));
ui.bnColor->setColor(satin->color());
KoColor color(KoColorSpaceRegistry::instance()->rgb8());
color.fromQColor(satin->color());
ui.bnColor->setColor(color);
ui.intOpacity->setValue(satin->opacity());
ui.dialAngle->setValue(satin->angle());
......@@ -1301,7 +1313,7 @@ void Satin::fetchSatin(psd_layer_effects_satin *satin) const
{
satin->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
satin->setOpacity(ui.intOpacity->value());
satin->setColor(ui.bnColor->color());
satin->setColor(ui.bnColor->color().toQColor());
satin->setAngle(ui.dialAngle->value());
......@@ -1345,7 +1357,7 @@ Stroke::Stroke(KisCanvasResourceProvider *resourceProvider, QWidget *parent)
connect(ui.cmbFillType, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(QColor)), SIGNAL(configChanged()));
connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged()));
connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
......@@ -1385,8 +1397,9 @@ void Stroke::setStroke(const psd_layer_effects_stroke *stroke)
ui.intOpacity->setValue(stroke->opacity());
ui.cmbFillType->setCurrentIndex((int)stroke->fillType());
ui.bnColor->setColor(stroke->color());
KoColor color(KoColorSpaceRegistry::instance()->rgb8());
color.fromQColor(stroke->color());
ui.bnColor->setColor(color);
KoAbstractGradient *gradient =
fetchGradientLazy(GradientPointerConverter::styleToResource(stroke->gradient()), m_resourceProvider);
......@@ -1417,7 +1430,7 @@ void Stroke::fetchStroke(psd_layer_effects_stroke *stroke) const
stroke->setFillType((psd_fill_type)ui.cmbFillType->currentIndex());
stroke->setColor(ui.bnColor->color());
stroke->setColor(ui.bnColor->color().toQColor());
stroke->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient()));
stroke->setReverse(ui.chkReverse->isChecked());
......
......@@ -669,7 +669,6 @@ void PerformanceTab::selectSwapDir()
//---------------------------------------------------------------------------------------------------
#include "KoColor.h"
#include "KoColorPopupAction.h"
DisplaySettingsTab::DisplaySettingsTab(QWidget *parent, const char *name)
: WdgDisplaySettings(parent, name)
......
......@@ -25,7 +25,6 @@
#include <QWidget>
#include <kpagedialog.h>
#include "KoColorPopupAction.h"
#include "kis_global.h"
#include "widgets/squeezedcombobox.h"
......@@ -157,7 +156,6 @@ private Q_SLOTS:
public:
void setDefault();
WdgColorSettings *m_page;
KoColorPopupAction *m_gamutWarning;
QButtonGroup m_pasteBehaviourGroup;
QList<QLabel*> m_monitorProfileLabels;
QList<SqueezedComboBox*> m_monitorProfileWidgets;
......@@ -245,7 +243,6 @@ public:
* Display settings tab for preferences dialog
*/
class KoColorPopupAction;
class DisplaySettingsTab : public WdgDisplaySettings
{
......@@ -260,7 +257,6 @@ protected Q_SLOTS:
void slotUseOpenGLToggled(bool isChecked);
public:
KoColorPopupAction *m_selectionOverlayColorAction;
};
//=======================
......
......@@ -108,12 +108,19 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="bnBackgroundColor">
<widget class="KisColorButton" name="bnBackgroundColor">
<property name="text">
<string>...</string>
<string/>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="KisDoubleSliderSpinBox" name="sldBackgroundColor" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</item>
......@@ -227,13 +234,6 @@
<string>Softproofing</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="1">
<widget class="QToolButton" name="gamutAlarm">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lblGamutWarning">
<property name="text">
......@@ -313,6 +313,13 @@
</layout>
</widget>
</item>
<item row="3" column="1">
<widget class="KisColorButton" name="gamutAlarm">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
......@@ -320,6 +327,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KisDoubleSliderSpinBox</class>
<extends>QWidget</extends>
<header>kis_slider_spin_box.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisColorSpaceSelector</class>
<extends>QWidget</extends>
......
......@@ -34,19 +34,6 @@
</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">
......@@ -57,19 +44,6 @@
</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">
......@@ -112,6 +86,32 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KisColorButton" 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="1">
<widget class="KisColorButton" 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>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
......@@ -179,6 +179,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisIntParseSpinBox</class>
<extends>QSpinBox</extends>
......
......@@ -52,7 +52,7 @@
</widget>
</item>
<item>
<widget class="KColorButton" name="bnColor">
<widget class="KisColorButton" name="bnColor">
<property name="text">
<string>...</string>
</property>
......@@ -115,15 +115,9 @@
</widget>
<customwidgets>
<customwidget>
<class>KColorButton</class>
<class>KisColorButton</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>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisSliderSpinBox</class>
......@@ -131,6 +125,11 @@
<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>
</customwidgets>
<resources/>
<connections/>
......
......@@ -49,7 +49,7 @@
</widget>
</item>
<item>
<widget class="KColorButton" name="bnColor">
<widget class="KisColorButton" name="bnColor">
<property name="text">
<string>...</string>
</property>
......@@ -246,6 +246,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisIntParseSpinBox</class>
<extends>QSpinBox</extends>
......@@ -257,12 +262,6 @@
<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>
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>401</width>
<width>406</width>
<height>642</height>
</rect>
</property>
......@@ -149,7 +149,7 @@
<item>
<widget class="QStackedWidget" name="fillStack">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="page_3">
<layout class="QFormLayout" name="formLayout_2">
......@@ -161,7 +161,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KColorButton" name="bnColor">
<widget class="KisColorButton" name="bnColor">
<property name="text">
<string>...</string>
</property>
......@@ -403,15 +403,14 @@
</widget>
<customwidgets>
<customwidget>
<class>KColorButton</class>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kcolorbutton.h</header>
<container>1</container>
<header>kis_color_button.h</header>
</customwidget>
<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>
......@@ -419,6 +418,11 @@
<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>
......@@ -430,11 +434,6 @@
<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/>
......
......@@ -313,7 +313,7 @@
</widget>
</item>
<item>
<widget class="KColorButton" name="bnHighlightColor">
<widget class="KisColorButton" name="bnHighlightColor">
<property name="text">
<string>...</string>
</property>
......@@ -366,7 +366,7 @@
</widget>
</item>
<item>
<widget class="KColorButton" name="bnShadowColor">
<widget class="KisColorButton" name="bnShadowColor">
<property name="text">
<string>...</string>
</property>
......@@ -454,6 +454,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisIntParseSpinBox</class>
<extends>QSpinBox</extends>
......@@ -465,12 +470,6 @@
<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>
......
......@@ -120,7 +120,7 @@
</widget>
</item>
<item>
<widget class="KColorButton" name="bnColor">
<widget class="KisColorButton" name="bnColor">
<property name="text">
<string>...</string>
</property>
......@@ -374,15 +374,9 @@
</widget>
<customwidgets>
<customwidget>
<class>KColorButton</class>
<class>KisColorButton</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>
<header>kis_color_button.h</header>
</customwidget>
<customwidget>
<class>KisSliderSpinBox</class>
......@@ -390,6 +384,11 @@
<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>KisCmbContour</class>
<extends>QWidget</extends>
......
......@@ -120,7 +120,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="KColorButton" name="bnColor"/>
<widget class="KisColorButton" name="bnColor"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
......@@ -286,6 +286,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KisColorButton</class>
<extends>QPushButton</extends>
<header>kis_color_button.h</header>