r14541 by cbradney - #7767: Commit patch to track layer visibility vs printability

[scribus-commit]

Revision: 14541
Author: cbradney
Date: 2010-01-19T21:51:50.449613Z
Commit message: #7767: Commit patch to track layer visibility vs printability

Changeset: 
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/prefsstructs.h
M  /trunk/Scribus/scribus/documentchecker.cpp
M  /trunk/Scribus/scribus/scribusstructs.h

Diffs:
Index: scribus/documentchecker.cpp
===================================================================
--- scribus/documentchecker.cpp	(revision 14540)
+++ scribus/documentchecker.cpp	(revision 14541)
@@ -55,6 +55,7 @@
 	checkerSettings.checkRasterPDF = currDoc->checkerProfiles[currDoc->curCheckProfile].checkRasterPDF;
 	checkerSettings.checkForGIF = currDoc->checkerProfiles[currDoc->curCheckProfile].checkForGIF;
 	checkerSettings.ignoreOffLayers = currDoc->checkerProfiles[currDoc->curCheckProfile].ignoreOffLayers;
+	checkerSettings.checkOffConflictLayers = currDoc->checkerProfiles[currDoc->curCheckProfile].checkOffConflictLayers;
 	checkerSettings.checkNotCMYKOrSpot = currDoc->checkerProfiles[currDoc->curCheckProfile].checkNotCMYKOrSpot;
 	checkerSettings.checkDeviceColorsAndOutputIntend = currDoc->checkerProfiles[currDoc->curCheckProfile].checkDeviceColorsAndOutputIntend;
 	checkerSettings.checkFontNotEmbedded = currDoc->checkerProfiles[currDoc->curCheckProfile].checkFontNotEmbedded;
@@ -73,6 +74,8 @@
 	{
 		layerError.clear();
 		currDoc->Layers.levelToLayer(ll, Lnr);
+		if ((ll.isViewable != ll.isPrintable) && (checkerSettings.checkOffConflictLayers))
+			layerError.insert(OffConflictLayers, 0);
 		if ((!ll.isViewable) && (checkerSettings.ignoreOffLayers))
 			continue;
 		if ((!ll.isPrintable) && (checkerSettings.ignoreOffLayers))
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 14540)
+++ scribus/prefsmanager.cpp	(revision 14541)
@@ -1492,6 +1492,7 @@
 		dc79a.setAttribute("checkRasterPDF", static_cast<int>(itcp.value().checkRasterPDF));
 		dc79a.setAttribute("checkForGIF", static_cast<int>(itcp.value().checkForGIF));
 		dc79a.setAttribute("ignoreOffLayers", static_cast<int>(itcp.value().ignoreOffLayers));
+		dc79a.setAttribute("checkOffConflictLayers", static_cast<int>(itcp.value().checkOffConflictLayers));
 		dc79a.setAttribute("minResolution",ScCLocale::toQStringC(itcp.value().minResolution));
 		dc79a.setAttribute("maxResolution",ScCLocale::toQStringC(itcp.value().maxResolution));
 		dc79a.setAttribute("checkNotCMYKOrSpot", static_cast<int>(itcp.value().checkNotCMYKOrSpot));
@@ -2164,6 +2165,7 @@
 			checkerSettings.checkRasterPDF = static_cast<bool>(dc.attribute("checkRasterPDF", "1").toInt());
 			checkerSettings.checkForGIF = static_cast<bool>(dc.attribute("checkForGIF", "1").toInt());
 			checkerSettings.ignoreOffLayers = static_cast<bool>(dc.attribute("ignoreOffLayers", "0").toInt());
+			checkerSettings.checkOffConflictLayers = static_cast<bool>(dc.attribute("checkOffConflictLayers", "0").toInt());
 			checkerSettings.checkNotCMYKOrSpot = static_cast<bool>(dc.attribute("checkNotCMYKOrSpot", "0").toInt());
 			checkerSettings.checkDeviceColorsAndOutputIntend = static_cast<bool>(dc.attribute("checkDeviceColorsAndOutputIntend", "0").toInt());
 			checkerSettings.checkFontNotEmbedded = static_cast<bool>(dc.attribute("checkFontNotEmbedded", "0").toInt());
@@ -2508,6 +2510,7 @@
 		checkerSettings.checkRasterPDF = true;
 		checkerSettings.checkForGIF = true;
 		checkerSettings.ignoreOffLayers = false;
+		checkerSettings.checkOffConflictLayers = false;
 		checkerSettings.minResolution = 144.0;
 		checkerSettings.maxResolution = 2400.0;
 		checkerSettings.checkNotCMYKOrSpot = false;
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h	(revision 14540)
+++ scribus/prefsstructs.h	(revision 14541)
@@ -36,6 +36,7 @@
 	bool checkRasterPDF;
 	bool checkForGIF;
 	bool ignoreOffLayers;
+	bool checkOffConflictLayers; //Check whether layers are marked as visible but not to be printed or vice versa
 	bool checkNotCMYKOrSpot; // colors must be either CMYK or spot (PDF/X-1a)
 	bool checkDeviceColorsAndOutputIntend; // unmanaged colors (device colors) must agree with output intend
 	bool checkFontNotEmbedded; // embedded PDF might use fonts without embedding
Index: scribus/scribusstructs.h
===================================================================
--- scribus/scribusstructs.h	(revision 14540)
+++ scribus/scribusstructs.h	(revision 14541)
@@ -434,7 +434,8 @@
 	NotCMYKOrSpot=13,
 	DeviceColorAndOutputIntend=14,
 	FontNotEmbedded=15,
-	EmbeddedFontIsOpenType=16
+	EmbeddedFontIsOpenType=16,
+	OffConflictLayers=17
 } PreflightError;
 
 typedef QMap<PreflightError, int> errorCodes;