From e18db30e3c500dd3bf5ceecd9d91e4ed9188f69e Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 14 Feb 2002 12:31:16 +0000 Subject: [PATCH] Rob Lahaye's prettification patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3534 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 10 + src/frontends/xforms/form_graphics.C | 152 +++++----- src/frontends/xforms/forms/form_graphics.fd | 292 +++++++++----------- 3 files changed, 219 insertions(+), 235 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index f0870bc631..e003e0657f 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,13 @@ +2002-02-14 Rob Lahaye + * forms/form_graphics.fd: + * form_graphics.C: minor layout changes, such as stretching all + tab-windows to equal sizes and better keyboard-shortcuts. + +2002-02-14 Rob Lahaye + * forms/form_graphics.fd: + * form_graphics.C: minor layout changes, such as stretching all + tab-windows to equal sizes and better keyboard-shortcuts. + 2002-02-12 Herbert Voss * forms/form_graphics.fd: diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C index 78139d8f85..ca5222e954 100644 --- a/src/frontends/xforms/form_graphics.C +++ b/src/frontends/xforms/form_graphics.C @@ -78,9 +78,9 @@ FD_form_file * FormGraphics::build_file() FL_OBJECT *obj; FD_form_file *fdui = new FD_form_file; - fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245); fdui->form->u_vdata = this; - obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, ""); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); { char const * const dummy = N_("File|#F"); @@ -96,12 +96,12 @@ FD_form_file * FormGraphics::build_file() } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 50, 475, 55, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 55, 480, 60, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("Subfigure|#S"); - fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 65, 30, 30, idex(_(dummy))); + fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 70, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -109,54 +109,51 @@ FD_form_file * FormGraphics::build_file() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Title|#T"); - fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 190, 65, 280, 30, idex(_(dummy))); + fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 190, 70, 290, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 105, 475, 65, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 115, 480, 60, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { - char const * const dummy = N_("Angle|#n"); - fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 190, 125, 55, 30, idex(_(dummy))); + char const * const dummy = N_("Angle|#A"); + fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 190, 130, 55, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_text(FL_NORMAL_TEXT, 247, 125, 38, 30, _("deg")); + obj = fl_add_text(FL_NORMAL_TEXT, 245, 130, 38, 30, _("deg")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); { char const * const dummy = N_("Origin|#O"); - fdui->choice_origin = obj = fl_add_choice(FL_NORMAL_CHOICE, 350, 125, 118, 28, idex(_(dummy))); + fdui->choice_origin = obj = fl_add_choice(FL_NORMAL_CHOICE, 360, 130, 118, 28, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 170, 475, 60, _("Options")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); { - char const * const dummy = N_("draft mode|#m"); - fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 190, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Draft mode|#D"); + fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Rotate|#a"); - fdui->check_rotate = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 125, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Rotate|#R"); + fdui->check_rotate = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 130, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("don't unzip, when \nexporting to LaTeX|#u"); - fdui->button_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 320, 190, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Don't unzip, when exporting to LaTeX|#u"); + fdui->button_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -182,18 +179,18 @@ FD_form_size * FormGraphics::build_size() FL_OBJECT *obj; FD_form_size *fdui = new FD_form_size; - fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245); fdui->form->u_vdata = this; - obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, ""); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 470, 210, _("Output Size")); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 225, _("Output size")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); fdui->radio_size = fl_bgn_group(); { - char const * const dummy = N_("Original Size|#O"); - fdui->button_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 20, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Original size|#O"); + fdui->button_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -202,7 +199,7 @@ FD_form_size * FormGraphics::build_size() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Scale|#S"); - fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 75, 30, 30, idex(_(dummy))); + fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -211,7 +208,7 @@ FD_form_size * FormGraphics::build_size() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Custom|#C"); - fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 140, 30, 30, idex(_(dummy))); + fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -222,48 +219,48 @@ FD_form_size * FormGraphics::build_size() { char const * const dummy = N_("Value|#V"); - fdui->input_scale = obj = fl_add_input(FL_NORMAL_INPUT, 325, 75, 85, 30, idex(_(dummy))); + fdui->input_scale = obj = fl_add_input(FL_NORMAL_INPUT, 200, 80, 85, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); // xgettext:no-c-format - obj = fl_add_text(FL_NORMAL_TEXT, 420, 75, 25, 30, _("%")); + obj = fl_add_text(FL_NORMAL_TEXT, 285, 80, 25, 30, _("%")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); { char const * const dummy = N_("Width|#W"); - fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 325, 140, 85, 30, idex(_(dummy))); + fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 200, 130, 85, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 140, 60, 30, ""); + fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 130, 60, 30, ""); fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Height|#g"); - fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 325, 175, 85, 30, idex(_(dummy))); + char const * const dummy = N_("Height|#H"); + fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 200, 165, 85, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 175, 60, 30, ""); + fdui->choice_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 165, 60, 30, ""); fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("keep Aspect ratio|#k"); - fdui->check_aspectratio = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 175, 30, 30, idex(_(dummy))); + char const * const dummy = N_("keep Aspect ratio|#A"); + fdui->check_aspectratio = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 200, 200, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Get LyX size|#x"); - fdui->button_lyx_values = obj = fl_add_button(FL_NORMAL_BUTTON, 360, 20, 115, 30, idex(_(dummy))); + char const * const dummy = N_("Get LyX size|#L"); + fdui->button_lyx_values = obj = fl_add_button(FL_NORMAL_BUTTON, 365, 20, 115, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -288,11 +285,11 @@ FD_form_bbox * FormGraphics::build_bbox() FL_OBJECT *obj; FD_form_bbox *fdui = new FD_form_bbox; - fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245); fdui->form->u_vdata = this; - obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, ""); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 475, 205, _("Corner coordinates (X, Y)")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 180, _("Corner coordinates (X, Y)")); fl_set_object_boxtype(obj, FL_UP_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); obj = fl_add_text(FL_NORMAL_TEXT, 195, 110, 30, 25, _(", ")); @@ -327,7 +324,7 @@ FD_form_bbox * FormGraphics::build_bbox() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Units|#U"); - fdui->choice_bb_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 370, 70, 45, 30, idex(_(dummy))); + fdui->choice_bb_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 350, 70, 45, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_boxtype(obj, FL_FRAME_BOX); @@ -335,14 +332,14 @@ FD_form_bbox * FormGraphics::build_bbox() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Get values from file|#G"); - fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 45, 160, 165, 30, idex(_(dummy))); + fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 20, 150, 165, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("clip to bounding box|#b"); - fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 245, 160, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Clip to bounding box|#C"); + fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -368,14 +365,12 @@ FD_form_special * FormGraphics::build_special() FL_OBJECT *obj; FD_form_special *fdui = new FD_form_special; - fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245); fdui->form->u_vdata = this; - obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, ""); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 15, 455, 70, _("Special Options")); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); { - char const * const dummy = N_("LaTeX Options|#L"); + char const * const dummy = N_("Additional LaTeX options|#L"); fdui->input_special = obj = fl_add_input(FL_NORMAL_INPUT, 190, 40, 265, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -401,23 +396,25 @@ FD_form_lyxview * FormGraphics::build_lyxview() FL_OBJECT *obj; FD_form_lyxview *fdui = new FD_form_lyxview; - fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245); fdui->form->u_vdata = this; - obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, ""); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 475, 205, _("Screen Display")); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 155, 10, 335, 225, _("Screen size")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 145, 225, _("Screen display")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("Value|#V"); - fdui->input_lyxscale = obj = fl_add_input(FL_NORMAL_INPUT, 350, 75, 70, 30, idex(_(dummy))); + fdui->input_lyxscale = obj = fl_add_input(FL_NORMAL_INPUT, 350, 95, 70, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_bgn_group(); { - char const * const dummy = N_("Original Size|#n"); - fdui->button_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 20, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Original size|#O"); + fdui->button_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -426,7 +423,7 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Scale|#S"); - fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 75, 30, 30, idex(_(dummy))); + fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -434,8 +431,8 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Custom|#C"); - fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 130, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Custom|#u"); + fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -445,14 +442,14 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_end_group(); // xgettext:no-c-format - obj = fl_add_text(FL_NORMAL_TEXT, 430, 75, 25, 30, _("%")); + obj = fl_add_text(FL_NORMAL_TEXT, 420, 95, 25, 30, _("%")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); fdui->radio_display = fl_bgn_group(); { char const * const dummy = N_("Default|#f"); - fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 20, 30, 30, idex(_(dummy))); + fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 25, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -460,7 +457,7 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Monochrome|#M"); - fdui->radio_mono = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 70, 30, 30, idex(_(dummy))); + fdui->radio_mono = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 65, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -475,16 +472,16 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Color|#o"); - fdui->radio_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 140, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Color|#C"); + fdui->radio_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 145, 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_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Don't display|#y"); - fdui->radio_nodisplay = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 175, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Don't display|#D"); + fdui->radio_nodisplay = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 185, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -492,36 +489,31 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 150, 10, 340, 205, _("Screen Size")); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); { - char const * const dummy = N_("Width|#w"); - fdui->input_lyxwidth = obj = fl_add_input(FL_NORMAL_INPUT, 350, 130, 70, 30, idex(_(dummy))); + char const * const dummy = N_("Width|#W"); + fdui->input_lyxwidth = obj = fl_add_input(FL_NORMAL_INPUT, 350, 155, 70, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_width_lyxwidth = obj = fl_add_choice(FL_NORMAL_CHOICE, 430, 130, 50, 30, ""); + fdui->choice_width_lyxwidth = obj = fl_add_choice(FL_NORMAL_CHOICE, 425, 155, 50, 30, ""); fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Height|#h"); - fdui->input_lyxheight = obj = fl_add_input(FL_NORMAL_INPUT, 350, 170, 70, 30, idex(_(dummy))); + char const * const dummy = N_("Height|#H"); + fdui->input_lyxheight = obj = fl_add_input(FL_NORMAL_INPUT, 350, 190, 70, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_width_lyxheight = obj = fl_add_choice(FL_NORMAL_CHOICE, 430, 170, 50, 30, ""); + fdui->choice_width_lyxheight = obj = fl_add_choice(FL_NORMAL_CHOICE, 425, 190, 50, 30, ""); fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_text(FL_NORMAL_TEXT, 30, 45, 115, 25, _("(from Preferences)")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); { - char const * const dummy = N_("Get LaTeX size|#x"); - fdui->button_latex_values = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 20, 115, 30, idex(_(dummy))); + char const * const dummy = N_("Get LaTeX size|#L"); + fdui->button_latex_values = obj = fl_add_button(FL_NORMAL_BUTTON, 365, 20, 115, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd index 84e9f3878e..e32cc62a42 100644 --- a/src/frontends/xforms/forms/form_graphics.fd +++ b/src/frontends/xforms/forms/form_graphics.fd @@ -141,14 +141,14 @@ argument: 0 =============== FORM =============== Name: form_file -Width: 505 -Height: 235 -Number of Objects: 14 +Width: 500 +Height: 245 +Number of Objects: 13 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 505 235 +box: 0 0 500 245 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -202,7 +202,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 50 475 55 +box: 10 55 480 60 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -220,7 +220,7 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 15 65 30 30 +box: 15 70 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT @@ -238,7 +238,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 190 65 280 30 +box: 190 70 290 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -256,7 +256,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 105 475 65 +box: 10 115 480 60 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -274,14 +274,14 @@ argument: -------------------- class: FL_INPUT type: INT_INPUT -box: 190 125 55 30 +box: 190 130 55 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Angle|#n +label: Angle|#A shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -292,7 +292,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 247 125 38 30 +box: 245 130 38 30 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -310,7 +310,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 350 125 118 28 +box: 360 130 118 28 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -325,35 +325,17 @@ name: choice_origin callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 10 170 475 60 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_BOLD_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Options -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 15 190 30 30 +box: 15 195 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: draft mode|#m +label: Draft mode|#D shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -364,14 +346,14 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 15 125 30 30 +box: 15 130 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Rotate|#a +label: Rotate|#R shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -382,14 +364,14 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 320 190 30 30 +box: 175 195 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: don't unzip, when \nexporting to LaTeX|#u +label: Don't unzip, when exporting to LaTeX|#u shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -399,14 +381,14 @@ argument: 0 =============== FORM =============== Name: form_size -Width: 505 -Height: 235 -Number of Objects: 15 +Width: 500 +Height: 245 +Number of Objects: 16 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 505 235 +box: 0 0 500 245 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -421,17 +403,35 @@ name: callback: argument: +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 355 10 135 50 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 15 10 470 210 +box: 10 10 480 225 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT -style: FL_BOLD_STYLE +style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Output Size +label: Output size shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -442,7 +442,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 @@ -460,14 +460,14 @@ argument: -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 50 20 30 30 +box: 25 30 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Original Size|#O +label: Original size|#O shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -478,7 +478,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 50 75 30 30 +box: 25 80 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT @@ -496,7 +496,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 50 140 30 30 +box: 25 130 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT @@ -532,7 +532,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 325 75 85 30 +box: 200 80 85 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -550,7 +550,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 420 75 25 30 +box: 285 80 25 30 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -568,7 +568,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 325 140 85 30 +box: 200 130 85 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -586,7 +586,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 415 140 60 30 +box: 290 130 60 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -604,14 +604,14 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 325 175 85 30 +box: 200 165 85 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Height|#g +label: Height|#H shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -622,7 +622,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 415 175 60 30 +box: 290 165 60 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -640,14 +640,14 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 85 175 30 30 +box: 200 200 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: keep Aspect ratio|#k +label: keep Aspect ratio|#A shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -658,14 +658,14 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 360 20 115 30 +box: 365 20 115 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Get LyX size|#x +label: Get LyX size|#L shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -675,14 +675,14 @@ argument: 0 =============== FORM =============== Name: form_bbox -Width: 505 -Height: 235 +Width: 500 +Height: 245 Number of Objects: 11 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 505 235 +box: 0 0 500 245 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -700,7 +700,7 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 15 10 475 205 +box: 10 10 480 180 boxtype: FL_UP_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -826,7 +826,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 370 70 45 30 +box: 350 70 45 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -844,7 +844,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 45 160 165 30 +box: 20 150 165 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -862,14 +862,14 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 245 160 30 30 +box: 20 200 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: clip to bounding box|#b +label: Clip to bounding box|#C shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -879,14 +879,14 @@ argument: 0 =============== FORM =============== Name: form_special -Width: 505 -Height: 235 -Number of Objects: 3 +Width: 500 +Height: 245 +Number of Objects: 2 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 505 235 +box: 0 0 500 245 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -901,24 +901,6 @@ name: callback: argument: --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 15 15 455 70 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Special Options -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -------------------- class: FL_INPUT type: NORMAL_INPUT @@ -929,7 +911,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: LaTeX Options|#L +label: Additional LaTeX options|#L shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -939,14 +921,14 @@ argument: 0 =============== FORM =============== Name: form_lyxview -Width: 505 -Height: 235 +Width: 500 +Height: 245 Number of Objects: 23 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 505 235 +box: 0 0 500 245 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -964,14 +946,50 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 15 10 475 205 +box: 155 10 335 225 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT -style: FL_BOLD_STYLE +style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Screen Display +label: Screen size +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 355 10 135 50 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 10 145 225 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Screen display shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -982,7 +1000,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 350 75 70 30 +box: 350 95 70 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -1000,7 +1018,7 @@ argument: 0 -------------------- 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 @@ -1018,14 +1036,14 @@ argument: -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 255 20 30 30 +box: 255 25 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Original Size|#n +label: Original size|#O shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1036,7 +1054,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 255 75 30 30 +box: 255 90 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_LEFT @@ -1054,14 +1072,14 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 255 130 30 30 +box: 255 155 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Custom|#C +label: Custom|#u shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1090,7 +1108,7 @@ argument: -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 430 75 25 30 +box: 420 95 25 30 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -1108,7 +1126,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 @@ -1126,7 +1144,7 @@ argument: -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 20 30 30 +box: 20 25 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -1144,7 +1162,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 70 30 30 +box: 20 65 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -1180,14 +1198,14 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 140 30 30 +box: 20 145 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Color|#o +label: Color|#C shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1198,14 +1216,14 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 175 30 30 +box: 20 185 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Don't display|#y +label: Don't display|#D shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1231,35 +1249,17 @@ name: callback: argument: --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 150 10 340 205 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_BOLD_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: Screen Size -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 350 130 70 30 +box: 350 155 70 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Width|#w +label: Width|#W shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1270,7 +1270,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 430 130 50 30 +box: 425 155 50 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -1288,14 +1288,14 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 350 170 70 30 +box: 350 190 70 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Height|#h +label: Height|#H shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1306,7 +1306,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 430 170 50 30 +box: 425 190 50 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -1321,35 +1321,17 @@ name: choice_width_lyxheight callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 30 45 115 25 -boxtype: FL_FLAT_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: (from Preferences) -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 350 20 115 30 +box: 365 20 115 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Get LaTeX size|#x +label: Get LaTeX size|#L shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -- 2.39.2