X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCitation.cpp;h=35f7e913a7fc835638c4e4251d2a52fa78cdb452;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=d8041d5cb31afac374073a00c286acba7df60232;hpb=f2c9b56fb4e4abd5183858984dd9329453004c96;p=lyx.git diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp index d8041d5cb3..35f7e913a7 100644 --- a/src/frontends/qt4/GuiCitation.cpp +++ b/src/frontends/qt4/GuiCitation.cpp @@ -1,3 +1,4 @@ + /** * \file GuiCitation.cpp * This file is part of LyX, the document processor. @@ -15,9 +16,13 @@ #include "GuiCitation.h" +#include "GuiSelectionManager.h" #include "qt_helpers.h" + #include "Buffer.h" +#include "BiblioInfo.h" #include "BufferParams.h" +#include "FuncRequest.h" #include "insets/InsetCommand.h" @@ -27,7 +32,9 @@ #include "support/lstrings.h" #include +#include #include +#include #include #include @@ -46,7 +53,7 @@ using namespace lyx::support; namespace lyx { namespace frontend { -static vector citeStyles_; +static vector citeStyles_; template @@ -76,7 +83,8 @@ static vector to_docstring_vector(QStringList const & qlist) GuiCitation::GuiCitation(GuiView & lv) - : GuiCommand(lv, "citation", qt_("Citation")) + : DialogView(lv, "citation", qt_("Citation")), + params_(insetCode("citation")) { setupUi(this); @@ -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(); - e->accept(); + 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); } @@ -189,43 +196,49 @@ void GuiCitation::updateView() // 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. -void GuiCitation::updateDialog() +void GuiCitation::updateControls(BiblioInfo const & bi) { if (selectionManager->selectedFocused()) { if (selectedLV->selectionModel()->selectedIndexes().isEmpty()) - updateInfo(availableLV->currentIndex()); + updateInfo(bi, availableLV->currentIndex()); else - updateInfo(selectedLV->currentIndex()); + updateInfo(bi, selectedLV->currentIndex()); } else { if (availableLV->selectionModel()->selectedIndexes().isEmpty()) - updateInfo(QModelIndex()); + updateInfo(bi, QModelIndex()); else - updateInfo(availableLV->currentIndex()); + updateInfo(bi, availableLV->currentIndex()); } setButtons(); - textBeforeED->setText(textBefore()); - textAfterED->setText(textAfter()); - fillStyles(); + textBeforeED->setText(toqstr(params_["before"])); + textAfterED->setText(toqstr(params_["after"])); + fillStyles(bi); updateStyle(); } -void GuiCitation::updateFormatting(biblio::CiteStyle currentStyle) +void GuiCitation::updateFormatting(CiteStyle currentStyle) { - biblio::CiteEngine const engine = citeEngine(); + 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; - bool const isNocite = currentStyle == biblio::NOCITE; + bool const isNocite = currentStyle == NOCITE; - fulllistCB->setEnabled(natbib_engine && haveSelection && !isNocite); - forceuppercaseCB->setEnabled(natbib_engine && haveSelection && !isNocite); + 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); @@ -240,10 +253,10 @@ void GuiCitation::updateStyle() string const & command = params_.getCmdName(); // Find the style of the citekeys - vector const & styles = citeStyles_; - biblio::CitationStyle const cs(command); + vector const & styles = citeStyles_; + CitationStyle const cs = citationStyleFromString(command); - vector::const_iterator cit = + vector::const_iterator cit = std::find(styles.begin(), styles.end(), cs.style); // restore the latest natbib style @@ -256,7 +269,7 @@ void GuiCitation::updateStyle() int const i = int(cit - styles.begin()); citationStyleCO->setCurrentIndex(i); fulllistCB->setChecked(cs.full); - forceuppercaseCB->setChecked(cs.forceUCase); + forceuppercaseCB->setChecked(cs.forceUpperCase); } else { fulllistCB->setChecked(false); forceuppercaseCB->setChecked(false); @@ -264,16 +277,16 @@ void GuiCitation::updateStyle() 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()->stringList(); + QStringList selected_keys = selected_model_.stringList(); if (selected_keys.empty()) { citationStyleCO->setEnabled(false); citationStyleLA->setEnabled(false); @@ -287,7 +300,7 @@ void GuiCitation::fillStyles() if (!selectedLV->selectionModel()->selectedIndexes().empty()) curr = selectedLV->selectionModel()->selectedIndexes()[0].row(); - QStringList sty = citationStyles(curr); + QStringList sty = citationStyles(bi, curr); citationStyleCO->setEnabled(!sty.isEmpty()); citationStyleLA->setEnabled(!sty.isEmpty()); @@ -302,13 +315,13 @@ void GuiCitation::fillStyles() } -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()) @@ -317,13 +330,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); @@ -334,7 +347,7 @@ void GuiCitation::fillEntries() bool GuiCitation::isSelected(const QModelIndex & idx) { QString const str = idx.data().toString(); - return selected()->stringList().contains(str); + return selected_model_.stringList().contains(str); } @@ -347,13 +360,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()))); + infoML->document()->setPlainText(keytxt); } @@ -361,7 +377,8 @@ void GuiCitation::findText(QString const & text, bool reset) { //"All Fields" and "Keys" are the first two int index = fieldsCO->currentIndex() - 2; - vector const & fields = availableFields(); + BiblioInfo const & bi = bibInfo(); + vector const & fields = bi.getFields(); docstring field; if (index <= -1 || index >= int(fields.size())) @@ -375,7 +392,7 @@ void GuiCitation::findText(QString const & text, bool reset) //"All Entry Types" is first. index = entriesCO->currentIndex() - 1; - vector const & entries = availableEntries(); + vector const & entries = bi.getEntries(); docstring entry_type; if (index < 0 || index >= int(entries.size())) entry_type = from_ascii(""); @@ -384,14 +401,14 @@ void GuiCitation::findText(QString const & text, bool reset) bool const case_sentitive = caseCB->checkState(); bool const reg_exp = regexCB->checkState(); - findKey(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 //availableLV. Currently, we get an automatic reset, since the //model is reset. - updateDialog(); + updateControls(bi); } @@ -410,7 +427,7 @@ void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/) void GuiCitation::on_citationStyleCO_currentIndexChanged(int index) { if (index >= 0 && index < citationStyleCO->count()) { - vector const & styles = citeStyles_; + vector const & styles = citeStyles_; updateFormatting(styles[index]); } } @@ -418,10 +435,20 @@ void GuiCitation::on_citationStyleCO_currentIndexChanged(int 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); } @@ -437,6 +464,15 @@ 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() { setButtons(); @@ -449,17 +485,19 @@ void GuiCitation::apply(int const choice, bool full, bool force, if (cited_keys_.isEmpty()) return; - vector const & styles = citeStyles_; - if (styles[choice] == biblio::NOCITE) { + vector const & styles = citeStyles_; + if (styles[choice] == NOCITE) { full = false; force = false; before.clear(); after.clear(); } - string const command = - biblio::CitationStyle(styles[choice], full, force) - .asLatexStr(); + 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(",")); @@ -476,22 +514,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 @@ -501,10 +528,14 @@ void GuiCitation::init() else cited_keys_ = str.split(","); selected_model_.setStringList(cited_keys_); + fillFields(bi); + fillEntries(bi); + updateControls(bi); } -void GuiCitation::findKey(QString const & str, bool only_keys, +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) { @@ -523,7 +554,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... @@ -544,40 +575,22 @@ void GuiCitation::findKey(QString const & str, bool only_keys, // First, filter by entry_type, which will be faster than // what follows, so we may get to do that on less. vector keyVector = to_docstring_vector(keys); - filterByEntryType(keyVector, entry_type); + 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())); } @@ -589,10 +602,10 @@ void GuiCitation::setCitedKeys() bool GuiCitation::initialiseParams(string const & data) { - InsetCommandMailer::string2params(lfun_name_, data, params_); - biblio::CiteEngine const engine = buffer().params().citeEngine(); - bibkeysInfo_.fillWithBibKeys(&buffer()); - citeStyles_ = biblio::getCiteStyles(engine); + InsetCommand::string2params("citation", data, params_); + CiteEngine const engine = buffer().params().citeEngine(); + citeStyles_ = citeStyles(engine); + init(); return true; } @@ -600,29 +613,10 @@ bool GuiCitation::initialiseParams(string const & data) void GuiCitation::clearParams() { params_.clear(); - bibkeysInfo_.clear(); -} - - -vector GuiCitation::availableKeys() const -{ - return bibkeysInfo_.getKeys(); -} - - -vector GuiCitation::availableFields() const -{ - return bibkeysInfo_.getFields(); -} - - -vector GuiCitation::availableEntries() const -{ - return bibkeysInfo_.getEntries(); } -void GuiCitation::filterByEntryType( +void GuiCitation::filterByEntryType(BiblioInfo const & bi, vector & keyVector, docstring entry_type) { if (entry_type.empty()) @@ -630,12 +624,12 @@ void GuiCitation::filterByEntryType( vector::iterator it = keyVector.begin(); vector::iterator end = keyVector.end(); - + vector 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() == entry_type) result.push_back(key); @@ -644,21 +638,12 @@ void GuiCitation::filterByEntryType( } -biblio::CiteEngine GuiCitation::citeEngine() const +CiteEngine GuiCitation::citeEngine() const { return buffer().params().citeEngine(); } -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 @@ -682,7 +667,7 @@ static docstring escape_special_chars(docstring const & expr) } -vector GuiCitation::searchKeys( +vector GuiCitation::searchKeys(BiblioInfo const & bi, vector const & keys_to_search, bool only_keys, docstring const & search_expression, docstring field, bool case_sensitive, bool regex) @@ -712,8 +697,8 @@ vector GuiCitation::searchKeys( vector::const_iterator it = keys_to_search.begin(); vector::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; @@ -722,8 +707,8 @@ vector GuiCitation::searchKeys( 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)); + else + data = to_utf8(kvm[field]); if (data.empty()) continue; @@ -741,11 +726,51 @@ vector GuiCitation::searchKeys( } +void GuiCitation::dispatchParams() +{ + std::string const lfun = InsetCommand::params2string("citation", params_); + dispatch(FuncRequest(getLfun(), lfun)); +} + + +BiblioInfo const & GuiCitation::bibInfo() const +{ + buffer().checkBibInfoCache(); + return buffer().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"