Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiMathMatrix.cpp

diff --git a/src/frontends/qt4/GuiMathMatrix.cpp b/src/frontends/qt4/GuiMathMatrix.cpp
index 3b0ace1428725fd21e539689568f060d7445581a..3a9768b0943bd4491baa21a3b27b9fa63971deb8 100644 (file)
--- a/src/frontends/qt4/GuiMathMatrix.cpp
+++ b/src/frontends/qt4/GuiMathMatrix.cpp
@@ -3,7 +3,8 @@
  * 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.
  */
@@ -15,6 +16,10 @@
 #include "EmptyTable.h"
 #include "qt_helpers.h"
 
+#include "FuncRequest.h"
+
+#include "support/gettext.h"
+
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSpinBox>
@@ -24,18 +29,50 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
+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)
-       : GuiMath(lv, "mathmatrix", qt_("Math Matrix"))
+       : GuiDialog(lv, "mathmatrix", qt_("Math Matrix"))
 {
        setupUi(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)));
@@ -46,13 +83,15 @@ GuiMathMatrix::GuiMathMatrix(GuiView & lv)
        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);
 }
@@ -60,18 +99,19 @@ GuiMathMatrix::GuiMathMatrix(GuiView & lv)
 
 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);
 }
 
 
@@ -81,15 +121,53 @@ void GuiMathMatrix::change_adaptor()
 }
 
 
+void GuiMathMatrix::on_buttonBox_clicked(QAbstractButton * button)
+{
+       switch (buttonBox->standardButton(button)) {
+       case QDialogButtonBox::Ok:
+               slotOK();
+               break;
+       case QDialogButtonBox::Cancel:
+               slotClose();
+               break;
+       default:
+               break;
+       }
+}
+
+
 void GuiMathMatrix::slotOK()
 {
-       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)));
+       // a matrix without a decoration is an array,
+       // otherwise it is an AMS matrix
+       // decorated matrices cannot have a vertical alignment
+
+       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();
 }
 
@@ -106,4 +184,4 @@ Dialog * createGuiMathMatrix(GuiView & lv) { return new GuiMathMatrix(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiMathMatrix_moc.cpp"
+#include "moc_GuiMathMatrix.cpp"