]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormFloat.C
Yet more dialog tweaking from Rob.
[lyx.git] / src / frontends / xforms / FormFloat.C
index 07b442aa3ae67a39b3d97e02d88e2fbbfb0a520c..ebd130a68a631ed5a655298d00cdf35ef489098e 100644 (file)
@@ -1,9 +1,12 @@
 /**
  * \file FormFloat.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes, larsbj@lyx.org
+ * \author Lars Gullik Bjønnes
+ * \author Juergen Spitzmueller j.spitzmueller@gmx.de
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 #include "xformsBC.h"
 #include "ControlFloat.h"
 #include "FormFloat.h"
-#include "form_float.h"
+#include "forms/form_float.h"
 #include "support/lstrings.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
-typedef FormCB<ControlFloat, FormDB<FD_form_float> > base_class;
+typedef FormCB<ControlFloat, FormDB<FD_float> > base_class;
 
-FormFloat::FormFloat(ControlFloat & c)
-       : base_class(c, _("Float Options"))
+FormFloat::FormFloat()
+       : base_class(_("Float Options"))
 {}
 
 
-// FIX: Needs to be implemented. (Lgb)
-// A way to set to float default is missing.
-// A way to set "force[!]" is missing.
-
 void FormFloat::build()
 {
-       dialog_.reset(build_float());
+       dialog_.reset(build_float(this));
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
@@ -40,11 +40,14 @@ void FormFloat::build()
        bc().setCancel(dialog_->button_close);
        bc().setRestore(dialog_->button_restore);
 
+       bc().addReadOnly(dialog_->check_default);
        bc().addReadOnly(dialog_->check_top);
        bc().addReadOnly(dialog_->check_bottom);
        bc().addReadOnly(dialog_->check_page);
        bc().addReadOnly(dialog_->check_here);
+       bc().addReadOnly(dialog_->check_force);
        bc().addReadOnly(dialog_->check_here_definitely);
+       bc().addReadOnly(dialog_->check_wide);
 }
 
 
@@ -54,6 +57,12 @@ void FormFloat::apply()
        if (fl_get_button(dialog_->check_here_definitely)) {
                placement += "H";
        } else {
+               if (fl_get_button(dialog_->check_force)) {
+                       placement += "!";
+               }
+               if (fl_get_button(dialog_->check_here)) {
+                       placement += "h";
+               }
                if (fl_get_button(dialog_->check_top)) {
                        placement += "t";
                }
@@ -63,27 +72,35 @@ void FormFloat::apply()
                if (fl_get_button(dialog_->check_page)) {
                        placement += "p";
                }
-               if (fl_get_button(dialog_->check_here)) {
-                       placement += "h";
-               }
+
        }
        controller().params().placement = placement;
+       controller().params().wide = fl_get_button(dialog_->check_wide);
 }
 
 
 void FormFloat::update()
 {
+       bool def_placement = false;
        bool top = false;
        bool bottom = false;
        bool page = false;
        bool here = false;
+       bool force = false;
        bool here_definitely = false;
 
        string placement(controller().params().placement);
-       
-       if (contains(placement, "H")) {
+
+       if (placement.empty()) {
+               def_placement = true;
+
+       } else if (contains(placement, "H")) {
                here_definitely = true;
+
        } else {
+               if (contains(placement, "!")) {
+                       force = true;
+               }
                if (contains(placement, "t")) {
                        top = true;
                }
@@ -97,28 +114,89 @@ void FormFloat::update()
                        here = true;
                }
        }
+       fl_set_button(dialog_->check_default, def_placement);
        fl_set_button(dialog_->check_top, top);
        fl_set_button(dialog_->check_bottom, bottom);
        fl_set_button(dialog_->check_page, page);
        fl_set_button(dialog_->check_here, here);
+       fl_set_button(dialog_->check_force, force);
        fl_set_button(dialog_->check_here_definitely, here_definitely);
-       setEnabled(dialog_->check_here_definitely, controller().params().allow_here_definitely);
+       setEnabled(dialog_->check_here_definitely, !controller().params().wide 
+                       && !def_placement);
+       if (controller().params().wide) {
+                       fl_set_button(dialog_->check_here, false);
+                       fl_set_button(dialog_->check_bottom, false);
+       }
+       setEnabled(dialog_->check_here, !controller().params().wide && !def_placement);
+       setEnabled(dialog_->check_bottom, !controller().params().wide && !def_placement);
+       fl_set_button(dialog_->check_wide, controller().params().wide);
+       setEnabled(dialog_->check_top, !def_placement);
+       setEnabled(dialog_->check_page, !def_placement);
+       setEnabled(dialog_->check_force, top || bottom || page || here);
 }
 
 
 ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
 {
-       if (ob == dialog_->check_here_definitely) {
+       bool const def_place = fl_get_button(dialog_->check_default);
+       bool const wide_float = fl_get_button(dialog_->check_wide);
+       // with wide floats, h[ere] is not allowed
+       // b[ottom] is allowed (only) for figure* in multicolumn, don't
+       // disallow it therefore
+       bool const wide_options = (fl_get_button(dialog_->check_top)
+                                       || fl_get_button(dialog_->check_bottom)
+                                       || fl_get_button(dialog_->check_page));
+       // The !-option is only allowed together with h, t, b, or p
+       // We have to take this into account
+       bool const standard_options = (wide_options || fl_get_button(dialog_->check_here));
+       
+       if (ob == dialog_->check_default) {
+               if (def_place) {
+                       fl_set_button(dialog_->check_top, false);
+                       fl_set_button(dialog_->check_bottom,  false);
+                       fl_set_button(dialog_->check_page, false);
+                       fl_set_button(dialog_->check_here, false);
+                       fl_set_button(dialog_->check_force, false);
+                       fl_set_button(dialog_->check_here_definitely, false);
+                       }
+               setEnabled(dialog_->check_top, !def_place);
+               setEnabled(dialog_->check_bottom, !def_place);
+               setEnabled(dialog_->check_page, !def_place);
+               setEnabled(dialog_->check_here, !def_place && !wide_float);
+               setEnabled(dialog_->check_force, !def_place && standard_options);
+               setEnabled(dialog_->check_here_definitely, !def_place && !wide_float);
+
+       } else if (ob == dialog_->check_wide) {
+               if (wide_float) {
+                       fl_set_button(dialog_->check_here_definitely, false);
+                       fl_set_button(dialog_->check_here, false);
+                       if (!wide_options) {
+                               fl_set_button(dialog_->check_force, false);
+                               setEnabled(dialog_->check_force, false);
+                       }
+               }
+               setEnabled(dialog_->check_here, !def_place && !wide_float);
+               setEnabled(dialog_->check_force, !def_place && wide_options);
+               setEnabled(dialog_->check_here_definitely, !def_place && !wide_float);
+
+       } else if (ob == dialog_->check_here_definitely) {
                if (fl_get_button(dialog_->check_here_definitely)) {
                        fl_set_button(dialog_->check_top,    false);
                        fl_set_button(dialog_->check_bottom, false);
                        fl_set_button(dialog_->check_page,   false);
                        fl_set_button(dialog_->check_here,   false);
+                       fl_set_button(dialog_->check_force,   false);
+                       setEnabled(dialog_->check_force, false);
                }
-       } else {
-               if (fl_get_button(dialog_->check_here_definitely)) {
+
+       } else if (ob == dialog_->check_here || ob == dialog_->check_top
+               || ob == dialog_->check_bottom || ob == dialog_->check_page) {
+               if (!standard_options)
+                       fl_set_button(dialog_->check_force, false);
+               else
                        fl_set_button(dialog_->check_here_definitely, false);
-               }
+               setEnabled(dialog_->check_force, standard_options);
+
        }
 
        return ButtonPolicy::SMI_VALID;