QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 151a714ae974d976bc6b8ea8cc68e810fdbafe63..4ac80ad77cd8722a51e8fd6685cd15bd919dac45 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -33,6 +33,7 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/lstrings.h"
 
 #include <QCheckBox>
 #include <QPushButton>
@@ -201,19 +202,29 @@ void GuiTabular::on_interlinespaceCO_activated(int index)
 }
 
 
+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
-       columnWidthED->setEnabled(specialAlignmentED->text().isEmpty());
-       columnWidthUnitLC->setEnabled(specialAlignmentED->text().isEmpty());
+       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())
+       if ((multicolumnCB->isChecked() || multirowCB->isChecked() || columnTypeCO->currentIndex() == 1)
                && hAlignCO->findData(toqstr("decimal")))
                hAlignCO->removeItem(hAlignCO->findData(toqstr("decimal")));
        else if (!multicolumnCB->isChecked() && !multirowCB->isChecked()
@@ -224,13 +235,13 @@ void GuiTabular::enableWidgets() const
        decimalPointED->setEnabled(dalign);
        decimalLA->setEnabled(dalign);
 
-       bool const setwidth = TableAlignCO->currentText() == qt_("Middle")
-               && !longTabularCB->isChecked();
+       bool const setwidth = TableAlignCO->currentText() == qt_("Middle");
        tabularWidthLA->setEnabled(setwidth);
        tabularWidthED->setEnabled(setwidth);
        tabularWidthUnitLC->setEnabled(setwidth);
 
-       rotateTabularAngleSB->setEnabled(rotateTabularCB->isChecked());
+       rotateTabularAngleSB->setEnabled(rotateTabularCB->isChecked()
+                                        && !longTabularCB->isChecked());
        rotateCellAngleSB->setEnabled(rotateCellCB->isChecked());
 
        bool const enable_valign =
@@ -250,7 +261,7 @@ void GuiTabular::enableWidgets() const
 
        // setting as longtable is not allowed when table is inside a float
        bool const is_tabular_star = !tabularWidthED->text().isEmpty();
-       longTabularCB->setEnabled(!is_tabular_star && funcEnabled(Tabular::SET_LONGTABULAR));
+       longTabularCB->setEnabled(funcEnabled(Tabular::SET_LONGTABULAR));
        bool const longtabular = longTabularCB->isChecked();
        longtableGB->setEnabled(true);
        newpageCB->setEnabled(longtabular);
@@ -258,11 +269,8 @@ void GuiTabular::enableWidgets() const
        // 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)
-       // FIXME: Add support for [pdf]lscape
-       rotateTabularCB->setDisabled(longtabular);
-       rotateTabularLA->setDisabled(longtabular);
-       // this one would also be disabled with [pdf]lscape
+       // 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
@@ -467,13 +475,20 @@ docstring GuiTabular::dialogToParams() const
        // 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())
+       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
@@ -562,7 +577,7 @@ 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);
@@ -606,7 +621,7 @@ docstring GuiTabular::dialogToParams() const
        //
        if (newpageCB->isChecked())
                setParam(param_str, Tabular::SET_LTNEWPAGE);
-    else
+       else
                setParam(param_str, Tabular::UNSET_LTNEWPAGE);
        //
        if (captionStatusCB->isChecked())
@@ -743,12 +758,16 @@ void GuiTabular::paramsToDialog(Inset const * inset)
                        rotateCellAngleSB->setValue(90);
        }
 
-       rotateTabularCB->setChecked(tabular.rotate != 0);
-       if (rotateTabularCB->isChecked())
-               rotateTabularAngleSB->setValue(tabular.rotate != 0 ? tabular.rotate : 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));
@@ -780,14 +799,20 @@ 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()
-           && !(columnWidthED->hasFocus() && columnWidthED->text() == "0"))
+           && !(columnWidthED->hasFocus() && columnWidthED->text() == "0")) {
                columnWidthED->clear();
-       else {
+               if (!varwidth)
+                       columnTypeCO->setCurrentIndex(0);
+       } else {
                colwidth = pwidth.asString();
                lengthToWidgets(columnWidthED, columnWidthUnitLC,
                        colwidth, default_unit);
+               columnTypeCO->setCurrentIndex(2);
        }
        Length mroffset;
        if (multirow)
@@ -1052,6 +1077,7 @@ bool GuiTabular::checkWidgets(bool readonly) const
                borders->setEnabled(false);
                tabularWidthUnitLC->setEnabled(false);
                columnWidthUnitLC->setEnabled(false);
+               columnTypeCO->setEnabled(false);
                multirowOffsetUnitLC->setEnabled(false);
                setBordersGB->setEnabled(false);
                allBordersGB->setEnabled(false);