Hopefully better dialog policy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27936 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index 6aaa9df9e41a2accd69a9c68371aef47232ace4b..39db68d51fe7cbea2eff170b8dd4f67215e12080 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -511,10 +511,13 @@ void GuiExternal::updateContents()
        draftCB->setChecked(params_.draft);
 
        displayGB->setChecked(params_.display);
-       displayscaleED->setEnabled(params_.display && !isBufferReadonly());
        displayscaleED->setText(QString::number(params_.lyxscale));
+       bool scaled = params_.display && !isBufferReadonly() &&
+                       (params_.preview_mode != PREVIEW_INSTANT);
+       displayscaleED->setEnabled(scaled);
+       scaleLA->setEnabled(scaled);
        displayGB->setEnabled(lyxrc.display_graphics);
-       displayscaleED->setEnabled(params_.preview_mode != PREVIEW_INSTANT);
+
 
        setRotation(*angleED, *originCO, params_.rotationdata);
 
@@ -556,7 +559,11 @@ void GuiExternal::updateTemplate()
 
        found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
        optionsGB->setEnabled(found);
-       displayscaleED->setEnabled(templ.preview_mode != PREVIEW_INSTANT);
+
+       bool scaled = displayGB->isChecked() && displayGB->isEnabled() &&
+                       !isBufferReadonly() && (templ.preview_mode != PREVIEW_INSTANT);
+       displayscaleED->setEnabled(scaled);
+       scaleLA->setEnabled(scaled);
 
        if (!found)
                return;