From: Jean-Marc Lasgouttes Date: Fri, 14 Feb 2003 17:23:50 +0000 (+0000) Subject: more bib stuff from Juergen X-Git-Tag: 1.6.10~17515 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d993c534e92a1f955cc50801c85a12134bf1b3a7;p=features.git more bib stuff from Juergen git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6158 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/ChangeLog b/lib/ChangeLog index b9cbc0ae20..62bc8bcbe3 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-02-14 Juergen Spitzmueller + + * scripts/TeXFiles.sh: Add search for *.bib-files (>bibFiles.lst) + changed version to 0.3. + 2003-02-11 Jean-Marc Lasgouttes * templates/elsart.lyx: diff --git a/lib/scripts/TeXFiles.sh b/lib/scripts/TeXFiles.sh index 976c8749ac..0572e3c3e1 100755 --- a/lib/scripts/TeXFiles.sh +++ b/lib/scripts/TeXFiles.sh @@ -4,27 +4,31 @@ # TeX class files -> option cls # TeX style files -> option sty # bibtex style files -> option bst +# bibtex database files -> option bib # # with the help # of kpsewhich and creates a -# bstFiles.lst, clsFiles.lst, styFiles.lst +# bstFiles.lst, clsFiles.lst, styFiles.lst, bibFiles.lst # without any parameter all files are created. # # Herbert Voss # # Updates from Jean-Marc Lasgouttes. # +# bib support added by Juergen Spitzmueller (v0.3) +# CLS_STYLEFILE=clsFiles.lst STY_STYLEFILE=styFiles.lst BST_STYLEFILE=bstFiles.lst -version='$Id: TeXFiles.sh,v 0.2 2001-10-15' +BIB_FILES=bibFiles.lst +version='$Id: TeXFiles.sh,v 0.3 2003-02-14' progname=`echo $0 | sed 's%.*/%%'` -usage="Usage: TeXFiles.sh [-version | cls | sty | bst] +usage="Usage: TeXFiles.sh [-version | cls | sty | bst | bib ] Default is without any Parameters, so that all files will be created" types=$1 -test -z "$types" && types="cls sty bst" +test -z "$types" && types="cls sty bst bib" # # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use ';' to separate @@ -59,6 +63,8 @@ for type in $types ; do kpsetype=.tex;; bst) outfile=$BST_STYLEFILE kpsetype=.bst;; + bib) outfile=$BIB_FILES + kpsetype=.bib;; *) echo "ERROR: unknown type $type" exit 1;; esac diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 0325a69eed..4a6e9ca0e3 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,4 +1,7 @@ -2003-02-09 Juergen Spitzmueller +2003-02-14 Juergen Spitzmueller + + * ControlBibtex.[Ch]: new function getBibFiles() (provides list + of available *.bib-files from bibFiles.lst). * tex_helpers.C (getTexFileList): sort and dis-duplicate listWithoutPath correctly. diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C index b4fea638a2..4fb819857e 100644 --- a/src/frontends/controllers/ControlBibtex.C +++ b/src/frontends/controllers/ControlBibtex.C @@ -76,6 +76,18 @@ string const ControlBibtex::getBibStyles() const } +string const ControlBibtex::getBibFiles() const +{ + string list = getTexFileList("bibFiles.lst", false); + // test, if we have a valid list, otherwise run rescan + if (list.empty()) { + rescanBibStyles(); + list = getTexFileList("bibFiles.lst", false); + } + return list; +} + + void ControlBibtex::rescanBibStyles() const { rescanTexStyles(); diff --git a/src/frontends/controllers/ControlBibtex.h b/src/frontends/controllers/ControlBibtex.h index 4811dcd6df..aee1e5b251 100644 --- a/src/frontends/controllers/ControlBibtex.h +++ b/src/frontends/controllers/ControlBibtex.h @@ -26,7 +26,9 @@ public: string const Browse(string const &, string const &, string const &); /// get the list of bst files string const getBibStyles() const; - /// build filelists of all availabe bst/cls/sty-files. done through + /// get the list of bib files + string const getBibFiles() const; + /// build filelists of all availabe bib/bst/cls/sty-files. done through /// kpsewhich and an external script, saved in *Files.lst void rescanBibStyles() const; private: diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index cc3cd688e5..8c867c808d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -9,7 +9,10 @@ * QBibtexDialog.C: Fix browsing mechanism of *.sty files (bug 773). * ui/QBibtexDialogBase.ui: Remove unused Update button (bug 773). + Replace addBib LineEdit with ComboBox. + * QBibtex.C: Insert available .bib-files into addBibCB. + 2003-02-13 John Levon * ui/QSpellcheckerDialogBase.ui: A&dd not &Add, bug 884 diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 3dc5cae1ac..7fe9119411 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -71,6 +71,18 @@ void QBibtex::update_contents() if (!bib.empty()) dialog_->databaseLB->insertItem(toqstr(bib)); } + + dialog_->addBibCB->clear(); + + vector const bib_str = getVectorFromString( + controller().getBibFiles(), "\n"); + for (vector::const_iterator it = bib_str.begin(); + it != bib_str.end(); ++it) { + string bibItem(ChangeExtension(*it, "")); + dialog_->addBibCB->insertItem(toqstr(bibItem)); + } + dialog_->addBibCB->clearEdit(); + string bibtotoc = "bibtotoc"; string bibstyle(controller().params().getOptions()); diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 260ca756fc..b21cda2895 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -60,7 +60,7 @@ void QBibtexDialog::browsePressed() if (!file.isNull()) { string const filen = ChangeExtension(fromqstr(file), ""); bool present = false; - int pres = 0; + unsigned int pres = 0; for (unsigned int i = 0; i != styleCB->count(); i++) { if (fromqstr(styleCB->text(i)) == filen) { @@ -100,7 +100,7 @@ void QBibtexDialog::browseBibPressed() void QBibtexDialog::addPressed() { - QString const file = addBibED->text(); + QString const file = addBibCB->currentText(); if (!file.isNull()) { string const f = ChangeExtension(file.latin1(), ""); bool present = false; diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui index 9ab985fdf1..d3609c9336 100644 --- a/src/frontends/qt2/ui/QBibtexDialogBase.ui +++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui @@ -13,7 +13,7 @@ 0 0 - 281 + 265 315 @@ -72,7 +72,7 @@ toolTip - Available BibTeX databases + Selected BibTeX databases @@ -90,17 +90,6 @@ Add a BibTeX database file - - QLineEdit - - name - addBibED - - - toolTip - Add a BibTeX file manually - - QPushButton @@ -156,25 +145,6 @@ - - QComboBox - - name - styleCB - - - editable - true - - - autoCompletion - true - - - duplicatesEnabled - false - - QLabel @@ -213,7 +183,7 @@ Choose a style file - + QLayoutWidget name @@ -277,7 +247,7 @@ - + QCheckBox name @@ -292,6 +262,52 @@ Add bibliography to the table of contents + + QComboBox + + name + styleCB + + + editable + true + + + autoCompletion + true + + + duplicatesEnabled + false + + + toolTip + Chose a style file + + + + QComboBox + + name + addBibCB + + + editable + true + + + autoCompletion + true + + + duplicatesEnabled + false + + + toolTip + Select a database + +