get rid of broken_header.h and some unneeded tests

[lyx.git] / src / frontends / xforms / FormFloat.C

diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index e1bae267154d69b1aee7f3263f3d49a1418d1351..c38b68a99885fef5d75cffa361477afb8262a61d 100644 (file)
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -7,21 +7,32 @@
  * \author Jürgen Spitzmüller
  * \author Rob Lahaye
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
-#include "xformsBC.h"
-#include "ControlFloat.h"
 #include "FormFloat.h"
+#include "ControlFloat.h"
 #include "forms/form_float.h"
+
 #include "Tooltips.h"
 #include "xforms_helpers.h"
+#include "xformsBC.h"
+
 #include "insets/insetfloat.h"
+
 #include "support/lstrings.h"
-#include FORMS_H_LOCATION
+
+#include "lyx_forms.h"
+
+using std::string;
+
+namespace lyx {
+
+using support::contains;
+
+namespace frontend {
 
 namespace {
 
@@ -61,6 +72,7 @@ void FormFloat::build()
        bcview().addReadOnly(dialog_->check_here);
        bcview().addReadOnly(dialog_->check_force);
        bcview().addReadOnly(dialog_->check_wide);
+       bcview().addReadOnly(dialog_->check_sideways);
 
        placement_.init(dialog_->radio_default,         DOCUMENT_DEFAULTS);
        placement_.init(dialog_->radio_here_definitely, HERE_DEFINITELY);
@@ -85,12 +97,15 @@ void FormFloat::build()
        tooltips().init(dialog_->check_force, str);
        str = _("Span float over the columns.");
        tooltips().init(dialog_->check_wide, str);
+       str = _("Rotate the float sideways by 90 degs.");
+       tooltips().init(dialog_->check_sideways, str);
 }
 
 
 void FormFloat::apply()
 {
        bool const wide = fl_get_button(dialog_->check_wide);
+       bool const sideways = fl_get_button(dialog_->check_sideways);
 
        string placement;
        switch (placement_.get()) {
@@ -144,6 +159,7 @@ void FormFloat::apply()
 
        controller().params().placement = placement;
        controller().params().wide = wide;
+       controller().params().sideways = sideways;
 }
 
 
@@ -151,14 +167,17 @@ void FormFloat::update()
 {
        string placement(controller().params().placement);
        bool const wide = controller().params().wide;
+       bool const sideways = controller().params().sideways;
+       bool const sideways_possible = (controller().params().type == "figure"
+               || controller().params().type == "table");
 
-       bool const here_definitely = contains(placement, "H");
+       bool const here_definitely = contains(placement, 'H');
 
-       bool const top    = contains(placement, "t");
-       bool const bottom = contains(placement, "b");
-       bool const page   = contains(placement, "p");
-       bool const here   = contains(placement, "h");
-       bool const force  = contains(placement, "!");
+       bool const top    = contains(placement, 't');
+       bool const bottom = contains(placement, 'b');
+       bool const page   = contains(placement, 'p');
+       bool const here   = contains(placement, 'h');
+       bool const force  = contains(placement, '!');
        bool const alternatives = top || bottom || page || (here && !wide);
 
        if (alternatives) {
@@ -174,13 +193,18 @@ void FormFloat::update()
        fl_set_button(dialog_->check_page, page);
        fl_set_button(dialog_->check_here, here);
        fl_set_button(dialog_->check_wide, wide);
-
-       setEnabled(dialog_->radio_here_definitely, !wide);
-       setEnabled(dialog_->check_force,  alternatives);
-       setEnabled(dialog_->check_top,    alternatives);
-       setEnabled(dialog_->check_bottom, alternatives);
-       setEnabled(dialog_->check_page,   alternatives);
-       setEnabled(dialog_->check_here,   alternatives && !wide);
+       fl_set_button(dialog_->check_sideways, sideways);
+
+       setEnabled(dialog_->radio_here_definitely, !wide && !sideways);
+       setEnabled(dialog_->check_force,  alternatives && !sideways);
+       setEnabled(dialog_->check_top,    alternatives && !sideways);
+       setEnabled(dialog_->check_bottom, alternatives && !sideways);
+       setEnabled(dialog_->check_page,   alternatives && !sideways);
+       setEnabled(dialog_->check_here,   alternatives && !wide && !sideways);
+       setEnabled(dialog_->check_wide,   !sideways);
+       setEnabled(dialog_->radio_default,   !sideways);
+       setEnabled(dialog_->radio_alternatives,   !sideways);
+       setEnabled(dialog_->check_sideways, sideways_possible);
 }
 
 
@@ -188,16 +212,17 @@ ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
 {
        bool const alternatives = placement_.get() == ALTERNATIVES;
        bool const wide = fl_get_button(dialog_->check_wide);
+       bool const sideways = fl_get_button(dialog_->check_sideways);
 
        if (ob == dialog_->radio_default ||
            ob == dialog_->radio_here_definitely ||
            ob == dialog_->radio_alternatives) {
                // enable check buttons only for Alternatives
                setEnabled(dialog_->check_top, alternatives);
-               setEnabled(dialog_->check_bottom, alternatives);
                setEnabled(dialog_->check_page, alternatives);
-               // wide float doesn't allow 'here' placement
+               // wide float doesn't allow 'here' or 'bottom' placement
                setEnabled(dialog_->check_here, alternatives && !wide);
+               setEnabled(dialog_->check_bottom, alternatives && !wide);
 
        } else if (ob == dialog_->check_wide) {
                if (wide && placement_.get() == HERE_DEFINITELY) {
@@ -207,11 +232,23 @@ ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
                }
                setEnabled(dialog_->check_here, alternatives && !wide);
                setEnabled(dialog_->radio_here_definitely, !wide);
+               setEnabled(dialog_->check_bottom, alternatives && !wide);
+
+       } else if (ob == dialog_->check_sideways) {
+               setEnabled(dialog_->radio_default,   !sideways);
+               setEnabled(dialog_->radio_alternatives,   !sideways);
+               setEnabled(dialog_->radio_here_definitely, !wide && !sideways);
+               setEnabled(dialog_->check_top, alternatives && !sideways);
+               setEnabled(dialog_->check_bottom,
+                       alternatives && !wide && !sideways);
+               setEnabled(dialog_->check_page, alternatives && !sideways);
+               setEnabled(dialog_->check_here, alternatives && !wide && !sideways);
+               setEnabled(dialog_->check_wide,   !sideways);
        }
 
        // enable force button, if Alternatives is selected and at least
        // one of its check buttons
-       bool const enable_force = alternatives &&
+       bool const enable_force = alternatives && !sideways &&
                (fl_get_button(dialog_->check_top) ||
                 fl_get_button(dialog_->check_bottom) ||
                 fl_get_button(dialog_->check_page) ||
@@ -220,3 +257,6 @@ ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
 
        return ButtonPolicy::SMI_VALID;
 }
+
+} // namespace frontend
+} // namespace lyx