From e4bb80965a78ea26d284989277330ef8a0448690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Fri, 10 Dec 2010 03:04:01 +0000 Subject: [PATCH] GuiTabular.cpp: backport fix for #3517 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36801 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiTabular.cpp | 11 +++++++---- status.16x | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 0a6bd0e051..1665ad00c2 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -739,8 +739,10 @@ void GuiTabular::updateContents() lengthToWidgets(widthED, widthUnit, colwidth, default_unit); } - widthED->setEnabled(!isReadonly); - widthUnit->setEnabled(!isReadonly); + // if there is a LaTeX argument, the width and alignment will be overwritten + // therefore disable them in this case + widthED->setEnabled(!isReadonly && specialAlignmentED->text().isEmpty()); + widthUnit->setEnabled(!isReadonly && specialAlignmentED->text().isEmpty()); hAlignCB->clear(); hAlignCB->addItem(qt_("Left")); @@ -791,8 +793,9 @@ void GuiTabular::updateContents() valign = 0; vAlignCB->setCurrentIndex(valign); - hAlignCB->setEnabled(true); - vAlignCB->setEnabled(!pwidth.zero()); + hAlignCB->setEnabled(specialAlignmentED->text().isEmpty()); + vAlignCB->setEnabled(!pwidth.zero() + && specialAlignmentED->text().isEmpty()); if (!tabular_.is_long_tabular) { headerStatusCB->setChecked(false); diff --git a/status.16x b/status.16x index e40bcf415c..09d612eec5 100644 --- a/status.16x +++ b/status.16x @@ -99,12 +99,16 @@ What's new - Fix the painting of non-InsetText insets with a transparent background as well as the description of an InsetCaption (bug 4889). -- Fix unexpected behavior when inserting big math delimiters around a matrix - (bug 7088). +- Fix unexpected behavior when inserting big math delimiters around a + matrix (bug 7088). -- Fix save of personal dictionary path to preferences. (bug 6688) +- Fix save of personal dictionary path to preferences (bug 6688). -- Fix unexpected behavior of some "insert math" menu/toolbar entries. (bug 6709) +- Fix unexpected behavior of some "insert math" menu/toolbar entries + (bug 6709). + +- In the table dialog, disable the column width and column alignment when + there is a LaTeX argument (bug 3517). * DOCUMENTATION AND LOCALIZATION