From: Angus Leeming Date: Wed, 30 Jan 2002 19:09:25 +0000 (+0000) Subject: J�rgen S's changes to the citation dialog + a few tweaks of my own. X-Git-Tag: 1.6.10~19936 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b0f054d030c47426fba2d11d4e2bca639146373a;p=features.git J�rgen S's changes to the citation dialog + a few tweaks of my own. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3459 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 0573df9c13..f469551a78 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,6 +1,14 @@ -2002-01-29 Angus Leeming +2002-01-30 Angus Leeming + + * forms/form_citation: a few tweaks of my own. + +2002-01-30 Jürgen Spitzmüller - * forms/form_graphics.fd: a few tweaks of my own. + * forms/form_citation: De-Monsterization (make it smaller). + +2002-01-30 Angus Leeming + + * forms/form_graphics.fd: * FormGraphics.C: a few tweaks of my own. 2002-01-30 Jürgen Spitzmüller diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C index e1283163ef..166afb2060 100644 --- a/src/frontends/xforms/form_citation.C +++ b/src/frontends/xforms/form_citation.C @@ -22,139 +22,172 @@ FD_form_citation * FormCitation::build_citation() FL_OBJECT *obj; FD_form_citation *fdui = new FD_form_citation; - fdui->form = fl_bgn_form(FL_NO_BOX, 800, 510); + fdui->form = fl_bgn_form(FL_NO_BOX, 680, 440); fdui->form->u_vdata = this; - fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 800, 510, ""); + fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, ""); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); { char const * const dummy = N_("Inset keys|#I"); - fdui->browser_cite = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 165, 460, idex(_(dummy))); + fdui->browser_cite = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 150, 240, 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_TOP_LEFT); fl_set_object_gravity(obj, FL_NorthWest, FL_South); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Bibliography keys|#B"); - fdui->browser_bib = obj = fl_add_browser(FL_HOLD_BROWSER, 225, 30, 165, 460, idex(_(dummy))); + fdui->browser_bib = obj = fl_add_browser(FL_HOLD_BROWSER, 200, 30, 160, 240, 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_TOP_LEFT); fl_set_object_gravity(obj, FL_North, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 185, 30, 30, 30, _("@4->")); + fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 30, 30, 30, _("@4->")); fl_set_button_shortcut(obj, _("#&D"), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_del = obj = fl_add_button(FL_NORMAL_BUTTON, 185, 65, 30, 30, _("@9+")); + fdui->button_del = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 65, 30, 30, _("@9+")); fl_set_button_shortcut(obj, _("#X"), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_up = obj = fl_add_button(FL_NORMAL_BUTTON, 185, 100, 30, 30, _("@8->")); + fdui->button_up = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 100, 30, 30, _("@8->")); fl_set_button_shortcut(obj, _("#&A"), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_down = obj = fl_add_button(FL_NORMAL_BUTTON, 185, 135, 30, 30, _("@2->")); + fdui->button_down = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 135, 30, 30, _("@2->")); fl_set_button_shortcut(obj, _("#&B"), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->browser_info = obj = fl_add_browser(FL_NORMAL_BROWSER, 410, 30, 370, 90, _("Info")); + fdui->browser_info = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 290, 350, 90, _("Info")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->frame_search = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 410, 140, 370, 120, _("Search")); + fdui->frame_search = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 30, 300, 130, _("Search")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); - fdui->input_search = obj = fl_add_input(FL_NORMAL_INPUT, 430, 150, 340, 30, ""); + fdui->input_search = obj = fl_add_input(FL_NORMAL_INPUT, 380, 45, 280, 30, ""); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->button_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 430, 190, 30, 30, _("Regular Expression")); + { + char const * const dummy = N_("Regular Expression|#R"); + fdui->button_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 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); - fdui->button_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 430, 220, 30, 30, _("Case sensitive")); + { + char const * const dummy = N_("Case sensitive|#C"); + fdui->button_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 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); { char const * const dummy = N_("Previous|#P"); - fdui->button_previous = obj = fl_add_button(FL_NORMAL_BUTTON, 680, 190, 90, 30, idex(_(dummy))); + fdui->button_previous = obj = fl_add_button(FL_NORMAL_BUTTON, 570, 85, 90, 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_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Next|#N"); - fdui->button_next = obj = fl_add_button(FL_NORMAL_BUTTON, 680, 225, 90, 30, idex(_(dummy))); + fdui->button_next = obj = fl_add_button(FL_NORMAL_BUTTON, 570, 120, 90, 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_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->frame_style = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 410, 280, 370, 80, _("Citation style")); + fdui->frame_style = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 170, 300, 110, _("Citation style")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fdui->choice_style = obj = fl_add_choice(FL_NORMAL_CHOICE, 550, 290, 130, 30, ""); + { + char const * const dummy = N_("Style:|#S"); + fdui->choice_style = obj = fl_add_choice(FL_NORMAL_CHOICE, 435, 200, 170, 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_lalign(obj, FL_ALIGN_TOP); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Full author list|#F"); - fdui->button_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 530, 320, 30, 30, idex(_(dummy))); + fdui->button_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 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_LEFT); + fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Force upper case|#u"); - fdui->button_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 730, 320, 30, 30, idex(_(dummy))); + char const * const dummy = N_("Upper case|#U"); + fdui->button_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 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_LEFT); + fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 290, 300, 90, _("Optional text")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); { - char const * const dummy = N_("Text before|#T"); - fdui->input_before = obj = fl_add_input(FL_NORMAL_INPUT, 530, 375, 250, 30, idex(_(dummy))); + char const * const dummy = N_("Before:|#B"); + fdui->input_before = obj = fl_add_input(FL_NORMAL_INPUT, 460, 305, 200, 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_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Text after|#e"); - fdui->input_after = obj = fl_add_input(FL_NORMAL_INPUT, 530, 410, 250, 30, idex(_(dummy))); + char const * const dummy = N_("After:|#e"); + fdui->input_after = obj = fl_add_input(FL_NORMAL_INPUT, 460, 340, 200, 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_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { char const * const dummy = N_("Restore|#R"); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 460, 100, 30, idex(_(dummy))); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 400, 100, 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, 510, 460, 90, 30, _("OK")); + fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 360, 400, 90, 30, _("OK")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); { char const * const dummy = N_("Apply|#A"); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 605, 460, 90, 30, idex(_(dummy))); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 470, 400, 90, 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_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { char const * const dummy = N_("Cancel|^["); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 700, 460, 90, 30, idex(_(dummy))); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 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_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/forms/form_citation.fd b/src/frontends/xforms/forms/form_citation.fd index 84cb1fa679..e20d90d38b 100644 --- a/src/frontends/xforms/forms/form_citation.fd +++ b/src/frontends/xforms/forms/form_citation.fd @@ -8,19 +8,19 @@ Unit of measure: FL_COORD_PIXEL =============== FORM =============== Name: form_citation -Width: 800 -Height: 510 -Number of Objects: 24 +Width: 680 +Height: 440 +Number of Objects: 25 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 800 510 +box: 0 0 680 440 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: @@ -33,12 +33,12 @@ argument: -------------------- class: FL_BROWSER type: HOLD_BROWSER -box: 10 30 165 460 +box: 10 30 150 240 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Inset keys|#I shortcut: @@ -51,12 +51,12 @@ argument: 0 -------------------- class: FL_BROWSER type: HOLD_BROWSER -box: 225 30 165 460 +box: 200 30 160 240 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Bibliography keys|#B shortcut: @@ -69,12 +69,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 185 30 30 30 +box: 165 30 30 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: @4-> shortcut: #&D @@ -87,12 +87,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 185 65 30 30 +box: 165 65 30 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: @9+ shortcut: #X @@ -105,12 +105,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 185 100 30 30 +box: 165 100 30 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: @8-> shortcut: #&A @@ -123,12 +123,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 185 135 30 30 +box: 165 135 30 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: @2-> shortcut: #&B @@ -141,12 +141,12 @@ argument: 0 -------------------- class: FL_BROWSER type: NORMAL_BROWSER -box: 410 30 370 90 +box: 10 290 350 90 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Info shortcut: @@ -159,11 +159,11 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 410 140 370 120 +box: 370 30 300 130 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: Search @@ -177,12 +177,12 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 430 150 340 30 +box: 380 45 280 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_TOP style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: @@ -195,14 +195,14 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 430 190 30 30 +box: 385 90 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Regular Expression +label: Regular Expression|#R shortcut: resize: FL_RESIZE_ALL gravity: FL_SouthWest FL_SouthWest @@ -213,14 +213,14 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 430 220 30 30 +box: 385 120 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Case sensitive +label: Case sensitive|#C shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthWest FL_SouthWest @@ -231,12 +231,12 @@ argument: -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 680 190 90 30 +box: 570 85 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Previous|#P shortcut: @@ -249,12 +249,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 680 225 90 30 +box: 570 120 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Next|#N shortcut: @@ -267,11 +267,11 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 410 280 370 80 +box: 370 170 300 110 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: Citation style @@ -285,14 +285,14 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 550 290 130 30 +box: 435 200 170 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK -alignment: FL_ALIGN_LEFT +alignment: FL_ALIGN_TOP style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: +label: Style:|#S shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthWest FL_SouthEast @@ -303,10 +303,10 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 530 320 30 30 +box: 375 240 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW -alignment: FL_ALIGN_LEFT +alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK @@ -321,14 +321,14 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 730 320 30 30 +box: 515 240 30 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW -alignment: FL_ALIGN_LEFT +alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Force upper case|#u +label: Upper case|#U shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -336,17 +336,35 @@ name: button_force_uppercase callback: C_FormBaseInputCB argument: 0 +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 370 290 300 90 +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: Optional text +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 530 375 250 30 +box: 460 305 200 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Text before|#T +label: Before:|#B shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthWest FL_SouthEast @@ -357,14 +375,14 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 530 410 250 30 +box: 460 340 200 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Text after|#e +label: After:|#e shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthWest FL_SouthEast @@ -375,12 +393,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 400 460 100 30 +box: 10 400 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Restore|#R shortcut: @@ -393,12 +411,12 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 510 460 90 30 +box: 360 400 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: OK shortcut: ^M @@ -411,12 +429,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 605 460 90 30 +box: 470 400 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Apply|#A shortcut: @@ -429,12 +447,12 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 700 460 90 30 +box: 580 400 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Cancel|^[ shortcut: