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

GuiBox.cpp:

Browse Source 
- fix another bug: shaded boxes can have a specified width when there is an inner box
- code optimizations according to http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg160048.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34532 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-05-28 03:01:18 +00:00
parent 311fb59467
commit c1bde420f8
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontends/qt4/GuiBox.cpp
View File

@ -119,16 +119,13 @@ void GuiBox::on_innerBoxCO_activated(QString const & str)
ialignCO->setEnabled(ibox);
halignCO->setEnabled(!ibox);
heightCB->setEnabled(ibox);
// if an outer box from the fancybox LaTeX-package has no inner box,
// the width cannot be specified
if (!ibox && outer != 0 && outer != 1) {
widthED->setEnabled(false);
widthUnitsLC->setEnabled(false);
} else {
widthED->setEnabled(true);
widthUnitsLC->setEnabled(true);
}
pagebreakCB->setEnabled(!ibox && outer == 1);
// except for fremeless and boxed, the width cannot be specified if
// there is no inner box
bool const width_disabled = (!ibox && ids_[outer] != "Frameless" &&
ids_[outer] != "Boxed");
widthED->setEnabled(!width_disabled);
widthUnitsLC->setEnabled(!width_disabled);
pagebreakCB->setEnabled(!ibox && ids_[outer] == "Boxed");
setSpecial(ibox);
changed();
}
@ -149,17 +146,13 @@ void GuiBox::on_typeCO_activated(int index)
int itype = innerBoxCO->currentIndex();
if (innerBoxCO->count() == 2)
++itype;
pagebreakCB->setEnabled(index == 1 && itype == 0);
// if an outer box from the fancybox LaTeX-package has no inner box,
// the width cannot be specified
if (itype == 0
&& (index == 2 || index == 3 || index == 4 || index == 6)) {
widthED->setEnabled(false);
widthUnitsLC->setEnabled(false);
} else {
widthED->setEnabled(index != 5);
widthUnitsLC->setEnabled(index != 5);
}
pagebreakCB->setEnabled(ids_[index] == "Boxed" && itype == 0);
// except for fremeless and boxed, the width cannot be specified if
// there is no inner box
bool const width_disabled = (itype == 0 && ids_[index] != "Frameless"
&& ids_[index] != "Boxed");
widthED->setEnabled(!width_disabled);
widthUnitsLC->setEnabled(!width_disabled);
setInnerType(frameless, itype);
changed();
}