If we are in a closeEvent, we don't want to close all buffers, because these may...

[lyx.git] / src / frontends / qt4 / GuiPrefs.cpp

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 3b2034286a50357ad4d791867df7b1674b2b9e9a..aaeaa73042282481d0f13a9446106f18a8b0c3f7 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -34,6 +34,7 @@
 #include "PanelStack.h"
 #include "paper.h"
 #include "Session.h"
+#include "SpellChecker.h"
 
 #include "support/debug.h"
 #include "support/FileName.h"
@@ -868,16 +869,16 @@ void PrefScreenFonts::apply(LyXRC & rc) const
 
        rc.zoom = screenZoomSB->value();
        rc.dpi = screenDpiSB->value();
-       rc.font_sizes[FONT_SIZE_TINY] = fromqstr(screenTinyED->text());
-       rc.font_sizes[FONT_SIZE_SCRIPT] = fromqstr(screenSmallestED->text());
-       rc.font_sizes[FONT_SIZE_FOOTNOTE] = fromqstr(screenSmallerED->text());
-       rc.font_sizes[FONT_SIZE_SMALL] = fromqstr(screenSmallED->text());
-       rc.font_sizes[FONT_SIZE_NORMAL] = fromqstr(screenNormalED->text());
-       rc.font_sizes[FONT_SIZE_LARGE] = fromqstr(screenLargeED->text());
-       rc.font_sizes[FONT_SIZE_LARGER] = fromqstr(screenLargerED->text());
-       rc.font_sizes[FONT_SIZE_LARGEST] = fromqstr(screenLargestED->text());
-       rc.font_sizes[FONT_SIZE_HUGE] = fromqstr(screenHugeED->text());
-       rc.font_sizes[FONT_SIZE_HUGER] = fromqstr(screenHugerED->text());
+       rc.font_sizes[FONT_SIZE_TINY] = widgetToDoubleStr(screenTinyED);
+       rc.font_sizes[FONT_SIZE_SCRIPT] = widgetToDoubleStr(screenSmallestED);
+       rc.font_sizes[FONT_SIZE_FOOTNOTE] = widgetToDoubleStr(screenSmallerED);
+       rc.font_sizes[FONT_SIZE_SMALL] = widgetToDoubleStr(screenSmallED);
+       rc.font_sizes[FONT_SIZE_NORMAL] = widgetToDoubleStr(screenNormalED);
+       rc.font_sizes[FONT_SIZE_LARGE] = widgetToDoubleStr(screenLargeED);
+       rc.font_sizes[FONT_SIZE_LARGER] = widgetToDoubleStr(screenLargerED);
+       rc.font_sizes[FONT_SIZE_LARGEST] = widgetToDoubleStr(screenLargestED);
+       rc.font_sizes[FONT_SIZE_HUGE] = widgetToDoubleStr(screenHugeED);
+       rc.font_sizes[FONT_SIZE_HUGER] = widgetToDoubleStr(screenHugerED);
        rc.use_pixmap_cache = pixmapCacheCB->isChecked();
 
        if (rc.font_sizes != oldrc.font_sizes
@@ -910,16 +911,16 @@ void PrefScreenFonts::update(LyXRC const & rc)
 
        screenZoomSB->setValue(rc.zoom);
        screenDpiSB->setValue(rc.dpi);
-       screenTinyED->setText(toqstr(rc.font_sizes[FONT_SIZE_TINY]));
-       screenSmallestED->setText(toqstr(rc.font_sizes[FONT_SIZE_SCRIPT]));
-       screenSmallerED->setText(toqstr(rc.font_sizes[FONT_SIZE_FOOTNOTE]));
-       screenSmallED->setText(toqstr(rc.font_sizes[FONT_SIZE_SMALL]));
-       screenNormalED->setText(toqstr(rc.font_sizes[FONT_SIZE_NORMAL]));
-       screenLargeED->setText(toqstr(rc.font_sizes[FONT_SIZE_LARGE]));
-       screenLargerED->setText(toqstr(rc.font_sizes[FONT_SIZE_LARGER]));
-       screenLargestED->setText(toqstr(rc.font_sizes[FONT_SIZE_LARGEST]));
-       screenHugeED->setText(toqstr(rc.font_sizes[FONT_SIZE_HUGE]));
-       screenHugerED->setText(toqstr(rc.font_sizes[FONT_SIZE_HUGER]));
+       doubleToWidget(screenTinyED, rc.font_sizes[FONT_SIZE_TINY]);
+       doubleToWidget(screenSmallestED, rc.font_sizes[FONT_SIZE_SCRIPT]);
+       doubleToWidget(screenSmallerED, rc.font_sizes[FONT_SIZE_FOOTNOTE]);
+       doubleToWidget(screenSmallED, rc.font_sizes[FONT_SIZE_SMALL]);
+       doubleToWidget(screenNormalED, rc.font_sizes[FONT_SIZE_NORMAL]);
+       doubleToWidget(screenLargeED, rc.font_sizes[FONT_SIZE_LARGE]);
+       doubleToWidget(screenLargerED, rc.font_sizes[FONT_SIZE_LARGER]);
+       doubleToWidget(screenLargestED, rc.font_sizes[FONT_SIZE_LARGEST]);
+       doubleToWidget(screenHugeED, rc.font_sizes[FONT_SIZE_HUGE]);
+       doubleToWidget(screenHugerED, rc.font_sizes[FONT_SIZE_HUGER]);
 
        pixmapCacheCB->setChecked(rc.use_pixmap_cache);
 #if defined(Q_WS_X11)
@@ -1129,6 +1130,7 @@ PrefPaths::PrefPaths(GuiPreferences * form)
        connect(workingDirPB, SIGNAL(clicked()), this, SLOT(selectWorkingdir()));
        connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(selectLyxPipe()));
        connect(thesaurusDirPB, SIGNAL(clicked()), this, SLOT(selectThesaurusdir()));
+       connect(hunspellDirPB, SIGNAL(clicked()), this, SLOT(selectHunspelldir()));
        connect(workingDirED, SIGNAL(textChanged(QString)),
                this, SIGNAL(changed()));
        connect(exampleDirED, SIGNAL(textChanged(QString)),
@@ -1156,6 +1158,7 @@ void PrefPaths::apply(LyXRC & rc) const
        rc.backupdir_path = internal_path(fromqstr(backupDirED->text()));
        rc.tempdir_path = internal_path(fromqstr(tempDirED->text()));
        rc.thesaurusdir_path = internal_path(fromqstr(thesaurusDirED->text()));
+       rc.hunspelldir_path = internal_path(fromqstr(hunspellDirED->text()));
        rc.path_prefix = internal_path_list(fromqstr(pathPrefixED->text()));
        // FIXME: should be a checkbox only
        rc.lyxpipes = internal_path(fromqstr(lyxserverDirED->text()));
@@ -1170,6 +1173,7 @@ void PrefPaths::update(LyXRC const & rc)
        backupDirED->setText(toqstr(external_path(rc.backupdir_path)));
        tempDirED->setText(toqstr(external_path(rc.tempdir_path)));
        thesaurusDirED->setText(toqstr(external_path(rc.thesaurusdir_path)));
+       hunspellDirED->setText(toqstr(external_path(rc.hunspelldir_path)));
        pathPrefixED->setText(toqstr(external_path_list(rc.path_prefix)));
        // FIXME: should be a checkbox only
        lyxserverDirED->setText(toqstr(external_path(rc.lyxpipes)));
@@ -1230,6 +1234,15 @@ void PrefPaths::selectThesaurusdir()
 }
 
 
+void PrefPaths::selectHunspelldir()
+{
+       QString file = browseDir(internalPath(hunspellDirED->text()),
+               qt_("Set the path to the Hunspell dictionaries"));
+       if (!file.isEmpty())
+               hunspellDirED->setText(file);
+}
+
+
 void PrefPaths::selectLyxPipe()
 {
        QString file = form_->browse(internalPath(lyxserverDirED->text()),
@@ -1250,6 +1263,11 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
 {
        setupUi(this);
 
+       spellcheckerCB->addItem("aspell");
+       spellcheckerCB->addItem("hunspell");
+
+       connect(spellcheckerCB, SIGNAL(currentIndexChanged(int)),
+               this, SIGNAL(changed()));
        connect(altLanguageED, SIGNAL(textChanged(QString)),
                this, SIGNAL(changed()));
        connect(escapeCharactersED, SIGNAL(textChanged(QString)),
@@ -1263,12 +1281,9 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
 
 void PrefSpellchecker::apply(LyXRC & rc) const
 {
-       // FIXME: remove spellchecker_use_alt_lang
+       rc.spellchecker = fromqstr(spellcheckerCB->currentText());
        rc.spellchecker_alt_lang = fromqstr(altLanguageED->text());
-       rc.spellchecker_use_alt_lang = !rc.spellchecker_alt_lang.empty();
-       // FIXME: remove spellchecker_use_esc_chars
        rc.spellchecker_esc_chars = fromqstr(escapeCharactersED->text());
-       rc.spellchecker_use_esc_chars = !rc.spellchecker_esc_chars.empty();
        rc.spellchecker_accept_compound = compoundWordCB->isChecked();
        rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked();
 }
@@ -1276,9 +1291,9 @@ void PrefSpellchecker::apply(LyXRC & rc) const
 
 void PrefSpellchecker::update(LyXRC const & rc)
 {
-       // FIXME: remove spellchecker_use_alt_lang
+       spellcheckerCB->setCurrentIndex(spellcheckerCB->findText(
+               toqstr(rc.spellchecker)));
        altLanguageED->setText(toqstr(rc.spellchecker_alt_lang));
-       // FIXME: remove spellchecker_use_esc_chars
        escapeCharactersED->setText(toqstr(rc.spellchecker_esc_chars));
        compoundWordCB->setChecked(rc.spellchecker_accept_compound);
        spellcheckContinuouslyCB->setChecked(rc.spellcheck_continuously);
@@ -1331,7 +1346,7 @@ PrefConverters::PrefConverters(GuiPreferences * form)
 void PrefConverters::apply(LyXRC & rc) const
 {
        rc.use_converter_cache = cacheCB->isChecked();
-       rc.converter_cache_maxage = int(maxAgeLE->text().toDouble() * 86400.0);
+       rc.converter_cache_maxage = int(widgetToDouble(maxAgeLE) * 86400.0);
 }
 
 
@@ -1339,8 +1354,7 @@ void PrefConverters::update(LyXRC const & rc)
 {
        cacheCB->setChecked(rc.use_converter_cache);
        QString max_age;
-       max_age.setNum(double(rc.converter_cache_maxage) / 86400.0, 'g', 6);
-       maxAgeLE->setText(max_age);
+       doubleToWidget(maxAgeLE, (double(rc.converter_cache_maxage) / 86400.0), 'g', 6);
        updateGui();
 }
 
@@ -2271,8 +2285,8 @@ void PrefShortcuts::apply(LyXRC & rc) const
        // The good thing is that the menus are updated automatically.
        theTopLevelKeymap().clear();
        theTopLevelKeymap().read("site");
-       theTopLevelKeymap().read(rc.bind_file);
-       theTopLevelKeymap().read("user");
+       theTopLevelKeymap().read(rc.bind_file, 0, KeyMap::Fallback);
+       theTopLevelKeymap().read("user", 0, KeyMap::MissingOK);
 }
 
 
@@ -2286,7 +2300,7 @@ void PrefShortcuts::update(LyXRC const & rc)
        system_bind_.read("site");
        system_bind_.read(rc.bind_file);
        // \unbind in user.bind is added to user_unbind_
-       user_bind_.read("user", &user_unbind_);
+       user_bind_.read("user", &user_unbind_, KeyMap::MissingOK);
        updateShortcutsTW();
 }