X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCitation.cpp;h=e219390fbd4cd35b677bb6b5133988484fb945a2;hb=39d569661a3f4411d4501f9a8db9c7360ef5d568;hp=5b668f0b34c337c6c8537a21869f104924be2ed5;hpb=14d7b574870c324508a2eaae5019fece2e5f7cee;p=lyx.git

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 5b668f0b34..e219390fbd 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -1,3 +1,4 @@
+
 /**
  * \file GuiCitation.cpp
  * This file is part of LyX, the document processor.
@@ -15,26 +16,33 @@
 
 #include "GuiCitation.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
+#include "GuiSelectionManager.h"
 #include "qt_helpers.h"
+
 #include "Buffer.h"
+#include "BufferView.h"
+#include "BiblioInfo.h"
 #include "BufferParams.h"
-
-#include "support/lstrings.h"
-#include "support/docstring.h"
+#include "FuncRequest.h"
 
 #include "insets/InsetCommand.h"
 
-#include <vector>
-#include <string>
+#include "support/debug.h"
+#include "support/docstring.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <QCloseEvent>
+#include <QSettings>
 #include <QShowEvent>
+#include <QVariant>
+
+#include <vector>
+#include <string>
 
 #undef KeyPress
 
-#include <boost/regex.hpp>
+#include "support/regex.h"
 
 #include <algorithm>
 #include <string>
@@ -46,7 +54,7 @@ using namespace lyx::support;
 namespace lyx {
 namespace frontend {
 
-static vector<biblio::CiteStyle> citeStyles_;
+static vector<CiteStyle> citeStyles_;
 
 
 template<typename String>
@@ -76,7 +84,8 @@ static vector<lyx::docstring> to_docstring_vector(QStringList const & qlist)
 
 
 GuiCitation::GuiCitation(GuiView & lv)
-	: GuiCommand(lv, "citation", qt_("Citation"))
+	: DialogView(lv, "citation", qt_("Citation")),
+	  params_(insetCode("citation"))
 {
 	setupUi(this);
 
@@ -90,42 +99,45 @@ GuiCitation::GuiCitation(GuiView & lv)
 		this, SLOT(changed()));
 	connect(textAfterED, SIGNAL(textChanged(QString)),
 		this, SLOT(changed()));
-	connect(clearPB, SIGNAL(clicked()),
-		findLE, SLOT(clear()));
-	connect(this, SIGNAL(rejected()), this, SLOT(cleanUp()));
+	connect(findLE, SIGNAL(returnPressed()), 
+		this, SLOT(on_searchPB_clicked()));
+	connect(textBeforeED, SIGNAL(returnPressed()),
+		this, SLOT(on_okPB_clicked()));
+	connect(textAfterED, SIGNAL(returnPressed()),
+		this, SLOT(on_okPB_clicked()));
 
 	selectionManager = new GuiSelectionManager(availableLV, selectedLV, 
-			addPB, deletePB, upPB, downPB, available(), selected());
+			addPB, deletePB, upPB, downPB, &available_model_, &selected_model_);
 	connect(selectionManager, SIGNAL(selectionChanged()),
 		this, SLOT(setCitedKeys()));
 	connect(selectionManager, SIGNAL(updateHook()),
-		this, SLOT(updateDialog()));
+		this, SLOT(updateControls()));
 	connect(selectionManager, SIGNAL(okHook()),
 		this, SLOT(on_okPB_clicked()));
 
-	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
+	setFocusProxy(availableLV);
+
+	// FIXME: the sizeHint() for this is _way_ too high
+	infoML->setFixedHeight(60);
 }
 
 
-void GuiCitation::cleanUp() 
+GuiCitation::~GuiCitation()
 {
-	clearSelection();
-	clearParams();
-	close();
+	delete selectionManager;
 }
 
 
 void GuiCitation::closeEvent(QCloseEvent * e)
 {
 	clearSelection();
-	clearParams();
-	GuiDialog::closeEvent(e);
+	DialogView::closeEvent(e);
 }
 
 
 void GuiCitation::applyView()
 {
-	int  const choice = max(0, citationStyleCO->currentIndex());
+	int const choice = max(0, citationStyleCO->currentIndex());
 	style_ = choice;
 	bool const full  = fulllistCB->isChecked();
 	bool const force = forceuppercaseCB->isChecked();
@@ -139,10 +151,9 @@ void GuiCitation::applyView()
 
 void GuiCitation::showEvent(QShowEvent * e)
 {
-	init();
 	findLE->clear();
 	availableLV->setFocus();
-	GuiDialog::showEvent(e);
+	DialogView::showEvent(e);
 }
 
 
@@ -170,16 +181,13 @@ void GuiCitation::on_applyPB_clicked()
 void GuiCitation::on_restorePB_clicked()
 {
 	init();
-	updateView();
 }
 
 
-void GuiCitation::updateView()
+void GuiCitation::updateControls()
 {
-	init();
-	fillFields();
-	fillEntries();
-	updateDialog();
+	BiblioInfo const & bi = bibInfo();
+	updateControls(bi);
 }
 
 
@@ -188,44 +196,42 @@ void GuiCitation::updateView()
 // such as when addPB is pressed, as the list of fields, entries, etc,
 // will not have changed. At the moment, however, the division between
 // fillStyles() and updateStyle() doesn't lend itself to dividing the
-// two methods, though they should be divisible.
-void GuiCitation::updateDialog()
-{
-	if (selectionManager->selectedFocused()) { 
-		if (selectedLV->selectionModel()->selectedIndexes().isEmpty())
-			updateInfo(availableLV->currentIndex());
-		else
-			updateInfo(selectedLV->currentIndex());
-	} else {
-		if (availableLV->selectionModel()->selectedIndexes().isEmpty())
-			updateInfo(QModelIndex());
-		else
-			updateInfo(availableLV->currentIndex());
-	}
+// two methods, though they should be divisible. That is, we should
+// not have to call fillStyles() every time through here.
+void GuiCitation::updateControls(BiblioInfo const & bi)
+{
+	QModelIndex idx = selectionManager->getSelectedIndex();
+	updateInfo(bi, idx);
 	setButtons();
 
-	textBeforeED->setText(textBefore());
-	textAfterED->setText(textAfter());
-	fillStyles();
+	textBeforeED->setText(toqstr(params_["before"]));
+	textAfterED->setText(toqstr(params_["after"]));
+	fillStyles(bi);
 	updateStyle();
 }
 
 
-void GuiCitation::updateFormatting(biblio::CiteStyle currentStyle)
+void GuiCitation::updateFormatting(CiteStyle currentStyle)
 {
-	biblio::CiteEngine const engine = getEngine();
+	CiteEngine const engine = citeEngine();
 	bool const natbib_engine =
-		engine == biblio::ENGINE_NATBIB_AUTHORYEAR ||
-		engine == biblio::ENGINE_NATBIB_NUMERICAL;
-	bool const basic_engine = engine == biblio::ENGINE_BASIC;
+		engine == ENGINE_NATBIB_AUTHORYEAR ||
+		engine == ENGINE_NATBIB_NUMERICAL;
+	bool const basic_engine = engine == ENGINE_BASIC;
 
 	bool const haveSelection = 
 		selectedLV->model()->rowCount() > 0;
 
-	bool const isNocite = currentStyle == biblio::NOCITE;
+	bool const isNocite = currentStyle == NOCITE;
+
+	bool const isCiteyear =
+		currentStyle == CITEYEAR ||
+		currentStyle == CITEYEARPAR;
 
-	fulllistCB->setEnabled(natbib_engine && haveSelection && !isNocite);
-	forceuppercaseCB->setEnabled(natbib_engine && haveSelection && !isNocite);
+	fulllistCB->setEnabled(natbib_engine && haveSelection && !isNocite
+		&& !isCiteyear);
+	forceuppercaseCB->setEnabled(natbib_engine && haveSelection
+		&& !isNocite && !isCiteyear);
 	textBeforeED->setEnabled(!basic_engine && haveSelection && !isNocite);
 	textBeforeLA->setEnabled(!basic_engine && haveSelection && !isNocite);
 	textAfterED->setEnabled(haveSelection && !isNocite);
@@ -240,75 +246,81 @@ void GuiCitation::updateStyle()
 	string const & command = params_.getCmdName();
 
 	// Find the style of the citekeys
-	vector<biblio::CiteStyle> const & styles = citeStyles_;
-	biblio::CitationStyle const cs(command);
+	vector<CiteStyle> const & styles = citeStyles_;
+	CitationStyle const cs = citationStyleFromString(command);
 
-	vector<biblio::CiteStyle>::const_iterator cit =
+	vector<CiteStyle>::const_iterator cit =
 		std::find(styles.begin(), styles.end(), cs.style);
 
-	// restore the latest natbib style
-	if (style_ >= 0 && style_ < citationStyleCO->count())
-		citationStyleCO->setCurrentIndex(style_);
-	else
-		citationStyleCO->setCurrentIndex(0);
-
 	if (cit != styles.end()) {
-		int const i = int(cit - styles.begin());
-		citationStyleCO->setCurrentIndex(i);
 		fulllistCB->setChecked(cs.full);
-		forceuppercaseCB->setChecked(cs.forceUCase);
+		forceuppercaseCB->setChecked(cs.forceUpperCase);
 	} else {
+		// restore the last used natbib style
+		if (style_ >= 0 && style_ < citationStyleCO->count()) {
+			// the necessary update will be performed later
+			citationStyleCO->blockSignals(true);
+			citationStyleCO->setCurrentIndex(style_);
+			citationStyleCO->blockSignals(false);
+		}
 		fulllistCB->setChecked(false);
 		forceuppercaseCB->setChecked(false);
 	}
 	updateFormatting(cs.style);
 }
 
-//This one needs to be called whenever citationStyleCO needs
-//to be updated---and this would be on anything that changes the
-//selection in selectedLV, or on a general update.
-void GuiCitation::fillStyles()
-{
-	int const oldIndex = citationStyleCO->currentIndex();
 
-	citationStyleCO->clear();
+// This one needs to be called whenever citationStyleCO needs
+// to be updated---and this would be on anything that changes the
+// selection in selectedLV, or on a general update.
+void GuiCitation::fillStyles(BiblioInfo const & bi)
+{
+	QStringList selected_keys = selected_model_.stringList();
+	int curr = selectedLV->model()->rowCount() - 1;
 
-	QStringList selected_keys = selected()->stringList();
-	if (selected_keys.empty()) {
+	if (curr < 0 || selected_keys.empty()) {
+		citationStyleCO->clear();
 		citationStyleCO->setEnabled(false);
 		citationStyleLA->setEnabled(false);
 		return;
 	}
 
-	int curr = selectedLV->model()->rowCount() - 1;
-	if (curr < 0)
-		return;
-
 	if (!selectedLV->selectionModel()->selectedIndexes().empty())
 		curr = selectedLV->selectionModel()->selectedIndexes()[0].row();
 
-	QStringList sty = citationStyles(curr);
-
-	citationStyleCO->setEnabled(!sty.isEmpty());
-	citationStyleLA->setEnabled(!sty.isEmpty());
+	QStringList sty = citationStyles(bi, curr);
 
-	if (sty.isEmpty())
+	if (sty.isEmpty()) { 
+		// some error
+		citationStyleCO->setEnabled(false);
+		citationStyleLA->setEnabled(false);
+		citationStyleCO->clear();
 		return;
-
+	}
+	
+	citationStyleCO->blockSignals(true);
+	
+	// save old index
+	int const oldIndex = citationStyleCO->currentIndex();
+	citationStyleCO->clear();
 	citationStyleCO->insertItems(0, sty);
-
+	citationStyleCO->setEnabled(true);
+	citationStyleLA->setEnabled(true);
+	// restore old index
 	if (oldIndex != -1 && oldIndex < citationStyleCO->count())
 		citationStyleCO->setCurrentIndex(oldIndex);
+
+	citationStyleCO->blockSignals(false);
 }
 
 
-void GuiCitation::fillFields()
+void GuiCitation::fillFields(BiblioInfo const & bi)
 {
 	fieldsCO->blockSignals(true);
 	int const oldIndex = fieldsCO->currentIndex();
 	fieldsCO->clear();
-	QStringList const & fields = getFieldsAsQStringList();
-	fieldsCO->insertItem(0, qt_("All Fields"));
+	QStringList const fields = to_qstring_list(bi.getFields());
+	fieldsCO->insertItem(0, qt_("All fields"));
 	fieldsCO->insertItem(1, qt_("Keys"));
 	fieldsCO->insertItems(2, fields);
 	if (oldIndex != -1 && oldIndex < fieldsCO->count())
@@ -317,13 +329,13 @@ void GuiCitation::fillFields()
 }
 
 
-void GuiCitation::fillEntries()
+void GuiCitation::fillEntries(BiblioInfo const & bi)
 {
 	entriesCO->blockSignals(true);
 	int const oldIndex = entriesCO->currentIndex();
 	entriesCO->clear();
-	QStringList const & entries = getEntriesAsQStringList();
-	entriesCO->insertItem(0, qt_("All Entry Types"));
+	QStringList const entries = to_qstring_list(bi.getEntries());
+	entriesCO->insertItem(0, qt_("All entry types"));
 	entriesCO->insertItems(1, entries);
 	if (oldIndex != -1 && oldIndex < entriesCO->count())
 		entriesCO->setCurrentIndex(oldIndex);
@@ -331,10 +343,10 @@ void GuiCitation::fillEntries()
 }
 
 
-bool GuiCitation::isSelected(const QModelIndex & idx)
+bool GuiCitation::isSelected(QModelIndex const & idx)
 {
 	QString const str = idx.data().toString();
-	return selected()->stringList().contains(str);
+	return selected_model_.stringList().contains(str);
 }
 
 
@@ -347,13 +359,16 @@ void GuiCitation::setButtons()
 }
 
 
-void GuiCitation::updateInfo(QModelIndex const & idx)
+void GuiCitation::updateInfo(BiblioInfo const & bi, QModelIndex const & idx)
 {
-	if (idx.isValid()) {
-		QString const keytxt = getKeyInfo(idx.data().toString());
-		infoML->document()->setPlainText(keytxt);
-	} else
+	if (!idx.isValid() || bi.empty()) {
 		infoML->document()->clear();
+		return;
+	}
+
+	QString const keytxt = toqstr(
+		bi.getInfo(qstring_to_ucs4(idx.data().toString()), documentBuffer(), true));
+	infoML->document()->setHtml(keytxt);
 }
 
 
@@ -361,7 +376,8 @@ void GuiCitation::findText(QString const & text, bool reset)
 {
 	//"All Fields" and "Keys" are the first two
 	int index = fieldsCO->currentIndex() - 2; 
-	vector<docstring> const & fields = availableFields();
+	BiblioInfo const & bi = bibInfo();
+	vector<docstring> const & fields = bi.getFields();
 	docstring field;
 	
 	if (index <= -1 || index >= int(fields.size()))
@@ -375,7 +391,7 @@ void GuiCitation::findText(QString const & text, bool reset)
 	
 	//"All Entry Types" is first.
 	index = entriesCO->currentIndex() - 1; 
-	vector<docstring> const & entries = availableEntries();
+	vector<docstring> const & entries = bi.getEntries();
 	docstring entry_type;
 	if (index < 0 || index >= int(entries.size()))
 		entry_type = from_ascii("");
@@ -384,14 +400,14 @@ void GuiCitation::findText(QString const & text, bool reset)
 	
 	bool const case_sentitive = caseCB->checkState();
 	bool const reg_exp = regexCB->checkState();
-	findKey(text, onlyKeys, field, entry_type, 
+	findKey(bi, text, onlyKeys, field, entry_type, 
 	               case_sentitive, reg_exp, reset);
 	//FIXME
 	//It'd be nice to save and restore the current selection in 
 	//availableLV. Currently, we get an automatic reset, since the
 	//model is reset.
 	
-	updateDialog();
+	updateControls(bi);
 }
 
 
@@ -410,7 +426,7 @@ void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/)
 void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
 {
 	if (index >= 0 && index < citationStyleCO->count()) {
-		vector<biblio::CiteStyle> const & styles = citeStyles_;
+		vector<CiteStyle> const & styles = citeStyles_;
 		updateFormatting(styles[index]);
 	}
 }
@@ -418,10 +434,20 @@ void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
 
 void GuiCitation::on_findLE_textChanged(const QString & text)
 {
-	clearPB->setDisabled(text.isEmpty());
-	if (text.isEmpty())
-		findLE->setFocus();
-	findText(text);
+	bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked);
+	searchPB->setDisabled(text.isEmpty() || searchAsWeGo);
+	if (!text.isEmpty()) {
+		if (searchAsWeGo)
+			findText(findLE->text());
+		return;
+	}
+	findText(findLE->text());
+	findLE->setFocus();
+}
+
+void GuiCitation::on_searchPB_clicked()
+{
+	findText(findLE->text(), true);
 }
 
 
@@ -437,6 +463,15 @@ void GuiCitation::on_regexCB_stateChanged(int)
 }
 
 
+void GuiCitation::on_asTypeCB_stateChanged(int)
+{
+	bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked);
+	searchPB->setDisabled(findLE->text().isEmpty() || searchAsWeGo);
+	if (searchAsWeGo)
+		findText(findLE->text(), true);
+}
+
+
 void GuiCitation::changed()
 {
 	setButtons();
@@ -449,17 +484,19 @@ void GuiCitation::apply(int const choice, bool full, bool force,
 	if (cited_keys_.isEmpty())
 		return;
 
-	vector<biblio::CiteStyle> const & styles = citeStyles_;
-	if (styles[choice] == biblio::NOCITE) {
+	vector<CiteStyle> const & styles = citeStyles_;
+	if (styles[choice] == NOCITE) {
 		full = false;
 		force = false;
 		before.clear();
 		after.clear();
 	}
 	
-	string const command =
-		biblio::CitationStyle(styles[choice], full, force)
-		.asLatexStr();
+	CitationStyle s;
+	s.style = styles[choice];
+	s.full = full;
+	s.forceUpperCase = force;
+	string const command = citationStyleToString(s);
 
 	params_.setCmdName(command);
 	params_["key"] = qstring_to_ucs4(cited_keys_.join(","));
@@ -476,22 +513,11 @@ void GuiCitation::clearSelection()
 }
 
 
-QString GuiCitation::textBefore()
-{
-	return toqstr(params_["before"]);
-}
-
-
-QString GuiCitation::textAfter()
-{
-	return toqstr(params_["after"]);
-}
-
-
 void GuiCitation::init()
 {
 	// Make the list of all available bibliography keys
-	all_keys_ = to_qstring_list(availableKeys());
+	BiblioInfo const & bi = bibInfo();
+	all_keys_ = to_qstring_list(bi.getKeys());
 	available_model_.setStringList(all_keys_);
 
 	// Ditto for the keys cited in this inset
@@ -501,10 +527,38 @@ void GuiCitation::init()
 	else
 		cited_keys_ = str.split(",");
 	selected_model_.setStringList(cited_keys_);
+	if (selected_model_.rowCount()) {
+		selectedLV->blockSignals(true);
+		selectedLV->setFocus();
+		QModelIndex idx = selected_model_.index(0, 0);
+		selectedLV->selectionModel()->select(idx, 
+				QItemSelectionModel::ClearAndSelect);
+		selectedLV->blockSignals(false);
+		
+		// set the style combo appropriately
+		string const & command = params_.getCmdName();
+		vector<CiteStyle> const & styles = citeStyles_;
+		CitationStyle const cs = citationStyleFromString(command);
+	
+		vector<CiteStyle>::const_iterator cit =
+			std::find(styles.begin(), styles.end(), cs.style);
+		if (cit != styles.end()) {
+			int const i = int(cit - styles.begin());
+			// the necessary update will be performed later
+			citationStyleCO->blockSignals(true);
+			citationStyleCO->setCurrentIndex(i);
+			citationStyleCO->blockSignals(false);
+		}
+	} else
+		availableLV->setFocus();
+	fillFields(bi);
+	fillEntries(bi);
+	updateControls(bi);
 }
 
 
-void GuiCitation::findKey(QString const & str, bool only_keys,
+void GuiCitation::findKey(BiblioInfo const & bi,
+	QString const & str, bool only_keys,
 	docstring field, docstring entry_type,
 	bool case_sensitive, bool reg_exp, bool reset)
 {
@@ -523,7 +577,7 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
 	last_case_sensitive = case_sensitive;
 	last_reg_exp = reg_exp;
 
-	Qt::CaseSensitivity qtcase = case_sensitive?
+	Qt::CaseSensitivity qtcase = case_sensitive ?
 			Qt::CaseSensitive: Qt::CaseInsensitive;
 	QStringList keys;
 	// If new string (str) contains the last searched one...
@@ -544,40 +598,22 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
 	// First, filter by entry_type, which will be faster than 
 	// what follows, so we may get to do that on less.
 	vector<docstring> keyVector = to_docstring_vector(keys);
-	filterByEntryType(keyVector, entry_type);
+	filterByEntryType(bi, keyVector, entry_type);
 	
 	if (str.isEmpty())
 		result = to_qstring_list(keyVector);
 	else
-		result = to_qstring_list(searchKeys(keyVector, only_keys, 
+		result = to_qstring_list(searchKeys(bi, keyVector, only_keys, 
 			qstring_to_ucs4(str), field, case_sensitive, reg_exp));
 	
 	available_model_.setStringList(result);
 }
 
 
-QStringList GuiCitation::getFieldsAsQStringList()
-{
-	return to_qstring_list(availableFields());
-}
-
-
-QStringList GuiCitation::getEntriesAsQStringList()
-{
-	return to_qstring_list(availableEntries());
-}
-
-
-QStringList GuiCitation::citationStyles(int sel)
+QStringList GuiCitation::citationStyles(BiblioInfo const & bi, int sel)
 {
 	docstring const key = qstring_to_ucs4(cited_keys_[sel]);
-	return to_qstring_list(bibkeysInfo_.getCiteStrings(key, buffer()));
-}
-
-
-QString GuiCitation::getKeyInfo(QString const & sel)
-{
-	return toqstr(getInfo(qstring_to_ucs4(sel)));
+	return to_qstring_list(bi.getCiteStrings(key, documentBuffer()));
 }
 
 
@@ -589,14 +625,10 @@ void GuiCitation::setCitedKeys()
 
 bool GuiCitation::initialiseParams(string const & data)
 {
-	InsetCommandMailer::string2params(lfun_name_, data, params_);
-
-	biblio::CiteEngine const engine = buffer().params().getEngine();
-
-	bibkeysInfo_.fillWithBibKeys(&buffer());
-	
-	citeStyles_ = biblio::getCiteStyles(engine);
-
+	InsetCommand::string2params(data, params_);
+	CiteEngine const engine = citeEngine();
+	citeStyles_ = citeStyles(engine);
+	init();
 	return true;
 }
 
@@ -604,29 +636,10 @@ bool GuiCitation::initialiseParams(string const & data)
 void GuiCitation::clearParams()
 {
 	params_.clear();
-	bibkeysInfo_.clear();
-}
-
-
-vector<docstring> const GuiCitation::availableKeys() const
-{
-	return bibkeysInfo_.getKeys();
 }
 
 
-vector<docstring> const GuiCitation::availableFields() const
-{
-	return bibkeysInfo_.getFields();
-}
-
-
-vector<docstring> const GuiCitation::availableEntries() const
-{
-	return bibkeysInfo_.getEntries();
-}
-
-
-void GuiCitation::filterByEntryType(
+void GuiCitation::filterByEntryType(BiblioInfo const & bi,
 	vector<docstring> & keyVector, docstring entry_type) 
 {
 	if (entry_type.empty())
@@ -634,12 +647,12 @@ void GuiCitation::filterByEntryType(
 	
 	vector<docstring>::iterator it = keyVector.begin();
 	vector<docstring>::iterator end = keyVector.end();
-	
+
 	vector<docstring> result;
 	for (; it != end; ++it) {
 		docstring const key = *it;
-		BiblioInfo::const_iterator cit = bibkeysInfo_.find(key);
-		if (cit == bibkeysInfo_.end())
+		BiblioInfo::const_iterator cit = bi.find(key);
+		if (cit == bi.end())
 			continue;
 		if (cit->second.entryType() == entry_type)
 			result.push_back(key);
@@ -648,18 +661,9 @@ void GuiCitation::filterByEntryType(
 }
 
 
-biblio::CiteEngine GuiCitation::getEngine() const
-{
-	return buffer().params().getEngine();
-}
-
-
-docstring GuiCitation::getInfo(docstring const & key) const
+CiteEngine GuiCitation::citeEngine() const
 {
-	if (bibkeysInfo_.empty())
-		return docstring();
-
-	return bibkeysInfo_.getInfo(key);
+	return documentBuffer().params().citeEngine();
 }
 
 
@@ -672,9 +676,9 @@ static docstring escape_special_chars(docstring const & expr)
 {
 	// Search for all chars '.|*?+(){}[^$]\'
 	// Note that '[' and '\' must be escaped.
-	// This is a limitation of boost::regex, but all other chars in BREs
+	// This is a limitation of lyx::regex, but all other chars in BREs
 	// are assumed literal.
-	static const boost::regex reg("[].|*?+(){}^$\\[\\\\]");
+	static const lyx::regex reg("[].|*?+(){}^$\\[\\\\]");
 
 	// $& is a perl-like expression that expands to all
 	// of the current match
@@ -682,11 +686,11 @@ static docstring escape_special_chars(docstring const & expr)
 	// boost to treat it as a literal.
 	// Thus, to prefix a matched expression with '\', we use:
 	// FIXME: UNICODE
-	return from_utf8(boost::regex_replace(to_utf8(expr), reg, "\\\\$&"));
+	return from_utf8(lyx::regex_replace(to_utf8(expr), reg, string("\\\\$&")));
 }
 
 
-vector<docstring> GuiCitation::searchKeys(
+vector<docstring> GuiCitation::searchKeys(BiblioInfo const & bi,	
 	vector<docstring> const & keys_to_search, bool only_keys,
  	docstring const & search_expression, docstring field,
 	bool case_sensitive, bool regex)
@@ -699,15 +703,15 @@ vector<docstring> GuiCitation::searchKeys(
 
 	if (!regex)
 		// We must escape special chars in the search_expr so that
-		// it is treated as a simple string by boost::regex.
+		// it is treated as a simple string by lyx::regex.
 		expr = escape_special_chars(expr);
 
-	boost::regex reg_exp;
+	lyx::regex reg_exp;
 	try {
 		reg_exp.assign(to_utf8(expr), case_sensitive ?
-			boost::regex_constants::normal : boost::regex_constants::icase);
-	} catch (boost::regex_error & e) {
-		// boost::regex throws an exception if the regular expression is not
+			lyx::regex_constants::ECMAScript : lyx::regex_constants::icase);
+	} catch (lyx::regex_error & e) {
+		// lyx::regex throws an exception if the regular expression is not
 		// valid.
 		LYXERR(Debug::GUI, e.what());
 		return vector<docstring>();
@@ -716,8 +720,8 @@ vector<docstring> GuiCitation::searchKeys(
 	vector<docstring>::const_iterator it = keys_to_search.begin();
 	vector<docstring>::const_iterator end = keys_to_search.end();
 	for (; it != end; ++it ) {
-		BiblioInfo::const_iterator info = bibkeysInfo_.find(*it);
-		if (info == bibkeysInfo_.end())
+		BiblioInfo::const_iterator info = bi.find(*it);
+		if (info == bi.end())
 			continue;
 		
 		BibTeXInfo const & kvm = info->second;
@@ -726,17 +730,17 @@ vector<docstring> GuiCitation::searchKeys(
 			data = to_utf8(*it);
 		else if (field.empty())
 			data = to_utf8(*it) + ' ' + to_utf8(kvm.allData());
-		else if (kvm.hasField(field))
-			data = to_utf8(kvm.getValueForField(field));
+		else 
+			data = to_utf8(kvm[field]);
 		
 		if (data.empty())
 			continue;
 
 		try {
-			if (boost::regex_search(data, reg_exp))
+			if (lyx::regex_search(data, reg_exp))
 				foundKeys.push_back(*it);
 		}
-		catch (boost::regex_error & e) {
+		catch (lyx::regex_error & e) {
 			LYXERR(Debug::GUI, e.what());
 			return vector<docstring>();
 		}
@@ -745,11 +749,52 @@ vector<docstring> GuiCitation::searchKeys(
 }
 
 
+void GuiCitation::dispatchParams()
+{
+	std::string const lfun = InsetCommand::params2string(params_);
+	dispatch(FuncRequest(getLfun(), lfun));
+}
+
+
+BiblioInfo const & GuiCitation::bibInfo() const
+{
+	Buffer const & buf = documentBuffer();
+	buf.reloadBibInfoCache();
+	return buf.masterBibInfo();
+}
+
+
+void GuiCitation::saveSession() const
+{
+	Dialog::saveSession();
+	QSettings settings;
+	settings.setValue(
+		sessionKey() + "/regex", regexCB->isChecked());
+	settings.setValue(
+		sessionKey() + "/casesensitive", caseCB->isChecked());
+	settings.setValue(
+		sessionKey() + "/autofind", asTypeCB->isChecked());
+}
+
+
+void GuiCitation::restoreSession()
+{
+	Dialog::restoreSession();
+	QSettings settings;
+	regexCB->setChecked(
+		settings.value(sessionKey() + "/regex").toBool());
+	caseCB->setChecked(
+		settings.value(sessionKey() + "/casesensitive").toBool());
+	asTypeCB->setChecked(
+		settings.value(sessionKey() + "/autofind").toBool());
+}
+
+
 Dialog * createGuiCitation(GuiView & lv) { return new GuiCitation(lv); }
 
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCitation_moc.cpp"
+#include "moc_GuiCitation.cpp"