The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 5fd8bda31a10cb69e93b8073e13b0cd4ca13fd45 Author: Juergen Spitzmueller <sp...@lyx.org> Date: Mon Sep 17 11:36:29 2012 +0200 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 1413ada..2319bfb 100644 --- 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 d567ca6..57b9a32 100644 --- 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 cad8ff9..b69d477 100644 --- 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 ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiPrefs.cpp | 8 -------- src/frontends/qt4/GuiPrefs.h | 1 - status.20x | 3 +++ 3 files changed, 3 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository