Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / FloatPlacement.cpp

diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index ffcedaf32bb07408667227f98042e7f88a28183b..f689ab24e84839bc822696b3914613da5d0cd428 100644 (file)
--- 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.
  *
@@ -18,8 +18,8 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
-using lyx::support::contains;
 
 //namespace lyx {
 
@@ -112,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);
@@ -120,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();
 }
 
@@ -225,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);