diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-08-19 16:51:24 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-09-27 19:26:17 +0200 |
| commit | 49d24215b1e2557e6d0687bf4f90e6b04a0e33cb (patch) | |
| tree | b9ed8909b72683b57b1a612a826421da5c91cb7d | |
| parent | 6736088603213890fba2c83b0c926db821d31b6e (diff) | |
| download | tdelibs-49d24215b1e2557e6d0687bf4f90e6b04a0e33cb.tar.gz tdelibs-49d24215b1e2557e6d0687bf4f90e6b04a0e33cb.zip | |
Add an ability to specify default spell checker
There is no reason to determine it with operating system basis.
Change to use build configuration instead. "ispell" by default,
and you can override it.
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 70d26004f065c5fd18be00cab17fc93ed231d849)
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | tdeui/ksconfig.cpp | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a295520c..0d17d4f01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1176,6 +1176,10 @@ if( WITH_HSPELL ) endif( WITH_HSPELL ) +####" default spell checker ##################### +set( DEFAULT_SPELL_CHECKER "ISPELL" CACHE STRING "default spell checker" ) + + ##### enable TDEIconLoader debugging ############ if ( WITH_TDEICONLOADER_DEBUG ) diff --git a/config.h.cmake b/config.h.cmake index b7a8120aa..9f253e9a4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -6,6 +6,9 @@ /* Define where aspell data dir is */ #define ASPELL_DATADIR "@ASPELL_DATADIR@" +/* Define default spell checker */ +#define DEFAULT_SPELL_CHECKER KS_CLIENT_@DEFAULT_SPELL_CHECKER@ + /* Avahi API 0.6 */ #cmakedefine HAVE_DNSSD 1 #cmakedefine AVAHI_API_0_6 1 diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index c814fec5c..cb211e4df 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -188,11 +188,7 @@ KSpellConfig::readGlobalSettings() setDictionary ( kc->readEntry("KSpell_Dictionary") ); setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) ); setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) ); -#if defined(__OpenBSD__) || defined(__FreeBSD__) - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ASPELL) ); -#else - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ISPELL) ); -#endif + setClient ( kc->readNumEntry ("KSpell_Client", DEFAULT_SPELL_CHECKER) ); return true; } |