The branch, biblatex2, has been updated. - Log -----------------------------------------------------------------
commit 7f97ace83b723b5176aaa70518bdec07fb8e4357 Merge: 90e2004 6b21480 Author: Juergen Spitzmueller <[email protected]> Date: Fri Jan 13 09:11:04 2017 +0100 Merge branch 'master' into biblatex2 commit 6b214804f6294f77b451b16c9860585e923c906b Author: Juergen Spitzmueller <[email protected]> Date: Fri Jan 13 09:07:44 2017 +0100 Assure long tooltip is correctly formatted. Amendment to ffb195b5e9fa diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index 8c35ced..e232d2c 100644 --- a/src/frontends/qt4/GuiBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -107,6 +107,10 @@ GuiBibtex::GuiBibtex(GuiView & lv) connect(add_->closePB, SIGNAL(clicked()), add_, SLOT(reject())); + add_->bibLW->setToolTip(formatToolTip(qt_("This list consists of all databases that are indexed by LaTeX and thus are found without a file path. " + "This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. " + "If you want to reuse your own database, this is the place you should store it."))); + bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setOK(okPB); bc().setCancel(closePB); diff --git a/src/frontends/qt4/ui/BibtexAddUi.ui b/src/frontends/qt4/ui/BibtexAddUi.ui index e8ee451..e3fe11a 100644 --- a/src/frontends/qt4/ui/BibtexAddUi.ui +++ b/src/frontends/qt4/ui/BibtexAddUi.ui @@ -38,7 +38,7 @@ <item row="1" column="0" colspan="2"> <widget class="QListWidget" name="bibLW"> <property name="toolTip"> - <string>This list consists of all databases that are indexed by LaTeX and thus are found without a file path. This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. If you want to reuse your own database, this is the place you should store it.</string> + <string/> </property> <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> commit 119dfcb1510b28be2330e3391ae91bb58d1438b2 Author: Richard Heck <[email protected]> Date: Thu Jan 12 10:31:58 2017 -0500 Add Martin Brown to credits. diff --git a/lib/CREDITS b/lib/CREDITS index 6fb3834..9922a58 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -67,6 +67,9 @@ @bAlfredo Braunstein @iE-mail: abraunst () lyx ! org A (pseudo) threaded graphics loader queue, lots of fixes, etc. +@bMartin A. Brown +@iE-mail: martin () linux-ip ! net + Docbook fixes @bChristian Buescher @iE-mail: christian.buescher () uni-bielefeld ! de User-definable keys, lyxserver and more diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 1eb4097..4fce7c1 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -511,6 +511,14 @@ contributors = [ "24 February 2005", u"A (pseudo) threaded graphics loader queue, lots of fixes, etc."), + contributor(u"Martin A. Brown", + "martin () linux-ip ! net", + "GPL", + "Re: public identifier for DocBook XML export", + "m=148391461928571", + "8 January 2017", + u"Docbook fixes"), + contributor(u"Christian Buescher", "christian.buescher () uni-bielefeld ! de", "", ----------------------------------------------------------------------- Summary of changes: lib/CREDITS | 3 +++ lib/generate_contributions.py | 8 ++++++++ src/frontends/qt4/GuiBibtex.cpp | 4 ++++ src/frontends/qt4/ui/BibtexAddUi.ui | 2 +- 4 files changed, 16 insertions(+), 1 deletions(-) hooks/post-receive -- Repository for new features
