#include "qt_helpers.h"
#include "Buffer.h"
+#include "BufferView.h"
#include "BiblioInfo.h"
#include "BufferParams.h"
#include "FuncRequest.h"
#undef KeyPress
-#include <boost/regex.hpp>
+#include "support/regex.h"
#include <algorithm>
#include <string>
this, SLOT(changed()));
connect(textAfterED, SIGNAL(textChanged(QString)),
this, SLOT(changed()));
- connect(findLE, SIGNAL(returnPressed()),
+ 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,
+ selectionManager = new GuiSelectionManager(availableLV, selectedLV,
addPB, deletePB, upPB, downPB, &available_model_, &selected_model_);
connect(selectionManager, SIGNAL(selectionChanged()),
this, SLOT(setCitedKeys()));
this, SLOT(on_okPB_clicked()));
setFocusProxy(availableLV);
-
- // FIXME: the sizeHint() for this is _way_ too high
- infoML->setFixedHeight(60);
}
// such as when addPB is pressed, as the list of fields, entries, etc,
// will not have changed. At the moment, however, the division between
// fillStyles() and updateStyle() doesn't lend itself to dividing the
-// two methods, though they should be divisible.
+// 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)
{
- if (selectionManager->selectedFocused()) {
- if (selectedLV->selectionModel()->selectedIndexes().isEmpty())
- updateInfo(bi, availableLV->currentIndex());
- else
- updateInfo(bi, selectedLV->currentIndex());
- } else {
- if (availableLV->selectionModel()->selectedIndexes().isEmpty())
- updateInfo(bi, QModelIndex());
- else
- updateInfo(bi, availableLV->currentIndex());
- }
+ QModelIndex idx = selectionManager->getSelectedIndex();
+ updateInfo(bi, idx);
setButtons();
textBeforeED->setText(toqstr(params_["before"]));
void GuiCitation::updateFormatting(CiteStyle currentStyle)
{
CiteEngine const engine = citeEngine();
- bool const natbib_engine =
- engine == ENGINE_NATBIB_AUTHORYEAR ||
- engine == ENGINE_NATBIB_NUMERICAL;
+ bool const natbib_engine = engine == ENGINE_NATBIB;
bool const basic_engine = engine == ENGINE_BASIC;
bool const haveSelection =
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.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(BiblioInfo const & bi)
{
- int const oldIndex = citationStyleCO->currentIndex();
-
- citationStyleCO->clear();
-
QStringList selected_keys = selected_model_.stringList();
- if (selected_keys.empty()) {
+ 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(bi, curr);
- citationStyleCO->setEnabled(!sty.isEmpty());
- citationStyleLA->setEnabled(!sty.isEmpty());
-
- if (sty.isEmpty())
+ 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);
}
int const oldIndex = fieldsCO->currentIndex();
fieldsCO->clear();
QStringList const fields = to_qstring_list(bi.getFields());
- fieldsCO->insertItem(0, qt_("All Fields"));
+ fieldsCO->insertItem(0, qt_("All fields"));
fieldsCO->insertItem(1, qt_("Keys"));
fieldsCO->insertItems(2, fields);
if (oldIndex != -1 && oldIndex < fieldsCO->count())
int const oldIndex = entriesCO->currentIndex();
entriesCO->clear();
QStringList const entries = to_qstring_list(bi.getEntries());
- entriesCO->insertItem(0, qt_("All Entry Types"));
+ 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_model_.stringList().contains(str);
}
QString const keytxt = toqstr(
- bi.getInfo(qstring_to_ucs4(idx.data().toString())));
- infoML->document()->setPlainText(keytxt);
+ 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;
+ 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;
+ index = entriesCO->currentIndex() - 1;
vector<docstring> const & entries = bi.getEntries();
docstring entry_type;
if (index < 0 || index >= int(entries.size()))
entry_type = from_ascii("");
- else
+ else
entry_type = entries[index];
-
+
bool const case_sentitive = caseCB->checkState();
bool const reg_exp = regexCB->checkState();
- findKey(bi, text, onlyKeys, field, entry_type,
+ findKey(bi, text, onlyKeys, field, entry_type,
case_sentitive, reg_exp, reset);
//FIXME
- //It'd be nice to save and restore the current selection in
+ //It'd be nice to save and restore the current selection in
//availableLV. Currently, we get an automatic reset, since the
//model is reset.
-
+
updateControls(bi);
}
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);
last_searched_string = str;
QStringList result;
-
- // First, filter by entry_type, 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(bi, keyVector, entry_type);
-
+
if (str.isEmpty())
result = to_qstring_list(keyVector);
else
- result = to_qstring_list(searchKeys(bi, 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::citationStyles(BiblioInfo const & bi, int sel)
{
docstring const key = qstring_to_ucs4(cited_keys_[sel]);
- return to_qstring_list(bi.getCiteStrings(key, buffer()));
+ return to_qstring_list(bi.getCiteStrings(key, documentBuffer()));
}
-void GuiCitation::setCitedKeys()
+void GuiCitation::setCitedKeys()
{
cited_keys_ = selected_model_.stringList();
}
bool GuiCitation::initialiseParams(string const & data)
{
- InsetCommand::string2params("citation", data, params_);
- CiteEngine const engine = buffer().params().citeEngine();
- citeStyles_ = citeStyles(engine);
+ InsetCommand::string2params(data, params_);
+ CiteEngine const engine = citeEngine();
+ CiteEngineType const engine_type = citeEngineType();
+ citeStyles_ = citeStyles(engine, engine_type);
init();
return true;
}
void GuiCitation::filterByEntryType(BiblioInfo const & bi,
- vector<docstring> & keyVector, docstring entry_type)
+ vector<docstring> & keyVector, docstring entry_type)
{
if (entry_type.empty())
return;
-
+
vector<docstring>::iterator it = keyVector.begin();
vector<docstring>::iterator end = keyVector.end();
CiteEngine GuiCitation::citeEngine() const
{
- return buffer().params().citeEngine();
+ return documentBuffer().params().citeEngine();
+}
+
+
+CiteEngineType GuiCitation::citeEngineType() const
+{
+ return documentBuffer().params().citeEngineType();
}
{
// 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(BiblioInfo const & bi,
+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)
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>();
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))
+ 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>();
}
void GuiCitation::dispatchParams()
{
- std::string const lfun = InsetCommand::params2string("citation", params_);
+ std::string const lfun = InsetCommand::params2string(params_);
dispatch(FuncRequest(getLfun(), lfun));
}
BiblioInfo const & GuiCitation::bibInfo() const
{
- return buffer().masterBibInfo();
+ Buffer const & buf = documentBuffer();
+ buf.reloadBibInfoCache();
+ return buf.masterBibInfo();
}