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 70d26004f0)
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
r14.0.x
OBATA Akio 4 years ago committed by Slávek Banko
parent 6736088603
commit 49d24215b1

@ -1176,6 +1176,10 @@ if( WITH_HSPELL )
endif( WITH_HSPELL ) endif( WITH_HSPELL )
####" default spell checker #####################
set( DEFAULT_SPELL_CHECKER "ISPELL" CACHE STRING "default spell checker" )
##### enable TDEIconLoader debugging ############ ##### enable TDEIconLoader debugging ############
if ( WITH_TDEICONLOADER_DEBUG ) if ( WITH_TDEICONLOADER_DEBUG )

@ -6,6 +6,9 @@
/* Define where aspell data dir is */ /* Define where aspell data dir is */
#define ASPELL_DATADIR "@ASPELL_DATADIR@" #define ASPELL_DATADIR "@ASPELL_DATADIR@"
/* Define default spell checker */
#define DEFAULT_SPELL_CHECKER KS_CLIENT_@DEFAULT_SPELL_CHECKER@
/* Avahi API 0.6 */ /* Avahi API 0.6 */
#cmakedefine HAVE_DNSSD 1 #cmakedefine HAVE_DNSSD 1
#cmakedefine AVAHI_API_0_6 1 #cmakedefine AVAHI_API_0_6 1

@ -188,11 +188,7 @@ KSpellConfig::readGlobalSettings()
setDictionary ( kc->readEntry("KSpell_Dictionary") ); setDictionary ( kc->readEntry("KSpell_Dictionary") );
setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) ); setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) );
setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) ); setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) );
#if defined(__OpenBSD__) || defined(__FreeBSD__) setClient ( kc->readNumEntry ("KSpell_Client", DEFAULT_SPELL_CHECKER) );
setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ASPELL) );
#else
setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ISPELL) );
#endif
return true; return true;
} }

Loading…
Cancel
Save