anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

'a radio control is a radio control is a radio control' patch from John

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3300 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-01-07 11:28:09 +00:00
parent 61ccd8b8b5
commit 8c92c860a2
24 changed files with 234 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2002-01-07 John Levon <moz@compsoc.man.ac.uk>
* form_*:
* forms/form_*: change radio buttons to round3dbutton
2002-01-05 John Levon <moz@compsoc.man.ac.uk>
* FormFiledialog.C: add FIXME

78
src/frontends/xforms/form_document.C
View File

@ -125,16 +125,18 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
fdui->group_radio_orientation = fl_bgn_group();
{
char const * const dummy = N_("Portrait|#o");
fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 255, 40, 120, 30, idex(_(dummy)));
fdui->radio_portrait = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 40, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Landscape|#L");
fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 255, 75, 120, 30, idex(_(dummy)));
fdui->radio_landscape = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 75, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
@ -321,16 +323,18 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->group_doc_sides = fl_bgn_group();
{
char const * const dummy = N_("One|#n");
fdui->radio_doc_sides_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy)));
fdui->radio_doc_sides_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Two|#T");
fdui->radio_doc_sides_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_(dummy)));
fdui->radio_doc_sides_two = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
@ -339,16 +343,18 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->group_doc_columns = fl_bgn_group();
{
char const * const dummy = N_("One|#e");
fdui->radio_doc_columns_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy)));
fdui->radio_doc_columns_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Two|#w");
fdui->radio_doc_columns_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_(dummy)));
fdui->radio_doc_columns_two = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
@ -357,16 +363,18 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->group_doc_sep = fl_bgn_group();
{
char const * const dummy = N_("Indent|#I");
fdui->radio_doc_indent = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 50, 260, 110, 30, idex(_(dummy)));
fdui->radio_doc_indent = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 260, 110, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Skip|#K");
fdui->radio_doc_skip = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 50, 290, 110, 30, idex(_(dummy)));
fdui->radio_doc_skip = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 290, 110, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_set_button(obj, 1);
@ -421,16 +429,18 @@ FD_form_doc_language * FormDocument::build_doc_language()
fl_bgn_group();
{
char const * const dummy = N_("Single|#S");
fdui->radio_single = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_(dummy)));
fdui->radio_single = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Double|#D");
fdui->radio_double = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_(dummy)));
fdui->radio_double = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
@ -538,16 +548,16 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_border_width(-1);
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
fl_set_border_width(-3);
fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 135, 105, 260, 180, "");
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETBMTABLE);
fl_set_object_lcol(obj, FL_BLUE);
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_bmtable_pixmap_file(obj, 6, 6,
LibFileSearch("images",
"standard",
"standard",
"xpm").c_str());
fl_set_border_width(-1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, "");
obj = fl_add_frame(FL_ENGRAVED_FRAME, 135, 20, 260, 55, "");
{
char const * const dummy = N_("Size|#z");
fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_(dummy)));
@ -569,86 +579,106 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fdui->radio_bullet_depth = fl_bgn_group();
{
char const * const dummy = N_("1|#1");
fdui->radio_bullet_depth_1 = obj = fl_add_button(FL_RADIO_BUTTON, 105, 35, 55, 40, idex(_(dummy)));
fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 40, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH1);
fl_set_button(obj, 1);
{
char const * const dummy = N_("2|#2");
fdui->radio_bullet_depth_2 = obj = fl_add_button(FL_RADIO_BUTTON, 165, 35, 55, 40, idex(_(dummy)));
fdui->radio_bullet_depth_2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 210, 35, 40, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH2);
{
char const * const dummy = N_("3|#3");
fdui->radio_bullet_depth_3 = obj = fl_add_button(FL_RADIO_BUTTON, 225, 35, 55, 40, idex(_(dummy)));
fdui->radio_bullet_depth_3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 270, 35, 40, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH3);
{
char const * const dummy = N_("4|#4");
fdui->radio_bullet_depth_4 = obj = fl_add_button(FL_RADIO_BUTTON, 285, 35, 55, 40, idex(_(dummy)));
fdui->radio_bullet_depth_4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 35, 40, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH4);
fl_end_group();
obj = fl_add_text(FL_NORMAL_TEXT, 105, 10, 85, 20, _("Bullet Depth"));
obj = fl_add_text(FL_NORMAL_TEXT, 145, 10, 85, 20, _("Bullet Depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fdui->radio_bullet_panel = fl_bgn_group();
{
char const * const dummy = N_("Standard|#S");
fdui->radio_bullet_panel_standard = obj = fl_add_button(FL_RADIO_BUTTON, 15, 105, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_standard = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 105, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL1);
fl_set_button(obj, 1);
{
char const * const dummy = N_("Maths|#M");
fdui->radio_bullet_panel_maths = obj = fl_add_button(FL_RADIO_BUTTON, 15, 135, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_maths = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 135, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL2);
{
char const * const dummy = N_("Ding 2|#i");
fdui->radio_bullet_panel_ding2 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 195, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_ding2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 195, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL3);
{
char const * const dummy = N_("Ding 3|#n");
fdui->radio_bullet_panel_ding3 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 225, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_ding3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 225, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL4);
{
char const * const dummy = N_("Ding 4|#g");
fdui->radio_bullet_panel_ding4 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 255, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_ding4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 255, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL5);
{
char const * const dummy = N_("Ding 1|#D");
fdui->radio_bullet_panel_ding1 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 165, 65, 30, idex(_(dummy)));
fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);

9
src/frontends/xforms/form_ert.C
View File

@ -32,23 +32,26 @@ FD_form_ert * FormERT::build_ert()
fdui->group_alignment = fl_bgn_group();
{
char const * const dummy = N_("Open|#O");
fdui->radio_open = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 19, 30, 152, 30, idex(_(dummy)));
fdui->radio_open = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 30, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Collapsed|#C");
fdui->radio_collapsed = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 19, 60, 152, 30, idex(_(dummy)));
fdui->radio_collapsed = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 60, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Inlined View|#I");
fdui->radio_inlined = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 19, 90, 152, 30, idex(_(dummy)));
fdui->radio_inlined = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 90, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();

9
src/frontends/xforms/form_include.C
View File

@ -74,23 +74,26 @@ FD_form_include * FormInclude::build_include()
fdui->include_grp = fl_bgn_group();
{
char const * const dummy = N_("Verbatim|#V");
fdui->check_verbatim = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
fdui->check_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Use input|#i");
fdui->check_useinput = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
fdui->check_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Use include|#U");
fdui->check_useinclude = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
fdui->check_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();

6
src/frontends/xforms/form_maths_delim.C
View File

@ -33,15 +33,17 @@ FD_form_maths_delim * FormMathsDelim::build_maths_delim()
fdui->lado = fl_bgn_group();
{
char const * const dummy = N_("Right|#R");
fdui->radio_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 40, 40, 80, 30, idex(_(dummy)));
fdui->radio_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 40, 40, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
{
char const * const dummy = N_("Left|#L");
fdui->radio_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 40, 10, 80, 30, idex(_(dummy)));
fdui->radio_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 40, 10, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();

12
src/frontends/xforms/form_maths_space.C
View File

@ -29,7 +29,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fdui->spaces = fl_bgn_group();
{
char const * const dummy = N_("Thin|#T");
fdui->radio_thin = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 10, 120, 30, idex(_(dummy)));
fdui->radio_thin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 10, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);
@ -37,7 +37,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 1);
{
char const * const dummy = N_("Medium|#M");
fdui->radio_medium = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 40, 120, 30, idex(_(dummy)));
fdui->radio_medium = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 40, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);
@ -45,7 +45,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 2);
{
char const * const dummy = N_("Thick|#H");
fdui->radio_thick = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 70, 120, 30, idex(_(dummy)));
fdui->radio_thick = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 70, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);
@ -53,7 +53,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 3);
{
char const * const dummy = N_("Negative|#N");
fdui->radio_negative = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 10, 120, 30, idex(_(dummy)));
fdui->radio_negative = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 10, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);
@ -61,7 +61,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Quadratin|#Q");
fdui->radio_quadratin = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 40, 120, 30, idex(_(dummy)));
fdui->radio_quadratin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 40, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);
@ -69,7 +69,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 4);
{
char const * const dummy = N_("2Quadratin|#2");
fdui->radio_twoquadratin = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 70, 120, 30, idex(_(dummy)));
fdui->radio_twoquadratin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 70, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_MCOL, FL_YELLOW);

9
src/frontends/xforms/form_minipage.C
View File

@ -41,23 +41,26 @@ FD_form_minipage * FormMinipage::build_minipage()
fdui->group_alignment = fl_bgn_group();
{
char const * const dummy = N_("Top|#T");
fdui->radio_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 249, 30, 152, 30, idex(_(dummy)));
fdui->radio_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 30, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Middle|#d");
fdui->radio_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 249, 60, 152, 30, idex(_(dummy)));
fdui->radio_middle = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 60, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Bottom|#B");
fdui->radio_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 249, 90, 152, 30, idex(_(dummy)));
fdui->radio_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 90, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();

12
src/frontends/xforms/form_paragraph.C
View File

@ -32,30 +32,34 @@ FD_form_paragraph * FormParagraph::build_paragraph()
fdui->group_radio_alignment = fl_bgn_group();
{
char const * const dummy = N_("Right|#R");
fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Left|#f");
fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 15, 60, 80, 30, idex(_(dummy)));
fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 60, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Block|#c");
fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 115, 30, 80, 30, idex(_(dummy)));
fdui->radio_align_block = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 115, 30, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Center|#n");
fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 115, 60, 80, 30, idex(_(dummy)));
fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 115, 60, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_end_group();

18
src/frontends/xforms/form_preferences.C
View File

@ -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();

21
src/frontends/xforms/form_print.C
View File

@ -35,16 +35,18 @@ FD_form_print * FormPrint::build_print()
fdui->group_radio_printto = fl_bgn_group();
{
char const * const dummy = N_("Printer|#P");
fdui->radio_printer = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy)));
fdui->radio_printer = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("File|#F");
fdui->radio_file = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_(dummy)));
fdui->radio_file = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
@ -70,23 +72,26 @@ FD_form_print * FormPrint::build_print()
fdui->group_radio_pages = fl_bgn_group();
{
char const * const dummy = N_("All Pages|#G");
fdui->radio_all_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
fdui->radio_all_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Only Odd Pages|#O");
fdui->radio_odd_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_(dummy)));
fdui->radio_odd_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Only Even Pages|#E");
fdui->radio_even_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_(dummy)));
fdui->radio_even_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
@ -95,16 +100,18 @@ FD_form_print * FormPrint::build_print()
fdui->group_radio_order = fl_bgn_group();
{
char const * const dummy = N_("Normal Order|#N");
fdui->radio_order_normal = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy)));
fdui->radio_order_normal = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Reverse Order|#R");
fdui->radio_order_reverse = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_(dummy)));
fdui->radio_order_reverse = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();

18
src/frontends/xforms/form_tabular.C
View File

@ -201,23 +201,26 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Left|#e");
fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 35, 105, 25, idex(_(dummy)));
fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 105, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Right|#i");
fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 85, 105, 25, idex(_(dummy)));
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 105, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Center|#c");
fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 60, 105, 25, idex(_(dummy)));
fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 60, 105, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
@ -333,23 +336,26 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Left|#e");
fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 35, 110, 25, idex(_(dummy)));
fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 110, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Right|#i");
fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 85, 115, 25, idex(_(dummy)));
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 115, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Center|#c");
fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 60, 115, 25, idex(_(dummy)));
fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 60, 115, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{

9
src/frontends/xforms/form_texinfo.C
View File

@ -36,9 +36,10 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
{
char const * const dummy = N_("LaTeX Classes|#C");
fdui->radio_cls = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 350, 20, 30, 30, idex(_(dummy)));
fdui->radio_cls = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 20, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
@ -46,18 +47,20 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
fl_set_button(obj, 1);
{
char const * const dummy = N_("LaTeX Styles|#S");
fdui->radio_sty = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 350, 50, 30, 30, idex(_(dummy)));
fdui->radio_sty = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 50, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("BibTeX Styles|#B");
fdui->radio_bst = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 350, 80, 30, 30, idex(_(dummy)));
fdui->radio_bst = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 80, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);

20
src/frontends/xforms/forms/form_document.C.patch
View File

@ -1,6 +1,6 @@
--- form_document.C Wed Oct 4 18:07:46 2000
+++ form_document.C.orig Wed Oct 4 18:07:23 2000
@@ -9,6 +9,8 @@
--- form_document.C Mon Jan 7 09:19:31 2002
+++ form_document.C.new Mon Jan 7 09:19:24 2002
@@ -10,6 +10,8 @@
#include <stdlib.h>
#include "form_document.h"
#include "FormDocument.h"
@ -9,25 +9,25 @@
FD_form_tabbed_document::~FD_form_tabbed_document()
{
@@ -390,10 +392,18 @@
@@ -543,10 +545,18 @@
fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form->u_vdata = this;
+ fl_set_border_width(-1);
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
- fdui->bmtable_bullet_panel = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 90, 105, 260, 180, "");
- fdui->bmtable_bullet_panel = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 135, 105, 260, 180, "");
- fl_set_object_boxtype(obj, FL_NO_BOX);
- fl_set_pixmapbutton_file(obj, _("/nfs/sinco/source/lyx/lyx-devel/lib/images/psnfss2.xpm"));
+ fl_set_border_width(-3);
+ fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
+ fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 135, 105, 260, 180, "");
+ fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETBMTABLE);
+ fl_set_object_lcol(obj, FL_BLUE);
+ fl_set_object_boxtype(obj, FL_UP_BOX);
+ fl_set_bmtable_pixmap_file(obj, 6, 6,
+ LibFileSearch("images",
+ "standard",
+ "standard",
+ "xpm").c_str());
+ fl_set_border_width(-1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, "");
fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_("Size|#z")));
fl_set_button_shortcut(obj, scex(_("Size|#z")), 1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 135, 20, 260, 55, "");
{
char const * const dummy = N_("Size|#z");

85
src/frontends/xforms/forms/form_document.fd
View File

@ -328,7 +328,7 @@ argument:
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -344,7 +344,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 255 40 120 30
boxtype: FL_NO_BOX
@ -362,7 +362,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 255 75 120 30
boxtype: FL_NO_BOX
@ -928,7 +928,7 @@ argument: INPUT
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -944,7 +944,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 300 30 120 30
boxtype: FL_NO_BOX
@ -962,7 +962,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 300 60 120 30
boxtype: FL_NO_BOX
@ -1000,7 +1000,7 @@ argument:
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -1016,7 +1016,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 300 120 110 30
boxtype: FL_NO_BOX
@ -1034,7 +1034,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 300 150 110 30
boxtype: FL_NO_BOX
@ -1072,7 +1072,7 @@ argument:
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -1088,7 +1088,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 50 260 110 30
boxtype: FL_NO_BOX
@ -1106,7 +1106,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 50 290 110 30
boxtype: FL_NO_BOX
@ -1170,8 +1170,8 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_default_skip_units
@ -1259,7 +1259,7 @@ argument: INPUT
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -1275,7 +1275,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 110 180 90 30
boxtype: FL_NO_BOX
@ -1293,7 +1293,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 210 180 90 30
boxtype: FL_NO_BOX
@ -1523,7 +1523,7 @@ argument:
--------------------
class: FL_PIXMAPBUTTON
type: NORMAL_BUTTON
box: 90 105 260 180
box: 135 105 260 180
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_BOTTOM
@ -1538,13 +1538,12 @@ name: bmtable_bullet_panel
callback:
argument:
file: /nfs/sinco/source/lyx/lyx-devel/lib/images/psnfss2.xpm
focus_file:
fullpath: 1
--------------------
class: FL_FRAME
type: ENGRAVED_FRAME
box: 95 20 255 70
box: 135 20 260 55
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_CENTER
@ -1598,7 +1597,7 @@ argument: INPUTBULLETLATEX
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -1614,9 +1613,9 @@ callback:
argument:
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 105 35 55 40
box: 150 35 40 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1633,9 +1632,9 @@ argument: BULLETDEPTH1
value: 1
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 165 35 55 40
box: 210 35 40 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1651,9 +1650,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETDEPTH2
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 225 35 55 40
box: 270 35 40 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1669,9 +1668,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETDEPTH3
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 285 35 55 40
box: 330 35 40 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1707,7 +1706,7 @@ argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 105 10 85 20
box: 145 10 85 20
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@ -1725,7 +1724,7 @@ argument:
--------------------
class: FL_BEGIN_GROUP
type: 0
box: 0 10 10 0
box: 0 0 0 0
boxtype: FL_NO_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER
@ -1741,9 +1740,9 @@ callback:
argument:
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 105 65 30
box: 15 105 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1760,9 +1759,9 @@ argument: BULLETPANEL1
value: 1
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 135 65 30
box: 15 135 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1778,9 +1777,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETPANEL2
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 195 65 30
box: 15 195 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1796,9 +1795,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETPANEL3
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 225 65 30
box: 15 225 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1814,9 +1813,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETPANEL4
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 255 65 30
box: 15 255 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -1832,9 +1831,9 @@ callback: C_FormBaseDeprecatedInputCB
argument: BULLETPANEL5
--------------------
class: FL_BUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 165 65 30
box: 15 165 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER

6
src/frontends/xforms/forms/form_ert.fd
View File

@ -67,7 +67,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 19 30 152 30
boxtype: FL_NO_BOX
@ -85,7 +85,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 19 60 152 30
boxtype: FL_NO_BOX
@ -103,7 +103,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 19 90 152 30
boxtype: FL_NO_BOX

6
src/frontends/xforms/forms/form_include.fd
View File

@ -193,7 +193,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 130 160 30
boxtype: FL_NO_BOX
@ -211,7 +211,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 100 160 30
boxtype: FL_NO_BOX
@ -229,7 +229,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 70 160 30
boxtype: FL_NO_BOX

4
src/frontends/xforms/forms/form_maths_delim.fd
View File

@ -68,7 +68,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 40 40 80 30
boxtype: FL_NO_BOX
@ -86,7 +86,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 40 10 80 30
boxtype: FL_NO_BOX

12
src/frontends/xforms/forms/form_maths_space.fd
View File

@ -50,7 +50,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 20 10 120 30
boxtype: FL_NO_BOX
@ -68,7 +68,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 1
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 20 40 120 30
boxtype: FL_NO_BOX
@ -86,7 +86,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 2
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 20 70 120 30
boxtype: FL_NO_BOX
@ -104,7 +104,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 3
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 140 10 120 30
boxtype: FL_NO_BOX
@ -122,7 +122,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 140 40 120 30
boxtype: FL_NO_BOX
@ -140,7 +140,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 4
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 140 70 120 30
boxtype: FL_NO_BOX

6
src/frontends/xforms/forms/form_minipage.fd
View File

@ -121,7 +121,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 249 30 152 30
boxtype: FL_NO_BOX
@ -139,7 +139,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 249 60 152 30
boxtype: FL_NO_BOX
@ -157,7 +157,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 249 90 152 30
boxtype: FL_NO_BOX

8
src/frontends/xforms/forms/form_paragraph.fd
View File

@ -68,7 +68,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 30 80 30
boxtype: FL_NO_BOX
@ -86,7 +86,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 15 60 80 30
boxtype: FL_NO_BOX
@ -104,7 +104,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 115 30 80 30
boxtype: FL_NO_BOX
@ -122,7 +122,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 115 60 80 30
boxtype: FL_NO_BOX

12
src/frontends/xforms/forms/form_preferences.fd
View File

@ -989,7 +989,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 250 220 30 30
boxtype: FL_NO_BOX
@ -1007,7 +1007,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 335 220 30 30
boxtype: FL_NO_BOX
@ -1317,7 +1317,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 285 35 30 30
boxtype: FL_NO_BOX
@ -1336,7 +1336,7 @@ argument: 0
value: 1
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 285 65 30 30
boxtype: FL_NO_BOX
@ -1354,7 +1354,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 285 95 30 30
boxtype: FL_NO_BOX
@ -1372,7 +1372,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 285 125 30 30
boxtype: FL_NO_BOX

14
src/frontends/xforms/forms/form_print.fd
View File

@ -85,7 +85,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 225 80 30
boxtype: FL_NO_BOX
@ -103,7 +103,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 265 80 30
boxtype: FL_NO_BOX
@ -211,7 +211,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 30 160 30
boxtype: FL_NO_BOX
@ -229,7 +229,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 60 160 30
boxtype: FL_NO_BOX
@ -247,7 +247,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 10 90 160 30
boxtype: FL_NO_BOX
@ -301,7 +301,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 180 30 150 30
boxtype: FL_NO_BOX
@ -319,7 +319,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 180 60 150 30
boxtype: FL_NO_BOX

12
src/frontends/xforms/forms/form_tabular.fd
View File

@ -494,7 +494,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 35 105 25
boxtype: FL_NO_BOX
@ -512,7 +512,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 85 105 25
boxtype: FL_NO_BOX
@ -530,7 +530,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 60 105 25
boxtype: FL_NO_BOX
@ -842,7 +842,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 35 110 25
boxtype: FL_NO_BOX
@ -860,7 +860,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 85 115 25
boxtype: FL_NO_BOX
@ -878,7 +878,7 @@ callback: C_FormBaseDeprecatedInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 205 60 115 25
boxtype: FL_NO_BOX

6
src/frontends/xforms/forms/form_texinfo.fd
View File

@ -68,7 +68,7 @@ callback:
argument:
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 350 20 30 30
boxtype: FL_NO_BOX
@ -87,7 +87,7 @@ argument: 0
value: 1
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 350 50 30 30
boxtype: FL_NO_BOX
@ -105,7 +105,7 @@ callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
class: FL_ROUND3DBUTTON
type: RADIO_BUTTON
box: 350 80 30 30
boxtype: FL_NO_BOX