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

Ensure that head/foot cannot be unset as long is the row is a caption

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40527 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2011-12-19 21:28:11 +00:00
parent 419b51172a
commit 0da8a39a3b
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,10 @@ void GuiTabular::checkEnabled()
// 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
@ -259,14 +262,19 @@ void GuiTabular::checkEnabled()
// 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
@ -278,7 +286,9 @@ void GuiTabular::checkEnabled()
// 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());

4
src/insets/InsetTabular.cpp
View File

@ -4610,6 +4610,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
case Tabular::UNSET_LTFIRSTHEAD:
status.setEnabled(sel_row_start == sel_row_end && !tabular.ltCaption(sel_row_start));
status.setOnOff(!tabular.getRowOfLTFirstHead(sel_row_start, dummyltt));
break;
@ -4619,6 +4620,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
case Tabular::UNSET_LTHEAD:
status.setEnabled(sel_row_start == sel_row_end && !tabular.ltCaption(sel_row_start));
status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
@ -4628,6 +4630,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
case Tabular::UNSET_LTFOOT:
status.setEnabled(sel_row_start == sel_row_end && !tabular.ltCaption(sel_row_start));
status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
@ -4637,6 +4640,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
case Tabular::UNSET_LTLASTFOOT:
status.setEnabled(sel_row_start == sel_row_end && !tabular.ltCaption(sel_row_start));
status.setOnOff(!tabular.getRowOfLTLastFoot(sel_row_start, dummyltt));
break;