Index: scribus/pdflib_core.cpp =================================================================== --- scribus/pdflib_core.cpp (révision 17391) +++ scribus/pdflib_core.cpp (copie de travail) @@ -2748,31 +2748,31 @@ { // Bottom Left PutPage("0 "+FToStr(markOffs+Options.bleeds.Bottom)+" m\n"); - PutPage(FToStr(20.0)+" "+FToStr(markOffs+Options.bleeds.Bottom)+" l\n"); + PutPage(FToStr(Options.cropMarkSize)+" "+FToStr(markOffs+Options.bleeds.Bottom)+" l\n"); PutPage("S\n"); PutPage(FToStr(markOffs+bleedLeft)+" 0 m\n"); - PutPage(FToStr(markOffs+bleedLeft)+" 20 l\n"); + PutPage(FToStr(markOffs+bleedLeft)+" "+ FToStr(Options.cropMarkSize) +" l\n"); PutPage("S\n"); // Top Left PutPage("0 "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" m\n"); - PutPage(FToStr(20.0)+" "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" l\n"); + PutPage(FToStr(Options.cropMarkSize)+" "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" l\n"); PutPage("S\n"); PutPage(FToStr(markOffs+bleedLeft)+" "+FToStr(maxBoxY)+" m\n"); - PutPage(FToStr(markOffs+bleedLeft)+" "+FToStr(maxBoxY-20.0)+" l\n"); + PutPage(FToStr(markOffs+bleedLeft)+" "+ FToStr(maxBoxY-Options.cropMarkSize) +" l\n"); PutPage("S\n"); // Bottom Right PutPage(FToStr(maxBoxX)+" "+FToStr(markOffs+Options.bleeds.Bottom)+" m\n"); - PutPage(FToStr(maxBoxX-20.0)+" "+FToStr(markOffs+Options.bleeds.Bottom)+" l\n"); + PutPage(FToStr(maxBoxX-Options.cropMarkSize)+" "+FToStr(markOffs+Options.bleeds.Bottom)+" l\n"); PutPage("S\n"); - PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+FToStr(0.0)+" m\n"); - PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+FToStr(20.0)+" l\n"); + PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" 0 m\n"); + PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+ FToStr(Options.cropMarkSize) +" l\n"); PutPage("S\n"); // Top Right PutPage(FToStr(maxBoxX)+" "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" m\n"); - PutPage(FToStr(maxBoxX-20.0)+" "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" l\n"); + PutPage(FToStr(maxBoxX-Options.cropMarkSize)+" "+FToStr(maxBoxY-Options.bleeds.Top-markOffs)+" l\n"); PutPage("S\n"); - PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+FToStr(maxBoxY)+" m\n"); - PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+FToStr(maxBoxY-20.0)+" l\n"); + PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+FToStr(maxBoxY)+" m\n"); + PutPage(FToStr(maxBoxX-bleedRight-markOffs)+" "+ FToStr(maxBoxY-Options.cropMarkSize) +" l\n"); PutPage("S\n"); } if (Options.bleedMarks) Index: scribus/prefsmanager.cpp =================================================================== --- scribus/prefsmanager.cpp (révision 17391) +++ scribus/prefsmanager.cpp (copie de travail) @@ -455,6 +455,7 @@ appPrefs.pdfPrefs.bleeds.Bottom = 0; appPrefs.pdfPrefs.useDocBleeds = true; appPrefs.pdfPrefs.cropMarks = false; + appPrefs.pdfPrefs.cropMarkSize = 20; appPrefs.pdfPrefs.bleedMarks = false; appPrefs.pdfPrefs.registrationMarks = false; appPrefs.pdfPrefs.colorMarks = false; @@ -1741,6 +1742,7 @@ pdf.setAttribute("BleedBottom", ScCLocale::toQStringC(appPrefs.pdfPrefs.bleeds.Bottom)); pdf.setAttribute("UseDocBleeds", static_cast(appPrefs.pdfPrefs.useDocBleeds)); pdf.setAttribute("CropMarks", static_cast(appPrefs.pdfPrefs.cropMarks)); + pdf.setAttribute("CropMarkSize", appPrefs.pdfPrefs.cropMarkSize); pdf.setAttribute("BleedMarks", static_cast(appPrefs.pdfPrefs.bleedMarks)); pdf.setAttribute("RegistrationMarks", static_cast(appPrefs.pdfPrefs.registrationMarks)); pdf.setAttribute("ColorMarks", static_cast(appPrefs.pdfPrefs.colorMarks)); @@ -2476,6 +2478,7 @@ appPrefs.pdfPrefs.bleeds.Bottom = ScCLocale::toDoubleC(dc.attribute("BleedBottom"), 0.0); appPrefs.pdfPrefs.useDocBleeds = static_cast(dc.attribute("UseDocBleeds", "1").toInt()); appPrefs.pdfPrefs.cropMarks = static_cast(dc.attribute("CropMarks", "0").toInt()); + appPrefs.pdfPrefs.cropMarkSize = ScCLocale::toDoubleC(dc.attribute("CropMarkSize"), 20.0); appPrefs.pdfPrefs.bleedMarks = static_cast(dc.attribute("BleedMarks", "0").toInt()); appPrefs.pdfPrefs.registrationMarks = static_cast(dc.attribute("RegistrationMarks", "0").toInt()); appPrefs.pdfPrefs.colorMarks = static_cast(dc.attribute("ColorMarks", "0").toInt()); Index: scribus/scpageoutput.h =================================================================== --- scribus/scpageoutput.h (révision 17391) +++ scribus/scpageoutput.h (copie de travail) @@ -42,6 +42,7 @@ double BleedLeft; double BleedRight; double BleedBottom; + double cropMarkSize; bool cropMarks; bool bleedMarks; bool registrationMarks; @@ -88,7 +89,7 @@ virtual void drawArrow(ScPainterExBase* painter, PageItem* item, QTransform &arrowTrans, int arrowIndex); virtual void drawMarks( ScPage* page, ScPainterExBase* painter, const MarksOptions& options ); - virtual void drawBoxMarks( ScPainterExBase* painter, const QRectF& box, const QRectF& bleedBox, double offset ); + virtual void drawBoxMarks( ScPainterExBase* painter, const QRectF& box, const QRectF& bleedBox, double offset , double markSize); virtual void drawRegistrationCross( ScPainterExBase* painter ); ScImage::RequestType translateImageModeToRequest( ScPainterExBase::ImageMode mode); Index: scribus/scribusstructs.h =================================================================== --- scribus/scribusstructs.h (révision 17391) +++ scribus/scribusstructs.h (copie de travail) @@ -225,6 +225,7 @@ bool setDevParam; bool useDocBleeds; bool cropMarks; + double cropMarkSize; bool bleedMarks; bool registrationMarks; bool colorMarks; Index: scribus/scpageoutput.cpp =================================================================== --- scribus/scpageoutput.cpp (révision 17391) +++ scribus/scpageoutput.cpp (copie de travail) @@ -44,6 +44,7 @@ BleedRight = 0.0; BleedBottom = 0.0; cropMarks = false; + cropMarkSize = 20.0; bleedMarks = false; registrationMarks = false; colorMarks = false; @@ -58,6 +59,7 @@ BleedRight = opt.bleeds.Right; BleedBottom = opt.bleeds.Bottom; cropMarks = opt.cropMarks; + cropMarkSize = opt.cropMarkSize; bleedMarks = opt.bleedMarks; registrationMarks = opt.registrationMarks; colorMarks = opt.colorMarks; @@ -1943,14 +1945,14 @@ FPoint start, end; double left = offsetX, right = offsetX + width; double bottom = offsetY + height, top = offsetY; - drawBoxMarks( painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs ); + drawBoxMarks( painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs , options.cropMarkSize); } if (options.bleedMarks) { FPoint start, end; double left = offsetX - bleedLeft, right = offsetX + width + bleedRight; double bottom = offsetY + height + bleedBottom, top = offsetY - bleedTop;; - drawBoxMarks( painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs ); + drawBoxMarks( painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs , 20.0); } if (options.registrationMarks) { @@ -2032,7 +2034,7 @@ painter->restore(); } -void ScPageOutput::drawBoxMarks( ScPainterExBase* painter, const QRectF& box, const QRectF& bleedBox, double offset ) +void ScPageOutput::drawBoxMarks( ScPainterExBase* painter, const QRectF& box, const QRectF& bleedBox, double offset , double markSize) { FPoint start, end; double left = box.left(), right = box.right(); @@ -2041,31 +2043,31 @@ double bleedBottom = bleedBox.bottom(), bleedTop = bleedBox.top(); // Top Left start.setXY( bleedLeft - offset, top ); - end.setXY ( bleedLeft - offset - 20, top ); + end.setXY ( bleedLeft - offset - markSize, top ); painter->drawLine(start, end); start.setXY( left, bleedTop - offset ); - end.setXY ( left, bleedTop - offset - 20); + end.setXY ( left, bleedTop - offset - markSize); painter->drawLine(start, end); // Top Right start.setXY( bleedRight + offset, top ); - end.setXY ( bleedRight + offset + 20, top ); + end.setXY ( bleedRight + offset + markSize, top ); painter->drawLine(start, end); start.setXY( right, bleedTop - offset ); - end.setXY ( right, bleedTop - offset - 20); + end.setXY ( right, bleedTop - offset - markSize); painter->drawLine(start, end); // Bottom Left start.setXY( bleedLeft - offset, bottom ); - end.setXY ( bleedLeft - offset - 20, bottom ); + end.setXY ( bleedLeft - offset - markSize, bottom ); painter->drawLine(start, end); start.setXY( left, bleedBottom + offset ); - end.setXY ( left, bleedBottom + offset + 20); + end.setXY ( left, bleedBottom + offset + markSize); painter->drawLine(start, end); // Bottom Right start.setXY( bleedRight + offset, bottom ); - end.setXY ( bleedRight + offset + 20, bottom ); + end.setXY ( bleedRight + offset + markSize, bottom ); painter->drawLine(start, end); start.setXY( right, bleedBottom + offset ); - end.setXY ( right, bleedBottom + offset + 20); + end.setXY ( right, bleedBottom + offset + markSize); painter->drawLine(start, end); } Index: scribus/pdfoptions.h =================================================================== --- scribus/pdfoptions.h (révision 17391) +++ scribus/pdfoptions.h (copie de travail) @@ -149,6 +149,7 @@ bool hideMenuBar; bool fitWindow; bool cropMarks; + double cropMarkSize; bool bleedMarks; bool registrationMarks; bool colorMarks; Index: scribus/ui/prefs_pdfexport.cpp =================================================================== --- scribus/ui/prefs_pdfexport.cpp (révision 17391) +++ scribus/ui/prefs_pdfexport.cpp (copie de travail) @@ -85,6 +85,7 @@ clipToPrinterMarginsCheckBox->setToolTip( "" + tr( "Do not show objects outside the margins in the exported file" ) + "" ); //PrePress tab printCropMarksCheckBox->setToolTip( "" + tr( "Creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing" ) + "" ); + printCropMarkSizeSpinBox->setToolTip( "" + tr( "Length of crop marks" ) + "" ); printBleedMarksCheckBox->setToolTip( "" + tr( "This creates bleed marks which are indicated by _ . _ and show the bleed limit" ) + "" ); printRegistrationMarksCheckBox->setToolTip( "" + tr( "Add registration marks to each separation" ) + "" ); printColorBarsCheckBox->setToolTip( "" + tr( "Add color calibration bars" ) + "" ); @@ -548,7 +549,9 @@ useDocumentBleedsCheckBox->hide(); registrationMarkOffsetSpinBox->setValue(prefsData->pdfPrefs.markOffset*unitRatio); + printCropMarkSizeSpinBox->setValue(prefsData->pdfPrefs.cropMarkSize*unitRatio); printCropMarksCheckBox->setChecked(prefsData->pdfPrefs.cropMarks); + printCropMarkSizeSpinBox->setEnabled(prefsData->pdfPrefs.cropMarks); printBleedMarksCheckBox->setChecked(prefsData->pdfPrefs.bleedMarks); printRegistrationMarksCheckBox->setChecked(prefsData->pdfPrefs.registrationMarks); printColorBarsCheckBox->setChecked(prefsData->pdfPrefs.colorMarks); @@ -674,6 +677,7 @@ prefsData->pdfPrefs.UseSpotColors = !convertSpotsToProcessCheckBox->isChecked(); prefsData->pdfPrefs.doMultiFile = false; prefsData->pdfPrefs.cropMarks = printCropMarksCheckBox->isChecked(); + prefsData->pdfPrefs.cropMarkSize = printCropMarkSizeSpinBox->value() / unitRatio; prefsData->pdfPrefs.bleedMarks = printBleedMarksCheckBox->isChecked(); prefsData->pdfPrefs.registrationMarks = printRegistrationMarksCheckBox->isChecked(); prefsData->pdfPrefs.colorMarks = printColorBarsCheckBox->isChecked(); Index: scribus/ui/tabpdfoptions.h =================================================================== --- scribus/ui/tabpdfoptions.h (révision 17391) +++ scribus/ui/tabpdfoptions.h (copie de travail) @@ -119,6 +119,7 @@ public slots: void doDocBleeds(); + void doCropMark(); void ToggleEncr(); void EnablePDFX(int a); void DoDownsample(); @@ -204,6 +205,7 @@ QCheckBox* colorMarks; QCheckBox* docInfoMarks; ScrSpinBox* markOffset; + ScrSpinBox* cropMarkSize; QGroupBox* CBox; QGridLayout* CBoxLayout; QGroupBox* ColorGroup; Index: scribus/ui/prefs_printerbase.ui =================================================================== --- scribus/ui/prefs_printerbase.ui (révision 17391) +++ scribus/ui/prefs_printerbase.ui (copie de travail) @@ -451,11 +451,46 @@ - - - Crop Marks - - + + + 0 + + + + Crop Marks + + + + + + + false + + + 1 + + + 100 + + + 20 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -594,5 +629,22 @@ - + + + cropMarksCheckBox + clicked(bool) + cropMarkSizeSpinBox + setEnabled(bool) + + + 55 + 485 + + + 128 + 485 + + + + Index: scribus/ui/printdialogbase.ui =================================================================== --- scribus/ui/printdialogbase.ui (révision 17391) +++ scribus/ui/printdialogbase.ui (copie de travail) @@ -437,17 +437,35 @@ Marks - - + + + + + + Offset: + + + + + + + Indicate the distance offset for the registration marks + + + + + + + - This creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing + Add color calibration bars - Crop Marks + Color Bars - + Add registration marks which are added to each separation @@ -457,7 +475,7 @@ - + This creates bleed marks which are indicated by _ . _ and show the bleed limit @@ -467,36 +485,18 @@ - - + + - Add color calibration bars + This creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing - Color Bars + Crop Marks - - - - - - Offset: - - - - - - - Indicate the distance offset for the registration marks - - - - - - - + + Qt::Horizontal @@ -508,6 +508,22 @@ + + + + false + + + 1 + + + 100 + + + 20 + + + @@ -707,5 +723,21 @@ + + cropMarks + clicked(bool) + cropMarkSize + setEnabled(bool) + + + 58 + 358 + + + 173 + 358 + + + Index: scribus/ui/printdialog.cpp =================================================================== --- scribus/ui/printdialog.cpp (révision 17391) +++ scribus/ui/printdialog.cpp (copie de travail) @@ -409,6 +409,7 @@ m_doc->Print_Options.bleeds.Right = BleedRight->value() / m_doc->unitRatio(); m_doc->Print_Options.bleeds.Bottom = BleedBottom->value() / m_doc->unitRatio(); m_doc->Print_Options.markOffset = markOffset->value() / m_doc->unitRatio(); + m_doc->Print_Options.cropMarkSize = cropMarkSize->value() / m_doc->unitRatio(); m_doc->Print_Options.cropMarks = cropMarks->isChecked(); m_doc->Print_Options.bleedMarks = bleedMarks->isChecked(); m_doc->Print_Options.registrationMarks = registrationMarks->isChecked(); @@ -466,6 +467,7 @@ options.useDocBleeds = true; options.bleeds=*m_doc->bleeds(); options.markOffset = prefs->getDouble("markOffset",0.0); + options.cropMarkSize = prefs->getDouble("cropMarkSize",20.0); options.cropMarks = prefs->getBool("cropMarks", false); options.bleedMarks = prefs->getBool("bleedMarks", false); options.registrationMarks = prefs->getBool("registrationMarks", false); @@ -546,7 +548,9 @@ BleedRight->setEnabled(!docBleeds->isChecked()); BleedLeft->setEnabled(!docBleeds->isChecked()); markOffset->setValue(m_doc->Print_Options.markOffset*unitRatio); + cropMarkSize->setValue(m_doc->Print_Options.cropMarkSize*unitRatio); cropMarks->setChecked(m_doc->Print_Options.cropMarks); + cropMarkSize->setEnabled(m_doc->Print_Options.cropMarks); bleedMarks->setChecked(m_doc->Print_Options.bleedMarks); registrationMarks->setChecked(m_doc->Print_Options.registrationMarks); colorMarks->setChecked(m_doc->Print_Options.colorMarks); Index: scribus/ui/pdfopts.cpp =================================================================== --- scribus/ui/pdfopts.cpp (révision 17391) +++ scribus/ui/pdfopts.cpp (copie de travail) @@ -272,6 +272,7 @@ Opts.bleeds.Bottom = Options->BleedBottom->value()/docUnitRatio; } Opts.markOffset = Options->markOffset->value()/docUnitRatio; + Opts.cropMarkSize = Options->cropMarkSize->value()/docUnitRatio; Opts.cropMarks = Options->cropMarks->isChecked(); Opts.bleedMarks = Options->bleedMarks->isChecked(); Opts.registrationMarks = Options->registrationMarks->isChecked(); Index: scribus/ui/preview.cpp =================================================================== --- scribus/ui/preview.cpp (révision 17391) +++ scribus/ui/preview.cpp (copie de travail) @@ -599,6 +599,7 @@ options.setDevParam = false; options.doClip = ClipMarg->isChecked(); options.cropMarks = false; + options.cropMarkSize = 20.0; options.bleedMarks = false; options.registrationMarks = false; options.colorMarks = false; @@ -711,6 +712,7 @@ options.setDevParam = false; options.doClip = ClipMarg->isChecked(); options.cropMarks = false; + options.cropMarkSize = 20.0; options.bleedMarks = false; options.registrationMarks = false; options.colorMarks = false; Index: scribus/ui/tabpdfoptions.cpp =================================================================== --- scribus/ui/tabpdfoptions.cpp (révision 17391) +++ scribus/ui/tabpdfoptions.cpp (copie de travail) @@ -800,14 +800,18 @@ MarkGroupLayout->setSpacing( 5 ); MarkGroupLayout->setMargin( 10 ); MarkGroupLayout->setAlignment( Qt::AlignTop ); - cropMarks = new QCheckBox( tr( "Crop Marks" ), MarkGroup ); - MarkGroupLayout->addWidget( cropMarks, 0, 0 ); + colorMarks = new QCheckBox( tr( "Color Bars" ), MarkGroup); + MarkGroupLayout->addWidget( colorMarks, 0, 0 ); bleedMarks = new QCheckBox( tr( "Bleed Marks" ), MarkGroup ); MarkGroupLayout->addWidget( bleedMarks, 1, 0 ); registrationMarks = new QCheckBox( tr( "Registration Marks" ), MarkGroup ); - MarkGroupLayout->addWidget( registrationMarks, 2, 0 ); - colorMarks = new QCheckBox( tr( "Color Bars" ), MarkGroup); - MarkGroupLayout->addWidget( colorMarks, 0, 1, 1, 2 ); + MarkGroupLayout->addWidget( registrationMarks, 2, 0 ); + cropMarks = new QCheckBox( tr( "Crop Marks" ), MarkGroup ); + MarkGroupLayout->addWidget( cropMarks, 0, 1 ); + cropMarkSize = new ScrSpinBox( MarkGroup, unitIndex ); + MarkGroupLayout->addWidget( cropMarkSize, 0, 2 ); + cropMarkSize->setMinimum(1); + cropMarkSize->setMaximum(100); docInfoMarks = new QCheckBox( tr( "Page Information" ), MarkGroup ); MarkGroupLayout->addWidget( docInfoMarks, 1, 1, 1, 2 ); MarkTxt1 = new QLabel( MarkGroup ); @@ -908,6 +912,7 @@ connect(InfoString, SIGNAL(textChanged(const QString &)), this, SLOT(checkInfo())); connect(InfoString, SIGNAL(editingFinished()), this, SLOT(checkInfo())); connect(docBleeds, SIGNAL(clicked()), this, SLOT(doDocBleeds())); + connect(cropMarks, SIGNAL(clicked()), this, SLOT(doCropMark())); EmbedFonts->setToolTip( "" + tr( "Embed fonts into the PDF. Embedding the fonts will preserve the layout and appearance of your document." ) + ""); CheckBox10->setToolTip( "" + tr( "Enables presentation effects when using Adobe® Reader® and other PDF viewers which support this in full screen mode." ) + ""); PagePrev->setToolTip( "" + tr( "Show page previews of each page listed above." ) + ""); @@ -992,6 +997,7 @@ ClipMarg->setToolTip( "" + tr( "Do not show objects outside the margins in the exported file" ) + "" ); //PrePress tab cropMarks->setToolTip( "" + tr( "Creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing" ) + "" ); + cropMarkSize->setToolTip( "" + tr( "Indicate the size of crops'marks" ) + "" ); bleedMarks->setToolTip( "" + tr( "This creates bleed marks which are indicated by _ . _ and show the bleed limit" ) + "" ); registrationMarks->setToolTip( "" + tr( "Add registration marks to each separation" ) + "" ); colorMarks->setToolTip( "" + tr( "Add color calibration bars" ) + "" ); @@ -1381,7 +1387,9 @@ doDocBleeds(); } markOffset->setValue(Opts.markOffset*unitRatio); + cropMarkSize->setValue(Opts.cropMarkSize*unitRatio); cropMarks->setChecked(Opts.cropMarks); + doCropMark(); bleedMarks->setChecked(Opts.bleedMarks); registrationMarks->setChecked(Opts.registrationMarks); colorMarks->setChecked(Opts.colorMarks); @@ -1459,6 +1467,7 @@ pdfOptions.UseSpotColors = !useSpot->isChecked(); pdfOptions.doMultiFile = false; pdfOptions.cropMarks = cropMarks->isChecked(); + pdfOptions.cropMarkSize = cropMarkSize->value() / unitRatio; pdfOptions.bleedMarks = bleedMarks->isChecked(); pdfOptions.registrationMarks = registrationMarks->isChecked(); pdfOptions.colorMarks = colorMarks->isChecked(); @@ -1563,6 +1572,11 @@ BleedLeft->setEnabled(true); } } + +void TabPDFOptions::doCropMark() +{ + cropMarkSize->setEnabled(cropMarks->isChecked()); +} void TabPDFOptions::checkInfo() { Index: scribus/ui/prefs_printer.cpp =================================================================== --- scribus/ui/prefs_printer.cpp (révision 17391) +++ scribus/ui/prefs_printer.cpp (copie de travail) @@ -91,7 +91,9 @@ prefs->getDouble("BleedLeft",0.0)*unitRatio); bleedsWidget->setup(bleeds, 0, 0, false, false); markOffsetSpinBox->setValue(prefs->getDouble("markOffset",0.0)*unitRatio); - bleedMarksCheckBox->setChecked(prefs->getBool("cropMarks", false)); + cropMarksCheckBox->setChecked(prefs->getBool("cropMarks", false)); + cropMarkSizeSpinBox->setValue(prefs->getDouble("cropMarkSize",20.0)); + cropMarkSizeSpinBox->setEnabled(prefs->getBool("cropMarks", false)); bleedMarksCheckBox->setChecked(prefs->getBool("bleedMarks", false)); registrationMarksCheckBox->setChecked(prefs->getBool("registrationMarks", false)); colorBarsCheckBox->setChecked(prefs->getBool("colorMarks", false)); @@ -128,6 +130,7 @@ prefs->set("BleedLeft", bleeds.Left / unitRatio); prefs->set("markOffset", markOffsetSpinBox->value() / unitRatio); prefs->set("cropMarks", cropMarksCheckBox->isChecked()); + prefs->set("cropMarkSize", cropMarkSizeSpinBox->value() / unitRatio); prefs->set("bleedMarks", bleedMarksCheckBox->isChecked()); prefs->set("registrationMarks", registrationMarksCheckBox->isChecked()); prefs->set("colorMarks", colorBarsCheckBox->isChecked()); Index: scribus/ui/prefs_pdfexportbase.ui =================================================================== --- scribus/ui/prefs_pdfexportbase.ui (révision 17391) +++ scribus/ui/prefs_pdfexportbase.ui (copie de travail) @@ -261,8 +261,8 @@ 0 0 - 563 - 456 + 317 + 409 @@ -685,8 +685,8 @@ 0 0 - 563 - 638 + 240 + 541 @@ -1012,8 +1012,8 @@ 0 0 - 563 - 470 + 624 + 446 @@ -1039,7 +1039,24 @@ + + QFormLayout::ExpandingFieldsGrow + + + + + Bleed Marks + + + + + + Color Bars + + + + Page Information @@ -1053,36 +1070,48 @@ - - - - + Registration Mark Offset: - - - - Crop Marks - - + + - - - - Bleed Marks + + + + 0 - - - - - - Color Bars + + 0 - + + + + Crop Marks + + + + + + + false + + + 1 + + + 100 + + + 20 + + + + @@ -1783,7 +1812,24 @@ - + + + printCropMarksCheckBox + clicked(bool) + printCropMarkSizeSpinBox + setEnabled(bool) + + + 61 + 113 + + + 134 + 113 + + + + Index: scribus/scribus.cpp =================================================================== --- scribus/scribus.cpp (révision 17391) +++ scribus/scribus.cpp (copie de travail) @@ -7896,6 +7896,7 @@ options.setDevParam = false; options.doClip = true; options.cropMarks = false; + options.cropMarkSize = 20.0; options.bleedMarks = false; options.registrationMarks = false; options.colorMarks = false; Index: scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp =================================================================== --- scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (révision 17391) +++ scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (copie de travail) @@ -1000,6 +1000,7 @@ docu.writeAttribute("setDevParam", static_cast(m_Doc->Print_Options.setDevParam)); docu.writeAttribute("useDocBleeds", static_cast(m_Doc->Print_Options.useDocBleeds)); docu.writeAttribute("cropMarks", static_cast(m_Doc->Print_Options.cropMarks)); + docu.writeAttribute("cropMarkSize" , m_Doc->Print_Options.cropMarkSize); docu.writeAttribute("bleedMarks", static_cast(m_Doc->Print_Options.bleedMarks)); docu.writeAttribute("registrationMarks", static_cast(m_Doc->Print_Options.registrationMarks)); docu.writeAttribute("colorMarks", static_cast(m_Doc->Print_Options.colorMarks)); @@ -1059,6 +1060,7 @@ docu.writeAttribute("BBottom", m_Doc->pdfOptions().bleeds.Bottom); docu.writeAttribute("useDocBleeds", static_cast(m_Doc->pdfOptions().useDocBleeds)); docu.writeAttribute("cropMarks", static_cast(m_Doc->pdfOptions().cropMarks)); + docu.writeAttribute("cropMarkSize", m_Doc->pdfOptions().cropMarkSize); docu.writeAttribute("bleedMarks", static_cast(m_Doc->pdfOptions().bleedMarks)); docu.writeAttribute("registrationMarks", static_cast(m_Doc->pdfOptions().registrationMarks)); docu.writeAttribute("colorMarks", static_cast(m_Doc->pdfOptions().colorMarks)); Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp =================================================================== --- scribus/plugins/fileloader/scribus150format/scribus150format.cpp (révision 17391) +++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp (copie de travail) @@ -2853,6 +2853,7 @@ doc->pdfOptions().bleeds.Bottom = attrs.valueAsDouble("BBottom", 0.0); doc->pdfOptions().useDocBleeds = attrs.valueAsBool("useDocBleeds", true); doc->pdfOptions().cropMarks = attrs.valueAsBool("cropMarks", false); + doc->pdfOptions().cropMarkSize = attrs.valueAsDouble("cropMarkSize", 20.0); doc->pdfOptions().bleedMarks = attrs.valueAsBool("bleedMarks", false); doc->pdfOptions().registrationMarks = attrs.valueAsBool("registrationMarks", false); doc->pdfOptions().colorMarks = attrs.valueAsBool("colorMarks", false); @@ -2940,6 +2941,7 @@ doc->Print_Options.setDevParam = attrs.valueAsBool("setDevParam"); doc->Print_Options.useDocBleeds = attrs.valueAsBool("useDocBleeds"); doc->Print_Options.cropMarks = attrs.valueAsBool("cropMarks"); + doc->Print_Options.cropMarkSize = attrs.valueAsDouble("cropMarkSize"); doc->Print_Options.bleedMarks = attrs.valueAsBool("bleedMarks"); doc->Print_Options.registrationMarks = attrs.valueAsBool("registrationMarks"); doc->Print_Options.colorMarks = attrs.valueAsBool("colorMarks"); Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp =================================================================== --- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (révision 17391) +++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (copie de travail) @@ -627,6 +627,7 @@ docu.writeAttribute("setDevParam", static_cast(m_Doc->Print_Options.setDevParam)); docu.writeAttribute("useDocBleeds", static_cast(m_Doc->Print_Options.useDocBleeds)); docu.writeAttribute("cropMarks", static_cast(m_Doc->Print_Options.cropMarks)); + docu.writeAttribute("cropMarkSize" , m_Doc->Print_Options.cropMarkSize); docu.writeAttribute("bleedMarks", static_cast(m_Doc->Print_Options.bleedMarks)); docu.writeAttribute("registrationMarks", static_cast(m_Doc->Print_Options.registrationMarks)); docu.writeAttribute("colorMarks", static_cast(m_Doc->Print_Options.colorMarks)); @@ -686,6 +687,7 @@ docu.writeAttribute("BBottom", m_Doc->pdfOptions().bleeds.Bottom); docu.writeAttribute("useDocBleeds", static_cast(m_Doc->pdfOptions().useDocBleeds)); docu.writeAttribute("cropMarks", static_cast(m_Doc->pdfOptions().cropMarks)); + docu.writeAttribute("cropMarkSize", m_Doc->pdfOptions().cropMarkSize); docu.writeAttribute("bleedMarks", static_cast(m_Doc->pdfOptions().bleedMarks)); docu.writeAttribute("registrationMarks", static_cast(m_Doc->pdfOptions().registrationMarks)); docu.writeAttribute("colorMarks", static_cast(m_Doc->pdfOptions().colorMarks)); Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp =================================================================== --- scribus/plugins/fileloader/scribus134format/scribus134format.cpp (révision 17391) +++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp (copie de travail) @@ -1509,6 +1509,7 @@ doc->pdfOptions().bleeds.Bottom = attrs.valueAsDouble("BBottom", 0.0); doc->pdfOptions().useDocBleeds = attrs.valueAsBool("useDocBleeds", true); doc->pdfOptions().cropMarks = attrs.valueAsBool("cropMarks", false); + doc->pdfOptions().cropMarkSize = attrs.valueAsDouble("cropMarkSize", 20.0); doc->pdfOptions().bleedMarks = attrs.valueAsBool("bleedMarks", false); doc->pdfOptions().registrationMarks = attrs.valueAsBool("registrationMarks", false); doc->pdfOptions().colorMarks = attrs.valueAsBool("colorMarks", false); @@ -1595,6 +1596,7 @@ doc->Print_Options.setDevParam = attrs.valueAsBool("setDevParam"); doc->Print_Options.useDocBleeds = attrs.valueAsBool("useDocBleeds"); doc->Print_Options.cropMarks = attrs.valueAsBool("cropMarks"); + doc->Print_Options.cropMarkSize = attrs.valueAsDouble("cropMarkSize"); doc->Print_Options.bleedMarks = attrs.valueAsBool("bleedMarks"); doc->Print_Options.registrationMarks = attrs.valueAsBool("registrationMarks"); doc->Print_Options.colorMarks = attrs.valueAsBool("colorMarks"); Index: scribus/pslib.cpp =================================================================== --- scribus/pslib.cpp (révision 17391) +++ scribus/pslib.cpp (copie de travail) @@ -670,31 +670,31 @@ { // Bottom Left PutStream("0 "+ToStr(markOffs+Options.bleeds.Bottom)+" m\n"); - PutStream(ToStr(20.0)+" "+ToStr(markOffs+Options.bleeds.Bottom)+" li\n"); + PutStream(ToStr(Options.cropMarkSize)+" "+ToStr(markOffs+Options.bleeds.Bottom)+" li\n"); PutStream("st\n"); PutStream(ToStr(markOffs+bleedLeft)+" 0 m\n"); - PutStream(ToStr(markOffs+bleedLeft)+" 20 li\n"); + PutStream(ToStr(markOffs+bleedLeft)+" " + ToStr(Options.cropMarkSize) + " li\n"); PutStream("st\n"); // Top Left PutStream("0 "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" m\n"); - PutStream(ToStr(20.0)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" li\n"); + PutStream(ToStr(Options.cropMarkSize)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" li\n"); PutStream("st\n"); PutStream(ToStr(markOffs+bleedLeft)+" "+ToStr(maxBoxY)+" m\n"); - PutStream(ToStr(markOffs+bleedLeft)+" "+ToStr(maxBoxY-20.0)+" li\n"); + PutStream(ToStr(markOffs+bleedLeft)+" "+ToStr(maxBoxY-Options.cropMarkSize)+" li\n"); PutStream("st\n"); // Bottom Right PutStream(ToStr(maxBoxX)+" "+ToStr(markOffs+Options.bleeds.Bottom)+" m\n"); - PutStream(ToStr(maxBoxX-20.0)+" "+ToStr(markOffs+Options.bleeds.Bottom)+" li\n"); + PutStream(ToStr(maxBoxX-Options.cropMarkSize)+" "+ToStr(markOffs+Options.bleeds.Bottom)+" li\n"); PutStream("st\n"); PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(0.0)+" m\n"); - PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(20.0)+" li\n"); + PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(Options.cropMarkSize)+" li\n"); PutStream("st\n"); // Top Right PutStream(ToStr(maxBoxX)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" m\n"); - PutStream(ToStr(maxBoxX-20.0)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" li\n"); + PutStream(ToStr(maxBoxX-Options.cropMarkSize)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs)+" li\n"); PutStream("st\n"); PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(maxBoxY)+" m\n"); - PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(maxBoxY-20.0)+" li\n"); + PutStream(ToStr(maxBoxX-bleedRight-markOffs)+" "+ToStr(maxBoxY-Options.cropMarkSize)+" li\n"); PutStream("st\n"); } if (Options.bleedMarks)