#include "Dialogs.h"
#include "LyXView.h"
-#include "lyxfunc.h"
#include "FormMathsPanel.h"
#include "form_maths_panel.h"
#include "MathsSymbols.h"
#include "debug.h"
+#include "lyxfunc.h"
#include "form_maths_deco.h"
#include "form_maths_delim.h"
#include "form_maths_matrix.h"
#include "form_maths_space.h"
+#include "form_maths_style.h"
#include "FormMathsBitmap.h"
#include "FormMathsDeco.h"
#include "FormMathsDelim.h"
#include "FormMathsMatrix.h"
#include "FormMathsSpace.h"
+#include "FormMathsStyle.h"
+
+#include "ButtonController.tmpl"
#include "deco.xpm"
#include "delim.xpm"
#include "frac.xpm"
#include "matrix.xpm"
#include "space.xpm"
+#include "style.xpm"
#include "sqrt.xpm"
+#include "sub.xpm"
+#include "super.xpm"
#include "arrows.xbm"
#include "bop.xbm"
#include "misc.xbm"
#include "varsz.xbm"
+#include "ams_misc.xbm"
+#include "ams_arrows.xbm"
+#include "ams_rel.xbm"
+#include "ams_nrel.xbm"
+#include "ams_ops.xbm"
+
using std::vector;
using SigC::slot;
FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
- : FormBaseBD(lv, d, _("Maths Panel")),
+ : FormBaseBD(lv, d, _("Maths Panel"), false),
active_(0), bc_("Close")
{
deco_.reset( new FormMathsDeco( lv, d, *this));
delim_.reset( new FormMathsDelim( lv, d, *this));
matrix_.reset(new FormMathsMatrix(lv, d, *this));
space_.reset( new FormMathsSpace( lv, d, *this));
+ style_.reset( new FormMathsStyle( lv, d, *this));
typedef vector<string> StringVec;
boperator_.reset(new FormMathsBitmap(lv, d, *this, latex));
latex.resize(nr_latex_brel);
- for (StringVec::size_type i = 0; i<latex.size(); ++i) {
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
latex[i] = latex_brel[i];
}
brelats_.reset(new FormMathsBitmap(lv, d, *this, latex));
greek_.reset(new FormMathsBitmap(lv, d, *this, latex));
latex.resize(nr_latex_misc);
- for (StringVec::size_type i = 0; i<latex.size(); ++i) {
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
latex[i] = latex_misc[i];
}
misc_.reset(new FormMathsBitmap(lv, d, *this, latex));
+ latex.resize(nr_latex_dots);
+ for (StringVec::size_type i = 0; i<latex.size(); ++i) {
+ latex[i] = latex_dots[i];
+ }
+
+ dots_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
latex.resize(nr_latex_varsz);
for (StringVec::size_type i = 0; i<latex.size(); ++i) {
latex[i] = latex_varsz[i];
}
varsize_.reset(new FormMathsBitmap(lv, d, *this, latex));
+ latex.resize(nr_latex_ams_misc);
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
+ latex[i] = latex_ams_misc[i];
+ }
+ ams_misc_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
+ latex.resize(nr_latex_ams_arrows);
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
+ latex[i] = latex_ams_arrows[i];
+ }
+ ams_arrows_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
+ latex.resize(nr_latex_ams_rel);
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
+ latex[i] = latex_ams_rel[i];
+ }
+ ams_rel_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
+ latex.resize(nr_latex_ams_nrel);
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
+ latex[i] = latex_ams_nrel[i];
+ }
+ ams_nrel_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
+ latex.resize(nr_latex_ams_ops);
+ for (StringVec::size_type i = 0; i < latex.size(); ++i) {
+ latex[i] = latex_ams_ops[i];
+ }
+ ams_ops_.reset(new FormMathsBitmap(lv, d, *this, latex));
+
d->showMathPanel.connect(slot(this, &FormMathsPanel::show));
}
const_cast<char**>(sqrt_xpm));
fl_set_pixmap_data(dialog_->button_frac,
const_cast<char**>(frac));
+ fl_set_pixmap_data(dialog_->button_super,
+ const_cast<char**>(super_xpm));
+ fl_set_pixmap_data(dialog_->button_sub,
+ const_cast<char**>(sub_xpm));
fl_set_pixmap_data(dialog_->button_delim,
const_cast<char**>(delim));
fl_set_pixmap_data(dialog_->button_deco,
const_cast<char**>(deco));
fl_set_pixmap_data(dialog_->button_space,
const_cast<char**>(space_xpm));
+ fl_set_pixmap_data(dialog_->button_style,
+ const_cast<char**>(style_xpm));
fl_set_pixmap_data(dialog_->button_matrix,
const_cast<char**>(matrix));
fl_set_pixmap_data(dialog_->button_equation,
greek_->addBitmap(28, 7, 4, greek_width, greek_height, greek_bits);
misc_->addBitmap(29, 5, 6, misc_width, misc_height, misc_bits);
+ misc_->addBitmap(6, 3, 2, misc2_width, misc2_height, misc2_bits, false);
+ misc_->addBitmap(4, 2, 2, misc3_width, misc3_height, misc3_bits);
+
+ dots_->addBitmap(4, 4, 1, dots_width, dots_height, dots_bits);
varsize_->addBitmap(14, 3, 5, varsz_width, varsz_height, varsz_bits);
+ ams_misc_->addBitmap(9, 5, 2, ams1_width, ams1_height, ams1_bits);
+ ams_misc_->addBitmap(26, 3, 9, ams7_width, ams7_height, ams7_bits);
+
+ ams_arrows_->addBitmap(32, 3, 11, ams2_width, ams2_height, ams2_bits);
+ ams_arrows_->addBitmap(6, 3, 2, ams3_width, ams3_height, ams3_bits);
+
+ ams_rel_->addBitmap(66, 3, 22, ams_rel_width, ams_rel_height, ams_rel_bits);
+
+ ams_nrel_->addBitmap(51, 3, 17, ams_nrel_width, ams_nrel_height, ams_nrel_bits);
+
+ ams_ops_->addBitmap(23, 3, 8, ams_ops_width, ams_ops_height, ams_ops_bits);
+
bc().setCancel(dialog_->button_close);
- bc().refresh();
}
bool FormMathsPanel::input(FL_OBJECT *, long data)
misc_->show();
break;
+ case MM_DOTS:
+ if (active_ && active_ != dots_.get())
+ active_->hide();
+ dots_->show();
+ break;
+
case MM_VARSIZE:
if (active_ && active_ != varsize_.get())
active_->hide();
varsize_->show();
break;
+ case MM_AMS_MISC:
+ if (active_ && active_ != ams_misc_.get())
+ active_->hide();
+ ams_misc_->show();
+ break;
+
+ case MM_AMS_ARROWS:
+ if (active_ && active_ != ams_arrows_.get())
+ active_->hide();
+ ams_arrows_->show();
+ break;
+
+ case MM_AMS_BREL:
+ if (active_ && active_ != ams_rel_.get())
+ active_->hide();
+ ams_rel_->show();
+ break;
+
+ case MM_AMS_NREL:
+ if (active_ && active_ != ams_nrel_.get())
+ active_->hide();
+ ams_nrel_->show();
+ break;
+
+ case MM_AMS_OPS:
+ if (active_ && active_ != ams_ops_.get())
+ active_->hide();
+ ams_ops_->show();
+ break;
+
case MM_FRAC:
insertSymbol("frac");
break;
insertSymbol("sqrt");
break;
+ case MM_SUPER:
+ lv_->getLyXFunc()->dispatch(LFUN_MATH_MODE);
+ lv_->getLyXFunc()->dispatch(LFUN_SUPERSCRIPT);
+ break;
+
+ case MM_SUB:
+ lv_->getLyXFunc()->dispatch(LFUN_MATH_MODE);
+ lv_->getLyXFunc()->dispatch(LFUN_SUBSCRIPT);
+ break;
+
+ case MM_SUBSUPER:
+ lv_->getLyXFunc()->dispatch(LFUN_SUBSCRIPT);
+ lv_->getLyXFunc()->dispatch(LFUN_LEFT);
+ lv_->getLyXFunc()->dispatch(LFUN_SUPERSCRIPT);
+ break;
+
case MM_DELIM:
if (active_ && active_ != delim_.get())
active_->hide();
space_->show();
break;
+ case MM_STYLE:
+ if (active_ && active_ != style_.get())
+ active_->hide();
+ style_->show();
+ break;
+
case MM_EQU:
mathDisplay();
break;
}
-void FormMathsPanel::insertSymbol(string const & sym) const
+void FormMathsPanel::insertSymbol(string const & sym, bool bs) const
+{
+ if (bs)
+ lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATH, '\\' + sym);
+ else
+ lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATH, sym);
+}
+
+
+void FormMathsPanel::dispatchFunc(kb_action action) const
{
- lv_->getLyXFunc()->Dispatch(LFUN_INSERT_MATH, sym);
+ lv_->getLyXFunc()->dispatch(action);
}
void FormMathsPanel::mathDisplay() const
{
- lv_->getLyXFunc()->Dispatch(LFUN_MATH_DISPLAY);
+ lv_->getLyXFunc()->dispatch(LFUN_MATH_DISPLAY);
}
FormMathsSub::FormMathsSub(LyXView * lv, Dialogs * d, FormMathsPanel const & p,
- string const & t)
- : FormBaseBD(lv, d, t), parent_(p), bc_("Close")
+ string const & t, bool allowResize)
+ : FormBaseBD(lv, d, t, allowResize), parent_(p), bc_("Close")
{}
projects / lyx.git / blobdiff