#include "GuiBox.h"
-#include "FuncRequest.h"
#include "LengthCombo.h"
#include "Length.h"
#include "qt_helpers.h"
widthED->setValidator(unsignedLengthValidator(widthED));
// initialize the length validator
- addCheckedWidget(widthED, widthLA);
+ addCheckedWidget(widthED, widthCB);
addCheckedWidget(heightED, heightCB);
initDialog();
}
-void GuiBox::on_innerBoxCO_activated(QString const & str)
+void GuiBox::on_innerBoxCO_activated(int /* index */)
{
- bool const ibox = (str != qt_("None"));
+ QString itype =
+ innerBoxCO->itemData(innerBoxCO->currentIndex()).toString();
+ // handle parbox and minipage the same way
+ bool const ibox =
+ (itype != "none"
+ && itype != "makebox");
QString const outer =
typeCO->itemData(typeCO->currentIndex()).toString();
valignCO->setEnabled(ibox);
ialignCO->setEnabled(ibox);
- halignCO->setEnabled(!ibox);
+ if (heightCB->isChecked() && !ibox)
+ heightCB->setChecked(false);
heightCB->setEnabled(ibox);
+ // the width can only be selected for makebox or framebox
+ widthCB->setEnabled(itype == "makebox"
+ || (outer == "Boxed" && itype == "none"));
+ widthCB->setChecked(!widthED->text().isEmpty());
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
- bool const width_disabled = (!ibox && outer != "Frameless" &&
- outer != "Boxed");
- widthED->setEnabled(!width_disabled);
- widthUnitsLC->setEnabled(!width_disabled);
+ bool const width_enabled =
+ ibox || outer == "Frameless" || outer == "Boxed";
+ // enable if width_enabled, except if checkbaox is active but unset
+ widthED->setEnabled(width_enabled || (widthCB->isEnabled() && widthCB->isChecked()));
+ widthUnitsLC->setEnabled(width_enabled || (widthCB->isEnabled() && widthCB->isChecked()));
+ if (!widthCB->isChecked() && widthCB->isEnabled()) {
+ widthED->setEnabled(false);
+ widthUnitsLC->setEnabled(false);
+ }
+ // halign is only allowed without inner box and if a width is used and if
+ // pagebreak is not used
+ halignCO->setEnabled(!pagebreakCB->isChecked() && widthCB->isChecked()
+ && ((!ibox && outer == "Boxed") || itype == "makebox"));
+ // pagebreak is only allowed for Boxed without inner box
pagebreakCB->setEnabled(!ibox && outer == "Boxed");
setSpecial(ibox);
changed();
QString const type =
typeCO->itemData(index).toString();
bool const frameless = (type == "Frameless");
- if (frameless) {
- valignCO->setEnabled(true);
- ialignCO->setEnabled(true);
- halignCO->setEnabled(false);
- heightCB->setEnabled(true);
- setSpecial(true);
- }
- if (type != "Boxed")
- pagebreakCB->setChecked(false);
QString itype =
innerBoxCO->itemData(innerBoxCO->currentIndex()).toString();
- pagebreakCB->setEnabled(type == "Boxed" && itype == "none");
+ setInnerType(frameless, itype);
+ // refresh itype because it might have been changed in setInnerType
+ itype =
+ innerBoxCO->itemData(innerBoxCO->currentIndex()).toString();
+ // handle parbox and minipage the same way
+ bool const ibox =
+ (itype != "none"
+ && itype != "makebox");
+ if (frameless && itype != "makebox") {
+ valignCO->setEnabled(ibox);
+ ialignCO->setEnabled(ibox);
+ if (heightCB->isChecked() && !ibox)
+ heightCB->setChecked(false);
+ heightCB->setEnabled(ibox);
+ setSpecial(ibox);
+ }
+ // the width can only be selected for makebox or framebox
+ widthCB->setEnabled(itype == "makebox"
+ || (type == "Boxed" && itype == "none"));
+ widthCB->setChecked(itype != "none" && !widthCB->isEnabled());
// 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);
- setInnerType(frameless, itype);
+ bool const width_enabled =
+ itype != "none" || frameless || type == "Boxed";
+ // enable if width_enabled, except if checkbaox is active but unset
+ widthED->setEnabled(width_enabled || (widthCB->isEnabled() && widthCB->isChecked()));
+ widthUnitsLC->setEnabled(width_enabled || (widthCB->isEnabled() && widthCB->isChecked()));
+ if (!widthCB->isChecked() && widthCB->isEnabled()) {
+ widthED->setEnabled(false);
+ widthUnitsLC->setEnabled(false);
+ }
+ // halign is only allowed without inner box and if a width is used and if
+ // pagebreak is not used
+ halignCO->setEnabled(!pagebreakCB->isChecked() && widthCB->isChecked()
+ && ((itype == "none" && type == "Boxed") || itype == "makebox"));
+ // pagebreak is only allowed for Boxed without inner box
+ pagebreakCB->setEnabled(type == "Boxed" && itype == "none");
+ if (type != "Boxed")
+ pagebreakCB->setChecked(false);
changed();
}
{
setInnerType(true, toqstr("minipage"));
widthED->setText("100");
+ widthCB->setChecked(true);
+ widthCB->setEnabled(false);
widthUnitsLC->setCurrentItem(Length::PCW);
- heightCB->setCheckState(Qt::Checked);
heightED->setText("1");
heightUnitsLC->setCurrentItem("totalheight");
}
+void GuiBox::on_widthCB_stateChanged(int)
+{
+ if (widthCB->isEnabled()) {
+ widthED->setEnabled(widthCB->isChecked());
+ widthUnitsLC->setEnabled(widthCB->isChecked());
+ halignCO->setEnabled(widthCB->isChecked());
+ }
+ changed();
+}
+
+
void GuiBox::on_heightCB_stateChanged(int state)
{
bool const enable = (innerBoxCO->currentText() != qt_("None"))
{
bool pbreak = (pagebreakCB->checkState() == Qt::Checked);
innerBoxCO->setEnabled(!pbreak);
+ widthCB->setEnabled(!pbreak);
+ if (pbreak)
+ widthCB->setChecked(!pbreak);
widthED->setEnabled(!pbreak);
widthUnitsLC->setEnabled(!pbreak);
if (!pbreak) {
pagebreakCB->setChecked(false);
}
- pagebreakCB->setEnabled(type == "Boxed" && !params.inner_box);
-
typeCO->setCurrentIndex(typeCO->findData(type));
// default: minipage
inner_type = "none";
if (params.use_parbox)
inner_type = "parbox";
+ if (params.use_makebox)
+ inner_type = "makebox";
bool const frameless = (params.type == "Frameless");
setInnerType(frameless, inner_type);
c = params.hor_pos;
halignCO->setCurrentIndex(string("lcrs").find(c, 0));
- bool ibox = params.inner_box;
+ bool ibox = (params.inner_box && !params.use_makebox);
valignCO->setEnabled(ibox);
ialignCO->setEnabled(ibox);
- halignCO->setEnabled(!ibox);
setSpecial(ibox);
+ // halign is only allowed without inner box and if a width is used and if
+ // pagebreak is not used
+ halignCO->setEnabled(!pagebreakCB->isChecked() && widthCB->isChecked()
+ && ((!ibox && type == "Boxed") || params.use_makebox));
+ // pagebreak is only allowed for Boxed without inner box
+ pagebreakCB->setEnabled(!ibox && type == "Boxed");
+
Length::UNIT const default_unit = Length::defaultUnit();
- lengthToWidgets(widthED, widthUnitsLC,
- (params.width).asString(), default_unit);
+ // the width can only be selected for makebox or framebox
+ widthCB->setEnabled(inner_type == "makebox"
+ || (type == "Boxed"
+ && !ibox && !pagebreakCB->isChecked()));
+ if (params.width.empty()) {
+ widthCB->setChecked(false);
+ lengthToWidgets(widthED, widthUnitsLC,
+ params.width, default_unit);
+ } else {
+ widthCB->setChecked(true);
+ lengthToWidgets(widthED, widthUnitsLC,
+ params.width, default_unit);
+ QString const special = toqstr(params.special);
+ if (!special.isEmpty() && special != "none")
+ widthUnitsLC->setCurrentItem(special);
+ }
- QString const special = toqstr(params.special);
- if (!special.isEmpty() && special != "none")
- widthUnitsLC->setCurrentItem(special);
+ widthED->setEnabled(widthCB->isChecked());
+ widthUnitsLC->setEnabled(widthCB->isChecked());
lengthToWidgets(heightED, heightUnitsLC,
(params.height).asString(), default_unit);
-
+
QString const height_special = toqstr(params.height_special);
if (!height_special.isEmpty() && height_special != "none")
heightUnitsLC->setCurrentItem(height_special);
(!pagebreak && innerBoxCO->currentText() != qt_("None"));
params.use_parbox =
(!pagebreak && innerBoxCO->currentText() == qt_("Parbox"));
+ params.use_makebox =
+ (!pagebreak && innerBoxCO->currentText() == qt_("Makebox"));
params.pos = "tcb"[valignCO->currentIndex()];
params.inner_pos = "tcbs"[ialignCO->currentIndex()];
QString unit =
widthUnitsLC->itemData(widthUnitsLC->currentIndex()).toString();
QString value = widthED->text();
- if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) {
- params.special = fromqstr(unit);
- // Note: the unit is simply ignored in this case
- params.width = Length(value.toDouble(), Length::IN);
+
+ if (widthED->isEnabled()) {
+ if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) {
+ params.special = fromqstr(unit);
+ // Note: the unit is simply ignored in this case
+ params.width = Length(value.toDouble(), Length::IN);
+ } else {
+ params.special = "none";
+ // we must specify a valid length in this case
+ if (value.isEmpty())
+ widthED->setText("0");
+ params.width = Length(widgetsToLength(widthED, widthUnitsLC));
+ }
} else {
params.special = "none";
- params.width = Length(widgetsToLength(widthED, widthUnitsLC));
+ params.width = Length();
}
// the height parameter is omitted if the value
innerBoxCO->clear();
if (!frameless)
innerBoxCO->addItem(qt_("None"), toqstr("none"));
+ else
+ innerBoxCO->addItem(qt_("Makebox"), toqstr("makebox"));
innerBoxCO->addItem(qt_("Parbox"), toqstr("parbox"));
innerBoxCO->addItem(qt_("Minipage"), toqstr("minipage"));
int i = (innerBoxCO->findData(type) != -1)
projects / lyx.git / blobdiff