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

GuiBox.cpp: fix this issue: horizontal box alignment is only possible without inner box and simple frame (the same as with pagebreaks)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34713 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-06-26 21:02:14 +00:00
parent cacad71fa2
commit 7d031e1fef
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,6 @@ void GuiBox::on_innerBoxCO_activated(int index)
typeCO->itemData(typeCO->currentIndex()).toString();
valignCO->setEnabled(ibox);
ialignCO->setEnabled(ibox);
halignCO->setEnabled(!ibox);
heightCB->setEnabled(ibox);
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
@ -127,6 +126,8 @@ void GuiBox::on_innerBoxCO_activated(int index)
outer != "Boxed");
widthED->setEnabled(!width_disabled);
widthUnitsLC->setEnabled(!width_disabled);
// halign and pagebreak are only allowed for Boxed without inner box
halignCO->setEnabled(!ibox && outer == "Boxed");
pagebreakCB->setEnabled(!ibox && outer == "Boxed");
setSpecial(ibox);
changed();
@ -141,7 +142,6 @@ void GuiBox::on_typeCO_activated(int index)
if (frameless) {
valignCO->setEnabled(true);
ialignCO->setEnabled(true);
halignCO->setEnabled(false);
heightCB->setEnabled(true);
setSpecial(true);
}
@ -149,13 +149,15 @@ void GuiBox::on_typeCO_activated(int index)
pagebreakCB->setChecked(false);
QString itype =
innerBoxCO->itemData(innerBoxCO->currentIndex()).toString();
pagebreakCB->setEnabled(type == "Boxed" && itype == "none");
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
bool const width_disabled = (itype == "none" && !frameless
&& type != "Boxed");
widthED->setEnabled(!width_disabled);
widthUnitsLC->setEnabled(!width_disabled);
// halign and pagebreak are only allowed for Boxed without inner box
halignCO->setEnabled(type == "Boxed" && itype == "none");
pagebreakCB->setEnabled(type == "Boxed" && itype == "none");
setInnerType(frameless, itype);
changed();
}
@ -166,7 +168,6 @@ void GuiBox::initDialog()
setInnerType(true, toqstr("minipage"));
widthED->setText("100");
widthUnitsLC->setCurrentItem(Length::PCW);
heightCB->setCheckState(Qt::Checked);
heightED->setText("1");
heightUnitsLC->setCurrentItem("totalheight");
}
@ -215,8 +216,6 @@ void GuiBox::paramsToDialog(Inset const * inset)
pagebreakCB->setChecked(false);
}
pagebreakCB->setEnabled(type == "Boxed" && !params.inner_box);
typeCO->setCurrentIndex(typeCO->findData(type));
// default: minipage
@ -238,9 +237,19 @@ void GuiBox::paramsToDialog(Inset const * inset)
bool ibox = params.inner_box;
valignCO->setEnabled(ibox);
ialignCO->setEnabled(ibox);
halignCO->setEnabled(!ibox);
setSpecial(ibox);
// halign and pagebreak are only allowed for Boxed without inner box
halignCO->setEnabled(!ibox && type == "Boxed");
pagebreakCB->setEnabled(!ibox && type == "Boxed");
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
bool const width_disabled = (!ibox && !frameless
&& type != "Boxed");
widthED->setEnabled(!width_disabled);
widthUnitsLC->setEnabled(!width_disabled);
Length::UNIT const default_unit = Length::defaultUnit();
lengthToWidgets(widthED, widthUnitsLC,