r20338 by jghali - put back sliders and spinboxes side by side in color editor + transform sliders in real color sliders
scribus-commit
scribus-commit at lists.scribus.net
Mon Aug 17 22:53:53 UTC 2015
Author: jghali
Date: Mon Aug 17 22:53:53 2015
New Revision: 20338
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20338
Log:
put back sliders and spinboxes side by side in color editor + transform sliders in real color sliders
Added:
trunk/Scribus/scribus/ui/sccolorslider.cpp
trunk/Scribus/scribus/ui/sccolorslider.h
Modified:
trunk/Scribus/Scribus.pro
trunk/Scribus/resources/translations/scribus.fr.ts
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/ui/cmykfw.cpp
trunk/Scribus/scribus/ui/cmykfw.h
trunk/Scribus/scribus/ui/cmykfwbase.ui
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=20338&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Mon Aug 17 22:53:53 2015
@@ -521,6 +521,7 @@
scribus/ui/resourcecollection.h \
scribus/ui/resourcemanager.h \
scribus/ui/rulermover.h \
+ scribus/ui/sccolorslider.h \
scribus/ui/sccombobox.h \
scribus/ui/scdockpalette.h \
scribus/ui/scescapecatcher.h \
@@ -1525,6 +1526,7 @@
scribus/ui/replaceonecolor.cpp \
scribus/ui/resourcemanager.cpp \
scribus/ui/rulermover.cpp \
+ scribus/ui/sccolorslider.cpp \
scribus/ui/sccombobox.cpp \
scribus/ui/scdockpalette.cpp \
scribus/ui/scescapecatcher.cpp \
Modified: trunk/Scribus/resources/translations/scribus.fr.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&path=/trunk/Scribus/resources/translations/scribus.fr.ts
==============================================================================
--- trunk/Scribus/resources/translations/scribus.fr.ts (original)
+++ trunk/Scribus/resources/translations/scribus.fr.ts Mon Aug 17 22:53:53 2015
@@ -4008,7 +4008,7 @@
<message>
<location filename="../../scribus/ui/cmykfw.cpp" line="802"/>
<source>H:</source>
- <translation type="unfinished">Teinte :</translation>
+ <translation type="unfinished">H :</translation>
</message>
<message>
<location filename="../../scribus/ui/cmykfw.cpp" line="1119"/>
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Mon Aug 17 22:53:53 2015
@@ -595,7 +595,6 @@
fileloader.cpp
filesearch.cpp
filewatcher.cpp
- ui/fontcombo.cpp
fontlistmodel.cpp
fpoint.cpp
fpointarray.cpp
@@ -801,6 +800,7 @@
ui/effectsdialog.cpp
ui/extimageprops.cpp
ui/filedialogeventcatcher.cpp
+ ui/fontcombo.cpp
ui/fontlistview.cpp
ui/fontreplacedialog.cpp
ui/gradientaddedit.cpp
@@ -921,6 +921,7 @@
ui/replaceonecolor.cpp
ui/resourcemanager.cpp
ui/rulermover.cpp
+ ui/sccolorslider.cpp
ui/sccombobox.cpp
ui/scdockpalette.cpp
ui/scescapecatcher.cpp
Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Mon Aug 17 22:53:53 2015
@@ -112,79 +112,52 @@
// We set it in the dialog showEvent().
// Swatches->setCurrentComboItem( tr( "HSV Color Map" ));
+ slidersLayout->setSpacing(5);
+ slidersLayout->setMargin(0);
+
CyanSp->setNewUnit(0);
CyanSp->setMinimum(0);
CyanSp->setMaximum(100);
CyanSp->setSuffix( tr(" %"));
-
- CyanSL = new QSlider(this);
- CyanSL->setObjectName(QStringLiteral("CyanSL"));
- CyanSL->setMinimumSize(QSize(16, 255));
CyanSL->setAutoFillBackground(true);
+ CyanSL->setMinimumSize(QSize(255, 16));
CyanSL->setMinimum(0);
CyanSL->setMaximum(100);
- CyanSL->setOrientation(Qt::Vertical);
CyanSL->setPalette(sliderPix(180));
- cMenu = new QMenu("");
- QWidgetAction *cAct = new QWidgetAction(this);
- cAct->setDefaultWidget(CyanSL);
- cMenu->addAction(cAct);
- CyanP->setMenu(cMenu);
MagentaSp->setNewUnit(0);
MagentaSp->setMinimum(0);
MagentaSp->setMaximum(100);
MagentaSp->setSuffix( tr(" %"));
- MagentaSL = new QSlider(this);
- MagentaSL->setObjectName(QStringLiteral("MagentaSL"));
- MagentaSL->setMinimumSize(QSize(16, 255));
+
MagentaSL->setAutoFillBackground(true);
+ MagentaSL->setMinimumSize(QSize(255, 16));
MagentaSL->setMinimum(0);
MagentaSL->setMaximum(100);
- MagentaSL->setOrientation(Qt::Vertical);
MagentaSL->setPalette(sliderPix(300));
- mMenu = new QMenu("");
- QWidgetAction *mAct = new QWidgetAction(this);
- mAct->setDefaultWidget(MagentaSL);
- mMenu->addAction(mAct);
- MagentaP->setMenu(mMenu);
YellowSp->setNewUnit(0);
YellowSp->setMinimum(0);
YellowSp->setMaximum(100);
YellowSp->setSuffix( tr(" %"));
- YellowSL = new QSlider(this);
- YellowSL->setObjectName(QStringLiteral("YellowSL"));
- YellowSL->setMinimumSize(QSize(16, 255));
+
YellowSL->setAutoFillBackground(true);
+ YellowSL->setMinimumSize(QSize(255, 16));
YellowSL->setMinimum(0);
YellowSL->setMaximum(100);
- YellowSL->setOrientation(Qt::Vertical);
YellowSL->setPalette(sliderPix(60));
- yMenu = new QMenu("");
- QWidgetAction *yAct = new QWidgetAction(this);
- yAct->setDefaultWidget(YellowSL);
- yMenu->addAction(yAct);
- YellowP->setMenu(yMenu);
BlackSp->setNewUnit(0);
BlackSp->setMinimum(0);
BlackSp->setMaximum(100);
BlackSp->setSuffix( tr(" %"));
- BlackSL = new QSlider(this);
- BlackSL->setObjectName(QStringLiteral("BlackSL"));
- BlackSL->setMinimumSize(QSize(16, 255));
+
BlackSL->setAutoFillBackground(true);
+ BlackSL->setMinimumSize(QSize(255, 16));
BlackSL->setMinimum(0);
BlackSL->setMaximum(100);
- BlackSL->setOrientation(Qt::Vertical);
BlackSL->setPalette(sliderBlack());
- kMenu = new QMenu("");
- QWidgetAction *bAct = new QWidgetAction(this);
- bAct->setDefaultWidget(BlackSL);
- kMenu->addAction(bAct);
- BlackP->setMenu(kMenu);
if (orig.getColorModel () == colorModelCMYK)
{
@@ -277,10 +250,6 @@
void CMYKChoose::setValSLiders(double value)
{
- disconnect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- disconnect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- disconnect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- disconnect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
if (CyanSp == sender())
CyanSL->setValue(value * 1000);
if (MagentaSp == sender())
@@ -289,10 +258,6 @@
YellowSL->setValue(value * 1000);
if (BlackSp == sender())
BlackSL->setValue(value * 1000);
- connect( CyanSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- connect( MagentaSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- connect( YellowSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
- connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
}
void CMYKChoose::slotRightClick()
@@ -343,7 +308,7 @@
{
RGBColor rgb;
CMYKColor cmyk;
- QImage image0 = QImage(10, 255, QImage::Format_ARGB32);
+ QImage image0 = QImage(255, 10, QImage::Format_ARGB32);
QPainter p;
p.begin(&image0);
p.setPen(Qt::NoPen);
@@ -519,17 +484,17 @@
p.setBrush(tmp);
}
}
- p.drawRect(0, x, 10, 5);
+ p.drawRect(x, 0, 5, 10);
}
p.end();
QPalette pal;
- pal.setBrush(QPalette::Window, QBrush(image0.mirrored(false, true)));
+ pal.setBrush(QPalette::Window, QBrush(image0));
return pal;
}
QPalette CMYKChoose::sliderBlack()
{
- QImage image0 = QImage(10, 255, QImage::Format_ARGB32);
+ QImage image0 = QImage(255, 10, QImage::Format_ARGB32);
QPainter p;
int val = 255;
p.begin(&image0);
@@ -544,12 +509,12 @@
p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(c, m, y, x), m_doc) );
else
p.setBrush( ScColorEngine::getDisplayColorGC(ScColor(0, 0, 0, x), m_doc) );
- p.drawRect(0, x, 10, 5);
+ p.drawRect(x, 0, 5, 10);
val -= 5;
}
p.end();
QPalette pal;
- pal.setBrush(QPalette::Window, QBrush(image0.mirrored(false, true)));
+ pal.setBrush(QPalette::Window, QBrush(image0));
return pal;
}
@@ -624,35 +589,49 @@
{
Wsave = false;
CyanSL->setMaximum( 100 * 1000.0);
+ CyanSL->setMinimum( 0 * 1000.0 );
+ CyanSL->setSingleStep(1 * 1000.0);
+ CyanSL->setPageStep(10 * 1000.0);
+
MagentaSL->setMaximum( 100 * 1000.0 );
+ MagentaSL->setMinimum( 0 * 1000.0 );
+ MagentaSL->setSingleStep(1 * 1000.0);
+ MagentaSL->setPageStep(10 * 1000.0);
+
YellowSL->setMaximum( 100 * 1000.0 );
+ YellowSL->setMinimum( 0 * 1000.0 );
+ YellowSL->setSingleStep(1 * 1000.0);
+ YellowSL->setPageStep(10 * 1000.0);
+
BlackSL->setMaximum( 100 * 1000.0);
- CyanSL->setMinimum( 0 * 1000.0 );
+ BlackSL->setMinimum( 0 * 1000.0);
+ BlackSL->setSingleStep(1 * 1000.0);
+ BlackSL->setPageStep(10 * 1000.0);
+
CyanSp->setMaximum( 100 );
+ CyanSp->setMinimum( 0 );
+ CyanSp->setDecimals(1);
+ CyanSp->setSingleStep(1);
+ CyanSp->setSuffix( tr(" %"));
+
MagentaSp->setMaximum( 100);
+ MagentaSp->setMinimum( 0 );
+ MagentaSp->setDecimals(1);
+ MagentaSp->setSingleStep(1);
+ MagentaSp->setSuffix( tr(" %"));
+
YellowSp->setMaximum( 100 );
- CyanSL->setSingleStep(1 * 1000.0);
- MagentaSL->setSingleStep(1 * 1000.0);
- YellowSL->setSingleStep(1 * 1000.0);
- BlackSL->setSingleStep(1 * 1000.0);
- CyanSL->setPageStep(10 * 1000.0);
- MagentaSL->setPageStep(10 * 1000.0);
- YellowSL->setPageStep(10 * 1000.0);
- BlackSL->setPageStep(10 * 1000.0);
- CyanSp->setDecimals(1);
- MagentaSp->setDecimals(1);
+ YellowSp->setMinimum( 0 );
YellowSp->setDecimals(1);
+ YellowSp->setSingleStep(1);
+ YellowSp->setSuffix( tr(" %"));
+
BlackSp->setDecimals(1);
- CyanSp->setSingleStep(1);
- MagentaSp->setSingleStep(1);
- YellowSp->setSingleStep(1);
- CyanSp->setSuffix( tr(" %"));
- MagentaSp->setSuffix( tr(" %"));
- YellowSp->setSuffix( tr(" %"));
+
CyanT->setText( tr("C:"));
MagentaT->setText( tr("M:"));
YellowT->setText( tr("Y:"));
- BlackP->show();
+ BlackSL->show();
BlackSp->show();
BlackT->show();
if (Farbe.getColorModel() != colorModelCMYK)
@@ -669,30 +648,41 @@
Wsave = false;
CyanSL->setMaximum( 255 * 1000.0 );
CyanSL->setMinimum( 0 * 1000.0 );
+ CyanSL->setSingleStep(1 * 1000.0);
+ CyanSL->setPageStep(1 * 1000.0);
+
MagentaSL->setMaximum( 255 * 1000.0 );
+ MagentaSL->setMinimum( 0 * 1000.0 );
+ MagentaSL->setSingleStep(1 * 1000.0);
+ MagentaSL->setPageStep(1 * 1000.0);
+
YellowSL->setMaximum( 255 * 1000.0 );
- CyanSL->setSingleStep(1 * 1000.0);
- MagentaSL->setSingleStep(1 * 1000.0);
+ YellowSL->setMinimum( 0 * 1000.0 );
YellowSL->setSingleStep(1 * 1000.0);
- CyanSL->setPageStep(1 * 1000.0);
- MagentaSL->setPageStep(1 * 1000.0);
YellowSL->setPageStep(1 * 1000.0);
+
CyanSp->setSingleStep(1);
+ CyanSp->setMaximum( 255 );
+ CyanSp->setMinimum( 0 );
+ CyanSp->setDecimals(0);
+ CyanSp->setSuffix("");
+
MagentaSp->setSingleStep(1);
+ MagentaSp->setMaximum( 255 );
+ MagentaSp->setMinimum( 0 );
+ MagentaSp->setDecimals(0);
+ MagentaSp->setSuffix("");
+
YellowSp->setSingleStep(1);
- CyanSp->setMaximum( 255 );
- MagentaSp->setMaximum( 255 );
YellowSp->setMaximum( 255 );
- CyanSp->setDecimals(0);
- MagentaSp->setDecimals(0);
+ YellowSp->setMinimum( 0 );
YellowSp->setDecimals(0);
- CyanSp->setSuffix("");
- MagentaSp->setSuffix("");
YellowSp->setSuffix("");
+
CyanT->setText( tr("R:"));
MagentaT->setText( tr("G:"));
YellowT->setText( tr("B:"));
- BlackP->hide();
+ BlackSL->hide();
BlackSp->hide();
BlackT->hide();
if (mod == tr("Web Safe RGB"))
@@ -753,7 +743,7 @@
MagentaT->setText( tr("a:"));
YellowT->setText( tr("b:"));
- BlackP->hide();
+ BlackSL->hide();
BlackSp->hide();
BlackT->hide();
if (Farbe.getColorModel() != colorModelLab)
@@ -803,7 +793,7 @@
MagentaT->setText( tr("L:"));
YellowT->setText( tr("C:"));
- BlackP->hide();
+ BlackSL->hide();
BlackSp->hide();
BlackT->hide();
if (Farbe.getColorModel() != colorModelLab)
Modified: trunk/Scribus/scribus/ui/cmykfw.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&path=/trunk/Scribus/scribus/ui/cmykfw.h
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.h (original)
+++ trunk/Scribus/scribus/ui/cmykfw.h Mon Aug 17 22:53:53 2015
@@ -64,14 +64,6 @@
QTreeWidgetItem *userSwatches;
QTreeWidgetItem *hsvSelector;
QStringList customColSet;
- QMenu *cMenu;
- QMenu *mMenu;
- QMenu *yMenu;
- QMenu *kMenu;
- QSlider *CyanSL;
- QSlider *MagentaSL;
- QSlider *YellowSL;
- QSlider *BlackSL;
bool isHLC;
virtual void showEvent(QShowEvent * event);
Modified: trunk/Scribus/scribus/ui/cmykfwbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&path=/trunk/Scribus/scribus/ui/cmykfwbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfwbase.ui (original)
+++ trunk/Scribus/scribus/ui/cmykfwbase.ui Mon Aug 17 22:53:53 2015
@@ -6,14 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
- <width>497</width>
- <height>317</height>
+ <width>652</width>
+ <height>361</height>
</rect>
</property>
<property name="windowTitle">
<string>Edit Color</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <property name="leftMargin">
+ <number>10</number>
+ </property>
+ <property name="topMargin">
+ <number>10</number>
+ </property>
+ <property name="rightMargin">
+ <number>10</number>
+ </property>
+ <property name="bottomMargin">
+ <number>10</number>
+ </property>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -82,6 +97,116 @@
</spacer>
</item>
<item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_4">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>New</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Old</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="OldC">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::WinPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="NewC">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::WinPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>20</number>
@@ -120,393 +245,338 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="SwatchCombo" name="Swatches">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="popupMode">
- <enum>QToolButton::MenuButtonPopup</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QStackedWidget" name="TabStack">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="page">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
- <widget class="QFrame" name="frame_2">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QFrame" name="frame_3">
- <property name="minimumSize">
- <size>
- <width>182</width>
- <height>130</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>182</width>
- <height>130</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::WinPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <property name="spacing">
- <number>0</number>
+ <widget class="QFrame" name="frame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="SwatchCombo" name="Swatches">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="popupMode">
+ <enum>QToolButton::MenuButtonPopup</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="TabStack">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="page">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
+ <widget class="QFrame" name="frame_2">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QFrame" name="frame_3">
+ <property name="minimumSize">
+ <size>
+ <width>182</width>
+ <height>130</height>
+ </size>
</property>
- <property name="leftMargin">
- <number>0</number>
+ <property name="maximumSize">
+ <size>
+ <width>182</width>
+ <height>130</height>
+ </size>
</property>
- <property name="topMargin">
- <number>0</number>
+ <property name="frameShape">
+ <enum>QFrame::WinPanel</enum>
</property>
- <property name="rightMargin">
- <number>0</number>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
</property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="ColorChart" name="ColorMap" native="true">
- <property name="minimumSize">
- <size>
- <width>128</width>
- <height>128</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>180</width>
- <height>128</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="ColorChart" name="ColorMap" native="true">
+ <property name="minimumSize">
+ <size>
+ <width>180</width>
+ <height>128</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>180</width>
+ <height>128</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="ColorListBox" name="ColorSwatch"/>
+ </item>
+ </layout>
+ </widget>
</widget>
- <widget class="QWidget" name="page_2">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="ColorListBox" name="ColorSwatch"/>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
- <widget class="QLabel" name="label_4">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>22</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>100</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string>New</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_3">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>22</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>100</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string>Old</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="OldC">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>50</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>50</width>
- <height>50</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::WinPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="NewC">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>50</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>50</width>
- <height>50</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::WinPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="CyanT">
- <property name="text">
- <string>C:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ScrSpinBox" name="CyanSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QToolButton" name="CyanP">
- <property name="text">
- <string>...</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="MagentaT">
- <property name="text">
- <string>M:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="MagentaSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="MagentaP">
- <property name="text">
- <string>...</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="YellowT">
- <property name="text">
- <string>Y:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ScrSpinBox" name="YellowSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QToolButton" name="YellowP">
- <property name="text">
- <string>...</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="BlackT">
- <property name="text">
- <string>K:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="BlackSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QToolButton" name="BlackP">
- <property name="text">
- <string>...</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="slidersLayout">
+ <item row="0" column="1">
+ <widget class="ScColorSlider" name="CyanSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScColorSlider" name="BlackSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="BlackT">
+ <property name="text">
+ <string>K:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScColorSlider" name="MagentaSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="ScrSpinBox" name="BlackSp">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScColorSlider" name="YellowSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="CyanT">
+ <property name="text">
+ <string>C:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="ScrSpinBox" name="YellowSp">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="ScrSpinBox" name="MagentaSp">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="MagentaT">
+ <property name="text">
+ <string>M:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="ScrSpinBox" name="CyanSp">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="YellowT">
+ <property name="text">
+ <string>Y:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
@@ -537,6 +607,11 @@
<extends>QDoubleSpinBox</extends>
<header>ui/scrspinbox.h</header>
</customwidget>
+ <customwidget>
+ <class>ScColorSlider</class>
+ <extends>QSlider</extends>
+ <header>ui/sccolorslider.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&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 Mon Aug 17 22:53:53 2015
@@ -573,6 +573,7 @@
<moc Include="..\..\..\scribus\ui\proptree.h" />
<moc Include="..\..\..\scribus\ui\viewtoolbar.h" />
<moc Include="..\..\..\scribus\ui\resourcemanager.h" />
+ <ClInclude Include="..\..\..\scribus\ui\sccolorslider.h" />
<ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h" />
<ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerbase.h" />
<ClInclude Include="..\..\..\scribus\undotransaction.h" />
@@ -1314,6 +1315,7 @@
<ClCompile Include="..\..\..\scribus\sccolor.cpp" />
<ClCompile Include="..\..\..\scribus\sccolorengine.cpp" />
<ClCompile Include="..\..\..\scribus\sccolorshade.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\sccolorslider.cpp" />
<ClCompile Include="..\..\..\scribus\ui\sccombobox.cpp" />
<ClCompile Include="..\..\..\scribus\downloadmanager\scdlmgr.cpp" />
<ClCompile Include="..\..\..\scribus\downloadmanager\scdlthread.cpp" />
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20338&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 Mon Aug 17 22:53:53 2015
@@ -98,9 +98,6 @@
<ClInclude Include="..\..\..\scribus\canvasmode_copyproperties.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\scribus\canvasmode_create.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\scribus\canvasmode_drawbezier.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1018,6 +1015,9 @@
</ClInclude>
<ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h">
<Filter>colorMgmt</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\ui\sccolorslider.h">
+ <Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -2540,6 +2540,9 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\iconmanager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\sccolorslider.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -4013,6 +4016,9 @@
<moc Include="..\..\..\scribus\iconmanager.h">
<Filter>Header Files</Filter>
</moc>
+ <moc Include="..\..\..\scribus\canvasmode_create.h">
+ <Filter>Header Files</Filter>
+ </moc>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\scribus\color.h">
More information about the scribus-commit
mailing list