]> git.lyx.org Git - features.git/commitdiff
Changelog:
authorAbdelrazak Younes <younes@lyx.org>
Wed, 22 Mar 2006 18:59:17 +0000 (18:59 +0000)
committerAbdelrazak Younes <younes@lyx.org>
Wed, 22 Mar 2006 18:59:17 +0000 (18:59 +0000)
* QDialogView.h: interface methods and slots are now public instead of protected. This allow to avoid making friend classes.
* QPrefs.[Ch]: removed everything GUI related. The controller does not know anything about what the Dialog is doing, it is here only to transfer request one way or the other.
* QPrefsDialogs.[Ch]: transfered everything GUI related here. Things are gathered per module in contructor, apply() and update() methods so that it will be easy to transfer code to separate class afterward
  - QPrefsDialogs::apply(LyXRC & rc): fill in rc parameters from GUI.
  - QPrefsDialogs::update(LyXRC const & rc): update GUI from rc parameters.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13453 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/QDialogView.h
src/frontends/qt4/QPrefs.C
src/frontends/qt4/QPrefs.h
src/frontends/qt4/QPrefsDialog.C
src/frontends/qt4/QPrefsDialog.h

index 654a5fd3fc5189a893b1af3b0fda4115c72ddf19..1d9ca041cd34b5363b5eababd9972b10d3e1bf5e 100644 (file)
@@ -40,6 +40,9 @@ public:
        /// the dialog has changed contents
        virtual void changed();
 
+       ///
+       Qt2BC & bcview();
+
 protected:
        /// build the actual dialog
        virtual void build_dialog() = 0;
@@ -57,12 +60,10 @@ protected:
        /// is the dialog currently valid ?
        virtual bool isValid();
 
-       ///
-       Qt2BC & bcview();
-
        /// are we updating ?
        bool updating_;
-protected slots:
+
+public slots:
        // dialog closed from WM
        void slotWMHide();
 
index bd0aa0cbb0763e982f98217415209c08be8163fc..5499c3c1c388a11c9081d07d4e1fbac3bc7b601a 100644 (file)
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
-#include "ui/QPrefAsciiUi.h"
-#include "ui/QPrefDateUi.h"
-#include "ui/QPrefKeyboardUi.h"
-#include "ui/QPrefLatexUi.h"
-#include "ui/QPrefScreenFontsUi.h"
-#include "ui/QPrefColorsUi.h"
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#include "ui/QPrefCygwinPathUi.h"
-#endif
-#include "ui/QPrefDisplayUi.h"
-#include "ui/QPrefPathsUi.h"
-#include "ui/QPrefSpellcheckerUi.h"
-#include "ui/QPrefLanguageUi.h"
-#include "ui/QPrefPrinterUi.h"
-#include "ui/QPrefUi.h"
-#include "ui/QPrefIdentityUi.h"
-
 #include "debug.h"
 #include "lastfiles.h"
 #include "LColor.h"
 
 #include "frontends/lyx_gui.h"
 
-#include <qcheckbox.h>
-#include "qcoloritem.h"
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-
-#include <boost/tuple/tuple.hpp>
-
-#include <iomanip>
-#include <sstream>
-
-using lyx::support::compare_no_case;
-
-using std::distance;
-using std::endl;
-using std::setfill;
-using std::setw;
-using std::string;
-using std::ostringstream;
-using std::pair;
-using std::vector;
-
 using namespace Ui;
 
 namespace lyx {
@@ -81,595 +41,37 @@ typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
 QPrefs::QPrefs(Dialog & parent)
        : base_class(parent, _("Preferences"))
 {
-}
 
+}
 
 Converters & QPrefs::converters()
 {
        return controller().converters();
 }
 
-
 Formats & QPrefs::formats()
 {
        return controller().formats();
 }
 
-
 Movers & QPrefs::movers()
 {
        return controller().movers();
 }
 
-
 void QPrefs::build_dialog()
 {
        dialog_.reset(new QPrefsDialog(this));
-
-       bcview().setOK(dialog_->savePB);
-       bcview().setApply(dialog_->applyPB);
-       bcview().setCancel(dialog_->closePB);
-       bcview().setRestore(dialog_->restorePB);
-
-       dialog_->uiModule->lastfilesSB->setMaxValue(maxlastfiles);
-
-       Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
-
-       langmod->defaultLanguageCO->clear();
-       // store the lang identifiers for later
-       using lyx::frontend::LanguagePair;
-       vector<LanguagePair> const langs =
-               lyx::frontend::getLanguageData(false);
-       lang_ = getSecond(langs);
-
-       vector<LanguagePair>::const_iterator lit  = langs.begin();
-       vector<LanguagePair>::const_iterator lend = langs.end();
-       for (; lit != lend; ++lit) {
-               langmod->defaultLanguageCO->insertItem(toqstr(lit->first));
-       }
-
-       Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
-       spellmod->spellCommandCO->insertItem(qt_("ispell"));
-       spellmod->spellCommandCO->insertItem(qt_("aspell"));
-       spellmod->spellCommandCO->insertItem(qt_("hspell"));
-#ifdef USE_PSPELL
-       spellmod->spellCommandCO->insertItem(qt_("pspell (library)"));
-#else
-#ifdef USE_ASPELL
-       spellmod->spellCommandCO->insertItem(qt_("aspell (library)"));
-#endif
-#endif
 }
 
-
-namespace {
-
-string const internal_path(QString const & input)
-{
-       return lyx::support::os::internal_path(fromqstr(input));
-}
-
-}
-
-
 void QPrefs::apply()
 {
-       LyXRC & rc(controller().rc());
-
-       Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
-
-       // FIXME: remove rtl_support bool
-       rc.rtl_support = langmod->rtlCB->isChecked();
-       rc.mark_foreign_language = langmod->markForeignCB->isChecked();
-       rc.language_auto_begin = langmod->autoBeginCB->isChecked();
-       rc.language_auto_end = langmod->autoEndCB->isChecked();
-       rc.language_use_babel = langmod->useBabelCB->isChecked();
-       rc.language_global_options = langmod->globalCB->isChecked();
-       rc.language_package = fromqstr(langmod->languagePackageED->text());
-       rc.language_command_begin = fromqstr(langmod->startCommandED->text());
-       rc.language_command_end = fromqstr(langmod->endCommandED->text());
-       rc.default_language = lang_[langmod->defaultLanguageCO->currentItem()];
-
-       Ui::QPrefUi * uimod(dialog_->uiModule);
-
-       rc.ui_file = internal_path(uimod->uiFileED->text());
-       rc.bind_file = internal_path(uimod->bindFileED->text());
-       rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
-       rc.wheel_jump = uimod->wheelMouseSB->value();
-       rc.autosave = uimod->autoSaveSB->value() * 60;
-       rc.make_backup = uimod->autoSaveCB->isChecked();
-       rc.num_lastfiles = uimod->lastfilesSB->value();
-
-
-       Ui::QPrefKeyboardUi * keymod(dialog_->keyboardModule);
-
-       // FIXME: can derive CB from the two EDs
-       rc.use_kbmap = keymod->keymapCB->isChecked();
-       rc.primary_kbmap = internal_path(keymod->firstKeymapED->text());
-       rc.secondary_kbmap = internal_path(keymod->secondKeymapED->text());
-
-
-       Ui::QPrefAsciiUi * ascmod(dialog_->asciiModule);
-
-       rc.ascii_linelen = ascmod->asciiLinelengthSB->value();
-       rc.ascii_roff_command = fromqstr(ascmod->asciiRoffED->text());
-
-
-       Ui::QPrefDateUi * datemod(dialog_->dateModule);
-
-       rc.date_insert_format = fromqstr(datemod->DateED->text());
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       Ui::QPrefCygwinPathUi * cygwinmod(dialog_->cygwinpathModule);
-       rc.cygwin_path_fix = cygwinmod->pathCB->isChecked();
-#endif
-
-       Ui::QPrefLatexUi * latexmod(dialog_->latexModule);
-
-       rc.fontenc = fromqstr(latexmod->latexEncodingED->text());
-       rc.chktex_command = fromqstr(latexmod->latexChecktexED->text());
-       rc.bibtex_command = fromqstr(latexmod->latexBibtexED->text());
-       rc.index_command = fromqstr(latexmod->latexIndexED->text());
-       rc.auto_reset_options = latexmod->latexAutoresetCB->isChecked();
-       rc.view_dvi_paper_option = fromqstr(latexmod->latexDviPaperED->text());
-       rc.default_papersize =
-               controller().toPaperSize(latexmod->latexPaperSizeCO->currentItem());
-
-       Ui::QPrefDisplayUi * displaymod(dialog_->displayModule);
-
-       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;
-       }
-       rc.display_graphics = dtype;
-
-#ifdef WITH_WARNINGS
-#warning FIXME!! The graphics cache no longer has a changeDisplay method.
-#endif
-#if 0
-       if (old_value != rc.display_graphics) {
-               lyx::graphics::GCache & gc = lyx::graphics::GCache::get();
-               gc.changeDisplay();
-       }
-#endif
-
-       Ui::QPrefPathsUi * pathsmod(dialog_->pathsModule);
-
-       rc.document_path = internal_path(pathsmod->workingDirED->text());
-       rc.template_path = internal_path(pathsmod->templateDirED->text());
-       rc.backupdir_path = internal_path(pathsmod->backupDirED->text());
-       rc.tempdir_path = internal_path(pathsmod->tempDirED->text());
-       rc.path_prefix = fromqstr(pathsmod->pathPrefixED->text());
-       // FIXME: should be a checkbox only
-       rc.lyxpipes = internal_path(pathsmod->lyxserverDirED->text());
-
-
-       Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
-
-       switch (spellmod->spellCommandCO->currentItem()) {
-               case 0:
-               case 1:
-               case 2:
-                       rc.use_spell_lib = false;
-                       rc.isp_command = fromqstr(spellmod->spellCommandCO->currentText());
-                       break;
-               case 3:
-                       rc.use_spell_lib = true;
-                       break;
-       }
-
-       // FIXME: remove isp_use_alt_lang
-       rc.isp_alt_lang = fromqstr(spellmod->altLanguageED->text());
-       rc.isp_use_alt_lang = !rc.isp_alt_lang.empty();
-       // FIXME: remove isp_use_esc_chars
-       rc.isp_esc_chars = fromqstr(spellmod->escapeCharactersED->text());
-       rc.isp_use_esc_chars = !rc.isp_esc_chars.empty();
-       // FIXME: remove isp_use_pers_dict
-       rc.isp_pers_dict = internal_path(spellmod->persDictionaryED->text());
-       rc.isp_use_pers_dict = !rc.isp_pers_dict.empty();
-       rc.isp_accept_compound = spellmod->compoundWordCB->isChecked();
-       rc.isp_use_input_encoding = spellmod->inputEncodingCB->isChecked();
-
-
-       Ui::QPrefPrinterUi * printmod(dialog_->printerModule);
-
-       rc.print_adapt_output = printmod->printerAdaptCB->isChecked();
-       rc.print_command = fromqstr(printmod->printerCommandED->text());
-       rc.printer = fromqstr(printmod->printerNameED->text());
-
-       rc.print_pagerange_flag = fromqstr(printmod->printerPageRangeED->text());
-       rc.print_copies_flag = fromqstr(printmod->printerCopiesED->text());
-       rc.print_reverse_flag = fromqstr(printmod->printerReverseED->text());
-       rc.print_to_printer = fromqstr(printmod->printerToPrinterED->text());
-       rc.print_file_extension = fromqstr(printmod->printerExtensionED->text());
-       rc.print_spool_command = fromqstr(printmod->printerSpoolCommandED->text());
-       rc.print_paper_flag = fromqstr(printmod->printerPaperTypeED->text());
-       rc.print_evenpage_flag = fromqstr(printmod->printerEvenED->text());
-       rc.print_oddpage_flag = fromqstr(printmod->printerOddED->text());
-       rc.print_collcopies_flag = fromqstr(printmod->printerCollatedED->text());
-       rc.print_landscape_flag = fromqstr(printmod->printerLandscapeED->text());
-       rc.print_to_file = internal_path(printmod->printerToFileED->text());
-       rc.print_extra_options = fromqstr(printmod->printerExtraED->text());
-       rc.print_spool_printerprefix = fromqstr(printmod->printerSpoolPrefixED->text());
-       rc.print_paper_dimension_flag = fromqstr(printmod->printerPaperSizeED->text());
-
-
-       Ui::QPrefIdentityUi * idmod(dialog_->identityModule);
-       rc.user_name = fromqstr(idmod->nameED->text());
-       rc.user_email = fromqstr(idmod->emailED->text());
-
-       Ui::QPrefScreenFontsUi * fontmod(dialog_->screenfontsModule);
-
-       LyXRC const oldrc(rc);
-
-       boost::tie(rc.roman_font_name, rc.roman_font_foundry)
-               = parseFontName(fromqstr(fontmod->screenRomanCO->currentText()));
-       boost::tie(rc.sans_font_name, rc.sans_font_foundry) =
-               parseFontName(fromqstr(fontmod->screenSansCO->currentText()));
-       boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) =
-               parseFontName(fromqstr(fontmod->screenTypewriterCO->currentText()));
-
-       rc.zoom = fontmod->screenZoomSB->value();
-       rc.dpi = fontmod->screenDpiSB->value();
-       rc.font_sizes[LyXFont::SIZE_TINY] = fromqstr(fontmod->screenTinyED->text());
-       rc.font_sizes[LyXFont::SIZE_SCRIPT] = fromqstr(fontmod->screenSmallestED->text());
-       rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = fromqstr(fontmod->screenSmallerED->text());
-       rc.font_sizes[LyXFont::SIZE_SMALL] = fromqstr(fontmod->screenSmallED->text());
-       rc.font_sizes[LyXFont::SIZE_NORMAL] = fromqstr(fontmod->screenNormalED->text());
-       rc.font_sizes[LyXFont::SIZE_LARGE] = fromqstr(fontmod->screenLargeED->text());
-       rc.font_sizes[LyXFont::SIZE_LARGER] = fromqstr(fontmod->screenLargerED->text());
-       rc.font_sizes[LyXFont::SIZE_LARGEST] = fromqstr(fontmod->screenLargestED->text());
-       rc.font_sizes[LyXFont::SIZE_HUGE] = fromqstr(fontmod->screenHugeED->text());
-       rc.font_sizes[LyXFont::SIZE_HUGER] = fromqstr(fontmod->screenHugerED->text());
-
-       if (rc.font_sizes != oldrc.font_sizes
-               || rc.roman_font_name != oldrc.roman_font_name
-               || rc.sans_font_name != oldrc.sans_font_name
-               || rc.typewriter_font_name != oldrc.typewriter_font_name
-               || rc.zoom != oldrc.zoom || rc.dpi != oldrc.dpi) {
-               controller().updateScreenFonts();
-       }
-
-       Ui::QPrefColorsUi * colmod(dialog_->colorsModule);
-
-       unsigned int i;
-
-       for (i = 0; i < colmod->lyxObjectsLB->count(); ++i) {
-               Q3ListBoxItem * ib(colmod->lyxObjectsLB->item(i));
-               QColorItem * ci(static_cast<QColorItem*>(ib));
-
-               LColor::color const col(dialog_->colors_[i]);
-               QColor const & qcol(lcolorcache.get(col));
-
-               // FIXME: dubious, but it's what xforms does
-               if (qcol != ci->color()) {
-                       ostringstream ostr;
-
-                       ostr << '#' << std::setbase(16) << setfill('0')
-                            << setw(2) << ci->color().red()
-                            << setw(2) << ci->color().green()
-                            << setw(2) << ci->color().blue();
-
-                       string newhex(ostr.str());
-                       controller().setColor(col, newhex);
-               }
-       }
-}
-
-
-// FIXME: move to helper_funcs.h
-namespace {
-
-template<class A>
-typename std::vector<A>::size_type
-findPos(std::vector<A> const & vec, A const & val)
-{
-       typedef typename std::vector<A>::const_iterator Cit;
-
-       Cit it = std::find(vec.begin(), vec.end(), val);
-       if (it == vec.end())
-               return 0;
-       return distance(vec.begin(), it);
+       dialog_->apply(controller().rc());
 }
 
-void setComboxFont(QComboBox * cb, string const & family, string const & foundry)
-{
-       string const name = makeFontName(family, foundry);
-       for (int i = 0; i < cb->count(); ++i) {
-               if (fromqstr(cb->text(i)) == name) {
-                       cb->setCurrentItem(i);
-                       return;
-               }
-       }
-
-       // Try matching without foundry name
-
-       // We count in reverse in order to prefer the Xft foundry
-       for (int i = cb->count() - 1; i >= 0; --i) {
-               pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
-               if (compare_no_case(tmp.first, family) == 0) {
-                       cb->setCurrentItem(i);
-                       return;
-               }
-       }
-
-       // family alone can contain e.g. "Helvetica [Adobe]"
-       pair<string, string> tmpfam = parseFontName(family);
-
-       // We count in reverse in order to prefer the Xft foundry
-       for (int i = cb->count() - 1; i >= 0; --i) {
-               pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
-               if (compare_no_case(tmp.first, tmpfam.first) == 0) {
-                       cb->setCurrentItem(i);
-                       return;
-               }
-       }
-
-       // Bleh, default fonts, and the names couldn't be found. Hack
-       // for bug 1063. Qt makes baby Jesus cry.
-
-       QFont font;
-
-       if (family == lyx_gui::roman_font_name()) {
-               font.setStyleHint(QFont::Serif);
-               font.setFamily(family.c_str());
-       } else if (family == lyx_gui::sans_font_name()) {
-               font.setStyleHint(QFont::SansSerif);
-               font.setFamily(family.c_str());
-       } else if (family == lyx_gui::typewriter_font_name()) {
-               font.setStyleHint(QFont::TypeWriter);
-               font.setFamily(family.c_str());
-       } else {
-               lyxerr << "FAILED to find the default font: '"
-                       << foundry << "', '" << family << '\''<< endl;
-               return;
-       }
-
-       QFontInfo info(font);
-       pair<string, string> tmp = parseFontName(fromqstr(info.family()));
-       string const & default_font_name = tmp.first;
-       lyxerr << "Apparent font is " << default_font_name << endl;
-
-       for (int i = 0; i < cb->count(); ++i) {
-               lyxerr << "Looking at " << fromqstr(cb->text(i)) << endl;
-               if (compare_no_case(fromqstr(cb->text(i)),
-                                   default_font_name) == 0) {
-                       cb->setCurrentItem(i);
-                       return;
-               }
-       }
-
-       lyxerr << "FAILED to find the font: '"
-               << foundry << "', '" << family << '\'' <<endl;
-}
-
-} // end namespace anon
-
-
-namespace {
-
-QString const external_path(string const & input)
-{
-       return toqstr(lyx::support::os::external_path(input));
-}
-
-}
-
-
 void QPrefs::update_contents()
 {
-       LyXRC const & rc(controller().rc());
-
-       Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
-
-       // FIXME: remove rtl_support bool
-       langmod->rtlCB->setChecked(rc.rtl_support);
-       langmod->markForeignCB->setChecked(rc.mark_foreign_language);
-       langmod->autoBeginCB->setChecked(rc.language_auto_begin);
-       langmod->autoEndCB->setChecked(rc.language_auto_end);
-       langmod->useBabelCB->setChecked(rc.language_use_babel);
-       langmod->globalCB->setChecked(rc.language_global_options);
-       langmod->languagePackageED->setText(toqstr(rc.language_package));
-       langmod->startCommandED->setText(toqstr(rc.language_command_begin));
-       langmod->endCommandED->setText(toqstr(rc.language_command_end));
-
-       int const pos = int(findPos(lang_, rc.default_language));
-       langmod->defaultLanguageCO->setCurrentItem(pos);
-
-       Ui::QPrefUi * uimod(dialog_->uiModule);
-
-       uimod->uiFileED->setText(external_path(rc.ui_file));
-       uimod->bindFileED->setText(external_path(rc.bind_file));
-       uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
-       uimod->wheelMouseSB->setValue(rc.wheel_jump);
-       // convert to minutes
-       int mins(rc.autosave / 60);
-       if (rc.autosave && !mins)
-               mins = 1;
-       uimod->autoSaveSB->setValue(mins);
-       uimod->autoSaveCB->setChecked(rc.make_backup);
-       uimod->lastfilesSB->setValue(rc.num_lastfiles);
-
-
-       Ui::QPrefIdentityUi * idmod(dialog_->identityModule);
-       idmod->nameED->setText(toqstr(rc.user_name));
-       idmod->emailED->setText(toqstr(rc.user_email));
-
-
-       Ui::QPrefKeyboardUi * keymod(dialog_->keyboardModule);
-
-       // FIXME: can derive CB from the two EDs
-       keymod->keymapCB->setChecked(rc.use_kbmap);
-       // no idea why we need these. Fscking Qt.
-       keymod->firstKeymapED->setEnabled(rc.use_kbmap);
-       keymod->firstKeymapPB->setEnabled(rc.use_kbmap);
-       keymod->firstKeymapLA->setEnabled(rc.use_kbmap);
-       keymod->secondKeymapED->setEnabled(rc.use_kbmap);
-       keymod->secondKeymapPB->setEnabled(rc.use_kbmap);
-       keymod->secondKeymapLA->setEnabled(rc.use_kbmap);
-       keymod->firstKeymapED->setText(external_path(rc.primary_kbmap));
-       keymod->secondKeymapED->setText(external_path(rc.secondary_kbmap));
-
-
-       Ui::QPrefAsciiUi * ascmod(dialog_->asciiModule);
-
-       ascmod->asciiLinelengthSB->setValue(rc.ascii_linelen);
-       ascmod->asciiRoffED->setText(toqstr(rc.ascii_roff_command));
-
-
-       Ui::QPrefDateUi * datemod(dialog_->dateModule);
-
-       datemod->DateED->setText(toqstr(rc.date_insert_format));
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       Ui::QPrefCygwinPathUi * cygwinmod(dialog_->cygwinpathModule);
-       cygwinmod->pathCB->setChecked(rc.cygwin_path_fix);
-#endif
-
-       Ui::QPrefLatexUi * latexmod(dialog_->latexModule);
-
-       latexmod->latexEncodingED->setText(toqstr(rc.fontenc));
-       latexmod->latexChecktexED->setText(toqstr(rc.chktex_command));
-       latexmod->latexBibtexED->setText(toqstr(rc.bibtex_command));
-       latexmod->latexIndexED->setText(toqstr(rc.index_command));
-       latexmod->latexAutoresetCB->setChecked(rc.auto_reset_options);
-       latexmod->latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option));
-       latexmod->latexPaperSizeCO->setCurrentItem(
-               controller().fromPaperSize(rc.default_papersize));
-
-
-       Ui::QPrefDisplayUi * displaymod(dialog_->displayModule);
-
-       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;
-
-       switch (rc.display_graphics) {
-               case lyx::graphics::NoDisplay:          item = 3; break;
-               case lyx::graphics::ColorDisplay:       item = 2; break;
-               case lyx::graphics::GrayscaleDisplay:   item = 1; break;
-               case lyx::graphics::MonochromeDisplay:  item = 0; break;
-               default: break;
-       }
-       displaymod->displayGraphicsCO->setCurrentItem(item);
-
-
-       Ui::QPrefPathsUi * pathsmod(dialog_->pathsModule);
-
-       pathsmod->workingDirED->setText(external_path(rc.document_path));
-       pathsmod->templateDirED->setText(external_path(rc.template_path));
-       pathsmod->backupDirED->setText(external_path(rc.backupdir_path));
-       pathsmod->tempDirED->setText(external_path(rc.tempdir_path));
-       pathsmod->pathPrefixED->setText(toqstr(rc.path_prefix));
-       // FIXME: should be a checkbox only
-       pathsmod->lyxserverDirED->setText(external_path(rc.lyxpipes));
-
-       Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
-
-       spellmod->spellCommandCO->setCurrentItem(0);
-
-       if (rc.isp_command == "ispell") {
-               spellmod->spellCommandCO->setCurrentItem(0);
-       } else if (rc.isp_command == "aspell") {
-               spellmod->spellCommandCO->setCurrentItem(1);
-       } else if (rc.isp_command == "hspell") {
-               spellmod->spellCommandCO->setCurrentItem(2);
-       }
-
-       if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
-               spellmod->spellCommandCO->setCurrentItem(3);
-#endif
-       }
-
-       // FIXME: remove isp_use_alt_lang
-       spellmod->altLanguageED->setText(toqstr(rc.isp_alt_lang));
-       // FIXME: remove isp_use_esc_chars
-       spellmod->escapeCharactersED->setText(toqstr(rc.isp_esc_chars));
-       // FIXME: remove isp_use_pers_dict
-       spellmod->persDictionaryED->setText(external_path(rc.isp_pers_dict));
-       spellmod->compoundWordCB->setChecked(rc.isp_accept_compound);
-       spellmod->inputEncodingCB->setChecked(rc.isp_use_input_encoding);
-
-
-       Ui::QPrefPrinterUi * printmod(dialog_->printerModule);
-
-       printmod->printerAdaptCB->setChecked(rc.print_adapt_output);
-       printmod->printerCommandED->setText(toqstr(rc.print_command));
-       printmod->printerNameED->setText(toqstr(rc.printer));
-
-       printmod->printerPageRangeED->setText(toqstr(rc.print_pagerange_flag));
-       printmod->printerCopiesED->setText(toqstr(rc.print_copies_flag));
-       printmod->printerReverseED->setText(toqstr(rc.print_reverse_flag));
-       printmod->printerToPrinterED->setText(toqstr(rc.print_to_printer));
-       printmod->printerExtensionED->setText(toqstr(rc.print_file_extension));
-       printmod->printerSpoolCommandED->setText(toqstr(rc.print_spool_command));
-       printmod->printerPaperTypeED->setText(toqstr(rc.print_paper_flag));
-       printmod->printerEvenED->setText(toqstr(rc.print_evenpage_flag));
-       printmod->printerOddED->setText(toqstr(rc.print_oddpage_flag));
-       printmod->printerCollatedED->setText(toqstr(rc.print_collcopies_flag));
-       printmod->printerLandscapeED->setText(toqstr(rc.print_landscape_flag));
-       printmod->printerToFileED->setText(external_path(rc.print_to_file));
-       printmod->printerExtraED->setText(toqstr(rc.print_extra_options));
-       printmod->printerSpoolPrefixED->setText(toqstr(rc.print_spool_printerprefix));
-       printmod->printerPaperSizeED->setText(toqstr(rc.print_paper_dimension_flag));
-
-
-       Ui::QPrefScreenFontsUi * fontmod(dialog_->screenfontsModule);
-
-       setComboxFont(fontmod->screenRomanCO, rc.roman_font_name,
-                       rc.roman_font_foundry);
-       setComboxFont(fontmod->screenSansCO, rc.sans_font_name,
-                       rc.sans_font_foundry);
-       setComboxFont(fontmod->screenTypewriterCO, rc.typewriter_font_name,
-                       rc.typewriter_font_foundry);
-
-       dialog_->select_roman(fontmod->screenRomanCO->currentText());
-       dialog_->select_sans(fontmod->screenSansCO->currentText());
-       dialog_->select_typewriter(fontmod->screenTypewriterCO->currentText());
-
-       fontmod->screenZoomSB->setValue(rc.zoom);
-       fontmod->screenDpiSB->setValue(rc.dpi);
-       fontmod->screenTinyED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_TINY]));
-       fontmod->screenSmallestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SCRIPT]));
-       fontmod->screenSmallerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]));
-       fontmod->screenSmallED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SMALL]));
-       fontmod->screenNormalED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_NORMAL]));
-       fontmod->screenLargeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGE]));
-       fontmod->screenLargerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGER]));
-       fontmod->screenLargestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGEST]));
-       fontmod->screenHugeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGE]));
-       fontmod->screenHugerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGER]));
-
-       dialog_->updateFormats();
-       dialog_->updateConverters();
-       dialog_->updateCopiers();
+       dialog_->update(controller().rc());
 }
 
 } // namespace frontend
index 4b5dfa3f40d417b51a89d106ec1b69fdd2512b63..44d4f2acf72dd5194a72b0405c7f190ed50f80c2 100644 (file)
@@ -29,11 +29,12 @@ class QPrefs
        : public QController<ControlPrefs, QView<QPrefsDialog> >
 {
 public:
-
-       friend class QPrefsDialog;
-
        QPrefs(Dialog &);
 
+       Converters & converters();
+       Formats & formats();
+       Movers & movers();
+
 private:
        /// Apply changes
        virtual void apply();
@@ -44,12 +45,6 @@ private:
        /// build the dialog
        virtual void build_dialog();
 
-       Converters & converters();
-       Formats & formats();
-       Movers & movers();
-
-       /// languages
-       std::vector<std::string> lang_;
 };
 
 } // namespace frontend
index a24ee45451aa368748e04876dd7de81eca02d1cb..0a7a8333670de693c129582e72ca6b606a7de103 100644 (file)
 #include "debug.h"
 #include "qt_helpers.h"
 
+#include "lcolorcache.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "debug.h"
+#include "lastfiles.h"
+#include "LColor.h"
+#include "lyxfont.h"
+
+#include "support/lstrings.h"
+#include "support/os.h"
+
+#include "controllers/ControlPrefs.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
+
+#include "frontends/lyx_gui.h"
+
 #include "QPrefsDialog.h"
 #include "QPrefs.h"
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include "panelstack.h"
 #include "qcoloritem.h"
 
 #include "controllers/ControlPrefs.h"
 
-#include <qcheckbox.h>
-#include <qcolordialog.h>
-#include <qfontdatabase.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qstring.h>
-#include <qvalidator.h>
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QFontDatabase>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QString>
+#include <QValidator>
+#include <QCloseEvent>
+
+#include <boost/tuple/tuple.hpp>
+#include <iomanip>
+#include <sstream>
+
+using lyx::support::compare_no_case;
 
+using std::distance;
+using std::endl;
+using std::setfill;
+using std::setw;
 using std::string;
+using std::ostringstream;
+using std::pair;
+using std::vector;
 
 namespace lyx {
 namespace frontend {
@@ -77,82 +107,103 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
                form, SLOT(slotRestore()));
 
 
+
        asciiModule = new UiWidget<Ui::QPrefAsciiUi>(this);
+       connect(asciiModule->asciiLinelengthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       connect(asciiModule->asciiRoffED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
 
+       
        dateModule = new UiWidget<Ui::QPrefDateUi>(this);
+       connect(dateModule->DateED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+
        
+
        keyboardModule = new UiWidget<Ui::QPrefKeyboardUi>(this);
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->firstKeymapLA, SLOT( setEnabled(bool) ) );
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->secondKeymapLA, SLOT( setEnabled(bool) ) );
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->firstKeymapED, SLOT( setEnabled(bool) ) );
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->secondKeymapED, SLOT( setEnabled(bool) ) );
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->firstKeymapPB, SLOT( setEnabled(bool) ) );
-    connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ), keyboardModule->secondKeymapPB, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+                keyboardModule->firstKeymapLA, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+               keyboardModule->secondKeymapLA, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+               keyboardModule->firstKeymapED, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+               keyboardModule->secondKeymapED, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+               keyboardModule->firstKeymapPB, SLOT( setEnabled(bool) ) );
+       connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
+               keyboardModule->secondKeymapPB, SLOT( setEnabled(bool) ) );
+       connect(keyboardModule->firstKeymapPB, SIGNAL(clicked()), this, SLOT(select_keymap1()));
+       connect(keyboardModule->secondKeymapPB, SIGNAL(clicked()), this, SLOT(select_keymap2()));
+       connect(keyboardModule->keymapCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       connect(keyboardModule->firstKeymapED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(keyboardModule->secondKeymapED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
 
-       latexModule = new UiWidget<Ui::QPrefLatexUi>(this);
-       
-       screenfontsModule = new UiWidget<Ui::QPrefScreenFontsUi>(this);
-       
-       colorsModule = new UiWidget<Ui::QPrefColorsUi>(this);
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       cygwinpathModule = new UiWidget<Ui::QPrefCygwinPathUi>(this);
-#endif
 
-       displayModule = new UiWidget<Ui::QPrefDisplayUi>(this);
-       
-       pathsModule = new UiWidget<Ui::QPrefPathsUi>(this);
-       
-       spellcheckerModule = new UiWidget<Ui::QPrefSpellcheckerUi>(this);
-       
-       convertersModule = new UiWidget<Ui::QPrefConvertersUi>(this);
-       
-       copiersModule = new UiWidget<Ui::QPrefCopiersUi>(this);
-       
-       fileformatsModule = new UiWidget<Ui::QPrefFileformatsUi>(this);
+       latexModule = new UiWidget<Ui::QPrefLatexUi>(this);
+       connect(latexModule->latexEncodingED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexChecktexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexBibtexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexIndexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexAutoresetCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexDviPaperED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(latexModule->latexPaperSizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
        
-       languageModule = new UiWidget<Ui::QPrefLanguageUi>(this);
 
-       printerModule = new UiWidget<Ui::QPrefPrinterUi>(this);
-       
-       uiModule = new UiWidget<Ui::QPrefUi>(this);
-    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveLA, SLOT( setEnabled(bool) ) );
-    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveSB, SLOT( setEnabled(bool) ) );
-    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->TextLabel1, SLOT( setEnabled(bool) ) );
 
-       identityModule = new UiWidget<Ui::QPrefIdentityUi>(this);
 
-       string const laf = _("Look and feel");
-       prefsPS->addCategory(laf);
-       prefsPS->addPanel(uiModule, _("User interface"), laf);
-       prefsPS->addPanel(screenfontsModule, _("Screen fonts"), laf);
-       prefsPS->addPanel(colorsModule, _("Colors"), laf);
-       prefsPS->addPanel(displayModule, _("Graphics"), laf);
-       prefsPS->addPanel(keyboardModule, _("Keyboard"), laf);
+       screenfontsModule = new UiWidget<Ui::QPrefScreenFontsUi>(this);
+       connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(select_roman(const QString&)));
+       connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(select_sans(const QString&)));
+       connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(select_typewriter(const QString&)));
 
-       string const ls = _("Language settings");
-       prefsPS->addCategory(ls);
-       prefsPS->addPanel(languageModule, _("Language"), ls);
-       prefsPS->addPanel(spellcheckerModule, _("Spellchecker"), ls);
+       QFontDatabase fontdb;
+       QStringList families(fontdb.families());
+       for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
+               screenfontsModule->screenRomanCO->insertItem(*it);
+               screenfontsModule->screenSansCO->insertItem(*it);
+               screenfontsModule->screenTypewriterCO->insertItem(*it);
+       }
+       connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenZoomSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenDpiSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenTinyED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenSmallestED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenSmallerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenSmallED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenNormalED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenLargeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenLargerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenLargestED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenHugeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(screenfontsModule->screenHugerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
 
-       string const op = _("Outputs");
-       prefsPS->addCategory(op);
-       prefsPS->addPanel(asciiModule, _("Plain text"), op);
-       prefsPS->addPanel(dateModule, _("Date format"), op);
-       prefsPS->addPanel(latexModule, _("LaTeX"), op);
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       prefsPS->addPanel(cygwinpathModule, _("Paths"), op);
-#endif
-       prefsPS->addPanel(printerModule, _("Printer"), op);
+       screenfontsModule->screenTinyED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenTinyED));
+       screenfontsModule->screenSmallestED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenSmallestED));
+       screenfontsModule->screenSmallerED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenSmallerED));
+       screenfontsModule->screenSmallED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenSmallED));
+       screenfontsModule->screenNormalED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenNormalED));
+       screenfontsModule->screenLargeED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenLargeED));
+       screenfontsModule->screenLargerED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenLargerED));
+       screenfontsModule->screenLargestED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenLargestED));
+       screenfontsModule->screenHugeED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenHugeED));
+       screenfontsModule->screenHugerED->setValidator(new QDoubleValidator(
+               screenfontsModule->screenHugerED));
 
-       prefsPS->addPanel(identityModule, _("Identity"));
-       prefsPS->addPanel(pathsModule, _("Paths"));
-       prefsPS->addPanel(fileformatsModule, _("File formats"));
-       prefsPS->addPanel(convertersModule, _("Converters"));
-       prefsPS->addPanel(copiersModule, _("Copiers"));
 
-       prefsPS->setCurrentPanel(_("User interface"));
+       
 
+       colorsModule = new UiWidget<Ui::QPrefColorsUi>(this);
        // FIXME: put in controller
        for (int i = 0; i < LColor::ignore; ++i) {
                LColor::color lc = static_cast<LColor::color>(i);
@@ -174,48 +225,66 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
                                toqstr(guiname)));
                colorsModule->lyxObjectsLB->insertItem(ci);
        }
+       connect(colorsModule->colorChangePB, SIGNAL(clicked()), this, SLOT(change_color()));
+       connect(colorsModule->lyxObjectsLB, SIGNAL(selected(int)), this, SLOT(change_color()));
 
-       QFontDatabase fontdb;
-       QStringList families(fontdb.families());
 
-       connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(select_roman(const QString&)));
-       connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(select_sans(const QString&)));
-       connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(select_typewriter(const QString&)));
 
-       for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
-               screenfontsModule->screenRomanCO->insertItem(*it);
-               screenfontsModule->screenSansCO->insertItem(*it);
-               screenfontsModule->screenTypewriterCO->insertItem(*it);
-       }
 
-       connect(uiModule->uiFilePB, SIGNAL(clicked()), this, SLOT(select_ui()));
-       connect(uiModule->bindFilePB, SIGNAL(clicked()), this, SLOT(select_bind()));
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+       cygwinpathModule = new UiWidget<Ui::QPrefCygwinPathUi>(this);
+       connect(cygwinpathModule->pathCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+#endif
 
-       connect(keyboardModule->firstKeymapPB, SIGNAL(clicked()), this, SLOT(select_keymap1()));
-       connect(keyboardModule->secondKeymapPB, SIGNAL(clicked()), this, SLOT(select_keymap2()));
 
-       connect(spellcheckerModule->persDictionaryPB, SIGNAL(clicked()), this, SLOT(select_dict()));
 
+       displayModule = new UiWidget<Ui::QPrefDisplayUi>(this);
+       connect(displayModule->instantPreviewCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(displayModule->displayGraphicsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       
+
+
+       pathsModule = new UiWidget<Ui::QPrefPathsUi>(this);
        connect(pathsModule->templateDirPB, SIGNAL(clicked()), this, SLOT(select_templatedir()));
        connect(pathsModule->tempDirPB, SIGNAL(clicked()), this, SLOT(select_tempdir()));
        connect(pathsModule->backupDirPB, SIGNAL(clicked()), this, SLOT(select_backupdir()));
        connect(pathsModule->workingDirPB, SIGNAL(clicked()), this, SLOT(select_workingdir()));
        connect(pathsModule->lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
+       connect(pathsModule->workingDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(pathsModule->templateDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(pathsModule->backupDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(pathsModule->tempDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(pathsModule->lyxserverDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(pathsModule->pathPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       
 
-       connect(colorsModule->colorChangePB, SIGNAL(clicked()), this, SLOT(change_color()));
-       connect(colorsModule->lyxObjectsLB, SIGNAL(selected(int)), this, SLOT(change_color()));
 
-       connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(new_format()));
-       connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(remove_format()));
-       connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(modify_format()));
-       connect(fileformatsModule->formatsLB, SIGNAL(highlighted(int)), this, SLOT(switch_format(int)));
-       connect(fileformatsModule->formatED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
-       connect(fileformatsModule->guiNameED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
-       connect(fileformatsModule->shortcutED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
-       connect(fileformatsModule->extensionED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
-       connect(fileformatsModule->viewerED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
-       connect(fileformatsModule->editorED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       spellcheckerModule = new UiWidget<Ui::QPrefSpellcheckerUi>(this);
+       connect(spellcheckerModule->persDictionaryPB, SIGNAL(clicked()), this, SLOT(select_dict()));
+#if defined (USE_ISPELL)
+       connect(spellcheckerModule->spellCommandCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+#else
+       spellcheckerModule->spellCommandCO->setEnabled(false);
+#endif
+       connect(spellcheckerModule->altLanguageED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(spellcheckerModule->escapeCharactersED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(spellcheckerModule->persDictionaryED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(spellcheckerModule->compoundWordCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       connect(spellcheckerModule->inputEncodingCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       spellcheckerModule->spellCommandCO->insertItem(qt_("ispell"));
+       spellcheckerModule->spellCommandCO->insertItem(qt_("aspell"));
+       spellcheckerModule->spellCommandCO->insertItem(qt_("hspell"));
+#ifdef USE_PSPELL
+       spellcheckerModule->spellCommandCO->insertItem(qt_("pspell (library)"));
+#else
+#ifdef USE_ASPELL
+       spellcheckerModule->spellCommandCO->insertItem(qt_("aspell (library)"));
+#endif
+#endif
 
+       
+
+       convertersModule = new UiWidget<Ui::QPrefConvertersUi>(this);
        connect(convertersModule->converterNewPB, SIGNAL(clicked()), this, SLOT(new_converter()));
        connect(convertersModule->converterRemovePB, SIGNAL(clicked()), this, SLOT(remove_converter()));
        connect(convertersModule->converterModifyPB, SIGNAL(clicked()), this, SLOT(modify_converter()));
@@ -224,14 +293,13 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(convertersModule->converterToCO, SIGNAL(activated(const QString&)), this, SLOT(converter_changed()));
        connect(convertersModule->converterED, SIGNAL(textChanged(const QString&)), this, SLOT(converter_changed()));
        connect(convertersModule->converterFlagED, SIGNAL(textChanged(const QString&)), this, SLOT(converter_changed()));
-
-       // Qt really sucks. This is as ugly as it looks, but the alternative
-       // means having to derive every module == bloat
-
        connect(convertersModule->converterNewPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(convertersModule->converterRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(convertersModule->converterModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 
+       
+
+       copiersModule = new UiWidget<Ui::QPrefCopiersUi>(this);
        connect(copiersModule->copierNewPB, SIGNAL(clicked()), this, SLOT(new_copier()));
        connect(copiersModule->copierRemovePB, SIGNAL(clicked()), this, SLOT(remove_copier()));
        connect(copiersModule->copierModifyPB, SIGNAL(clicked()), this, SLOT(modify_copier()));
@@ -242,10 +310,29 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(copiersModule->copierModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(copiersModule->copierFormatCO, SIGNAL(activated(const QString&)), this, SLOT(copiers_changed()));
        connect(copiersModule->copierED, SIGNAL(textChanged(const QString&)), this, SLOT(copiers_changed()));
+       
+
 
+
+       fileformatsModule = new UiWidget<Ui::QPrefFileformatsUi>(this);
+       connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(new_format()));
+       connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(remove_format()));
+       connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(modify_format()));
+       connect(fileformatsModule->formatsLB, SIGNAL(highlighted(int)), this, SLOT(switch_format(int)));
+       connect(fileformatsModule->formatED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->guiNameED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->shortcutED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->extensionED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->viewerED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->editorED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
        connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+       
+
+
+
+       languageModule = new UiWidget<Ui::QPrefLanguageUi>(this);
        connect(languageModule->rtlCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
        connect(languageModule->markForeignCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
        connect(languageModule->autoBeginCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
@@ -256,47 +343,26 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(languageModule->startCommandED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(languageModule->endCommandED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(languageModule->defaultLanguageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(uiModule->uiFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(uiModule->cursorFollowsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-       connect(uiModule->wheelMouseSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-       connect(uiModule->lastfilesSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(keyboardModule->keymapCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-       connect(keyboardModule->firstKeymapED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(keyboardModule->secondKeymapED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(asciiModule->asciiLinelengthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(asciiModule->asciiRoffED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(dateModule->DateED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       connect(cygwinpathModule->pathCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-#endif
-       connect(latexModule->latexEncodingED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexChecktexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexBibtexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexIndexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexAutoresetCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexDviPaperED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(latexModule->latexPaperSizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(displayModule->instantPreviewCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(displayModule->displayGraphicsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(pathsModule->workingDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(pathsModule->templateDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(pathsModule->backupDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(pathsModule->tempDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(pathsModule->lyxserverDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(pathsModule->pathPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-#if defined (USE_ISPELL)
-       connect(spellcheckerModule->spellCommandCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-#else
-       spellcheckerModule->spellCommandCO->setEnabled(false);
-#endif
-       connect(spellcheckerModule->altLanguageED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(spellcheckerModule->escapeCharactersED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(spellcheckerModule->persDictionaryED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(spellcheckerModule->compoundWordCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-       connect(spellcheckerModule->inputEncodingCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+
+       languageModule->defaultLanguageCO->clear();
+
+       // store the lang identifiers for later
+       using lyx::frontend::LanguagePair;
+       std::vector<LanguagePair> const langs =
+               lyx::frontend::getLanguageData(false);
+       lang_ = getSecond(langs);
+
+       std::vector<LanguagePair>::const_iterator lit  = langs.begin();
+       std::vector<LanguagePair>::const_iterator lend = langs.end();
+       for (; lit != lend; ++lit) {
+               languageModule->defaultLanguageCO->insertItem(toqstr(lit->first));
+       }
+
+
+
+       
+       
+       printerModule = new UiWidget<Ui::QPrefPrinterUi>(this);
        connect(printerModule->printerAdaptCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
        connect(printerModule->printerCommandED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(printerModule->printerNameED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
@@ -315,48 +381,76 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(printerModule->printerExtraED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(printerModule->printerSpoolPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(printerModule->printerPaperSizeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenZoomSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenDpiSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenTinyED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenSmallestED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenSmallerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenSmallED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenNormalED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenLargeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenLargerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenLargestED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenHugeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-       connect(screenfontsModule->screenHugerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       
+
+
+
+       uiModule = new UiWidget<Ui::QPrefUi>(this);
+    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveLA, SLOT( setEnabled(bool) ) );
+    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveSB, SLOT( setEnabled(bool) ) );
+    connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->TextLabel1, SLOT( setEnabled(bool) ) );
+       connect(uiModule->uiFilePB, SIGNAL(clicked()), this, SLOT(select_ui()));
+       connect(uiModule->bindFilePB, SIGNAL(clicked()), this, SLOT(select_bind()));
+       connect(uiModule->uiFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+       connect(uiModule->cursorFollowsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       connect(uiModule->wheelMouseSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+       connect(uiModule->lastfilesSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
+       uiModule->lastfilesSB->setMaxValue(maxlastfiles);
+
+
+
+
+       identityModule = new UiWidget<Ui::QPrefIdentityUi>(this);
        connect(identityModule->nameED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
        connect(identityModule->emailED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
 
-       // initialize the validators
-       screenfontsModule->screenTinyED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenTinyED));
-       screenfontsModule->screenSmallestED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenSmallestED));
-       screenfontsModule->screenSmallerED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenSmallerED));
-       screenfontsModule->screenSmallED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenSmallED));
-       screenfontsModule->screenNormalED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenNormalED));
-       screenfontsModule->screenLargeED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenLargeED));
-       screenfontsModule->screenLargerED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenLargerED));
-       screenfontsModule->screenLargestED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenLargestED));
-       screenfontsModule->screenHugeED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenHugeED));
-       screenfontsModule->screenHugerED->setValidator(new QDoubleValidator(
-               screenfontsModule->screenHugerED));
+
+
+
+       string const laf = _("Look and feel");
+       prefsPS->addCategory(laf);
+       prefsPS->addPanel(uiModule, _("User interface"), laf);
+       prefsPS->addPanel(screenfontsModule, _("Screen fonts"), laf);
+       prefsPS->addPanel(colorsModule, _("Colors"), laf);
+       prefsPS->addPanel(displayModule, _("Graphics"), laf);
+       prefsPS->addPanel(keyboardModule, _("Keyboard"), laf);
+
+       string const ls = _("Language settings");
+       prefsPS->addCategory(ls);
+       prefsPS->addPanel(languageModule, _("Language"), ls);
+       prefsPS->addPanel(spellcheckerModule, _("Spellchecker"), ls);
+
+       string const op = _("Outputs");
+       prefsPS->addCategory(op);
+       prefsPS->addPanel(asciiModule, _("Plain text"), op);
+       prefsPS->addPanel(dateModule, _("Date format"), op);
+       prefsPS->addPanel(latexModule, _("LaTeX"), op);
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+       prefsPS->addPanel(cygwinpathModule, _("Paths"), op);
+#endif
+       prefsPS->addPanel(printerModule, _("Printer"), op);
+
+       prefsPS->addPanel(identityModule, _("Identity"));
+       prefsPS->addPanel(pathsModule, _("Paths"));
+       prefsPS->addPanel(fileformatsModule, _("File formats"));
+       prefsPS->addPanel(convertersModule, _("Converters"));
+       prefsPS->addPanel(copiersModule, _("Copiers"));
+
+       prefsPS->setCurrentPanel(_("User interface"));
+
+
+       form_->bcview().setOK(savePB);
+       form_->bcview().setApply(applyPB);
+       form_->bcview().setCancel(closePB);
+       form_->bcview().setRestore(restorePB);
 }
 
 
+
+
 QPrefsDialog::~QPrefsDialog()
 {
 }
@@ -1000,5 +1094,497 @@ void QPrefsDialog::select_typewriter(const QString& name)
        screenfontsModule->screenTypewriterFE->set(QFont(name), name);
 }
 
+namespace {
+
+string const internal_path(QString const & input)
+{
+       return lyx::support::os::internal_path(fromqstr(input));
+}
+
+}
+
+void QPrefsDialog::apply(LyXRC & rc) const
+{
+       // FIXME: remove rtl_support bool
+       rc.rtl_support = languageModule->rtlCB->isChecked();
+       rc.mark_foreign_language = languageModule->markForeignCB->isChecked();
+       rc.language_auto_begin = languageModule->autoBeginCB->isChecked();
+       rc.language_auto_end = languageModule->autoEndCB->isChecked();
+       rc.language_use_babel = languageModule->useBabelCB->isChecked();
+       rc.language_global_options = languageModule->globalCB->isChecked();
+       rc.language_package = fromqstr(languageModule->languagePackageED->text());
+       rc.language_command_begin = fromqstr(languageModule->startCommandED->text());
+       rc.language_command_end = fromqstr(languageModule->endCommandED->text());
+       rc.default_language = lang_[languageModule->defaultLanguageCO->currentItem()];
+
+
+       rc.ui_file = internal_path(uiModule->uiFileED->text());
+       rc.bind_file = internal_path(uiModule->bindFileED->text());
+       rc.cursor_follows_scrollbar = uiModule->cursorFollowsCB->isChecked();
+       rc.wheel_jump = uiModule->wheelMouseSB->value();
+       rc.autosave = uiModule->autoSaveSB->value() * 60;
+       rc.make_backup = uiModule->autoSaveCB->isChecked();
+       rc.num_lastfiles = uiModule->lastfilesSB->value();
+
+
+       // FIXME: can derive CB from the two EDs
+       rc.use_kbmap = keyboardModule->keymapCB->isChecked();
+       rc.primary_kbmap = internal_path(keyboardModule->firstKeymapED->text());
+       rc.secondary_kbmap = internal_path(keyboardModule->secondKeymapED->text());
+
+
+       rc.ascii_linelen = asciiModule->asciiLinelengthSB->value();
+       rc.ascii_roff_command = fromqstr(asciiModule->asciiRoffED->text());
+
+
+       rc.date_insert_format = fromqstr(dateModule->DateED->text());
+
+
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+       rc.cygwin_path_fix = cygwinpathModule->pathCB->isChecked();
+#endif
+
+
+       rc.fontenc = fromqstr(latexModule->latexEncodingED->text());
+       rc.chktex_command = fromqstr(latexModule->latexChecktexED->text());
+       rc.bibtex_command = fromqstr(latexModule->latexBibtexED->text());
+       rc.index_command = fromqstr(latexModule->latexIndexED->text());
+       rc.auto_reset_options = latexModule->latexAutoresetCB->isChecked();
+       rc.view_dvi_paper_option = fromqstr(latexModule->latexDviPaperED->text());
+       rc.default_papersize =
+               form_->controller().toPaperSize(latexModule->latexPaperSizeCO->currentItem());
+
+
+       switch (displayModule->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;
+       switch (displayModule->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;
+       default: dtype = lyx::graphics::GrayscaleDisplay;
+       }
+       rc.display_graphics = dtype;
+
+#ifdef WITH_WARNINGS
+#warning FIXME!! The graphics cache no longer has a changeDisplay method.
+#endif
+#if 0
+       if (old_value != rc.display_graphics) {
+               lyx::graphics::GCache & gc = lyx::graphics::GCache::get();
+               gc.changeDisplay();
+       }
+#endif
+
+
+       rc.document_path = internal_path(pathsModule->workingDirED->text());
+       rc.template_path = internal_path(pathsModule->templateDirED->text());
+       rc.backupdir_path = internal_path(pathsModule->backupDirED->text());
+       rc.tempdir_path = internal_path(pathsModule->tempDirED->text());
+       rc.path_prefix = fromqstr(pathsModule->pathPrefixED->text());
+       // FIXME: should be a checkbox only
+       rc.lyxpipes = internal_path(pathsModule->lyxserverDirED->text());
+
+
+       switch (spellcheckerModule->spellCommandCO->currentItem()) {
+               case 0:
+               case 1:
+               case 2:
+                       rc.use_spell_lib = false;
+                       rc.isp_command = fromqstr(spellcheckerModule->spellCommandCO->currentText());
+                       break;
+               case 3:
+                       rc.use_spell_lib = true;
+                       break;
+       }
+
+       // FIXME: remove isp_use_alt_lang
+       rc.isp_alt_lang = fromqstr(spellcheckerModule->altLanguageED->text());
+       rc.isp_use_alt_lang = !rc.isp_alt_lang.empty();
+       // FIXME: remove isp_use_esc_chars
+       rc.isp_esc_chars = fromqstr(spellcheckerModule->escapeCharactersED->text());
+       rc.isp_use_esc_chars = !rc.isp_esc_chars.empty();
+       // FIXME: remove isp_use_pers_dict
+       rc.isp_pers_dict = internal_path(spellcheckerModule->persDictionaryED->text());
+       rc.isp_use_pers_dict = !rc.isp_pers_dict.empty();
+       rc.isp_accept_compound = spellcheckerModule->compoundWordCB->isChecked();
+       rc.isp_use_input_encoding = spellcheckerModule->inputEncodingCB->isChecked();
+
+
+
+       rc.print_adapt_output = printerModule->printerAdaptCB->isChecked();
+       rc.print_command = fromqstr(printerModule->printerCommandED->text());
+       rc.printer = fromqstr(printerModule->printerNameED->text());
+
+       rc.print_pagerange_flag = fromqstr(printerModule->printerPageRangeED->text());
+       rc.print_copies_flag = fromqstr(printerModule->printerCopiesED->text());
+       rc.print_reverse_flag = fromqstr(printerModule->printerReverseED->text());
+       rc.print_to_printer = fromqstr(printerModule->printerToPrinterED->text());
+       rc.print_file_extension = fromqstr(printerModule->printerExtensionED->text());
+       rc.print_spool_command = fromqstr(printerModule->printerSpoolCommandED->text());
+       rc.print_paper_flag = fromqstr(printerModule->printerPaperTypeED->text());
+       rc.print_evenpage_flag = fromqstr(printerModule->printerEvenED->text());
+       rc.print_oddpage_flag = fromqstr(printerModule->printerOddED->text());
+       rc.print_collcopies_flag = fromqstr(printerModule->printerCollatedED->text());
+       rc.print_landscape_flag = fromqstr(printerModule->printerLandscapeED->text());
+       rc.print_to_file = internal_path(printerModule->printerToFileED->text());
+       rc.print_extra_options = fromqstr(printerModule->printerExtraED->text());
+       rc.print_spool_printerprefix = fromqstr(printerModule->printerSpoolPrefixED->text());
+       rc.print_paper_dimension_flag = fromqstr(printerModule->printerPaperSizeED->text());
+
+
+
+       rc.user_name = fromqstr(identityModule->nameED->text());
+       rc.user_email = fromqstr(identityModule->emailED->text());
+
+
+
+       LyXRC const oldrc(rc);
+
+       boost::tie(rc.roman_font_name, rc.roman_font_foundry)
+               = parseFontName(fromqstr(screenfontsModule->screenRomanCO->currentText()));
+       boost::tie(rc.sans_font_name, rc.sans_font_foundry) =
+               parseFontName(fromqstr(screenfontsModule->screenSansCO->currentText()));
+       boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) =
+               parseFontName(fromqstr(screenfontsModule->screenTypewriterCO->currentText()));
+
+       rc.zoom = screenfontsModule->screenZoomSB->value();
+       rc.dpi = screenfontsModule->screenDpiSB->value();
+       rc.font_sizes[LyXFont::SIZE_TINY] = fromqstr(screenfontsModule->screenTinyED->text());
+       rc.font_sizes[LyXFont::SIZE_SCRIPT] = fromqstr(screenfontsModule->screenSmallestED->text());
+       rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = fromqstr(screenfontsModule->screenSmallerED->text());
+       rc.font_sizes[LyXFont::SIZE_SMALL] = fromqstr(screenfontsModule->screenSmallED->text());
+       rc.font_sizes[LyXFont::SIZE_NORMAL] = fromqstr(screenfontsModule->screenNormalED->text());
+       rc.font_sizes[LyXFont::SIZE_LARGE] = fromqstr(screenfontsModule->screenLargeED->text());
+       rc.font_sizes[LyXFont::SIZE_LARGER] = fromqstr(screenfontsModule->screenLargerED->text());
+       rc.font_sizes[LyXFont::SIZE_LARGEST] = fromqstr(screenfontsModule->screenLargestED->text());
+       rc.font_sizes[LyXFont::SIZE_HUGE] = fromqstr(screenfontsModule->screenHugeED->text());
+       rc.font_sizes[LyXFont::SIZE_HUGER] = fromqstr(screenfontsModule->screenHugerED->text());
+
+       if (rc.font_sizes != oldrc.font_sizes
+               || rc.roman_font_name != oldrc.roman_font_name
+               || rc.sans_font_name != oldrc.sans_font_name
+               || rc.typewriter_font_name != oldrc.typewriter_font_name
+               || rc.zoom != oldrc.zoom || rc.dpi != oldrc.dpi) {
+               form_->controller().updateScreenFonts();
+       }
+
+       
+       
+       
+       unsigned int i;
+       for (i = 0; i < colorsModule->lyxObjectsLB->count(); ++i) {
+               Q3ListBoxItem * ib(colorsModule->lyxObjectsLB->item(i));
+               QColorItem * ci(static_cast<QColorItem*>(ib));
+
+               LColor::color const col(colors_[i]);
+               QColor const & qcol(lcolorcache.get(col));
+
+               // FIXME: dubious, but it's what xforms does
+               if (qcol != ci->color()) {
+                       ostringstream ostr;
+
+                       ostr << '#' << std::setbase(16) << setfill('0')
+                            << setw(2) << ci->color().red()
+                            << setw(2) << ci->color().green()
+                            << setw(2) << ci->color().blue();
+
+                       string newhex(ostr.str());
+                       form_->controller().setColor(col, newhex);
+               }
+       }
+}
+
+// FIXME: move to helper_funcs.h
+namespace {
+
+template<class A>
+typename std::vector<A>::size_type
+findPos(std::vector<A> const & vec, A const & val)
+{
+       typedef typename std::vector<A>::const_iterator Cit;
+
+       Cit it = std::find(vec.begin(), vec.end(), val);
+       if (it == vec.end())
+               return 0;
+       return distance(vec.begin(), it);
+}
+
+void setComboxFont(QComboBox * cb, string const & family, string const & foundry)
+{
+       string const name = makeFontName(family, foundry);
+       for (int i = 0; i < cb->count(); ++i) {
+               if (fromqstr(cb->text(i)) == name) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+
+       // Try matching without foundry name
+
+       // We count in reverse in order to prefer the Xft foundry
+       for (int i = cb->count() - 1; i >= 0; --i) {
+               pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
+               if (compare_no_case(tmp.first, family) == 0) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+
+       // family alone can contain e.g. "Helvetica [Adobe]"
+       pair<string, string> tmpfam = parseFontName(family);
+
+       // We count in reverse in order to prefer the Xft foundry
+       for (int i = cb->count() - 1; i >= 0; --i) {
+               pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
+               if (compare_no_case(tmp.first, tmpfam.first) == 0) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+
+       // Bleh, default fonts, and the names couldn't be found. Hack
+       // for bug 1063. Qt makes baby Jesus cry.
+
+       QFont font;
+
+       if (family == lyx_gui::roman_font_name()) {
+               font.setStyleHint(QFont::Serif);
+               font.setFamily(family.c_str());
+       } else if (family == lyx_gui::sans_font_name()) {
+               font.setStyleHint(QFont::SansSerif);
+               font.setFamily(family.c_str());
+       } else if (family == lyx_gui::typewriter_font_name()) {
+               font.setStyleHint(QFont::TypeWriter);
+               font.setFamily(family.c_str());
+       } else {
+               lyxerr << "FAILED to find the default font: '"
+                       << foundry << "', '" << family << '\''<< endl;
+               return;
+       }
+
+       QFontInfo info(font);
+       pair<string, string> tmp = parseFontName(fromqstr(info.family()));
+       string const & default_font_name = tmp.first;
+       lyxerr << "Apparent font is " << default_font_name << endl;
+
+       for (int i = 0; i < cb->count(); ++i) {
+               lyxerr << "Looking at " << fromqstr(cb->text(i)) << endl;
+               if (compare_no_case(fromqstr(cb->text(i)),
+                                   default_font_name) == 0) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+
+       lyxerr << "FAILED to find the font: '"
+               << foundry << "', '" << family << '\'' <<endl;
+}
+
+} // end namespace anon
+
+namespace {
+
+QString const external_path(string const & input)
+{
+       return toqstr(lyx::support::os::external_path(input));
+}
+
+}
+
+void QPrefsDialog::update(LyXRC const & rc)
+{
+       // FIXME: remove rtl_support bool
+       languageModule->rtlCB->setChecked(rc.rtl_support);
+       languageModule->markForeignCB->setChecked(rc.mark_foreign_language);
+       languageModule->autoBeginCB->setChecked(rc.language_auto_begin);
+       languageModule->autoEndCB->setChecked(rc.language_auto_end);
+       languageModule->useBabelCB->setChecked(rc.language_use_babel);
+       languageModule->globalCB->setChecked(rc.language_global_options);
+       languageModule->languagePackageED->setText(toqstr(rc.language_package));
+       languageModule->startCommandED->setText(toqstr(rc.language_command_begin));
+       languageModule->endCommandED->setText(toqstr(rc.language_command_end));
+
+       int const pos = int(findPos(lang_, rc.default_language));
+       languageModule->defaultLanguageCO->setCurrentItem(pos);
+
+       uiModule->uiFileED->setText(external_path(rc.ui_file));
+       uiModule->bindFileED->setText(external_path(rc.bind_file));
+       uiModule->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
+       uiModule->wheelMouseSB->setValue(rc.wheel_jump);
+       // convert to minutes
+       int mins(rc.autosave / 60);
+       if (rc.autosave && !mins)
+               mins = 1;
+       uiModule->autoSaveSB->setValue(mins);
+       uiModule->autoSaveCB->setChecked(rc.make_backup);
+       uiModule->lastfilesSB->setValue(rc.num_lastfiles);
+
+
+       identityModule->nameED->setText(toqstr(rc.user_name));
+       identityModule->emailED->setText(toqstr(rc.user_email));
+
+
+       // FIXME: can derive CB from the two EDs
+       keyboardModule->keymapCB->setChecked(rc.use_kbmap);
+       // no idea why we need these. Fscking Qt.
+       keyboardModule->firstKeymapED->setEnabled(rc.use_kbmap);
+       keyboardModule->firstKeymapPB->setEnabled(rc.use_kbmap);
+       keyboardModule->firstKeymapLA->setEnabled(rc.use_kbmap);
+       keyboardModule->secondKeymapED->setEnabled(rc.use_kbmap);
+       keyboardModule->secondKeymapPB->setEnabled(rc.use_kbmap);
+       keyboardModule->secondKeymapLA->setEnabled(rc.use_kbmap);
+       keyboardModule->firstKeymapED->setText(external_path(rc.primary_kbmap));
+       keyboardModule->secondKeymapED->setText(external_path(rc.secondary_kbmap));
+
+
+
+       asciiModule->asciiLinelengthSB->setValue(rc.ascii_linelen);
+       asciiModule->asciiRoffED->setText(toqstr(rc.ascii_roff_command));
+
+
+
+       dateModule->DateED->setText(toqstr(rc.date_insert_format));
+
+
+
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+       cygwinpathModule->pathCB->setChecked(rc.cygwin_path_fix);
+#endif
+
+
+
+       latexModule->latexEncodingED->setText(toqstr(rc.fontenc));
+       latexModule->latexChecktexED->setText(toqstr(rc.chktex_command));
+       latexModule->latexBibtexED->setText(toqstr(rc.bibtex_command));
+       latexModule->latexIndexED->setText(toqstr(rc.index_command));
+       latexModule->latexAutoresetCB->setChecked(rc.auto_reset_options);
+       latexModule->latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option));
+       latexModule->latexPaperSizeCO->setCurrentItem(
+               form_->controller().fromPaperSize(rc.default_papersize));
+
+
+
+       switch (rc.preview) {
+       case LyXRC::PREVIEW_OFF:
+               displayModule->instantPreviewCO->setCurrentItem(0);
+               break;
+       case LyXRC::PREVIEW_NO_MATH :
+               displayModule->instantPreviewCO->setCurrentItem(1);
+               break;
+       case LyXRC::PREVIEW_ON :
+               displayModule->instantPreviewCO->setCurrentItem(2);
+               break;
+       }
+
+       int item = 2;
+       switch (rc.display_graphics) {
+               case lyx::graphics::NoDisplay:          item = 3; break;
+               case lyx::graphics::ColorDisplay:       item = 2; break;
+               case lyx::graphics::GrayscaleDisplay:   item = 1; break;
+               case lyx::graphics::MonochromeDisplay:  item = 0; break;
+               default: break;
+       }
+       displayModule->displayGraphicsCO->setCurrentItem(item);
+
+
+
+       pathsModule->workingDirED->setText(external_path(rc.document_path));
+       pathsModule->templateDirED->setText(external_path(rc.template_path));
+       pathsModule->backupDirED->setText(external_path(rc.backupdir_path));
+       pathsModule->tempDirED->setText(external_path(rc.tempdir_path));
+       pathsModule->pathPrefixED->setText(toqstr(rc.path_prefix));
+       // FIXME: should be a checkbox only
+       pathsModule->lyxserverDirED->setText(external_path(rc.lyxpipes));
+
+
+
+       spellcheckerModule->spellCommandCO->setCurrentItem(0);
+
+       if (rc.isp_command == "ispell") {
+               spellcheckerModule->spellCommandCO->setCurrentItem(0);
+       } else if (rc.isp_command == "aspell") {
+               spellcheckerModule->spellCommandCO->setCurrentItem(1);
+       } else if (rc.isp_command == "hspell") {
+               spellcheckerModule->spellCommandCO->setCurrentItem(2);
+       }
+
+       if (rc.use_spell_lib) {
+#if defined(USE_ASPELL) || defined(USE_PSPELL)
+               spellcheckerModule->spellCommandCO->setCurrentItem(3);
+#endif
+       }
+
+       // FIXME: remove isp_use_alt_lang
+       spellcheckerModule->altLanguageED->setText(toqstr(rc.isp_alt_lang));
+       // FIXME: remove isp_use_esc_chars
+       spellcheckerModule->escapeCharactersED->setText(toqstr(rc.isp_esc_chars));
+       // FIXME: remove isp_use_pers_dict
+       spellcheckerModule->persDictionaryED->setText(external_path(rc.isp_pers_dict));
+       spellcheckerModule->compoundWordCB->setChecked(rc.isp_accept_compound);
+       spellcheckerModule->inputEncodingCB->setChecked(rc.isp_use_input_encoding);
+
+
+
+
+       printerModule->printerAdaptCB->setChecked(rc.print_adapt_output);
+       printerModule->printerCommandED->setText(toqstr(rc.print_command));
+       printerModule->printerNameED->setText(toqstr(rc.printer));
+
+       printerModule->printerPageRangeED->setText(toqstr(rc.print_pagerange_flag));
+       printerModule->printerCopiesED->setText(toqstr(rc.print_copies_flag));
+       printerModule->printerReverseED->setText(toqstr(rc.print_reverse_flag));
+       printerModule->printerToPrinterED->setText(toqstr(rc.print_to_printer));
+       printerModule->printerExtensionED->setText(toqstr(rc.print_file_extension));
+       printerModule->printerSpoolCommandED->setText(toqstr(rc.print_spool_command));
+       printerModule->printerPaperTypeED->setText(toqstr(rc.print_paper_flag));
+       printerModule->printerEvenED->setText(toqstr(rc.print_evenpage_flag));
+       printerModule->printerOddED->setText(toqstr(rc.print_oddpage_flag));
+       printerModule->printerCollatedED->setText(toqstr(rc.print_collcopies_flag));
+       printerModule->printerLandscapeED->setText(toqstr(rc.print_landscape_flag));
+       printerModule->printerToFileED->setText(external_path(rc.print_to_file));
+       printerModule->printerExtraED->setText(toqstr(rc.print_extra_options));
+       printerModule->printerSpoolPrefixED->setText(toqstr(rc.print_spool_printerprefix));
+       printerModule->printerPaperSizeED->setText(toqstr(rc.print_paper_dimension_flag));
+
+
+
+
+       setComboxFont(screenfontsModule->screenRomanCO, rc.roman_font_name,
+                       rc.roman_font_foundry);
+       setComboxFont(screenfontsModule->screenSansCO, rc.sans_font_name,
+                       rc.sans_font_foundry);
+       setComboxFont(screenfontsModule->screenTypewriterCO, rc.typewriter_font_name,
+                       rc.typewriter_font_foundry);
+
+       select_roman(screenfontsModule->screenRomanCO->currentText());
+       select_sans(screenfontsModule->screenSansCO->currentText());
+       select_typewriter(screenfontsModule->screenTypewriterCO->currentText());
+
+       screenfontsModule->screenZoomSB->setValue(rc.zoom);
+       screenfontsModule->screenDpiSB->setValue(rc.dpi);
+       screenfontsModule->screenTinyED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_TINY]));
+       screenfontsModule->screenSmallestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SCRIPT]));
+       screenfontsModule->screenSmallerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]));
+       screenfontsModule->screenSmallED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SMALL]));
+       screenfontsModule->screenNormalED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_NORMAL]));
+       screenfontsModule->screenLargeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGE]));
+       screenfontsModule->screenLargerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGER]));
+       screenfontsModule->screenLargestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGEST]));
+       screenfontsModule->screenHugeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGE]));
+       screenfontsModule->screenHugerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGER]));
+
+       updateFormats();
+       updateConverters();
+       updateCopiers();
+
+}
+
+
 } // namespace frontend
 } // namespace lyx
index 7806af27b07372b719266d532448c242cc329bc4..033ff3993c8dc7cb85bb7dcb91837720720f37fe 100644 (file)
@@ -14,6 +14,7 @@
 #define QPREFSDIALOG_H
 
 #include "LColor.h"
+#include "lyxrc.h"
 
 #include "ui/QPrefsUi.h"
 
@@ -52,21 +53,23 @@ template<class UI>
                }
        };
 
-
 namespace lyx {
 namespace frontend {
 
 class QPrefs;
 
+///
 class QPrefsDialog : public QDialog, public Ui::QPrefsUi {
        Q_OBJECT
 public:
-       friend class QPrefs;
-
        QPrefsDialog(QPrefs *);
 
        ~QPrefsDialog();
+       
+       void apply(LyXRC & rc) const;
+       void update(LyXRC const & rc);
 
+protected:
        void updateConverters();
        void updateConverterButtons();
        void updateCopiers();
@@ -118,6 +121,9 @@ protected:
 
 private:
 
+       /// languages
+       std::vector<std::string> lang_;
+
        std::vector<LColor_color> colors_;
 
        UiWidget<Ui::QPrefAsciiUi> * asciiModule;