#include "support/convert.h"
#include "support/debug.h"
+#include "support/lstrings.h"
#include <QCheckBox>
#include <QPushButton>
GuiTabular::GuiTabular(QWidget * parent)
: InsetParamsWidget(parent), firstheader_suppressable_(false),
- lastfooter_suppressable_(false)
+ lastfooter_suppressable_(false), orig_leftborder_(GuiSetBorder::LINE_UNDEF),
+ orig_rightborder_(GuiSetBorder::LINE_UNDEF), lastrow_(0)
{
setupUi(this);
connect(interlinespaceUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(checkEnabled()));
connect(booktabsRB, SIGNAL(clicked(bool)),
- this, SLOT(checkEnabled()));
+ this, SLOT(booktabs_toggled(bool)));
connect(borderDefaultRB, SIGNAL(clicked(bool)),
- this, SLOT(checkEnabled()));
+ this, SLOT(nonbooktabs_toggled(bool)));
connect(borderSetPB, SIGNAL(clicked()),
this, SLOT(borderSet_clicked()));
connect(borderUnsetPB, SIGNAL(clicked()),
this, SLOT(borderUnset_clicked()));
+ connect(resetFormalCB, SIGNAL(clicked()),
+ this, SLOT(checkEnabled()));
connect(hAlignCO, SIGNAL(activated(int)),
this, SLOT(checkEnabled()));
connect(vAlignCO, SIGNAL(activated(int)),
this, SLOT(checkEnabled()));
connect(specialAlignmentED, SIGNAL(textEdited(const QString &)),
this, SLOT(checkEnabled()));
- connect(columnTypeCO, SIGNAL(activated(int)),
- this, SLOT(checkEnabled()));
connect(columnWidthED, SIGNAL(textEdited(const QString &)),
this, SLOT(checkEnabled()));
connect(columnWidthUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(checkEnabled()));
- connect(borders, SIGNAL(topSet(bool)),
+ connect(borders, SIGNAL(topSet()),
+ this, SLOT(checkEnabled()));
+ connect(borders, SIGNAL(bottomSet()),
+ this, SLOT(checkEnabled()));
+ connect(borders, SIGNAL(rightSet()),
+ this, SLOT(checkEnabled()));
+ connect(borders, SIGNAL(leftSet()),
+ this, SLOT(checkEnabled()));
+ connect(borders, SIGNAL(topLTSet()),
this, SLOT(checkEnabled()));
- connect(borders, SIGNAL(bottomSet(bool)),
+ connect(borders, SIGNAL(topRTSet()),
this, SLOT(checkEnabled()));
- connect(borders, SIGNAL(rightSet(bool)),
+ connect(borders, SIGNAL(bottomLTSet()),
this, SLOT(checkEnabled()));
- connect(borders, SIGNAL(leftSet(bool)),
+ connect(borders, SIGNAL(bottomRTSet()),
this, SLOT(checkEnabled()));
connect(rotateTabularCB, SIGNAL(clicked()),
this, SLOT(checkEnabled()));
}
+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
hAlignCO->itemData(hAlignCO->currentIndex()).toString() == QString("decimal");
decimalPointED->setEnabled(dalign);
decimalLA->setEnabled(dalign);
+ resetFormalCB->setEnabled(booktabsRB->isChecked());
bool const setwidth = TableAlignCO->currentText() == qt_("Middle");
tabularWidthLA->setEnabled(setwidth);
// 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);
// Vertical lines cannot be set in formal tables
borders->setLeftEnabled(!booktabsRB->isChecked());
borders->setRightEnabled(!booktabsRB->isChecked());
+ // Trimming is only allowed in booktabs and if the line is set
+ int const row = tabularRowED->text().toInt();
+ borders->setTopLeftTrimEnabled(booktabsRB->isChecked()
+ && borders->topLineSet()
+ && row > 1);
+ borders->setTopRightTrimEnabled(booktabsRB->isChecked()
+ && borders->topLineSet()
+ && row > 1);
+ borders->setBottomLeftTrimEnabled(booktabsRB->isChecked()
+ && borders->bottomLineSet()
+ && row < lastrow_);
+ borders->setBottomRightTrimEnabled(booktabsRB->isChecked()
+ && borders->bottomLineSet()
+ && row < lastrow_);
}
void GuiTabular::borderSet_clicked()
{
- borders->setTop(true);
- borders->setBottom(true);
- borders->setLeft(true);
- borders->setRight(true);
+ borders->setTop(GuiSetBorder::LINE_SET);
+ borders->setBottom(GuiSetBorder::LINE_SET);
+ borders->setLeft(GuiSetBorder::LINE_SET);
+ borders->setRight(GuiSetBorder::LINE_SET);
+ borders->setTopLeftTrim(GuiSetBorder::LINE_SET);
+ borders->setBottomLeftTrim(GuiSetBorder::LINE_SET);
+ borders->setTopRightTrim(GuiSetBorder::LINE_SET);
+ borders->setBottomRightTrim(GuiSetBorder::LINE_SET);
// repaint the setborder widget
borders->update();
checkEnabled();
void GuiTabular::borderUnset_clicked()
{
- borders->setTop(false);
- borders->setBottom(false);
- borders->setLeft(false);
- borders->setRight(false);
+ borders->setTop(GuiSetBorder::LINE_UNSET);
+ borders->setBottom(GuiSetBorder::LINE_UNSET);
+ borders->setLeft(GuiSetBorder::LINE_UNSET);
+ borders->setRight(GuiSetBorder::LINE_UNSET);
+ borders->setTopLeftTrim(GuiSetBorder::LINE_UNSET);
+ borders->setBottomLeftTrim(GuiSetBorder::LINE_UNSET);
+ borders->setTopRightTrim(GuiSetBorder::LINE_UNSET);
+ borders->setBottomRightTrim(GuiSetBorder::LINE_UNSET);
// repaint the setborder widget
borders->update();
checkEnabled();
}
+void GuiTabular::booktabs_toggled(bool const check)
+{
+ // when switching from formal, restore the left/right lines
+ if (!check) {
+ borders->setLeft(orig_leftborder_);
+ borders->setRight(orig_rightborder_);
+ }
+ // repaint the setborder widget
+ borders->update();
+ checkEnabled();
+}
+
+
+void GuiTabular::nonbooktabs_toggled(bool const check)
+{
+ booktabs_toggled(!check);
+}
+
+
static void setParam(string & param_str, Tabular::Feature f, string const & arg = string())
{
param_str += ' ';
}
//
- if (borders->getTop() && borders->getBottom() && borders->getLeft()
- && borders->getRight())
+ if (resetFormalCB->isChecked())
+ setParam(param_str, Tabular::RESET_FORMAL_DEFAULT);
+ else if (borders->topLineSet() && borders->bottomLineSet() && borders->leftLineSet()
+ && borders->rightLineSet())
setParam(param_str, Tabular::SET_ALL_LINES);
- else if (!borders->getTop() && !borders->getBottom() && !borders->getLeft()
- && !borders->getRight())
+ else if (borders->topLineUnset() && borders->bottomLineUnset() && borders->leftLineUnset()
+ && borders->rightLineUnset())
setParam(param_str, Tabular::UNSET_ALL_LINES);
else {
- setParam(param_str, Tabular::SET_LINE_LEFT,
- borders->getLeft() ? "true" : "false");
- setParam(param_str, Tabular::SET_LINE_RIGHT,
- borders->getRight() ? "true" : "false");
- setParam(param_str, Tabular::SET_LINE_TOP,
- borders->getTop() ? "true" : "false");
- setParam(param_str, Tabular::SET_LINE_BOTTOM,
- borders->getBottom() ? "true" : "false");
+ if (borders->getLeft() != GuiSetBorder::LINE_UNDECIDED)
+ setParam(param_str, Tabular::SET_LINE_LEFT,
+ borders->leftLineSet() ? "true" : "false");
+ if (borders->getRight() != GuiSetBorder::LINE_UNDECIDED)
+ setParam(param_str, Tabular::SET_LINE_RIGHT,
+ borders->rightLineSet() ? "true" : "false");
+ if (borders->getTop() != GuiSetBorder::LINE_UNDECIDED)
+ setParam(param_str, Tabular::SET_LINE_TOP,
+ borders->topLineSet() ? "true" : "false");
+ if (borders->getBottom() != GuiSetBorder::LINE_UNDECIDED)
+ setParam(param_str, Tabular::SET_LINE_BOTTOM,
+ borders->bottomLineSet() ? "true" : "false");
}
+ if (borders->topLineLTSet())
+ setParam(param_str, Tabular::SET_LTRIM_TOP, "false");
+ else if (borders->topLineLTUnset())
+ setParam(param_str, Tabular::SET_LTRIM_TOP, "true");
+ if (borders->topLineRTSet())
+ setParam(param_str, Tabular::SET_RTRIM_TOP, "false");
+ else if (borders->topLineRTUnset())
+ setParam(param_str, Tabular::SET_RTRIM_TOP, "true");
+ if (borders->bottomLineLTSet())
+ setParam(param_str, Tabular::SET_LTRIM_BOTTOM, "false");
+ else if (borders->bottomLineRTUnset())
+ setParam(param_str, Tabular::SET_LTRIM_BOTTOM, "true");
+ if (borders->bottomLineRTSet())
+ setParam(param_str, Tabular::SET_RTRIM_BOTTOM, "false");
+ else if (borders->bottomLineRTUnset())
+ setParam(param_str, Tabular::SET_RTRIM_BOTTOM, "true");
// 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);
}
+GuiSetBorder::BorderState GuiTabular::borderState(GuiSetBorder::BorderState bs,
+ bool const line)
+{
+ if (bs == GuiSetBorder::LINE_UNDEF)
+ bs = line ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ else if ((bs == GuiSetBorder::LINE_SET && !line)
+ || (bs == GuiSetBorder::LINE_UNSET && line))
+ bs = GuiSetBorder::LINE_UNDECIDED;
+ return bs;
+}
+
+
void GuiTabular::paramsToDialog(Inset const * inset)
{
InsetTabular const * itab = static_cast<InsetTabular const *>(inset);
tabularRowED->setText(QString::number(row + 1));
tabularColumnED->setText(QString::number(col + 1));
+ lastrow_ = int(tabular.nrows());
bool const multicol = tabular.isMultiColumn(cell);
multicolumnCB->setChecked(multicol);
rotateTabularAngleSB->setValue(tabular.rotate != 0 ? tabular.rotate : 90);
}
- borders->setTop(tabular.topLine(cell));
- borders->setBottom(tabular.bottomLine(cell));
- borders->setLeft(tabular.leftLine(cell));
- borders->setRight(tabular.rightLine(cell));
+ // In what follows, we check the borders of all selected cells,
+ // and if there are diverging settings, we use the LINE_UNDECIDED
+ // border status.
+ GuiSetBorder::BorderState ltop = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState lbottom = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState lleft = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState lright = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState ltop_ltrim = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState ltop_rtrim = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState lbottom_ltrim = GuiSetBorder::LINE_UNDEF;
+ GuiSetBorder::BorderState lbottom_rtrim = GuiSetBorder::LINE_UNDEF;
+ CursorSlice const & beg = bv->cursor().selBegin();
+ CursorSlice const & end = bv->cursor().selEnd();
+ if (beg != end) {
+ Tabular::col_type cs = tabular.cellColumn(beg.idx());
+ Tabular::col_type ce = tabular.cellColumn(end.idx());
+ if (cs > ce)
+ swap(cs, ce);
+ Tabular::row_type rs = tabular.cellRow(beg.idx());
+ Tabular::row_type re = tabular.cellRow(end.idx());
+ if (rs > re)
+ swap(rs, re);
+ for (Tabular::row_type r = rs; r <= re; ++r)
+ for (Tabular::col_type c = cs; c <= ce; ++c) {
+ idx_type const cc = tabular.cellIndex(r, c);
+ ltop = borderState(ltop, tabular.topLine(cc));
+ lbottom = borderState(lbottom, tabular.bottomLine(cc));
+ lleft = borderState(lleft, tabular.leftLine(cc));
+ lright = borderState(lright, tabular.rightLine(cc));
+ ltop_ltrim = borderState(ltop_ltrim, !tabular.topLineTrim(cc).first);
+ ltop_rtrim = borderState(ltop_rtrim, !tabular.topLineTrim(cc).second);
+ lbottom_ltrim = borderState(lbottom_ltrim, !tabular.bottomLineTrim(cc).first);
+ lbottom_rtrim = borderState(lbottom_rtrim, !tabular.bottomLineTrim(cc).second);
+ // store left/right borders for the case of formal/nonformal switch
+ orig_leftborder_ = borderState(lleft, tabular.leftLine(cc, true));
+ orig_rightborder_ = borderState(lright, tabular.rightLine(cc, true));
+ }
+ } else {
+ ltop = tabular.topLine(cell) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ lbottom = tabular.bottomLine(cell) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ lleft = tabular.leftLine(cell) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ lright = tabular.rightLine(cell) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ ltop_ltrim = tabular.topLineTrim(cell).first ? GuiSetBorder::LINE_UNSET : GuiSetBorder::LINE_SET;
+ ltop_rtrim = tabular.topLineTrim(cell).second ? GuiSetBorder::LINE_UNSET : GuiSetBorder::LINE_SET;
+ lbottom_ltrim = tabular.bottomLineTrim(cell).first ? GuiSetBorder::LINE_UNSET : GuiSetBorder::LINE_SET;
+ lbottom_rtrim = tabular.bottomLineTrim(cell).second ? GuiSetBorder::LINE_UNSET : GuiSetBorder::LINE_SET;
+ // store left/right borders for the case of formal/nonformal switch
+ orig_leftborder_ = tabular.leftLine(cell, true) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ orig_rightborder_ = tabular.rightLine(cell, true) ? GuiSetBorder::LINE_SET : GuiSetBorder::LINE_UNSET;
+ }
+ borders->setTop(ltop);
+ borders->setBottom(lbottom);
+ borders->setLeft(lleft);
+ borders->setRight(lright);
+ borders->setTopLeftTrim(ltop_ltrim);
+ borders->setTopRightTrim(ltop_rtrim);
+ borders->setBottomLeftTrim(lbottom_ltrim);
+ borders->setBottomRightTrim(lbottom_rtrim);
// repaint the setborder widget
borders->update();