anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tentative fix of John's "no point in spell command "None"" bug, #223255.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2574 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-08-23 14:39:18 +00:00
parent 9f672b28c4
commit f921515196
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2001-08-21 Angus Leeming <a.leeming@ic.ac.uk>
* FormPreferences.C: Tentative fix of John's "no point in spell
command "None"" bug, #223255.
2001-08-23 Herbert Voss <voss@perce.de> 2001-08-23 Herbert Voss <voss@perce.de>
* FormBibtex.C (input): normalize database list * FormBibtex.C (input): normalize database list

18
src/frontends/xforms/FormPreferences.C
View File

@ -2759,6 +2759,7 @@ void FormPreferences::SpellOptions::apply()
lyxrc.isp_command = choice; lyxrc.isp_command = choice;
#if 0
// If spell checker == "none", all other input set to off. // If spell checker == "none", all other input set to off.
if (fl_get_choice(dialog_->choice_spell_command) == 1) { if (fl_get_choice(dialog_->choice_spell_command) == 1) {
lyxrc.isp_use_alt_lang = false; lyxrc.isp_use_alt_lang = false;
@ -2773,6 +2774,7 @@ void FormPreferences::SpellOptions::apply()
lyxrc.isp_accept_compound = false; lyxrc.isp_accept_compound = false;
lyxrc.isp_use_input_encoding = false; lyxrc.isp_use_input_encoding = false;
} else { } else {
#else
int button = fl_get_button(dialog_->check_alt_lang); int button = fl_get_button(dialog_->check_alt_lang);
choice = fl_get_input(dialog_->input_alt_lang); choice = fl_get_input(dialog_->input_alt_lang);
if (button && choice.empty()) button = 0; if (button && choice.empty()) button = 0;
@ -2802,7 +2804,10 @@ void FormPreferences::SpellOptions::apply()
button = fl_get_button(dialog_->check_input_enc); button = fl_get_button(dialog_->check_input_enc);
lyxrc.isp_use_input_encoding = static_cast<bool>(button); lyxrc.isp_use_input_encoding = static_cast<bool>(button);
#endif
#if 0
} }
#endif
// Reset view // Reset view
update(); update();
@ -2814,7 +2819,11 @@ void FormPreferences::SpellOptions::build()
dialog_.reset(parent_.build_spelloptions()); dialog_.reset(parent_.build_spelloptions());
fl_addto_choice(dialog_->choice_spell_command, fl_addto_choice(dialog_->choice_spell_command,
#if 0
_(" none | ispell | aspell ")); _(" none | ispell | aspell "));
#else
_(" ispell | aspell "));
#endif
fl_set_input_return(dialog_->input_alt_lang, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_alt_lang, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_escape_chars, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_escape_chars, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED);
@ -2867,6 +2876,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
// objects, // objects,
// otherwise the function is called by an xforms CB via input(). // otherwise the function is called by an xforms CB via input().
#if 0
// If spell checker == "none", disable all input. // If spell checker == "none", disable all input.
if (!ob || ob == dialog_->choice_spell_command) { if (!ob || ob == dialog_->choice_spell_command) {
if (fl_get_choice(dialog_->choice_spell_command) == 1) { if (fl_get_choice(dialog_->choice_spell_command) == 1) {
@ -2887,6 +2897,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
fl_activate_object(dialog_->check_input_enc); fl_activate_object(dialog_->check_input_enc);
} }
} }
#endif
if (!ob || ob == dialog_->check_alt_lang) { if (!ob || ob == dialog_->check_alt_lang) {
bool const enable = fl_get_button(dialog_->check_alt_lang); bool const enable = fl_get_button(dialog_->check_alt_lang);
@ -2917,12 +2928,19 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
void FormPreferences::SpellOptions::update() void FormPreferences::SpellOptions::update()
{ {
int choice = 1; int choice = 1;
#if 0
if (lyxrc.isp_command == "none") if (lyxrc.isp_command == "none")
choice = 1; choice = 1;
else if (lyxrc.isp_command == "ispell") else if (lyxrc.isp_command == "ispell")
choice = 2; choice = 2;
else if (lyxrc.isp_command == "aspell") else if (lyxrc.isp_command == "aspell")
choice = 3; choice = 3;
#else
if (lyxrc.isp_command == "ispell")
choice = 1;
else if (lyxrc.isp_command == "aspell")
choice = 2;
#endif
fl_set_choice(dialog_->choice_spell_command, choice); fl_set_choice(dialog_->choice_spell_command, choice);
string str; string str;