+
/**
* \file GuiCitation.cpp
* This file is part of LyX, the document processor.
#include "GuiCitation.h"
-#include "debug.h"
-#include "gettext.h"
+#include "GuiSelectionManager.h"
#include "qt_helpers.h"
+
#include "Buffer.h"
+#include "BufferView.h"
+#include "BiblioInfo.h"
#include "BufferParams.h"
+#include "FuncRequest.h"
-#include "support/lstrings.h"
+#include "insets/InsetCommand.h"
+
+#include "support/debug.h"
#include "support/docstring.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
-#include "insets/InsetCommand.h"
+#include <QCloseEvent>
+#include <QSettings>
+#include <QShowEvent>
+#include <QVariant>
#include <vector>
#include <string>
-#include <QCloseEvent>
-
#undef KeyPress
-#include <boost/regex.hpp>
+#include "support/regex.h"
#include <algorithm>
#include <string>
#include <vector>
-using std::string;
-using std::vector;
-using std::pair;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
namespace frontend {
-static vector<biblio::CiteStyle> citeStyles_;
+// 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>
}
-GuiCitation::GuiCitation(LyXView & lv)
- : GuiCommand(lv, "citation")
+GuiCitation::GuiCitation(GuiView & lv)
+ : 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()),
this, SLOT(changed()));
connect(textBeforeED, SIGNAL(textChanged(QString)),
- this, SLOT(changed()));
+ this, SLOT(updateStyles()));
connect(textAfterED, SIGNAL(textChanged(QString)),
- this, SLOT(changed()));
- connect(clearPB, SIGNAL(clicked()),
- findLE, SLOT(clear()));
- connect(this, SIGNAL(rejected()), this, SLOT(cleanUp()));
+ this, SLOT(updateStyles()));
+ 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());
+ 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()));
- bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
+ setFocusProxy(availableLV);
}
-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 = std::max(0, citationStyleCO->currentIndex());
+ int const choice = max(0, citationStyleCO->currentIndex());
style_ = choice;
bool const full = fulllistCB->isChecked();
bool const force = forceuppercaseCB->isChecked();
QString const before = textBeforeED->text();
QString const after = textAfterED->text();
- apply(choice, full, force, before, after);
-}
-
-
-void GuiCitation::hideView()
-{
- clearParams();
- accept();
+ applyParams(choice, full, force, before, after);
}
-void GuiCitation::showView()
+void GuiCitation::showEvent(QShowEvent * e)
{
- init();
findLE->clear();
availableLV->setFocus();
- QDialog::show();
- raise();
- activateWindow();
+ DialogView::showEvent(e);
}
-bool GuiCitation::isVisibleView() const
+void GuiCitation::on_citationTB_currentChanged(int i)
{
- return QDialog::isVisible();
+ if (i == 0)
+ findLE->setFocus();
+ else if (citationStyleCO->isEnabled())
+ citationStyleCO->setFocus();
+ else
+ textAfterED->setFocus();
}
{
applyView();
clearSelection();
- hideView();
+ hide();
}
void GuiCitation::on_cancelPB_clicked()
{
clearSelection();
- hideView();
+ hide();
}
void GuiCitation::on_restorePB_clicked()
{
init();
- updateView();
}
-void GuiCitation::updateView()
+void GuiCitation::updateControls()
{
- init();
- 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 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());
- }
- setButtons();
-
- textBeforeED->setText(textBefore());
- textAfterED->setText(textAfter());
- fillStyles();
- updateStyle();
+// will not have changed.
+void GuiCitation::updateControls(BiblioInfo const & bi)
+{
+ QModelIndex idx = selectionManager->getSelectedIndex();
+ updateInfo(bi, idx);
+ selectionManager->update();
}
-void GuiCitation::updateStyle()
+void GuiCitation::updateFormatting(CitationStyle currentStyle)
{
- biblio::CiteEngine const engine = 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 = params_.getCmdName();
-
- // Find the style of the citekeys
- vector<biblio::CiteStyle> const & styles = citeStyles_;
- 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 GuiCitation::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 = 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 = citationStyles(curr);
-
- bool const basic_engine = (getEngine() == biblio::ENGINE_BASIC);
-
- citationStyleCO->setEnabled(!sty.isEmpty() && !basic_engine);
- citationStyleLA->setEnabled(!sty.isEmpty() && !basic_engine);
+ static const size_t max_length = 80;
+ QStringList sty = citationStyles(bi, max_length);
- 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 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())
}
-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);
}
-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);
}
void GuiCitation::setButtons()
{
- selectionManager->update();
int const srows = selectedLV->model()->rowCount();
applyPB->setEnabled(srows > 0);
okPB->setEnabled(srows > 0);
}
-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);
}
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();
+ 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 = 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];
-
+ entry_type = from_ascii("");
+ else
+ 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
+ //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 GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
+{
+ if (index >= 0 && index < citationStyleCO->count()) {
+ vector<CitationStyle> const & styles = citeStyles_;
+ updateFormatting(styles[index]);
+ changed();
+ }
+}
+
+
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);
}
}
+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::applyParams(int const choice, bool full, bool force,
QString before, QString after)
{
if (cited_keys_.isEmpty())
return;
- vector<biblio::CiteStyle> const & styles = citeStyles_;
+ vector<CitationStyle> const & styles = citeStyles_;
+
+ CitationStyle cs = styles[choice];
+
+ if (!cs.textBefore)
+ before.clear();
+ if (!cs.textAfter)
+ after.clear();
- string const command =
- biblio::CitationStyle(styles[choice], full, force)
- .asLatexStr();
+ cs.forceUpperCase &= force;
+ cs.fullAuthorList &= full;
+ string const command = citationStyleToString(cs);
params_.setCmdName(command);
params_["key"] = qstring_to_ucs4(cited_keys_.join(","));
}
-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
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.
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...
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()
-{
- return to_qstring_list(availableFields());
-}
-
-
-QStringList GuiCitation::getEntriesAsQStringList()
-{
- return to_qstring_list(availableEntries());
-}
-
-
-QStringList GuiCitation::citationStyles(int sel)
-{
- docstring const key = qstring_to_ucs4(cited_keys_[sel]);
- return to_qstring_list(bibkeysInfo_.getCiteStrings(key, buffer()));
+ available_model_.setStringList(result);
}
-QString GuiCitation::getKeyInfo(QString const & sel)
+QStringList GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
{
- return toqstr(getInfo(qstring_to_ucs4(sel)));
+ 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);
}
-void GuiCitation::setCitedKeys()
+void GuiCitation::setCitedKeys()
{
cited_keys_ = selected_model_.stringList();
+ updateStyles();
}
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_);
+ citeCmds_ = documentBuffer().params().citeCommands();
+ citeStyles_ = documentBuffer().params().citeStyles();
+ init();
return true;
}
void GuiCitation::clearParams()
{
params_.clear();
- bibkeysInfo_.clear();
-}
-
-
-vector<docstring> const GuiCitation::availableKeys() const
-{
- return bibkeysInfo_.getKeys();
}
-vector<docstring> const GuiCitation::availableFields() const
+void GuiCitation::filterByEntryType(BiblioInfo const & bi,
+ vector<docstring> & keyVector, docstring entry_type)
{
- return bibkeysInfo_.getFields();
-}
-
-
-vector<docstring> const GuiCitation::availableEntries() const
-{
- 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
-{
- if (bibkeysInfo_.empty())
- return docstring();
-
- return bibkeysInfo_.getInfo(key);
-}
-
-
// Escape special chars.
// All characters are literals except: '.|*?+(){}[]^$\'
// These characters are literals when preceded by a "\", which is done here
{
// 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
// 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(to_utf8(expr), case_sensitive ?
- boost::regex_constants::normal : boost::regex_constants::icase);
+ 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 = bibkeysInfo_.find(*it);
- if (info == bibkeysInfo_.end())
+ 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 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 &) {
+ catch (lyx::regex_error const & e) {
+ LYXERR(Debug::GUI, e.what());
return vector<docstring>();
}
}
}
-Dialog * createGuiCitation(LyXView & lv) { return new GuiCitation(lv); }
+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"