From f7334ebfdb53b601675844a89b30807bd0522009 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Mon, 3 Jan 2011 17:21:22 +0000
Subject: [PATCH] Fix UI glitch in the prefs dialog (bug 7190).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37081 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiPrefs.cpp | 31 ++++++++++++++++++++-----------
 src/frontends/qt4/GuiPrefs.h   |  1 +
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 372e7d9eeb..2b36892a0f 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1196,28 +1196,34 @@ PrefDisplay::PrefDisplay(GuiPreferences * form)
 	connect(instantPreviewCO, SIGNAL(activated(int)), this, SIGNAL(changed()));
 	connect(previewSizeSB, SIGNAL(valueChanged(double)), this, SIGNAL(changed()));
 	connect(paragraphMarkerCB, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-	if (instantPreviewCO->currentIndex() == 0)
-		previewSizeSB->setEnabled(false);
-	else
-		previewSizeSB->setEnabled(true);
 }
 
 
 void PrefDisplay::on_instantPreviewCO_currentIndexChanged(int index)
 {
-	if (index == 0)
-		previewSizeSB->setEnabled(false);
-	else
-		previewSizeSB->setEnabled(true);
+	previewSizeSB->setEnabled(index != 0);
+}
+
+
+void PrefDisplay::on_displayGraphicsCB_toggled(bool on)
+{
+	instantPreviewCO->setEnabled(on);
+	previewSizeSB->setEnabled(on && instantPreviewCO->currentIndex() > 0);
 }
 
 
 void PrefDisplay::apply(LyXRC & rc) const
 {
 	switch (instantPreviewCO->currentIndex()) {
-		case 0: rc.preview = LyXRC::PREVIEW_OFF; break;
-		case 1:	rc.preview = LyXRC::PREVIEW_NO_MATH; break;
-		case 2:	rc.preview = LyXRC::PREVIEW_ON;	break;
+		case 0:
+			rc.preview = LyXRC::PREVIEW_OFF;
+			break;
+		case 1:
+			rc.preview = LyXRC::PREVIEW_NO_MATH;
+			break;
+		case 2:
+			rc.preview = LyXRC::PREVIEW_ON;
+			break;
 	}
 
 	rc.display_graphics = displayGraphicsCB->isChecked();
@@ -1252,6 +1258,9 @@ void PrefDisplay::update(LyXRC const & rc)
 	instantPreviewCO->setEnabled(rc.display_graphics);
 	previewSizeSB->setValue(rc.preview_scale_factor);
 	paragraphMarkerCB->setChecked(rc.paragraph_markers);
+	previewSizeSB->setEnabled(
+		rc.display_graphics
+		&& rc.preview != LyXRC::PREVIEW_OFF);
 }
 
 
diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 57b9a32cfc..d567ca683a 100644
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -281,6 +281,7 @@ public:
 
 private Q_SLOTS:
 	void on_instantPreviewCO_currentIndexChanged(int);
+	void on_displayGraphicsCB_toggled(bool);
 };
 
 
-- 
2.39.2