r21086 by fschmid -

[scribus-commit]

Author: fschmid
Date: Tue Mar 15 19:56:39 2016
New Revision: 21086

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21086
Log:
Fixed Bug #13816: Move 'Show Autosave Countdown Clock on Canvas' to Prefs > Doc Setup > Saving & Undo

Modified:
    trunk/Scribus/scribus/ui/prefs_display.cpp
    trunk/Scribus/scribus/ui/prefs_displaybase.ui
    trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
    trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui

Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21086&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp	Tue Mar 15 19:56:39 2016
@@ -117,7 +117,6 @@
 	showBleedAreaCheckBox->setChecked(prefsData->guidesPrefs.showBleed);
 	showPageShadowCheckBox->setChecked(prefsData->displayPrefs.showPageShadow);
 	showVerifierWarningsOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showVerifierWarningsOnCanvas);
-	showAutosaveClockOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showAutosaveClockOnCanvas);
 
 	unitChange(docUnitIndex);
 
@@ -411,7 +410,6 @@
 	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.setLeft(scratchSpaceLeftSpinBox->value() / unitRatio);
 	prefsData->displayPrefs.scratch.setRight(scratchSpaceRightSpinBox->value() / unitRatio);

Modified: trunk/Scribus/scribus/ui/prefs_displaybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21086&path=/trunk/Scribus/scribus/ui/prefs_displaybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_displaybase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_displaybase.ui	Tue Mar 15 19:56:39 2016
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>521</width>
-    <height>406</height>
+    <height>415</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -123,13 +123,6 @@
         </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">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -375,8 +368,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>246</width>
-            <height>350</height>
+            <width>212</width>
+            <height>292</height>
            </rect>
           </property>
           <layout class="QFormLayout" name="formLayout_2">

Modified: trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21086&path=/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetup.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetup.cpp	Tue Mar 15 19:56:39 2016
@@ -190,6 +190,7 @@
 	autosaveDirEdit->setText(prefsData->docSetupPrefs.AutoSaveDir);
 	autosaveDirEdit->setEnabled(!prefsData->docSetupPrefs.AutoSaveLocation);
 	changeAutoDir->setEnabled(!prefsData->docSetupPrefs.AutoSaveLocation);
+	showAutosaveClockOnCanvasCheckBox->setChecked(prefsData->displayPrefs.showAutosaveClockOnCanvas);
 	undoCheckBox->setChecked(PrefsManager::instance()->prefsFile->getContext("undo")->getBool("enabled", true));
 	int undoLength = UndoManager::instance()->getHistoryLength();
 	if (undoLength == -1)
@@ -218,6 +219,7 @@
 	prefsData->docSetupPrefs.AutoSaveKeep = autosaveKeepCheckBox->isChecked();
 	prefsData->docSetupPrefs.AutoSaveLocation = autosaveDocRadio->isChecked();
 	prefsData->docSetupPrefs.AutoSaveDir = autosaveDirEdit->text();
+	prefsData->displayPrefs.showAutosaveClockOnCanvas=showAutosaveClockOnCanvasCheckBox->isChecked();
 	bool undoActive=undoCheckBox->isChecked();
 	if (!undoActive)
 		UndoManager::instance()->clearStack();

Modified: trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21086&path=/trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui	Tue Mar 15 19:56:39 2016
@@ -630,6 +630,13 @@
         </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_7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -721,8 +728,8 @@
  <customwidgets>
   <customwidget>
    <class>ScrSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>ui/scrspinbox.h</header>
+   <extends>QSpinBox</extends>
+   <header location="global">ui/scrspinbox.h</header>
   </customwidget>
   <customwidget>
    <class>NewMarginWidget</class>