try this for distinguishing inner and outer tabs

[lyx.git] / src / frontends / xforms / form_preferences.h

diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h
index 88bdbc5a2cfa5844767c37bfbd5bf987b5feef79..d6b0fcb53ecef3dc3717c1f5a4376fe2921e097a 100644 (file)
--- a/src/frontends/xforms/form_preferences.h
+++ b/src/frontends/xforms/form_preferences.h
@@ -5,12 +5,12 @@
 #define FD_form_preferences_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
 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);
@@ -23,6 +23,9 @@ extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
@@ -61,15 +64,16 @@ struct FD_form_screen_fonts {
        FL_OBJECT *counter_zoom;
        FL_OBJECT *check_scalable;
        FL_OBJECT *input_screen_encoding;
-       FL_OBJECT *input_tiny;
        FL_OBJECT *input_script;
        FL_OBJECT *input_footnote;
-       FL_OBJECT *input_small;
        FL_OBJECT *input_large;
-       FL_OBJECT *input_larger;
        FL_OBJECT *input_largest;
-       FL_OBJECT *input_normal;
        FL_OBJECT *input_huge;
+       FL_OBJECT *input_normal;
+       FL_OBJECT *counter_dpi;
+       FL_OBJECT *input_tiny;
+       FL_OBJECT *input_larger;
+       FL_OBJECT *input_small;
        FL_OBJECT *input_huger;
 };
 struct FD_form_outputs_misc {
@@ -107,22 +111,60 @@ struct FD_form_language {
        ~FD_form_language();
 
        FL_FORM *form;
+       FL_OBJECT *input_package;
+       FL_OBJECT *choice_default_lang;
        FL_OBJECT *check_use_kbmap;
-       FL_OBJECT *choice_kbmap_1;
        FL_OBJECT *check_rtl_support;
        FL_OBJECT *check_mark_foreign;
-       FL_OBJECT *check_auto_end;
        FL_OBJECT *check_auto_begin;
-       FL_OBJECT *input_package;
+       FL_OBJECT *check_auto_end;
        FL_OBJECT *input_command_begin;
        FL_OBJECT *input_command_end;
-       FL_OBJECT *choice_kbmap_2;
-       FL_OBJECT *choice_default_lang;
+       FL_OBJECT *input_kbmap1;
+       FL_OBJECT *input_kbmap2;
+       FL_OBJECT *button_kbmap1_browse;
+       FL_OBJECT *button_kbmap2_browse;
+};
+struct FD_form_colors {
+       ~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_colours {
-       ~FD_form_colours();
+struct FD_form_formats {
+       ~FD_form_formats();
 
        FL_FORM *form;
+       FL_OBJECT *browser_all;
+       FL_OBJECT *input_format;
+       FL_OBJECT *input_gui_name;
+       FL_OBJECT *button_delete;
+       FL_OBJECT *button_add;
+       FL_OBJECT *input_extension;
+       FL_OBJECT *input_viewer;
+       FL_OBJECT *input_shrtcut;
 };
 struct FD_form_lnf_misc {
        ~FD_form_lnf_misc();
@@ -131,7 +173,7 @@ struct FD_form_lnf_misc {
        FL_OBJECT *check_banner;
        FL_OBJECT *check_auto_region_delete;
        FL_OBJECT *check_exit_confirm;
-       FL_OBJECT *check_display_shortcuts;
+       FL_OBJECT *check_display_shrtcuts;
        FL_OBJECT *counter_autosave;
        FL_OBJECT *check_ask_new_file;
        FL_OBJECT *check_cursor_follows_scrollbar;
@@ -178,10 +220,10 @@ struct FD_form_paths {
 
        FL_FORM *form;
        FL_OBJECT *input_default_path;
-       FL_OBJECT *button_document_browse;
+       FL_OBJECT *button_default_path_browse;
        FL_OBJECT *counter_lastfiles;
        FL_OBJECT *input_template_path;
-       FL_OBJECT *button_template_browse;
+       FL_OBJECT *button_template_path_browse;
        FL_OBJECT *check_last_files;
        FL_OBJECT *button_temp_dir_browse;
        FL_OBJECT *input_lastfiles;