r14838 by cbradney - #8849: Ensure lock widget enabled when returning to single page layout

[scribus-commit]

Revision: 14838
Author: cbradney
Date: 2010-02-28T20:03:17.242524Z
Commit message: #8849: Ensure lock widget enabled when returning to single page layout

Changeset: 
M  /branches/Version135/Scribus/scribus/marginwidget.cpp

Diffs:
Index: scribus/marginwidget.cpp
===================================================================
--- scribus/marginwidget.cpp	(revision 14837)
+++ scribus/marginwidget.cpp	(revision 14838)
@@ -354,7 +354,7 @@
 	int item = presetCombo->currentIndex();
 
 	MarginStruct marg = presetCombo->getMargins(item, pageWidth, pageHeight, leftR->value() / m_unitRatio);
-	facingPages ? presetCombo->setEnabled(true) : presetCombo->setEnabled(false);
+	presetCombo->setEnabled(facingPages);
 	bool restoringValues=false;
 	if (item==PresetLayout::none && savedPresetItem!=PresetLayout::none)
 	{
@@ -385,7 +385,7 @@
 	leftR->setEnabled(item != PresetLayout::nineparts);
 	if (item!=PresetLayout::none)
 		linkMargins->setChecked(false);
-	linkMargins->setEnabled(item==PresetLayout::none);
+	linkMargins->setEnabled(item==PresetLayout::none || !presetCombo->isEnabled());
 	connect(topR, SIGNAL(valueChanged(double)), this, SLOT(setTop()));
 	connect(bottomR, SIGNAL(valueChanged(double)), this, SLOT(setBottom()));
 	connect(leftR, SIGNAL(valueChanged(double)), this, SLOT(setLeft()));
@@ -466,7 +466,7 @@
 	if (savedPresetItem==PresetLayout::none)
 		savedMargins=marginData;
 	int item = presetCombo->currentIndex();
-	facingPages ? presetCombo->setEnabled(true) : presetCombo->setEnabled(false);
+	presetCombo->setEnabled(facingPages);
 	bool restoringValues=false;
 	if (item==PresetLayout::none && savedPresetItem!=PresetLayout::none)
 	{