From 46a6e652ed61adc6ccc20c6fdd541f78c3f6c0d4 Mon Sep 17 00:00:00 2001
From: Pavel Sanda <sanda@lyx.org>
Date: Sat, 20 Dec 2008 14:04:24 +0000
Subject: [PATCH] Backport.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27937 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiExternal.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index 9570fa0e73..46e1eabf1d 100644
--- 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;