r18956 by jghali - #12167: Incorrectly set the vertical and horizontal distance Between the pages.
scribus-commit
scribus-commit at lists.scribus.net
Thu Mar 27 12:30:09 UTC 2014
Author: jghali
Date: Thu Mar 27 12:30:08 2014
New Revision: 18956
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18956
Log:
#12167: Incorrectly set the vertical and horizontal distance Between the pages.
Modified:
trunk/Scribus/scribus/ui/prefs_display.cpp
Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18956&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Thu Mar 27 12:30:08 2014
@@ -116,13 +116,12 @@
pageGapHorizontalSpinBox->setNewUnit(docUnitIndex);
pageGapVerticalSpinBox->setNewUnit(docUnitIndex);
-
scratchSpaceLeftSpinBox->setValue(prefsData->displayPrefs.scratch.Left * unitRatio);
scratchSpaceRightSpinBox->setValue(prefsData->displayPrefs.scratch.Right * unitRatio);
scratchSpaceTopSpinBox->setValue(prefsData->displayPrefs.scratch.Top * unitRatio);
scratchSpaceBottomSpinBox->setValue(prefsData->displayPrefs.scratch.Bottom * unitRatio);
- pageGapHorizontalSpinBox->setValue(prefsData->displayPrefs.pageGapHorizontal);
- pageGapVerticalSpinBox->setValue(prefsData->displayPrefs.pageGapVertical);
+ pageGapHorizontalSpinBox->setValue(prefsData->displayPrefs.pageGapHorizontal * unitRatio);
+ pageGapVerticalSpinBox->setValue(prefsData->displayPrefs.pageGapVertical * unitRatio);
QPixmap pm(100, 30);
pm.fill(prefsData->displayPrefs.paperColor);
@@ -409,12 +408,12 @@
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;
- prefsData->displayPrefs.scratch.Top=scratchSpaceTopSpinBox->value()/unitRatio;
- prefsData->displayPrefs.scratch.Bottom=scratchSpaceBottomSpinBox->value()/unitRatio;
- prefsData->displayPrefs.pageGapHorizontal=pageGapHorizontalSpinBox->value();
- prefsData->displayPrefs.pageGapVertical=pageGapVerticalSpinBox->value();
+ prefsData->displayPrefs.scratch.Left=scratchSpaceLeftSpinBox->value() / unitRatio;
+ prefsData->displayPrefs.scratch.Right=scratchSpaceRightSpinBox->value() / unitRatio;
+ prefsData->displayPrefs.scratch.Top=scratchSpaceTopSpinBox->value() / unitRatio;
+ prefsData->displayPrefs.scratch.Bottom=scratchSpaceBottomSpinBox->value() / unitRatio;
+ prefsData->displayPrefs.pageGapHorizontal=pageGapHorizontalSpinBox->value() / unitRatio;
+ prefsData->displayPrefs.pageGapVertical=pageGapVerticalSpinBox->value() / unitRatio;
prefsData->displayPrefs.paperColor=colorPaper;
prefsData->displayPrefs.scratchColor=colorScratch;
More information about the scribus-commit
mailing list