X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiPrefs.cpp;h=4518838456d131f635df510acedb43869c3f44fb;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=5d6968c4268aa6034c693cf1fccd44f8d6ab0011;hpb=8b99f9c5b04bc4d53324c3015e3469656c863785;p=lyx.git

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 5d6968c426..4518838456 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -590,6 +590,8 @@ PrefLatex::PrefLatex(GuiPreferences * form)
 	: PrefModule(qt_(catOutput), qt_("LaTeX"), form)
 {
 	setupUi(this);
+	connect(latexEncodingCB, SIGNAL(clicked()),
+		this, SIGNAL(changed()));
 	connect(latexEncodingED, SIGNAL(textChanged(QString)),
 		this, SIGNAL(changed()));
 	connect(latexChecktexED, SIGNAL(textChanged(QString)),
@@ -623,6 +625,12 @@ PrefLatex::PrefLatex(GuiPreferences * form)
 }
 
 
+void PrefLatex::on_latexEncodingCB_stateChanged(int state)
+{
+	latexEncodingED->setEnabled(state == Qt::Checked);
+}
+
+
 void PrefLatex::on_latexBibtexCO_activated(int n)
 {
 	QString const bibtex = latexBibtexCO->itemData(n).toString();
@@ -699,7 +707,10 @@ void PrefLatex::apply(LyXRC & rc) const
 	else
 		rc.index_command = fromqstr(index) + " " + fromqstr(idxopt);
 
-	rc.fontenc = fromqstr(latexEncodingED->text());
+	if (latexEncodingCB->isChecked())
+		rc.fontenc = fromqstr(latexEncodingED->text());
+	else
+		rc.fontenc = "default";
 	rc.chktex_command = fromqstr(latexChecktexED->text());
 	rc.jbibtex_command = fromqstr(latexJBibtexED->text());
 	rc.jindex_command = fromqstr(latexJIndexED->text());
@@ -770,7 +781,14 @@ void PrefLatex::update(LyXRC const & rc)
 		latexIndexOptionsLA->setText(qt_("Co&mmand:"));
 	}
 
-	latexEncodingED->setText(toqstr(rc.fontenc));
+	if (rc.fontenc == "default") {
+		latexEncodingCB->setChecked(false);
+		latexEncodingED->setEnabled(false);
+	} else {
+		latexEncodingCB->setChecked(true);
+		latexEncodingED->setEnabled(true);
+		latexEncodingED->setText(toqstr(rc.fontenc));
+	}
 	latexChecktexED->setText(toqstr(rc.chktex_command));
 	latexJBibtexED->setText(toqstr(rc.jbibtex_command));
 	latexJIndexED->setText(toqstr(rc.jindex_command));
@@ -1293,25 +1311,41 @@ PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
 {
 	setupUi(this);
 
-	spellcheckerCB->addItem("aspell");
-	spellcheckerCB->addItem("hunspell");
+#if defined(USE_ASPELL)
+	spellcheckerCB->addItem(qt_("aspell"), QString("aspell"));
+#endif
+#if defined(USE_ENCHANT)
+	spellcheckerCB->addItem(qt_("enchant"), QString("enchant"));
+#endif
+#if defined(USE_HUNSPELL)
+	spellcheckerCB->addItem(qt_("hunspell"), QString("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);
+	}
 }
 
 
 void PrefSpellchecker::apply(LyXRC & rc) const
 {
-	rc.spellchecker = fromqstr(spellcheckerCB->currentText());
+	rc.spellchecker = fromqstr(spellcheckerCB->itemData(
+			spellcheckerCB->currentIndex()).toString());
 	rc.spellchecker_alt_lang = fromqstr(altLanguageED->text());
 	rc.spellchecker_esc_chars = fromqstr(escapeCharactersED->text());
 	rc.spellchecker_accept_compound = compoundWordCB->isChecked();
@@ -1321,8 +1355,8 @@ void PrefSpellchecker::apply(LyXRC & rc) const
 
 void PrefSpellchecker::update(LyXRC const & rc)
 {
-	spellcheckerCB->setCurrentIndex(spellcheckerCB->findText(
-		toqstr(rc.spellchecker)));
+	spellcheckerCB->setCurrentIndex(
+		spellcheckerCB->findData(toqstr(rc.spellchecker)));
 	altLanguageED->setText(toqstr(rc.spellchecker_alt_lang));
 	escapeCharactersED->setText(toqstr(rc.spellchecker_esc_chars));
 	compoundWordCB->setChecked(rc.spellchecker_accept_compound);