r14839 by cbradney - #8849 applied to new margin widget

[scribus-commit]

Revision: 14839
Author: cbradney
Date: 2010-02-28T21:02:57.054418Z
Commit message: #8849 applied to new margin widget

Changeset: 
M  /trunk/Scribus/scribus/ui/newmarginwidget.cpp
M  /trunk/Scribus/scribus/ui/marginwidget.cpp
M  /trunk/Scribus/scribus/ui/newfile.cpp

Diffs:
Index: scribus/ui/newmarginwidget.cpp
===================================================================
--- scribus/ui/newmarginwidget.cpp	(revision 14838)
+++ scribus/ui/newmarginwidget.cpp	(revision 14839)
@@ -212,7 +212,7 @@
 	leftMarginSpinBox->setEnabled(item != PresetLayout::nineparts);
 	if (item!=PresetLayout::none)
 		marginLinkCheckBox->setChecked(false);
-	marginLinkCheckBox->setEnabled(item==PresetLayout::none);
+	marginLinkCheckBox->setEnabled(item==PresetLayout::none || !presetLayoutComboBox->isEnabled());
 	leftMarginSpinBox->blockSignals(false);
 	rightMarginSpinBox->blockSignals(false);
 	topMarginSpinBox->blockSignals(false);
Index: scribus/ui/newfile.cpp
===================================================================
--- scribus/ui/newfile.cpp	(revision 14838)
+++ scribus/ui/newfile.cpp	(revision 14839)
@@ -668,7 +668,7 @@
 
 void NewDoc::setDocLayout(int layout)
 {
-	marginGroup->setFacingPages(!(layout == singlePage));
+	marginGroup->setFacingPages(layout != singlePage);
 	m_choosenLayout = layout;
 	firstPage->setCurrentIndex(prefsManager->appPrefs.pageSets[m_choosenLayout].FirstPage);
 }
Index: scribus/ui/marginwidget.cpp
===================================================================
--- scribus/ui/marginwidget.cpp	(revision 14838)
+++ scribus/ui/marginwidget.cpp	(revision 14839)
@@ -384,7 +384,6 @@
 	if (pageType == 1)
 		rightR->setEnabled(false);
 	leftR->setEnabled(item != PresetLayout::nineparts);
-	qDebug()<<item;
 	if (item!=PresetLayout::none)
 		linkMargins->setChecked(false);
 	linkMargins->setEnabled(item==PresetLayout::none || !presetCombo->isEnabled());