From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Fri, 2 Apr 2004 09:32:45 +0000 (+0000)
Subject: I hope this is the final adjustment to enable/disable
X-Git-Tag: 1.6.10~15373
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5d2127ac8e0223165af0beb211067a9c5aed6a70;p=features.git

I hope this is the final adjustment to enable/disable
the placement options in the qt float dialog correctly.
Yesterday's fix still had some glitches.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8590 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 46294344ff..283fc10ff0 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-04  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* floatplacement.[Ch]: another adjustment of placement enabling.
+
 2004-01-04  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* floatplacement.[Ch]: correct fix for enabling of placement 
diff --git a/src/frontends/qt2/floatplacement.C b/src/frontends/qt2/floatplacement.C
index d57cb29cd8..27cbd35176 100644
--- a/src/frontends/qt2/floatplacement.C
+++ b/src/frontends/qt2/floatplacement.C
@@ -146,6 +146,7 @@ void FloatPlacement::set(string const & placement)
 	ignoreCB->setChecked(force);
 	ignoreCB->setEnabled(top || bottom || page || here);
 	heredefinitelyCB->setChecked(here_definitely);
+	checkAllowed();
 }
 
 
@@ -163,6 +164,7 @@ void FloatPlacement::set(InsetFloatParams const & params)
 	sidewaysCB->setChecked(params.sideways);
 	sidewaysCB->setEnabled(params.type == "figure" 
 		|| params.type == "table");
+	checkAllowed();
 }
 
 
@@ -271,4 +273,5 @@ void FloatPlacement::checkAllowed()
 	ignoreCB->setEnabled(!sideways && !defaults && ignore);
 	herepossiblyCB->setEnabled(!sideways && !defaults && !span);
 	heredefinitelyCB->setEnabled(!sideways && !defaults && !span);
+	spanCB->setEnabled(!sideways);
 }