From: Pavel Sanda <sanda@lyx.org>
Date: Sat, 20 Dec 2008 13:09:36 +0000 (+0000)
Subject: Hopefully better dialog policy.
X-Git-Tag: 2.0.0~7535
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d5f27729229212e414a82a8fd83b61cf07f1ab03;p=features.git

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 6aaa9df9e4..39db68d51f 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;