Show only those spellers that are active.

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

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 896f84d415f246906f6f0df836d17c6238d59914..ece84acc8e8d97bd914471cc2c88c0701fff99bf 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -277,7 +277,13 @@ void LyXRC::setDefaults()
        backupdir_path.erase();
        display_graphics = true;
        // Spellchecker settings:
+#if defined(USE_ASPELL)
        spellchecker = "aspell";
+#elif defined(USE_HUNSPELL)
+       spellchecker = "hunspell";
+#else
+       spellchecker = "aspell";
+#endif
        spellchecker_accept_compound = false;
        spellcheck_continuously = false;
        use_kbmap = false;

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 5d6968c4268aa6034c693cf1fccd44f8d6ab0011..cae0dbc8127f3931d9d7e9955c8c98dd9f77a13d 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1293,19 +1293,31 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
 {
        setupUi(this);
 
+#if defined(USE_ASPELL)
        spellcheckerCB->addItem("aspell");
+#endif
+#if defined(USE_HUNSPELL)
        spellcheckerCB->addItem("hunspell");
+#endif
 
-       connect(spellcheckerCB, SIGNAL(currentIndexChanged(int)),
-               this, SIGNAL(changed()));
-       connect(altLanguageED, SIGNAL(textChanged(QString)),
-               this, SIGNAL(changed()));
-       connect(escapeCharactersED, SIGNAL(textChanged(QString)),
-               this, SIGNAL(changed()));
-       connect(compoundWordCB, SIGNAL(clicked()),
-               this, SIGNAL(changed()));
-       connect(spellcheckContinuouslyCB, SIGNAL(clicked()),
-               this, SIGNAL(changed()));
+       if (theSpellChecker()) {
+               connect(spellcheckerCB, SIGNAL(currentIndexChanged(int)),
+                       this, SIGNAL(changed()));
+               connect(altLanguageED, SIGNAL(textChanged(QString)),
+                       this, SIGNAL(changed()));
+               connect(escapeCharactersED, SIGNAL(textChanged(QString)),
+                       this, SIGNAL(changed()));
+               connect(compoundWordCB, SIGNAL(clicked()),
+                       this, SIGNAL(changed()));
+               connect(spellcheckContinuouslyCB, SIGNAL(clicked()),
+                       this, SIGNAL(changed()));
+       } else {
+               spellcheckerCB->setEnabled(false);
+               altLanguageED->setEnabled(false);
+               escapeCharactersED->setEnabled(false);
+               compoundWordCB->setEnabled(false);
+               spellcheckContinuouslyCB->setEnabled(false);
+       }
 }