anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Herbert's bibtex fixes plus some more of mine

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5621 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-11-13 01:34:29 +00:00
parent eca7848597
commit 6c81bd2680
3 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,15 @@
2002-11-13 John Levon <levon@movementarian.org>
* ui/QBibtexDialog.ui: add some change_adaptors()
* QBibtex.C: fix duplicate entries in style CB, and
alphasort it again, but still allow empty/user-defined
style
2002-11-12 Herbert Voss <voss@perce.de>
* QBibtex.[Ch]: fix bugs in the apply-part
2002-11-13 John Levon <levon@movementarian.org>
* QDocument.h:

40
src/frontends/qt2/QBibtex.C
View File

@ -4,6 +4,7 @@
* Licence details can be found in the file COPYING.
*
* \author John Levon
* \author Herbert Voss
*
* Full author contact details are available in file CREDITS
*/
@ -71,14 +72,14 @@ void QBibtex::update_contents()
bibs = split(bibs, bib, ',');
bib = trim(bib);
if (!bib.empty())
dialog_->databaseLB->inSort(bib.c_str());
dialog_->databaseLB->insertItem(bib.c_str());
}
string bibtotoc = "bibtotoc";
string bibstyle(controller().params().getOptions().c_str());
// bibtotoc exists?
if (prefixIs(bibstyle,bibtotoc)) {
if (prefixIs(bibstyle, bibtotoc)) {
dialog_->bibtocCB->setChecked(true);
// bibstyle exists?
@ -90,29 +91,42 @@ void QBibtex::update_contents()
dialog_->bibtocCB->setChecked(false);
dialog_->styleCB->clear();
int item_nr(-1);
vector<string> const str = getVectorFromString(
controller().getBibStyles(),"\n");
controller().getBibStyles(), "\n");
for (vector<string>::const_iterator it = str.begin();
it != str.end(); ++it) {
dialog_->styleCB->insertItem(ChangeExtension(*it, "").c_str());
string item(ChangeExtension(*it, ""));
if (item == bibstyle)
item_nr = int(it - str.begin());
dialog_->styleCB->insertItem(item.c_str());
}
dialog_->styleCB->insertItem(bibstyle.c_str(),0);
if (item_nr == -1) {
dialog_->styleCB->insertItem(bibstyle.c_str());
item_nr = dialog_->styleCB->count() - 1;
}
dialog_->styleCB->setCurrentItem(item_nr);
}
void QBibtex::apply()
{
string dbs;
string dbs(dialog_->databaseLB->text(0).latin1());
for (unsigned int i = 0; i < dialog_->databaseLB->count(); ++i) {
unsigned int maxCount = dialog_->databaseLB->count();
for (unsigned int i = 1; i < maxCount; i++) {
dbs += ',';
dbs += dialog_->databaseLB->text(i).latin1();
if (i != dialog_->databaseLB->count())
dbs += ",";
}
controller().params().setContents(dbs);
string bibstyle(dialog_->styleCB->text(0).latin1());
string const bibstyle(dialog_->styleCB->currentText().latin1());
bool const bibtotoc(dialog_->bibtocCB->isChecked());
if (bibtotoc && (!bibstyle.empty())) {
@ -121,8 +135,8 @@ void QBibtex::apply()
} else if (bibtotoc) {
// bibtotoc and no style
controller().params().setOptions("bibtotoc");
} else if (!bibstyle.empty()){
// only style
} else {
// only style. An empty one is valid!
controller().params().setOptions(bibstyle);
}
}

14
src/frontends/qt2/ui/QBibtexDialog.ui
View File

@ -13,7 +13,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>301</width>
<width>293</width>
<height>318</height>
</rect>
</property>
@ -312,12 +312,24 @@
<receiver>QBibtexDialogBase</receiver>
<slot>deletePressed()</slot>
</connection>
<connection>
<sender>styleCB</sender>
<signal>textChanged(const QString&amp;)</signal>
<receiver>QBibtexDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
<connection>
<sender>databaseLB</sender>
<signal>selectionChanged()</signal>
<receiver>QBibtexDialogBase</receiver>
<slot>databaseChanged()</slot>
</connection>
<connection>
<sender>databaseLB</sender>
<signal>selectionChanged()</signal>
<receiver>QBibtexDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
<slot access="public">addPressed()</slot>
<slot access="public">browsePressed()</slot>
<slot access="public">change_adaptor()</slot>