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

Optimize a bit the handling of local layout validation. This handles

Browse Source 
empty cases better than what was before.

Patch from Scott Kostyshak.
This commit is contained in:
Richard Heck 2012-04-21 16:22:28 -04:00
parent 0dde9cc163
commit afee2488cb
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/frontends/qt4/GuiDocument.cpp
View File

@ -606,13 +606,26 @@ void LocalLayout::apply(BufferParams & params)
void LocalLayout::textChanged()
{
static const QString unknown = qt_("Press button to check validity...");
static const QString message =
qt_("Press button to check validity...");
string const layout =
fromqstr(locallayoutTE->document()->toPlainText().trimmed());
is_valid_ = false;
validLB->setText(unknown);
validatePB->setEnabled(true);
convertPB->setEnabled(false);
changed();
if (layout.empty()) {
is_valid_ = true;
validatePB->setEnabled(false);
validLB->setText("");
convertPB->hide();
convertLB->hide();
changed();
} else if (!validatePB->isEnabled()) {
// if that's already enabled, we shouldn't need to do anything.
is_valid_ = false;
validLB->setText(message);
validatePB->setEnabled(true);
convertPB->setEnabled(false);
changed();
}
}
@ -649,13 +662,7 @@ void LocalLayout::validate() {
string const layout =
fromqstr(locallayoutTE->document()->toPlainText().trimmed());
if (layout.empty()) {
is_valid_ = true;
validatePB->setEnabled(false);
validLB->setText("");
convertPB->hide();
convertLB->hide();
} else {
if (!layout.empty()) {
TextClass::ReturnValues const ret = TextClass::validate(layout);
is_valid_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
validatePB->setEnabled(false);