Differential D17134 Diff 47368 libs/ui/dialogs/kis_dlg_layer_style.cpp

Changeset View

Standalone View

View Options

libs/ui/dialogs/kis_dlg_layer_style.cpp

Show All 23 Lines
24#include <QListWidgetItem> 24​#include <QListWidgetItem>
25#include <QComboBox> 25​#include <QComboBox>
26#include <QDial> 26​#include <QDial>
27#include <QCheckBox> 27​#include <QCheckBox>
28#include <QSpinBox> 28​#include <QSpinBox>
29#include <QUuid> 29​#include <QUuid>
30#include <QInputDialog> 30​#include <QInputDialog>
31 31​
32 ​
33#include <KoColorPopupButton.h> 32​#include <KoColorPopupButton.h>
34#include <KoColorSpaceRegistry.h> 33​#include <KoColorSpaceRegistry.h>
35#include <KoResourceServerProvider.h> 34​#include <KoResourceServerProvider.h>
36 35​
37#include "kis_config.h" 36​#include "kis_config.h"
38#include "kis_cmb_contour.h" 37​#include "kis_cmb_contour.h"
39#include "kis_cmb_gradient.h" 38​#include "kis_cmb_gradient.h"
40#include "KisResourceServerProvider.h" 39​#include "KisResourceServerProvider.h"
41#include "kis_psd_layer_style_resource.h" 40​#include "kis_psd_layer_style_resource.h"
42#include "kis_psd_layer_style.h" 41​#include "kis_psd_layer_style.h"
43 42​
44#include "kis_signals_blocker.h" 43​#include "kis_signals_blocker.h"
45#include "kis_signal_compressor.h" 44​#include "kis_signal_compressor.h"
46#include "kis_canvas_resource_provider.h" 45​#include "kis_canvas_resource_provider.h"
47 46​
48#include <KoFileDialog.h> 47​#include <KoFileDialog.h>
49 48​
50 49​
51 ​
52KoAbstractGradient* fetchGradientLazy(KoAbstractGradient *gradient, 50​KoAbstractGradient* fetchGradientLazy(KoAbstractGradient *gradient,
53 KisCanvasResourceProvider *resourceProvider) 51​ KisCanvasResourceProvider *resourceProvider)
54{ 52​{
55 if (!gradient) { 53​ if (!gradient) {
56 gradient = resourceProvider->currentGradient(); 54​ gradient = resourceProvider->currentGradient();
57 } 55​ }
58 return gradient; 56​ return gradient;
59} 57​}
▲ Show 20 Lines • Show All 551 Lines • ▼ Show 20 Line(s)590{
611 609​
612 // Shading 610​ // Shading
613 ui.intOpacity->setRange(0, 100); 611​ ui.intOpacity->setRange(0, 100);
614 ui.intOpacity->setSuffix(i18n(" %")); 612​ ui.intOpacity->setSuffix(i18n(" %"));
615 613​
616 ui.intOpacity2->setRange(0, 100); 614​ ui.intOpacity2->setRange(0, 100);
617 ui.intOpacity2->setSuffix(i18n(" %")); 615​ ui.intOpacity2->setSuffix(i18n(" %"));
618 616​
619 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int))); 617​ ui.angleSelector->enableGlobalLight(true);
620 connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int))); 618​ connect(ui.angleSelector, SIGNAL(globalAngleChanged(int)), SIGNAL(globalAngleChanged(int)));
621 connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SLOT(slotGlobalLightToggled())); 619​ connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
622 620​
623 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
624 connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
625 connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SIGNAL(configChanged())); ​
626 connect(ui.intAltitude, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 621​ connect(ui.intAltitude, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
627 connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 622​ connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
628 connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 623​ connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
629 connect(ui.cmbHighlightMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 624​ connect(ui.cmbHighlightMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
630 connect(ui.bnHighlightColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged())); 625​ connect(ui.bnHighlightColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
631 connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 626​ connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
632 connect(ui.cmbShadowMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 627​ connect(ui.cmbShadowMode, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
633 connect(ui.bnShadowColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged())); 628​ connect(ui.bnShadowColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
Show All 25 Lines
659{ 654​{
660 ui.cmbStyle->setCurrentIndex((int)bevelAndEmboss->style()); 655​ ui.cmbStyle->setCurrentIndex((int)bevelAndEmboss->style());
661 ui.cmbTechnique->setCurrentIndex((int)bevelAndEmboss->technique()); 656​ ui.cmbTechnique->setCurrentIndex((int)bevelAndEmboss->technique());
662 ui.intDepth->setValue(bevelAndEmboss->depth()); 657​ ui.intDepth->setValue(bevelAndEmboss->depth());
663 ui.cmbDirection->setCurrentIndex((int)bevelAndEmboss->direction()); 658​ ui.cmbDirection->setCurrentIndex((int)bevelAndEmboss->direction());
664 ui.intSize->setValue(bevelAndEmboss->size()); 659​ ui.intSize->setValue(bevelAndEmboss->size());
665 ui.intSoften->setValue(bevelAndEmboss->soften()); 660​ ui.intSoften->setValue(bevelAndEmboss->soften());
666 661​
667 ui.dialAngle->setValue(bevelAndEmboss->angle()); 662​ ui.angleSelector->setValue(bevelAndEmboss->angle());
668 ui.intAngle->setValue(bevelAndEmboss->angle()); 663​ ui.angleSelector->setUseGlobalLight(bevelAndEmboss->useGlobalLight());
669 ui.chkUseGlobalLight->setChecked(bevelAndEmboss->useGlobalLight()); 664​
670 ui.intAltitude->setValue(bevelAndEmboss->altitude()); 665​ ui.intAltitude->setValue(bevelAndEmboss->altitude());
671 // FIXME: curve editing 666​ // FIXME: curve editing
672 // ui.cmbContour; 667​ // ui.cmbContour;
673 ui.chkAntiAliased->setChecked(bevelAndEmboss->glossAntiAliased()); 668​ ui.chkAntiAliased->setChecked(bevelAndEmboss->glossAntiAliased());
674 ui.cmbHighlightMode->selectCompositeOp(KoID(bevelAndEmboss->highlightBlendMode())); 669​ ui.cmbHighlightMode->selectCompositeOp(KoID(bevelAndEmboss->highlightBlendMode()));
675 KoColor highlightshadow(KoColorSpaceRegistry::instance()->rgb8()); 670​ KoColor highlightshadow(KoColorSpaceRegistry::instance()->rgb8());
676 highlightshadow.fromQColor(bevelAndEmboss->highlightColor()); 671​ highlightshadow.fromQColor(bevelAndEmboss->highlightColor());
677 ui.bnHighlightColor->setColor(highlightshadow); 672​ ui.bnHighlightColor->setColor(highlightshadow);
Show All 19 Lines
697{ 692​{
698 bevelAndEmboss->setStyle((psd_bevel_style)ui.cmbStyle->currentIndex()); 693​ bevelAndEmboss->setStyle((psd_bevel_style)ui.cmbStyle->currentIndex());
699 bevelAndEmboss->setTechnique((psd_technique_type)ui.cmbTechnique->currentIndex()); 694​ bevelAndEmboss->setTechnique((psd_technique_type)ui.cmbTechnique->currentIndex());
700 bevelAndEmboss->setDepth(ui.intDepth->value()); 695​ bevelAndEmboss->setDepth(ui.intDepth->value());
701 bevelAndEmboss->setDirection((psd_direction)ui.cmbDirection->currentIndex()); 696​ bevelAndEmboss->setDirection((psd_direction)ui.cmbDirection->currentIndex());
702 bevelAndEmboss->setSize(ui.intSize->value()); 697​ bevelAndEmboss->setSize(ui.intSize->value());
703 bevelAndEmboss->setSoften(ui.intSoften->value()); 698​ bevelAndEmboss->setSoften(ui.intSoften->value());
704 699​
705 bevelAndEmboss->setAngle(ui.dialAngle->value()); 700​ bevelAndEmboss->setAngle(ui.angleSelector->value());
706 bevelAndEmboss->setUseGlobalLight(ui.chkUseGlobalLight->isChecked()); 701​ bevelAndEmboss->setUseGlobalLight(ui.angleSelector->useGlobalLight());
707 bevelAndEmboss->setAltitude(ui.intAltitude->value()); 702​ bevelAndEmboss->setAltitude(ui.intAltitude->value());
708 bevelAndEmboss->setGlossAntiAliased(ui.chkAntiAliased->isChecked()); 703​ bevelAndEmboss->setGlossAntiAliased(ui.chkAntiAliased->isChecked());
709 bevelAndEmboss->setHighlightBlendMode(ui.cmbHighlightMode->selectedCompositeOp().id()); 704​ bevelAndEmboss->setHighlightBlendMode(ui.cmbHighlightMode->selectedCompositeOp().id());
710 bevelAndEmboss->setHighlightColor(ui.bnHighlightColor->color().toQColor()); 705​ bevelAndEmboss->setHighlightColor(ui.bnHighlightColor->color().toQColor());
711 bevelAndEmboss->setHighlightOpacity(ui.intOpacity->value()); 706​ bevelAndEmboss->setHighlightOpacity(ui.intOpacity->value());
712 bevelAndEmboss->setShadowBlendMode(ui.cmbShadowMode->selectedCompositeOp().id()); 707​ bevelAndEmboss->setShadowBlendMode(ui.cmbShadowMode->selectedCompositeOp().id());
713 bevelAndEmboss->setShadowColor(ui.bnShadowColor->color().toQColor()); 708​ bevelAndEmboss->setShadowColor(ui.bnShadowColor->color().toQColor());
714 bevelAndEmboss->setShadowOpacity(ui.intOpacity2->value()); 709​ bevelAndEmboss->setShadowOpacity(ui.intOpacity2->value());
715 710​
716 // FIXME: curve editing 711​ // FIXME: curve editing
717 bevelAndEmboss->setAntiAliased(m_contour->ui.chkAntiAliased->isChecked()); 712​ bevelAndEmboss->setAntiAliased(m_contour->ui.chkAntiAliased->isChecked());
718 bevelAndEmboss->setContourRange(m_contour->ui.intRange->value()); 713​ bevelAndEmboss->setContourRange(m_contour->ui.intRange->value());
719 714​
720 bevelAndEmboss->setTexturePattern(static_cast<KoPattern*>(m_texture->ui.patternChooser->currentResource())); 715​ bevelAndEmboss->setTexturePattern(static_cast<KoPattern*>(m_texture->ui.patternChooser->currentResource()));
721 bevelAndEmboss->setTextureScale(m_texture->ui.intScale->value()); 716​ bevelAndEmboss->setTextureScale(m_texture->ui.intScale->value());
722 bevelAndEmboss->setTextureDepth(m_texture->ui.intDepth->value()); 717​ bevelAndEmboss->setTextureDepth(m_texture->ui.intDepth->value());
723 bevelAndEmboss->setTextureInvert(m_texture->ui.chkInvert->isChecked()); 718​ bevelAndEmboss->setTextureInvert(m_texture->ui.chkInvert->isChecked());
724 bevelAndEmboss->setTextureAlignWithLayer(m_texture->ui.chkLinkWithLayer->isChecked()); 719​ bevelAndEmboss->setTextureAlignWithLayer(m_texture->ui.chkLinkWithLayer->isChecked());
725} 720​}
726 721​
727void BevelAndEmboss::slotDialAngleChanged(int value) ​
728{ ​
729 KisSignalsBlocker b(ui.intAngle); ​
730 ui.intAngle->setValue(value); ​
731 ​
732 if (ui.chkUseGlobalLight->isChecked()) { ​
733 emit globalAngleChanged(value); ​
734 } ​
735} ​
736 ​
737void BevelAndEmboss::slotIntAngleChanged(int value) ​
738{ ​
739 KisSignalsBlocker b(ui.dialAngle); ​
740 ui.dialAngle->setValue(value); ​
741 ​
742 if (ui.chkUseGlobalLight->isChecked()) { ​
743 emit globalAngleChanged(value); ​
744 } ​
745} ​
746 ​
747void BevelAndEmboss::slotGlobalLightToggled() ​
748{ ​
749 if (ui.chkUseGlobalLight->isChecked()) { ​
750 emit globalAngleChanged(ui.intAngle->value()); ​
751 } ​
752} ​
753 722​
754/********************************************************************/ 723​/********************************************************************/
755/***** Texture *********************************************/ 724​/***** Texture *********************************************/
756/********************************************************************/ 725​/********************************************************************/
757 726​
758Texture::Texture(QWidget *parent) 727​Texture::Texture(QWidget *parent)
759 : QWidget(parent) 728​ : QWidget(parent)
760{ 729​{
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Line(s)802{
844 ui.intSpread->setSuffix(i18n(" %")); 813​ ui.intSpread->setSuffix(i18n(" %"));
845 814​
846 ui.intSize->setRange(0, 250); 815​ ui.intSize->setRange(0, 250);
847 ui.intSize->setSuffix(i18n(" px")); 816​ ui.intSize->setSuffix(i18n(" px"));
848 817​
849 ui.intNoise->setRange(0, 100); 818​ ui.intNoise->setRange(0, 100);
850 ui.intNoise->setSuffix(i18n(" %")); 819​ ui.intNoise->setSuffix(i18n(" %"));
851 820​
852 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int))); 821​ ui.angleSelector->enableGlobalLight(true);
853 connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int))); 822​ connect(ui.angleSelector, SIGNAL(globalAngleChanged(int)), SIGNAL(globalAngleChanged(int)));
854 connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SLOT(slotGlobalLightToggled())); 823​ connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
855 824​
856 // connect everything to configChanged() signal 825​ // connect everything to configChanged() signal
857 connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 826​ connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
858 connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 827​ connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
859 connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged())); 828​ connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
860 829​
861 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
862 connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
863 connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SIGNAL(configChanged())); ​
864 ​
865 connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 830​ connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
866 connect(ui.intSpread, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 831​ connect(ui.intSpread, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
867 connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 832​ connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
868 833​
869 connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 834​ connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
870 connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 835​ connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
871 connect(ui.intNoise, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 836​ connect(ui.intNoise, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
872 837​
873 connect(ui.chkLayerKnocksOutDropShadow, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 838​ connect(ui.chkLayerKnocksOutDropShadow, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
874 839​
875 if (m_mode == InnerShadowMode) { 840​ if (m_mode == InnerShadowMode) {
876 ui.chkLayerKnocksOutDropShadow->setVisible(false); 841​ ui.chkLayerKnocksOutDropShadow->setVisible(false);
877 ui.grpMain->setTitle(i18n("Inner Shadow")); 842​ ui.grpMain->setTitle(i18n("Inner Shadow"));
878 ui.lblSpread->setText(i18n("Choke:")); 843​ ui.lblSpread->setText(i18n("Choke:"));
879 } 844​ }
880} 845​}
881 846​
882void DropShadow::slotDialAngleChanged(int value) ​
883{ ​
884 KisSignalsBlocker b(ui.intAngle); ​
885 ui.intAngle->setValue(value); ​
886 ​
887 if (ui.chkUseGlobalLight->isChecked()) { ​
888 emit globalAngleChanged(value); ​
889 } ​
890} ​
891 ​
892void DropShadow::slotIntAngleChanged(int value) ​
893{ ​
894 KisSignalsBlocker b(ui.dialAngle); ​
895 ui.dialAngle->setValue(value); ​
896 ​
897 if (ui.chkUseGlobalLight->isChecked()) { ​
898 emit globalAngleChanged(value); ​
899 } ​
900} ​
901 ​
902void DropShadow::slotGlobalLightToggled() ​
903{ ​
904 if (ui.chkUseGlobalLight->isChecked()) { ​
905 emit globalAngleChanged(ui.intAngle->value()); ​
906 } ​
907} ​
908 ​
909void DropShadow::setShadow(const psd_layer_effects_shadow_common *shadow) 847​void DropShadow::setShadow(const psd_layer_effects_shadow_common *shadow)
910{ 848​{
911 ui.cmbCompositeOp->selectCompositeOp(KoID(shadow->blendMode())); 849​ ui.cmbCompositeOp->selectCompositeOp(KoID(shadow->blendMode()));
912 ui.intOpacity->setValue(shadow->opacity()); 850​ ui.intOpacity->setValue(shadow->opacity());
913 KoColor color(KoColorSpaceRegistry::instance()->rgb8()); 851​ KoColor color(KoColorSpaceRegistry::instance()->rgb8());
914 color.fromQColor(shadow->color()); 852​ color.fromQColor(shadow->color());
915 ui.bnColor->setColor(color); 853​ ui.bnColor->setColor(color);
916 854​
917 ui.dialAngle->setValue(shadow->angle()); 855​ ui.angleSelector->setValue(shadow->angle());
918 ui.intAngle->setValue(shadow->angle()); 856​ ui.angleSelector->setUseGlobalLight(shadow->useGlobalLight());
919 ui.chkUseGlobalLight->setChecked(shadow->useGlobalLight()); ​
920 857​
921 ui.intDistance->setValue(shadow->distance()); 858​ ui.intDistance->setValue(shadow->distance());
922 ui.intSpread->setValue(shadow->spread()); 859​ ui.intSpread->setValue(shadow->spread());
923 ui.intSize->setValue(shadow->size()); 860​ ui.intSize->setValue(shadow->size());
924 861​
925 // FIXME: curve editing 862​ // FIXME: curve editing
926 // ui.cmbContour; 863​ // ui.cmbContour;
927 ui.chkAntiAliased->setChecked(shadow->antiAliased()); 864​ ui.chkAntiAliased->setChecked(shadow->antiAliased());
Show All 9 Lines
937} 874​}
938 875​
939void DropShadow::fetchShadow(psd_layer_effects_shadow_common *shadow) const 876​void DropShadow::fetchShadow(psd_layer_effects_shadow_common *shadow) const
940{ 877​{
941 shadow->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id()); 878​ shadow->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
942 shadow->setOpacity(ui.intOpacity->value()); 879​ shadow->setOpacity(ui.intOpacity->value());
943 shadow->setColor(ui.bnColor->color().toQColor()); 880​ shadow->setColor(ui.bnColor->color().toQColor());
944 881​
945 shadow->setAngle(ui.dialAngle->value()); 882​ shadow->setAngle(ui.angleSelector->value());
946 shadow->setUseGlobalLight(ui.chkUseGlobalLight->isChecked()); 883​ shadow->setUseGlobalLight(ui.angleSelector->useGlobalLight());
947 884​
948 shadow->setDistance(ui.intDistance->value()); 885​ shadow->setDistance(ui.intDistance->value());
949 shadow->setSpread(ui.intSpread->value()); 886​ shadow->setSpread(ui.intSpread->value());
950 shadow->setSize(ui.intSize->value()); 887​ shadow->setSize(ui.intSize->value());
951 888​
952 // FIXME: curve editing 889​ // FIXME: curve editing
953 // ui.cmbContour; 890​ // ui.cmbContour;
954 shadow->setAntiAliased(ui.chkAntiAliased->isChecked()); 891​ shadow->setAntiAliased(ui.chkAntiAliased->isChecked());
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)946{
1010 ui.setupUi(this); 947​ ui.setupUi(this);
1011 948​
1012 ui.intOpacity->setRange(0, 100); 949​ ui.intOpacity->setRange(0, 100);
1013 ui.intOpacity->setSuffix(i18n(" %")); 950​ ui.intOpacity->setSuffix(i18n(" %"));
1014 951​
1015 ui.intScale->setRange(0, 100); 952​ ui.intScale->setRange(0, 100);
1016 ui.intScale->setSuffix(i18n(" %")); 953​ ui.intScale->setSuffix(i18n(" %"));
1017 954​
1018 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int))); 955​ connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
1019 connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int))); ​
1020 956​
1021 connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 957​ connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1022 connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 958​ connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1023 connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged())); 959​ connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged()));
1024 connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 960​ connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1025 connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 961​ connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1026 connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 962​ connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1027 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
1028 connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
1029 connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 963​ connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1030} 964​}
1031 965​
1032void GradientOverlay::setGradientOverlay(const psd_layer_effects_gradient_overlay *config) 966​void GradientOverlay::setGradientOverlay(const psd_layer_effects_gradient_overlay *config)
1033{ 967​{
1034 ui.cmbCompositeOp->selectCompositeOp(KoID(config->blendMode())); 968​ ui.cmbCompositeOp->selectCompositeOp(KoID(config->blendMode()));
1035 ui.intOpacity->setValue(config->opacity()); 969​ ui.intOpacity->setValue(config->opacity());
1036 970​
1037 KoAbstractGradient *gradient = fetchGradientLazy( 971​ KoAbstractGradient *gradient = fetchGradientLazy(
1038 GradientPointerConverter::styleToResource(config->gradient()), m_resourceProvider); 972​ GradientPointerConverter::styleToResource(config->gradient()), m_resourceProvider);
1039 973​
1040 if (gradient) { 974​ if (gradient) {
1041 ui.cmbGradient->setGradient(gradient); 975​ ui.cmbGradient->setGradient(gradient);
1042 } 976​ }
1043 977​
1044 ui.chkReverse->setChecked(config->reverse()); 978​ ui.chkReverse->setChecked(config->reverse());
1045 ui.cmbStyle->setCurrentIndex((int)config->style()); 979​ ui.cmbStyle->setCurrentIndex((int)config->style());
1046 ui.chkAlignWithLayer->setCheckable(config->alignWithLayer()); 980​ ui.chkAlignWithLayer->setCheckable(config->alignWithLayer());
1047 ui.dialAngle->setValue(config->angle()); 981​ ui.angleSelector->setValue(config->angle());
1048 ui.intAngle->setValue(config->angle()); ​
1049 ui.intScale->setValue(config->scale()); 982​ ui.intScale->setValue(config->scale());
1050} 983​}
1051 984​
1052void GradientOverlay::fetchGradientOverlay(psd_layer_effects_gradient_overlay *config) const 985​void GradientOverlay::fetchGradientOverlay(psd_layer_effects_gradient_overlay *config) const
1053{ 986​{
1054 config->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id()); 987​ config->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
1055 config->setOpacity(ui.intOpacity->value()); 988​ config->setOpacity(ui.intOpacity->value());
1056 config->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient())); 989​ config->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient()));
1057 config->setReverse(ui.chkReverse->isChecked()); 990​ config->setReverse(ui.chkReverse->isChecked());
1058 config->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex()); 991​ config->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex());
1059 config->setAlignWithLayer(ui.chkAlignWithLayer->isChecked()); 992​ config->setAlignWithLayer(ui.chkAlignWithLayer->isChecked());
1060 config->setAngle(ui.dialAngle->value()); 993​ config->setAngle(ui.angleSelector->value());
1061 config->setScale(ui.intScale->value()); 994​ config->setScale(ui.intScale->value());
1062} 995​}
1063 996​
1064void GradientOverlay::slotDialAngleChanged(int value) ​
1065{ ​
1066 KisSignalsBlocker b(ui.intAngle); ​
1067 ui.intAngle->setValue(value); ​
1068} ​
1069 ​
1070void GradientOverlay::slotIntAngleChanged(int value) ​
1071{ ​
1072 KisSignalsBlocker b(ui.dialAngle); ​
1073 ui.dialAngle->setValue(value); ​
1074} ​
1075 997​
1076/********************************************************************/ 998​/********************************************************************/
1077/***** Innner Glow *********************************************/ 999​/***** Innner Glow *********************************************/
1078/********************************************************************/ 1000​/********************************************************************/
1079 1001​
1080InnerGlow::InnerGlow(Mode mode, KisCanvasResourceProvider *resourceProvider, QWidget *parent) 1002​InnerGlow::InnerGlow(Mode mode, KisCanvasResourceProvider *resourceProvider, QWidget *parent)
1081 : QWidget(parent), 1003​ : QWidget(parent),
1082 m_mode(mode), 1004​ m_mode(mode),
▲ Show 20 Lines • Show All 176 Lines • ▼ Show 20 Line(s)1177{
1259 ui.intOpacity->setSuffix(i18n(" %")); 1181​ ui.intOpacity->setSuffix(i18n(" %"));
1260 1182​
1261 ui.intDistance->setRange(0, 250); 1183​ ui.intDistance->setRange(0, 250);
1262 ui.intDistance->setSuffix(i18n(" px")); 1184​ ui.intDistance->setSuffix(i18n(" px"));
1263 1185​
1264 ui.intSize->setRange(0, 250); 1186​ ui.intSize->setRange(0, 250);
1265 ui.intSize->setSuffix(i18n(" px")); 1187​ ui.intSize->setSuffix(i18n(" px"));
1266 1188​
1267 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int))); ​
1268 connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int))); ​
1269 ​
1270 connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 1189​ connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1271 connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged())); 1190​ connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
1272 connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1191​ connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1273 1192​
1274 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1193​ connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
1275 connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); ​
1276 connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1194​ connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1277 connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1195​ connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1278 1196​
1279 connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 1197​ connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1280 connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 1198​ connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1281 connect(ui.chkInvert, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 1199​ connect(ui.chkInvert, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1282 1200​
1283} 1201​}
1284 1202​
1285void Satin::slotDialAngleChanged(int value) ​
1286{ ​
1287 KisSignalsBlocker b(ui.intAngle); ​
1288 ui.intAngle->setValue(value); ​
1289} ​
1290 ​
1291void Satin::slotIntAngleChanged(int value) ​
1292{ ​
1293 KisSignalsBlocker b(ui.dialAngle); ​
1294 ui.dialAngle->setValue(value); ​
1295} ​
1296 ​
1297void Satin::setSatin(const psd_layer_effects_satin *satin) 1203​void Satin::setSatin(const psd_layer_effects_satin *satin)
1298{ 1204​{
1299 ui.cmbCompositeOp->selectCompositeOp(KoID(satin->blendMode())); 1205​ ui.cmbCompositeOp->selectCompositeOp(KoID(satin->blendMode()));
1300 KoColor color(KoColorSpaceRegistry::instance()->rgb8()); 1206​ KoColor color(KoColorSpaceRegistry::instance()->rgb8());
1301 color.fromQColor(satin->color()); 1207​ color.fromQColor(satin->color());
1302 ui.bnColor->setColor(color); 1208​ ui.bnColor->setColor(color);
1303 ui.intOpacity->setValue(satin->opacity()); 1209​ ui.intOpacity->setValue(satin->opacity());
1304 1210​
1305 ui.dialAngle->setValue(satin->angle()); 1211​ ui.angleSelector->setValue(satin->angle());
1306 ui.intAngle->setValue(satin->angle()); ​
1307 1212​
1308 ui.intDistance->setValue(satin->distance()); 1213​ ui.intDistance->setValue(satin->distance());
1309 ui.intSize->setValue(satin->size()); 1214​ ui.intSize->setValue(satin->size());
1310 1215​
1311 // FIXME: Curve editing 1216​ // FIXME: Curve editing
1312 //ui.cmbContour; 1217​ //ui.cmbContour;
1313 1218​
1314 ui.chkAntiAliased->setChecked(satin->antiAliased()); 1219​ ui.chkAntiAliased->setChecked(satin->antiAliased());
1315 ui.chkInvert->setChecked(satin->invert()); 1220​ ui.chkInvert->setChecked(satin->invert());
1316 1221​
1317} 1222​}
1318 1223​
1319void Satin::fetchSatin(psd_layer_effects_satin *satin) const 1224​void Satin::fetchSatin(psd_layer_effects_satin *satin) const
1320{ 1225​{
1321 satin->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id()); 1226​ satin->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
1322 satin->setOpacity(ui.intOpacity->value()); 1227​ satin->setOpacity(ui.intOpacity->value());
1323 satin->setColor(ui.bnColor->color().toQColor()); 1228​ satin->setColor(ui.bnColor->color().toQColor());
1324 1229​
1325 satin->setAngle(ui.dialAngle->value()); 1230​ satin->setAngle(ui.angleSelector->value());
1326 1231​
1327 satin->setDistance(ui.intDistance->value()); 1232​ satin->setDistance(ui.intDistance->value());
1328 satin->setSize(ui.intSize->value()); 1233​ satin->setSize(ui.intSize->value());
1329 1234​
1330 // FIXME: curve editing 1235​ // FIXME: curve editing
1331 // ui.cmbContour; 1236​ // ui.cmbContour;
1332 satin->setAntiAliased(ui.chkAntiAliased->isChecked()); 1237​ satin->setAntiAliased(ui.chkAntiAliased->isChecked());
1333 satin->setInvert(ui.chkInvert->isChecked()); 1238​ satin->setInvert(ui.chkInvert->isChecked());
Show All 31 Lines1248{
1365 connect(ui.cmbFillType, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 1270​ connect(ui.cmbFillType, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1366 1271​
1367 connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged())); 1272​ connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
1368 1273​
1369 connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged())); 1274​ connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged()));
1370 connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 1275​ connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1371 connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged())); 1276​ connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
1372 connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 1277​ connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1373 connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int))); ​
1374 connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int))); ​
1375 connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1278​ connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1376 1279​
1280​ connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
1281​
1377 connect(ui.patternChooser, SIGNAL(resourceSelected(KoResource*)), SIGNAL(configChanged())); 1282​ connect(ui.patternChooser, SIGNAL(resourceSelected(KoResource*)), SIGNAL(configChanged()));
1378 connect(ui.chkLinkWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged())); 1283​ connect(ui.chkLinkWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
1379 connect(ui.intScale_2, SIGNAL(valueChanged(int)), SIGNAL(configChanged())); 1284​ connect(ui.intScale_2, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
1380 1285​
1381 // cold initialization 1286​ // cold initialization
1382 ui.fillStack->setCurrentIndex(ui.cmbFillType->currentIndex()); 1287​ ui.fillStack->setCurrentIndex(ui.cmbFillType->currentIndex());
1383} 1288​}
1384 1289​
1385void Stroke::slotDialAngleChanged(int value) ​
1386{ ​
1387 KisSignalsBlocker b(ui.intAngle); ​
1388 ui.intAngle->setValue(value); ​
1389} ​
1390 ​
1391void Stroke::slotIntAngleChanged(int value) ​
1392{ ​
1393 KisSignalsBlocker b(ui.dialAngle); ​
1394 ui.dialAngle->setValue(value); ​
1395} ​
1396 ​
1397 ​
1398void Stroke::setStroke(const psd_layer_effects_stroke *stroke) 1290​void Stroke::setStroke(const psd_layer_effects_stroke *stroke)
1399{ 1291​{
1400 1292​
1401 ui.intSize->setValue(stroke->size()); 1293​ ui.intSize->setValue(stroke->size());
1402 ui.cmbPosition->setCurrentIndex((int)stroke->position()); 1294​ ui.cmbPosition->setCurrentIndex((int)stroke->position());
1403 ui.cmbCompositeOp->selectCompositeOp(KoID(stroke->blendMode())); 1295​ ui.cmbCompositeOp->selectCompositeOp(KoID(stroke->blendMode()));
1404 ui.intOpacity->setValue(stroke->opacity()); 1296​ ui.intOpacity->setValue(stroke->opacity());
1405 1297​
1406 ui.cmbFillType->setCurrentIndex((int)stroke->fillType()); 1298​ ui.cmbFillType->setCurrentIndex((int)stroke->fillType());
1407 KoColor color(KoColorSpaceRegistry::instance()->rgb8()); 1299​ KoColor color(KoColorSpaceRegistry::instance()->rgb8());
1408 color.fromQColor(stroke->color()); 1300​ color.fromQColor(stroke->color());
1409 ui.bnColor->setColor(color); 1301​ ui.bnColor->setColor(color);
1410 1302​
1411 KoAbstractGradient *gradient = 1303​ KoAbstractGradient *gradient =
1412 fetchGradientLazy(GradientPointerConverter::styleToResource(stroke->gradient()), m_resourceProvider); 1304​ fetchGradientLazy(GradientPointerConverter::styleToResource(stroke->gradient()), m_resourceProvider);
1413 1305​
1414 if (gradient) { 1306​ if (gradient) {
1415 ui.cmbGradient->setGradient(gradient); 1307​ ui.cmbGradient->setGradient(gradient);
1416 } 1308​ }
1417 1309​
1418 ui.chkReverse->setChecked(stroke->antiAliased()); 1310​ ui.chkReverse->setChecked(stroke->antiAliased());
1419 ui.cmbStyle->setCurrentIndex((int)stroke->style()); 1311​ ui.cmbStyle->setCurrentIndex((int)stroke->style());
1420 ui.chkAlignWithLayer->setCheckable(stroke->alignWithLayer()); 1312​ ui.chkAlignWithLayer->setCheckable(stroke->alignWithLayer());
1421 ui.dialAngle->setValue(stroke->angle()); 1313​ ui.angleSelector->setValue(stroke->angle());
1422 ui.intAngle->setValue(stroke->angle()); ​
1423 ui.intScale->setValue(stroke->scale()); 1314​ ui.intScale->setValue(stroke->scale());
1424 1315​
1425 ui.patternChooser->setCurrentPattern(stroke->pattern()); 1316​ ui.patternChooser->setCurrentPattern(stroke->pattern());
1426 ui.chkLinkWithLayer->setChecked(stroke->alignWithLayer()); 1317​ ui.chkLinkWithLayer->setChecked(stroke->alignWithLayer());
1427 ui.intScale_2->setValue(stroke->scale()); 1318​ ui.intScale_2->setValue(stroke->scale());
1428 1319​
1429} 1320​}
1430 1321​
1431void Stroke::fetchStroke(psd_layer_effects_stroke *stroke) const 1322​void Stroke::fetchStroke(psd_layer_effects_stroke *stroke) const
1432{ 1323​{
1433 stroke->setSize(ui.intSize->value()); 1324​ stroke->setSize(ui.intSize->value());
1434 stroke->setPosition((psd_stroke_position)ui.cmbPosition->currentIndex()); 1325​ stroke->setPosition((psd_stroke_position)ui.cmbPosition->currentIndex());
1435 stroke->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id()); 1326​ stroke->setBlendMode(ui.cmbCompositeOp->selectedCompositeOp().id());
1436 stroke->setOpacity(ui.intOpacity->value()); 1327​ stroke->setOpacity(ui.intOpacity->value());
1437 1328​
1438 stroke->setFillType((psd_fill_type)ui.cmbFillType->currentIndex()); 1329​ stroke->setFillType((psd_fill_type)ui.cmbFillType->currentIndex());
1439 1330​
1440 stroke->setColor(ui.bnColor->color().toQColor()); 1331​ stroke->setColor(ui.bnColor->color().toQColor());
1441 1332​
1442 stroke->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient())); 1333​ stroke->setGradient(GradientPointerConverter::resourceToStyle(ui.cmbGradient->gradient()));
1443 stroke->setReverse(ui.chkReverse->isChecked()); 1334​ stroke->setReverse(ui.chkReverse->isChecked());
1444 stroke->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex()); 1335​ stroke->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex());
1445 stroke->setAlignWithLayer(ui.chkAlignWithLayer->isChecked()); 1336​ stroke->setAlignWithLayer(ui.chkAlignWithLayer->isChecked());
1446 stroke->setAngle(ui.dialAngle->value()); 1337​ stroke->setAngle(ui.angleSelector->value());
1447 stroke->setScale(ui.intScale->value()); 1338​ stroke->setScale(ui.intScale->value());
1448 1339​
1449 stroke->setPattern(static_cast<KoPattern*>(ui.patternChooser->currentResource())); 1340​ stroke->setPattern(static_cast<KoPattern*>(ui.patternChooser->currentResource()));
1450 stroke->setAlignWithLayer(ui.chkLinkWithLayer->isChecked()); 1341​ stroke->setAlignWithLayer(ui.chkLinkWithLayer->isChecked());
1451 stroke->setScale(ui.intScale->value()); 1342​ stroke->setScale(ui.intScale->value());
1452} 1343​}