r14811 by cbradney - Add new option for displaying preflight verifier preferences on canvas, back end work to be done later eg for image resolution warning

[scribus-commit]

Revision: 14811
Author: cbradney
Date: 2010-02-24T22:10:36.858077Z
Commit message: Add new option for displaying preflight verifier preferences on canvas, back end work to be done later eg for image resolution warning

Changeset: 
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/prefsstructs.h
M  /trunk/Scribus/scribus/ui/prefs_display.cpp
M  /trunk/Scribus/scribus/ui/prefs_displaybase.ui

Diffs:
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 14810)
+++ scribus/prefsmanager.cpp	(revision 14811)
@@ -266,6 +266,7 @@
 	appPrefs.opToolPrefs.constrain = 15.0;
 	appPrefs.displayPrefs.paperColor = QColor(Qt::white);
 	appPrefs.displayPrefs.showPageShadow = true;
+	appPrefs.displayPrefs.showVerifierWarningsOnCanvas = true;
 	appPrefs.displayPrefs.frameColor = QColor(Qt::red);
 	appPrefs.displayPrefs.frameNormColor = QColor(Qt::black);
 	appPrefs.displayPrefs.frameGroupColor = QColor(Qt::darkCyan);
@@ -1308,6 +1309,8 @@
 	dc1a.setAttribute("MARGC",appPrefs.guidesPrefs.marginColor.name());
 	dc1a.setAttribute("RANDF", static_cast<int>(appPrefs.displayPrefs.marginColored));
 	dc1a.setAttribute("DScale", ScCLocale::toQStringC(appPrefs.displayPrefs.displayScale));
+	dc1a.setAttribute("ShowVerifierWarningsOnCanvas",static_cast<int>(appPrefs.displayPrefs.showVerifierWarningsOnCanvas));
+
 	elem.appendChild(dc1a);
 	// Font information must be written before FONTS element so that face "usable"
 	// member is set properly before one try to set default font. Allows to check
@@ -1908,6 +1911,7 @@
 			appPrefs.guidesPrefs.marginColor = QColor(dc.attribute("MARGC","#0000ff"));
 			appPrefs.displayPrefs.marginColored = static_cast<bool>(dc.attribute("RANDF", "0").toInt());
 			appPrefs.displayPrefs.displayScale = ScCLocale::toDoubleC(dc.attribute("DScale"), appPrefs.displayPrefs.displayScale);
+			appPrefs.displayPrefs.showVerifierWarningsOnCanvas = static_cast<bool>(dc.attribute("ShowVerifierWarningsOnCanvas", "1").toInt());
 		}
 		if (dc.tagName()=="TYPO")
 		{
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h	(revision 14810)
+++ scribus/prefsstructs.h	(revision 14811)
@@ -296,6 +296,7 @@
 	double pageGapHorizontal; //! Horizontal gap between pages
 	double pageGapVertical; //! Vertical gap between pages
 	double displayScale; //! Display scale, typically used to set the scale of the display to 100% of real values.
+	bool showVerifierWarningsOnCanvas; //! Show preflight verifier warnings on canvas
 };
 
 struct ExternalToolsPrefs
Index: scribus/ui/prefs_display.cpp
===================================================================
--- scribus/ui/prefs_display.cpp	(revision 14810)
+++ scribus/ui/prefs_display.cpp	(revision 14811)
@@ -77,8 +77,8 @@
 	showUnprintableAreaInMarginColorCheckBox->setChecked(prefsData->displayPrefs.marginColored);
 	showBleedAreaCheckBox->setChecked(prefsData->guidesPrefs.showBleed);
 	showPageShadowCheckBox->setChecked(prefsData->displayPrefs.showPageShadow);
+	showVerifierWarningsOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showVerifierWarningsOnCanvas);
 
-
 	scratchSpaceLeftSpinBox->setMaximum(1000);
 	scratchSpaceRightSpinBox->setMaximum(1000);
 	scratchSpaceTopSpinBox->setMaximum(1000);
@@ -366,6 +366,7 @@
 	prefsData->displayPrefs.marginColored=showUnprintableAreaInMarginColorCheckBox->isChecked();
 	prefsData->guidesPrefs.showBleed=showBleedAreaCheckBox->isChecked();
 	prefsData->displayPrefs.showPageShadow=showPageShadowCheckBox->isChecked();
+	prefsData->displayPrefs.showVerifierWarningsOnCanvas=showVerifierWarningsOnCanvasCheckBox->isChecked();
 	double unitRatio = unitGetRatioFromIndex(docUnitIndex);
 	prefsData->displayPrefs.scratch.Left=scratchSpaceLeftSpinBox->value()/unitRatio;
 	prefsData->displayPrefs.scratch.Right=scratchSpaceRightSpinBox->value()/unitRatio;
Index: scribus/ui/prefs_displaybase.ui
===================================================================
--- scribus/ui/prefs_displaybase.ui	(revision 14810)
+++ scribus/ui/prefs_displaybase.ui	(revision 14811)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>686</width>
-    <height>486</height>
+    <height>504</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -117,6 +117,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="showVerifierWarningsOnCanvasCheckBox">
+           <property name="text">
+            <string>Show Preflight Verifier Warnings on the Page</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>