From a2cb34619f366ef5dcb544b0add2b404d70d325b Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 26 Apr 2002 10:26:37 +0000 Subject: [PATCH] (Rob Lahaye): UI improvements to the preferences dialog. (Me): fix a bug in fdfixc.sed that he activated. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4075 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 13 ++ src/frontends/xforms/FormPreferences.C | 2 +- src/frontends/xforms/form_preferences.C | 80 ++++++-- src/frontends/xforms/forms/Makefile.am | 2 +- src/frontends/xforms/forms/fdfixc.sed | 4 +- .../xforms/forms/form_preferences.fd | 180 +++++++++--------- 6 files changed, 167 insertions(+), 114 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 91d518e311..b62c8c37af 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -2,6 +2,19 @@ * FormCitation.C (apply, input): ensure that the choice is always valid. + * forms/fdfixc.sed: use "_shortcut" rather than "shortcut" as an + identifier when performing one of the substitutions. "shortcut" can + reasonably appear in the label. + +2002-04-25 Rob Lahaye + + * Makefile.am: fix typo "shoul go to" -> "should go to". + + * forms/form_preferences.fd: Modify naming for Converter flags + ("Extra flags") and remove a couple of shortcut-clashes. + + * FormPreferences.C: Modify 'tooltip' info for Converter flags. + 2002-04-23 Juergen Spitzmueller * FormBibtex.C: Do not use a blank after the comma for multiple diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index dab53e40fa..99e5bf1612 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -971,7 +971,7 @@ FormPreferences::Converters::feedback(FL_OBJECT const * const ob) const } else if (ob == dialog_->input_converter) { str = _("The conversion command. $$i is the input file name, $$b is the file name without its extension and $$o is the name of the output file."); } else if (ob == dialog_->input_flags) { - str = _("Flags that control the converter behavior"); + str = _("Extra information for the Converter class, whether and how to parse the result, and various other things."); } else if (ob == dialog_->button_delete) { str = _("Remove the current converter from the list of available converters. Note: you must then \"Apply\" the change."); } else if (ob == dialog_->button_add) { diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C index 6695a1f999..e4306a90b4 100644 --- a/src/frontends/xforms/form_preferences.C +++ b/src/frontends/xforms/form_preferences.C @@ -104,19 +104,41 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts() fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, ""); - fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 145, 25, 140, 30, _("Roman")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 180, 285, 145, _("Scale & Resolution")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 285, 155, _("Fonts used")); + { + char const * const dummy = N_("Roman|#R"); + fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 145, 25, 140, 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); - fdui->input_sans = obj = fl_add_input(FL_NORMAL_INPUT, 145, 60, 140, 30, _("Sans Serif")); + { + char const * const dummy = N_("Sans Serif|#S"); + fdui->input_sans = obj = fl_add_input(FL_NORMAL_INPUT, 145, 60, 140, 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); - fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 145, 95, 140, 30, _("Typewriter")); + { + char const * const dummy = N_("Typewriter|#T"); + fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 145, 95, 140, 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); - fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 145, 130, 140, 30, _("Encoding")); + { + char const * const dummy = N_("Encoding|#E"); + fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 145, 130, 140, 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); - fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, _("Rescale bitmap fonts")); + { + char const * const dummy = N_("Rescale bitmap fonts|#b"); + fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, 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_FormBaseDeprecatedInputCB, 0); @@ -176,9 +198,7 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts() fdui->input_huger = obj = fl_add_input(FL_FLOAT_INPUT, 370, 290, 70, 30, _("huger")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 285, 155, _("Fonts used")); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 305, 15, 140, 310, _("Size")); - obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 180, 285, 145, _("Scale & Resolution")); fl_end_form(); fdui->form->fdui = fdui; @@ -203,13 +223,25 @@ FD_form_interface * FormPreferences::build_interface() fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, ""); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Popup Fonts & Encoding")); - fdui->input_popup_normal_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Normal Font")); + { + char const * const dummy = N_("Normal Font|#N"); + fdui->input_popup_normal_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 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); - fdui->input_popup_bold_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Bold Font")); + { + char const * const dummy = N_("Bold Font|#B"); + fdui->input_popup_bold_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 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); - fdui->input_popup_font_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding")); + { + char const * const dummy = N_("Popup Encoding|#P"); + fdui->input_popup_font_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 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, 15, 150, 425, 85, _("Layout & Bindings")); @@ -228,7 +260,7 @@ FD_form_interface * FormPreferences::build_interface() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { - char const * const dummy = N_("Bind file|#B"); + char const * const dummy = N_("Bind file|#f"); fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 195, 170, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -381,6 +413,7 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, ""); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 15, 255, 210, ""); { char const * const dummy = N_("Show banner|#S"); fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 30, 30, idex(_(dummy))); @@ -405,7 +438,11 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fl_set_button(obj, 1); - fdui->check_display_shrtcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 30, 30, _("Display keyboard shortcuts")); + { + char const * const dummy = N_("Display keyboard shortcuts|#k"); + fdui->check_display_shrtcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 30, 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); fl_set_button(obj, 1); @@ -418,7 +455,7 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fl_set_button(obj, 1); { - char const * const dummy = N_("Cursor follows scrollbar|#C"); + char const * const dummy = N_("Cursor follows scrollbar|#f"); fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -426,7 +463,7 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fl_set_button(obj, 1); { - char const * const dummy = N_("Dialogs iconify with main window|#D"); + char const * const dummy = N_("Dialogs iconify with main window|#i"); fdui->check_dialogs_iconify_with_main = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -482,7 +519,6 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fl_end_group(); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 275, 15, 160, 210, _("Display Graphics")); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 15, 255, 210, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 230, 420, 75, ""); fl_end_form(); @@ -594,6 +630,7 @@ FD_form_language * FormPreferences::build_language() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 10, 440, 80, ""); { char const * const dummy = N_("Package|#P"); fdui->input_package = obj = fl_add_input(FL_NORMAL_INPUT, 131, 18, 300, 30, idex(_(dummy))); @@ -707,7 +744,6 @@ FD_form_language * FormPreferences::build_language() obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 175, 440, 60, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 240, 440, 80, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 95, 440, 75, ""); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 10, 440, 80, ""); fl_end_form(); fdui->form->fdui = fdui; @@ -732,7 +768,7 @@ FD_form_formats * FormPreferences::build_formats() fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); { - char const * const dummy = N_("All formats|#A"); + char const * const dummy = N_("All formats|#l"); fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -812,7 +848,7 @@ FD_form_converters * FormPreferences::build_converters() fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); { - char const * const dummy = N_("All converters|#A"); + char const * const dummy = N_("All converters|#l"); fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -841,7 +877,7 @@ FD_form_converters * FormPreferences::build_converters() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { - char const * const dummy = N_("Flags|#F"); + char const * const dummy = N_("Extra flags|#E"); fdui->input_flags = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } @@ -1149,7 +1185,11 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc() } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - fdui->input_paperoption = obj = fl_add_input(FL_NORMAL_INPUT, 145, 285, 285, 30, _("DVI paper option")); + { + char const * const dummy = N_("DVI paper option|#D"); + fdui->input_paperoption = obj = fl_add_input(FL_NORMAL_INPUT, 145, 285, 285, 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_frame(FL_ENGRAVED_FRAME, 10, 10, 435, 165, ""); diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 7d05df53d7..07db02d288 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = $(SRCS) form_document.C.patch form_ert.C.patch form_filedialog.C.pa updatesrc: @echo Note: @echo To update the C files generated from XForms fd files - @echo You shoul go to the source dir and do a + @echo You should go to the source dir and do a @echo make -f makefile.old updatesrc SRCS = form_aboutlyx.fd \ diff --git a/src/frontends/xforms/forms/fdfixc.sed b/src/frontends/xforms/forms/fdfixc.sed index 55c86448b5..7b2e21c9df 100644 --- a/src/frontends/xforms/forms/fdfixc.sed +++ b/src/frontends/xforms/forms/fdfixc.sed @@ -41,9 +41,9 @@ s/#include \"forms\.h\"/#include FORMS_H_LOCATION/ # "fl_add_bmtable" /bmtable/ s/fl_add_button/fl_add_bmtable/ -# For all lines containing "shortcut" and a string containing |, +# For all lines containing "_shortcut" and a string containing |, # replace the string with scex(_(string)) -/shortcut/ s/".*[|].*"/scex(_(&))/ +/_shortcut/ s/".*[|].*"/scex(_(&))/ # gettext will get confused if the string contains a "%" unless the line is # preceeded immediately by // xgettext:no-c-format diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd index b0dde302a9..ade092419b 100644 --- a/src/frontends/xforms/forms/form_preferences.fd +++ b/src/frontends/xforms/forms/form_preferences.fd @@ -223,6 +223,42 @@ name: callback: argument: +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 180 285 145 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Scale & Resolution +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 15 285 155 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Fonts used +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + -------------------- class: FL_INPUT type: NORMAL_INPUT @@ -233,7 +269,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Roman +label: Roman|#R shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -251,7 +287,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Sans Serif +label: Sans Serif|#S shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -269,7 +305,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Typewriter +label: Typewriter|#T shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -287,7 +323,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Encoding +label: Encoding|#E shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -305,7 +341,7 @@ alignment: FL_ALIGN_RIGHT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Rescale bitmap fonts +label: Rescale bitmap fonts|#b shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -538,24 +574,6 @@ name: input_huger callback: C_FormBaseDeprecatedInputCB argument: 0 --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 10 15 285 155 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: Fonts used -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME @@ -574,24 +592,6 @@ name: callback: argument: --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 10 180 285 145 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: Scale & Resolution -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - =============== FORM =============== Name: form_interface Width: 450 @@ -644,7 +644,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Normal Font +label: Normal Font|#N shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -662,7 +662,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Bold Font +label: Bold Font|#B shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -680,7 +680,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Popup Encoding +label: Popup Encoding|#P shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -752,7 +752,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Bind file|#B +label: Bind file|#f shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -984,7 +984,7 @@ label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: +name: callback: argument: @@ -1121,6 +1121,24 @@ name: callback: argument: +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 15 15 255 210 +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_CHECKBUTTON type: PUSH_BUTTON @@ -1188,7 +1206,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Display keyboard shortcuts +label: Display keyboard shortcuts|#k shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1226,7 +1244,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cursor follows scrollbar|#C +label: Cursor follows scrollbar|#f shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1245,7 +1263,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Dialogs iconify with main window|#D +label: Dialogs iconify with main window|#i shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1312,7 +1330,7 @@ label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: +name: callback: argument: @@ -1425,24 +1443,6 @@ name: callback: argument: --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 15 15 255 210 -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_FRAME type: ENGRAVED_FRAME @@ -1743,6 +1743,24 @@ name: callback: argument: +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 5 10 440 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_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + -------------------- class: FL_INPUT type: NORMAL_INPUT @@ -2067,24 +2085,6 @@ name: callback: argument: --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 5 10 440 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_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - =============== FORM =============== Name: form_formats Width: 450 @@ -2119,7 +2119,7 @@ alignment: FL_ALIGN_TOP style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: All formats|#A +label: All formats|#l shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -2287,7 +2287,7 @@ alignment: FL_ALIGN_TOP style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: All converters|#A +label: All converters|#l shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -2359,7 +2359,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Flags|#F +label: Extra flags|#E shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -3294,7 +3294,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: DVI paper option +label: DVI paper option|#D shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -- 2.39.2