#include <config.h>
-#include "debug.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-#include "support/std_sstream.h"
-#include <iomanip>
-
-#include "ControlPrefs.h"
+#include "QPrefs.h"
#include "QPrefsDialog.h"
+
+#include "lcolorcache.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
#include "ui/QPrefAsciiModule.h"
#include "ui/QPrefDateModule.h"
#include "ui/QPrefKeyboardModule.h"
#include "ui/QPrefPrinterModule.h"
#include "ui/QPrefUIModule.h"
#include "ui/QPrefIdentityModule.h"
-#include "lyx_gui.h"
-#include "QPrefs.h"
-#include "Qt2BC.h"
+
+#include "debug.h"
+#include "LColor.h"
#include "lyxfont.h"
-#include "frnt_lang.h"
-#include "helper_funcs.h"
-#include "qt_helpers.h"
-#include "lcolorcache.h"
-#include <boost/tuple/tuple.hpp>
+#include "support/lstrings.h"
+#include "support/tostr.h"
+
+#include "controllers/ControlPrefs.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
+
+#include "frontends/lyx_gui.h"
-#include <qpushbutton.h>
#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
+#include "qcoloritem.h"
#include <qcombobox.h>
#include <qlabel.h>
-#include "qcoloritem.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
-#include "LColor.h"
+#include <boost/tuple/tuple.hpp>
+
+#include <iomanip>
+#include <sstream>
using lyx::support::compare_no_case;
using lyx::support::strToDbl;
using std::pair;
using std::vector;
+namespace lyx {
+namespace frontend {
typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
langmod->defaultLanguageCO->clear();
// store the lang identifiers for later
- vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
+ using lyx::frontend::LanguagePair;
+ vector<LanguagePair> const langs =
+ lyx::frontend::getLanguageData(false);
lang_ = getSecond(langs);
- vector<frnt::LanguagePair>::const_iterator lit = langs.begin();
- vector<frnt::LanguagePair>::const_iterator lend = langs.end();
+ vector<LanguagePair>::const_iterator lit = langs.begin();
+ vector<LanguagePair>::const_iterator lend = langs.end();
for (; lit != lend; ++lit) {
langmod->defaultLanguageCO->insertItem(toqstr(lit->first));
}
QPrefDisplayModule * displaymod(dialog_->displayModule);
- rc.preview = displaymod->previewCB->isChecked();
+ switch (displaymod->instantPreviewCO->currentItem()) {
+ 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;
+ }
lyx::graphics::DisplayType dtype(lyx::graphics::ColorDisplay);
switch (displaymod->displayGraphicsCO->currentItem()) {
- case 3: dtype = lyx::graphics::NoDisplay; break;
- case 2: dtype = lyx::graphics::ColorDisplay; break;
- case 1: dtype = lyx::graphics::GrayscaleDisplay; break;
- case 0: dtype = lyx::graphics::MonochromeDisplay; break;
+ case 3: dtype = lyx::graphics::NoDisplay; break;
+ case 2: dtype = lyx::graphics::ColorDisplay; break;
+ case 1: dtype = lyx::graphics::GrayscaleDisplay; break;
+ case 0: dtype = lyx::graphics::MonochromeDisplay; break;
}
rc.display_graphics = dtype;
QPrefDisplayModule * displaymod(dialog_->displayModule);
- displaymod->previewCB->setChecked(rc.preview);
+ switch (rc.preview) {
+ case LyXRC::PREVIEW_OFF:
+ displaymod->instantPreviewCO->setCurrentItem(0);
+ break;
+ case LyXRC::PREVIEW_NO_MATH :
+ displaymod->instantPreviewCO->setCurrentItem(1);
+ break;
+ case LyXRC::PREVIEW_ON :
+ displaymod->instantPreviewCO->setCurrentItem(2);
+ break;
+ }
int item = 2;
dialog_->updateConverters();
}
+
+} // namespace frontend
+} // namespace lyx