]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiCitation.cpp
Replay r36745
[lyx.git] / src / frontends / qt4 / GuiCitation.cpp
index f0fbc7ccf4f64a46e0c2466cd3703294967564b3..9da6f1016d3d3da83e432006114a2d5dbcba5e7a 100644 (file)
@@ -1,3 +1,4 @@
+
 /**
  * \file GuiCitation.cpp
  * This file is part of LyX, the document processor.
 
 #include "GuiCitation.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
+#include "GuiSelectionManager.h"
 #include "qt_helpers.h"
+
 #include "Buffer.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>
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-static vector<biblio::CiteStyle> citeStyles_;
+static vector<CiteStyle> citeStyles_;
 
 
 template<typename String>
@@ -75,13 +83,13 @@ static vector<lyx::docstring> to_docstring_vector(QStringList const & qlist)
 
 
 GuiCitation::GuiCitation(GuiView & lv)
-       : GuiCommand(lv, "citation")
+       : DialogView(lv, "citation", qt_("Citation")),
+         params_(insetCode("citation"))
 {
        setupUi(this);
-       setViewTitle(_("Citation"));
 
        connect(citationStyleCO, SIGNAL(activated(int)),
-               this, SLOT(changed()));
+               this, SLOT(on_citationStyleCO_currentIndexChanged(int)));
        connect(fulllistCB, SIGNAL(clicked()),
                this, SLOT(changed()));
        connect(forceuppercaseCB, SIGNAL(clicked()),
@@ -90,42 +98,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 +150,9 @@ void GuiCitation::applyView()
 
 void GuiCitation::showEvent(QShowEvent * e)
 {
-       init();
        findLE->clear();
        availableLV->setFocus();
-       GuiDialog::showEvent(e);
+       DialogView::showEvent(e);
 }
 
 
@@ -170,16 +180,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);
 }
 
 
@@ -187,123 +194,132 @@ void GuiCitation::updateView()
 // called in update() do not need to be called for INTERNAL updates,
 // 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 updateStyles() 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());
-       }
+// fillStyles() and updateStyle() doesn't lend itself to dividing the
+// 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::updateStyle()
+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;
-       fulllistCB->setEnabled(natbib_engine && haveSelection);
-       forceuppercaseCB->setEnabled(natbib_engine && haveSelection);
-       textBeforeED->setEnabled(!basic_engine && haveSelection);
-       textBeforeLA->setEnabled(!basic_engine && haveSelection);
-       textAfterED->setEnabled(haveSelection);
-       textAfterLA->setEnabled(haveSelection);
-       citationStyleCO->setEnabled(!basic_engine && haveSelection);
-       citationStyleLA->setEnabled(!basic_engine && haveSelection);
 
+       bool const isNocite = currentStyle == NOCITE;
+
+       bool const isCiteyear =
+               currentStyle == CITEYEAR ||
+               currentStyle == CITEYEARPAR;
+
+       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);
+       textAfterLA->setEnabled(haveSelection && !isNocite);
+       citationStyleCO->setEnabled(haveSelection);
+       citationStyleLA->setEnabled(haveSelection);
+}
+
+
+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()
+// 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)
 {
-       int const oldIndex = citationStyleCO->currentIndex();
-
-       citationStyleCO->clear();
+       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);
-
-       bool const basic_engine = (getEngine() == biblio::ENGINE_BASIC);
-
-       citationStyleCO->setEnabled(!sty.isEmpty() && !basic_engine);
-       citationStyleLA->setEnabled(!sty.isEmpty() && !basic_engine);
+       QStringList sty = citationStyles(bi, curr);
 
-       if (sty.isEmpty() || basic_engine)
+       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())
@@ -312,13 +328,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);
@@ -326,10 +342,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);
 }
 
 
@@ -342,13 +358,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()), buffer(), true));
+       infoML->document()->setHtml(keytxt);
 }
 
 
@@ -356,7 +375,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()))
@@ -370,23 +390,23 @@ void GuiCitation::findText(QString const & text, bool reset)
        
        //"All Entry Types" is first.
        index = entriesCO->currentIndex() - 1; 
-       vector<docstring> const & entries = availableEntries();
-       docstring entryType;
+       vector<docstring> const & entries = bi.getEntries();
+       docstring entry_type;
        if (index < 0 || index >= int(entries.size()))
-               entryType = from_ascii("");
+               entry_type = from_ascii("");
        else 
-               entryType = entries[index];
+               entry_type = entries[index];
        
        bool const case_sentitive = caseCB->checkState();
        bool const reg_exp = regexCB->checkState();
-       findKey(text, onlyKeys, field, entryType, 
+       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);
 }
 
 
@@ -402,12 +422,31 @@ void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/)
 }
 
 
+void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
+{
+       if (index >= 0 && index < citationStyleCO->count()) {
+               vector<CiteStyle> const & styles = citeStyles_;
+               updateFormatting(styles[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);
 }
 
 
@@ -423,24 +462,40 @@ 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()
 {
-       fillStyles();
        setButtons();
 }
 
 
-void GuiCitation::apply(int const choice, bool const full, bool const force,
+void GuiCitation::apply(int const choice, bool full, bool force,
        QString before, QString after)
 {
        if (cited_keys_.isEmpty())
                return;
 
-       vector<biblio::CiteStyle> const & styles = citeStyles_;
-
-       string const command =
-               biblio::CitationStyle(styles[choice], full, force)
-               .asLatexStr();
+       vector<CiteStyle> const & styles = citeStyles_;
+       if (styles[choice] == NOCITE) {
+               full = false;
+               force = false;
+               before.clear();
+               after.clear();
+       }
+       
+       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(","));
@@ -457,22 +512,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
@@ -482,11 +526,39 @@ 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,
-       docstring field, docstring entryType,
+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)
 {
        // Used for optimisation: store last searched string.
@@ -504,7 +576,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...
@@ -522,43 +594,25 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
 
        QStringList result;
        
-       // First, filter by entryType, which will be faster than 
+       // 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, entryType);
+       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, buffer()));
 }
 
 
@@ -570,22 +624,10 @@ void GuiCitation::setCitedKeys()
 
 bool GuiCitation::initialiseParams(string const & data)
 {
-       InsetCommandMailer::string2params(lfun_name_, data, params_);
-
-       biblio::CiteEngine const engine = buffer().params().getEngine();
-
-       bool use_styles = engine != biblio::ENGINE_BASIC;
-
-       bibkeysInfo_.fillWithBibKeys(&buffer());
-       
-       if (citeStyles_.empty())
-               citeStyles_ = biblio::getCiteStyles(engine);
-       else {
-               if ((use_styles && citeStyles_.size() == 1) ||
-                   (!use_styles && citeStyles_.size() != 1))
-                       citeStyles_ = biblio::getCiteStyles(engine);
-       }
-
+       InsetCommand::string2params(data, params_);
+       CiteEngine const engine = buffer().params().citeEngine();
+       citeStyles_ = citeStyles(engine);
+       init();
        return true;
 }
 
@@ -593,62 +635,34 @@ 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
+void GuiCitation::filterByEntryType(BiblioInfo const & bi,
+       vector<docstring> & keyVector, docstring entry_type) 
 {
-       return bibkeysInfo_.getEntries();
-}
-
-
-void GuiCitation::filterByEntryType(
-       vector<docstring> & keyVector, docstring entryType) 
-{
-       if (entryType.empty())
+       if (entry_type.empty())
                return;
        
        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 == entryType)
+               if (cit->second.entryType() == entry_type)
                        result.push_back(key);
        }
        keyVector = result;
 }
 
 
-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 buffer().params().citeEngine();
 }
 
 
@@ -661,9 +675,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
@@ -671,32 +685,32 @@ 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)
 {
        vector<docstring> foundKeys;
 
-       docstring expr = support::trim(search_expression);
+       docstring expr = trim(search_expression);
        if (expr.empty())
                return foundKeys;
 
        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>();
@@ -705,8 +719,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;
@@ -714,18 +728,18 @@ vector<docstring> GuiCitation::searchKeys(
                if (only_keys)
                        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));
+                       data = to_utf8(*it) + ' ' + to_utf8(kvm.allData());
+               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>();
                }
@@ -734,11 +748,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 = buffer();
+       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"