r20155 by jghali - uification of color editor dialog
scribus-commit
scribus-commit at lists.scribus.net
Sun Jun 7 19:32:45 UTC 2015
Author: jghali
Date: Sun Jun 7 19:32:45 2015
New Revision: 20155
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20155
Log:
uification of color editor dialog
Added:
trunk/Scribus/scribus/ui/cmykfwbase.ui
Modified:
trunk/Scribus/Scribus.pro
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/ui/cmykfw.cpp
trunk/Scribus/scribus/ui/cmykfw.h
trunk/Scribus/scribus/ui/colorchart.cpp
trunk/Scribus/scribus/ui/colorchart.h
trunk/Scribus/scribus/ui/paintmanager.cpp
trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Sun Jun 7 19:32:45 2015
@@ -1014,6 +1014,7 @@
scribus/ui/charselect.ui \
scribus/ui/charselectenhanced.ui \
scribus/ui/cmsprefsbase.ui \
+ scribus/ui/cmykfwbase.ui \
scribus/ui/colorpalette.ui \
scribus/ui/copypagetomasterpage.ui \
scribus/ui/createrange.ui \
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Jun 7 19:32:45 2015
@@ -99,6 +99,7 @@
ui/charselect.ui
ui/charselectenhanced.ui
ui/cmsprefsbase.ui
+ ui/cmykfwbase.ui
ui/colorpalette.ui
ui/downloadspalettebase.ui
ui/gradientaddedit.ui
Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Sun Jun 7 19:32:45 2015
@@ -43,6 +43,7 @@
#include "scribusdoc.h"
#include "scrspinbox.h"
#include "swatchcombo.h"
+#include "ui_cmykfwbase.h"
#include "ui/scmessagebox.h"
#include "util.h"
#include "util_color.h"
@@ -74,105 +75,29 @@
QPixmap image1 = sliderPix(300);
QPixmap image2 = sliderPix(60);
QPixmap image3 = sliderBlack();
+
resize( 498, 306 );
setWindowTitle( tr( "Edit Color" ) );
setWindowIcon(QIcon(loadIcon("AppIcon.png")));
- CMYKColorLayout = new QHBoxLayout( this );
- CMYKColorLayout->setSpacing( 5 );
- CMYKColorLayout->setMargin( 10 );
- Layout23 = new QVBoxLayout;
- Layout23->setSpacing( 5 );
- Layout23->setMargin( 0 );
-
- TextLabel1 = new QLabel( tr( "&Name:" ), this );
- TextLabel1->setMinimumSize( QSize( 200, 22 ) );
- Layout23->addWidget( TextLabel1 );
-
- ColorName = new QLineEdit( this );
- ColorName->setMinimumSize( QSize( 200, 22 ) );
+
+ setupUi(this);
+ ColorMap->setDoc(doc);
+
ColorName->setText( name );
- TextLabel1->setBuddy( ColorName );
- Layout23->addWidget( ColorName );
-
- TextLabel3 = new QLabel( tr( "Color &Model" ), this );
- TextLabel3->setMinimumSize( QSize( 100, 22 ) );
- Layout23->addWidget( TextLabel3 );
-
- ComboBox1 = new ScComboBox( this );
ComboBox1->addItem( tr( "CMYK" ) );
ComboBox1->addItem( tr( "RGB" ) );
ComboBox1->addItem( tr( "Web Safe RGB" ) );
ComboBox1->addItem( tr( "Lab" ) );
- TextLabel3->setBuddy( ComboBox1 );
- Layout23->addWidget( ComboBox1 );
-
- Separations = new QCheckBox( this );
- Separations->setText( tr( "Is Spot Color" ) );
Separations->setChecked(orig.isSpotColor());
- Layout23->addWidget( Separations );
- QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding );
- Layout23->addItem( spacer );
-
- Layout2 = new QGridLayout();
- Layout2->setSpacing( 6 );
- Layout2->setMargin( 0 );
-
- TextLabel5_2 = new QLabel( tr( "New" ), this );
- TextLabel5_2->setMinimumSize( QSize( 50, 22 ) );
- TextLabel5_2->setMaximumSize( QSize( 100, 22 ) );
-
- Layout2->addWidget( TextLabel5_2, 0, 1 );
-
- OldC = new QLabel( "", this );
- OldC->setMinimumSize( QSize( 50, 50 ) );
- OldC->setMaximumSize( QSize( 50, 50 ) );
- OldC->setFrameShape( QLabel::WinPanel );
- OldC->setFrameShadow( QLabel::Sunken );
- OldC->setScaledContents( true );
- OldC->setAlignment(Qt::AlignCenter);
+
OldC->setPixmap( imageA );
-
- Layout2->addWidget( OldC, 1, 0 );
-
- TextLabel5 = new QLabel( tr( "Old" ), this );
- TextLabel5->setMinimumSize( QSize( 50, 22 ) );
- TextLabel5->setMaximumSize( QSize( 100, 22 ) );
-
- Layout2->addWidget( TextLabel5, 0, 0 );
-
- NewC = new QLabel( "", this );
- NewC->setMinimumSize( QSize( 50, 50 ) );
- NewC->setMaximumSize( QSize( 50, 50 ) );
- NewC->setFrameShape( QLabel::WinPanel );
- NewC->setFrameShadow( QLabel::Sunken );
- NewC->setScaledContents( true );
- NewC->setAlignment(Qt::AlignCenter);
NewC->setPixmap( imageN );
- Layout2->addWidget( NewC, 1, 1 );
- Layout23->addLayout( Layout2 );
-
- Layout21 = new QHBoxLayout;
- Layout21->setSpacing( 20 );
- Layout21->setMargin( 10 );
-
- Cancel_2 = new QPushButton( CommonStrings::tr_OK, this );
- Cancel_2->setDefault( true );
- Layout21->addWidget( Cancel_2 );
- Cancel = new QPushButton( CommonStrings::tr_Cancel, this );
- Layout21->addWidget( Cancel );
- Layout23->addLayout( Layout21 );
- CMYKColorLayout->addLayout( Layout23 );
-
- Frame4 = new QFrame( this );
- Frame4->setFrameShape( QFrame::NoFrame );
- Frame4->setFrameShadow( QFrame::Raised );
- Frame4Layout = new QVBoxLayout( Frame4 );
- Frame4Layout->setSpacing( 5 );
- Frame4Layout->setMargin( 0 );
-
- Swatches = new SwatchCombo( Frame4 );
+ buttonOK->setText(CommonStrings::tr_OK);
+ buttonOK->setDefault( true );
+ buttonCancel->setText(CommonStrings::tr_Cancel);
+
hsvSelector = Swatches->addTopLevelItem( tr( "HSV Color Map" ) );
hsvSelector->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
csm.findPaletteLocations();
@@ -189,140 +114,33 @@
// the swatch combo widget does not know its width yet.
// We set it in the dialog showEvent().
// Swatches->setCurrentComboItem( tr( "HSV Color Map" ));
- Frame4Layout->addWidget( Swatches );
-
- TabStack = new QStackedWidget( Frame4 );
- TabStack->setFrameShape( QFrame::NoFrame );
-
- Frame5a = new QFrame( TabStack );
- Frame5a->setFrameShape( QFrame::NoFrame );
- Frame5a->setFrameShadow( QFrame::Raised );
- Frame5aLayout = new QHBoxLayout( Frame5a );
- Frame5aLayout->setSpacing( 0 );
- Frame5aLayout->setMargin( 0 );
- Frame5 = new QFrame(Frame5a);
- Frame5->setFrameShape( QLabel::WinPanel );
- Frame5->setFrameShadow( QLabel::Sunken );
- Frame5->setMinimumSize( QSize( 182, 130 ) );
- Frame5->setMaximumSize( QSize( 182, 130 ) );
- Frame5Layout = new QHBoxLayout( Frame5 );
- Frame5Layout->setSpacing( 0 );
- Frame5Layout->setMargin( 0 );
- ColorMap = new ColorChart( Frame5, doc);
- ColorMap->setMinimumSize( QSize( 180, 128 ) );
- ColorMap->setMaximumSize( QSize( 180, 128 ) );
- Frame5Layout->addWidget( ColorMap );
- Frame5aLayout->addWidget( Frame5, 0, Qt::AlignCenter);
- TabStack->addWidget( Frame5a );
-
- ColorSwatch = new ColorListBox(TabStack);
- TabStack->addWidget( ColorSwatch );
-
- Frame4Layout->addWidget( TabStack );
-
- Layout2x = new QGridLayout();
- Layout2x->setSpacing( 5 );
- Layout2x->setMargin( 0 );
-
- CyanT = new QLabel( tr( "C:" ), Frame4 );
- Layout2x->addWidget(CyanT, 0, 0);
-
- Layout1_2 = new QVBoxLayout;
- Layout1_2->setSpacing( 0 );
- Layout1_2->setMargin( 0 );
-
- CyanP = new QLabel( Frame4 );
- CyanP->setMinimumSize( QSize( 200, 10 ) );
+
+ slidersLayout->setSpacing(5);
+ slidersLayout->setMargin(0);
+
CyanP->setPixmap(image0);
- CyanP->setScaledContents( true );
- Layout1_2->addWidget( CyanP );
-
- CyanSL = new QSlider( Frame4 );
- CyanSL->setMinimumSize( QSize( 200, 16 ) );
- CyanSL->setMaximum( 100 );
- CyanSL->setOrientation( Qt::Horizontal );
- Layout1_2->addWidget( CyanSL );
- Layout2x->addLayout(Layout1_2, 0, 1);
-
- CyanSp = new ScrSpinBox( 0, 100, Frame4, 0 );
+ CyanSp->setNewUnit(0);
+ CyanSp->setMinimum(0);
+ CyanSp->setMaximum(100);
CyanSp->setSuffix( tr(" %"));
- Layout2x->addWidget(CyanSp, 0, 2);
-
- MagentaT = new QLabel( tr( "M:" ), Frame4 );
- Layout2x->addWidget(MagentaT, 1, 0);
-
- Layout1_2_2 = new QVBoxLayout;
- Layout1_2_2->setSpacing( 0 );
- Layout1_2_2->setMargin( 0 );
-
- MagentaP = new QLabel( Frame4 );
- MagentaP->setMinimumSize( QSize( 200, 10 ) );
+
MagentaP->setPixmap(image1);
- MagentaP->setScaledContents( true );
- Layout1_2_2->addWidget( MagentaP );
-
- MagentaSL = new QSlider( Frame4 );
- MagentaSL->setMinimumSize( QSize( 200, 16 ) );
- MagentaSL->setMaximum( 100 );
- MagentaSL->setOrientation( Qt::Horizontal );
- Layout1_2_2->addWidget( MagentaSL );
- Layout2x->addLayout(Layout1_2_2, 1, 1);
-
- MagentaSp = new ScrSpinBox( 0, 100, Frame4, 0 );
+ MagentaSp->setNewUnit(0);
+ MagentaSp->setMinimum(0);
+ MagentaSp->setMaximum(100);
MagentaSp->setSuffix( tr(" %"));
- Layout2x->addWidget(MagentaSp, 1, 2);
-
- YellowT = new QLabel( tr( "Y:" ), Frame4 );
- Layout2x->addWidget(YellowT, 2, 0);
-
- Layout1_2_3 = new QVBoxLayout;
- Layout1_2_3->setSpacing( 0 );
- Layout1_2_3->setMargin( 0 );
-
- YellowP = new QLabel( Frame4);
- YellowP->setMinimumSize( QSize( 200, 10 ) );
+
YellowP->setPixmap(image2);
- YellowP->setScaledContents( true );
- Layout1_2_3->addWidget( YellowP );
-
- YellowSL = new QSlider( Frame4 );
- YellowSL->setMinimumSize( QSize( 200, 16 ) );
- YellowSL->setMaximum( 100 );
- YellowSL->setOrientation( Qt::Horizontal );
- Layout1_2_3->addWidget( YellowSL );
- Layout2x->addLayout(Layout1_2_3, 2, 1);
-
- YellowSp = new ScrSpinBox( 0, 100, Frame4, 0 );
+ YellowSp->setNewUnit(0);
+ YellowSp->setMinimum(0);
+ YellowSp->setMaximum(100);
YellowSp->setSuffix( tr(" %"));
- Layout2x->addWidget(YellowSp, 2, 2);
-
- BlackT = new QLabel( tr( "K:" ), Frame4 );
- Layout2x->addWidget(BlackT, 3, 0);
-
- Layout1_2_4 = new QVBoxLayout;
- Layout1_2_4->setSpacing( 0 );
- Layout1_2_4->setMargin( 0 );
-
- BlackP = new QLabel( Frame4 );
- BlackP->setMinimumSize( QSize( 200, 10 ) );
+
BlackP->setPixmap(image3);
- BlackP->setScaledContents( true );
- Layout1_2_4->addWidget( BlackP );
-
- BlackSL = new QSlider( Frame4 );
- BlackSL->setMinimumSize( QSize( 200, 16 ) );
- BlackSL->setMaximum( 100 );
- BlackSL->setOrientation( Qt::Horizontal );
- Layout1_2_4->addWidget( BlackSL );
- Layout2x->addLayout(Layout1_2_4, 3, 1);
-
- BlackSp = new ScrSpinBox( 0, 100, Frame4, 0 );
+ BlackSp->setNewUnit(0);
+ BlackSp->setMinimum(0);
+ BlackSp->setMaximum(100);
BlackSp->setSuffix( tr(" %"));
- Layout2x->addWidget(BlackSp, 3, 2);
- Frame4Layout->addLayout( Layout2x );
- QSpacerItem* spacer2 = new QSpacerItem( 2, 2, QSizePolicy::Minimum, QSizePolicy::Expanding );
- Frame4Layout->addItem( spacer2 );
- CMYKColorLayout->addWidget( Frame4 );
if (orig.getColorModel () == colorModelCMYK)
{
@@ -377,8 +195,8 @@
// signals and slots connections
// Regist->setToolTip( "<qt>" + tr( "Choosing this will enable printing this on all plates. Registration colors are used for printer marks such as crop marks, registration marks and the like. These are not typically used in the layout itself." ) + "</qt>");
Separations->setToolTip( "<qt>" + tr( "Choosing this will make this color a spot color, thus creating another spot when creating plates or separations. This is used most often when a logo or other color needs exact representation or cannot be replicated with CMYK inks. Metallic and fluorescent inks are good examples which cannot be easily replicated with CMYK inks." ) + "</qt>");
- connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
- connect( Cancel_2, SIGNAL( clicked() ), this, SLOT( leave() ) );
+ connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
+ connect( buttonOK, SIGNAL( clicked() ), this, SLOT( leave() ) );
connect( CyanSp, SIGNAL( valueChanged(double) ), this, SLOT( setValSLiders(double) ) );
connect( MagentaSp, SIGNAL( valueChanged(double) ), this, SLOT( setValSLiders(double) ) );
connect( YellowSp, SIGNAL( valueChanged(double) ), this, SLOT( setValSLiders(double) ) );
@@ -402,6 +220,16 @@
layout()->activate();
}
+QString CMYKChoose::colorName()
+{
+ return ColorName->text();
+}
+
+bool CMYKChoose::isSpotColor()
+{
+ return Separations->isChecked();
+}
+
void CMYKChoose::setValSLiders(double value)
{
int val = qRound(value);
@@ -655,14 +483,14 @@
void CMYKChoose::setSpot()
{
- disconnect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
+ disconnect(ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
if (Separations->isChecked())
{
ComboBox1->setCurrentIndex( 0 );
// Commented out to allow RGB Spot-Colors
// selModel( tr("CMYK"));
}
- connect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
+ connect(ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
}
void CMYKChoose::selModel(const QString& mod)
@@ -697,6 +525,7 @@
CyanSp->setDecimals(1);
MagentaSp->setDecimals(1);
YellowSp->setDecimals(1);
+ BlackSp->setDecimals(1);
CyanSp->setSingleStep(1);
MagentaSp->setSingleStep(1);
YellowSp->setSingleStep(1);
@@ -745,7 +574,7 @@
CyanT->setText( tr("R:"));
MagentaT->setText( tr("G:"));
YellowT->setText( tr("B:"));
- Layout2x->setSizeConstraint(QLayout::SetFixedSize);
+ slidersLayout->setSizeConstraint(QLayout::SetFixedSize);
BlackP->hide();
BlackSL->hide();
BlackSp->hide();
@@ -806,8 +635,7 @@
MagentaT->setText( tr("a:"));
YellowT->setText( tr("b:"));
-
- Layout2x->setSizeConstraint(QLayout::SetFixedSize);
+ slidersLayout->setSizeConstraint(QLayout::SetFixedSize);
BlackP->hide();
BlackSL->hide();
BlackSp->hide();
Modified: trunk/Scribus/scribus/ui/cmykfw.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/ui/cmykfw.h
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.h (original)
+++ trunk/Scribus/scribus/ui/cmykfw.h Sun Jun 7 19:32:45 2015
@@ -8,77 +8,32 @@
#define CMYKFARBEN_H
#include <QDialog>
-class QHBoxLayout;
-class QVBoxLayout;
-class QGridLayout;
-class QLabel;
-class QFrame;
-class QLineEdit;
-class QCheckBox;
-class QPushButton;
-class QStackedWidget;
-class QSlider;
-class QPixmap;
-class QListWidgetItem;
-class QTreeWidget;
+#include <QPixmap>
+class QTreeWidgetItem;
#include "colorsetmanager.h"
#include "sccolor.h"
#include "scribusapi.h"
+#include "ui_cmykfwbase.h"
-class ScColor;
class ScribusDoc;
-class ScrSpinBox;
-class ScComboBox;
-class SwatchCombo;
-class ColorListBox;
-class ColorChart;
-class SCRIBUS_API CMYKChoose : public QDialog
+class SCRIBUS_API CMYKChoose : public QDialog, Ui::CMYKChooseBase
{
Q_OBJECT
public:
CMYKChoose( QWidget* parent, ScribusDoc* doc, ScColor orig, QString name, ColorList *Colors, bool newCol );
~CMYKChoose() {};
- QLabel* TextLabel1;
- QLineEdit* ColorName;
- QLabel* TextLabel3;
- ScComboBox* ComboBox1;
- QCheckBox* Separations;
- SwatchCombo* Swatches;
- QLabel* TextLabel5_2;
- QLabel* OldC;
- QLabel* TextLabel5;
- QLabel* NewC;
- QPushButton* Cancel;
- QPushButton* Cancel_2;
- QFrame* Frame4;
- QStackedWidget* TabStack;
- QFrame* Frame5;
- QFrame* Frame5a;
- ColorListBox* ColorSwatch;
- ColorChart* ColorMap;
- QLabel* CyanP;
- QLabel* CyanT;
- QSlider* CyanSL;
- ScrSpinBox* CyanSp;
- QLabel* MagentaP;
- QLabel* MagentaT;
- QSlider* MagentaSL;
- ScrSpinBox* MagentaSp;
- QLabel* YellowP;
- QLabel* YellowT;
- QSlider* YellowSL;
- ScrSpinBox* YellowSp;
- QLabel* BlackP;
- QLabel* BlackT;
- QSlider* BlackSL;
- ScrSpinBox* BlackSp;
+
+ QString colorName();
+ bool isSpotColor();
+
QPixmap imageA;
QPixmap imageN;
QPixmap alertIcon;
ScColor Farbe;
+
bool Wsave;
bool dynamic;
bool isNew;
@@ -103,19 +58,6 @@
void leave();
protected:
- QHBoxLayout* CMYKColorLayout;
- QVBoxLayout* Layout23;
- QGridLayout* Layout2;
- QGridLayout* Layout2x;
- QHBoxLayout* Layout21;
- QVBoxLayout* Frame4Layout;
- QHBoxLayout* Frame5Layout;
- QHBoxLayout* Frame5aLayout;
- QVBoxLayout* Layout1_2;
- QVBoxLayout* Layout1_2_2;
- QVBoxLayout* Layout1_2_3;
- QVBoxLayout* Layout1_2_4;
-
ColorSetManager csm;
ScribusDoc* m_doc;
QTreeWidgetItem *systemSwatches;
Modified: trunk/Scribus/scribus/ui/colorchart.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/ui/colorchart.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorchart.cpp (original)
+++ trunk/Scribus/scribus/ui/colorchart.cpp Sun Jun 7 19:32:45 2015
@@ -28,6 +28,16 @@
#include "sccolorengine.h"
#include "scribuscore.h"
#include "scribusdoc.h"
+
+ColorChart::ColorChart(QWidget *parent) : QWidget(parent), m_doc(0)
+{
+ Xp = 0;
+ Yp = 0;
+ doDrawMark = false;
+ isLabMode = false;
+ setAutoFillBackground(false);
+ drawPalette(255);
+}
ColorChart::ColorChart(QWidget *parent, ScribusDoc* doc) : QWidget(parent), m_doc(doc)
{
Modified: trunk/Scribus/scribus/ui/colorchart.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/ui/colorchart.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorchart.h (original)
+++ trunk/Scribus/scribus/ui/colorchart.h Sun Jun 7 19:32:45 2015
@@ -41,16 +41,21 @@
Q_OBJECT
-public:
+public:
+ ColorChart(QWidget *parent);
ColorChart(QWidget *parent, ScribusDoc* doc);
~ColorChart() {};
+
void mouseMoveEvent(QMouseEvent *m);
void mousePressEvent(QMouseEvent *m);
void mouseReleaseEvent(QMouseEvent *m);
void paintEvent(QPaintEvent *e);
+
+ void setDoc(ScribusDoc* doc) { m_doc = doc; }
void drawMark(int x, int y);
void setMark(int h, int s);
void drawPalette(int val);
+
int Xp;
int Yp;
bool doDrawMark;
Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Sun Jun 7 19:32:45 2015
@@ -465,9 +465,9 @@
CMYKChoose* dia = new CMYKChoose(this, m_doc, tmpColor, tr("New Color"), &m_colorList, true);
if (dia->exec())
{
- dia->Farbe.setSpotColor(dia->Separations->isChecked());
- m_colorList.insert(dia->ColorName->text(), dia->Farbe);
- QTreeWidgetItem *lg = updateColorList(dia->ColorName->text());
+ dia->Farbe.setSpotColor(dia->isSpotColor());
+ m_colorList.insert(dia->colorName(), dia->Farbe);
+ QTreeWidgetItem *lg = updateColorList(dia->colorName());
if (lg != 0)
{
dataTree->expandItem(lg->parent());
@@ -549,18 +549,18 @@
CMYKChoose* dia = new CMYKChoose(this, m_doc, tmpColor, it->text(0), &m_colorList, false);
if (dia->exec())
{
- dia->Farbe.setSpotColor(dia->Separations->isChecked());
+ dia->Farbe.setSpotColor(dia->isSpotColor());
dia->Farbe.setRegistrationColor(tmpColor.isRegistrationColor());
- m_colorList[dia->ColorName->text()] = dia->Farbe;
- if (it->text(0) != dia->ColorName->text())
- {
- replaceColorMap.insert(it->text(0), dia->ColorName->text());
+ m_colorList[dia->colorName()] = dia->Farbe;
+ if (it->text(0) != dia->colorName())
+ {
+ replaceColorMap.insert(it->text(0), dia->colorName());
m_colorList.remove(it->text(0));
}
- updateGradientColors(dia->ColorName->text(), it->text(0));
+ updateGradientColors(dia->colorName(), it->text(0));
updateGradientList();
updatePatternList();
- QTreeWidgetItem *lg = updateColorList(dia->ColorName->text());
+ QTreeWidgetItem *lg = updateColorList(dia->colorName());
if (lg != 0)
{
dataTree->expandItem(lg->parent());
@@ -669,18 +669,18 @@
CMYKChoose* dia = new CMYKChoose(this, m_doc, tmpColor, nam, &m_colorList, false);
if (dia->exec())
{
- dia->Farbe.setSpotColor(dia->Separations->isChecked());
+ dia->Farbe.setSpotColor(dia->isSpotColor());
dia->Farbe.setRegistrationColor(tmpColor.isRegistrationColor());
- m_colorList[dia->ColorName->text()] = dia->Farbe;
- if (nam != dia->ColorName->text())
- {
- replaceColorMap.insert(nam, dia->ColorName->text());
+ m_colorList[dia->colorName()] = dia->Farbe;
+ if (nam != dia->colorName())
+ {
+ replaceColorMap.insert(nam, dia->colorName());
m_colorList.remove(nam);
}
- updateGradientColors(dia->ColorName->text(), nam);
+ updateGradientColors(dia->colorName(), nam);
updateGradientList();
updatePatternList();
- QTreeWidgetItem *lg = updateColorList(dia->ColorName->text());
+ QTreeWidgetItem *lg = updateColorList(dia->colorName());
if (lg != 0)
{
dataTree->expandItem(lg->parent());
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj Sun Jun 7 19:32:45 2015
@@ -1531,6 +1531,7 @@
<uic Include="..\..\..\scribus\ui\charselect.ui" />
<uic Include="..\..\..\scribus\ui\charselectenhanced.ui" />
<uic Include="..\..\..\scribus\ui\cmsprefsbase.ui" />
+ <uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
<uic Include="..\..\..\scribus\ui\colorpalette.ui" />
<uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
<uic Include="..\..\..\scribus\ui\createrange.ui" />
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20155&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters Sun Jun 7 19:32:45 2015
@@ -2902,6 +2902,9 @@
<uic Include="..\..\..\scribus\ui\tabpdfoptions.ui">
<Filter>Form Files</Filter>
</uic>
+ <uic Include="..\..\..\scribus\ui\cmykfwbase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
</ItemGroup>
<ItemGroup>
<lrelease Include="..\..\..\resources\translations\scribus.af.ts">
More information about the scribus-commit
mailing list