From 956b1497fb664d32036deccefc3bdd2c2d2825a3 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 13 Feb 2002 18:07:43 +0000 Subject: [PATCH] Herberts graphics10.diff, part II. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3532 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 9 ++ src/frontends/xforms/FormGraphics.C | 49 +++--- src/frontends/xforms/form_graphics.C | 49 +++--- src/frontends/xforms/form_graphics.h | 3 +- src/frontends/xforms/forms/form_graphics.fd | 166 +++++--------------- 5 files changed, 99 insertions(+), 177 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 68ecb8b387..f0870bc631 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,12 @@ +2002-02-12 Herbert Voss + + * forms/form_graphics.fd: + * form_graphics.[Ch]: small changes to the layout, mentioned + by Rob + + * FormGraphics.C: fix bug with use of updateWidget... when + no unit is given. + 2002-02-11 John Levon * FormMinipage.C: return SMI_VALID on other form changes diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index ad18b19ce2..bd961ae2a5 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -96,7 +96,6 @@ void FormGraphics::build() bc().addReadOnly(file_->button_browse); bc().addReadOnly(file_->check_subcaption); bc().addReadOnly(file_->check_rotate); - bc().addReadOnly(file_->button_clip); bc().addReadOnly(file_->button_draft); bc().addReadOnly(file_->button_nounzip); @@ -147,6 +146,7 @@ void FormGraphics::build() string const bb_units = "pt|cm|in"; fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str()); bc().addReadOnly(bbox_->button_getBB); + bc().addReadOnly(bbox_->button_clip); // the rotate section special_.reset(build_special()); @@ -186,7 +186,6 @@ void FormGraphics::apply() else igp.rotateOrigin = string(); igp.draft = fl_get_button(file_->button_draft); - igp.clip = fl_get_button(file_->button_clip); igp.noUnzip = fl_get_button(file_->button_nounzip); // the lyxview section @@ -254,6 +253,7 @@ void FormGraphics::apply() bbox_->choice_bb_units)+" "); igp.bb = bb; } + igp.clip = fl_get_button(bbox_->button_clip); // the special section igp.special = getStringFromInput(special_->input_special); @@ -284,7 +284,6 @@ void FormGraphics::update() { setEnabled(file_->choice_origin, fl_get_button(file_->check_rotate)); fl_set_button(file_->button_draft, igp.draft); - fl_set_button(file_->button_clip, igp.clip); fl_set_button(file_->button_nounzip, igp.noUnzip); // the lyxview section @@ -384,12 +383,11 @@ void FormGraphics::update() { // the bb section // set the bounding box values, if exists. First we need the whole // path, because the controller knows nothing about the doc-dir - lyxerr << "GraphicsUpdate::BoundingBox = " << igp.bb << "\n"; controller().bbChanged = false; if (igp.bb.empty()) { - string const fileWithAbsPath = MakeAbsPath(igp.filename, OnlyPath(igp.filename)); - string bb = controller().readBB(fileWithAbsPath); - lyxerr << "file::BoundingBox = " << bb << "\n"; + string const fileWithAbsPath = + MakeAbsPath(igp.filename, OnlyPath(igp.filename)); + string const bb = controller().readBB(fileWithAbsPath); if (!bb.empty()) { // get the values from the file // in this case we always have the point-unit @@ -397,7 +395,14 @@ void FormGraphics::update() { fl_set_input(bbox_->input_bb_y0, token(bb,' ',1).c_str()); fl_set_input(bbox_->input_bb_x1, token(bb,' ',2).c_str()); fl_set_input(bbox_->input_bb_y1, token(bb,' ',3).c_str()); + } else { // no bb from file + fl_set_input(bbox_->input_bb_x0, bb.c_str()); + fl_set_input(bbox_->input_bb_y0, bb.c_str()); + fl_set_input(bbox_->input_bb_x1, bb.c_str()); + fl_set_input(bbox_->input_bb_y1, bb.c_str()); } + string const unit("pt"); + fl_set_choice_text(bbox_->choice_bb_units, unit.c_str()); } else { // get the values from the inset controller().bbChanged = true; LyXLength anyLength; @@ -414,6 +419,7 @@ void FormGraphics::update() { updateWidgetsFromLength(bbox_->input_bb_y1, bbox_->choice_bb_units,anyLength,"pt"); } + fl_set_button(bbox_->button_clip, igp.clip); // the special section fl_set_input(special_->input_special, igp.special.c_str()); @@ -479,7 +485,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long) size_->choice_width_units)); updateWidgetsFromLength(lyxview_->input_lyxheight, lyxview_->choice_width_lyxheight, dummy, defaultUnit); - string const scale = fl_get_input(size_->input_scale); + string const scale = getStringFromInput(size_->input_scale); fl_set_input(lyxview_->input_lyxscale, scale.c_str()); // the bb section @@ -493,22 +499,21 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long) if (!filename.empty()) { string const fileWithAbsPath = MakeAbsPath(filename, OnlyPath(filename)); string bb = controller().readBB(fileWithAbsPath); - lyxerr << "getBB::BoundingBox = " << bb << "\n"; if (!bb.empty()) { - updateWidgetsFromLengthString(bbox_->input_bb_x0, - bbox_->choice_bb_units, - token(bb,' ',0), "pt"); - updateWidgetsFromLengthString(bbox_->input_bb_y0, - bbox_->choice_bb_units, - token(bb,' ',1), "pt"); - updateWidgetsFromLengthString(bbox_->input_bb_x1, - bbox_->choice_bb_units, - token(bb,' ',2), "pt"); - updateWidgetsFromLengthString(bbox_->input_bb_y1, - bbox_->choice_bb_units, - token(bb,' ',3), "pt"); + fl_set_input(bbox_->input_bb_x0, token(bb,' ',0).c_str()); + fl_set_input(bbox_->input_bb_y0, token(bb,' ',1).c_str()); + fl_set_input(bbox_->input_bb_x1, token(bb,' ',2).c_str()); + fl_set_input(bbox_->input_bb_y1, token(bb,' ',3).c_str()); + string const unit("pt"); + fl_set_choice_text(bbox_->choice_bb_units, unit.c_str()); } controller().bbChanged = false; + } else { + fl_set_input(bbox_->input_bb_x0, ""); + fl_set_input(bbox_->input_bb_y0, ""); + fl_set_input(bbox_->input_bb_x1, ""); + fl_set_input(bbox_->input_bb_y1, ""); + fl_set_choice_text(bbox_->choice_bb_units, "pt"); } // the size section @@ -542,7 +547,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long) lyxview_->choice_width_lyxheight)); updateWidgetsFromLength(size_->input_height, size_->choice_height_units, dummy, defaultUnit); - string const scale = fl_get_input(lyxview_->input_lyxscale); + string const scale = getStringFromInput(lyxview_->input_lyxscale); fl_set_input(size_->input_scale, scale.c_str()); } diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C index c3c0248ce7..78139d8f85 100644 --- a/src/frontends/xforms/form_graphics.C +++ b/src/frontends/xforms/form_graphics.C @@ -27,35 +27,37 @@ FD_form_graphics * FormGraphics::build_graphics() obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 360, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder")); + fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_ALL); { char const * const dummy = N_("Restore|#R"); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 320, 80, 30, idex(_(dummy))); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 310, 80, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); - fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 225, 320, 90, 30, _("Ok")); + fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 225, 310, 90, 30, _("Ok")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseOKCB, 0); { char const * const dummy = N_("Cancel|^["); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 320, 90, 30, idex(_(dummy))); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 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_FormBaseCancelCB, 0); { char const * const dummy = N_("Apply|#A"); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 320, 90, 30, idex(_(dummy))); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 310, 90, 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_FormBaseApplyCB, 0); - fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 15, 275, 485, 35, ""); + fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 280, 495, 25, ""); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); fdui->form->fdui = fdui; @@ -112,7 +114,7 @@ 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, 110, 475, 60, ""); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 105, 475, 65, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { @@ -133,17 +135,9 @@ FD_form_file * FormGraphics::build_file() 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, 180, 475, 50, _("Options")); + 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_("clip to bounding box|#b"); - fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 190, 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_("draft mode|#m"); fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 190, 30, 30, idex(_(dummy))); @@ -162,7 +156,7 @@ FD_form_file * FormGraphics::build_file() 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, 315, 190, 30, 30, idex(_(dummy))); + fdui->button_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 320, 190, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -267,7 +261,6 @@ FD_form_size * FormGraphics::build_size() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 60, 470, 65, ""); { 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))); @@ -275,7 +268,6 @@ FD_form_size * FormGraphics::build_size() } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 340, 10, 5, 50, ""); fl_end_form(); fdui->form->fdui = fdui; @@ -343,10 +335,18 @@ 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, 110, 160, 165, 30, idex(_(dummy))); + fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 45, 160, 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))); 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); fl_end_form(); @@ -448,7 +448,6 @@ FD_form_lyxview * FormGraphics::build_lyxview() obj = fl_add_text(FL_NORMAL_TEXT, 430, 75, 25, 30, _("%")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 150, 60, 340, 55, ""); fdui->radio_display = fl_bgn_group(); { @@ -469,7 +468,7 @@ FD_form_lyxview * FormGraphics::build_lyxview() fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Grayscale|#G"); - fdui->radio_gray = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 100, 30, 30, idex(_(dummy))); + fdui->radio_gray = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 105, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -477,7 +476,7 @@ FD_form_lyxview * FormGraphics::build_lyxview() 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, 130, 30, 30, idex(_(dummy))); + fdui->radio_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 140, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -485,7 +484,7 @@ FD_form_lyxview * FormGraphics::build_lyxview() 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, 160, 30, 30, idex(_(dummy))); + fdui->radio_nodisplay = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 175, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_color(obj, FL_COL1, FL_YELLOW); @@ -493,7 +492,7 @@ 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, 50, _("Screen Size")); + 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"); @@ -517,7 +516,6 @@ FD_form_lyxview * FormGraphics::build_lyxview() 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_frame(FL_ENGRAVED_FRAME, 150, 115, 340, 100, ""); 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); @@ -528,7 +526,6 @@ FD_form_lyxview * FormGraphics::build_lyxview() } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 320, 10, 5, 50, ""); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h index cca00507e8..56c834affb 100644 --- a/src/frontends/xforms/form_graphics.h +++ b/src/frontends/xforms/form_graphics.h @@ -9,6 +9,7 @@ extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long); extern "C" void C_FormBaseOKCB(FL_OBJECT *, long); extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long); extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long); +extern "C" void C_FormBaseInputCB(FL_OBJECT *, long); extern "C" void C_FormBaseInputCB(FL_OBJECT *, long); @@ -43,7 +44,6 @@ struct FD_form_file { FL_OBJECT *input_subcaption; FL_OBJECT *input_rotate_angle; FL_OBJECT *choice_origin; - FL_OBJECT *button_clip; FL_OBJECT *button_draft; FL_OBJECT *check_rotate; FL_OBJECT *button_nounzip; @@ -74,6 +74,7 @@ struct FD_form_bbox { FL_OBJECT *input_bb_y0; FL_OBJECT *choice_bb_units; FL_OBJECT *button_getBB; + FL_OBJECT *button_clip; }; struct FD_form_special { ~FD_form_special(); diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd index a678e741a2..84e9f3878e 100644 --- a/src/frontends/xforms/forms/form_graphics.fd +++ b/src/frontends/xforms/forms/form_graphics.fd @@ -35,7 +35,7 @@ argument: class: FL_TABFOLDER type: TOP_TABFOLDER box: 5 5 500 270 -boxtype: FL_UP_BOX +boxtype: FL_FRAME_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE @@ -52,7 +52,7 @@ argument: -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 5 320 80 30 +box: 5 310 80 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -70,7 +70,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 225 320 90 30 +box: 225 310 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -88,7 +88,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 415 320 90 30 +box: 415 310 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -106,7 +106,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 320 320 90 30 +box: 320 310 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -124,7 +124,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 15 275 485 35 +box: 5 280 495 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -136,14 +136,14 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: text_warning -callback: -argument: +callback: C_FormBaseInputCB +argument: 0 =============== FORM =============== Name: form_file Width: 505 Height: 235 -Number of Objects: 15 +Number of Objects: 14 -------------------- class: FL_BOX @@ -256,7 +256,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 110 475 60 +box: 10 105 475 65 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -328,7 +328,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 180 475 50 +box: 10 170 475 60 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -343,24 +343,6 @@ name: callback: argument: --------------------- -class: FL_CHECKBUTTON -type: PUSH_BUTTON -box: 140 190 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 -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: button_clip -callback: C_FormBaseInputCB -argument: 0 - -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON @@ -400,7 +382,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 315 190 30 30 +box: 320 190 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_RIGHT @@ -419,7 +401,7 @@ argument: 0 Name: form_size Width: 505 Height: 235 -Number of Objects: 17 +Number of Objects: 15 -------------------- class: FL_BOX @@ -673,24 +655,6 @@ name: check_aspectratio callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 15 60 470 65 -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_BUTTON type: NORMAL_BUTTON @@ -709,29 +673,11 @@ name: button_lyx_values callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 340 10 5 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: - =============== FORM =============== Name: form_bbox Width: 505 Height: 235 -Number of Objects: 10 +Number of Objects: 11 -------------------- class: FL_BOX @@ -898,7 +844,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 160 165 30 +box: 45 160 165 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -913,6 +859,24 @@ name: button_getBB callback: C_FormBaseInputCB argument: 0 +-------------------- +class: FL_CHECKBUTTON +type: PUSH_BUTTON +box: 245 160 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 +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: button_clip +callback: C_FormBaseInputCB +argument: 0 + =============== FORM =============== Name: form_special Width: 505 @@ -977,7 +941,7 @@ argument: 0 Name: form_lyxview Width: 505 Height: 235 -Number of Objects: 26 +Number of Objects: 23 -------------------- class: FL_BOX @@ -1141,24 +1105,6 @@ name: callback: argument: --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 150 60 340 55 -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_BEGIN_GROUP type: 0 @@ -1216,7 +1162,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 100 30 30 +box: 20 105 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -1234,7 +1180,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 130 30 30 +box: 20 140 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -1252,7 +1198,7 @@ argument: 0 -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 20 160 30 30 +box: 20 175 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -1288,7 +1234,7 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 150 10 340 50 +box: 150 10 340 205 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -1375,24 +1321,6 @@ name: choice_width_lyxheight callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 150 115 340 100 -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_TEXT type: NORMAL_TEXT @@ -1429,23 +1357,5 @@ name: button_latex_values callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 320 10 5 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: - ============================== -------------------- -- 2.39.2