From f14970eacd5da64d4b2f23b441e9e7635c75ca8b Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 20 Jun 2011 21:08:51 +0000 Subject: [PATCH] Cosmetic improvements to tabular dialog. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39156 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiTabular.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 8fe7961474..bb01c3bd24 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -218,9 +218,12 @@ void GuiTabular::checkEnabled() bool const is_tabular_star = !tabularWidthED->text().isEmpty(); rotateTabularCB->setDisabled(is_tabular_star); - vAlignCO->setEnabled(!multirowCB->isChecked() + bool const enable_valign = + !multirowCB->isChecked() && !widgetsToLength(columnWidthED, columnWidthUnitLC).empty() - && specialAlignmentED->text().isEmpty()); + && specialAlignmentED->text().isEmpty(); + vAlignCO->setEnabled(enable_valign); + vAlignLA->setEnabled(enable_valign); topspaceED->setEnabled(topspaceCO->currentIndex() == 2); topspaceED->setEnabled(topspaceCO->currentIndex() == 2); @@ -287,8 +290,10 @@ void GuiTabular::checkEnabled() multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN)); multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW)); - multirowOffsetED->setEnabled(multirowCB->isChecked()); - multirowOffsetUnitLC->setEnabled(multirowCB->isChecked()); + bool const enable_mr = multirowCB->isChecked(); + multirowOffsetLA->setEnabled(enable_mr); + multirowOffsetED->setEnabled(enable_mr); + multirowOffsetUnitLC->setEnabled(enable_mr); changed(); }