]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiTabular.cpp
QDialogButtonBox for the remaining dialogs.
[lyx.git] / src / frontends / qt4 / GuiTabular.cpp
index 1d8caefb0c96025220bec0aa286ae8a008fd8528..4ac80ad77cd8722a51e8fd6685cd15bd919dac45 100644 (file)
@@ -31,7 +31,9 @@
 
 #include "insets/InsetTabular.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
+#include "support/lstrings.h"
 
 #include <QCheckBox>
 #include <QPushButton>
@@ -44,34 +46,37 @@ namespace lyx {
 namespace frontend {
 
 GuiTabular::GuiTabular(QWidget * parent)
-       : InsetParamsWidget(parent)
+       : InsetParamsWidget(parent), firstheader_suppressable_(false),
+         lastfooter_suppressable_(false)
+
 {
        setupUi(this);
 
-       widthED->setValidator(unsignedLengthValidator(widthED));
+       tabularWidthED->setValidator(unsignedLengthValidator(tabularWidthED));
+       columnWidthED->setValidator(unsignedLengthValidator(columnWidthED));
+       multirowOffsetED->setValidator(new LengthValidator(multirowOffsetED));
        topspaceED->setValidator(new LengthValidator(topspaceED));
        bottomspaceED->setValidator(new LengthValidator(bottomspaceED));
        interlinespaceED->setValidator(new LengthValidator(interlinespaceED));
 
-       widthUnitCB->setCurrentItem(Length::defaultUnit());
+       tabularWidthUnitLC->setCurrentItem(Length::defaultUnit());
+       columnWidthUnitLC->setCurrentItem(Length::defaultUnit());
+       multirowOffsetUnitLC->setCurrentItem(Length::defaultUnit());
+       topspaceUnitLC->setCurrentItem(Length::defaultUnit());
+       bottomspaceUnitLC->setCurrentItem(Length::defaultUnit());
+       interlinespaceUnitLC->setCurrentItem(Length::defaultUnit());
 
-       connect(topspaceED, SIGNAL(textEdited(QString)),
-               this, SLOT(checkEnabled()));
-       connect(topspaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(checkEnabled()));
-       connect(topspaceCO, SIGNAL(activated(int)),
+       connect(topspaceED, SIGNAL(textEdited(const QString &)),
                this, SLOT(checkEnabled()));
-       connect(bottomspaceED, SIGNAL(textEdited(QString)),
+       connect(topspaceUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(checkEnabled()));
-       connect(bottomspaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+       connect(bottomspaceED, SIGNAL(textEdited(const QString &)),
                this, SLOT(checkEnabled()));
-       connect(bottomspaceCO, SIGNAL(activated(int)),
+       connect(bottomspaceUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(checkEnabled()));
-       connect(interlinespaceED, SIGNAL(textEdited(QString)),
+       connect(interlinespaceED, SIGNAL(textEdited(const QString &)),
                this, SLOT(checkEnabled()));
-       connect(interlinespaceUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
-               this, SLOT(checkEnabled()));
-       connect(interlinespaceCO, SIGNAL(activated(int)),
+       connect(interlinespaceUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(checkEnabled()));
        connect(booktabsRB, SIGNAL(clicked(bool)),
                this, SLOT(checkEnabled()));
@@ -79,16 +84,20 @@ GuiTabular::GuiTabular(QWidget * parent)
                this, SLOT(checkEnabled()));
        connect(borderSetPB, SIGNAL(clicked()),
                this, SLOT(borderSet_clicked()));
-       connect(borderUnsetPB, SIGNAL(clicked()), 
+       connect(borderUnsetPB, SIGNAL(clicked()),
                this, SLOT(borderUnset_clicked()));
-       connect(hAlignCB, SIGNAL(activated(int)),
+       connect(hAlignCO, SIGNAL(activated(int)),
                this, SLOT(checkEnabled()));
-       connect(vAlignCB, SIGNAL(activated(int)),
+       connect(vAlignCO, SIGNAL(activated(int)),
                this, SLOT(checkEnabled()));
        connect(multicolumnCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
        connect(multirowCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
+       connect(multirowOffsetED, SIGNAL(textEdited(const QString &)),
+               this, SLOT(checkEnabled()));
+       connect(multirowOffsetUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+               this, SLOT(checkEnabled()));
        connect(newpageCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
        connect(headerStatusCB, SIGNAL(clicked()),
@@ -119,11 +128,13 @@ GuiTabular::GuiTabular(QWidget * parent)
                this, SLOT(checkEnabled()));
        connect(lastfooterNoContentsCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
-       connect(specialAlignmentED, SIGNAL(textEdited(QString)),
+       connect(captionStatusCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
-       connect(widthED, SIGNAL(textEdited(QString)),
+       connect(specialAlignmentED, SIGNAL(textEdited(const QString &)),
                this, SLOT(checkEnabled()));
-       connect(widthUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+       connect(columnWidthED, SIGNAL(textEdited(const QString &)),
+               this, SLOT(checkEnabled()));
+       connect(columnWidthUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(checkEnabled()));
        connect(borders, SIGNAL(topSet(bool)),
                this, SLOT(checkEnabled()));
@@ -135,9 +146,13 @@ GuiTabular::GuiTabular(QWidget * parent)
                this, SLOT(checkEnabled()));
        connect(rotateTabularCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
+       connect(rotateTabularAngleSB, SIGNAL(valueChanged(int)),
+               this, SLOT(checkEnabled()));
        connect(rotateCellCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
-       connect(TableAlignCB, SIGNAL(activated(int)),
+       connect(rotateCellAngleSB, SIGNAL(valueChanged(int)),
+               this, SLOT(checkEnabled()));
+       connect(TableAlignCO, SIGNAL(activated(int)),
                this, SLOT(checkEnabled()));
        connect(longTabularCB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
@@ -147,82 +162,163 @@ GuiTabular::GuiTabular(QWidget * parent)
                this, SLOT(checkEnabled()));
        connect(rightRB, SIGNAL(clicked()),
                this, SLOT(checkEnabled()));
-               
-       
+       connect(tabularWidthED, SIGNAL(textEdited(const QString &)),
+               this, SLOT(checkEnabled()));
+
+       decimalPointED->setInputMask("X; ");
+       decimalPointED->setMaxLength(1);
+
        // initialize the length validator
-       addCheckedWidget(widthED, fixedWidthColLA);
+       addCheckedWidget(columnWidthED, columnWidthLA);
+       addCheckedWidget(multirowOffsetED, multirowOffsetLA);
        addCheckedWidget(topspaceED, topspaceLA);
        addCheckedWidget(bottomspaceED, bottomspaceLA);
        addCheckedWidget(interlinespaceED, interlinespaceLA);
+       addCheckedWidget(tabularWidthED, tabularWidthLA);
 }
 
 
-void GuiTabular::checkEnabled()
+void GuiTabular::on_topspaceCO_activated(int index)
+{
+       bool const enable = (index == 2);
+       topspaceED->setEnabled(enable);
+       topspaceUnitLC->setEnabled(enable);
+}
+
+
+void GuiTabular::on_bottomspaceCO_activated(int index)
 {
-       // multirows don't have their own alignment
-       hAlignCB->setEnabled(!multirowCB->isChecked());
-       bool dalign =
-               hAlignCB->itemData(hAlignCB->currentIndex()).toString() == QString("decimal");
-       decimalPointLE->setEnabled(dalign);
-       decimalL->setEnabled(dalign);
+       bool const enable = (index == 2);
+       bottomspaceED->setEnabled(enable);
+       bottomspaceUnitLC->setEnabled(enable);
+}
+
 
-       vAlignCB->setEnabled(!multirowCB->isChecked() 
-               && !widgetsToLength(widthED, widthUnitCB).empty());
+void GuiTabular::on_interlinespaceCO_activated(int index)
+{
+       bool const enable = (index == 2);
+       interlinespaceED->setEnabled(enable);
+       interlinespaceUnitLC->setEnabled(enable);
+}
+
+
+void GuiTabular::on_columnTypeCO_activated(int index)
+{
+       checkEnabled();
+       if (index == 2)
+               columnWidthED->setFocus();
+}
+
+
+void GuiTabular::enableWidgets() const
+{
+       // if there is a LaTeX argument, the width and alignment will be overwritten
+       // therefore disable them in this case
+       bool const fixed = specialAlignmentED->text().isEmpty()
+                       && columnTypeCO->currentIndex() == 2;
+       columnWidthED->setEnabled(fixed);
+       columnWidthUnitLC->setEnabled(fixed);
+       // if the column has a width, multirows are always left-aligned
+       // therefore disable hAlignCB in this case
+       hAlignCO->setEnabled(!(multirowCB->isChecked()
+               && !widgetsToLength(columnWidthED, columnWidthUnitLC).empty())
+               && specialAlignmentED->text().isEmpty());
+       // decimal alignment is only possible for non-multicol and non-multirow cells
+       if ((multicolumnCB->isChecked() || multirowCB->isChecked() || columnTypeCO->currentIndex() == 1)
+               && hAlignCO->findData(toqstr("decimal")))
+               hAlignCO->removeItem(hAlignCO->findData(toqstr("decimal")));
+       else if (!multicolumnCB->isChecked() && !multirowCB->isChecked()
+               && hAlignCO->findData(toqstr("decimal")) == -1)
+               hAlignCO->addItem(qt_("At Decimal Separator"), toqstr("decimal"));
+       bool const dalign =
+               hAlignCO->itemData(hAlignCO->currentIndex()).toString() == QString("decimal");
+       decimalPointED->setEnabled(dalign);
+       decimalLA->setEnabled(dalign);
+
+       bool const setwidth = TableAlignCO->currentText() == qt_("Middle");
+       tabularWidthLA->setEnabled(setwidth);
+       tabularWidthED->setEnabled(setwidth);
+       tabularWidthUnitLC->setEnabled(setwidth);
+
+       rotateTabularAngleSB->setEnabled(rotateTabularCB->isChecked()
+                                        && !longTabularCB->isChecked());
+       rotateCellAngleSB->setEnabled(rotateCellCB->isChecked());
+
+       bool const enable_valign =
+               !multirowCB->isChecked()
+               && !widgetsToLength(columnWidthED, columnWidthUnitLC).empty()
+               && specialAlignmentED->text().isEmpty();
+       vAlignCO->setEnabled(enable_valign);
+       vAlignLA->setEnabled(enable_valign);
 
        topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
-       topspaceUnit->setEnabled(topspaceCO->currentIndex() == 2);
+       topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
+       topspaceUnitLC->setEnabled(topspaceCO->currentIndex() == 2);
        bottomspaceED->setEnabled(bottomspaceCO->currentIndex() == 2);
-       bottomspaceUnit->setEnabled(bottomspaceCO->currentIndex() == 2);
+       bottomspaceUnitLC->setEnabled(bottomspaceCO->currentIndex() == 2);
        interlinespaceED->setEnabled(interlinespaceCO->currentIndex() == 2);
-       interlinespaceUnit->setEnabled(interlinespaceCO->currentIndex() == 2);
+       interlinespaceUnitLC->setEnabled(interlinespaceCO->currentIndex() == 2);
 
        // setting as longtable is not allowed when table is inside a float
+       bool const is_tabular_star = !tabularWidthED->text().isEmpty();
        longTabularCB->setEnabled(funcEnabled(Tabular::SET_LONGTABULAR));
        bool const longtabular = longTabularCB->isChecked();
        longtableGB->setEnabled(true);
        newpageCB->setEnabled(longtabular);
        alignmentGB->setEnabled(longtabular);
-       // longtables cannot have a vertical alignment
-       TableAlignCB->setDisabled(longtabular);
+       // longtables and tabular* cannot have a vertical alignment
+       TableAlignLA->setDisabled(is_tabular_star || longtabular);
+       TableAlignCO->setDisabled(is_tabular_star || longtabular);
+       // longtable cannot be rotated with rotating package, only
+       // with [pdf]lscape, which only supports 90 deg.
+       rotateTabularAngleSB->setDisabled(longtabular);
 
        // FIXME: This Dialog is really horrible, disabling/enabling a checkbox
        // depending on the cursor position is very very unintuitive...
        // We need some edit boxes to show which rows are header/footer/etc
        // without having to move the cursor first.
-       headerStatusCB->setEnabled(longtabular);
+       headerStatusCB->setEnabled(longtabular
+               && (headerStatusCB->isChecked() ?
+                   funcEnabled(Tabular::UNSET_LTHEAD) :
+                   funcEnabled(Tabular::SET_LTHEAD)));
        headerBorderAboveCB->setEnabled(longtabular
                && headerStatusCB->isChecked());
        headerBorderBelowCB->setEnabled(longtabular
                && headerStatusCB->isChecked());
 
        // first header can only be suppressed when there is a header
-       // FIXME: old code also checked for
-       //  tabular.haveLTHead() && !tabular.haveLTFirstHead());
-       firstheaderNoContentsCB->setEnabled(longtabular);
+       // firstheader_suppressable_ is set in paramsToDialog
+       firstheaderNoContentsCB->setEnabled(longtabular && firstheader_suppressable_);
        // check if setting a first header is allowed
        // additionally check firstheaderNoContentsCB because when this is
        // the case a first header makes no sense
-       firstheaderStatusCB->setEnabled(funcEnabled(Tabular::SET_LTFIRSTHEAD)
+       firstheaderStatusCB->setEnabled((firstheaderStatusCB->isChecked() ?
+                  funcEnabled(Tabular::UNSET_LTFIRSTHEAD) :
+                  funcEnabled(Tabular::SET_LTFIRSTHEAD))
                && longtabular && !firstheaderNoContentsCB->isChecked());
        firstheaderBorderAboveCB->setEnabled(longtabular
                && firstheaderStatusCB->isChecked());
        firstheaderBorderBelowCB->setEnabled(longtabular
                && firstheaderStatusCB->isChecked());
 
-       footerStatusCB->setEnabled(longtabular);
+       footerStatusCB->setEnabled(longtabular
+               && (footerStatusCB->isChecked() ?
+                   funcEnabled(Tabular::UNSET_LTFOOT) :
+                   funcEnabled(Tabular::SET_LTFOOT)));
        footerBorderAboveCB->setEnabled(longtabular
                && footerBorderAboveCB->isChecked());
        footerBorderBelowCB->setEnabled(longtabular
                && footerBorderAboveCB->isChecked());
 
        // last footer can only be suppressed when there is a footer
-       // FIXME: old code also checked for
-       //   tabular.haveLTFoot() && !tabular.haveLTLastFoot());
-       lastfooterNoContentsCB->setEnabled(longtabular);
+       // lastfooter_suppressable_ is set in paramsToDialog
+       lastfooterNoContentsCB->setEnabled(longtabular && lastfooter_suppressable_);
        // check if setting a last footer is allowed
        // additionally check lastfooterNoContentsCB because when this is
        // the case a last footer makes no sense
-       lastfooterStatusCB->setEnabled(funcEnabled(Tabular::SET_LTLASTFOOT)
+       lastfooterStatusCB->setEnabled((lastfooterStatusCB->isChecked() ?
+                  funcEnabled(Tabular::UNSET_LTLASTFOOT) :
+                  funcEnabled(Tabular::SET_LTLASTFOOT))
                && longtabular && !lastfooterNoContentsCB->isChecked());
        lastfooterBorderAboveCB->setEnabled(longtabular
                && lastfooterBorderAboveCB->isChecked());
@@ -231,10 +327,25 @@ void GuiTabular::checkEnabled()
 
        captionStatusCB->setEnabled(funcEnabled(Tabular::TOGGLE_LTCAPTION)
                && longtabular);
-       
-       multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN));
-       multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW));
 
+       multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN)
+               && !dalign && !multirowCB->isChecked());
+       multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW)
+               && !dalign && !multicolumnCB->isChecked());
+       bool const enable_mr = multirowCB->isChecked();
+       multirowOffsetLA->setEnabled(enable_mr);
+       multirowOffsetED->setEnabled(enable_mr);
+       multirowOffsetUnitLC->setEnabled(enable_mr);
+
+       // Vertical lines cannot be set in formal tables
+       borders->setLeftEnabled(!booktabsRB->isChecked());
+       borders->setRightEnabled(!booktabsRB->isChecked());
+}
+
+
+void GuiTabular::checkEnabled()
+{
+       enableWidgets();
        changed();
 }
 
@@ -274,8 +385,8 @@ void GuiTabular::setHAlign(string & param_str) const
 {
        Tabular::Feature num = Tabular::ALIGN_LEFT;
        Tabular::Feature multi_num = Tabular::M_ALIGN_LEFT;
-       string const align = 
-               fromqstr(hAlignCB->itemData(hAlignCB->currentIndex()).toString());
+       string const align =
+               fromqstr(hAlignCO->itemData(hAlignCO->currentIndex()).toString());
        if (align == "left") {
                num = Tabular::ALIGN_LEFT;
                multi_num = Tabular::M_ALIGN_LEFT;
@@ -302,7 +413,7 @@ void GuiTabular::setHAlign(string & param_str) const
 
 void GuiTabular::setVAlign(string & param_str) const
 {
-       int const align = vAlignCB->currentIndex();
+       int const align = vAlignCO->currentIndex();
        enum VALIGN { TOP, MIDDLE, BOTTOM };
        VALIGN v = TOP;
 
@@ -338,7 +449,7 @@ void GuiTabular::setVAlign(string & param_str) const
 
 void GuiTabular::setTableAlignment(string & param_str) const
 {
-       int const align = TableAlignCB->currentIndex();
+       int const align = TableAlignCO->currentIndex();
        switch (align) {
                case 0: setParam(param_str, Tabular::TABULAR_VALIGN_TOP);
                        break;
@@ -352,12 +463,41 @@ void GuiTabular::setTableAlignment(string & param_str) const
 
 docstring GuiTabular::dialogToParams() const
 {
-       // FIXME: We should use Tabular directly.
        string param_str = "tabular";
-       setHAlign(param_str);
+
+       // table width
+       string tabwidth = widgetsToLength(tabularWidthED, tabularWidthUnitLC);
+       if (tabwidth.empty())
+               tabwidth = "0pt";
+       setParam(param_str, Tabular::SET_TABULAR_WIDTH, tabwidth);
+
+       // apply the fixed width values
+       // this must be done before applying the column alignment
+       // because its value influences the alignment of multirow cells
+       string width = widgetsToLength(columnWidthED, columnWidthUnitLC);
+       if (width.empty() || columnTypeCO->currentIndex() != 2)
+               width = "0pt";
+       if (multicolumnCB->isChecked())
+               setParam(param_str, Tabular::SET_MPWIDTH, width);
+       else
+               setParam(param_str, Tabular::SET_PWIDTH, width);
+
+       bool const varwidth = specialAlignmentED->text().isEmpty()
+                       && columnTypeCO->currentIndex() == 1;
+       if (varwidth)
+               setParam(param_str, Tabular::TOGGLE_VARWIDTH_COLUMN, "on");
+       else
+               setParam(param_str, Tabular::TOGGLE_VARWIDTH_COLUMN, "off");
+
+       // apply the column alignment
+       // multirows inherit the alignment from the column; if a column width
+       // is set, multirows are always left-aligned so that in this case
+       // its alignment must not be applied (see bug #8084)
+       if (!(multirowCB->isChecked() && width != "0pt"))
+               setHAlign(param_str);
 
        // SET_DECIMAL_POINT must come after setHAlign() (ALIGN_DECIMAL)
-       string decimal_point = fromqstr(decimalPointLE->text());
+       string decimal_point = fromqstr(decimalPointED->text());
        if (decimal_point.empty())
                decimal_point = lyxrc.default_decimal_point;
        setParam(param_str, Tabular::SET_DECIMAL_POINT, decimal_point);
@@ -381,7 +521,7 @@ docstring GuiTabular::dialogToParams() const
                case 2:
                        if (!topspaceED->text().isEmpty())
                                setParam(param_str, Tabular::SET_TOP_SPACE,
-                                        widgetsToLength(topspaceED, topspaceUnit));
+                                        widgetsToLength(topspaceED, topspaceUnitLC));
                        break;
        }
 
@@ -397,7 +537,7 @@ docstring GuiTabular::dialogToParams() const
                        if (!bottomspaceED->text().isEmpty())
                                setParam(param_str, Tabular::SET_BOTTOM_SPACE,
                                        widgetsToLength(bottomspaceED,
-                                                       bottomspaceUnit));
+                                                       bottomspaceUnitLC));
                        break;
        }
 
@@ -413,7 +553,7 @@ docstring GuiTabular::dialogToParams() const
                        if (!interlinespaceED->text().isEmpty())
                                setParam(param_str, Tabular::SET_INTERLINE_SPACE,
                                        widgetsToLength(interlinespaceED,
-                                                       interlinespaceUnit));
+                                                       interlinespaceUnitLC));
                        break;
        }
 
@@ -437,42 +577,42 @@ docstring GuiTabular::dialogToParams() const
 
        // apply the special alignment
        string special = fromqstr(specialAlignmentED->text());
-       if (special.empty())
+       if (support::trim(special).empty())
                special = "none";
        if (multicolumnCB->isChecked())
                setParam(param_str, Tabular::SET_SPECIAL_MULTICOLUMN, special);
        else
                setParam(param_str, Tabular::SET_SPECIAL_COLUMN, special);
 
-       // apply the fixed width values
-       string width = widgetsToLength(widthED, widthUnitCB);
-       if (width.empty())
-               width = "0pt";
-       if (multicolumnCB->isChecked())
-               setParam(param_str, Tabular::SET_MPWIDTH, width);
-       else
-               setParam(param_str, Tabular::SET_PWIDTH, width);
-
        //
        if (multicolumnCB->isChecked())
                setParam(param_str, Tabular::SET_MULTICOLUMN);
        else
                setParam(param_str, Tabular::UNSET_MULTICOLUMN);
+
+       // apply the multirow offset
+       string mroffset = widgetsToLength(multirowOffsetED, multirowOffsetUnitLC);
+       if (mroffset.empty())
+               mroffset = "0pt";
+       if (multirowCB->isChecked())
+               setParam(param_str, Tabular::SET_MROFFSET, mroffset);
        //
        if (multirowCB->isChecked())
                setParam(param_str, Tabular::SET_MULTIROW);
        else
                setParam(param_str, Tabular::UNSET_MULTIROW);
-       //
+       // store the table rotation angle
+       string const tabular_angle = convert<string>(rotateTabularAngleSB->value());
        if (rotateTabularCB->isChecked())
-               setParam(param_str, Tabular::SET_ROTATE_TABULAR);
+               setParam(param_str, Tabular::SET_ROTATE_TABULAR, tabular_angle);
        else
-               setParam(param_str, Tabular::UNSET_ROTATE_TABULAR);
-       //
+               setParam(param_str, Tabular::UNSET_ROTATE_TABULAR, tabular_angle);
+       // store the cell rotation angle
+       string const cell_angle = convert<string>(rotateCellAngleSB->value());
        if (rotateCellCB->isChecked())
-               setParam(param_str, Tabular::SET_ROTATE_CELL);
+               setParam(param_str, Tabular::SET_ROTATE_CELL, cell_angle);
        else
-               setParam(param_str, Tabular::UNSET_ROTATE_CELL);
+               setParam(param_str, Tabular::UNSET_ROTATE_CELL, cell_angle);
        //
        if (longTabularCB->isChecked())
                setParam(param_str, Tabular::SET_LONGTABULAR);
@@ -481,6 +621,8 @@ docstring GuiTabular::dialogToParams() const
        //
        if (newpageCB->isChecked())
                setParam(param_str, Tabular::SET_LTNEWPAGE);
+       else
+               setParam(param_str, Tabular::UNSET_LTNEWPAGE);
        //
        if (captionStatusCB->isChecked())
                setParam(param_str, Tabular::SET_LTCAPTION);
@@ -571,6 +713,14 @@ static Length getMColumnPWidth(Tabular const & t, size_t cell)
 }
 
 
+static Length getMROffset(Tabular const & t, size_t cell)
+{
+       if (t.isMultiRow(cell))
+               return t.cellInfo(cell).mroffset;
+       return Length();
+}
+
+
 static docstring getAlignSpecial(Tabular const & t, size_t cell, int what)
 {
        if (what == Tabular::SET_SPECIAL_MULTICOLUMN)
@@ -600,11 +750,24 @@ void GuiTabular::paramsToDialog(Inset const * inset)
        bool const multirow = tabular.isMultiRow(cell);
        multirowCB->setChecked(multirow);
 
-       rotateCellCB->setChecked(tabular.getRotateCell(cell));
-       rotateTabularCB->setChecked(tabular.rotate);
+       rotateCellCB->setChecked(tabular.getRotateCell(cell) != 0);
+       if (rotateCellCB->isChecked()) {
+               if (tabular.getRotateCell(cell) != 0)
+                       rotateCellAngleSB->setValue(tabular.getRotateCell(cell));
+               else
+                       rotateCellAngleSB->setValue(90);
+       }
 
        longTabularCB->setChecked(tabular.is_long_tabular);
 
+       rotateTabularCB->setChecked(tabular.rotate != 0);
+       if (rotateTabularCB->isChecked()) {
+               if (longTabularCB->isChecked())
+                       rotateTabularAngleSB->setValue(90);
+               else
+                       rotateTabularAngleSB->setValue(tabular.rotate != 0 ? tabular.rotate : 90);
+       }
+
        borders->setTop(tabular.topLine(cell));
        borders->setBottom(tabular.bottomLine(cell));
        borders->setLeft(tabular.leftLine(cell));
@@ -616,6 +779,15 @@ void GuiTabular::paramsToDialog(Inset const * inset)
 
        ///////////////////////////////////
        // Set width and alignment
+
+       Length const tabwidth = tabular.tabularWidth();
+       if (tabwidth.zero()
+           && !(tabularWidthED->hasFocus() && tabularWidthED->text() == "0"))
+               tabularWidthED->clear();
+       else
+               lengthToWidgets(tabularWidthED, tabularWidthUnitLC,
+                       tabwidth.asString(), default_unit);
+
        Length pwidth;
        docstring special;
        if (multicol) {
@@ -627,13 +799,32 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                        Tabular::SET_SPECIAL_COLUMN);
                pwidth = getColumnPWidth(tabular, cell);
        }
+       bool const varwidth = tabular.column_info[tabular.cellColumn(cell)].varwidth;
+       if (varwidth)
+               columnTypeCO->setCurrentIndex(1);
        string colwidth;
-       if (pwidth.zero())
-               widthED->clear();
-       else {
+       if (pwidth.zero()
+           && !(columnWidthED->hasFocus() && columnWidthED->text() == "0")) {
+               columnWidthED->clear();
+               if (!varwidth)
+                       columnTypeCO->setCurrentIndex(0);
+       } else {
                colwidth = pwidth.asString();
-               lengthToWidgets(widthED, widthUnitCB,
+               lengthToWidgets(columnWidthED, columnWidthUnitLC,
                        colwidth, default_unit);
+               columnTypeCO->setCurrentIndex(2);
+       }
+       Length mroffset;
+       if (multirow)
+               mroffset = getMROffset(tabular, cell);
+       string offset;
+       if (mroffset.zero()
+           && !(multirowOffsetED->hasFocus() && multirowOffsetED->text() == "0"))
+               multirowOffsetED->clear();
+       else {
+               offset = mroffset.asString();
+               lengthToWidgets(multirowOffsetED, multirowOffsetUnitLC,
+                       offset, default_unit);
        }
        specialAlignmentED->setText(toqstr(special));
        ///////////////////////////////////
@@ -650,7 +841,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
        } else {
                topspaceCO->setCurrentIndex(2);
                lengthToWidgets(topspaceED,
-                               topspaceUnit,
+                               topspaceUnitLC,
                                tabular.row_info[row].top_space.asString(),
                                default_unit);
        }
@@ -663,7 +854,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
        } else {
                bottomspaceCO->setCurrentIndex(2);
                lengthToWidgets(bottomspaceED,
-                               bottomspaceUnit,
+                               bottomspaceUnitLC,
                                tabular.row_info[row].bottom_space.asString(),
                                default_unit);
        }
@@ -676,19 +867,19 @@ void GuiTabular::paramsToDialog(Inset const * inset)
        } else {
                interlinespaceCO->setCurrentIndex(2);
                lengthToWidgets(interlinespaceED,
-                               interlinespaceUnit,
+                               interlinespaceUnitLC,
                                tabular.row_info[row].interline_space.asString(),
                                default_unit);
        }
 
-       hAlignCB->clear();
-       hAlignCB->addItem(qt_("Left"), toqstr("left"));
-       hAlignCB->addItem(qt_("Center"), toqstr("center"));
-       hAlignCB->addItem(qt_("Right"), toqstr("right"));
+       hAlignCO->clear();
+       hAlignCO->addItem(qt_("Left"), toqstr("left"));
+       hAlignCO->addItem(qt_("Center"), toqstr("center"));
+       hAlignCO->addItem(qt_("Right"), toqstr("right"));
        if (!multicol && !pwidth.zero())
-               hAlignCB->addItem(qt_("Justified"), toqstr("justified"));
-       if (!multicol)
-               hAlignCB->addItem(qt_("At Decimal Separator"), toqstr("decimal"));
+               hAlignCO->addItem(qt_("Justified"), toqstr("justified"));
+       if (!multicol && !multirow)
+               hAlignCO->addItem(qt_("At Decimal Separator"), toqstr("decimal"));
 
        string align;
        switch (tabular.getAlignment(cell)) {
@@ -709,7 +900,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                }
                case LYX_ALIGN_DECIMAL:
                {
-                       if (!multicol)
+                       if (!multicol && !multirow)
                                align = "decimal";
                        break;
                }
@@ -717,13 +908,13 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                        // we should never end up here
                        break;
        }
-       hAlignCB->setCurrentIndex(hAlignCB->findData(toqstr(align)));
+       hAlignCO->setCurrentIndex(hAlignCO->findData(toqstr(align)));
 
        //
        QString decimal_point = toqstr(tabular.column_info[col].decimal_point);
        if (decimal_point.isEmpty())
                decimal_point = toqstr(from_utf8(lyxrc.default_decimal_point));
-       decimalPointLE->setText(decimal_point);
+       decimalPointED->setText(decimal_point);
 
        int valign = 0;
        switch (tabular.getVAlignment(cell)) {
@@ -742,7 +933,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
        }
        if (pwidth.zero())
                valign = 0;
-       vAlignCB->setCurrentIndex(valign);
+       vAlignCO->setCurrentIndex(valign);
 
        int tableValign = 1;
        switch (tabular.tabular_valignment) {
@@ -759,7 +950,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                tableValign = 0;
                break;
        }
-       TableAlignCB->setCurrentIndex(tableValign);
+       TableAlignCO->setCurrentIndex(tableValign);
 
        if (!tabular.is_long_tabular) {
                headerStatusCB->setChecked(false);
@@ -784,7 +975,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                return;
        } else {
                // longtables cannot have a vertical alignment
-               TableAlignCB->setCurrentIndex(Tabular::LYX_VALIGN_MIDDLE);
+               TableAlignCO->setCurrentIndex(Tabular::LYX_VALIGN_MIDDLE);
        }
        switch (tabular.longtabular_alignment) {
        case Tabular::LYX_LONGTABULAR_ALIGN_LEFT:
@@ -852,14 +1043,68 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                lastfooterBorderBelowCB->setChecked(false);
        }
        newpageCB->setChecked(tabular.getLTNewPage(row));
+
+       // first header can only be suppressed when there is a header
+       firstheader_suppressable_ = tabular.haveLTHead()
+                       && !tabular.haveLTFirstHead();
+       // last footer can only be suppressed when there is a footer
+       lastfooter_suppressable_ = tabular.haveLTFoot()
+                       && !tabular.haveLTLastFoot();
+
+       // after setting the features, check if they are enabled
        checkEnabled();
 }
 
 
+bool GuiTabular::checkWidgets(bool readonly) const
+{
+       tabularRowED->setReadOnly(readonly);
+       tabularColumnED->setReadOnly(readonly);
+       tabularWidthED->setReadOnly(readonly);
+       specialAlignmentED->setReadOnly(readonly);
+       columnWidthED->setReadOnly(readonly);
+       multirowOffsetED->setReadOnly(readonly);
+       decimalPointED->setReadOnly(readonly);
+
+       if (readonly) {
+               multicolumnCB->setEnabled(false);
+               multirowCB->setEnabled(false);
+               rotateCellCB->setEnabled(false);
+               rotateCellAngleSB->setEnabled(false);
+               rotateTabularCB->setEnabled(false);
+               rotateTabularAngleSB->setEnabled(false);
+               longTabularCB->setEnabled(false);
+               borders->setEnabled(false);
+               tabularWidthUnitLC->setEnabled(false);
+               columnWidthUnitLC->setEnabled(false);
+               columnTypeCO->setEnabled(false);
+               multirowOffsetUnitLC->setEnabled(false);
+               setBordersGB->setEnabled(false);
+               allBordersGB->setEnabled(false);
+               borderStyleGB->setEnabled(false);
+               booktabsRB->setEnabled(false);
+               topspaceCO->setEnabled(false);
+               topspaceUnitLC->setEnabled(false);
+               bottomspaceCO->setEnabled(false);
+               bottomspaceUnitLC->setEnabled(false);
+               interlinespaceCO->setEnabled(false);
+               interlinespaceUnitLC->setEnabled(false);
+               hAlignCO->setEnabled(false);
+               vAlignCO->setEnabled(false);
+               TableAlignCO->setEnabled(false);
+               longtableGB->setEnabled(false);
+               alignmentGB->setEnabled(false);
+       } else
+               enableWidgets();
+
+       return InsetParamsWidget::checkWidgets();
+}
+
+
 bool GuiTabular::funcEnabled(Tabular::Feature f) const
 {
-       string cmd = "tabular " + featureAsString(f);
-       return getStatus(FuncRequest(LFUN_INSET_MODIFY, cmd)).enabled();
+       FuncRequest r(LFUN_INSET_MODIFY, "tabular for-dialog" + featureAsString(f));
+       return getStatus(r).enabled();
 }