From e8eb0d773d624b44f8e057f9a25a8d04ddcb6bda Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 24 Oct 2002 12:56:44 +0000 Subject: [PATCH] (Rob Lahaye): minor xforms nits 'n' bobs. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5498 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ControlSearch.C | 2 +- src/frontends/xforms/ChangeLog | 23 +++- src/frontends/xforms/FormLog.C | 23 ++-- src/frontends/xforms/FormMathsPanel.C | 2 +- src/frontends/xforms/FormPreamble.C | 14 ++- src/frontends/xforms/FormSearch.C | 43 +++++-- src/frontends/xforms/FormShowFile.C | 7 +- src/frontends/xforms/forms/form_browser.fd | 21 ++-- .../xforms/forms/form_maths_panel.fd | 67 +++++----- src/frontends/xforms/forms/form_preamble.fd | 26 ++-- src/frontends/xforms/forms/form_ref.fd | 32 ++--- src/frontends/xforms/forms/form_search.fd | 119 ++++++++---------- 12 files changed, 206 insertions(+), 173 deletions(-) diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C index bfc42f2364..bcfc6d293a 100644 --- a/src/frontends/controllers/ControlSearch.C +++ b/src/frontends/controllers/ControlSearch.C @@ -61,7 +61,7 @@ void ControlSearch::replace(string const & search, string const & replace, } else { string str = tostr(replace_count); str += _(" strings have been replaced."); - lv_.message(str.c_str()); + lv_.message(str); } } } diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 55e4d76f55..c0055ad37f 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -4,8 +4,27 @@ glue lengths are valid. Improve code documentation and layout. InsetGraphicsParams::scale is now a float; modify dialog to suit. - * forms/form_graphics.fd: remove text_warning widget. Reshape. - + * FormLog.C (update): more descriptive title and warning messages. + + * FormMathsPanel.C (c-tor): allow dialog to be resized. + + * FormPreamble.C (build): rearrange. + (apply): use getString, not fl_get_input. + + * FormSearch.C (build): add tooltips. + (input): use getString, not fl_get_input. + + * FormShowFile.C: more descriptive title. + + * forms/form_browser.fd: + * forms/form_preamble.fd: reshape. + + * forms/form_graphics.fd: reshape. Remove text_warning widget. + + * forms/form_maths_panel.fd: + * forms/form_ref.fd: + * forms/form_search.fd: reshape. Fix gravity. + 2002-10-24 Rob Lahaye * FormFloat.C (input): fix the radio buttongroup behaviour. diff --git a/src/frontends/xforms/FormLog.C b/src/frontends/xforms/FormLog.C index ecba38a962..14748d7d25 100644 --- a/src/frontends/xforms/FormLog.C +++ b/src/frontends/xforms/FormLog.C @@ -28,15 +28,20 @@ FormLog::FormLog() void FormLog::update() { - fl_clear_browser(dialog_->browser); + bool const buildlog = controller().logfile().first == Buffer::buildlog; - bool buildlog = (controller().logfile().first == Buffer::buildlog); + string const title = buildlog ? + _("LyX: LaTeX Log") : + _("LyX: Literate Programming Build Log"); + fl_set_form_title(dialog_->form, title.c_str()); - fl_set_form_title(dialog_->form, - buildlog ? _("Build log") : _("LaTeX Log")); - if (!fl_load_browser(dialog_->browser, - controller().logfile().second.c_str())) - fl_add_browser_line(dialog_->browser, - buildlog ? _("No build log file found") - : _("No LaTeX log file found")); + fl_clear_browser(dialog_->browser); + int const valid = fl_load_browser(dialog_->browser, + controller().logfile().second.c_str()); + if (!valid) { + string const error = buildlog ? + _("No LaTeX log file found.") : + _("No Literate Programming build log file found."); + fl_add_browser_line(dialog_->browser, error.c_str()); + } } diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C index f194a4303d..1f8e788833 100644 --- a/src/frontends/xforms/FormMathsPanel.C +++ b/src/frontends/xforms/FormMathsPanel.C @@ -68,7 +68,7 @@ using std::vector; FormMathsPanel::FormMathsPanel(LyXView & lv, Dialogs & d) - : FormBaseBD(lv, d, _("Maths Panel"), false), + : FormBaseBD(lv, d, _("Maths Panel")), active_(0), bc_(_("Close")) { deco_.reset( new FormMathsDeco( lv, d, *this)); diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C index 16c15c11cc..4502a919b2 100644 --- a/src/frontends/xforms/FormPreamble.C +++ b/src/frontends/xforms/FormPreamble.C @@ -19,6 +19,7 @@ #include "FormPreamble.h" #include "forms/form_preamble.h" #include "xforms_helpers.h" + #include FORMS_H_LOCATION typedef FormCB > base_class; @@ -32,21 +33,22 @@ void FormPreamble::build() { dialog_.reset(build_preamble(this)); - fl_set_input_return(dialog_->input_preamble, FL_RETURN_CHANGED); - - // trigger an input event when pasting using the middle mouse button. - setPrehandler(dialog_->input_preamble); - // Manage the ok, apply and cancel/close buttons bc().setOK(dialog_->button_ok); bc().setApply(dialog_->button_apply); bc().setCancel(dialog_->button_close); + + // trigger an input event for cut&paste with middle mouse button. + setPrehandler(dialog_->input_preamble); + + // for activate ok/apply immediately upon input + fl_set_input_return(dialog_->input_preamble, FL_RETURN_CHANGED); } void FormPreamble::apply() { - controller().params(fl_get_input(dialog_->input_preamble)); + controller().params(getString(dialog_->input_preamble)); } diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C index cd578cb3b2..ce055a937a 100644 --- a/src/frontends/xforms/FormSearch.C +++ b/src/frontends/xforms/FormSearch.C @@ -18,6 +18,9 @@ #include "ControlSearch.h" #include "FormSearch.h" #include "forms/form_search.h" +#include "Tooltips.h" +#include "xforms_helpers.h" + #include FORMS_H_LOCATION typedef FormCB > base_class; @@ -33,9 +36,29 @@ void FormSearch::build() // Manage the ok, apply and cancel/close buttons bc().setCancel(dialog_->button_close); + + // disable for read-only documents bc().addReadOnly(dialog_->input_replace); bc().addReadOnly(dialog_->button_replace); bc().addReadOnly(dialog_->button_replaceall); + + // set up the tooltips + string str = _("Enter the string you want to find."); + tooltips().init(dialog_->input_search, str); + str = _("Enter the replacement string."); + tooltips().init(dialog_->input_replace, str); + str = _("Continue to next search result."); + tooltips().init(dialog_->button_findnext, str); + str = _("Replace search result by replacement string."); + tooltips().init(dialog_->button_replace, str); + str = _("Replace all by replacement string."); + tooltips().init(dialog_->button_replaceall, str); + str = _("Do case sensitive search."); + tooltips().init(dialog_->check_casesensitive, str); + str = _("Search only matching words."); + tooltips().init(dialog_->check_matchword, str); + str = _("Search backwards."); + tooltips().init(dialog_->check_searchbackwards, str); } @@ -46,23 +69,19 @@ void FormSearch::update() } -ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * obj, long) +ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * ob, long) { - if (obj == dialog_->button_findnext || - obj == dialog_->button_findprev) { - bool const forward = (obj == dialog_->button_findnext); - - controller().find(fl_get_input(dialog_->input_search), + if (ob == dialog_->button_findnext) { + controller().find(getString(dialog_->input_search), fl_get_button(dialog_->check_casesensitive), fl_get_button(dialog_->check_matchword), - forward); + !fl_get_button(dialog_->check_searchbackwards)); - } else if (obj == dialog_->button_replace || - obj == dialog_->button_replaceall) { - bool const all = (obj == dialog_->button_replaceall); + } else if (ob == dialog_->button_replace || ob == dialog_->button_replaceall) { + bool const all = (ob == dialog_->button_replaceall); - controller().replace(fl_get_input(dialog_->input_search), - fl_get_input(dialog_->input_replace), + controller().replace(getString(dialog_->input_search), + getString(dialog_->input_replace), fl_get_button(dialog_->check_casesensitive), fl_get_button(dialog_->check_matchword), all); diff --git a/src/frontends/xforms/FormShowFile.C b/src/frontends/xforms/FormShowFile.C index 1633bad954..bd492978b4 100644 --- a/src/frontends/xforms/FormShowFile.C +++ b/src/frontends/xforms/FormShowFile.C @@ -23,7 +23,7 @@ FormShowFile::FormShowFile() - : FormCB(string()) + : FormCB(_("Show File")) {} @@ -31,9 +31,12 @@ void FormShowFile::update() { fl_hide_object(dialog_->button_update); fl_clear_browser(dialog_->browser); + // courier medium fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE); - fl_set_form_title(dialog_->form, controller().getFileName().c_str()); + + string const title = "LyX: " + controller().getFileName(); + fl_set_form_title(dialog_->form, title.c_str()); string const contents = controller().getFileContents(); if (contents.empty()) diff --git a/src/frontends/xforms/forms/form_browser.fd b/src/frontends/xforms/forms/form_browser.fd index 30777451c0..c866869f03 100644 --- a/src/frontends/xforms/forms/form_browser.fd +++ b/src/frontends/xforms/forms/form_browser.fd @@ -5,22 +5,23 @@ Internal Form Definition File Number of forms: 1 Unit of measure: FL_COORD_PIXEL +SnapGrid: 5 =============== FORM =============== Name: form_browser -Width: 470 -Height: 380 +Width: 395 +Height: 310 Number of Objects: 4 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 470 380 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 395 310 +boxtype: FL_FLAT_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,7 +34,7 @@ argument: -------------------- class: FL_BROWSER type: NORMAL_BROWSER -box: 10 10 450 320 +box: 5 5 385 270 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_BOTTOM @@ -51,7 +52,7 @@ argument: -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 370 340 90 30 +box: 300 280 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -59,7 +60,7 @@ style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK label: Close|^[^M -shortcut: +shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast name: button_close @@ -69,7 +70,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 270 340 90 30 +box: 205 280 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER diff --git a/src/frontends/xforms/forms/form_maths_panel.fd b/src/frontends/xforms/forms/form_maths_panel.fd index 0735f045ce..8f18940ae6 100644 --- a/src/frontends/xforms/forms/form_maths_panel.fd +++ b/src/frontends/xforms/forms/form_maths_panel.fd @@ -5,18 +5,19 @@ Internal Form Definition File Number of forms: 1 Unit of measure: FL_COORD_PIXEL +SnapGrid: 5 =============== FORM =============== Name: form_maths_panel -Width: 260 -Height: 211 +Width: 255 +Height: 200 Number of Objects: 25 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 260 211 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 255 200 +boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE @@ -33,7 +34,7 @@ argument: -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 170 170 80 30 +box: 160 170 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -42,8 +43,8 @@ size: FL_NORMAL_SIZE lcol: FL_BLACK label: Close shortcut: ^M -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity +resize: FL_RESIZE_NONE +gravity: FL_SouthEast FL_SouthEast name: button_close callback: C_FormBaseDeprecatedCancelCB argument: 0 @@ -51,17 +52,17 @@ argument: 0 -------------------- class: FL_BROWSER type: SELECT_BROWSER -box: 170 30 80 130 +box: 165 20 80 140 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_TOP style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE +size: FL_NORMAL_SIZE lcol: FL_BLACK label: Functions shortcut: resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity +gravity: FL_NoGravity FL_SouthEast name: browser_funcs callback: C_FormBaseDeprecatedInputCB argument: MM_FUNC @@ -70,7 +71,7 @@ argument: MM_FUNC -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 140 50 30 +box: 5 135 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -88,7 +89,7 @@ argument: MM_GREEK -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 80 50 30 +box: 105 75 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -106,7 +107,7 @@ argument: MM_ARROW -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 80 50 30 +box: 5 75 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -124,7 +125,7 @@ argument: MM_BOP -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 60 80 50 30 +box: 55 75 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -142,7 +143,7 @@ argument: MM_BRELATS -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 110 50 30 +box: 105 105 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -160,7 +161,7 @@ argument: MM_MISC -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 130 40 30 30 +box: 125 35 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -178,7 +179,7 @@ argument: MM_EQU -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 10 10 30 30 +box: 5 5 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -196,7 +197,7 @@ argument: MM_SQRT -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 40 10 30 30 +box: 35 5 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -214,7 +215,7 @@ argument: MM_FRAC -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 70 10 30 30 +box: 65 5 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -232,7 +233,7 @@ argument: MM_DELIM -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 100 40 30 30 +box: 95 35 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -250,7 +251,7 @@ argument: MM_MATRIX -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 100 10 30 30 +box: 95 5 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -268,7 +269,7 @@ argument: MM_DECO -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 130 10 30 30 +box: 125 5 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -286,7 +287,7 @@ argument: MM_SPACE -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 60 110 50 30 +box: 55 105 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -304,7 +305,7 @@ argument: MM_DOTS -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 110 50 30 +box: 5 105 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -322,7 +323,7 @@ argument: MM_VARSIZE -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 40 40 30 30 +box: 35 35 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -340,7 +341,7 @@ argument: MM_SUB -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 10 40 30 30 +box: 5 35 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -358,7 +359,7 @@ argument: MM_SUPER -------------------- class: FL_PIXMAPBUTTON type: NORMAL_BUTTON -box: 70 40 30 30 +box: 65 35 30 30 boxtype: FL_UP_BOX colors: FL_MCOL FL_BLUE alignment: FL_ALIGN_BOTTOM @@ -376,7 +377,7 @@ argument: MM_STYLE -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 60 140 50 30 +box: 55 135 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -394,7 +395,7 @@ argument: MM_AMS_ARROWS -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 140 50 30 +box: 105 135 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -412,7 +413,7 @@ argument: MM_AMS_BREL -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 170 50 30 +box: 5 165 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -430,7 +431,7 @@ argument: MM_AMS_NREL -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 60 170 50 30 +box: 55 165 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -448,7 +449,7 @@ argument: MM_AMS_OPS -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 170 50 30 +box: 105 165 50 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER diff --git a/src/frontends/xforms/forms/form_preamble.fd b/src/frontends/xforms/forms/form_preamble.fd index dc9b88ad36..8d02db9412 100644 --- a/src/frontends/xforms/forms/form_preamble.fd +++ b/src/frontends/xforms/forms/form_preamble.fd @@ -9,15 +9,15 @@ SnapGrid: 5 =============== FORM =============== Name: form_preamble -Width: 380 -Height: 420 +Width: 290 +Height: 325 Number of Objects: 5 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 380 420 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 290 325 +boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE @@ -33,16 +33,16 @@ argument: -------------------- class: FL_BUTTON -type: NORMAL_BUTTON -box: 50 380 100 30 +type: RETURN_BUTTON +box: 5 295 90 25 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: OK|#O -shortcut: +label: OK +shortcut: ^M resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast name: button_ok @@ -52,7 +52,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 160 380 100 30 +box: 100 295 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -70,7 +70,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 270 380 100 30 +box: 195 295 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -88,7 +88,7 @@ argument: 0 -------------------- class: FL_INPUT type: MULTILINE_INPUT -box: 10 10 360 360 +box: 5 5 280 285 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -101,7 +101,7 @@ resize: FL_RESIZE_ALL gravity: FL_NorthWest FL_SouthEast name: input_preamble callback: C_FormBaseInputCB -argument: +argument: 0 ============================== create_the_forms diff --git a/src/frontends/xforms/forms/form_ref.fd b/src/frontends/xforms/forms/form_ref.fd index 431c224eb8..3a1730b4d2 100644 --- a/src/frontends/xforms/forms/form_ref.fd +++ b/src/frontends/xforms/forms/form_ref.fd @@ -10,13 +10,13 @@ SnapGrid: 5 =============== FORM =============== Name: form_ref Width: 395 -Height: 330 +Height: 300 Number of Objects: 13 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 395 330 +box: 0 0 395 300 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -34,7 +34,7 @@ argument: -------------------- class: FL_BROWSER type: HOLD_BROWSER -box: 5 35 385 110 +box: 5 35 280 110 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_TOP @@ -52,7 +52,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 155 100 25 +box: 290 75 100 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -62,7 +62,7 @@ lcol: FL_BLACK label: Update|#U shortcut: resize: FL_RESIZE_NONE -gravity: FL_South FL_South +gravity: FL_East FL_East name: button_update callback: C_FormBaseInputCB argument: 0 @@ -70,7 +70,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 5 155 100 25 +box: 290 40 100 25 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -80,7 +80,7 @@ lcol: FL_BLACK label: Sort|#S shortcut: resize: FL_RESIZE_NONE -gravity: FL_South FL_South +gravity: FL_East FL_East name: check_sort callback: C_FormBaseInputCB argument: 0 @@ -88,7 +88,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 5 300 90 25 +box: 5 270 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -106,7 +106,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 110 300 90 25 +box: 110 270 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -124,7 +124,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 300 300 90 25 +box: 300 270 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -142,7 +142,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 205 300 90 25 +box: 205 270 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -179,7 +179,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 110 265 280 25 +box: 110 230 280 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -197,7 +197,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 110 195 280 25 +box: 110 160 280 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -215,7 +215,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 110 230 280 25 +box: 110 195 280 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -233,7 +233,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 220 155 100 25 +box: 290 115 100 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -243,7 +243,7 @@ lcol: FL_BLACK label: Go to|#G shortcut: resize: FL_RESIZE_NONE -gravity: FL_South FL_South +gravity: FL_East FL_East name: button_go callback: C_FormBaseInputCB argument: 0 diff --git a/src/frontends/xforms/forms/form_search.fd b/src/frontends/xforms/forms/form_search.fd index 8ab0b963f3..16b26d622c 100644 --- a/src/frontends/xforms/forms/form_search.fd +++ b/src/frontends/xforms/forms/form_search.fd @@ -5,18 +5,19 @@ Internal Form Definition File Number of forms: 1 Unit of measure: FL_COORD_PIXEL +SnapGrid: 5 =============== FORM =============== Name: form_search -Width: 440 -Height: 160 -Number of Objects: 11 +Width: 375 +Height: 125 +Number of Objects: 10 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 440 160 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 375 125 +boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE @@ -30,38 +31,20 @@ name: callback: argument: --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 300 10 130 80 -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_NONE -gravity: FL_NorthEast FL_NorthEast -name: -callback: -argument: - -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 110 10 180 30 +box: 110 5 165 25 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: Find|#n +label: Find|#F shortcut: resize: FL_RESIZE_X -gravity: FL_NorthWest FL_NorthEast +gravity: FL_West FL_East name: input_search callback: C_FormBaseInputCB argument: 0 @@ -69,35 +52,35 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 110 40 180 30 +box: 110 35 165 25 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: Replace with|#W +label: Replace with|#w shortcut: resize: FL_RESIZE_X -gravity: FL_NorthWest FL_NorthEast +gravity: FL_West FL_East name: input_replace callback: C_FormBaseInputCB argument: 0 -------------------- class: FL_BUTTON -type: NORMAL_BUTTON -box: 200 80 90 30 +type: RETURN_BUTTON +box: 280 5 90 25 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: Forwards >|#F^s -shortcut: +label: Find next +shortcut: ^M resize: FL_RESIZE_NONE -gravity: FL_SouthEast FL_SouthEast +gravity: FL_NorthEast FL_NorthEast name: button_findnext callback: C_FormBaseInputCB argument: 0 @@ -105,35 +88,17 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 110 80 90 30 +box: 280 35 90 25 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: < Backwards|#B^r +label: Replace|#R shortcut: resize: FL_RESIZE_NONE -gravity: FL_SouthEast FL_SouthEast -name: button_findprev -callback: C_FormBaseInputCB -argument: 0 - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 110 120 90 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: Replace|#R#r -shortcut: -resize: FL_RESIZE_NONE -gravity: FL_SouthEast FL_SouthEast +gravity: FL_East FL_East name: button_replace callback: C_FormBaseInputCB argument: 0 @@ -141,7 +106,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 350 120 80 30 +box: 280 95 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -159,17 +124,17 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 300 20 150 30 +box: 5 70 140 25 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|#s#S +label: Case sensitive|#C shortcut: resize: FL_RESIZE_NONE -gravity: FL_NorthEast FL_NorthEast +gravity: FL_West FL_NoGravity name: check_casesensitive callback: C_FormBaseInputCB argument: 0 @@ -177,17 +142,17 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 300 50 150 30 +box: 145 70 130 25 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: Match word|#M#m +label: Match word|#M shortcut: resize: FL_RESIZE_NONE -gravity: FL_NorthEast FL_NorthEast +gravity: FL_NoGravity FL_NoGravity name: check_matchword callback: C_FormBaseInputCB argument: 0 @@ -195,20 +160,38 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 200 120 90 30 +box: 280 65 90 25 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: Replace All|#A#a +label: Replace all|#a shortcut: resize: FL_RESIZE_NONE -gravity: FL_SouthEast FL_SouthEast +gravity: FL_East FL_East name: button_replaceall callback: C_FormBaseInputCB argument: 0 +-------------------- +class: FL_CHECKBUTTON +type: PUSH_BUTTON +box: 5 95 140 25 +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: Search backwards|#S +shortcut: +resize: FL_RESIZE_NONE +gravity: FL_West FL_NoGravity +name: check_searchbackwards +callback: C_FormBaseInputCB +argument: 0 + ============================== -------------------- -- 2.39.5