rc.preview and rc.display_graphics are completely unrelated (bug 7562)

(cherry picked from commit 6bf00d9feddbd41a776b6b8a1f3a1278413b1cbe)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 1413ada3bd4aa85be3534bbef74cbae2e14b515c..2319bfb30496f52537b911db0ed8a2f8373f5520 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1243,13 +1243,6 @@ void PrefDisplay::on_instantPreviewCO_currentIndexChanged(int index)
 }
 
 
-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()) {
@@ -1293,7 +1286,6 @@ void PrefDisplay::update(LyXRC const & rc)
        }
 
        displayGraphicsCB->setChecked(rc.display_graphics);
-       instantPreviewCO->setEnabled(rc.display_graphics);
        previewSizeSB->setValue(rc.preview_scale_factor);
        paragraphMarkerCB->setChecked(rc.paragraph_markers);
        previewSizeSB->setEnabled(

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index d567ca683a198195804198e703aff0fb6868d200..57b9a32cfcc6223acd12397c7218ec6b814bfa4c 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -281,7 +281,6 @@ public:
 
 private Q_SLOTS:
        void on_instantPreviewCO_currentIndexChanged(int);
-       void on_displayGraphicsCB_toggled(bool);
 };
 
 

diff --git a/status.20x b/status.20x
index cad8ff93e11e9eb16ab9f49deaf034e84dd9829e..b69d477762d1ed51822035dd2227166a891f25c5 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -156,6 +156,9 @@ What's new
 - When using a non-default language for the GUI, do not change locale
   settings of child proceses (bug 7741).
 
+- Do not disable Instant Preview widgets in preferences when Display
+  Graphics is unchecked (bug 7462).
+
 
 * DOCUMENTATION AND LOCALIZATION