More preference work from Angus

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

diff --git a/ChangeLog b/ChangeLog
index 30b23e824a0312255e09ce9220265b173be9d69d..4b14490c92e942e56689ba63b75b1c04b4a38f6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-24  Angus Leeming <a.leeming@ic.ac.uk>
+       
+       * src/frontends/xforms/FormPreferences.[Ch]:
+       * src/frontends/xforms/forms/form_preferences.fd: added spell checker,
+       TeX encoding and default paper size sections.
+       
 2000-10-24  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/frontends/xforms/FormTabularCreate.C: add missing #pragma

diff --git a/README b/README
index 55c704edfd1119037a98c6e63bef10aa72e4776a..b0a02db1461eb53b45188c1d1616623b4290ed63 100644 (file)
--- a/README
+++ b/README
@@ -159,6 +159,7 @@ Does LyX have support for non-English speakers/writers/readers?
        Greek
        Hebrew
        Hungarian (Magyar)
+       Latvian
        Polish
        Portugese
        Romanian

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 4ab43da97ba26e45b83f09dbd9cfc26d58bfdcd6..38c53d57b3c5bd2401f577955e00237d9877bea4 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -30,8 +30,8 @@ using SigC::slot;
 FormPreferences::FormPreferences(LyXView * lv, Dialogs * d)
        : FormBaseBI(lv, d, _("Preferences"), new PreferencesPolicy),
          dialog_(0), outputs_tab_(0), look_n_feel_tab_(0), inputs_tab_(0),
-         lnf_general_(0), screen_fonts_(0), interface_(0),
-         printer_(0), paths_(0), outputs_general_(0)
+         spellchecker_tab_(0), lnf_general_(0), screen_fonts_(0),
+         interface_(0), printer_(0), paths_(0), outputs_general_(0)
 {
        // let the dialog be shown
        // This is a permanent connection so we won't bother
@@ -46,6 +46,7 @@ FormPreferences::~FormPreferences()
        delete look_n_feel_tab_;
        delete inputs_tab_;
        delete outputs_tab_;
+       delete spellchecker_tab_;
        delete lnf_general_;
        delete screen_fonts_;
        delete interface_;
@@ -87,6 +88,7 @@ void FormPreferences::build()
        outputs_tab_ = build_outer_tab();
        look_n_feel_tab_ = build_outer_tab();
        inputs_tab_  = build_outer_tab();
+       spellchecker_tab_ = build_spellchecker();
 
        // build actual tabfolder contents
        // these will become nested tabfolders
@@ -159,6 +161,20 @@ void FormPreferences::build()
        // outputs general
        fl_set_counter_return(outputs_general_->counter_line_len,
                              FL_RETURN_CHANGED);
+       fl_set_input_return(outputs_general_->input_tex_encoding,
+                           FL_RETURN_CHANGED);
+       fl_addto_choice(outputs_general_->choice_default_papersize,
+                       _(" default | US letter | legal | executive | A3 | A4 | A5 | B5 "));
+
+       // spell checker
+       fl_addto_choice(spellchecker_tab_->choice_spell_command,
+                       _(" none | ispell | aspell "));
+       fl_set_input_return(spellchecker_tab_->input_alt_lang,
+                           FL_RETURN_CHANGED);
+       fl_set_input_return(spellchecker_tab_->input_escape_chars,
+                           FL_RETURN_CHANGED);
+       fl_set_input_return(spellchecker_tab_->input_personal_dict,
+                           FL_RETURN_CHANGED);
 
        // Now add them to the tabfolder
        fl_addto_tabfolder(dialog_->tabfolder_prefs,
@@ -170,6 +186,9 @@ void FormPreferences::build()
        fl_addto_tabfolder(dialog_->tabfolder_prefs,
                           _("Outputs"),
                           outputs_tab_->form);
+       fl_addto_tabfolder(dialog_->tabfolder_prefs,
+                          _("Spell checker"),
+                          spellchecker_tab_->form);
 
        // now build the nested tabfolders
        // Starting with look and feel
@@ -207,6 +226,7 @@ void FormPreferences::build()
        fl_deactivate_object(paths_->button_lastfiles_browse);
        fl_deactivate_object(paths_->button_backup_path_browse);
        fl_deactivate_object(paths_->button_serverpipe_browse);
+       fl_deactivate_object(spellchecker_tab_->button_personal_dict);
        fl_set_object_lcol(interface_->button_bind_file_browse, FL_INACTIVE);
        fl_set_object_lcol(interface_->button_ui_file_browse, FL_INACTIVE);
        fl_set_object_lcol(paths_->button_document_browse, FL_INACTIVE);
@@ -215,6 +235,7 @@ void FormPreferences::build()
        fl_set_object_lcol(paths_->button_lastfiles_browse, FL_INACTIVE);
        fl_set_object_lcol(paths_->button_backup_path_browse, FL_INACTIVE);
        fl_set_object_lcol(paths_->button_serverpipe_browse, FL_INACTIVE);
+       fl_set_object_lcol(spellchecker_tab_->button_personal_dict, FL_INACTIVE);
 }
 
 
@@ -369,138 +390,261 @@ void FormPreferences::apply()
        // outputs general
        lyxrc.ascii_linelen = static_cast<unsigned int>
                (fl_get_counter_value(outputs_general_->counter_line_len));
+       lyxrc.fontenc = fl_get_input(outputs_general_->input_tex_encoding);
+
+       int choice =
+               fl_get_choice(outputs_general_->choice_default_papersize) - 1;
+       lyxrc.default_papersize = static_cast<BufferParams::PAPER_SIZE>(choice);
+
+       applySpellChecker();
+}
+
+
+void FormPreferences::applySpellChecker()
+{
+
+       string choice = "none";
+       switch(fl_get_choice(spellchecker_tab_->choice_spell_command)) {
+       case 1:
+               choice = "none";
+               break;
+       case 2:
+               choice = "ispell";
+               break;
+       case 3:
+               choice = "aspell";
+               break;
+       default:
+               break;
+       }
+       lyxrc.isp_command = choice;
+
+       // If spell checker == "none", all other input set to off.
+       if( fl_get_choice(spellchecker_tab_->choice_spell_command) == 1 ) {
+               lyxrc.isp_use_alt_lang = false;
+               lyxrc.isp_alt_lang.erase();
+
+               lyxrc.isp_use_esc_chars = false;
+               lyxrc.isp_esc_chars.erase();
+
+               lyxrc.isp_use_pers_dict = false;
+               lyxrc.isp_pers_dict.erase();
+
+               lyxrc.isp_accept_compound = false;
+               lyxrc.isp_use_input_encoding = false;
+       } else {
+               int button = fl_get_button(spellchecker_tab_->check_alt_lang);
+               choice = fl_get_input(spellchecker_tab_->input_alt_lang);
+               if( button && choice.empty() ) button = 0;
+               if( !button ) choice.erase();
+
+               lyxrc.isp_use_alt_lang = static_cast<bool>(button);
+               lyxrc.isp_alt_lang = choice;
+
+               button = fl_get_button(spellchecker_tab_->check_escape_chars);
+               choice = fl_get_input(spellchecker_tab_->input_escape_chars);
+               if( button && choice.empty() ) button = 0;
+               if( !button ) choice.erase();
+       
+               lyxrc.isp_use_esc_chars = static_cast<bool>(button);
+               lyxrc.isp_esc_chars = choice;
+
+               button = fl_get_button(spellchecker_tab_->check_personal_dict);
+               choice = fl_get_input(spellchecker_tab_->input_personal_dict);
+               if( button && choice.empty() ) button = 0;
+               if( !button ) choice.erase();
+
+               lyxrc.isp_use_pers_dict = static_cast<bool>(button);
+               lyxrc.isp_pers_dict = choice;
+
+               button = fl_get_button(spellchecker_tab_->check_compound_words);
+               lyxrc.isp_accept_compound = static_cast<bool>(button);
+
+               button = fl_get_button(spellchecker_tab_->check_input_enc);
+               lyxrc.isp_use_input_encoding = static_cast<bool>(button);
+       }
+       
+       updateSpellChecker();
 }
 
 
 void FormPreferences::update()
 {
-       if (dialog_) {
-               // read lyxrc entries
-               // Lnf_General tab
-               fl_set_button(lnf_general_->check_banner,
-                             lyxrc.show_banner);
-               fl_set_button(lnf_general_->check_auto_region_delete,
-                             lyxrc.auto_region_delete);
-               fl_set_button(lnf_general_->check_exit_confirm,
-                             lyxrc.exit_confirmation);
-               fl_set_button(lnf_general_->check_display_shortcuts,
-                             lyxrc.display_shortcuts);
-               fl_set_button(lnf_general_->check_ask_new_file,
-                             lyxrc.new_ask_filename);
-               fl_set_button(lnf_general_->check_cursor_follows_scrollbar,
-                             lyxrc.cursor_follows_scrollbar);
-               fl_set_counter_value(lnf_general_->counter_autosave,
-                                    lyxrc.autosave);
-               fl_set_counter_value(lnf_general_->counter_wm_jump,
-                                    lyxrc.wheel_jump);
-               // Screen fonts
-               fl_set_input(screen_fonts_->input_roman,
-                            lyxrc.roman_font_name.c_str());
-               fl_set_input(screen_fonts_->input_sans,
-                            lyxrc.sans_font_name.c_str());
-               fl_set_input(screen_fonts_->input_typewriter,
-                            lyxrc.typewriter_font_name.c_str());
-               fl_set_input(screen_fonts_->input_screen_encoding,
-                            lyxrc.font_norm.c_str());
-               fl_set_button(screen_fonts_->check_scalable,
-                            lyxrc.use_scalable_fonts);
-               fl_set_counter_value(screen_fonts_->counter_zoom,
+       if (!dialog_) return;
+    
+       // read lyxrc entries
+       // Lnf_General tab
+       fl_set_button(lnf_general_->check_banner,
+                     lyxrc.show_banner);
+       fl_set_button(lnf_general_->check_auto_region_delete,
+                     lyxrc.auto_region_delete);
+       fl_set_button(lnf_general_->check_exit_confirm,
+                     lyxrc.exit_confirmation);
+       fl_set_button(lnf_general_->check_display_shortcuts,
+                     lyxrc.display_shortcuts);
+       fl_set_button(lnf_general_->check_ask_new_file,
+                     lyxrc.new_ask_filename);
+       fl_set_button(lnf_general_->check_cursor_follows_scrollbar,
+                     lyxrc.cursor_follows_scrollbar);
+       fl_set_counter_value(lnf_general_->counter_autosave,
+                            lyxrc.autosave);
+       fl_set_counter_value(lnf_general_->counter_wm_jump,
+                            lyxrc.wheel_jump);
+       // Screen fonts
+       fl_set_input(screen_fonts_->input_roman,
+                    lyxrc.roman_font_name.c_str());
+       fl_set_input(screen_fonts_->input_sans,
+                    lyxrc.sans_font_name.c_str());
+       fl_set_input(screen_fonts_->input_typewriter,
+                    lyxrc.typewriter_font_name.c_str());
+       fl_set_input(screen_fonts_->input_screen_encoding,
+                    lyxrc.font_norm.c_str());
+       fl_set_button(screen_fonts_->check_scalable,
+                     lyxrc.use_scalable_fonts);
+       fl_set_counter_value(screen_fonts_->counter_zoom,
                             lyxrc.zoom);
-               fl_set_input(screen_fonts_->input_tiny,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_TINY]).c_str());
-               fl_set_input(screen_fonts_->input_script,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_SCRIPT]).c_str());
-               fl_set_input(screen_fonts_->input_footnote,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE]).c_str());
-               fl_set_input(screen_fonts_->input_small,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_SMALL]).c_str());
-               fl_set_input(screen_fonts_->input_normal,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_NORMAL]).c_str());
-               fl_set_input(screen_fonts_->input_large,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGE]).c_str());
-               fl_set_input(screen_fonts_->input_larger,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGER]).c_str());
-               fl_set_input(screen_fonts_->input_largest,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGEST]).c_str());
-               fl_set_input(screen_fonts_->input_huge,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGE]).c_str());
-               fl_set_input(screen_fonts_->input_huger,
-                            tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGER]).c_str());
-               // interface
-               fl_set_input(interface_->input_popup_font,
-                            lyxrc.popup_font_name.c_str());
-               fl_set_input(interface_->input_menu_font,
-                            lyxrc.menu_font_name.c_str());
-               fl_set_input(interface_->input_popup_encoding,
-                            lyxrc.font_norm_menu.c_str());
-               fl_set_input(interface_->input_bind_file,
-                            lyxrc.bind_file.c_str());
-               fl_set_input(interface_->input_ui_file,
-                            lyxrc.ui_file.c_str());
-               fl_set_button(interface_->check_override_x_dead_keys,
-                             lyxrc.override_x_deadkeys);
-               // printer
-               fl_set_button(printer_->check_adapt_output,
-                             lyxrc.print_adapt_output);
-               fl_set_input(printer_->input_command,
-                            lyxrc.print_command.c_str());
-               fl_set_input(printer_->input_page_range,
-                            lyxrc.print_pagerange_flag.c_str());
-               fl_set_input(printer_->input_copies,
-                            lyxrc.print_copies_flag.c_str());
-               fl_set_input(printer_->input_reverse,
-                             lyxrc.print_reverse_flag.c_str());
-               fl_set_input(printer_->input_to_printer,
-                            lyxrc.print_to_printer.c_str());
-               fl_set_input(printer_->input_file_extension,
-                            lyxrc.print_file_extension.c_str());
-               fl_set_input(printer_->input_spool_command,
-                            lyxrc.print_spool_command.c_str());
-               fl_set_input(printer_->input_paper_type,
-                            lyxrc.print_paper_flag.c_str());
-               fl_set_input(printer_->input_even_pages,
-                            lyxrc.print_evenpage_flag.c_str());
-               fl_set_input(printer_->input_odd_pages,
-                            lyxrc.print_oddpage_flag.c_str());
-               fl_set_input(printer_->input_collated,
-                            lyxrc.print_collcopies_flag.c_str());
-               fl_set_input(printer_->input_landscape,
-                            lyxrc.print_landscape_flag.c_str());
-               fl_set_input(printer_->input_to_file,
-                            lyxrc.print_to_file.c_str());
-               fl_set_input(printer_->input_extra_options,
-                            lyxrc.print_extra_options.c_str());
-               fl_set_input(printer_->input_spool_prefix,
-                            lyxrc.print_spool_printerprefix.c_str());
-               fl_set_input(printer_->input_paper_size,
-                            lyxrc.print_paper_dimension_flag.c_str());
-               fl_set_input(printer_->input_name,
-                            lyxrc.printer.c_str());
-               // paths
-               fl_set_input(paths_->input_default_path,
-                            lyxrc.document_path.c_str());
-               fl_set_input(paths_->input_template_path,
-                            lyxrc.template_path.c_str());
-               fl_set_input(paths_->input_temp_dir,
-                            lyxrc.tempdir_path.c_str());
-               fl_set_input(paths_->input_lastfiles,
-                            lyxrc.lastfiles.c_str());
-               fl_set_input(paths_->input_backup_path,
-                            lyxrc.backupdir_path.c_str());
-               fl_set_button(paths_->check_use_temp_dir,
-                             lyxrc.use_tempdir);
-               fl_set_button(paths_->check_last_files,
-                             lyxrc.check_lastfiles);           
-               fl_set_button(paths_->check_make_backups,
-                             lyxrc.make_backup);
-               fl_set_counter_value(paths_->counter_lastfiles,
-                                    lyxrc.num_lastfiles);
-               fl_set_input(paths_->input_serverpipe, lyxrc.lyxpipes.c_str());
-               // outputs general
-               fl_set_counter_value(outputs_general_->counter_line_len,
-                                    lyxrc.ascii_linelen);
+       fl_set_input(screen_fonts_->input_tiny,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_TINY]).c_str());
+       fl_set_input(screen_fonts_->input_script,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_SCRIPT]).c_str());
+       fl_set_input(screen_fonts_->input_footnote,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE]).c_str());
+       fl_set_input(screen_fonts_->input_small,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_SMALL]).c_str());
+       fl_set_input(screen_fonts_->input_normal,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_NORMAL]).c_str());
+       fl_set_input(screen_fonts_->input_large,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGE]).c_str());
+       fl_set_input(screen_fonts_->input_larger,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGER]).c_str());
+       fl_set_input(screen_fonts_->input_largest,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGEST]).c_str());
+       fl_set_input(screen_fonts_->input_huge,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGE]).c_str());
+       fl_set_input(screen_fonts_->input_huger,
+                    tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGER]).c_str());
+       // interface
+       fl_set_input(interface_->input_popup_font,
+                    lyxrc.popup_font_name.c_str());
+       fl_set_input(interface_->input_menu_font,
+                    lyxrc.menu_font_name.c_str());
+       fl_set_input(interface_->input_popup_encoding,
+                    lyxrc.font_norm_menu.c_str());
+       fl_set_input(interface_->input_bind_file,
+                    lyxrc.bind_file.c_str());
+       fl_set_input(interface_->input_ui_file,
+                    lyxrc.ui_file.c_str());
+       fl_set_button(interface_->check_override_x_dead_keys,
+                     lyxrc.override_x_deadkeys);
+       // printer
+       fl_set_button(printer_->check_adapt_output,
+                     lyxrc.print_adapt_output);
+       fl_set_input(printer_->input_command,
+                    lyxrc.print_command.c_str());
+       fl_set_input(printer_->input_page_range,
+                    lyxrc.print_pagerange_flag.c_str());
+       fl_set_input(printer_->input_copies,
+                    lyxrc.print_copies_flag.c_str());
+       fl_set_input(printer_->input_reverse,
+                    lyxrc.print_reverse_flag.c_str());
+       fl_set_input(printer_->input_to_printer,
+                    lyxrc.print_to_printer.c_str());
+       fl_set_input(printer_->input_file_extension,
+                    lyxrc.print_file_extension.c_str());
+       fl_set_input(printer_->input_spool_command,
+                    lyxrc.print_spool_command.c_str());
+       fl_set_input(printer_->input_paper_type,
+                    lyxrc.print_paper_flag.c_str());
+       fl_set_input(printer_->input_even_pages,
+                    lyxrc.print_evenpage_flag.c_str());
+       fl_set_input(printer_->input_odd_pages,
+                    lyxrc.print_oddpage_flag.c_str());
+       fl_set_input(printer_->input_collated,
+                    lyxrc.print_collcopies_flag.c_str());
+       fl_set_input(printer_->input_landscape,
+                    lyxrc.print_landscape_flag.c_str());
+       fl_set_input(printer_->input_to_file,
+                    lyxrc.print_to_file.c_str());
+       fl_set_input(printer_->input_extra_options,
+                    lyxrc.print_extra_options.c_str());
+       fl_set_input(printer_->input_spool_prefix,
+                    lyxrc.print_spool_printerprefix.c_str());
+       fl_set_input(printer_->input_paper_size,
+                    lyxrc.print_paper_dimension_flag.c_str());
+       fl_set_input(printer_->input_name,
+                    lyxrc.printer.c_str());
+       // paths
+       fl_set_input(paths_->input_default_path,
+                    lyxrc.document_path.c_str());
+       fl_set_input(paths_->input_template_path,
+                    lyxrc.template_path.c_str());
+       fl_set_input(paths_->input_temp_dir,
+                    lyxrc.tempdir_path.c_str());
+       fl_set_input(paths_->input_lastfiles,
+                    lyxrc.lastfiles.c_str());
+       fl_set_input(paths_->input_backup_path,
+                    lyxrc.backupdir_path.c_str());
+       fl_set_button(paths_->check_use_temp_dir,
+                     lyxrc.use_tempdir);
+       fl_set_button(paths_->check_last_files,
+                     lyxrc.check_lastfiles);           
+       fl_set_button(paths_->check_make_backups,
+                     lyxrc.make_backup);
+       fl_set_counter_value(paths_->counter_lastfiles,
+                            lyxrc.num_lastfiles);
+       fl_set_input(paths_->input_serverpipe, lyxrc.lyxpipes.c_str());
+       // outputs general
+       fl_set_counter_value(outputs_general_->counter_line_len,
+                            lyxrc.ascii_linelen);
+       fl_set_input(outputs_general_->input_tex_encoding,
+                    lyxrc.fontenc.c_str());
+       fl_set_choice(outputs_general_->choice_default_papersize,
+                     lyxrc.default_papersize+1);
+
+       updateSpellChecker();
+}
 
-       }
+
+void FormPreferences::updateSpellChecker()
+{
+       int choice = 1;
+       if( lyxrc.isp_command == "none" )
+               choice = 1;
+       else if( lyxrc.isp_command == "ispell" )
+               choice = 2;
+       else if( lyxrc.isp_command == "aspell" )
+               choice = 3;
+       fl_set_choice(spellchecker_tab_->choice_spell_command, choice);
+       
+       string str = string();
+       if( lyxrc.isp_use_alt_lang ) str = lyxrc.isp_alt_lang;
+
+       fl_set_button(spellchecker_tab_->check_alt_lang,
+                     lyxrc.isp_use_alt_lang);
+       fl_set_input(spellchecker_tab_->input_alt_lang, str.c_str());
+       
+       str = string();
+       if( lyxrc.isp_use_esc_chars ) str = lyxrc.isp_esc_chars;
+
+       fl_set_button(spellchecker_tab_->check_escape_chars,
+                     lyxrc.isp_use_esc_chars);
+       fl_set_input(spellchecker_tab_->input_escape_chars, str.c_str());
+
+       str = string();
+       if( lyxrc.isp_use_pers_dict ) str = lyxrc.isp_pers_dict;
+
+       fl_set_button(spellchecker_tab_->check_personal_dict,
+                     lyxrc.isp_use_pers_dict);
+       fl_set_input(spellchecker_tab_->input_personal_dict, str.c_str());
+
+       fl_set_button(spellchecker_tab_->check_compound_words,
+                     lyxrc.isp_accept_compound);
+       fl_set_button(spellchecker_tab_->check_input_enc,
+                     lyxrc.isp_use_input_encoding);
+
+       // Activate/Deactivate the input fields dependent on the state of the
+       // buttons.
+       inputSpellChecker();
 }
 
 
@@ -629,10 +773,70 @@ bool FormPreferences::input(FL_OBJECT *, long)
                lyxerr[Debug::GUI] << "Preferences: Sizes are wrong\n";
        }
 
+       if( ! inputSpellChecker() )
+               activate = false;
+
        return activate;
 }
 
 
+bool FormPreferences::inputSpellChecker()
+{
+       // Allow/dissallow input
+
+       // If spell checker == "none", disable all input.
+       if( fl_get_choice(spellchecker_tab_->choice_spell_command) == 1 ) {
+               fl_deactivate_object( spellchecker_tab_->check_alt_lang );
+               fl_deactivate_object( spellchecker_tab_->input_alt_lang );
+               fl_deactivate_object( spellchecker_tab_->check_escape_chars );
+               fl_deactivate_object( spellchecker_tab_->input_escape_chars );
+               fl_deactivate_object( spellchecker_tab_->check_personal_dict );
+               fl_deactivate_object( spellchecker_tab_->input_personal_dict );
+               fl_deactivate_object( spellchecker_tab_->check_compound_words );
+               fl_deactivate_object( spellchecker_tab_->check_input_enc );
+               return true;
+       } else {
+               fl_activate_object( spellchecker_tab_->check_alt_lang );
+               fl_activate_object( spellchecker_tab_->check_escape_chars );
+               fl_activate_object( spellchecker_tab_->check_personal_dict );
+               fl_activate_object( spellchecker_tab_->check_compound_words );
+               fl_activate_object( spellchecker_tab_->check_input_enc );
+       }
+       
+       if( fl_get_button(spellchecker_tab_->check_alt_lang) ) {
+               fl_activate_object(spellchecker_tab_->input_alt_lang);
+               fl_set_object_lcol(spellchecker_tab_->input_alt_lang,
+                                  FL_BLACK);
+       } else {
+               fl_deactivate_object(spellchecker_tab_->input_alt_lang);
+               fl_set_object_lcol(spellchecker_tab_->input_alt_lang,
+                                  FL_INACTIVE);
+       }
+
+       if( fl_get_button(spellchecker_tab_->check_escape_chars) ) {
+               fl_activate_object(spellchecker_tab_->input_escape_chars);
+               fl_set_object_lcol(spellchecker_tab_->input_escape_chars,
+                                  FL_BLACK);
+       } else {
+               fl_deactivate_object(spellchecker_tab_->input_escape_chars);
+               fl_set_object_lcol(spellchecker_tab_->input_escape_chars,
+                                  FL_INACTIVE);
+       }
+
+       if( fl_get_button(spellchecker_tab_->check_personal_dict) ) {
+               fl_activate_object(spellchecker_tab_->input_personal_dict);
+               fl_set_object_lcol(spellchecker_tab_->input_personal_dict,
+                                  FL_BLACK);
+       } else {
+               fl_deactivate_object(spellchecker_tab_->input_personal_dict);
+               fl_set_object_lcol(spellchecker_tab_->input_personal_dict,
+                                  FL_INACTIVE);
+       }
+
+       return true; // all input is valid!
+}
+
+
 void FormPreferences::ok()
 {
        FormBase::ok();

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index b7a809b6036b2d0b78df2aba8baba2ab4cbfb99f..a3401e7bf0f6de66469c7c84fc529ad8a926c432 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -34,6 +34,7 @@ struct FD_form_printer;
 struct FD_form_paths;
 struct FD_form_outer_tab;
 struct FD_form_outputs_general;
+struct FD_form_spellchecker;
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
     The preferences dialog allows users to set/save their preferences.
@@ -62,6 +63,12 @@ private:
        ///
        virtual FL_FORM * form() const;
        ///
+       void applySpellChecker();
+       ///
+       void updateSpellChecker();
+       ///
+       bool inputSpellChecker();
+       ///
        FD_form_preferences * build_preferences();
        ///
        FD_form_outer_tab * build_outer_tab();
@@ -77,6 +84,8 @@ private:
        FD_form_paths * build_paths();
        ///
        FD_form_outputs_general * build_outputs_general();
+       ///
+       FD_form_spellchecker * build_spellchecker();
 
        /// Real GUI implementation.
        FD_form_preferences * dialog_;
@@ -87,6 +96,8 @@ private:
        /// reLyX and other import/input stuff
        FD_form_outer_tab * inputs_tab_;
        ///
+       FD_form_spellchecker * spellchecker_tab_;
+       ///
        FD_form_lnf_general * lnf_general_;
        ///
        FD_form_screen_fonts * screen_fonts_;

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index b9f5aec047d728795a775b3bd6e0b29d25896203..412c6afc82ce61079f7e5ac72420f570fa689605 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -449,6 +449,68 @@ FD_form_outputs_general * FormPreferences::build_outputs_general()
     fl_set_counter_bounds(obj, 0, 120);
     fl_set_counter_value(obj, 75);
     fl_set_counter_step(obj, 1, 1);
+  fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, _("TeX encoding"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 217, 142, 199, 29, _("Default paper size"));
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+  fl_end_form();
+
+  fdui->form->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_spellchecker::~FD_form_spellchecker()
+{
+  if( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
+
+FD_form_spellchecker * FormPreferences::build_spellchecker()
+{
+  FL_OBJECT *obj;
+  FD_form_spellchecker *fdui = new FD_form_spellchecker;
+
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
+  fdui->form->u_vdata = this;
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
+  fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 141, 47, 171, 34, _("Spell command"));
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, _("Use alternative language"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, _("Use escape characters"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, _("Use personal dictionary"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, _("Browse..."));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, _("Accept compound words"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, _("Use input encoding"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_form();
 
   fdui->form->fdui = fdui;

diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h
index 4fee00364ee6244099a398b749d5685a8b0751af..ff248282566202d8b8f8ce465ed0040c078bce8f 100644 (file)
--- a/src/frontends/xforms/form_preferences.h
+++ b/src/frontends/xforms/form_preferences.h
@@ -21,6 +21,8 @@ extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
 
 
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 
@@ -138,6 +140,23 @@ struct FD_form_outputs_general {
 
        FL_FORM *form;
        FL_OBJECT *counter_line_len;
+       FL_OBJECT *input_tex_encoding;
+       FL_OBJECT *choice_default_papersize;
+};
+struct FD_form_spellchecker {
+       ~FD_form_spellchecker();
+
+       FL_FORM *form;
+       FL_OBJECT *choice_spell_command;
+       FL_OBJECT *check_alt_lang;
+       FL_OBJECT *input_alt_lang;
+       FL_OBJECT *check_escape_chars;
+       FL_OBJECT *input_escape_chars;
+       FL_OBJECT *check_personal_dict;
+       FL_OBJECT *input_personal_dict;
+       FL_OBJECT *button_personal_dict;
+       FL_OBJECT *check_compound_words;
+       FL_OBJECT *check_input_enc;
 };
 
 #endif /* FD_form_lnf_general_h_ */

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index ab06f5eef93cdc8a24a36b267a658cd110faf1df..3453bd8a2d9db57fa0c280075ca124ea5af04721 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -3,7 +3,7 @@ Magic: 13000
 Internal Form Definition File
     (do not change)
 
-Number of forms: 8
+Number of forms: 9
 Unit of measure: FL_COORD_PIXEL
 SnapGrid: 1
 
@@ -1556,7 +1556,7 @@ argument:
 Name: form_outputs_general
 Width: 455
 Height: 345
-Number of Objects: 2
+Number of Objects: 4
 
 --------------------
 class: FL_BOX
@@ -1598,5 +1598,245 @@ argument: 0
   value: 75
   sstep: 1
 
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 216 95 200 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: TeX encoding
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_tex_encoding
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 217 142 199 29
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Default paper size
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: choice_default_papersize
+callback: 
+argument: 
+
+=============== FORM ===============
+Name: form_spellchecker
+Width: 450
+Height: 320
+Number of Objects: 11
+
+--------------------
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 450 320
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 141 47 171 34
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_TOP
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Spell command
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: choice_spell_command
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 208 100 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Use alternative language
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_alt_lang
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 239 100 170 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_alt_lang
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 208 130 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Use escape characters
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_escape_chars
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 239 130 170 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_escape_chars
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 208 160 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Use personal dictionary
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_personal_dict
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 239 160 170 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_personal_dict
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 239 190 89 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Browse...
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: button_personal_dict
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 130 230 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Accept compound words
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_compound_words
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 130 260 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Use input encoding
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_input_enc
+callback: C_FormBaseInputCB
+argument: 0
+
 ==============================
 create_the_forms