remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 519f3c455946d3794408b8207b90232128549c59..10d12e1204371b6b26b36ee7125240bdee029445 100644 (file)
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -1,67 +1,65 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
+/**
+ * \file FormMinipage.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Jürgen Vigna
  *
- * \file FormMinipage.C
- * \author Jürgen Vigna, jug@sad.it
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "xformsBC.h"
 #include "ControlMinipage.h"
 #include "FormMinipage.h"
-#include "form_minipage.h"
+#include "forms/form_minipage.h"
 #include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "debug.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
-typedef FormCB<ControlMinipage, FormDB<FD_form_minipage> > base_class;
+typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
 
-FormMinipage::FormMinipage(ControlMinipage & c)
-       : base_class(c, _("Minipage Options"))
+FormMinipage::FormMinipage(Dialog & parent)
+       : base_class(parent, _("Minipage Options"))
 {}
 
 
 void FormMinipage::build()
 {
-       dialog_.reset(build_minipage());
+       dialog_.reset(build_minipage(this));
+
+       // Allow the base class to control messages
+       setMessageWidget(dialog_->text_warning);
 
        fl_set_input_return(dialog_->input_width, FL_RETURN_CHANGED);
+       setPrehandler(dialog_->input_width);
 
        string const choice = getStringFromVector(getLatexUnits(), "|");
        fl_addto_choice(dialog_->choice_width_units, subst(choice, "%", "%%").c_str());
 
        // Manage the ok, apply and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_cancel);
-       bc().setRestore(dialog_->button_restore);
-
-       bc().addReadOnly(dialog_->input_width);
-       bc().addReadOnly(dialog_->choice_width_units);
-       bc().addReadOnly(dialog_->group_alignment);
-       bc().addReadOnly(dialog_->radio_top);
-       bc().addReadOnly(dialog_->radio_middle);
-       bc().addReadOnly(dialog_->radio_bottom);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
+
+       bcview().addReadOnly(dialog_->input_width);
+       bcview().addReadOnly(dialog_->choice_width_units);
+       bcview().addReadOnly(dialog_->radio_top);
+       bcview().addReadOnly(dialog_->radio_middle);
+       bcview().addReadOnly(dialog_->radio_bottom);
 }
 
 
 void FormMinipage::apply()
 {
-       controller().params().pageWidth =
+       controller().params().width =
                LyXLength(getLengthFromWidgets(dialog_->input_width,
-                       dialog_->choice_width_units));
+                                              dialog_->choice_width_units));
 
        if (fl_get_button(dialog_->radio_top))
                controller().params().pos = InsetMinipage::top;
@@ -74,44 +72,48 @@ void FormMinipage::apply()
 
 void FormMinipage::update()
 {
-    LyXLength len(controller().params().pageWidth);
-    fl_set_input(dialog_->input_width, tostr(len.value()).c_str());
-    fl_set_choice(dialog_->choice_width_units, len.unit() + 1);
-
-    switch (controller().params().pos) {
-    case InsetMinipage::top:
-       fl_set_button(dialog_->radio_top, 1);
-       break;
-    case InsetMinipage::center:
-       fl_set_button(dialog_->radio_middle, 1);
-       break;
-    case InsetMinipage::bottom:
-       fl_set_button(dialog_->radio_bottom, 1);
-       break;
-    }
+       LyXLength len(controller().params().width);
+       fl_set_input(dialog_->input_width, tostr(len.value()).c_str());
+       fl_set_choice(dialog_->choice_width_units, len.unit() + 1);
+
+       switch (controller().params().pos) {
+       case InsetMinipage::top:
+               fl_set_button(dialog_->radio_top, 1);
+               break;
+       case InsetMinipage::center:
+               fl_set_button(dialog_->radio_middle, 1);
+               break;
+       case InsetMinipage::bottom:
+               fl_set_button(dialog_->radio_bottom, 1);
+               break;
+       }
 }
 
+
 ButtonPolicy::SMInput FormMinipage::input(FL_OBJECT * ob, long)
 {
+       clearMessage();
+
        ButtonPolicy::SMInput action = ButtonPolicy::SMI_NOOP;
 
+       if (ob == dialog_->radio_top ||
+           ob == dialog_->radio_middle ||
+           ob == dialog_->radio_bottom ||
+           ob == dialog_->choice_width_units)
+               return ButtonPolicy::SMI_VALID;
+
        // disallow senseless data
        // warnings if input is senseless
-       //
-       string input = fl_get_input(dialog_->input_width);
-       bool invalid = false;
-
        if (ob == dialog_->input_width) {
-               invalid = !isValidLength(input) && !isStrDbl(input);
+               string const input = getString(dialog_->input_width);
+               bool const invalid = !isValidLength(input) && !isStrDbl(input);
                if (invalid) {
-                       fl_set_object_label(dialog_->text_warning,
-                               _("Warning: Invalid Length!"));
-                       fl_show_object(dialog_->text_warning);
+                       postWarning(_("Invalid Length!"));
                        action = ButtonPolicy::SMI_INVALID;
                } else {
-                       fl_hide_object(dialog_->text_warning);
                        action = ButtonPolicy::SMI_VALID;
                }
        }
+
        return action;
 }