X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FFloatPlacement.cpp;h=22fc1ac1d79d649ec1aeee9c8d5b81284e1f5ae0;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=145c98707103e0fd0b397c60a2e41d338237a46c;hpb=897436efbb9bd641b61467d185a2dfae9839e575;p=lyx.git

diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index 145c987071..22fc1ac1d7 100644
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -1,5 +1,5 @@
 /**
- * \file floatplacement.C
+ * \file FloatPlacement.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -17,10 +17,11 @@
 #include "insets/InsetFloat.h"
 #include "support/lstrings.h"
 
-using lyx::support::contains;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
-//namespace lyx {
+
+namespace lyx {
 
 FloatPlacement::FloatPlacement(QWidget *)
 {
@@ -111,6 +112,9 @@ void FloatPlacement::set(lyx::InsetFloatParams const & params)
 {
 	set(params.placement);
 
+	standardfloat_ = (params.type == "figure"
+		|| params.type == "table");
+
 	if (params.wide) {
 		herepossiblyCB->setChecked(false);
 		heredefinitelyCB->setChecked(false);
@@ -119,8 +123,8 @@ void FloatPlacement::set(lyx::InsetFloatParams const & params)
 
 	spanCB->setChecked(params.wide);
 	sidewaysCB->setChecked(params.sideways);
-	sidewaysCB->setEnabled(params.type == "figure"
-		|| params.type == "table");
+	// the package rotfloat only has *-versions for figure and table
+	spanCB->setEnabled(!params.sideways || standardfloat_);
 	checkAllowed();
 }
 
@@ -224,7 +228,7 @@ void FloatPlacement::checkAllowed()
 		ignoreCB->setEnabled(!sideways && !defaults && ignore);
 		herepossiblyCB->setEnabled(!sideways && !defaults && !span);
 		heredefinitelyCB->setEnabled(!sideways && !defaults && !span);
-		spanCB->setEnabled(!sideways);
+		spanCB->setEnabled(!sideways || standardfloat_);
 	} else {
 		topCB->setEnabled(!defaults);
 		bottomCB->setEnabled(!defaults);
@@ -235,6 +239,6 @@ void FloatPlacement::checkAllowed()
 	}
 }
 
-//} // namespace lyx
+} // namespace lyx
 
-#include "FloatPlacement_moc.cpp"
+#include "moc_FloatPlacement.cpp"