]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiCitation.cpp
Speed up exit time
[lyx.git] / src / frontends / qt4 / GuiCitation.cpp
index 1bf47e6d802cf4e740812287c34c9156bb20528d..8f8a73bd27ddd86f26e741dd0b1439b60f9b5d4a 100644 (file)
@@ -1,3 +1,4 @@
+
 /**
  * \file GuiCitation.cpp
  * This file is part of LyX, the document processor.
 
 #include "GuiCitation.h"
 
-#include "debug.h"
-#include "gettext.h"
-#include "frontend_helpers.h"
+#include "GuiApplication.h"
+#include "GuiSelectionManager.h"
+#include "LyXToolBox.h"
 #include "qt_helpers.h"
 
-#include "support/lstrings.h"
+#include "Buffer.h"
+#include "BufferView.h"
+#include "BiblioInfo.h"
+#include "BufferParams.h"
+#include "FuncRequest.h"
+
+#include "insets/InsetCommand.h"
+
+#include "support/debug.h"
 #include "support/docstring.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
+#include <QCloseEvent>
+#include <QMenu>
+#include <QSettings>
+#include <QShowEvent>
+#include <QVariant>
 
 #include <vector>
 #include <string>
 
-#include <QCloseEvent>
-
 #undef KeyPress
 
+#include "support/regex.h"
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-using std::vector;
-using std::string;
+using namespace std;
+using namespace lyx::support;
+
+namespace lyx {
+namespace frontend {
+
+// FIXME THREAD
+// I am guessing that it would not hurt to make these private members.
+static vector<string> citeCmds_;
+static vector<CitationStyle> citeStyles_;
 
 
 template<typename String>
@@ -64,74 +89,99 @@ static vector<lyx::docstring> to_docstring_vector(QStringList const & qlist)
 }
 
 
-namespace lyx {
-namespace frontend {
-
-///////////////////////////////////////////////////////////////////////
-//
-// GuiCitationDialog
-//
-///////////////////////////////////////////////////////////////////////
-
-
-GuiCitationDialog::GuiCitationDialog(Dialog & dialog, GuiCitation * form)
-       : Dialog::View(dialog, _("Citation")), form_(form)
+GuiCitation::GuiCitation(GuiView & lv)
+       : DialogView(lv, "citation", qt_("Citation")),
+         params_(insetCode("citation"))
 {
        setupUi(this);
 
-       setWindowTitle(toqstr("LyX: " + getTitle()));
+       // The filter bar
+       filter_ = new FancyLineEdit(this);
+#if QT_VERSION >= 0x040600
+       filter_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "svgz,png"));
+       filter_->setButtonVisible(FancyLineEdit::Right, true);
+       filter_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
+       filter_->setAutoHideButton(FancyLineEdit::Right, true);
+#endif
+#if QT_VERSION >= 0x040700
+       filter_->setPlaceholderText(qt_("All avail. citations"));
+#endif
+
+       filterBarL->addWidget(filter_, 0);
+       findKeysLA->setBuddy(filter_);
+
+       // Add search options as button menu
+       regexp_ = new QAction(qt_("Regular e&xpression"), this);
+       regexp_->setCheckable(true);
+       casesense_ = new QAction(qt_("Case se&nsitive"), this);
+       casesense_->setCheckable(true);
+       instant_ = new QAction(qt_("Search as you &type"), this);
+       instant_->setCheckable(true);
+       instant_->setChecked(true);
+
+       QMenu * searchOpts = new QMenu(this);
+       searchOpts->addAction(regexp_);
+       searchOpts->addAction(casesense_);
+       searchOpts->addAction(instant_);
+       searchOptionsPB->setMenu(searchOpts);
 
        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()),
                this, SLOT(changed()));
-       connect(textBeforeED, SIGNAL(textChanged(const QString&)),
-               this, SLOT(changed()));
-       connect(textAfterED, SIGNAL(textChanged(const QString&)),
-               this, SLOT(changed()));
-       connect(clearPB, SIGNAL(clicked()),
-               findLE, SLOT(clear()));
-       connect(this, SIGNAL(rejected()), this, SLOT(cleanUp()));
-
-       selectionManager = 
-               new GuiSelectionManager(availableLV, selectedLV, 
-                                     addPB, deletePB, upPB, downPB, 
-                                     form_->available(), form_->selected());
+       connect(textBeforeED, SIGNAL(textChanged(QString)),
+               this, SLOT(updateStyles()));
+       connect(textAfterED, SIGNAL(textChanged(QString)),
+               this, SLOT(updateStyles()));
+       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_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()));
-
-}
+               this, SLOT(on_okPB_clicked()));
 
+       connect(filter_, SIGNAL(rightButtonClicked()),
+               this, SLOT(resetFilter()));
+       connect(filter_, SIGNAL(textEdited(QString)),
+               this, SLOT(filterChanged(QString)));
+       connect(filter_, SIGNAL(returnPressed()),
+               this, SLOT(filterPressed()));
+       connect(regexp_, SIGNAL(triggered()),
+               this, SLOT(regexChanged()));
+       connect(casesense_, SIGNAL(triggered()),
+               this, SLOT(caseChanged()));
+       connect(instant_, SIGNAL(triggered(bool)),
+               this, SLOT(instantChanged(bool)));
 
-GuiCitationDialog::~GuiCitationDialog()
-{}
+       setFocusProxy(filter_);
+}
 
 
-void GuiCitationDialog::cleanUp() 
+GuiCitation::~GuiCitation()
 {
-       form_->clearSelection();
-       form_->clearParams();
-       close();
+       delete selectionManager;
 }
 
 
-void GuiCitationDialog::closeEvent(QCloseEvent * e)
+void GuiCitation::closeEvent(QCloseEvent * e)
 {
-       form_->clearSelection();
-       form_->clearParams();
-       e->accept();
+       clearSelection();
+       DialogView::closeEvent(e);
 }
 
 
-void GuiCitationDialog::apply()
+void GuiCitation::applyView()
 {
-       int  const choice = std::max(0, citationStyleCO->currentIndex());
+       int const choice = max(0, citationStyleCO->currentIndex());
        style_ = choice;
        bool const full  = fulllistCB->isChecked();
        bool const force = forceuppercaseCB->isChecked();
@@ -139,192 +189,149 @@ void GuiCitationDialog::apply()
        QString const before = textBeforeED->text();
        QString const after = textAfterED->text();
 
-       form_->apply(choice, full, force, before, after);
-}
-
-
-void GuiCitationDialog::hide()
-{
-       form_->clearParams();
-       accept();
+       applyParams(choice, full, force, before, after);
 }
 
 
-void GuiCitationDialog::show()
+void GuiCitation::showEvent(QShowEvent * e)
 {
-       findLE->clear();
+       filter_->clear();
        availableLV->setFocus();
-       QDialog::show();
-       raise();
-       activateWindow();
+       DialogView::showEvent(e);
 }
 
 
-bool GuiCitationDialog::isVisible() const
+void GuiCitation::on_okPB_clicked()
 {
-       return QDialog::isVisible();
-}
-
-
-void GuiCitationDialog::on_okPB_clicked()
-{
-       apply();
-       form_->clearSelection();
+       applyView();
+       clearSelection();
        hide();
 }
 
 
-void GuiCitationDialog::on_cancelPB_clicked()
+void GuiCitation::on_cancelPB_clicked()
 {
-       form_->clearSelection();
+       clearSelection();
        hide();
 }
 
 
-void GuiCitationDialog::on_applyPB_clicked()
+void GuiCitation::on_applyPB_clicked()
 {
-       apply();
+       applyView();
 }
 
 
-void GuiCitationDialog::on_restorePB_clicked()
+void GuiCitation::on_restorePB_clicked()
 {
-       form_->init();
-       update();
+       init();
+       updateFilterHint();
 }
 
 
-void GuiCitationDialog::update()
+void GuiCitation::updateControls()
 {
-       fillFields();
-       fillEntries();
-       updateDialog();
+       BiblioInfo const & bi = bibInfo();
+       updateControls(bi);
 }
 
 
-//The main point of separating this out is that the fill*() methods
-//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 GuiCitationDialog::updateDialog()
+// The main point of separating this out is that the fill*() methods
+// 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.
+void GuiCitation::updateControls(BiblioInfo const & bi)
 {
-       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());
-       }
-       setButtons();
-
-       textBeforeED->setText(form_->textBefore());
-       textAfterED->setText(form_->textAfter());
-       fillStyles();
-       updateStyle();
+       QModelIndex idx = selectionManager->getSelectedIndex();
+       updateInfo(bi, idx);
+       int i = citationStyleCO->currentIndex();
+       if (i == -1)
+               i = 0;
+       updateFormatting(citeStyles_[i]);
+       selectionManager->update();
 }
 
 
-void GuiCitationDialog::updateStyle()
+void GuiCitation::updateFormatting(CitationStyle currentStyle)
 {
-       biblio::CiteEngine const engine = form_->getEngine();
-       bool const natbib_engine =
-               engine == biblio::ENGINE_NATBIB_AUTHORYEAR ||
-               engine == biblio::ENGINE_NATBIB_NUMERICAL;
-       bool const basic_engine = engine == biblio::ENGINE_BASIC;
+       bool const force = currentStyle.forceUpperCase;
+       bool const full = currentStyle.fullAuthorList &&
+               documentBuffer().params().fullAuthorList();
+       bool const textbefore = currentStyle.textBefore;
+       bool const textafter = currentStyle.textAfter;
 
-       bool const haveSelection = 
+       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);
-
-       string const & command = form_->params().getCmdName();
-
-       // Find the style of the citekeys
-       vector<biblio::CiteStyle> const & styles =
-               ControlCitation::getCiteStyles();
-       biblio::CitationStyle const cs(command);
-
-       vector<biblio::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);
-       } else {
-               fulllistCB->setChecked(false);
-               forceuppercaseCB->setChecked(false);
-       }
+       forceuppercaseCB->setEnabled(force && haveSelection);
+       fulllistCB->setEnabled(full && haveSelection);
+       textBeforeED->setEnabled(textbefore && haveSelection);
+       textBeforeLA->setEnabled(textbefore && haveSelection);
+       textAfterED->setEnabled(textafter && haveSelection);
+       textAfterLA->setEnabled(textafter && haveSelection);
+       citationStyleCO->setEnabled(haveSelection);
+       citationStyleLA->setEnabled(haveSelection);
 }
 
 
-//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 GuiCitationDialog::fillStyles()
+// Update the styles for the style combo, citationStyleCO, and mark the
+// settings as changed. Called upon changing the cited keys (including
+// merely reordering the keys) or editing the text before/after fields.
+void GuiCitation::updateStyles()
 {
-       int const oldIndex = citationStyleCO->currentIndex();
+       BiblioInfo const & bi = bibInfo();
+       updateStyles(bi);
+       changed();
+}
 
-       citationStyleCO->clear();
 
-       QStringList selected_keys = form_->selected()->stringList();
-       if (selected_keys.empty()) {
+// Update the styles for the style combo, citationStyleCO.
+void GuiCitation::updateStyles(BiblioInfo const & bi)
+{
+       QStringList selected_keys = selected_model_.stringList();
+       int curr = selectedLV->model()->rowCount() - 1;
+
+       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 = form_->citationStyles(curr);
+       static const size_t max_length = 80;
+       QStringList sty = citationStyles(bi, max_length);
 
-       bool const basic_engine =
-                       (form_->getEngine() == biblio::ENGINE_BASIC);
-
-       citationStyleCO->setEnabled(!sty.isEmpty() && !basic_engine);
-       citationStyleLA->setEnabled(!sty.isEmpty() && !basic_engine);
-
-       if (sty.isEmpty() || basic_engine)
+       if (sty.isEmpty()) {
+               // some error
+               citationStyleCO->setEnabled(false);
+               citationStyleLA->setEnabled(false);
+               citationStyleCO->clear();
                return;
+       }
 
-       citationStyleCO->insertItems(0, sty);
+       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 GuiCitationDialog::fillFields()
+void GuiCitation::fillFields(BiblioInfo const & bi)
 {
        fieldsCO->blockSignals(true);
        int const oldIndex = fieldsCO->currentIndex();
        fieldsCO->clear();
-       QStringList const & fields = form_->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())
@@ -333,13 +340,13 @@ void GuiCitationDialog::fillFields()
 }
 
 
-void GuiCitationDialog::fillEntries()
+void GuiCitation::fillEntries(BiblioInfo const & bi)
 {
        entriesCO->blockSignals(true);
        int const oldIndex = entriesCO->currentIndex();
        entriesCO->clear();
-       QStringList const & entries = form_->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);
@@ -347,196 +354,259 @@ void GuiCitationDialog::fillEntries()
 }
 
 
-bool GuiCitationDialog::isSelected(const QModelIndex & idx)
+bool GuiCitation::isSelected(QModelIndex const & idx)
 {
        QString const str = idx.data().toString();
-       return form_->selected()->stringList().contains(str);
+       return selected_model_.stringList().contains(str);
 }
 
 
-void GuiCitationDialog::setButtons()
+void GuiCitation::setButtons()
 {
-       selectionManager->update();
        int const srows = selectedLV->model()->rowCount();
        applyPB->setEnabled(srows > 0);
        okPB->setEnabled(srows > 0);
 }
 
 
-void GuiCitationDialog::updateInfo(QModelIndex const & idx)
+void GuiCitation::updateInfo(BiblioInfo const & bi, QModelIndex const & idx)
 {
-       if (idx.isValid()) {
-               QString const keytxt = form_->getKeyInfo(idx.data().toString());
-               infoML->document()->setPlainText(keytxt);
-       } else
+       if (!idx.isValid() || bi.empty()) {
                infoML->document()->clear();
-}
-
+               infoML->setToolTip(qt_("Displays a sketchy preview if a citation is selected above"));
+               return;
+       }
 
-void GuiCitationDialog::setCitedKeys() 
-{
-       form_->setCitedKeys();
+       infoML->setToolTip(qt_("Sketchy preview of the selected citation"));
+       QString const keytxt = toqstr(
+               bi.getInfo(qstring_to_ucs4(idx.data().toString()), documentBuffer(), true));
+       infoML->document()->setHtml(keytxt);
 }
 
 
-void GuiCitationDialog::findText(QString const & text, bool reset)
+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 = form_->availableFields();
+       int index = fieldsCO->currentIndex() - 2;
+       BiblioInfo const & bi = bibInfo();
+       vector<docstring> const & fields = bi.getFields();
        docstring field;
-       
+
        if (index <= -1 || index >= int(fields.size()))
                //either "All Fields" or "Keys" or an invalid value
                field = from_ascii("");
        else
                field = fields[index];
-       
+
        //Was it "Keys"?
        bool const onlyKeys = index == -1;
-       
+
        //"All Entry Types" is first.
-       index = entriesCO->currentIndex() - 1; 
-       vector<docstring> const & entries = form_->availableEntries();
-       docstring entryType;
+       index = entriesCO->currentIndex() - 1;
+       vector<docstring> const & entries = bi.getEntries();
+       docstring entry_type;
        if (index < 0 || index >= int(entries.size()))
-               entryType = from_ascii("");
-       else 
-               entryType = entries[index];
-       
-       bool const case_sentitive = caseCB->checkState();
-       bool const reg_exp = regexCB->checkState();
-       form_->findKey(text, onlyKeys, field, entryType, 
+               entry_type = from_ascii("");
+       else
+               entry_type = entries[index];
+
+       bool const case_sentitive = casesense_->isChecked();
+       bool const reg_exp = regexp_->isChecked();
+
+       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 
+       //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);
 }
 
 
-void GuiCitationDialog::on_fieldsCO_currentIndexChanged(int /*index*/)
+void GuiCitation::on_fieldsCO_currentIndexChanged(int /*index*/)
 {
-       findText(findLE->text(), true);
+       findText(filter_->text(), true);
 }
 
 
-void GuiCitationDialog::on_entriesCO_currentIndexChanged(int /*index*/)
+void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/)
 {
-       findText(findLE->text(), true);
+       findText(filter_->text(), true);
 }
 
 
-void GuiCitationDialog::on_findLE_textChanged(const QString & text)
+void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
 {
-       clearPB->setDisabled(text.isEmpty());
-       if (text.isEmpty())
-               findLE->setFocus();
-       findText(text);
+       if (index >= 0 && index < citationStyleCO->count()) {
+               vector<CitationStyle> const & styles = citeStyles_;
+               updateFormatting(styles[index]);
+               changed();
+       }
 }
 
 
-void GuiCitationDialog::on_caseCB_stateChanged(int)
+void GuiCitation::filterChanged(const QString & text)
 {
-       findText(findLE->text());
+       if (!text.isEmpty()) {
+               if (instant_->isChecked())
+                       findText(filter_->text());
+               return;
+       }
+       findText(filter_->text());
+       filter_->setFocus();
 }
 
 
-void GuiCitationDialog::on_regexCB_stateChanged(int)
+void GuiCitation::filterPressed()
 {
-       findText(findLE->text());
+       findText(filter_->text(), true);
 }
 
 
-void GuiCitationDialog::changed()
+void GuiCitation::resetFilter()
 {
-       fillStyles();
-       setButtons();
+       filter_->setText(QString());
+       findText(filter_->text(), true);
 }
 
-///////////////////////////////////////////////////////////////////////
-//
-// GuiCitation
-//
-///////////////////////////////////////////////////////////////////////
 
-GuiCitation::GuiCitation(Dialog & parent)
-       : ControlCitation(parent)
+void GuiCitation::caseChanged()
 {
+       findText(filter_->text());
 }
 
 
-void GuiCitation::apply(int const choice, bool const full, bool const force,
-                     QString before, QString after)
+void GuiCitation::regexChanged()
 {
-       if (cited_keys_.isEmpty())
-               return;
-
-       vector<biblio::CiteStyle> const & styles =
-               ControlCitation::getCiteStyles();
+       findText(filter_->text());
+}
 
-       string const command =
-               biblio::CitationStyle(styles[choice], full, force)
-               .asLatexStr();
 
-       params().setCmdName(command);
-       params()["key"] = qstring_to_ucs4(cited_keys_.join(","));
-       params()["before"] = qstring_to_ucs4(before);
-       params()["after"] = qstring_to_ucs4(after);
-       dispatchParams();
+void GuiCitation::updateFilterHint()
+{
+       QString const hint = instant_->isChecked() ?
+               qt_("Enter string to filter the list of available citations") :
+               qt_("Enter string to filter the list of available citations and press <Enter>");
+       filter_->setToolTip(hint);
 }
 
 
-void GuiCitation::clearSelection()
+void GuiCitation::instantChanged(bool checked)
 {
-       cited_keys_.clear();
-       selected_model_.setStringList(cited_keys_);
+       if (checked)
+               findText(filter_->text(), true);
+
+       updateFilterHint();
 }
 
 
-QString GuiCitation::textBefore()
+void GuiCitation::changed()
 {
-       return toqstr(params()["before"]);
+       setButtons();
 }
 
 
-QString GuiCitation::textAfter()
+void GuiCitation::applyParams(int const choice, bool full, bool force,
+       QString before, QString after)
 {
-       return toqstr(params()["after"]);
+       if (cited_keys_.isEmpty())
+               return;
+
+       vector<CitationStyle> const & styles = citeStyles_;
+
+       CitationStyle cs = styles[choice];
+
+       if (!cs.textBefore)
+               before.clear();
+       if (!cs.textAfter)
+               after.clear();
+
+       cs.forceUpperCase &= force;
+       cs.fullAuthorList &= full;
+       string const command = citationStyleToString(cs);
+
+       params_.setCmdName(command);
+       params_["key"] = qstring_to_ucs4(cited_keys_.join(","));
+       params_["before"] = qstring_to_ucs4(before);
+       params_["after"] = qstring_to_ucs4(after);
+       dispatchParams();
 }
 
 
-bool GuiCitation::initialiseParams(std::string const & data)
+void GuiCitation::clearSelection()
 {
-       if (!ControlCitation::initialiseParams(data))
-               return false;
-       init();
-       return true;
+       cited_keys_.clear();
+       selected_model_.setStringList(cited_keys_);
 }
 
 
 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
-       QString str = toqstr(params()["key"]);
+       QString str = toqstr(params_["key"]);
        if (str.isEmpty())
                cited_keys_.clear();
        else
                cited_keys_ = str.split(",");
        selected_model_.setStringList(cited_keys_);
+
+       // Initialize the drop downs
+       fillEntries(bi);
+       fillFields(bi);
+
+       // Initialize the citation formatting
+       string const & cmd = params_.getCmdName();
+       CitationStyle const cs = citationStyleFromString(cmd);
+       forceuppercaseCB->setChecked(cs.forceUpperCase);
+       fulllistCB->setChecked(cs.fullAuthorList &&
+               documentBuffer().params().fullAuthorList());
+       textBeforeED->setText(toqstr(params_["before"]));
+       textAfterED->setText(toqstr(params_["after"]));
+
+       // Update the interface
+       updateControls(bi);
+       updateStyles(bi);
+       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);
+
+               // Find the citation style
+               vector<string> const & cmds = citeCmds_;
+               vector<string>::const_iterator cit =
+                       std::find(cmds.begin(), cmds.end(), cs.cmd);
+               int i = 0;
+               if (cit != cmds.end())
+                       i = int(cit - cmds.begin());
+
+               // Set the style combo appropriately
+               citationStyleCO->blockSignals(true);
+               citationStyleCO->setCurrentIndex(i);
+               citationStyleCO->blockSignals(false);
+               updateFormatting(citeStyles_[i]);
+       } else
+               availableLV->setFocus();
+
+       applyPB->setEnabled(false);
+       okPB->setEnabled(false);
 }
 
 
-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)
 {
+       // FIXME THREAD
        // Used for optimisation: store last searched string.
        static QString last_searched_string;
        // Used to disable the above optimisation.
@@ -545,14 +615,14 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
        // Reset last_searched_string in case of changed option.
        if (last_case_sensitive != case_sensitive
                || last_reg_exp != reg_exp) {
-                       LYXERR(Debug::GUI) << "GuiCitation::findKey: optimisation disabled!" << std::endl;
+                       LYXERR(Debug::GUI, "GuiCitation::findKey: optimisation disabled!");
                last_searched_string.clear();
        }
        // save option for next search.
        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...
@@ -569,53 +639,211 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
        last_searched_string = str;
 
        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()
+QStringList GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
 {
-       return to_qstring_list(availableFields());
+       docstring const before = qstring_to_ucs4(textBeforeED->text());
+       docstring const after = qstring_to_ucs4(textAfterED->text());
+       vector<docstring> const keys = to_docstring_vector(cited_keys_);
+       vector<CitationStyle> styles = citeStyles_;
+       // FIXME: pass a dictionary instead of individual before, after, dialog, etc.
+       vector<docstring> ret = bi.getCiteStrings(keys, styles, documentBuffer(),
+               before, after, from_utf8("dialog"), max_size);
+       return to_qstring_list(ret);
 }
 
 
-QStringList GuiCitation::getEntriesAsQStringList()
+void GuiCitation::setCitedKeys()
 {
-       return to_qstring_list(availableEntries());
+       cited_keys_ = selected_model_.stringList();
+       updateStyles();
 }
 
 
-QStringList GuiCitation::citationStyles(int sel)
+bool GuiCitation::initialiseParams(string const & data)
 {
-       docstring const key = qstring_to_ucs4(cited_keys_[sel]);
-       return to_qstring_list(getCiteStrings(key));
+       InsetCommand::string2params(data, params_);
+       citeCmds_ = documentBuffer().params().citeCommands();
+       citeStyles_ = documentBuffer().params().citeStyles();
+       init();
+       return true;
 }
 
 
-QString GuiCitation::getKeyInfo(QString const & sel)
+void GuiCitation::clearParams()
 {
-       return toqstr(getInfo(qstring_to_ucs4(sel)));
+       params_.clear();
 }
 
-void GuiCitation::setCitedKeys() 
+
+void GuiCitation::filterByEntryType(BiblioInfo const & bi,
+       vector<docstring> & keyVector, docstring entry_type)
 {
-       cited_keys_ = selected_model_.stringList();
+       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 = bi.find(key);
+               if (cit == bi.end())
+                       continue;
+               if (cit->second.entryType() == entry_type)
+                       result.push_back(key);
+       }
+       keyVector = result;
+}
+
+
+// Escape special chars.
+// All characters are literals except: '.|*?+(){}[]^$\'
+// These characters are literals when preceded by a "\", which is done here
+// @todo: This function should be moved to support, and then the test in tests
+//        should be moved there as well.
+static docstring escape_special_chars(docstring const & expr)
+{
+       // Search for all chars '.|*?+(){}[^$]\'
+       // Note that '[', ']', and '\' must be escaped.
+       static const lyx::regex reg("[.|*?+(){}^$\\[\\]\\\\]");
+
+       // $& is an ECMAScript format expression that expands to all
+       // of the current match
+#if defined(LYX_USE_CXX11) && defined(LYX_USE_STD_REGEX)
+       // To prefix a matched expression with a single literal backslash, we
+       // need to escape it for the C++ compiler and use:
+       // FIXME: UNICODE
+       return from_utf8(lyx::regex_replace(to_utf8(expr), reg, string("\\$&")));
+#else
+       // A backslash in the format string starts an escape sequence in boost.
+       // Thus, to prefix a matched expression with a single literal backslash,
+       // we need to give two backslashes to the regex engine, and escape both
+       // for the C++ compiler and use:
+       // FIXME: UNICODE
+       return from_utf8(lyx::regex_replace(to_utf8(expr), reg, string("\\\\$&")));
+#endif
+}
+
+
+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 = 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 lyx::regex.
+               expr = escape_special_chars(expr);
+
+       lyx::regex reg_exp;
+       try {
+               reg_exp.assign(to_utf8(expr), case_sensitive ?
+                       lyx::regex_constants::ECMAScript : lyx::regex_constants::icase);
+       } catch (lyx::regex_error const & e) {
+               // lyx::regex throws an exception if the regular expression is not
+               // valid.
+               LYXERR(Debug::GUI, e.what());
+               return vector<docstring>();
+       }
+
+       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 = bi.find(*it);
+               if (info == bi.end())
+                       continue;
+
+               BibTeXInfo const & kvm = info->second;
+               string data;
+               if (only_keys)
+                       data = to_utf8(*it);
+               else if (field.empty())
+                       data = to_utf8(*it) + ' ' + to_utf8(kvm.allData());
+               else
+                       data = to_utf8(kvm[field]);
+
+               if (data.empty())
+                       continue;
+
+               try {
+                       if (lyx::regex_search(data, reg_exp))
+                               foundKeys.push_back(*it);
+               }
+               catch (lyx::regex_error const & e) {
+                       LYXERR(Debug::GUI, e.what());
+                       return vector<docstring>();
+               }
+       }
+       return foundKeys;
 }
 
+
+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(QSettings & settings) const
+{
+       Dialog::saveSession(settings);
+       settings.setValue(
+               sessionKey() + "/regex", regexp_->isChecked());
+       settings.setValue(
+               sessionKey() + "/casesensitive", casesense_->isChecked());
+       settings.setValue(
+               sessionKey() + "/autofind", instant_->isChecked());
+}
+
+
+void GuiCitation::restoreSession()
+{
+       Dialog::restoreSession();
+       QSettings settings;
+       regexp_->setChecked(settings.value(sessionKey() + "/regex").toBool());
+       casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
+       instant_->setChecked(settings.value(sessionKey() + "/autofind").toBool());
+       updateFilterHint();
+}
+
+
+Dialog * createGuiCitation(GuiView & lv) { return new GuiCitation(lv); }
+
+
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCitation_moc.cpp"
+#include "moc_GuiCitation.cpp"