* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include "GuiMathMatrix.h"
-#include "ControlMath.h"
#include "EmptyTable.h"
#include "qt_helpers.h"
-#include "gettext.h"
-#include <sstream>
+#include "FuncRequest.h"
+
+#include "support/gettext.h"
#include <QLineEdit>
#include <QPushButton>
#include <QSpinBox>
-using std::ostringstream;
-using std::string;
+using namespace std;
namespace lyx {
namespace frontend {
-GuiMathMatrixDialog::GuiMathMatrixDialog(LyXView & lv)
- : GuiDialog(lv, "mathmatrix")
+static char const * const DecoChars[] = {
+ N_("None"),
+ N_("[x]"),
+ N_("(x)"),
+ N_("{x}"),
+ N_("|x|"),
+ N_("||x||"),
+ ""
+};
+
+static char const * const DecoNames[] = {
+ N_("bmatrix"),
+ N_("pmatrix"),
+ N_("Bmatrix"),
+ N_("vmatrix"),
+ N_("Vmatrix"),
+ ""
+};
+
+static char const * const VertAligns[] = {
+ N_("Top"),
+ N_("Middle"),
+ N_("Bottom"),
+ ""
+};
+
+static char const v_align_c[] = "tcb";
+
+
+GuiMathMatrix::GuiMathMatrix(GuiView & lv)
+ : GuiDialog(lv, "mathmatrix", qt_("Math Matrix"))
{
setupUi(this);
- setViewTitle(_("Math Matrix"));
- setController(new ControlMath(*this));
+
+ for (int i = 0; *VertAligns[i]; ++i)
+ valignCO->addItem(qt_(VertAligns[i]));
+ for (int i = 0; *DecoChars[i]; ++i)
+ decorationCO->addItem(qt_(DecoChars[i]));
table->setMinimumSize(100, 100);
rowsSB->setValue(5);
columnsSB->setValue(5);
valignCO->setCurrentIndex(1);
-
- connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
- connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+ decorationCO->setCurrentIndex(0);
connect(table, SIGNAL(rowsChanged(int)),
rowsSB, SLOT(setValue(int)));
connect(columnsSB, SIGNAL(valueChanged(int)),
table, SLOT(setNumberColumns(int)));
connect(rowsSB, SIGNAL(valueChanged(int)),
- this, SLOT(rowsChanged(int)));
+ this, SLOT(change_adaptor()));
connect(columnsSB, SIGNAL(valueChanged(int)),
this, SLOT(columnsChanged(int)) );
- connect(valignCO, SIGNAL(highlighted(const QString&)),
+ connect(valignCO, SIGNAL(highlighted(QString)),
this, SLOT(change_adaptor()));
- connect(halignED, SIGNAL(textChanged(const QString&)),
+ connect(halignED, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
+ connect(decorationCO, SIGNAL(activated(int)),
+ this, SLOT(decorationChanged(int)));
bc().setPolicy(ButtonPolicy::IgnorantPolicy);
}
-ControlMath & GuiMathMatrixDialog::controller() const
+void GuiMathMatrix::columnsChanged(int)
{
- return static_cast<ControlMath &>(GuiDialog::controller());
+ int const nx = int(columnsSB->value());
+ halignED->setText(QString(nx, 'c'));
}
-void GuiMathMatrixDialog::columnsChanged(int)
+void GuiMathMatrix::decorationChanged(int deco)
{
- char h_align_str[80] = "c";
- int const nx = int(columnsSB->value());
- for (int i = 0; i < nx; ++i)
- h_align_str[i] = 'c';
-
- h_align_str[nx] = '\0';
- halignED->setText(h_align_str);
+ // a matrix with a decoration cannot have a vertical alignment
+ if (deco != 0) {
+ valignCO->setEnabled(false);
+ valignCO->setCurrentIndex(1);
+ } else
+ valignCO->setEnabled(true);
}
-void GuiMathMatrixDialog::rowsChanged(int)
+void GuiMathMatrix::change_adaptor()
{
+ // FIXME: We need a filter for the halign input
}
-void GuiMathMatrixDialog::change_adaptor()
+void GuiMathMatrix::on_buttonBox_clicked(QAbstractButton * button)
{
- // FIXME: We need a filter for the halign input
+ switch (buttonBox->standardButton(button)) {
+ case QDialogButtonBox::Ok:
+ slotOK();
+ break;
+ case QDialogButtonBox::Cancel:
+ slotClose();
+ break;
+ default:
+ break;
+ }
}
-void GuiMathMatrixDialog::slotOK()
+void GuiMathMatrix::slotOK()
{
- char v_align_c[] = "tcb";
- char const c = v_align_c[valignCO->currentIndex()];
- string const sh = fromqstr(halignED->text());
- int const nx = int(columnsSB->value());
- int const ny = int(rowsSB->value());
-
- ostringstream os;
- os << nx << ' ' << ny << ' ' << c << ' ' << sh;
- controller().dispatchMatrix(os.str().c_str());
+ int const nx = columnsSB->value();
+ int const ny = rowsSB->value();
+ // a matrix without a decoration is an array,
+ // otherwise it is an AMS matrix
+ // decorated matrices cannot have a vertical alignment
- // close the dialog
+ char const c = v_align_c[valignCO->currentIndex()];
+ QString const sh = halignED->text();
+ string const str = fromqstr(
+ QString("%1 %2 %3 %4").arg(nx).arg(ny).arg(c).arg(sh));
+
+ if (decorationCO->currentIndex() != 0) {
+ int const deco = decorationCO->currentIndex();
+ QString deco_name = DecoNames[deco - 1];
+ // only if a special alignment is set create a 1x1 AMS array in which
+ // a normal array will be created, otherwise create just a normal AMS array
+ if (sh.contains('l') || sh.contains('r')) {
+ string const str_ams = fromqstr(
+ QString("%1 %2 %3").arg(int(1)).arg(int(1)).arg(deco_name));
+ dispatch(FuncRequest(LFUN_MATH_AMS_MATRIX, str_ams));
+ } else {
+ string const str_ams = fromqstr(
+ QString("%1 %2 %3").arg(nx).arg(ny).arg(deco_name));
+ dispatch(FuncRequest(LFUN_MATH_AMS_MATRIX, str_ams));
+ close();
+ return;
+ }
+ }
+ // create the normal array
+ dispatch(FuncRequest(LFUN_MATH_MATRIX, str));
close();
}
-void GuiMathMatrixDialog::slotClose()
+void GuiMathMatrix::slotClose()
{
close();
}
+
+Dialog * createGuiMathMatrix(GuiView & lv) { return new GuiMathMatrix(lv); }
+
+
} // namespace frontend
} // namespace lyx
-#include "GuiMathMatrix_moc.cpp"
+#include "moc_GuiMathMatrix.cpp"
projects / lyx.git / blobdiff