Author: spitz
Date: Mon Jan 3 18:21:37 2011
New Revision: 37082
URL: http://www.lyx.org/trac/changeset/37082
Log:
Fix UI glitch in the prefs dialog (bug 7190).
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.cpp
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.h
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.cpp Mon Jan
3 18:21:22 2011 (r37081)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.cpp Mon Jan
3 18:21:37 2011 (r37082)
@@ -970,29 +970,35 @@
connect(displayGraphicsCB, SIGNAL(toggled(bool)), this,
SIGNAL(changed()));
connect(instantPreviewCO, SIGNAL(activated(int)), this,
SIGNAL(changed()));
connect(previewSizeSB, SIGNAL(valueChanged(double)), this,
SIGNAL(changed()));
- if (instantPreviewCO->currentIndex() == 0)
- previewSizeSB->setEnabled(false);
- else
- previewSizeSB->setEnabled(true);
connect(paragraphMarkerCB, SIGNAL(toggled(bool)), this,
SIGNAL(changed()));
}
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();
@@ -1027,6 +1033,9 @@
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);
}
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.h
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.h Mon Jan
3 18:21:22 2011 (r37081)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiPrefs.h Mon Jan
3 18:21:37 2011 (r37082)
@@ -275,6 +275,7 @@
private Q_SLOTS:
void on_instantPreviewCO_currentIndexChanged(int);
+ void on_displayGraphicsCB_toggled(bool);
};
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Mon Jan 3 18:21:22 2011
(r37081)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Mon Jan 3 18:21:37 2011
(r37082)
@@ -154,6 +154,9 @@
- Wake up from waiting state after encountering a file parsing error
(bug 6950).
+- Fix enabling/disabling of Instant Preview widgets in the preferences
+ dialog (bug 7190).
+
* DOCUMENTATION AND LOCALIZATION
