anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable setting vertical lines when using a formal table

Browse Source 
The code in InsetTabular disables the toolbar icons and menu entries related to vertical lines.

The code in GuiTabular disables vertical lines in the Settings dialog.
Note that there was a bug in
GuiSetBorders::set(Left|Right|Top|Bottom)Enabled, where the borders
did not get drawn correctly.

Fixes bug #9816
This commit is contained in:
Jean-Marc Lasgouttes 2015-10-27 16:48:29 +01:00
parent 1f81cd7b65
commit 5e0e676530
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/qt4/GuiSetBorder.cpp
View File

@ -151,31 +151,31 @@ void GuiSetBorder::drawBottom(bool draw)
} }
void GuiSetBorder::setLeftEnabled(bool border) void GuiSetBorder::setLeftEnabled(bool enabled)
{ {
left_.enabled = border; left_.enabled = enabled;
drawLeft(border); drawLeft(left_.set);
} }
void GuiSetBorder::setRightEnabled(bool border) void GuiSetBorder::setRightEnabled(bool enabled)
{ {
right_.enabled = border; right_.enabled = enabled;
drawRight(border); drawRight(right_.set);
} }
void GuiSetBorder::setTopEnabled(bool border) void GuiSetBorder::setTopEnabled(bool enabled)
{ {
top_.enabled = border; top_.enabled = enabled;
drawTop(border); drawTop(top_.set);
} }
void GuiSetBorder::setBottomEnabled(bool border) void GuiSetBorder::setBottomEnabled(bool enabled)
{ {
bottom_.enabled = border; bottom_.enabled = enabled;
drawBottom(border); drawBottom(bottom_.set);
} }

4
src/frontends/qt4/GuiTabular.cpp
View File

@ -320,6 +320,10 @@ void GuiTabular::enableWidgets() const
multirowOffsetLA->setEnabled(enable_mr); multirowOffsetLA->setEnabled(enable_mr);
multirowOffsetED->setEnabled(enable_mr); multirowOffsetED->setEnabled(enable_mr);
multirowOffsetUnitLC->setEnabled(enable_mr); multirowOffsetUnitLC->setEnabled(enable_mr);
// Vertical lines cannot be set in formal tables
borders->setLeftEnabled(!booktabsRB->isChecked());
borders->setRightEnabled(!booktabsRB->isChecked());
} }

12
src/insets/InsetTabular.cpp
View File

@ -4622,9 +4622,13 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
case Tabular::SET_LINE_TOP: case Tabular::SET_LINE_TOP:
case Tabular::SET_LINE_BOTTOM: case Tabular::SET_LINE_BOTTOM:
status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx())));
break;
case Tabular::SET_LINE_LEFT: case Tabular::SET_LINE_LEFT:
case Tabular::SET_LINE_RIGHT: case Tabular::SET_LINE_RIGHT:
status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx()))); status.setEnabled(!tabular.use_booktabs
&& !tabular.ltCaption(tabular.cellRow(cur.idx())));
break; break;
case Tabular::TOGGLE_LINE_TOP: case Tabular::TOGGLE_LINE_TOP:
@ -4638,12 +4642,14 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break; break;
case Tabular::TOGGLE_LINE_LEFT: case Tabular::TOGGLE_LINE_LEFT:
status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx()))); status.setEnabled(!tabular.use_booktabs
&& !tabular.ltCaption(tabular.cellRow(cur.idx())));
status.setOnOff(tabular.leftLine(cur.idx())); status.setOnOff(tabular.leftLine(cur.idx()));
break; break;
case Tabular::TOGGLE_LINE_RIGHT: case Tabular::TOGGLE_LINE_RIGHT:
status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx()))); status.setEnabled(!tabular.use_booktabs
&& !tabular.ltCaption(tabular.cellRow(cur.idx())));
status.setOnOff(tabular.rightLine(cur.idx())); status.setOnOff(tabular.rightLine(cur.idx()));
break; break;