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 4ab695f89a9c7b87e82905d5ce23bbd604920592..d6b0fcb53ecef3dc3717c1f5a4376fe2921e097a 100644 (file)
--- a/src/frontends/xforms/form_preferences.h
+++ b/src/frontends/xforms/form_preferences.h
@@ -114,28 +114,32 @@ struct FD_form_language {
        FL_OBJECT *input_package;
        FL_OBJECT *choice_default_lang;
        FL_OBJECT *check_use_kbmap;
-       FL_OBJECT *choice_kbmap_1;
-       FL_OBJECT *choice_kbmap_2;
        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_kbmap2;
+       FL_OBJECT *button_kbmap1_browse;
+       FL_OBJECT *button_kbmap2_browse;
 };
-struct FD_form_colours {
-       ~FD_form_colours();
+struct FD_form_colors {
+       ~FD_form_colors();
 
        FL_FORM *form;
-       FL_OBJECT *browser_x11;
-       FL_OBJECT *input_name;
-       FL_OBJECT *button_browse;
-       FL_OBJECT *button_colour;
-       FL_OBJECT *valslider_red;
-       FL_OBJECT *valslider_green;
-       FL_OBJECT *valslider_blue;
+       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();
@@ -216,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;