order the items in the Preferences dialog "logically" so that tabbing through

it makes sense. Closes bug #404569.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2577 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-08-23 16:19:22 +00:00
parent 3f7e3f8bef
commit 1aaf551af0
4 changed files with 1907 additions and 1902 deletions

View File

@ -1,4 +1,9 @@
2001-08-21 Angus Leeming <a.leeming@ic.ac.uk> 2001-08-23 Angus Leeming <a.leeming@ic.ac.uk>
* forms/form_preferences.fd: order the items "logically" so that
tabbing through the dialog makes sense. Close bug #404569.
2001-08-23 Angus Leeming <a.leeming@ic.ac.uk>
* FormPreferences.C: Tentative fix of John's "no point in spell * FormPreferences.C: Tentative fix of John's "no point in spell
command "None"" bug, #223255. command "None"" bug, #223255.

File diff suppressed because it is too large Load Diff

View File

@ -5,10 +5,10 @@
#define FD_form_preferences_h_ #define FD_form_preferences_h_
/** Callbacks, globals and object handlers **/ /** Callbacks, globals and object handlers **/
extern "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long); extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long); extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long); extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
@ -42,10 +42,10 @@ struct FD_form_preferences {
FL_FORM *form; FL_FORM *form;
FL_OBJECT *tabfolder_prefs; FL_OBJECT *tabfolder_prefs;
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply; FL_OBJECT *button_apply;
FL_OBJECT *button_cancel; FL_OBJECT *button_cancel;
FL_OBJECT *button_ok;
FL_OBJECT *button_restore;
FL_OBJECT *text_warning; FL_OBJECT *text_warning;
}; };
struct FD_form_outer_tab { struct FD_form_outer_tab {
@ -61,30 +61,62 @@ struct FD_form_screen_fonts {
FL_OBJECT *input_roman; FL_OBJECT *input_roman;
FL_OBJECT *input_sans; FL_OBJECT *input_sans;
FL_OBJECT *input_typewriter; FL_OBJECT *input_typewriter;
FL_OBJECT *counter_zoom;
FL_OBJECT *check_scalable;
FL_OBJECT *input_screen_encoding; FL_OBJECT *input_screen_encoding;
FL_OBJECT *input_script; FL_OBJECT *check_scalable;
FL_OBJECT *input_footnote; FL_OBJECT *counter_zoom;
FL_OBJECT *input_large;
FL_OBJECT *input_largest;
FL_OBJECT *input_huge;
FL_OBJECT *input_normal;
FL_OBJECT *counter_dpi; FL_OBJECT *counter_dpi;
FL_OBJECT *input_tiny; FL_OBJECT *input_tiny;
FL_OBJECT *input_larger; FL_OBJECT *input_script;
FL_OBJECT *input_footnote;
FL_OBJECT *input_small; FL_OBJECT *input_small;
FL_OBJECT *input_normal;
FL_OBJECT *input_large;
FL_OBJECT *input_larger;
FL_OBJECT *input_largest;
FL_OBJECT *input_huge;
FL_OBJECT *input_huger; FL_OBJECT *input_huger;
}; };
struct FD_form_outputs_misc { struct FD_form_interface {
~FD_form_outputs_misc(); ~FD_form_interface();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *counter_line_len; FL_OBJECT *input_popup_font;
FL_OBJECT *input_tex_encoding; FL_OBJECT *input_menu_font;
FL_OBJECT *choice_default_papersize; FL_OBJECT *input_popup_encoding;
FL_OBJECT *input_ascii_roff; FL_OBJECT *input_ui_file;
FL_OBJECT *input_checktex; FL_OBJECT *button_ui_file_browse;
FL_OBJECT *input_bind_file;
FL_OBJECT *button_bind_file_browse;
FL_OBJECT *check_override_x_dead_keys;
};
struct FD_form_colors {
~FD_form_colors();
FL_FORM *form;
FL_OBJECT *browser_lyx_objs;
FL_OBJECT *dial_hue;
FL_OBJECT *slider_saturation;
FL_OBJECT *slider_value;
FL_OBJECT *slider_red;
FL_OBJECT *slider_green;
FL_OBJECT *slider_blue;
FL_OBJECT *button_colorspace;
FL_OBJECT *text_color_values;
FL_OBJECT *button_color;
FL_OBJECT *button_modify;
};
struct FD_form_lnf_misc {
~FD_form_lnf_misc();
FL_FORM *form;
FL_OBJECT *check_banner;
FL_OBJECT *check_auto_region_delete;
FL_OBJECT *check_exit_confirm;
FL_OBJECT *check_display_shrtcuts;
FL_OBJECT *check_ask_new_file;
FL_OBJECT *check_cursor_follows_scrollbar;
FL_OBJECT *counter_wm_jump;
FL_OBJECT *counter_autosave;
}; };
struct FD_form_spelloptions { struct FD_form_spelloptions {
~FD_form_spelloptions(); ~FD_form_spelloptions();
@ -101,12 +133,6 @@ struct FD_form_spelloptions {
FL_OBJECT *check_compound_words; FL_OBJECT *check_compound_words;
FL_OBJECT *check_input_enc; FL_OBJECT *check_input_enc;
}; };
struct FD_form_inputs_misc {
~FD_form_inputs_misc();
FL_FORM *form;
FL_OBJECT *input_date_format;
};
struct FD_form_language { struct FD_form_language {
~FD_form_language(); ~FD_form_language();
@ -114,46 +140,18 @@ struct FD_form_language {
FL_OBJECT *input_package; FL_OBJECT *input_package;
FL_OBJECT *choice_default_lang; FL_OBJECT *choice_default_lang;
FL_OBJECT *check_use_kbmap; FL_OBJECT *check_use_kbmap;
FL_OBJECT *check_rtl_support;
FL_OBJECT *check_mark_foreign;
FL_OBJECT *check_auto_begin;
FL_OBJECT *check_auto_end;
FL_OBJECT *input_command_begin;
FL_OBJECT *input_command_end;
FL_OBJECT *input_kbmap1; FL_OBJECT *input_kbmap1;
FL_OBJECT *input_kbmap2; FL_OBJECT *input_kbmap2;
FL_OBJECT *button_kbmap1_browse; FL_OBJECT *button_kbmap1_browse;
FL_OBJECT *button_kbmap2_browse; FL_OBJECT *button_kbmap2_browse;
FL_OBJECT *check_rtl_support;
FL_OBJECT *check_auto_begin;
FL_OBJECT *check_use_babel; FL_OBJECT *check_use_babel;
FL_OBJECT *check_mark_foreign;
FL_OBJECT *check_auto_end;
FL_OBJECT *check_global_options; FL_OBJECT *check_global_options;
}; FL_OBJECT *input_command_begin;
struct FD_form_colors { FL_OBJECT *input_command_end;
~FD_form_colors();
FL_FORM *form;
FL_OBJECT *button_color;
FL_OBJECT *browser_lyx_objs;
FL_OBJECT *button_modify;
FL_OBJECT *slider_saturation;
FL_OBJECT *slider_value;
FL_OBJECT *dial_hue;
FL_OBJECT *slider_red;
FL_OBJECT *slider_blue;
FL_OBJECT *slider_green;
FL_OBJECT *button_colorspace;
FL_OBJECT *text_color_values;
};
struct FD_form_converters {
~FD_form_converters();
FL_FORM *form;
FL_OBJECT *browser_all;
FL_OBJECT *button_delete;
FL_OBJECT *button_add;
FL_OBJECT *input_converter;
FL_OBJECT *choice_from;
FL_OBJECT *choice_to;
FL_OBJECT *input_flags;
}; };
struct FD_form_formats { struct FD_form_formats {
~FD_form_formats(); ~FD_form_formats();
@ -162,42 +160,57 @@ struct FD_form_formats {
FL_OBJECT *browser_all; FL_OBJECT *browser_all;
FL_OBJECT *input_format; FL_OBJECT *input_format;
FL_OBJECT *input_gui_name; FL_OBJECT *input_gui_name;
FL_OBJECT *button_delete; FL_OBJECT *input_shrtcut;
FL_OBJECT *button_add;
FL_OBJECT *input_extension; FL_OBJECT *input_extension;
FL_OBJECT *input_viewer; FL_OBJECT *input_viewer;
FL_OBJECT *input_shrtcut; FL_OBJECT *button_add;
FL_OBJECT *button_delete;
}; };
struct FD_form_lnf_misc { struct FD_form_converters {
~FD_form_lnf_misc(); ~FD_form_converters();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *check_banner; FL_OBJECT *browser_all;
FL_OBJECT *check_auto_region_delete; FL_OBJECT *choice_from;
FL_OBJECT *check_exit_confirm; FL_OBJECT *choice_to;
FL_OBJECT *check_display_shrtcuts; FL_OBJECT *input_converter;
FL_OBJECT *counter_autosave; FL_OBJECT *input_flags;
FL_OBJECT *check_ask_new_file; FL_OBJECT *button_add;
FL_OBJECT *check_cursor_follows_scrollbar; FL_OBJECT *button_delete;
FL_OBJECT *counter_wm_jump;
}; };
struct FD_form_interface { struct FD_form_paths {
~FD_form_interface(); ~FD_form_paths();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *input_popup_font; FL_OBJECT *input_default_path;
FL_OBJECT *input_menu_font; FL_OBJECT *button_default_path_browse;
FL_OBJECT *input_popup_encoding; FL_OBJECT *input_template_path;
FL_OBJECT *input_bind_file; FL_OBJECT *button_template_path_browse;
FL_OBJECT *button_bind_file_browse; FL_OBJECT *check_use_temp_dir;
FL_OBJECT *input_ui_file; FL_OBJECT *input_temp_dir;
FL_OBJECT *button_ui_file_browse; FL_OBJECT *button_temp_dir_browse;
FL_OBJECT *check_override_x_dead_keys; FL_OBJECT *check_last_files;
FL_OBJECT *input_lastfiles;
FL_OBJECT *button_lastfiles_browse;
FL_OBJECT *counter_lastfiles;
FL_OBJECT *check_make_backups;
FL_OBJECT *input_backup_path;
FL_OBJECT *button_backup_path_browse;
FL_OBJECT *input_serverpipe;
FL_OBJECT *button_serverpipe_browse;
};
struct FD_form_inputs_misc {
~FD_form_inputs_misc();
FL_FORM *form;
FL_OBJECT *input_date_format;
}; };
struct FD_form_printer { struct FD_form_printer {
~FD_form_printer(); ~FD_form_printer();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *input_name;
FL_OBJECT *check_adapt_output;
FL_OBJECT *input_command; FL_OBJECT *input_command;
FL_OBJECT *input_page_range; FL_OBJECT *input_page_range;
FL_OBJECT *input_copies; FL_OBJECT *input_copies;
@ -214,29 +227,16 @@ struct FD_form_printer {
FL_OBJECT *input_extra_options; FL_OBJECT *input_extra_options;
FL_OBJECT *input_spool_prefix; FL_OBJECT *input_spool_prefix;
FL_OBJECT *input_paper_size; FL_OBJECT *input_paper_size;
FL_OBJECT *input_name;
FL_OBJECT *check_adapt_output;
}; };
struct FD_form_paths { struct FD_form_outputs_misc {
~FD_form_paths(); ~FD_form_outputs_misc();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *input_default_path; FL_OBJECT *counter_line_len;
FL_OBJECT *button_default_path_browse; FL_OBJECT *input_tex_encoding;
FL_OBJECT *counter_lastfiles; FL_OBJECT *choice_default_papersize;
FL_OBJECT *input_template_path; FL_OBJECT *input_ascii_roff;
FL_OBJECT *button_template_path_browse; FL_OBJECT *input_checktex;
FL_OBJECT *check_last_files;
FL_OBJECT *button_temp_dir_browse;
FL_OBJECT *input_lastfiles;
FL_OBJECT *button_lastfiles_browse;
FL_OBJECT *check_make_backups;
FL_OBJECT *input_backup_path;
FL_OBJECT *button_backup_path_browse;
FL_OBJECT *input_serverpipe;
FL_OBJECT *button_serverpipe_browse;
FL_OBJECT *input_temp_dir;
FL_OBJECT *check_use_temp_dir;
}; };
#endif /* FD_form_preferences_h_ */ #endif /* FD_form_preferences_h_ */

File diff suppressed because it is too large Load Diff