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

[scribus-commit]

Revision: 14542
Author: cbradney
Date: 2010-01-19T21:52:00.498253Z
Commit message: #7767: Commit patch to track layer visibility vs printability

Changeset: 
M  /trunk/Scribus/scribus/ui/checkDocument.cpp
M  /trunk/Scribus/scribus/ui/tabcheckdoc.h
M  /trunk/Scribus/scribus/ui/prefs_preflightverifierbase.ui
M  /trunk/Scribus/scribus/ui/tabcheckdoc.cpp

Diffs:
Index: scribus/ui/checkDocument.cpp
===================================================================
--- scribus/ui/checkDocument.cpp	(revision 14541)
+++ scribus/ui/checkDocument.cpp	(revision 14542)
@@ -386,6 +386,7 @@
 // 		resultError = true;
 		bool hasError = false;
 // 		globalGraveError = false;
+		bool layoutGraveError = false;
 		itemError = false;
 // 		QTreeWidgetItem * pagep = 0;
 		// LAYERS **********************************************8
@@ -410,17 +411,28 @@
 					{
 						case Transparency:
 							errorText->setText(COLUMN_ITEM, tr("Transparency used"));
+							errorText->setIcon(COLUMN_ITEM, graveError );
+							layoutGraveError = true;
 							break;
 						case BlendMode:
 							errorText->setText(COLUMN_ITEM, tr("Blendmode used"));
+							errorText->setIcon(COLUMN_ITEM, graveError );
+							layoutGraveError = true;
 							break;
+						case OffConflictLayers:
+							errorText->setText(COLUMN_ITEM, tr("Print/Visible Mismatch"));
+							errorText->setIcon(COLUMN_ITEM, onlyWarning );
+							break;
 						default:
 							break;
 					}
-					errorText->setIcon(COLUMN_ITEM, graveError );
+//					errorText->setIcon(COLUMN_ITEM, graveError );
 				}
 				layer->setText(COLUMN_ITEM,tr("Layer \"%1\"").arg(doc->layerName(docLayerErrorsIt.key())));
-				layer->setIcon(COLUMN_ITEM, graveError );
+				if (layoutGraveError)
+					layer->setIcon(COLUMN_ITEM, graveError );
+				else
+					layer->setIcon(COLUMN_ITEM, onlyWarning );
 				layer->setText(COLUMN_PROBLEM, tr("Issue(s): %1").arg(doc->docLayerErrors[docLayerErrorsIt.key()].count()));
 				layer->setExpanded(true);
 // 				pagep = layer;
Index: scribus/ui/prefs_preflightverifierbase.ui
===================================================================
--- scribus/ui/prefs_preflightverifierbase.ui	(revision 14541)
+++ scribus/ui/prefs_preflightverifierbase.ui	(revision 14542)
@@ -46,7 +46,7 @@
         <x>0</x>
         <y>0</y>
         <width>595</width>
-        <height>640</height>
+        <height>641</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -252,6 +252,13 @@
         </widget>
        </item>
        <item>
+        <widget class="QCheckBox" name="checkBox_13">
+         <property name="text">
+          <string>Check for Visible/Printable Mismatch in Layers</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
Index: scribus/ui/tabcheckdoc.cpp
===================================================================
--- scribus/ui/tabcheckdoc.cpp	(revision 14541)
+++ scribus/ui/tabcheckdoc.cpp	(revision 14542)
@@ -88,6 +88,9 @@
 	ignoreOffLayers = new QCheckBox( this );
 	ignoreOffLayers->setText( tr( "Ignore non-printable Layers" ) );
 	TabCheckDocLayout->addWidget( ignoreOffLayers );
+	checkOffConflictLayers = new QCheckBox( this );
+	checkOffConflictLayers->setText( tr( "Check for Visible/Printable Mismatch in Layers" ) );
+	TabCheckDocLayout->addWidget( checkOffConflictLayers );
 	layout1 = new QHBoxLayout;
 	layout1->setMargin(0);
 	layout1->setSpacing(5);
@@ -121,7 +124,7 @@
 	connect(resolutionValue, SIGNAL(valueChanged(int)), this, SLOT(putProfile()));
 	connect(resolutionValueM, SIGNAL(valueChanged(int)), this, SLOT(putProfile()));
 	connect(ignoreOffLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
-	
+	connect(checkOffConflictLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
 	connect(removeProfile, SIGNAL(clicked()), this, SLOT(delProf()));
 	connect(addProfile, SIGNAL(clicked()), this, SLOT(addProf()));
 }
@@ -147,6 +150,7 @@
 	rasterPDF->setChecked(checkerProfile[prefProfile].checkRasterPDF);
 	checkForGIF->setChecked(checkerProfile[prefProfile].checkForGIF);
 	ignoreOffLayers->setChecked(checkerProfile[prefProfile].ignoreOffLayers);
+	checkOffConflictLayers->setChecked(checkerProfile[prefProfile].checkOffConflictLayers);
 	resolutionValue->setValue( qRound(checkerProfile[prefProfile].minResolution) );
 	resolutionValueM->setValue( qRound(checkerProfile[prefProfile].maxResolution) );
 	currentProfile = prefProfile;
@@ -174,6 +178,7 @@
 		checkerProfile[currentProfile].checkRasterPDF = rasterPDF->isChecked();
 		checkerProfile[currentProfile].checkForGIF = checkForGIF->isChecked();
 		checkerProfile[currentProfile].ignoreOffLayers = ignoreOffLayers->isChecked();
+		checkerProfile[currentProfile].checkOffConflictLayers = checkOffConflictLayers->isChecked();
 	}
 }
 
@@ -208,6 +213,7 @@
 	disconnect(checkForGIF, SIGNAL(clicked()), this, SLOT(putProfile()));
 	disconnect(useAnnotations, SIGNAL(clicked()), this, SLOT(putProfile()));
 	disconnect(ignoreOffLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
+	disconnect(checkOffConflictLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
 	ignoreErrors->setChecked(checkerProfile[name].ignoreErrors);
 	automaticCheck->setChecked(checkerProfile[name].autoCheck);
 	missingGlyphs->setChecked(checkerProfile[name].checkGlyphs);
@@ -222,6 +228,7 @@
 	rasterPDF->setChecked(checkerProfile[name].checkRasterPDF);
 	checkForGIF->setChecked(checkerProfile[name].checkForGIF);
 	ignoreOffLayers->setChecked(checkerProfile[name].ignoreOffLayers);
+	checkOffConflictLayers->setChecked(checkerProfile[name].checkOffConflictLayers);
 	currentProfile = name;
 	connect(ignoreErrors, SIGNAL(clicked()), this, SLOT(putProfile()));
 	connect(automaticCheck, SIGNAL(clicked()), this, SLOT(putProfile()));
@@ -236,6 +243,7 @@
 	connect(checkForGIF, SIGNAL(clicked()), this, SLOT(putProfile()));
 	connect(useAnnotations, SIGNAL(clicked()), this, SLOT(putProfile()));
 	connect(ignoreOffLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
+	connect(checkOffConflictLayers, SIGNAL(clicked()), this, SLOT(putProfile()));
 }
 
 void TabCheckDoc::addProf()
@@ -255,6 +263,7 @@
 	checkerSettings.checkRasterPDF = rasterPDF->isChecked();
 	checkerSettings.checkForGIF = checkForGIF->isChecked();
 	checkerSettings.ignoreOffLayers = ignoreOffLayers->isChecked();
+	checkerSettings.checkOffConflictLayers = checkOffConflictLayers->isChecked();
 	checkerProfile.insert(tempNewProfileName, checkerSettings);
 	currentProfile = tempNewProfileName;
 	if (checkerProfile.count() > 1)
Index: scribus/ui/tabcheckdoc.h
===================================================================
--- scribus/ui/tabcheckdoc.h	(revision 14541)
+++ scribus/ui/tabcheckdoc.h	(revision 14542)
@@ -45,6 +45,7 @@
 	QCheckBox* rasterPDF;
 	QCheckBox* checkForGIF;
 	QCheckBox* ignoreOffLayers;
+	QCheckBox* checkOffConflictLayers;
 	QGroupBox* pictResolution;
 	QLabel* textLabel1;
 	QSpinBox* resolutionValue;