Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index 4762431ff5b9fc54e07153906919e99226782b7d..69bfa2dc55b948c8189fc38f34a28ed54d0303e3 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -1,6 +1,6 @@
 // File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
 #include <config.h>
-#include "lyx_gui_misc.h"
+#include "xforms_helpers.h"
 #include "gettext.h"
 
 /* Form definition file generated with fdesign. */
@@ -64,22 +64,22 @@ FD_form_preferences * FormPreferences::build_preferences()
 }
 /*---------------------------------------*/
 
-FD_form_outer_tab::~FD_form_outer_tab()
+FD_form_inner_tab::~FD_form_inner_tab()
 {
   if ( form->visible ) fl_hide_form( form );
   fl_free_form( form );
 }
 
 
-FD_form_outer_tab * FormPreferences::build_outer_tab()
+FD_form_inner_tab * FormPreferences::build_inner_tab()
 {
   FL_OBJECT *obj;
-  FD_form_outer_tab *fdui = new FD_form_outer_tab;
+  FD_form_inner_tab *fdui = new FD_form_inner_tab;
 
   fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
-  fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375, "");
+  fdui->tabfolder_inner = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375, "");
     fl_set_object_boxtype(obj, FL_FLAT_BOX);
   fl_end_form();
 
@@ -116,7 +116,7 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
   fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 145, 130, 140, 30, _("Encoding"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, _("Use scalable fonts"));
+  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, _("Rescale bitmap fonts"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
@@ -149,10 +149,10 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
   fdui->input_tiny = obj = fl_add_input(FL_FLOAT_INPUT, 370, 20, 70, 30, _("tiny"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_script = obj = fl_add_input(FL_FLOAT_INPUT, 370, 50, 70, 30, _("script"));
+  fdui->input_script = obj = fl_add_input(FL_FLOAT_INPUT, 370, 50, 70, 30, _("smallest"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_footnote = obj = fl_add_input(FL_FLOAT_INPUT, 370, 80, 70, 30, _("footnote"));
+  fdui->input_footnote = obj = fl_add_input(FL_FLOAT_INPUT, 370, 80, 70, 30, _("smaller"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   fdui->input_small = obj = fl_add_input(FL_FLOAT_INPUT, 370, 110, 70, 30, _("small"));
@@ -202,15 +202,17 @@ FD_form_interface * FormPreferences::build_interface()
   fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Popup Font"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Popup Fonts & Encoding"));
+  fdui->input_popup_normal_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Normal Font"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_menu_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Menu Font"));
+  fdui->input_popup_bold_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Bold Font"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding"));
+  fdui->input_popup_font_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 150, 425, 85, _("Layout & Bindings"));
   {
     char const * const dummy = N_("User Interface file|#U");
     fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 160, 170, 30, idex(_(dummy)));
@@ -239,6 +241,7 @@ FD_form_interface * FormPreferences::build_interface()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 255, 425, 45, _("Dead Keys"));
   {
     char const * const dummy = N_("Override X Window dead-keys|#O");
     fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 265, 30, 30, idex(_(dummy)));
@@ -247,9 +250,6 @@ FD_form_interface * FormPreferences::build_interface()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
     fl_set_button(obj, 1);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Fonts & Encoding"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 150, 425, 85, _("Layout & Bindings"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 255, 425, 45, _("Dead Keys"));
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -335,10 +335,12 @@ FD_form_colors * FormPreferences::build_colors()
     fl_set_slider_size(obj, 0.15);
 
   fdui->group_radio_printto = fl_bgn_group();
-  fdui->radio_hsv = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 250, 220, 30, 30, _("HSV"));
+  fdui->radio_hsv = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 250, 220, 30, 30, _("HSV"));
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->radio_rgb = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 335, 220, 30, 30, _("RGB"));
+  fdui->radio_rgb = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 335, 220, 30, 30, _("RGB"));
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
     fl_set_button(obj, 1);
@@ -452,28 +454,32 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc()
   fdui->radio_button_group_display = fl_bgn_group();
   {
     char const * const dummy = N_("in Monochrome|#M");
-    fdui->radio_display_monochrome = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 285, 35, 30, 30, idex(_(dummy)));
+    fdui->radio_display_monochrome = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 35, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
     fl_set_button(obj, 1);
   {
     char const * const dummy = N_("in Grayscale|#G");
-    fdui->radio_display_grayscale = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 285, 65, 30, 30, idex(_(dummy)));
+    fdui->radio_display_grayscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 65, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("in Color|#C");
-    fdui->radio_display_color = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 285, 95, 30, 30, idex(_(dummy)));
+    fdui->radio_display_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 95, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Don't display|#D");
-    fdui->radio_no_display = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 285, 125, 30, 30, idex(_(dummy)));
+    fdui->radio_no_display = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 125, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   fl_end_group();