From b7c25c8a80c37aed808613a0bcf8ec82b490112f Mon Sep 17 00:00:00 2001 From: John Levon Date: Wed, 11 Sep 2002 17:53:15 +0000 Subject: [PATCH] small fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5270 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 10 ++++++++++ src/frontends/qt2/QCitationDialog.C | 2 +- src/frontends/qt2/QFloatDialog.C | 8 ++++++-- src/frontends/qt2/QParagraphDialog.C | 5 +++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f34aad41da..5deb40621b 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,13 @@ +2002-09-11 John Levon + + * QCitationDialog.C: show right info when selecting a cite + + * QParagraphDialog.C: don't validate lengths, to allow glue + +2002-09-11 Juergen Spitzmueller + + * QFloatDialog.C: Fix the setEnable() logic + 2002-09-11 John Levon * Alert_pimpl.C: diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index 6f9f32c1dd..e56bebf836 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -135,7 +135,7 @@ void QCitationDialog::slotCiteHighlighted(int sel) // Put into browser_info the additional info associated // with the selected browser_cite key infoML->clear(); - infoML->setText(biblio::getInfo(theMap, form_->bibkeys[sel]).c_str()); + infoML->setText(biblio::getInfo(theMap, form_->citekeys[sel]).c_str()); } } diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C index 8efa34320e..ce1220f3f8 100644 --- a/src/frontends/qt2/QFloatDialog.C +++ b/src/frontends/qt2/QFloatDialog.C @@ -58,22 +58,26 @@ void QFloatDialog::tbhpClicked() void QFloatDialog::heredefinitelyClicked() { + if (heredefinitelyCB->isChecked()); + ignoreCB->setEnabled(false); + topCB->setChecked(false); bottomCB->setChecked(false); pageCB->setChecked(false); herepossiblyCB->setChecked(false); + ignoreCB->setChecked(false); } void QFloatDialog::spanClicked() { bool const span(spanCB->isChecked()); - + if (!defaultsCB->isChecked()) { herepossiblyCB->setEnabled(!span); heredefinitelyCB->setEnabled(!span); } - + if (!span) return; diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C index 8cea66f6e5..7e59952b52 100644 --- a/src/frontends/qt2/QParagraphDialog.C +++ b/src/frontends/qt2/QParagraphDialog.C @@ -31,8 +31,9 @@ QParagraphDialog::QParagraphDialog(QParagraph * form) linespacingValue->setValidator(new QDoubleValidator(linespacingValue)); - valueAbove->setValidator(new QDoubleValidator(valueAbove)); - valueBelow->setValidator(new QDoubleValidator(valueBelow)); + // disabled to allow glue spacing for latexperts + //valueAbove->setValidator(new QDoubleValidator(valueAbove)); + //valueBelow->setValidator(new QDoubleValidator(valueBelow)); } void QParagraphDialog::closeEvent(QCloseEvent * e) -- 2.39.5