The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit f5b4cd90a3bf56db48aa81e32c66c46907591f20
Merge: 6bf00d9 538570a
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Sep 17 11:36:47 2012 +0200
Merge branch 'master' of git.lyx.org:lyx
commit 6bf00d9feddbd41a776b6b8a1f3a1278413b1cbe
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)
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 5fa14c7..d377084 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 8d90280..9cb96bc 100644
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -276,7 +276,6 @@ public:
private Q_SLOTS:
void on_instantPreviewCO_currentIndexChanged(int);
- void on_displayGraphicsCB_toggled(bool);
};
-----------------------------------------------------------------------
Summary of changes:
src/frontends/qt4/GuiPrefs.cpp | 8 --------
src/frontends/qt4/GuiPrefs.h | 1 -
2 files changed, 0 insertions(+), 9 deletions(-)
hooks/post-receive
--
The LyX Source Repository
