#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>
connect(selectionManager, SIGNAL(okHook()),
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)
{
QModelIndex idx = selectionManager->getSelectedIndex();
std::find(styles.begin(), styles.end(), cs.style);
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);
}
citationStyleCO->setCurrentIndex(oldIndex);
citationStyleCO->blockSignals(false);
-
- // simulate a change of index to trigger updateFormatting().
- on_citationStyleCO_currentIndexChanged(citationStyleCO->currentIndex());
}
}
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);
}
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);
- // restore the last used natbib style
- if (style_ >= 0 && style_ < citationStyleCO->count())
- citationStyleCO->setCurrentIndex(style_);
- else
- citationStyleCO->setCurrentIndex(0);
}
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()));
}
bool GuiCitation::initialiseParams(string const & data)
{
- InsetCommand::string2params("citation", data, params_);
- CiteEngine const engine = buffer().params().citeEngine();
+ InsetCommand::string2params(data, params_);
+ CiteEngine const engine = citeEngine();
citeStyles_ = citeStyles(engine);
init();
return true;
CiteEngine GuiCitation::citeEngine() const
{
- return buffer().params().citeEngine();
+ return documentBuffer().params().citeEngine();
}
{
// 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("\\\\$&")));
}
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>();
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
{
- buffer().checkBibInfoCache();
- return buffer().masterBibInfo();
+ Buffer const & buf = documentBuffer();
+ buf.reloadBibInfoCache();
+ return buf.masterBibInfo();
}
projects / lyx.git / blobdiff