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

fix multirow/column logic in table dialog

Browse Source 
GuiTabular.cpp: a cell can either be a multicolumn or multirow, not both the same time, this is already respected by the toolbar and context menu, only the dialog allowed to set this although this was correctly never applied

should also go to branch
This commit is contained in:
Uwe Stöhr 2012-09-11 21:58:13 +02:00
parent 6f58137318
commit 6f157533a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,8 +311,10 @@ void GuiTabular::checkEnabled()
captionStatusCB->setEnabled(funcEnabled(Tabular::TOGGLE_LTCAPTION)
&& longtabular);
multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN) && !dalign);
multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW) && !dalign);
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);