From a400d98de60a0c7c5d16300ac3871fc7417ea3fc Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 21 Aug 2001 13:33:25 +0000 Subject: [PATCH] Small fixes to the BibTeX form git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2567 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 9 +++++++++ src/frontends/xforms/FormBibtex.C | 8 ++++---- src/frontends/xforms/form_bibtex.C | 8 ++++++-- src/frontends/xforms/forms/form_bibtex.fd | 8 ++++---- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 2f1514cc97..37979deee8 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,12 @@ +2001-08-21 Herbert Voss + + * FormBibtex.C (input): extension handling for ".bst" + +2001-08-21 Angus Leeming + + * forms/form_bibtex.fd: activate "Ok" when the "Add bibliography to TOC" + check button is pressed. + 2001-08-20 Dekel Tsur * FormParagraph.C (general_apply): Handle default spacing. diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C index 95806be52b..f2fb0f9c8d 100644 --- a/src/frontends/xforms/FormBibtex.C +++ b/src/frontends/xforms/FormBibtex.C @@ -58,12 +58,12 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long) "Select Database", "*.bib| BibTeX Databases (*.bib)"); if (!out_name.empty()) { - if (suffixIs(out_name,".bib")) { - // to prevent names like xxxbib.bib - // latex needs it without suffix + out_name = OnlyFilename(out_name); + if (suffixIs(out_name,".bst")) { + // to prevent names like xxxbst.bst out_name = ChangeExtension(out_name,""); } - + fl_freeze_form(form()); fl_set_input(dialog_->database, out_name.c_str()); fl_unfreeze_form(form()); diff --git a/src/frontends/xforms/form_bibtex.C b/src/frontends/xforms/form_bibtex.C index 33e207e234..aa48b1b53e 100644 --- a/src/frontends/xforms/form_bibtex.C +++ b/src/frontends/xforms/form_bibtex.C @@ -61,8 +61,12 @@ FD_form_bibtex * FormBibtex::build_bibtex() fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 90, 30, 30, _("Add bibliography to TOC")); - fl_set_button_shortcut(obj, _("T"), 1); + { + char const * const dummy = N_("Add bibliography to TOC|#A"); + fdui->radio_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 90, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } + fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/forms/form_bibtex.fd b/src/frontends/xforms/forms/form_bibtex.fd index f04b2d7496..228bc433b0 100644 --- a/src/frontends/xforms/forms/form_bibtex.fd +++ b/src/frontends/xforms/forms/form_bibtex.fd @@ -149,13 +149,13 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Add bibliography to TOC -shortcut: T +label: Add bibliography to TOC|#A +shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_bibtotoc -callback: -argument: +callback: C_FormBaseInputCB +argument: 0 ============================== create_the_forms -- 2.39.5