Compil fix.

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

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 274effa2d103b8853b52dd4c2a09565933f83e30..3b78e406a79a45a76ff3fcf2b6cce4fe2189f925 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -17,11 +17,12 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "EmbeddedFiles.h"
-#include "ui_BibtexAddUi.h"
+#include "FuncRequest.h"
+#include "LyXRC.h"
 #include "qt_helpers.h"
 #include "Validator.h"
-#include "LyXRC.h"
+
+#include "ui_BibtexAddUi.h"
 
 #include "ButtonPolicy.h"
 
@@ -31,7 +32,7 @@
 
 #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"
 #include "support/lstrings.h"
@@ -49,7 +50,8 @@ namespace frontend {
 
 
 GuiBibtex::GuiBibtex(GuiView & lv)
-       : GuiCommand(lv, "bibtex", qt_("BibTeX Bibliography"))
+       : GuiDialog(lv, "bibtex", qt_("BibTeX Bibliography")),
+         params_(insetCode("bibtex"))
 {
        setupUi(this);
 
@@ -208,9 +210,7 @@ void GuiBibtex::addDatabase()
                        if (matches.empty()) {
                                QString label = item->text();
                                QListWidgetItem * db = new QListWidgetItem(label);
-                               db->setFlags(db->flags() | Qt::ItemIsSelectable
-                                       | Qt::ItemIsUserCheckable);
-                               db->setCheckState(Qt::Checked);
+                               db->setFlags(db->flags() | Qt::ItemIsSelectable);
                                databaseLW->addItem(db);
                        }
                }
@@ -223,9 +223,7 @@ void GuiBibtex::addDatabase()
                        databaseLW->findItems(f, Qt::MatchExactly);
                if (matches.empty()) {
                        QListWidgetItem * db = new QListWidgetItem(f);
-                       db->setFlags(db->flags() | Qt::ItemIsSelectable
-                               | Qt::ItemIsUserCheckable);
-                       db->setCheckState(Qt::Checked);
+                       db->setFlags(db->flags() | Qt::ItemIsSelectable);
                        databaseLW->addItem(db);
                }
        }
@@ -290,19 +288,14 @@ void GuiBibtex::updateContents()
        databaseLW->clear();
 
        docstring bibs = params_["bibfiles"];
-       docstring embs = params_["embed"];
        docstring bib;
-       docstring emb;
 
        while (!bibs.empty()) {
                bibs = split(bibs, bib, ',');
-               embs = split(embs, emb, ',');
                bib = trim(bib);
                if (!bib.empty()) {
                        QListWidgetItem * db = new QListWidgetItem(toqstr(bib));
-                       db->setFlags(db->flags() | Qt::ItemIsSelectable
-                               | Qt::ItemIsUserCheckable);
-                       db->setCheckState(emb.empty() ? Qt::Unchecked : Qt::Checked);
+                       db->setFlags(db->flags() | Qt::ItemIsSelectable);
                        databaseLW->addItem(db);
                }
        }
@@ -360,28 +353,17 @@ void GuiBibtex::updateContents()
 void GuiBibtex::applyView()
 {
        docstring dbs;
-       docstring emb;
 
        unsigned int maxCount = databaseLW->count();
-       Buffer & buf = buffer();
        for (unsigned int i = 0; i < maxCount; i++) {
-               if (i != 0) {
+               if (i != 0)
                        dbs += ',';
-                       emb += ',';
-               }
                QString item = databaseLW->item(i)->text();
                docstring bibfile = qstring_to_ucs4(item);
                dbs += bibfile;
-               if (databaseLW->item(i)->checkState() == Qt::Checked) {
-                       FileName bibfilepath = InsetBibtex::getBibTeXPath(bibfile, buf);
-                       string inzipName = EmbeddedFile(bibfilepath.absFilename(),
-                               buf.filePath()).inzipName();
-                       emb += from_utf8(inzipName);
-               }
        }
 
        params_["bibfiles"] = dbs;
-       params_["embed"] = emb;
 
        docstring const bibstyle = qstring_to_ucs4(styleCB->currentText());
        bool const bibtotoc = bibtocCB->isChecked();
@@ -441,7 +423,7 @@ 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)"));
+       QStringList const filter(qt_("BibTeX Databases (*.bib)"));
        return browseRelFile(in_name, bufferFilepath(),
                qt_("Select a BibTeX database to add"), filter, false, label1, dir1);
 }
@@ -451,7 +433,7 @@ 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)"));
+       QStringList const filter(qt_("BibTeX Styles (*.bst)"));
        return browseRelFile(in_name, bufferFilepath(),
                qt_("Select a BibTeX style"), filter, false, label1, dir1);
 }
@@ -511,19 +493,19 @@ QString GuiBibtex::styleFile() const
 {
        // the different bibtex packages have (and need) their
        // own "plain" stylefiles
-       biblio::CiteEngine const engine = buffer().params().citeEngine();
+       CiteEngine const engine = buffer().params().citeEngine();
        QString defaultstyle;
        switch (engine) {
-       case biblio::ENGINE_BASIC:
+       case ENGINE_BASIC:
                defaultstyle = "plain";
                break;
-       case biblio::ENGINE_NATBIB_AUTHORYEAR:
+       case ENGINE_NATBIB_AUTHORYEAR:
                defaultstyle = "plainnat";
                break;
-       case biblio::ENGINE_NATBIB_NUMERICAL:
+       case ENGINE_NATBIB_NUMERICAL:
                defaultstyle = "plainnat";
                break;
-       case biblio::ENGINE_JURABIB:
+       case ENGINE_JURABIB:
                defaultstyle = "jurabib";
                break;
        }
@@ -536,7 +518,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();
                }
@@ -552,6 +534,21 @@ QString GuiBibtex::styleFile() const
 }
 
 
+bool GuiBibtex::initialiseParams(std::string const & data)
+{
+       InsetCommand::string2params("bibtex", data, params_);
+       return true;
+}
+
+
+void GuiBibtex::dispatchParams()
+{
+       std::string const lfun = InsetCommand::params2string("bibtex", params_);
+       dispatch(FuncRequest(getLfun(), lfun));
+}
+
+
+
 Dialog * createGuiBibtex(GuiView & lv) { return new GuiBibtex(lv); }