Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QBibtex.C

diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C
index c4294e36cd0fc1458df49fc50c03db1256960b66..3169a1490d5b94fda82a6a9d8c69f467b63c328f 100644 (file)
--- a/src/frontends/qt2/QBibtex.C
+++ b/src/frontends/qt2/QBibtex.C
@@ -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());
+       controller().params().setContents(dbs);
 
+       string const bibstyle(dialog_->styleCB->currentText().latin1());
        bool const bibtotoc(dialog_->bibtocCB->isChecked());
 
        if (bibtotoc && (!bibstyle.empty())) {
@@ -121,8 +135,10 @@ 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, because some
+               // documentclasses have an own \bibliographystyle{}
+               // command!
                controller().params().setOptions(bibstyle);
        }
 }
@@ -130,6 +146,5 @@ void QBibtex::apply()
 
 bool QBibtex::isValid()
 {
-       return dialog_->databaseLB->count() != 0 &&
-               !string(dialog_->styleCB->text(0)).empty();
+       return dialog_->databaseLB->count() != 0;
 }