From 06abf8895c5c13fcd69e2e600848a32fc76a09e4 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 23 Oct 2001 09:04:46 +0000 Subject: [PATCH] =?UTF-8?q?J=EF=BF=BDrgen=20Spitzm=EF=BF=BDller's=20change?= =?UTF-8?q?s=20to=20the=20paragraph=20and=20minipage=20dialogs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2917 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/FormParagraph.C | 102 +++++++++++-------- src/frontends/xforms/form_minipage.C | 3 +- src/frontends/xforms/form_paragraph.C | 55 ++++++---- src/frontends/xforms/form_paragraph.h | 2 + src/frontends/xforms/forms/form_minipage.fd | 4 +- src/frontends/xforms/forms/form_paragraph.fd | 86 +++++++++++----- 6 files changed, 159 insertions(+), 93 deletions(-) diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index b921336adc..b7875a3d95 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -30,6 +30,7 @@ #include "Spacing.h" #include "ParagraphParameters.h" #include "input_validators.h" +#include "helper_funcs.h" using Liason::setMinibuffer; using SigC::slot; @@ -119,6 +120,21 @@ void FormParagraph::build() fl_set_input_return(dialog_->input_labelwidth, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_linespacing, FL_RETURN_CHANGED); fl_set_input_filter(dialog_->input_linespacing, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_space_above, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_space_below, fl_unsigned_float_filter); + + // Create the contents of the unit choices + // Don't include the "%" terms... + std::vector units_vec = getLatexUnits(); + for (std::vector::iterator it = units_vec.begin(); + it != units_vec.end(); ++it) { + if (contains(*it, "%")) + it = units_vec.erase(it, it+1) - 1; + } + string units = getStringFromVector(units_vec, "|"); + + fl_addto_choice(dialog_->choice_value_space_above, units.c_str()); + fl_addto_choice(dialog_->choice_value_space_below, units.c_str()); // Manage the ok, apply, restore and cancel/close buttons bc_.setOK(dialog_->button_ok); @@ -196,10 +212,16 @@ void FormParagraph::apply() space_top = VSpace(VSpace::VFILL); break; case 7: + { + string const length = + getLengthFromWidgets(dialog_->input_space_above, + dialog_->choice_value_space_above); space_top = - VSpace(LyXGlueLength(fl_get_input(dialog_->input_space_above))); + VSpace(LyXGlueLength(length)); break; } + } + if (fl_get_button (dialog_->check_space_above)) space_top.setKeep (true); switch (fl_get_choice (dialog_->choice_space_below)) { @@ -359,6 +381,7 @@ void FormParagraph::update() fl_set_input (dialog_->input_space_above, ""); setEnabled(dialog_->input_space_above, false); + setEnabled(dialog_->choice_value_space_above, false); switch (par_->params().spaceTop().kind()) { case VSpace::NONE: fl_set_choice (dialog_->choice_space_above, 1); @@ -379,11 +402,16 @@ void FormParagraph::update() fl_set_choice (dialog_->choice_space_above, 6); break; case VSpace::LENGTH: - setEnabled(dialog_->input_space_above, true); - fl_set_choice (dialog_->choice_space_above, 7); - fl_set_input(dialog_->input_space_above, par_-> - params().spaceTop().length().asString().c_str()); - break; + { + setEnabled(dialog_->input_space_above, true); + setEnabled(dialog_->choice_value_space_above, true); + string const default_unit = "cm"; + string const length = par_->params().spaceTop().length().asString(); + updateWidgetsFromLengthString(dialog_->input_space_above, + dialog_->choice_value_space_above, + length, default_unit); + break; + } } fl_set_button (dialog_->check_space_above, @@ -391,6 +419,7 @@ void FormParagraph::update() fl_set_input (dialog_->input_space_below, ""); setEnabled(dialog_->input_space_below, false); + setEnabled(dialog_->choice_value_space_below, false); switch (par_->params().spaceBottom().kind()) { case VSpace::NONE: fl_set_choice (dialog_->choice_space_below, 1); @@ -411,12 +440,19 @@ void FormParagraph::update() fl_set_choice (dialog_->choice_space_below, 6); break; case VSpace::LENGTH: - setEnabled(dialog_->input_space_below, true); - fl_set_choice (dialog_->choice_space_below, 7); - fl_set_input(dialog_->input_space_below, par_-> - params().spaceBottom().length().asString().c_str()); - break; + { + setEnabled(dialog_->input_space_below, true); + setEnabled(dialog_->choice_value_space_below, true); + string const default_unit = "cm"; + string const length = + par_->params().spaceBottom().length().asString(); + updateWidgetsFromLengthString(dialog_->input_space_below, + dialog_->choice_value_space_below, + length, default_unit); + break; } + } + fl_set_button(dialog_->check_space_below, par_->params().spaceBottom().keep()); fl_set_button(dialog_->check_noindent, @@ -440,16 +476,28 @@ bool FormParagraph::input(FL_OBJECT * ob, long) if (fl_get_choice (dialog_->choice_space_above) != 7) { fl_set_input (dialog_->input_space_above, ""); setEnabled (dialog_->input_space_above, false); + setEnabled (dialog_->choice_value_space_above, false); } else { setEnabled (dialog_->input_space_above, !lv_->buffer()->isReadonly()); + setEnabled (dialog_->choice_value_space_above, !lv_->buffer()->isReadonly()); + int const default_unit = 8; + if (strip(fl_get_input(dialog_->input_space_above)).empty()) + fl_set_choice(dialog_->choice_value_space_above, + default_unit); } } if (ob == dialog_->choice_space_below) { if (fl_get_choice (dialog_->choice_space_below) != 7) { fl_set_input (dialog_->input_space_below, ""); setEnabled (dialog_->input_space_below, false); + setEnabled (dialog_->choice_value_space_below, false); } else { setEnabled (dialog_->input_space_below, !lv_->buffer()->isReadonly()); + setEnabled (dialog_->choice_value_space_below, !lv_->buffer()->isReadonly()); + int const default_unit = 8; + if (strip(fl_get_input(dialog_->input_space_below)).empty()) + fl_set_choice(dialog_->choice_value_space_below, + default_unit); } } @@ -460,38 +508,6 @@ bool FormParagraph::input(FL_OBJECT * ob, long) fl_set_input (dialog_->input_linespacing, ""); } - string input = fl_get_input (dialog_->input_space_above); - - if (fl_get_choice(dialog_->choice_space_above)==7 && - input.empty() || !isValidGlueLength(input)) - valid = false; - - if (ob == dialog_->input_space_above) { - if (!isValidGlueLength(input)) { - fl_set_object_label(dialog_->text_warning, - _("Warning: Invalid Length (valid example: 10mm)")); - fl_show_object(dialog_->text_warning); - valid = false; - } else - fl_hide_object(dialog_->text_warning); - } - - input = fl_get_input (dialog_->input_space_below); - - if (fl_get_choice(dialog_->choice_space_below)==7 && - input.empty() || !isValidGlueLength(input)) - valid = false; - - if (ob == dialog_->input_space_below) { - if (!isValidGlueLength(input)) { - fl_set_object_label(dialog_->text_warning, - _("Warning: Invalid Length (valid example: 10mm)")); - fl_show_object(dialog_->text_warning); - valid = false; - } else - fl_hide_object(dialog_->text_warning); - } - double spacing(strToDbl(fl_get_input(dialog_->input_linespacing))); if (fl_get_choice (dialog_->choice_linespacing) == 5 diff --git a/src/frontends/xforms/form_minipage.C b/src/frontends/xforms/form_minipage.C index a4cc039bba..d706c63a30 100644 --- a/src/frontends/xforms/form_minipage.C +++ b/src/frontends/xforms/form_minipage.C @@ -34,7 +34,8 @@ FD_form_minipage * FormMinipage::build_minipage() fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 30, 30, 110, 30, ""); 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_CHOICE2, 150, 30, 60, 30, ""); + fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 150, 30, 60, 30, ""); + fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->group_alignment = fl_bgn_group(); diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C index 8abf5edcd4..d234c3bec0 100644 --- a/src/frontends/xforms/form_paragraph.C +++ b/src/frontends/xforms/form_paragraph.C @@ -22,9 +22,9 @@ FD_form_paragraph * FormParagraph::build_paragraph() FL_OBJECT *obj; FD_form_paragraph *fdui = new FD_form_paragraph; - fdui->form = fl_bgn_form(FL_NO_BOX, 500, 395); + fdui->form = fl_bgn_form(FL_NO_BOX, 500, 450); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 500, 395, ""); + obj = fl_add_box(FL_UP_BOX, 0, 0, 500, 450, ""); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 220, 75, _("Alignment")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); @@ -94,105 +94,116 @@ FD_form_paragraph * FormParagraph::build_paragraph() } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 110, 350, 120, _("Vertical spaces")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 110, 480, 105, _("Vertical spaces")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("Above:|#v"); - fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 135, 100, 30, idex(_(dummy))); + fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 130, 100, 30, 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_FormBaseDeprecatedInputCB, 0); - fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 135, 90, 30, ""); + fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 190, 130, 90, 30, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Keep|#K"); - fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 135, 40, 30, idex(_(dummy))); + fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 130, 40, 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_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Below:|#w"); - fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 185, 100, 30, idex(_(dummy))); + fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 170, 100, 30, 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_FormBaseDeprecatedInputCB, 0); - fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 185, 90, 30, ""); + fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 190, 170, 90, 30, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Keep|#p"); - fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 185, 40, 30, idex(_(dummy))); + fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 170, 40, 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_FormBaseDeprecatedInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 110, 120, 120, _("Line spacing")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 230, 345, 55, _("Line spacing")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fdui->choice_linespacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 380, 135, 100, 30, ""); + { + char const * const dummy = N_("Spacing:|#S"); + fdui->choice_linespacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 245, 100, 30, 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_FormBaseDeprecatedInputCB, 0); - fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 380, 185, 100, 30, ""); + fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 190, 245, 155, 30, ""); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 245, 350, 45, _("Label Width")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 300, 480, 50, _("Label Width")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("Longest Label:|#g"); - fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 255, 230, 30, idex(_(dummy))); + fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 310, 355, 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_West, FL_East); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 245, 120, 45, _("Indent")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 365, 230, 125, 55, _("Indent")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("No Indent|#I"); - fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 255, 115, 30, idex(_(dummy))); + fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 245, 115, 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_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Restore|#R"); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 305, 90, 30, idex(_(dummy))); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 360, 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_FormBaseDeprecatedRestoreCB, 0); - fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 200, 305, 90, 30, _("OK")); + fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 200, 360, 90, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0); { char const * const dummy = N_("Apply|#A"); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 305, 90, 30, idex(_(dummy))); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 360, 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_FormBaseDeprecatedApplyCB, 0); { char const * const dummy = N_("Cancel|^["); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 305, 90, 30, idex(_(dummy))); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 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_FormBaseDeprecatedCancelCB, 0); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 340, 480, 1, ""); - fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 350, 480, 35, ""); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 395, 480, 1, ""); + fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 405, 480, 35, ""); fl_set_object_boxtype(obj, FL_NO_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); + fdui->choice_value_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 130, 65, 30, ""); + fl_set_object_boxtype(obj, FL_FRAME_BOX); + fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); + fdui->choice_value_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 170, 65, 30, ""); + fl_set_object_boxtype(obj, FL_FRAME_BOX); + fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h index 5e5dd57b00..443c54fc5c 100644 --- a/src/frontends/xforms/form_paragraph.h +++ b/src/frontends/xforms/form_paragraph.h @@ -41,6 +41,8 @@ struct FD_form_paragraph { FL_OBJECT *button_apply; FL_OBJECT *button_cancel; FL_OBJECT *text_warning; + FL_OBJECT *choice_value_space_above; + FL_OBJECT *choice_value_space_below; }; #endif /* FD_form_paragraph_h_ */ diff --git a/src/frontends/xforms/forms/form_minipage.fd b/src/frontends/xforms/forms/form_minipage.fd index c0bad20f0f..3e6b0245e9 100644 --- a/src/frontends/xforms/forms/form_minipage.fd +++ b/src/frontends/xforms/forms/form_minipage.fd @@ -86,9 +86,9 @@ argument: 0 -------------------- class: FL_CHOICE -type: NORMAL_CHOICE2 +type: NORMAL_CHOICE box: 150 30 60 30 -boxtype: FL_UP_BOX +boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index be616a5bee..463cfda10c 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -10,13 +10,13 @@ SnapGrid: 5 =============== FORM =============== Name: form_paragraph Width: 500 -Height: 395 -Number of Objects: 34 +Height: 450 +Number of Objects: 36 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 500 395 +box: 0 0 500 450 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -268,7 +268,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 110 350 120 +box: 10 110 480 105 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -286,7 +286,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 70 135 100 30 +box: 80 130 100 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -304,7 +304,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 180 135 90 30 +box: 190 130 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -322,7 +322,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 270 135 40 30 +box: 375 130 40 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -340,7 +340,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 70 185 100 30 +box: 80 170 100 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -358,7 +358,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 180 185 90 30 +box: 190 170 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -376,7 +376,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 270 185 40 30 +box: 375 170 40 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -394,7 +394,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 370 110 120 120 +box: 10 230 345 55 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -412,14 +412,14 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 380 135 100 30 +box: 80 245 100 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: +label: Spacing:|#S shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -430,7 +430,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 380 185 100 30 +box: 190 245 155 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -448,7 +448,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 10 245 350 45 +box: 10 300 480 50 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -466,7 +466,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 125 255 230 30 +box: 125 310 355 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -484,7 +484,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 370 245 120 45 +box: 365 230 125 55 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -502,7 +502,7 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 375 255 115 30 +box: 375 245 115 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -520,7 +520,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 305 90 30 +box: 10 360 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -538,7 +538,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 200 305 90 30 +box: 200 360 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -556,7 +556,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 300 305 90 30 +box: 300 360 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -574,7 +574,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 400 305 90 30 +box: 400 360 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -592,7 +592,7 @@ argument: 0 -------------------- class: FL_FRAME type: ENGRAVED_FRAME -box: 10 340 480 1 +box: 10 395 480 1 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_CENTER @@ -610,7 +610,7 @@ argument: -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 10 350 480 35 +box: 10 405 480 35 boxtype: FL_NO_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -624,6 +624,42 @@ gravity: FL_NoGravity FL_NoGravity name: text_warning callback: argument: + +-------------------- +class: FL_CHOICE +type: NORMAL_CHOICE +box: 290 130 65 30 +boxtype: FL_FRAME_BOX +colors: FL_COL1 FL_BLACK +alignment: FL_ALIGN_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: choice_value_space_above +callback: C_FormBaseDeprecatedInputCB +argument: 0 + +-------------------- +class: FL_CHOICE +type: NORMAL_CHOICE +box: 290 170 65 30 +boxtype: FL_FRAME_BOX +colors: FL_COL1 FL_BLACK +alignment: FL_ALIGN_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: choice_value_space_below +callback: C_FormBaseDeprecatedInputCB +argument: 0 ============================== create_the_forms