* \author Alejandro Aguilar Sierra
* \author Pablo De Napoli
* \author John Levon
- * \author Angus Leeming
+ * \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
* Adapted from FormMathsSpace martin.vermeer@hut.fi
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "FormMathsStyle.h"
#include "forms/form_maths_style.h"
-#include "bmtable.h"
-
-#include "debug.h"
+#include "ControlMath.h"
+#include "xformsBC.h"
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
+#include "bmtable.h"
#include "style.xbm"
#include "font.xbm"
+
char const * latex_mathstyle[] = {
"displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle"
};
kb_action latex_mathfontcmds[] = {
LFUN_BOLD, LFUN_SANS, LFUN_ROMAN, LFUN_ITAL, LFUN_CODE,
- LFUN_NOUN, LFUN_FRAK, LFUN_EMPH, LFUN_FREE, LFUN_DEFAULT
+ LFUN_NOUN, LFUN_FRAK, LFUN_EMPH, LFUN_FREEFONT_APPLY, LFUN_DEFAULT
};
+typedef FormController<ControlMath, FormView<FD_maths_style> > base_class;
-FormMathsStyle::FormMathsStyle(LyXView & lv, Dialogs & d,
- FormMathsPanel const & p)
- : FormMathsSub(lv, d, p, _("Maths Styles & Fonts"), false),
+FormMathsStyle::FormMathsStyle(Dialog & parent)
+ : base_class(parent, _("Math Styles & Fonts"), false),
style_(-1)
{}
-FL_FORM * FormMathsStyle::form() const
-{
- if (dialog_.get())
- return dialog_->form;
- return 0;
-}
-
-
void FormMathsStyle::build()
{
dialog_.reset(build_maths_style(this));
fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1,
style1_width, style1_height, style1_bits);
fl_set_bmtable_maxitems(dialog_->bmtable_style1, 1);
- bc().addReadOnly(dialog_->bmtable_style1);
+ bcview().addReadOnly(dialog_->bmtable_style1);
fl_set_bmtable_data(dialog_->bmtable_style2, 1, 3,
style2_width, style2_height, style2_bits);
fl_set_bmtable_maxitems(dialog_->bmtable_style2, 3);
- bc().addReadOnly(dialog_->bmtable_style2);
+ bcview().addReadOnly(dialog_->bmtable_style2);
fl_set_bmtable_data(dialog_->bmtable_font1, 1, 5,
font1_width, font1_height, font1_bits);
fl_set_bmtable_maxitems(dialog_->bmtable_font1, 5);
- bc().addReadOnly(dialog_->bmtable_font1);
+ bcview().addReadOnly(dialog_->bmtable_font1);
fl_set_bmtable_data(dialog_->bmtable_font2, 1, 3,
font2_width, font2_height, font2_bits);
fl_set_bmtable_maxitems(dialog_->bmtable_font2, 3);
- bc().addReadOnly(dialog_->bmtable_font2);
+ bcview().addReadOnly(dialog_->bmtable_font2);
- bc().setCancel(dialog_->button_close);
+ bcview().setCancel(dialog_->button_close);
}
void FormMathsStyle::apply()
{
if ((style_ >= 0) && (style_ < 4))
- parent_.insertSymbol(latex_mathstyle[style_]);
+ controller().dispatchInsert(latex_mathstyle[style_]);
else if ((style_ >= 4) && (style_ < 14))
- parent_.dispatchFunc(latex_mathfontcmds[style_ - 4]);
+ controller().dispatchFunc(latex_mathfontcmds[style_-4]);
}
-bool FormMathsStyle::input(FL_OBJECT * ob, long data)
+ButtonPolicy::SMInput FormMathsStyle::input(FL_OBJECT * ob, long data)
{
style_ = fl_get_bmtable(ob);
- if (style_ < 0) return false;
+ if (style_ < 0) return ButtonPolicy::SMI_INVALID;
+
//if (ob == dialog_->bmtable_style1) style_ += 0;
if (ob == dialog_->bmtable_style2) style_ += 1;
if (ob == dialog_->bmtable_font1) style_ += 4;
if (ob == dialog_->bmtable_font2) style_ += 9;
if (data >= 12) style_ = short(data);
apply();
- return true;
+
+ return ButtonPolicy::SMI_VALID;
}