#include "GuiCitation.h"
+#include "GuiApplication.h"
#include "GuiSelectionManager.h"
+#include "LyXToolBox.h"
#include "qt_helpers.h"
#include "Buffer.h"
#include "BufferView.h"
#include "BiblioInfo.h"
#include "BufferParams.h"
+#include "TextClass.h"
#include "FuncRequest.h"
#include "insets/InsetCommand.h"
#include "support/lstrings.h"
#include <QCloseEvent>
+#include <QMenu>
#include <QSettings>
#include <QShowEvent>
#include <QVariant>
GuiCitation::GuiCitation(GuiView & lv)
: DialogView(lv, "citation", qt_("Citation")),
- params_(insetCode("citation"))
+ style_(0), params_(insetCode("citation"))
{
setupUi(this);
+ // The filter bar
+ filter_ = new FancyLineEdit(this);
+ 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);
+ filter_->setPlaceholderText(qt_("All avail. citations"));
+
+ 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(on_citationStyleCO_currentIndexChanged(int)));
- connect(fulllistCB, SIGNAL(clicked()),
+ connect(starredCB, SIGNAL(clicked()),
this, SLOT(changed()));
connect(forceuppercaseCB, SIGNAL(clicked()),
this, SLOT(changed()));
this, SLOT(updateStyles()));
connect(textAfterED, SIGNAL(textChanged(QString)),
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()),
connect(selectionManager, SIGNAL(okHook()),
this, SLOT(on_okPB_clicked()));
- setFocusProxy(availableLV);
+ 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)));
+
+ setFocusProxy(filter_);
}
{
int const choice = max(0, citationStyleCO->currentIndex());
style_ = choice;
- bool const full = fulllistCB->isChecked();
+ bool const full = starredCB->isChecked();
bool const force = forceuppercaseCB->isChecked();
QString const before = textBeforeED->text();
void GuiCitation::showEvent(QShowEvent * e)
{
- findLE->clear();
+ filter_->clear();
availableLV->setFocus();
DialogView::showEvent(e);
}
-void GuiCitation::on_citationTB_currentChanged(int i)
-{
- if (i == 0)
- findLE->setFocus();
- else if (citationStyleCO->isEnabled())
- citationStyleCO->setFocus();
- else
- textAfterED->setFocus();
-}
-
-
void GuiCitation::on_okPB_clicked()
{
applyView();
void GuiCitation::on_restorePB_clicked()
{
init();
+ updateFilterHint();
}
void GuiCitation::updateFormatting(CitationStyle currentStyle)
{
+ BufferParams const bp = documentBuffer().params();
bool const force = currentStyle.forceUpperCase;
- bool const full = currentStyle.fullAuthorList &&
- documentBuffer().params().fullAuthorList();
+ bool const starred = currentStyle.hasStarredVersion;
+ bool const full = starred && bp.fullAuthorList();
bool const textbefore = currentStyle.textBefore;
bool const textafter = currentStyle.textAfter;
selectedLV->model()->rowCount() > 0;
forceuppercaseCB->setEnabled(force && haveSelection);
- fulllistCB->setEnabled(full && haveSelection);
+ starredCB->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);
+
+ // Check if we have a custom string/tooltip for the starred version
+ if (starred && !currentStyle.stardesc.empty()) {
+ string val =
+ bp.documentClass().getCiteMacro(bp.citeEngineType(), currentStyle.stardesc);
+ docstring guistring;
+ if (!val.empty()) {
+ guistring = translateIfPossible(from_utf8(val));
+ starredCB->setText(toqstr(guistring));
+ starredCB->setEnabled(haveSelection);
+ }
+ if (!currentStyle.startooltip.empty()) {
+ val = bp.documentClass().getCiteMacro(bp.citeEngineType(),
+ currentStyle.startooltip);
+ if (!val.empty())
+ guistring = translateIfPossible(from_utf8(val));
+ }
+ // Tooltip might also be empty
+ starredCB->setToolTip(toqstr(guistring));
+ } else {
+ // This is the default meaning of the starred commands
+ starredCB->setText(qt_("All aut&hors"));
+ starredCB->setToolTip(qt_("Always list all authors (rather than using \"et al.\")"));
+ }
}
citationStyleCO->blockSignals(true);
// save old index
- int const oldIndex = citationStyleCO->currentIndex();
+ int const curindex = citationStyleCO->currentIndex();
+ int const oldIndex = (curindex < 0) ? style_ : curindex;
citationStyleCO->clear();
citationStyleCO->insertItems(0, sty);
citationStyleCO->setEnabled(true);
{
if (!idx.isValid() || bi.empty()) {
infoML->document()->clear();
+ infoML->setToolTip(qt_("Displays a sketchy preview if a citation is selected above"));
return;
}
+ 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);
else
entry_type = entries[index];
- bool const case_sentitive = caseCB->checkState();
- bool const reg_exp = regexCB->checkState();
+ 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
void GuiCitation::on_fieldsCO_currentIndexChanged(int /*index*/)
{
- findText(findLE->text(), true);
+ findText(filter_->text(), true);
}
void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/)
{
- findText(findLE->text(), true);
+ findText(filter_->text(), true);
}
}
-void GuiCitation::on_findLE_textChanged(const QString & text)
+void GuiCitation::filterChanged(const QString & text)
{
- bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked);
- searchPB->setDisabled(text.isEmpty() || searchAsWeGo);
if (!text.isEmpty()) {
- if (searchAsWeGo)
- findText(findLE->text());
+ if (instant_->isChecked())
+ findText(filter_->text());
return;
}
- findText(findLE->text());
- findLE->setFocus();
+ findText(filter_->text());
+ filter_->setFocus();
+}
+
+
+void GuiCitation::filterPressed()
+{
+ findText(filter_->text(), true);
}
-void GuiCitation::on_searchPB_clicked()
+
+void GuiCitation::resetFilter()
{
- findText(findLE->text(), true);
+ filter_->setText(QString());
+ findText(filter_->text(), true);
}
-void GuiCitation::on_caseCB_stateChanged(int)
+void GuiCitation::caseChanged()
{
- findText(findLE->text());
+ findText(filter_->text());
}
-void GuiCitation::on_regexCB_stateChanged(int)
+void GuiCitation::regexChanged()
{
- findText(findLE->text());
+ findText(filter_->text());
}
-void GuiCitation::on_asTypeCB_stateChanged(int)
+void GuiCitation::updateFilterHint()
{
- bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked);
- searchPB->setDisabled(findLE->text().isEmpty() || searchAsWeGo);
- if (searchAsWeGo)
- findText(findLE->text(), true);
+ 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::instantChanged(bool checked)
+{
+ if (checked)
+ findText(filter_->text(), true);
+
+ updateFilterHint();
}
after.clear();
cs.forceUpperCase &= force;
- cs.fullAuthorList &= full;
+ cs.hasStarredVersion &= full;
string const command = citationStyleToString(cs);
params_.setCmdName(command);
// Initialize the citation formatting
string const & cmd = params_.getCmdName();
- CitationStyle const cs = citationStyleFromString(cmd);
+ CitationStyle const cs =
+ citationStyleFromString(cmd, documentBuffer().params());
forceuppercaseCB->setChecked(cs.forceUpperCase);
- fulllistCB->setChecked(cs.fullAuthorList &&
+ starredCB->setChecked(cs.hasStarredVersion &&
documentBuffer().params().fullAuthorList());
textBeforeED->setText(toqstr(params_["before"]));
textAfterED->setText(toqstr(params_["after"]));
// Find the citation style
vector<string> const & cmds = citeCmds_;
vector<string>::const_iterator cit =
- std::find(cmds.begin(), cmds.end(), cs.cmd);
+ std::find(cmds.begin(), cmds.end(), cs.name);
int i = 0;
if (cit != cmds.end())
i = int(cit - cmds.begin());
bool case_sensitive, bool reg_exp, bool reset)
{
// FIXME THREAD
+ // This should be moved to a class member.
// Used for optimisation: store last searched string.
static QString last_searched_string;
// Used to disable the above optimisation.
citeCmds_ = documentBuffer().params().citeCommands();
citeStyles_ = documentBuffer().params().citeStyles();
init();
-
- // Set the minimal size of the QToolbox. Without this, the size of the
- // QToolbox is only determined by values in the ui file (e.g. computed by
- // qtcreator) and therefore causes portability and localisation issues. In
- // the future, this should be integrated into a custom widget if plans are
- // made to generalise such a use of QToolboxes. Note that the page widgets
- // must have a layout with layoutSizeContraint = SetMinimumSize or similar.
- if (!isVisible()) {
- // only reliable way to get the size calculations up-to-date
- show();
- layout()->invalidate();
- hide();
- // this does not show any window since hide() is called before
- // relinquishing control
- }
- QSize minimum_size = QSize(0,0);
- // Compute the max of the minimal sizes of the pages
- QWidget * page;
- for (int i = 0; (page = citationTB->widget(i)); ++i)
- minimum_size = minimum_size.expandedTo(page->minimumSizeHint());
- // Add the height of the tabs
- if (citationTB->currentWidget())
- minimum_size.rheight() += citationTB->height() -
- citationTB->currentWidget()->height();
- citationTB->setMinimumSize(minimum_size);
- updateGeometry();
-
return true;
}
// $& is an ECMAScript format expression that expands to all
// of the current match
-#if defined(LYX_USE_CXX11) && defined(LYX_USE_STD_REGEX)
+#ifdef 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
Dialog::saveSession();
QSettings settings;
settings.setValue(
- sessionKey() + "/regex", regexCB->isChecked());
+ sessionKey() + "/regex", regexp_->isChecked());
+ settings.setValue(
+ sessionKey() + "/casesensitive", casesense_->isChecked());
settings.setValue(
- sessionKey() + "/casesensitive", caseCB->isChecked());
+ sessionKey() + "/autofind", instant_->isChecked());
settings.setValue(
- sessionKey() + "/autofind", asTypeCB->isChecked());
+ sessionKey() + "/citestyle", style_);
}
{
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());
+ regexp_->setChecked(settings.value(sessionKey() + "/regex").toBool());
+ casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
+ instant_->setChecked(settings.value(sessionKey() + "/autofind").toBool());
+ style_ = settings.value(sessionKey() + "/citestyle").toInt();
+ updateFilterHint();
}