r14857 by fschmid - Fixed Bug #8901: "Scribus freezes when attempting to change the column width of a single-column text frame."

[scribus-commit]

Revision: 14857
Author: fschmid
Date: 2010-03-08T13:27:44.996303Z
Commit message: Fixed Bug #8901: "Scribus freezes when attempting to change the column width of a single-column text frame."

Changeset: 
M  /trunk/Scribus/scribus/ui/propertiespalette.cpp

Diffs:
Index: scribus/ui/propertiespalette.cpp
===================================================================
--- scribus/ui/propertiespalette.cpp	(revision 14856)
+++ scribus/ui/propertiespalette.cpp	(revision 14857)
@@ -1605,6 +1605,16 @@
 		DTop->setValue(i2->textToFrameDistTop()*m_unitRatio);
 		DBottom->setValue(i2->textToFrameDistBottom()*m_unitRatio);
 		DRight->setValue(i2->textToFrameDistRight()*m_unitRatio);
+		if (DCol->value() == 1)
+		{
+			dGap->setEnabled(false);
+			colgapLabel->setEnabled(false);
+		}
+		else
+		{
+			dGap->setEnabled(true);
+			colgapLabel->setEnabled(true);
+		}
 		// I put it here because it’s visually grouped with these elements
 		// but it’s a PageItem prop. and as such should be set without considering
 		// the frame type.
@@ -2367,6 +2377,16 @@
 	}
 	DCol->setMinimum(1);
 	dGap->setMinimum(0);
+	if (DCol->value() == 1)
+	{
+		dGap->setEnabled(false);
+		colgapLabel->setEnabled(false);
+	}
+	else
+	{
+		dGap->setEnabled(true);
+		colgapLabel->setEnabled(true);
+	}
 	HaveItem = tmp;
 }
 
@@ -3258,6 +3278,16 @@
 	CurItem->Cols = DCol->value();
 	setCols(CurItem->Cols, CurItem->ColGap);
 	CurItem->update();
+	if (DCol->value() == 1)
+	{
+		dGap->setEnabled(false);
+		colgapLabel->setEnabled(false);
+	}
+	else
+	{
+		dGap->setEnabled(true);
+		colgapLabel->setEnabled(true);
+	}
 	emit DocChanged();
 }