/**
* \file FormMathsMatrix.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 Alejandro Aguilar Sierra
- * \author Pablo De Napoli, pdenapo@dm.uba.ar
- * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Pablo De Napoli
+ * \author John Levon
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG_
-#pragma implementation
-#endif
-
#include "FormMathsMatrix.h"
-#include "form_maths_matrix.h"
-#include "Dialogs.h"
-#include "LyXView.h"
-#include "Lsstream.h"
-#include "lyxfunc.h"
-#include "support/LAssert.h"
+#include "forms/form_maths_matrix.h"
+#include "ControlMath.h"
+
+#include "xformsBC.h"
+
+#include "controllers/ButtonController.h"
+
+#include "support/lyxalgo.h" // lyx::count
+
+#include "lyx_forms.h"
+
+#include "support/std_sstream.h"
+
+
+using std::ostringstream;
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
static char h_align_str[80] = "c";
static char v_align_c[] = "tcb";
-extern "C"
-int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
- char const * cur, int c)
-{
- lyx::Assert(ob);
- FormMathsMatrix * pre = static_cast<FormMathsMatrix *>(ob->u_vdata);
- lyx::Assert(pre);
- return pre->AlignFilter(cur, c);
-}
-
-FormMathsMatrix::FormMathsMatrix(LyXView * lv, Dialogs * d,
- FormMathsPanel const & p)
- : FormMathsSub(lv, d, p, _("Maths Matrix"), false)
-{}
+extern "C" {
+ static
+ int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
+ char const * cur, int c)
+ {
+ BOOST_ASSERT(ob);
+ FormMathsMatrix * pre =
+ static_cast<FormMathsMatrix *>(ob->u_vdata);
+ BOOST_ASSERT(pre);
+ return pre->AlignFilter(cur, c);
+ }
-FL_FORM * FormMathsMatrix::form() const
-{
- if (dialog_.get())
- return dialog_->form;
- return 0;
}
+typedef FormController<ControlMath, FormView<FD_maths_matrix> > base_class;
+
+FormMathsMatrix::FormMathsMatrix(Dialog & parent)
+ : base_class(parent, _("Math Matrix"), false)
+{}
+
+
void FormMathsMatrix::build()
{
- dialog_.reset(build_maths_matrix());
+ dialog_.reset(build_maths_matrix(this));
- fl_addto_choice(dialog_->choice_valign, _("Top | Center | Bottom"));
+ fl_addto_choice(dialog_->choice_valign,
+ _("Top | Middle | Bottom").c_str());
fl_set_choice(dialog_->choice_valign, 2);
fl_set_input(dialog_->input_halign, h_align_str);
dialog_->input_halign->u_vdata = this;
fl_set_input_filter(dialog_->input_halign,
C_FormMathsMatrixAlignFilter);
+ setPrehandler(dialog_->input_halign);
- bc().setOK(dialog_->button_ok);
- bc().setApply(dialog_->button_apply);
- bc().setCancel(dialog_->button_cancel);
+ bcview().setOK(dialog_->button_ok);
+ bcview().setApply(dialog_->button_apply);
+ bcview().setCancel(dialog_->button_close);
- bc().addReadOnly(dialog_->slider_rows);
- bc().addReadOnly(dialog_->slider_columns);
- bc().addReadOnly(dialog_->choice_valign);
- bc().addReadOnly(dialog_->input_halign);
+ bcview().addReadOnly(dialog_->slider_rows);
+ bcview().addReadOnly(dialog_->slider_columns);
+ bcview().addReadOnly(dialog_->choice_valign);
+ bcview().addReadOnly(dialog_->input_halign);
}
char const * sh = fl_get_input(dialog_->input_halign);
int const nx = int(fl_get_slider_value(dialog_->slider_columns) + 0.5);
int const ny = int(fl_get_slider_value(dialog_->slider_rows) + 0.5);
-
- ostringstream ost;
- ost << nx << ' ' << ny << ' ' << c << sh;
-
- lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATRIX, ost.str().c_str());
+
+ ostringstream os;
+ os << nx << ' ' << ny << ' ' << c << ' ' << sh;
+ controller().dispatchMatrix(os.str());
+}
+
+
+void FormMathsMatrix::update()
+{
+ bc().valid();
}
-bool FormMathsMatrix::input(FL_OBJECT * ob, long)
+
+ButtonPolicy::SMInput FormMathsMatrix::input(FL_OBJECT * ob, long)
{
if (ob == dialog_->choice_valign ||
- ob == dialog_->slider_rows) return true;
+ ob == dialog_->slider_rows) return ButtonPolicy::SMI_VALID;
int const nx = int(fl_get_slider_value(dialog_->slider_columns)+0.5);
for (int i = 0; i < nx; ++i)
h_align_str[i] = 'c';
-
+
h_align_str[nx] = '\0';
fl_set_input(dialog_->input_halign, h_align_str);
fl_redraw_object(dialog_->input_halign);
- return true;
+ return ButtonPolicy::SMI_VALID;
}
int FormMathsMatrix::AlignFilter(char const * cur, int c)
{
- int const n = int(fl_get_slider_value(dialog_->slider_columns) + 0.5) -
- int(strlen(cur));
+ size_t const len = strlen(cur);
+
+ int const n = int(fl_get_slider_value(dialog_->slider_columns) + 0.5)
+ - int(len)
+ + int(lyx::count(cur, cur + len, '|'));
if (n < 0)
return FL_INVALID;
- if (c == 'c' || c == 'l' || c == 'r')
+ if (c == 'c' || c == 'l' || c == 'r' || c == '|')
return FL_VALID;
-
+
return FL_INVALID;
}