X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBibtex.cpp;h=ff0a03e272222dfcb0b7d2c6eb41d12d9fea0154;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=274effa2d103b8853b52dd4c2a09565933f83e30;hpb=534b81a5c16915b486eae41133df0fdcbc6e5f18;p=lyx.git

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 274effa2d1..ff0a03e272 100644
--- 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.
  */
@@ -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);
 
@@ -77,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);
@@ -90,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 *)),
@@ -208,9 +214,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 +227,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);
 		}
 	}
@@ -266,6 +268,13 @@ void GuiBibtex::downPressed()
 }
 
 
+void GuiBibtex::rescanClicked()
+{
+	rescanBibStyles();
+	updateContents();
+}
+
+
 void GuiBibtex::databaseChanged()
 {
 	bool readOnly = isBufferReadonly();
@@ -290,19 +299,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 +364,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 +434,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 +444,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 +504,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 +529,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,10 +545,25 @@ 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); }
 
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBibtex_moc.cpp"
+#include "moc_GuiBibtex.cpp"