* 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 "EmptyTable.h"
#include "qt_helpers.h"
+#include "FuncRequest.h"
+
#include <QLineEdit>
#include <QPushButton>
#include <QSpinBox>
namespace frontend {
GuiMathMatrix::GuiMathMatrix(GuiView & lv)
- : GuiMath(lv, "mathmatrix", qt_("Math Matrix"))
+ : GuiDialog(lv, "mathmatrix", qt_("Math Matrix"))
{
setupUi(this);
rowsSB->setValue(5);
columnsSB->setValue(5);
valignCO->setCurrentIndex(1);
+ decorationCO->setCurrentIndex(0);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
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(QString)),
this, SLOT(change_adaptor()));
connect(halignED, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
+ connect(decorationCO, SIGNAL(activated(int)),
+ this, SLOT(decorationChanged(int)));
bc().setPolicy(ButtonPolicy::IgnorantPolicy);
}
void GuiMathMatrix::columnsChanged(int)
{
- 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);
+ halignED->setText(QString(nx, 'c'));
}
-void GuiMathMatrix::rowsChanged(int)
+void GuiMathMatrix::decorationChanged(int deco)
{
+ // a matrix with a decoration cannot have a vertical alignment
+ if (deco != 0) {
+ valignCO->setEnabled(false);
+ valignCO->setCurrentIndex(1);
+ } else
+ valignCO->setEnabled(true);
}
void GuiMathMatrix::slotOK()
{
+ 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
+
char v_align_c[] = "tcb";
char const c = v_align_c[valignCO->currentIndex()];
QString const sh = halignED->text();
- int const nx = columnsSB->value();
- int const ny = rowsSB->value();
- dispatchMatrix(fromqstr(
- QString("%1 %2 %3 %4").arg(nx).arg(ny).arg(c).arg(sh)));
+ 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;
+ // FIXME This is very dangerous way of coding.
+ // The order is defined in .ui file and anybody who will touch it
+ // will destroy the whole math decorations machinery.
+ // For better way look on MathDelimiter Size-combo solution and biggui[] array.
+ // Similarly for the v_align_c stuff -- at least we should push it into
+ // constructor and have it in one file...
+ switch (deco) {
+ case 1: deco_name = "bmatrix";
+ break;
+ case 2: deco_name = "pmatrix";
+ break;
+ case 3: deco_name = "Bmatrix";
+ break;
+ case 4: deco_name = "vmatrix";
+ break;
+ case 5: deco_name = "Vmatrix";
+ break;
+ }
+ // 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') > 0 || sh.contains('r') > 0) {
+ 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();
}
} // namespace frontend
} // namespace lyx
-#include "GuiMathMatrix_moc.cpp"
+#include "moc_GuiMathMatrix.cpp"