On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiBibtex.cpp

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index a1c97cd6edb37e2ba17b63decfa0e49a3ebb918d..556b79ce802fae22cfd9765681ee0fae303a0b65 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -4,9 +4,9 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Herbert Voß
+ * \author Herbert Voß
  * \author Angus Leeming
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -32,7 +32,6 @@
 
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/FileFilterList.h"
 #include "support/FileName.h"
 #include "support/filetools.h" // changeExtension
 #include "support/gettext.h"
@@ -80,6 +79,8 @@ GuiBibtex::GuiBibtex(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(addBibPB, SIGNAL(clicked()),
                this, SLOT(addPressed()));
+       connect(rescanPB, SIGNAL(clicked()),
+               this, SLOT(rescanClicked()));
 
        add_ = new GuiBibtexAddDialog(this);
        add_bc_.setPolicy(ButtonPolicy::OkCancelPolicy);
@@ -93,6 +94,8 @@ GuiBibtex::GuiBibtex(GuiView & lv)
                this, SLOT(addDatabase()));
        connect(add_->addPB, SIGNAL(clicked()),
                add_, SLOT(accept()));
+       connect(add_->rescanPB, SIGNAL(clicked()),
+               this, SLOT(rescanClicked()));
        connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)),
                this, SLOT(addDatabase()));
        connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)),
@@ -265,6 +268,13 @@ void GuiBibtex::downPressed()
 }
 
 
+void GuiBibtex::rescanClicked()
+{
+       rescanBibStyles();
+       updateContents();
+}
+
+
 void GuiBibtex::databaseChanged()
 {
        bool readOnly = isBufferReadonly();
@@ -307,7 +317,7 @@ void GuiBibtex::updateContents()
        for (int i = 0; i != bibfiles.count(); ++i)
                add_->bibLW->addItem(changeExtension(bibfiles[i], ""));
 
-       QString bibstyle = styleFile();
+       QString const bibstyle = styleFile();
 
        bibtocCB->setChecked(bibtotoc() && !bibtopic);
        bibtocCB->setEnabled(!bibtopic);
@@ -317,7 +327,7 @@ void GuiBibtex::updateContents()
        else if (bibtopic && btPrintCO->count() < 3)
                btPrintCO->insertItem(1, qt_("all uncited references", 0));
 
-       docstring btprint = params_["btprint"];
+       docstring const & btprint = params_["btprint"];
        int btp = 0;
        if ((bibtopic && btprint == "btPrintNotCited") ||
           (!bibtopic && btprint == "btPrintAll"))
@@ -331,7 +341,7 @@ void GuiBibtex::updateContents()
 
        int item_nr = -1;
 
-       QStringList str = bibStyles();
+       QStringList const str = bibStyles();
        for (int i = 0; i != str.count(); ++i) {
                QString item = changeExtension(str[i], "");
                if (item == bibstyle)
@@ -409,7 +419,7 @@ void GuiBibtex::applyView()
                        // use \nocite{*}
                        params_["btprint"] = from_ascii("btPrintAll");
                        break;
-               }               
+               }
        }
 }
 
@@ -424,8 +434,8 @@ QString GuiBibtex::browseBib(QString const & in_name) const
 {
        QString const label1 = qt_("Documents|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
-       FileFilterList const filter(_("BibTeX Databases (*.bib)"));
-       return browseRelFile(in_name, bufferFilepath(),
+       QStringList const filter(qt_("BibTeX Databases (*.bib)"));
+       return browseRelToParent(in_name, bufferFilePath(),
                qt_("Select a BibTeX database to add"), filter, false, label1, dir1);
 }
 
@@ -434,8 +444,8 @@ QString GuiBibtex::browseBst(QString const & in_name) const
 {
        QString const label1 = qt_("Documents|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
-       FileFilterList const filter(_("BibTeX Styles (*.bst)"));
-       return browseRelFile(in_name, bufferFilepath(),
+       QStringList const filter(qt_("BibTeX Styles (*.bst)"));
+       return browseRelToParent(in_name, bufferFilePath(),
                qt_("Select a BibTeX style"), filter, false, label1, dir1);
 }
 
@@ -449,7 +459,7 @@ QStringList GuiBibtex::bibStyles() const
                data = texFileList("bstFiles.lst");
        }
        for (int i = 0; i != data.size(); ++i)
-               data[i] = onlyFilename(data[i]);
+               data[i] = onlyFileName(data[i]);
        // sort on filename only (no path)
        data.sort();
        return data;
@@ -465,7 +475,7 @@ QStringList GuiBibtex::bibFiles() const
                data = texFileList("bibFiles.lst");
        }
        for (int i = 0; i != data.size(); ++i)
-               data[i] = onlyFilename(data[i]);
+               data[i] = onlyFileName(data[i]);
        // sort on filename only (no path)
        data.sort();
        return data;
@@ -474,7 +484,7 @@ QStringList GuiBibtex::bibFiles() const
 
 void GuiBibtex::rescanBibStyles() const
 {
-       rescanTexStyles();
+       rescanTexStyles("bst bib");
 }
 
 
@@ -494,22 +504,7 @@ QString GuiBibtex::styleFile() const
 {
        // the different bibtex packages have (and need) their
        // own "plain" stylefiles
-       CiteEngine const engine = buffer().params().citeEngine();
-       QString defaultstyle;
-       switch (engine) {
-       case ENGINE_BASIC:
-               defaultstyle = "plain";
-               break;
-       case ENGINE_NATBIB_AUTHORYEAR:
-               defaultstyle = "plainnat";
-               break;
-       case ENGINE_NATBIB_NUMERICAL:
-               defaultstyle = "plainnat";
-               break;
-       case ENGINE_JURABIB:
-               defaultstyle = "jurabib";
-               break;
-       }
+       QString defaultstyle = toqstr(buffer().params().defaultBiblioStyle());
 
        QString bst = toqstr(params_["options"]);
        if (bibtotoc()){
@@ -519,7 +514,7 @@ QString GuiBibtex::styleFile() const
                        // FIXME: check
                        // docstring bibtotoc = from_ascii("bibtotoc");
                        // bst = split(bst, bibtotoc, ',');
-                       bst = bst.mid(pos);     
+                       bst = bst.mid(pos + 1);
                } else {
                        bst.clear();
                }
@@ -537,14 +532,14 @@ QString GuiBibtex::styleFile() const
 
 bool GuiBibtex::initialiseParams(std::string const & data)
 {
-       InsetCommand::string2params("bibtex", data, params_);
+       InsetCommand::string2params(data, params_);
        return true;
 }
 
 
 void GuiBibtex::dispatchParams()
 {
-       std::string const lfun = InsetCommand::params2string("bibtex", params_);
+       std::string const lfun = InsetCommand::params2string(params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }
 
@@ -556,4 +551,4 @@ Dialog * createGuiBibtex(GuiView & lv) { return new GuiBibtex(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBibtex_moc.cpp"
+#include "moc_GuiBibtex.cpp"