r17805 by fschmid - Follow up to Bug fix #11113 made the display of the countdown configureable in the prefs and doc setup. The default for the display is not to show the "clock".

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 14 09:03:01 UTC 2012


Author: fschmid
Date: Sun Oct 14 09:03:00 2012
New Revision: 17805

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17805
Log:
Follow up to Bug fix #11113 made the display of the countdown configureable in the prefs and doc setup. The default for the display is not to show the "clock".

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/prefsstructs.h
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/ui/clockwidget.cpp
    trunk/Scribus/scribus/ui/prefs_display.cpp
    trunk/Scribus/scribus/ui/prefs_displaybase.ui

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Sun Oct 14 09:03:00 2012
@@ -241,6 +241,7 @@
 	appPrefs.displayPrefs.scratchColor = qApp->palette().color(QPalette::Active, QPalette::Window);
 	appPrefs.displayPrefs.showPageShadow = true;
 	appPrefs.displayPrefs.showVerifierWarningsOnCanvas = true;
+	appPrefs.displayPrefs.showAutosaveClockOnCanvas = false;
 	appPrefs.displayPrefs.frameColor = QColor(Qt::red);
 	appPrefs.displayPrefs.frameNormColor = QColor(Qt::black);
 	appPrefs.displayPrefs.frameGroupColor = QColor(Qt::darkCyan);
@@ -1404,6 +1405,7 @@
 	deDisplay.setAttribute("ShowMarginsFilled", static_cast<int>(appPrefs.displayPrefs.marginColored));
 	deDisplay.setAttribute("DisplayScale", ScCLocale::toQStringC(appPrefs.displayPrefs.displayScale, 8));
 	deDisplay.setAttribute("ShowVerifierWarningsOnCanvas",static_cast<int>(appPrefs.displayPrefs.showVerifierWarningsOnCanvas));
+	deDisplay.setAttribute("ShowAutosaveClockOnCanvas",static_cast<int>(appPrefs.displayPrefs.showAutosaveClockOnCanvas));
 	deDisplay.setAttribute("ToolTips", static_cast<int>(appPrefs.displayPrefs.showToolTips));
 	deDisplay.setAttribute("ShowMouseCoordinates", static_cast<int>(appPrefs.displayPrefs.showMouseCoordinates));
 	elem.appendChild(deDisplay);
@@ -1972,6 +1974,7 @@
 			appPrefs.displayPrefs.marginColored = static_cast<bool>(dc.attribute("ShowMarginsFilled", "0").toInt());
 			appPrefs.displayPrefs.displayScale = qRound(ScCLocale::toDoubleC(dc.attribute("DisplayScale"), appPrefs.displayPrefs.displayScale)*72)/72.0;
 			appPrefs.displayPrefs.showVerifierWarningsOnCanvas = static_cast<bool>(dc.attribute("ShowVerifierWarningsOnCanvas", "1").toInt());
+			appPrefs.displayPrefs.showAutosaveClockOnCanvas = static_cast<bool>(dc.attribute("ShowAutosaveClockOnCanvas", "0").toInt());
 			appPrefs.displayPrefs.showToolTips = static_cast<bool>(dc.attribute("ToolTips", "1").toInt());
 			appPrefs.displayPrefs.showMouseCoordinates = static_cast<bool>(dc.attribute("ShowMouseCoordinates", "1").toInt());
 		}

Modified: trunk/Scribus/scribus/prefsstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Sun Oct 14 09:03:00 2012
@@ -347,6 +347,7 @@
 	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
+	bool showAutosaveClockOnCanvas; //! Show autosave countdown on canvas
 };
 
 struct ExternalToolsPrefs

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Sun Oct 14 09:03:00 2012
@@ -184,6 +184,7 @@
 	void setHyphAutoCheck(bool b) { docPrefsData.hyphPrefs.AutoCheck=b; }
 	bool autoSave() const { return docPrefsData.docSetupPrefs.AutoSave; }
 	int autoSaveTime() const  { return docPrefsData.docSetupPrefs.AutoSaveTime; }
+	bool autoSaveClockDisplay() const  { return docPrefsData.displayPrefs.showAutosaveClockOnCanvas; }
 	void setAutoSave(bool b) { docPrefsData.docSetupPrefs.AutoSave=b; }
 	void setAutoSaveTime(int i) { docPrefsData.docSetupPrefs.AutoSaveTime=i; }
 	//FIXME (maybe) :non const, the loaders make a mess here

Modified: trunk/Scribus/scribus/ui/clockwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/ui/clockwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/clockwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/clockwidget.cpp Sun Oct 14 09:03:00 2012
@@ -107,7 +107,7 @@
 
 void ClockWidget::updateDisplay()
 {
-	if (m_doc->autoSave())
+	if (m_doc->autoSave() && m_doc->autoSaveClockDisplay())
 	{
 		if (!isVisible())
 			setVisible(true);

Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Sun Oct 14 09:03:00 2012
@@ -101,6 +101,7 @@
 	showBleedAreaCheckBox->setChecked(prefsData->guidesPrefs.showBleed);
 	showPageShadowCheckBox->setChecked(prefsData->displayPrefs.showPageShadow);
 	showVerifierWarningsOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showVerifierWarningsOnCanvas);
+	showAutosaveClockOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showAutosaveClockOnCanvas);
 
 	scratchSpaceLeftSpinBox->setMaximum(1000);
 	scratchSpaceRightSpinBox->setMaximum(1000);
@@ -406,6 +407,7 @@
 	prefsData->guidesPrefs.showBleed=showBleedAreaCheckBox->isChecked();
 	prefsData->displayPrefs.showPageShadow=showPageShadowCheckBox->isChecked();
 	prefsData->displayPrefs.showVerifierWarningsOnCanvas=showVerifierWarningsOnCanvasCheckBox->isChecked();
+	prefsData->displayPrefs.showAutosaveClockOnCanvas=showAutosaveClockOnCanvasCheckBox->isChecked();
 	double unitRatio = unitGetRatioFromIndex(docUnitIndex);
 	prefsData->displayPrefs.scratch.Left=scratchSpaceLeftSpinBox->value()/unitRatio;
 	prefsData->displayPrefs.scratch.Right=scratchSpaceRightSpinBox->value()/unitRatio;

Modified: trunk/Scribus/scribus/ui/prefs_displaybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17805&path=/trunk/Scribus/scribus/ui/prefs_displaybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_displaybase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_displaybase.ui Sun Oct 14 09:03:00 2012
@@ -44,87 +44,90 @@
       <attribute name="title">
        <string>Pages</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_7">
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QCheckBox" name="showRulersCheckBox">
-           <property name="text">
-            <string>Show Rulers</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showRulersRelativeToPageCheckBox">
-           <property name="text">
-            <string>Show Rulers Relative to Page</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showFramesCheckBox">
-           <property name="text">
-            <string>Show Frames</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showImagesCheckBox">
-           <property name="text">
-            <string>Show Images</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showTextChainsCheckBox">
-           <property name="text">
-            <string>Show Text Chains</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showControlCharsCheckBox">
-           <property name="text">
-            <string>Show Text Control Characters</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showLayerIndicatorsCheckBox">
-           <property name="text">
-            <string>Show Layer Indicators</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showUnprintableAreaInMarginColorCheckBox">
-           <property name="text">
-            <string>Show Unprintable Area in Margin Color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showBleedAreaCheckBox">
-           <property name="text">
-            <string>Show Bleed Area</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="showPageShadowCheckBox">
-           <property name="text">
-            <string>Show Page Shadow</string>
-           </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>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QCheckBox" name="showRulersCheckBox">
+         <property name="text">
+          <string>Show Rulers</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showRulersRelativeToPageCheckBox">
+         <property name="text">
+          <string>Show Rulers Relative to Page</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showFramesCheckBox">
+         <property name="text">
+          <string>Show Frames</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showImagesCheckBox">
+         <property name="text">
+          <string>Show Images</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showTextChainsCheckBox">
+         <property name="text">
+          <string>Show Text Chains</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showControlCharsCheckBox">
+         <property name="text">
+          <string>Show Text Control Characters</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showLayerIndicatorsCheckBox">
+         <property name="text">
+          <string>Show Layer Indicators</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showUnprintableAreaInMarginColorCheckBox">
+         <property name="text">
+          <string>Show Unprintable Area in Margin Color</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showBleedAreaCheckBox">
+         <property name="text">
+          <string>Show Bleed Area</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showPageShadowCheckBox">
+         <property name="text">
+          <string>Show Page Shadow</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showVerifierWarningsOnCanvasCheckBox">
+         <property name="text">
+          <string>Show Preflight Verifier Warnings on the Page</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="showAutosaveClockOnCanvasCheckBox">
+         <property name="text">
+          <string>Show Autosave Countdown Clock on the Canvas</string>
+         </property>
+        </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_8">
@@ -372,8 +375,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>432</width>
-            <height>350</height>
+            <width>192</width>
+            <height>339</height>
            </rect>
           </property>
           <layout class="QFormLayout" name="formLayout_2">




More information about the scribus-commit mailing list