anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 09:32:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiTabular.cpp: backport fix for #3517

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36801 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-12-10 03:04:01 +00:00
parent f3cb4911ab
commit e4bb80965a
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -739,8 +739,10 @@ void GuiTabular::updateContents()
lengthToWidgets(widthED, widthUnit, colwidth, default_unit); lengthToWidgets(widthED, widthUnit, colwidth, default_unit);
} }
widthED->setEnabled(!isReadonly); // if there is a LaTeX argument, the width and alignment will be overwritten
widthUnit->setEnabled(!isReadonly); // therefore disable them in this case
widthED->setEnabled(!isReadonly && specialAlignmentED->text().isEmpty());
widthUnit->setEnabled(!isReadonly && specialAlignmentED->text().isEmpty());
hAlignCB->clear(); hAlignCB->clear();
hAlignCB->addItem(qt_("Left")); hAlignCB->addItem(qt_("Left"));
@ -791,8 +793,9 @@ void GuiTabular::updateContents()
valign = 0; valign = 0;
vAlignCB->setCurrentIndex(valign); vAlignCB->setCurrentIndex(valign);
hAlignCB->setEnabled(true); hAlignCB->setEnabled(specialAlignmentED->text().isEmpty());
vAlignCB->setEnabled(!pwidth.zero()); vAlignCB->setEnabled(!pwidth.zero()
&& specialAlignmentED->text().isEmpty());
if (!tabular_.is_long_tabular) { if (!tabular_.is_long_tabular) {
headerStatusCB->setChecked(false); headerStatusCB->setChecked(false);

12
status.16x
View File

@ -99,12 +99,16 @@ What's new
- Fix the painting of non-InsetText insets with a transparent - Fix the painting of non-InsetText insets with a transparent
background as well as the description of an InsetCaption (bug 4889). background as well as the description of an InsetCaption (bug 4889).
- Fix unexpected behavior when inserting big math delimiters around a matrix - Fix unexpected behavior when inserting big math delimiters around a
(bug 7088). 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 * DOCUMENTATION AND LOCALIZATION