r20387 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Wed Sep 16 00:12:10 UTC 2015
Author: jghali
Date: Wed Sep 16 00:12:10 2015
New Revision: 20387
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20387
Log:
backport fix for color management consistency between PostScript and PDF CMYK output
Modified:
branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
branches/Version14x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
branches/Version14x/Scribus/scribus/preview.cpp
branches/Version14x/Scribus/scribus/preview.h
branches/Version14x/Scribus/scribus/printdialog.cpp
branches/Version14x/Scribus/scribus/printdialog.h
branches/Version14x/Scribus/scribus/printdialogbase.ui
branches/Version14x/Scribus/scribus/pslib.cpp
branches/Version14x/Scribus/scribus/pslib.h
branches/Version14x/Scribus/scribus/scprintengine_gdi.cpp
branches/Version14x/Scribus/scribus/scribus.cpp
branches/Version14x/Scribus/scribus/scribusstructs.h
branches/Version14x/Scribus/scribus/tabprinter.cpp
branches/Version14x/Scribus/scribus/tabprinter.ui
Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Wed Sep 16 00:12:10 2015
@@ -635,7 +635,6 @@
m_Doc->Print_Options.useColor = static_cast<bool>(pg.attribute("useColor").toInt());
m_Doc->Print_Options.mirrorH = static_cast<bool>(pg.attribute("mirrorH").toInt());
m_Doc->Print_Options.mirrorV = static_cast<bool>(pg.attribute("mirrorV").toInt());
- m_Doc->Print_Options.useICC = static_cast<bool>(pg.attribute("useICC").toInt());
m_Doc->Print_Options.doGCR = static_cast<bool>(pg.attribute("doGCR").toInt());
m_Doc->Print_Options.doClip = static_cast<bool>(pg.attribute("doClip").toInt());
m_Doc->Print_Options.setDevParam = static_cast<bool>(pg.attribute("setDevParam").toInt());
Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp Wed Sep 16 00:12:10 2015
@@ -621,7 +621,7 @@
docu.writeAttribute("useColor", static_cast<int>(m_Doc->Print_Options.useColor));
docu.writeAttribute("mirrorH", static_cast<int>(m_Doc->Print_Options.mirrorH));
docu.writeAttribute("mirrorV", static_cast<int>(m_Doc->Print_Options.mirrorV));
- docu.writeAttribute("useICC", static_cast<int>(m_Doc->Print_Options.useICC));
+ docu.writeAttribute("useICC", static_cast<int>(m_Doc->CMSSettings.CMSinUse)); // Not used anymore, only for backward compatibility
docu.writeAttribute("doGCR", static_cast<int>(m_Doc->Print_Options.doGCR));
docu.writeAttribute("doClip", static_cast<int>(m_Doc->Print_Options.doClip));
docu.writeAttribute("setDevParam", static_cast<int>(m_Doc->Print_Options.setDevParam));
Modified: branches/Version14x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp Wed Sep 16 00:12:10 2015
@@ -424,7 +424,6 @@
options.useColor = self->color;
options.mirrorH = self->mph;
options.mirrorV = self->mpv;
- options.useICC = self->useICC;
options.doGCR = self->ucr;
options.cropMarks = false;
options.bleedMarks = false;
Modified: branches/Version14x/Scribus/scribus/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/preview.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/preview.cpp (original)
+++ branches/Version14x/Scribus/scribus/preview.cpp Wed Sep 16 00:12:10 2015
@@ -103,7 +103,6 @@
fClip = false;
fSpot = true;
fGray = false;
- fICC = false;
scaleFactor = 1.0;
SMode = 1;
getNumericGSVersion(GsMajor, GsMinor);
@@ -282,11 +281,6 @@
spotColors = new QCheckBox( tr( "Convert Spot Colors" ), jobTitle );
Layout1->addWidget( spotColors );
-
- UseICC = new QCheckBox( tr( "Apply Color Profiles" ), jobTitle );
- Layout1->addWidget( UseICC );
- if (!doc->HasCMS)
- UseICC->setEnabled(false);
settingsBarLayout->addWidget(jobTitle);
QSpacerItem* spacerC = new QSpacerItem( 5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding );
@@ -360,7 +354,6 @@
EnableGCR->setToolTip( "<qt>" + tr( "A way of switching off some of the gray shades which are composed of cyan, yellow and magenta and using black instead. UCR most affects parts of images which are neutral and/or dark tones which are close to the gray. Use of this may improve printing some images and some experimentation and testing is need on a case by case basis. UCR reduces the possibility of over saturation with CMY inks." ) + "</qt>" );
scaleBox->setToolTip( "<qt>" + tr("Resize the scale of the page.") + "</qt>");
spotColors->setToolTip("<qt>" + tr( "Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled." ) + "</qt>");
- UseICC->setToolTip("<qt>" + tr( "Allows you to embed color profiles in the print stream when color management is enabled" ) + "</qt>");
//signals and slots
connect(AntiAlias, SIGNAL(clicked()), this, SLOT(redisplay()));
@@ -372,7 +365,6 @@
connect(ClipMarg, SIGNAL(clicked()), this, SLOT(redisplay()));
connect(spotColors, SIGNAL(clicked()), this, SLOT(redisplay()));
connect(useGray, SIGNAL(clicked()), this, SLOT(redisplay()));
- connect(UseICC, SIGNAL(clicked()), this, SLOT(redisplay()));
if (!HaveTiffSep)
{
connect(EnableCMYK_C, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
@@ -401,11 +393,6 @@
ClipMarg->setChecked(doc->Print_Options.doClip);
spotColors->setChecked(!doc->Print_Options.useSpotColors);
useGray->setChecked(!doc->Print_Options.useColor);
- if (doc->HasCMS)
- {
- UseICC->setChecked( postscriptPreview ? doc->Print_Options.useICC : false);
- UseICC->setEnabled( postscriptPreview );
- }
}
else
{
@@ -420,11 +407,6 @@
useGray->setChecked(true);
else
useGray->setChecked(false);
- if (doc->HasCMS)
- {
- UseICC->setChecked( postscriptPreview ? prefs->getBool("ICCinUse", false) : false);
- UseICC->setEnabled( postscriptPreview );
- }
}
}
@@ -566,7 +548,6 @@
options.separationName = "All";
options.toFile = false;
options.useColor = !useGray->isChecked();
- options.useICC = false;
options.useSpotColors = false;
bool done = winPrint.gdiPrintPreview(doc, page, &image, options, Res / 72.0);
if ( done )
@@ -577,13 +558,10 @@
// Recreate Postscript-File only when the actual Page has changed
if ((Seite != APage) || (EnableGCR->isChecked() != GMode) || (useGray->isChecked() != fGray)
|| (MirrorHor->isChecked() != mHor) || (MirrorVert->isChecked() != mVer) || (ClipMarg->isChecked() != fClip)
- || (UseICC->isChecked() != fICC) || (spotColors->isChecked() != fSpot))
+ || (spotColors->isChecked() != fSpot))
{
ReallyUsed.clear();
doc->getUsedFonts(ReallyUsed);
- bool useIC = UseICC->isChecked();
- if (!doc->HasCMS)
- useIC = false;
PrintOptions options;
options.pageNumbers.push_back(Seite+1);
options.outputSeparations = false;
@@ -592,7 +570,6 @@
options.useColor = !useGray->isChecked();
options.mirrorH = MirrorHor->isChecked();
options.mirrorV = MirrorVert->isChecked();
- options.useICC = useIC;
options.doGCR = EnableGCR->isChecked();
options.setDevParam = false;
options.doClip = ClipMarg->isChecked();
@@ -650,13 +627,21 @@
args.append( "-dTextAlphaBits=4" );
args.append( "-dGraphicsAlphaBits=4" );
}
- if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9) && UseICC->isChecked())
- {
- args.append("-sDefaultCMYKProfile=" + QDir::toNativeSeparators(doc->DocInputCMYKProf.profilePath()));
+ if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9))
+ {
+ args.append("-sDefaultCMYKProfile=" + QDir::toNativeSeparators(doc->DocPrinterProf.profilePath()));
if (EnableCMYK->isChecked() && HaveTiffSep)
args.append("-sOutputICCProfile=" + QDir::toNativeSeparators(doc->DocPrinterProf.profilePath()));
else
args.append("-sOutputICCProfile=" + QDir::toNativeSeparators(doc->DocOutputProf.profilePath()));
+ }
+ else if (ScCore->haveCMS() && (GsMinor >= 0) && (GsMajor >= 9))
+ {
+ args.append("-sDefaultCMYKProfile=" + QDir::toNativeSeparators(ScCore->defaultCMYKProfile.profilePath()));
+ if (EnableCMYK->isChecked() && HaveTiffSep)
+ args.append("-sOutputICCProfile=" + QDir::toNativeSeparators(ScCore->defaultCMYKProfile.profilePath()));
+ else
+ args.append("-sOutputICCProfile=" + QDir::toNativeSeparators(ScCore->defaultRGBProfile.profilePath()));
}
// Add any extra font paths being used by Scribus to gs's font search path
PrefsContext *pc = prefsManager->prefsFile->getContext("Fonts");
@@ -666,7 +651,7 @@
cmd1 = QString("-sFONTPATH=%1").arg(QDir::toNativeSeparators(extraFonts->get(0,0)));
for (int i = 1; i < extraFonts->getRowCount(); ++i)
cmd1 += QString("%1%2").arg(sep).arg(QDir::toNativeSeparators(extraFonts->get(i,0)));
- if( !cmd1.isEmpty() )
+ if (!cmd1.isEmpty())
args.append( cmd1 );
// then add any final args and call gs
if ((EnableCMYK->isChecked()) && HaveTiffSep)
@@ -691,13 +676,10 @@
// Recreate Postscript-File only when the actual Page has changed
if ((Seite != APage) || (EnableGCR->isChecked() != GMode) || (useGray->isChecked() != fGray)
|| (MirrorHor->isChecked() != mHor) || (MirrorVert->isChecked() != mVer) || (ClipMarg->isChecked() != fClip)
- || (UseICC->isChecked() != fICC) || (spotColors->isChecked() != fSpot))
+ || (spotColors->isChecked() != fSpot))
{
ReallyUsed.clear();
doc->getUsedFonts(ReallyUsed);
- bool useIC = UseICC->isChecked();
- if (!doc->HasCMS)
- useIC = false;
PrintOptions options;
options.pageNumbers.push_back(Seite+1);
options.outputSeparations = false;
@@ -706,7 +688,6 @@
options.useColor = !useGray->isChecked();
options.mirrorH = MirrorHor->isChecked();
options.mirrorV = MirrorVert->isChecked();
- options.useICC = useIC;
options.doGCR = EnableGCR->isChecked();
options.setDevParam = false;
options.doClip = ClipMarg->isChecked();
@@ -746,10 +727,15 @@
args1.append("-dTextAlphaBits=4");
args1.append("-dGraphicsAlphaBits=4");
}
- if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9) && UseICC->isChecked())
- {
- args1.append("-sDefaultCMYKProfile="+doc->DocInputCMYKProf.profilePath());
- args1.append("-sOutputICCProfile="+doc->DocPrinterProf.profilePath());
+ if ((doc->HasCMS) && (GsMinor >= 0) && (GsMajor >= 9))
+ {
+ args1.append("-sDefaultCMYKProfile=" + QDir::toNativeSeparators(doc->DocPrinterProf.profilePath()));
+ args1.append("-sOutputICCProfile=" + QDir::toNativeSeparators(doc->DocPrinterProf.profilePath()));
+ }
+ else if (ScCore->haveCMS() && (GsMinor >= 0) && (GsMajor >= 9))
+ {
+ args1.append("-sDefaultCMYKProfile=" + QDir::toNativeSeparators(ScCore->defaultCMYKProfile.profilePath()));
+ args1.append("-sOutputICCProfile=" + QDir::toNativeSeparators(ScCore->defaultCMYKProfile.profilePath()));
}
// Add any extra font paths being used by Scribus to gs's font search path
PrefsContext *pc = prefsManager->prefsFile->getContext("Fonts");
@@ -759,7 +745,7 @@
cmd = QString("-sFONTPATH=%1").arg(QDir::toNativeSeparators(extraFonts->get(0,0)));
for (int i = 1; i < extraFonts->getRowCount(); ++i)
cmd += QString("%1%2").arg(sep).arg(QDir::toNativeSeparators(extraFonts->get(i,0)));
- if( !cmd.isEmpty() )
+ if (!cmd.isEmpty())
args1.append( cmd );
args1.append( QString("-sOutputFile=%1").arg(QDir::toNativeSeparators(ScPaths::getTempFileDir()+"/sc.tif")) );
@@ -927,7 +913,7 @@
|| (AntiAlias->isChecked() != GsAl) || (((AliasTr->isChecked() != Trans) || (EnableGCR->isChecked() != GMode))
&& (!EnableCMYK->isChecked()))
|| (useGray->isChecked() != fGray) || (MirrorHor->isChecked() != mHor) || (MirrorVert->isChecked() != mVer)
- || (ClipMarg->isChecked() != fClip) || (UseICC->isChecked() != fICC) || (spotColors->isChecked() != fSpot))
+ || (ClipMarg->isChecked() != fClip) || (spotColors->isChecked() != fSpot))
{
if (!EnableCMYK->isChecked() || (!HaveTiffSep))
{
@@ -950,7 +936,7 @@
if ((Seite != APage) || (EnableCMYK->isChecked() != CMode) || (SMode != scaleBox->currentIndex())
|| (AntiAlias->isChecked() != GsAl) || (AliasTr->isChecked() != Trans) || (EnableGCR->isChecked() != GMode)
|| (useGray->isChecked() != fGray) || (MirrorHor->isChecked() != mHor)|| (MirrorVert->isChecked() != mVer)
- || (ClipMarg->isChecked() != fClip) || (UseICC->isChecked() != fICC) || (spotColors->isChecked() != fSpot))
+ || (ClipMarg->isChecked() != fClip) || (spotColors->isChecked() != fSpot))
{
ret = RenderPreviewSep(Seite, Res);
if (ret > 0)
@@ -967,10 +953,10 @@
std::swap(w, h2);
image = QImage(w, h2, QImage::Format_ARGB32);
QRgb clean = qRgba(0, 0, 0, 0);
- for( int yi=0; yi < h2; ++yi )
+ for (int yi=0; yi < h2; ++yi)
{
QRgb *q = (QRgb*)(image.scanLine( yi ));
- for(int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
*q = clean;
q++;
@@ -1080,10 +1066,10 @@
if (EnableInkCover->isChecked())
{
uint limitVal = (CoverThresholdValue->value() * 255) / 100;
- for( int yi=0; yi < h2; ++yi )
+ for (int yi=0; yi < h2; ++yi)
{
QRgb *q = (QRgb*)(image.scanLine( yi ));
- for(int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
uint greyVal = *q;
if (greyVal != 0)
@@ -1118,10 +1104,13 @@
{
QRgb alphaFF = qRgba(0,0,0,255);
QRgb alphaOO = qRgba(255,255,255,0);
+ int flags = Ctf_LowResPrecalc;
+ if ((doc->HasCMS && doc->CMSSettings.BlackPoint) || (!doc->HasCMS))
+ flags |= Ctf_BlackPointCompensation;
ScColorProfile cmykProfile = doc->HasCMS ? doc->DocPrinterProf : ScCore->defaultCMYKProfile;
ScColorProfile rgbProfile = doc->HasCMS ? doc->DocOutputProf : ScCore->defaultRGBProfile;
- ScColorTransform transCMYK = ScColorMgmtEngine::createTransform(cmykProfile, Format_YMCK_8, rgbProfile, Format_BGRA_8, Intent_Relative_Colorimetric, Ctf_LowResPrecalc);
- for( int yi=0; yi < h2; ++yi )
+ ScColorTransform transCMYK = ScColorMgmtEngine::createTransform(cmykProfile, Format_YMCK_8, rgbProfile, Format_BGRA_8, Intent_Relative_Colorimetric, flags);
+ for (int yi=0; yi < h2; ++yi)
{
uchar* ptr = image.scanLine( yi );
transCMYK.apply(ptr, ptr, image.width());
@@ -1145,10 +1134,10 @@
}
else
{
- for( int yi=0; yi < h2; ++yi )
+ for (int yi=0; yi < h2; ++yi)
{
QRgb *q = (QRgb*)(image.scanLine( yi ));
- for(int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
cyan = qRed(*q);
magenta = qGreen(*q);
@@ -1181,9 +1170,12 @@
{
QRgb alphaFF = qRgba(0,0,0,255);
QRgb alphaOO = qRgba(255,255,255,0);
+ int flags = Ctf_LowResPrecalc;
+ if ((doc->HasCMS && doc->CMSSettings.BlackPoint) || (!doc->HasCMS))
+ flags |= Ctf_BlackPointCompensation;
ScColorProfile cmykProfile = doc->HasCMS ? doc->DocPrinterProf : ScCore->defaultCMYKProfile;
ScColorProfile rgbProfile = doc->HasCMS ? doc->DocOutputProf : ScCore->defaultRGBProfile;
- ScColorTransform transCMYK = ScColorMgmtEngine::createTransform(cmykProfile, Format_YMCK_8, rgbProfile, Format_BGRA_8, Intent_Relative_Colorimetric, Ctf_LowResPrecalc);
+ ScColorTransform transCMYK = ScColorMgmtEngine::createTransform(cmykProfile, Format_YMCK_8, rgbProfile, Format_BGRA_8, Intent_Relative_Colorimetric, flags);
for (int y=0; y < h2; ++y )
{
uchar* ptr = image.scanLine( y );
@@ -1275,12 +1267,12 @@
{
int wi = image.width();
int hi = image.height();
- for( int yi=0; yi < hi; ++yi )
+ for (int yi=0; yi < hi; ++yi)
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
- for(int xi=0; xi < wi; ++xi )
+ for (int xi=0; xi < wi; ++xi)
{
- if((*s) == 0xffffffff)
+ if ((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
@@ -1312,11 +1304,11 @@
bool PPreview::usePostscriptPreview(QString printerName, PrintEngine engine)
{
#ifdef _WIN32
- if ( printerName == tr("File") )
+ if (printerName == tr("File"))
return true;
- else if( printerName.isEmpty() )
+ else if (printerName.isEmpty())
return PrinterUtil::isPostscriptPrinter( ScPrintEngine_GDI::getDefaultPrinter() );
- else if( engine >= PostScript1 && engine <= PostScript3 )
+ else if (engine >= PostScript1 && engine <= PostScript3)
return PrinterUtil::isPostscriptPrinter( printerName );
return false;
#else
@@ -1339,7 +1331,6 @@
fClip = ClipMarg->isChecked();
fSpot = spotColors->isChecked();
fGray = useGray->isChecked();
- fICC = UseICC->isChecked();
}
void PPreview::imageLoadError(QPixmap &Bild, int page)
Modified: branches/Version14x/Scribus/scribus/preview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/preview.h
==============================================================================
--- branches/Version14x/Scribus/scribus/preview.h (original)
+++ branches/Version14x/Scribus/scribus/preview.h Wed Sep 16 00:12:10 2015
@@ -84,7 +84,6 @@
QCheckBox* ClipMarg;
QCheckBox* spotColors;
QCheckBox* useGray;
- QCheckBox* UseICC;
QCheckBox* EnableInkCover;
QSpinBox* CoverThresholdValue;
QLabel* ThresLabel;
@@ -116,7 +115,6 @@
bool fClip;
bool fSpot;
bool fGray;
- bool fICC;
bool postscriptPreview;
QMap<QString, int> sepsToFileNum;
QMap<QString, QCheckBox*> flagsVisible;
Modified: branches/Version14x/Scribus/scribus/printdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/printdialog.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/printdialog.cpp (original)
+++ branches/Version14x/Scribus/scribus/printdialog.cpp Wed Sep 16 00:12:10 2015
@@ -154,7 +154,6 @@
bool ps3Supported = printEngineMap.contains(CommonStrings::trPostScript3);
bool psSupported = (ps1Supported || ps2Supported || ps3Supported);
printEngines->setEnabled(psSupported || outputToFile());
- UseICC->setEnabled(m_doc->HasCMS && psSupported);
}
PrintDialog::~PrintDialog()
@@ -283,7 +282,6 @@
if (psSupported)
{
PrintSep->setEnabled( true );
- UseICC->setEnabled( m_doc->HasCMS );
usePDFMarks->setEnabled(true);
}
else
@@ -292,8 +290,6 @@
PrintSep->setEnabled( false );
setCurrentComboItem(SepArt, tr("All"));
SepArt->setEnabled( false );
- UseICC->setEnabled( false );
- UseICC->setChecked( false );
usePDFMarks->setEnabled(false);
}
}
@@ -343,7 +339,6 @@
{
printEngines->setEnabled( true );
PrintSep->setEnabled( true );
- UseICC->setEnabled( m_doc->HasCMS );
usePDFMarks->setEnabled(true);
}
else
@@ -353,8 +348,6 @@
PrintSep->setEnabled( false );
setCurrentComboItem(SepArt, tr("All"));
SepArt->setEnabled( false );
- UseICC->setEnabled( false );
- UseICC->setChecked( false );
usePDFMarks->setEnabled(false);
}
}
@@ -410,7 +403,6 @@
m_doc->Print_Options.useColor = color();
m_doc->Print_Options.mirrorH = mirrorHorizontal();
m_doc->Print_Options.mirrorV = mirrorVertical();
- m_doc->Print_Options.useICC = ICCinUse();
m_doc->Print_Options.doClip = doClip();
m_doc->Print_Options.doGCR = doGCR();
m_doc->Print_Options.prnEngine= printEngine();
@@ -474,7 +466,6 @@
options.doGCR = prefs->getBool("DoGCR", gcr);
options.doClip = prefs->getBool("Clip", false);
options.useSpotColors = prefs->getBool("doSpot", true);
- options.useICC = m_doc->HasCMS ? prefs->getBool("ICCinUse", false) : false;
options.useDocBleeds = true;
options.bleeds.Top = m_doc->bleeds.Top;
options.bleeds.Bottom = m_doc->bleeds.Bottom;
@@ -537,10 +528,7 @@
GcR->setChecked(m_doc->Print_Options.doGCR);
ClipMarg->setChecked(m_doc->Print_Options.doClip);
spotColors->setChecked(!m_doc->Print_Options.useSpotColors);
- bool iccInUse = m_doc->HasCMS ? m_doc->Print_Options.useICC : false;
bool psPrinter = PrinterUtil::isPostscriptPrinter(PrintDest->currentText()) || outputToFile();
- UseICC->setChecked( psPrinter ? iccInUse : false );
- UseICC->setEnabled( psPrinter );
docBleeds->setChecked(m_doc->Print_Options.useDocBleeds);
if (docBleeds->isChecked())
{
@@ -651,11 +639,6 @@
return !spotColors->isChecked();
}
-bool PrintDialog::ICCinUse()
-{
- return (m_doc->HasCMS && UseICC->isChecked());
-}
-
bool PrintDialog::doPrintAll()
{
return RadioButton1->isChecked();
Modified: branches/Version14x/Scribus/scribus/printdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/printdialog.h
==============================================================================
--- branches/Version14x/Scribus/scribus/printdialog.h (original)
+++ branches/Version14x/Scribus/scribus/printdialog.h Wed Sep 16 00:12:10 2015
@@ -42,7 +42,6 @@
PrintEngine printEngine();
bool doDev();
bool doSpot();
- bool ICCinUse();
bool doPrintAll();
bool doPrintCurrentPage();
QString getPageString();
Modified: branches/Version14x/Scribus/scribus/printdialogbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/printdialogbase.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/printdialogbase.ui (original)
+++ branches/Version14x/Scribus/scribus/printdialogbase.ui Wed Sep 16 00:12:10 2015
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>570</width>
- <height>520</height>
+ <height>529</height>
</rect>
</property>
<property name="windowTitle">
@@ -398,16 +398,6 @@
</property>
<property name="text">
<string>Convert Spot Colors to Process Colors</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="UseICC">
- <property name="toolTip">
- <string><qt>Allows you to embed color profiles in the print stream when color management is enabled</qt></string>
- </property>
- <property name="text">
- <string>Apply Color Profiles</string>
</property>
</widget>
</item>
@@ -641,6 +631,45 @@
<header location="global">scrspinbox.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>PrintDest</tabstop>
+ <tabstop>OptButton</tabstop>
+ <tabstop>LineEdit1</tabstop>
+ <tabstop>ToolButton1</tabstop>
+ <tabstop>OtherCom</tabstop>
+ <tabstop>Command</tabstop>
+ <tabstop>RadioButton1</tabstop>
+ <tabstop>CurrentPage</tabstop>
+ <tabstop>RadioButton2</tabstop>
+ <tabstop>pageNr</tabstop>
+ <tabstop>pageNrButton</tabstop>
+ <tabstop>Copies</tabstop>
+ <tabstop>printOptions</tabstop>
+ <tabstop>PrintSep</tabstop>
+ <tabstop>colorType</tabstop>
+ <tabstop>SepArt</tabstop>
+ <tabstop>printEngines</tabstop>
+ <tabstop>usePDFMarks</tabstop>
+ <tabstop>MirrorHor</tabstop>
+ <tabstop>MirrorVert</tabstop>
+ <tabstop>devPar</tabstop>
+ <tabstop>ClipMarg</tabstop>
+ <tabstop>GcR</tabstop>
+ <tabstop>spotColors</tabstop>
+ <tabstop>cropMarks</tabstop>
+ <tabstop>registrationMarks</tabstop>
+ <tabstop>bleedMarks</tabstop>
+ <tabstop>colorMarks</tabstop>
+ <tabstop>markOffset</tabstop>
+ <tabstop>BleedTop</tabstop>
+ <tabstop>BleedRight</tabstop>
+ <tabstop>BleedBottom</tabstop>
+ <tabstop>BleedLeft</tabstop>
+ <tabstop>docBleeds</tabstop>
+ <tabstop>previewButton</tabstop>
+ <tabstop>OKButton</tabstop>
+ <tabstop>OKButton_2</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
Modified: branches/Version14x/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/pslib.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pslib.cpp (original)
+++ branches/Version14x/Scribus/scribus/pslib.cpp Wed Sep 16 00:12:10 2015
@@ -1468,7 +1468,7 @@
image.imgInfo.RequestProps = c->pixm.imgInfo.RequestProps;
image.imgInfo.isRequest = c->pixm.imgInfo.isRequest;
CMSettings cms(c->doc(), Prof, c->IRender);
- if (!image.LoadPicture(fn, c->pixm.imgInfo.actualPageNumber, cms, UseEmbedded, applyICC, ScImage::CMYKData, 300, &dummy))
+ if (!image.LoadPicture(fn, c->pixm.imgInfo.actualPageNumber, cms, UseEmbedded, true, ScImage::CMYKData, 300, &dummy))
{
PS_Error_ImageLoadFailure(fn);
return false;
@@ -1561,7 +1561,7 @@
else if (c->pixm.imgInfo.type == ImageType7)
resolution = 72;
// int resolution = (c->pixm.imgInfo.type == ImageType7) ? 72 : 300;
- if ( !image.LoadPicture(fn, c->pixm.imgInfo.actualPageNumber, cms, UseEmbedded, applyICC, ScImage::CMYKData, resolution, &dummy) )
+ if ( !image.LoadPicture(fn, c->pixm.imgInfo.actualPageNumber, cms, UseEmbedded, true, ScImage::CMYKData, resolution, &dummy) )
{
PS_Error_ImageLoadFailure(fn);
return false;
@@ -1821,7 +1821,6 @@
bool farb = options.useColor;
bool Hm = options.mirrorH;
bool Vm = options.mirrorV;
- bool applyICC = options.useICC;
bool doDev = options.setDevParam;
bool doClip = options.doClip;
QStack<PageItem*> groupStack;
@@ -1841,10 +1840,10 @@
PS_set_Info("Title", Doc->documentInfo.getTitle());
if (!farb)
PS_setGray();
- if ((Doc->HasCMS) && (ScCore->haveCMS()) && (applyICC))
+ if (Doc->HasCMS && ScCore->haveCMS())
solidTransform = ScColorMgmtEngine::createTransform(Doc->DocInputCMYKProf, Format_CMYK_16, Doc->DocPrinterProf, Format_CMYK_16, Doc->IntentColors, 0);
else
- applyICC = false;
+ solidTransform = ScColorTransform();
if (usingGUI)
{
QString title=QObject::tr("Exporting PostScript File");
@@ -3454,7 +3453,7 @@
if ((Options.doGCR) && (!farb.isRegistrationColor()))
ScColorEngine::applyGCR(tmp, m_Doc);
tmp.getCMYK(&h1, &s1, &v1, &k1);
- if ((m_Doc->HasCMS) && (ScCore->haveCMS()) && (applyICC))
+ if ((m_Doc->HasCMS) && (ScCore->haveCMS()) && (solidTransform))
{
h1 = qRound(h1 * shade / 100.0);
s1 = qRound(s1 * shade / 100.0);
Modified: branches/Version14x/Scribus/scribus/pslib.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/pslib.h
==============================================================================
--- branches/Version14x/Scribus/scribus/pslib.h (original)
+++ branches/Version14x/Scribus/scribus/pslib.h Wed Sep 16 00:12:10 2015
@@ -188,7 +188,6 @@
bool DoSep;
bool useSpotColors;
bool fillRule;
- bool applyICC;
ScColorTransform solidTransform;
QString currentSpot;
ColorList colorsToUse;
Modified: branches/Version14x/Scribus/scribus/scprintengine_gdi.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/scprintengine_gdi.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scprintengine_gdi.cpp (original)
+++ branches/Version14x/Scribus/scribus/scprintengine_gdi.cpp Wed Sep 16 00:12:10 2015
@@ -308,7 +308,7 @@
StartPage( printerDC );
#ifdef HAVE_ICM
- if ( options.useICC && isPostscriptPrinter(printerDC) )
+ if (isPostscriptPrinter(printerDC))
{
success = false;
QString mProf = doc->CMSSettings.DefaultSolidColorRGBProfile;
@@ -400,7 +400,7 @@
// Create the GDI painter
MarksOptions marksOptions(options);
- ScPageOutput pageOutput(doc, true, 300, options.useICC);
+ ScPageOutput pageOutput(doc, true, 300, true);
pageOutput.setMarksOptions(marksOptions);
QRect drawRect( 0, 0, physicalWidth, physicalHeight);
Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Wed Sep 16 00:12:10 2015
@@ -8006,7 +8006,6 @@
options.useColor = true;
options.mirrorH = false;
options.mirrorV = false;
- options.useICC = true;
options.doGCR = prefsManager->appPrefs.GCRMode;
options.setDevParam = false;
options.doClip = true;
Modified: branches/Version14x/Scribus/scribus/scribusstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/scribusstructs.h
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusstructs.h (original)
+++ branches/Version14x/Scribus/scribus/scribusstructs.h Wed Sep 16 00:12:10 2015
@@ -338,7 +338,6 @@
bool useColor;
bool mirrorH;
bool mirrorV;
- bool useICC;
bool doGCR;
bool doClip;
bool setDevParam;
Modified: branches/Version14x/Scribus/scribus/tabprinter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/tabprinter.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/tabprinter.cpp (original)
+++ branches/Version14x/Scribus/scribus/tabprinter.cpp Wed Sep 16 00:12:10 2015
@@ -34,7 +34,6 @@
psLevel->setToolTip("<qt>" + tr( "Sets the PostScript Level.\n Setting to Level 1 or 2 can create huge files" ) + "</qt>" );
doGCR->setToolTip( "<qt>" + tr( "A way of switching off some of the gray shades which are composed of cyan, yellow and magenta and using black instead. UCR most affects parts of images which are neutral and/or dark tones which are close to the gray. Use of this may improve printing some images and some experimentation and testing is need on a case by case basis. UCR reduces the possibility of over saturation with CMY inks." ) + "</qt>");
convertSpots->setToolTip("<qt>" + tr( "Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled." ) + "</qt>");
- useICC->setToolTip("<qt>" + tr( "Allows you to embed color profiles in the print stream when color management is enabled" ) + "</qt>");
setMedia->setToolTip( "<qt>" + tr( "This enables you to explicitely set the media size of the PostScript file. Not recommended unless requested by your printer." ) + "</qt>");
connect(useAltPrintCommand, SIGNAL(clicked()), this, SLOT(selOtherComm()));
}
@@ -94,10 +93,6 @@
printerCommand->setEnabled(false);
}
printerCommand->setText(prefs->get("Command", ""));
- bool iccInUse = prefs->getBool("ICCinUse", false);
- bool psPrinter = PrinterUtil::isPostscriptPrinter(defaultPrinter->currentText());
- useICC->setChecked( psPrinter ? iccInUse : false );
- useICC->setEnabled( psPrinter );
bool seps = static_cast<bool>(prefs->getInt("Separations", 0));
buttonNormal->setChecked(!seps);
buttonSeparations->setChecked(seps);
@@ -143,7 +138,7 @@
prefs->set("PSLevel", psLevel->currentIndex() + 1);
prefs->set("doDev", setMedia->isChecked());
prefs->set("doSpot", !convertSpots->isChecked());
- prefs->set("ICCinUse", useICC->isChecked());
+ prefs->set("ICCinUse", true);
prefs->set("BleedTop", bleedTop->value() / unitRatio);
prefs->set("BleedBottom", bleedBottom->value() / unitRatio);
prefs->set("BleedRight", bleedRight->value() / unitRatio);
Modified: branches/Version14x/Scribus/scribus/tabprinter.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20387&path=/branches/Version14x/Scribus/scribus/tabprinter.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/tabprinter.ui (original)
+++ branches/Version14x/Scribus/scribus/tabprinter.ui Wed Sep 16 00:12:10 2015
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>TabPrinter</class>
- <widget class="QWidget" name="TabPrinter" >
- <property name="geometry" >
+ <widget class="QWidget" name="TabPrinter">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,25 +10,25 @@
<height>536</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>TabPrinterBase</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="2" column="0" >
+ <item row="2" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>141</width>
<height>61</height>
@@ -35,58 +36,58 @@
</property>
</spacer>
</item>
- <item row="1" column="0" >
- <widget class="QTabWidget" name="tabOptions" >
- <property name="currentIndex" >
+ <item row="1" column="0">
+ <widget class="QTabWidget" name="tabOptions">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
<string>Options</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupPage" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupPage">
+ <property name="title">
<string>Page</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="mirrorH" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="mirrorH">
+ <property name="text">
<string>Mirror Page(s) Horizontal</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QCheckBox" name="mirrorV" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="mirrorV">
+ <property name="text">
<string>Mirror Page(s) Vertical</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="setMedia" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="setMedia">
+ <property name="text">
<string>Set Media Size</string>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QCheckBox" name="setClip" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="setClip">
+ <property name="text">
<string>Clip to Printer Margins</string>
</property>
</widget>
@@ -94,49 +95,49 @@
</layout>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
<string>PostScript Options</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="2" column="0" colspan="2" >
- <widget class="QRadioButton" name="printGray" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QRadioButton" name="printGray">
+ <property name="text">
<string>Print in Grayscale</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="printColor" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="printColor">
+ <property name="text">
<string>Print in Color if Available</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QComboBox" name="psLevel" >
+ <item row="0" column="0">
+ <widget class="QComboBox" name="psLevel">
<item>
- <property name="text" >
+ <property name="text">
<string>Level 1</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Level 2</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Level 3</string>
</property>
</item>
@@ -145,32 +146,32 @@
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>General</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QRadioButton" name="buttonNormal" >
- <property name="text" >
+ <widget class="QRadioButton" name="buttonNormal">
+ <property name="text">
<string>Print Normal</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="buttonSeparations" >
- <property name="text" >
+ <widget class="QRadioButton" name="buttonSeparations">
+ <property name="text">
<string>Print Separations</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="usePDFMarks" >
- <property name="text" >
+ <widget class="QCheckBox" name="usePDFMarks">
+ <property name="text">
<string>Include PDF Annotations and Links</string>
</property>
</widget>
@@ -178,183 +179,189 @@
</layout>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QGroupBox" name="groupColor" >
- <property name="title" >
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="groupColor">
+ <property name="title">
<string>Color</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="doGCR" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="convertSpots">
+ <property name="text">
+ <string>Convert Spot Colors to Process Colors</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="doGCR">
+ <property name="text">
<string>Apply Under Color Removal</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QCheckBox" name="convertSpots" >
- <property name="text" >
- <string>Convert Spot Colors to Process Colors</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="useICC" >
- <property name="text" >
- <string>Apply ICC Profiles</string>
- </property>
- </widget>
+ <item row="2" column="0">
+ <spacer name="verticalSpacer">
+ <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>
- <widget class="QWidget" name="TabPage" >
- <attribute name="title" >
+ <widget class="QWidget" name="TabPage">
+ <attribute name="title">
<string>Marks && Bleeds</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
<string>Bleed Settings</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="ScrSpinBox" native="1" name="bleedTop" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="bleedTop"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Top:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
<string>Bottom:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="ScrSpinBox" native="1" name="bleedBottom" />
- </item>
- <item row="0" column="2" >
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="bleedBottom"/>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
<string>Left:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="ScrSpinBox" native="1" name="bleedLeft" />
- </item>
- <item row="1" column="2" >
- <widget class="QLabel" name="textLabel6" >
- <property name="text" >
+ <item row="0" column="3">
+ <widget class="ScrSpinBox" name="bleedLeft"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="textLabel6">
+ <property name="text">
<string>Right:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="ScrSpinBox" native="1" name="bleedRight" />
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupMarks" >
- <property name="title" >
+ <item row="1" column="3">
+ <widget class="ScrSpinBox" name="bleedRight"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupMarks">
+ <property name="title">
<string>Printer Marks</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="1" colspan="2" >
- <widget class="QCheckBox" name="colorMarks" >
- <property name="toolTip" >
+ <item row="0" column="1" colspan="2">
+ <widget class="QCheckBox" name="colorMarks">
+ <property name="toolTip">
<string>Add color calibration bars</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Color Bars</string>
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="ScrSpinBox" native="1" name="offsetValue" />
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <item row="1" column="2">
+ <widget class="ScrSpinBox" name="offsetValue"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>Offset:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="registrationMarks" >
- <property name="toolTip" >
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="registrationMarks">
+ <property name="toolTip">
<string>Add registration marks which are added to each separation</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Registration Marks</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QCheckBox" name="bleedMarks" >
- <property name="toolTip" >
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="bleedMarks">
+ <property name="toolTip">
<string>This creates bleed marks which are indicated by _ . _ and show the bleed limit</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Bleed Marks</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="cropMarks" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="cropMarks">
+ <property name="toolTip">
<string>This creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Crop Marks</string>
</property>
</widget>
@@ -366,63 +373,63 @@
</widget>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="destinationGroup" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="destinationGroup">
+ <property name="title">
<string>Print Destination</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="1" column="0" colspan="2" >
- <widget class="QCheckBox" name="useAltPrintCommand" >
- <property name="text" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="useAltPrintCommand">
+ <property name="text">
<string>Alternative Printer Command</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="2" column="0" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>5</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>Command:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="printerCommand" />
+ <widget class="QLineEdit" name="printerCommand"/>
</item>
</layout>
</item>
- <item row="0" column="0" >
- <widget class="QComboBox" name="defaultPrinter" />
+ <item row="0" column="0">
+ <widget class="QComboBox" name="defaultPrinter"/>
</item>
- <item row="0" column="1" >
+ <item row="0" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>191</width>
<height>20</height>
@@ -435,11 +442,11 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="5" margin="10" />
+ <layoutdefault spacing="5" margin="10"/>
<customwidgets>
<customwidget>
<class>ScrSpinBox</class>
- <extends>QWidget</extends>
+ <extends>QDoubleSpinBox</extends>
<header>scrspinbox.h</header>
</customwidget>
</customwidgets>
@@ -460,7 +467,6 @@
<tabstop>setClip</tabstop>
<tabstop>doGCR</tabstop>
<tabstop>convertSpots</tabstop>
- <tabstop>useICC</tabstop>
<tabstop>cropMarks</tabstop>
<tabstop>bleedMarks</tabstop>
<tabstop>registrationMarks</tabstop>
More information about the scribus-commit
mailing list