r16357 by petr - #7563: Preflight checker: report underfull image frames
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 14 10:25:17 CET 2011
Author: petr
Date: Mon Feb 14 09:25:17 2011
New Revision: 16357
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16357
Log:
#7563: Preflight checker: report underfull image frames
Modified:
trunk/Scribus/scribus/documentchecker.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/prefsstructs.h
trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui
Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp (original)
+++ trunk/Scribus/scribus/documentchecker.cpp Mon Feb 14 09:25:17 2011
@@ -5,20 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
- begin : 2005
- copyright : (C) 2005 by Franz Schmid
- email : Franz.Schmid at altmuehlnet.de
- copyright : (C) 2005 by Craig Bradney
- email : cbradney at zip.com.au
+ begin : 2005
+ copyright : (C) 2005 by Franz Schmid
+ email : Franz.Schmid at altmuehlnet.de
+ copyright : (C) 2005 by Craig Bradney
+ email : cbradney at zip.com.au
***************************************************************************/
/***************************************************************************
-* *
+* *
* ScMW program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
***************************************************************************/
#include "commonstrings.h"
@@ -36,6 +36,16 @@
#include <QList>
+
+bool isPartFilledImageFrame(PageItem * currItem)
+{
+ //qDebug() << "X" << currItem->width() << currItem->imageXScale() / 72.0 * currItem->pixm.imgInfo.xres * currItem->pixm.width();
+ //qDebug() << "Y" << currItem->height() << currItem->imageYScale() / 72.0 * currItem->pixm.imgInfo.yres * currItem->pixm.height();
+ return (currItem->height() > currItem->imageYScale() / 72.0 * currItem->pixm.imgInfo.yres * currItem->pixm.height()
+ || currItem->width() > currItem->imageXScale() / 72.0 * currItem->pixm.imgInfo.xres * currItem->pixm.width());
+}
+
+
bool DocumentChecker::checkDocument(ScribusDoc *currDoc)
{
QString chstr;
@@ -47,6 +57,7 @@
checkerSettings.checkOverflow = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkOverflow;
checkerSettings.checkPictures = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkPictures;
checkerSettings.checkResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkResolution;
+ checkerSettings.checkPartFilledImageFrames = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkPartFilledImageFrames;
checkerSettings.checkTransparency = currDoc->checkerProfiles()[currDoc->curCheckProfile()].checkTransparency;
checkerSettings.minResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].minResolution;
checkerSettings.maxResolution = currDoc->checkerProfiles()[currDoc->curCheckProfile()].maxResolution;
@@ -167,6 +178,13 @@
if (currItem->asImageFrame())
#endif
{
+
+ // check image vs. frame sizes
+ if (checkerSettings.checkPartFilledImageFrames && isPartFilledImageFrame(currItem))
+ {
+ itemError.insert(PartFilledImageFrame, 0);
+ }
+
if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures))
itemError.insert(MissingImage, 0);
else
@@ -184,14 +202,6 @@
if ((ext == "gif") && (checkerSettings.checkForGIF))
itemError.insert(ImageIsGIF, 0);
- //qDebug() << "MASTER: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width();
- // check image vs. frame sizes
- if (currItem->height() > currItem->imageYScale() * currItem->pixm.height()
- || currItem->width() > currItem->imageXScale() * currItem->pixm.width())
- {
- itemError.insert(PartFilledImageFrame, 0);
- }
-
if (extensionIndicatesPDF(ext))
{
PDFAnalyzer analyst(currItem->Pfile);
@@ -439,6 +449,13 @@
if (currItem->asImageFrame())
#endif
{
+
+ // check image vs. frame sizes
+ if (checkerSettings.checkPartFilledImageFrames && isPartFilledImageFrame(currItem))
+ {
+ itemError.insert(PartFilledImageFrame, 0);
+ }
+
if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures))
itemError.insert(MissingImage, 0);
else
@@ -455,14 +472,6 @@
itemError.insert(PlacedPDF, 0);
if ((ext == "gif") && (checkerSettings.checkForGIF))
itemError.insert(ImageIsGIF, 0);
-
- //qDebug() << "REGULAR: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width();
- // check image vs. frame sizes
- if (currItem->height() > currItem->imageYScale() * currItem->pixm.height()
- || currItem->width() > currItem->imageXScale() * currItem->pixm.width())
- {
- itemError.insert(PartFilledImageFrame, 0);
- }
if (extensionIndicatesPDF(ext))
{
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Mon Feb 14 09:25:17 2011
@@ -1080,6 +1080,7 @@
checkerSettings.checkOrphans = attrs.valueAsBool("checkOrphans", true);
checkerSettings.checkOverflow = attrs.valueAsBool("checkOverflow", true);
checkerSettings.checkPictures = attrs.valueAsBool("checkPictures", true);
+ checkerSettings.checkPartFilledImageFrames = attrs.valueAsBool("checkPartFilledImageFrames", false);
checkerSettings.checkResolution = attrs.valueAsBool("checkResolution", true);
checkerSettings.checkTransparency = attrs.valueAsBool("checkTransparency", true);
checkerSettings.minResolution = attrs.valueAsDouble("minResolution", 72.0);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp Mon Feb 14 09:25:17 2011
@@ -291,6 +291,7 @@
docu.writeAttribute("checkOrphans", static_cast<int>(itcp.value().checkOrphans));
docu.writeAttribute("checkOverflow", static_cast<int>(itcp.value().checkOverflow));
docu.writeAttribute("checkPictures", static_cast<int>(itcp.value().checkPictures));
+ docy.writeAttribute("checkPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames));
docu.writeAttribute("checkResolution", static_cast<int>(itcp.value().checkResolution));
docu.writeAttribute("checkTransparency", static_cast<int>(itcp.value().checkTransparency));
docu.writeAttribute("minResolution",itcp.value().minResolution);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Mon Feb 14 09:25:17 2011
@@ -483,6 +483,7 @@
checkerSettings.checkOrphans = static_cast<bool>(pg.attribute("checkOrphans", "1").toInt());
checkerSettings.checkOverflow = static_cast<bool>(pg.attribute("checkOverflow", "1").toInt());
checkerSettings.checkPictures = static_cast<bool>(pg.attribute("checkPictures", "1").toInt());
+ checkerSettings.checkPartFilledImageFrames = static_cast<bool>(pg.attribute("checkPartFilledImageFrames", "0").toInt());
checkerSettings.checkResolution = static_cast<bool>(pg.attribute("checkResolution", "1").toInt());
checkerSettings.checkTransparency = static_cast<bool>(pg.attribute("checkTransparency", "1").toInt());
checkerSettings.minResolution = ScCLocale::toDoubleC(pg.attribute("minResolution"), 72.0);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Mon Feb 14 09:25:17 2011
@@ -1846,6 +1846,7 @@
checkerSettings.checkOrphans = attrs.valueAsBool("checkOrphans", true);
checkerSettings.checkOverflow = attrs.valueAsBool("checkOverflow", true);
checkerSettings.checkPictures = attrs.valueAsBool("checkPictures", true);
+ checkerSettings.checkPartFilledImageFrames = attrs.valueAsBool("checkPartFilledImageFrames", false);
checkerSettings.checkResolution = attrs.valueAsBool("checkResolution", true);
checkerSettings.checkTransparency = attrs.valueAsBool("checkTransparency", true);
checkerSettings.minResolution = attrs.valueAsDouble("minResolution", 72.0);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Mon Feb 14 09:25:17 2011
@@ -389,6 +389,7 @@
docu.writeAttribute("checkOrphans", static_cast<int>(itcp.value().checkOrphans));
docu.writeAttribute("checkOverflow", static_cast<int>(itcp.value().checkOverflow));
docu.writeAttribute("checkPictures", static_cast<int>(itcp.value().checkPictures));
+ docu.writeAttribute("checkPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames));
docu.writeAttribute("checkResolution", static_cast<int>(itcp.value().checkResolution));
docu.writeAttribute("checkTransparency", static_cast<int>(itcp.value().checkTransparency));
docu.writeAttribute("minResolution",itcp.value().minResolution);
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Mon Feb 14 09:25:17 2011
@@ -5,17 +5,17 @@
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
- copyright : (C) 2005 by Craig Bradney
- email : cbradney at zip.com.au
+ copyright : (C) 2005 by Craig Bradney
+ email : cbradney at zip.com.au
***************************************************************************/
/***************************************************************************
-* *
+* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
***************************************************************************/
#include <QColor>
@@ -119,7 +119,7 @@
if (importingFrom12)
convert12Preferences();
//<<CB TODO Reset keyboard shortcuts of all 1.3 users as too many
- // have conflicts if they dont nuke their settings.
+ // have conflicts if they dont nuke their settings.
// - Remove for 1.3.0 release: importingFrom12=true;
//>>CB
}
@@ -1573,6 +1573,7 @@
dcVerifierProfile.setAttribute("CheckOverflow", static_cast<int>(itcp.value().checkOverflow));
dcVerifierProfile.setAttribute("CheckPictures", static_cast<int>(itcp.value().checkPictures));
dcVerifierProfile.setAttribute("CheckResolution", static_cast<int>(itcp.value().checkResolution));
+ dcVerifierProfile.setAttribute("CheckPartFilledImageFrames", static_cast<int>(itcp.value().checkPartFilledImageFrames));
dcVerifierProfile.setAttribute("CheckTransparency", static_cast<int>(itcp.value().checkTransparency));
dcVerifierProfile.setAttribute("CheckAnnotations", static_cast<int>(itcp.value().checkAnnotations));
dcVerifierProfile.setAttribute("CheckRasterPDF", static_cast<int>(itcp.value().checkRasterPDF));
@@ -1897,11 +1898,11 @@
appPrefs.docSetupPrefs.margins.Left = ScCLocale::toDoubleC(dc.attribute("MarginLeft"), 9.0);
appPrefs.docSetupPrefs.margins.Right = ScCLocale::toDoubleC(dc.attribute("MarginRight"), 9.0);
appPrefs.docSetupPrefs.marginPreset = dc.attribute("MarginPreset", "0").toInt();
- appPrefs.docSetupPrefs.pagePositioning = dc.attribute("PagePositioning", "0").toInt();
- appPrefs.docSetupPrefs.AutoSave = static_cast<bool>(dc.attribute("AutoSave", "0").toInt());
+ appPrefs.docSetupPrefs.pagePositioning = dc.attribute("PagePositioning", "0").toInt();
+ appPrefs.docSetupPrefs.AutoSave = static_cast<bool>(dc.attribute("AutoSave", "0").toInt());
appPrefs.docSetupPrefs.AutoSaveTime = dc.attribute("AutoSaveTime", "600000").toInt();
appPrefs.docSetupPrefs.saveCompressed = static_cast<bool>(dc.attribute("SaveCompressed", "0").toInt());
- appPrefs.docSetupPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0);
+ appPrefs.docSetupPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0);
appPrefs.docSetupPrefs.bleeds.Left = ScCLocale::toDoubleC(dc.attribute("BleedLeft"), 0.0);
appPrefs.docSetupPrefs.bleeds.Right = ScCLocale::toDoubleC(dc.attribute("BleedRight"), 0.0);
appPrefs.docSetupPrefs.bleeds.Bottom = ScCLocale::toDoubleC(dc.attribute("BleedBottom"), 0.0);
@@ -1921,9 +1922,9 @@
appPrefs.displayPrefs.scratch.Bottom = ScCLocale::toDoubleC(dc.attribute("ScratchBottom"), 20.0);
appPrefs.displayPrefs.scratch.Left = ScCLocale::toDoubleC(dc.attribute("ScratchLeft"), 100.0);
appPrefs.displayPrefs.scratch.Right = ScCLocale::toDoubleC(dc.attribute("ScratchRight"), 100.0);
- appPrefs.displayPrefs.scratch.Top = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0);
+ appPrefs.displayPrefs.scratch.Top = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0);
appPrefs.displayPrefs.pageGapHorizontal = ScCLocale::toDoubleC(dc.attribute("PageGapHorizontal"), 0.0);
- appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(dc.attribute("PageGapVertical"), 40.0);
+ appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(dc.attribute("PageGapVertical"), 40.0);
appPrefs.displayPrefs.showPageShadow = static_cast<bool>(dc.attribute("ShowPageShadow", "1").toInt());
appPrefs.displayPrefs.paperColor = QColor(dc.attribute("PageColor"));
if (dc.hasAttribute("ScratchColor"))
@@ -2050,7 +2051,7 @@
appPrefs.itemToolPrefs.textDistances.Right = ScCLocale::toDoubleC(dc.attribute("TextDistanceRight"), 0.0);
appPrefs.itemToolPrefs.shapeLineStyle = dc.attribute("ShapeLineStyle").toInt();
appPrefs.itemToolPrefs.lineStyle = dc.attribute("LineStyle").toInt();
- appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("ShapeLineWidth"), 1.0);
+ appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("ShapeLineWidth"), 1.0);
appPrefs.itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("LineWidth"), 1.0);
appPrefs.itemToolPrefs.shapeLineColorShade = dc.attribute("ShapeLineColorShade").toInt();
appPrefs.itemToolPrefs.lineColorShade = dc.attribute("LineColorShade").toInt();
@@ -2261,6 +2262,7 @@
checkerSettings.checkOverflow = static_cast<bool>(dc.attribute("CheckOverflow", "1").toInt());
checkerSettings.checkPictures = static_cast<bool>(dc.attribute("CheckPictures", "1").toInt());
checkerSettings.checkResolution = static_cast<bool>(dc.attribute("CheckResolution", "1").toInt());
+ checkerSettings.checkPartFilledImageFrames = static_cast<bool>(dc.attribute("CheckPartFilledImageFrames", "0").toInt());
checkerSettings.checkTransparency = static_cast<bool>(dc.attribute("CheckTransparency", "1").toInt());
checkerSettings.minResolution = ScCLocale::toDoubleC(dc.attribute("MinimumResolution"), 144.0);
checkerSettings.maxResolution = ScCLocale::toDoubleC(dc.attribute("MaximumResolution"), 4800.0);
@@ -2424,7 +2426,7 @@
appPrefs.pdfPrefs.ImageProf = dc.attribute("ImageProfile", "");
appPrefs.pdfPrefs.PrintProf = dc.attribute("PrintProfile", "");
appPrefs.pdfPrefs.Info = dc.attribute("InfoString", "");
- appPrefs.pdfPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0);
+ appPrefs.pdfPrefs.bleeds.Top = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0);
appPrefs.pdfPrefs.bleeds.Left = ScCLocale::toDoubleC(dc.attribute("BleedLeft"), 0.0);
appPrefs.pdfPrefs.bleeds.Right = ScCLocale::toDoubleC(dc.attribute("BleedRight"), 0.0);
appPrefs.pdfPrefs.bleeds.Bottom = ScCLocale::toDoubleC(dc.attribute("BleedBottom"), 0.0);
@@ -2569,6 +2571,7 @@
checkerSettings.checkOverflow = true;
checkerSettings.checkPictures = true;
checkerSettings.checkResolution = true;
+ checkerSettings.checkPartFilledImageFrames = false;
checkerSettings.checkTransparency = true;
checkerSettings.checkAnnotations = false;
checkerSettings.checkRasterPDF = true;
@@ -2593,15 +2596,15 @@
checkerSettings.checkAnnotations = true;
checkerSettings.minResolution = 144.0;
checkerSettings.checkDeviceColorsAndOutputIntend = true;
- cp->insert( CommonStrings::PDF_X3 , checkerSettings);
+ cp->insert( CommonStrings::PDF_X3 , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = true;
checkerSettings.checkDeviceColorsAndOutputIntend = false;
- cp->insert( CommonStrings::PDF_X1a , checkerSettings);
+ cp->insert( CommonStrings::PDF_X1a , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = false;
checkerSettings.checkDeviceColorsAndOutputIntend = true;
checkerSettings.checkTransparency = false;
checkerSettings.checkFontIsOpenType = false;
- cp->insert( CommonStrings::PDF_X4 , checkerSettings);
+ cp->insert( CommonStrings::PDF_X4 , checkerSettings);
}
}
Modified: trunk/Scribus/scribus/prefsstructs.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Mon Feb 14 09:25:17 2011
@@ -44,6 +44,7 @@
bool checkDeviceColorsAndOutputIntend; // unmanaged colors (device colors) must agree with output intend
bool checkFontNotEmbedded; // embedded PDF might use fonts without embedding
bool checkFontIsOpenType; // embedded PDF might use OpenType font program (only allowed in PDF/X-4 and PDF 1.6)
+ bool checkPartFilledImageFrames;
};
typedef QMap<QString, CheckerPrefs> CheckerPrefsList;
@@ -93,7 +94,7 @@
QStringList RecentDocs; //! List of recent documents
QString language; //! Language of the user interface
bool useSmallWidgets; //! Use small widgets in the palettes
- bool useTabs; //! Use a tabbed MainWidget a la FireFox
+ bool useTabs; //! Use a tabbed MainWidget a la FireFox
bool showStartupDialog; //! Whether to show the startup dialog or not
bool showSplashOnStartup; //! Whether to show the splashscreen or not
bool stickyTools; //! Whether a user's tool section remains after use or the normal tool is reselected
@@ -226,11 +227,11 @@
double calligrapicPenWidth; //! Width of the calligraphics Brush
int calligrapicPenStyle; //! Line style of the calligraphics Brush
/* Arc Tool */
- double arcStartAngle; //! angle where the arc starts
- double arcSweepAngle; //! angle the arc spans
+ double arcStartAngle; //! angle where the arc starts
+ double arcSweepAngle; //! angle the arc spans
/* Spiral Tool */
- double spiralStartAngle; //! angle where the spiral starts
- double spiralEndAngle; //! angle where the spiral ends
+ double spiralStartAngle; //! angle where the spiral starts
+ double spiralEndAngle; //! angle where the spiral ends
double spiralFactor; //! factor the spiral gets smaller
};
@@ -390,7 +391,7 @@
// Image Cache
struct ImageCachePrefs
{
- bool cacheEnabled; //!< Enable the image cache
+ bool cacheEnabled; //!< Enable the image cache
int maxCacheSizeMiB; //!< Maximum total size of image cache in MiB
int maxCacheEntries; //!< Maximum number of cache entries
int compressionLevel; //!< Cache image compression level (see QImage)
Modified: trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp Mon Feb 14 09:25:17 2011
@@ -25,6 +25,7 @@
connect(checkTextOverflowCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
+ connect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile()));
connect(checkPDFAnnotFieldsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkPlacedPDFCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
@@ -64,6 +65,7 @@
checkTextOverflowCheckBox->setChecked(checkerProfile[prefProfile].checkOverflow);
checkTransparenciesCheckBox->setChecked(checkerProfile[prefProfile].checkTransparency);
checkMissingImagesCheckBox->setChecked(checkerProfile[prefProfile].checkPictures);
+ checkPartFilledImageFramesCheckBox->setChecked(checkerProfile[prefProfile].checkPartFilledImageFrames);
checkImageResolutionCheckBox->setChecked(checkerProfile[prefProfile].checkResolution);
checkPDFAnnotFieldsCheckBox->setChecked(checkerProfile[prefProfile].checkAnnotations);
checkPlacedPDFCheckBox->setChecked(checkerProfile[prefProfile].checkRasterPDF);
@@ -98,6 +100,7 @@
checkerProfile[currentProfile].checkOrphans = checkItemsNotOnAPageCheckBox->isChecked();
checkerProfile[currentProfile].checkOverflow = checkTextOverflowCheckBox->isChecked();
checkerProfile[currentProfile].checkPictures = checkMissingImagesCheckBox->isChecked();
+ checkerProfile[currentProfile].checkPartFilledImageFrames = checkPartFilledImageFramesCheckBox->isChecked();
checkerProfile[currentProfile].checkResolution = checkImageResolutionCheckBox->isChecked();
checkerProfile[currentProfile].checkTransparency = checkTransparenciesCheckBox->isChecked();
checkerProfile[currentProfile].minResolution = minimumResolutionSpinBox->value();
@@ -133,6 +136,7 @@
disconnect(checkMissingGlyphsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
disconnect(checkItemsNotOnAPageCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
disconnect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
+ disconnect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
disconnect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile()));
disconnect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
disconnect(minimumResolutionSpinBox, SIGNAL(valueChanged(int)), this, SLOT(putProfile()));
@@ -149,6 +153,7 @@
checkTextOverflowCheckBox->setChecked(checkerProfile[name].checkOverflow);
checkTransparenciesCheckBox->setChecked(checkerProfile[name].checkTransparency);
checkMissingImagesCheckBox->setChecked(checkerProfile[name].checkPictures);
+ checkPartFilledImageFramesCheckBox->setChecked(checkerProfile[name].checkPartFilledImageFrames);
checkImageResolutionCheckBox->setChecked(checkerProfile[name].checkResolution);
minimumResolutionSpinBox->setValue( qRound(checkerProfile[name].minResolution) );
maximumResolutionSpinBox->setValue( qRound(checkerProfile[name].maxResolution) );
@@ -163,6 +168,7 @@
connect(checkMissingGlyphsCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkItemsNotOnAPageCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkMissingImagesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
+ connect(checkPartFilledImageFramesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(checkImageResolutionCheckBox, SIGNAL(toggled(bool)), this, SLOT(putProfile()));
connect(checkTransparenciesCheckBox, SIGNAL(clicked()), this, SLOT(putProfile()));
connect(minimumResolutionSpinBox, SIGNAL(valueChanged(int)), this, SLOT(putProfile()));
@@ -183,6 +189,7 @@
checkerSettings.checkOrphans = checkItemsNotOnAPageCheckBox->isChecked();
checkerSettings.checkOverflow = checkTextOverflowCheckBox->isChecked();
checkerSettings.checkPictures = checkMissingImagesCheckBox->isChecked();
+ checkerSettings.checkPartFilledImageFrames = checkPartFilledImageFramesCheckBox->isChecked();
checkerSettings.checkResolution = checkImageResolutionCheckBox->isChecked();
checkerSettings.checkTransparency = checkTransparenciesCheckBox->isChecked();
checkerSettings.minResolution = minimumResolutionSpinBox->value();
Modified: trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16357&path=/trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui Mon Feb 14 09:25:17 2011
@@ -88,8 +88,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>595</width>
- <height>543</height>
+ <width>597</width>
+ <height>545</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -237,6 +237,13 @@
</widget>
</item>
<item>
+ <widget class="QCheckBox" name="checkPartFilledImageFramesCheckBox">
+ <property name="text">
+ <string>Check for part filed image frames</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="checkImageResolutionCheckBox">
<property name="text">
<string>Check image resolution</string>
More information about the scribus-commit
mailing list