#include "Buffer.h"
#include "BufferParams.h"
#include "BufferList.h"
+#include "BufferView.h"
+#include "Cursor.h"
#include "FuncRequest.h"
#include "qt_helpers.h"
filter_->setAutoHideButton(FancyLineEdit::Right, true);
filter_->setPlaceholderText(qt_("All available labels"));
filter_->setToolTip(qt_("Enter string to filter the list of available labels"));
+#if (QT_VERSION < 0x050000)
+ connect(filter_, SIGNAL(downPressed()),
+ refsTW, SLOT(setFocus()));
+#else
+ connect(filter_, &FancyLineEdit::downPressed,
+ refsTW, [=](){ focusAndHighlight(refsTW); });
+#endif
filterBarL->addWidget(filter_, 0);
findKeysLA->setBuddy(filter_);
sortingCO->addItem(qt_("Alphabetically (Case-Insensitive)"), "nocase");
sortingCO->addItem(qt_("Alphabetically (Case-Sensitive)"), "case");
+ buttonBox->button(QDialogButtonBox::Reset)->setText(qt_("&Update"));
+ buttonBox->button(QDialogButtonBox::Reset)->setToolTip(qt_("Update the label list"));
+
refsTW->setColumnCount(1);
refsTW->header()->setVisible(false);
- connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
- connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
- connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
- connect(closePB, SIGNAL(clicked()), this, SLOT(resetDialog()));
connect(this, SIGNAL(rejected()), this, SLOT(dialogRejected()));
connect(typeCO, SIGNAL(activated(int)),
this, SLOT(groupToggled()));
connect(gotoPB, SIGNAL(clicked()),
this, SLOT(gotoClicked()));
- connect(updatePB, SIGNAL(clicked()),
- this, SLOT(updateClicked()));
connect(bufferCO, SIGNAL(activated(int)),
this, SLOT(updateClicked()));
connect(pluralCB, SIGNAL(clicked()),
enableBoxes();
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
- bc().setOK(okPB);
- bc().setApply(applyPB);
- bc().setCancel(closePB);
+ bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+ bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+ bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().addReadOnly(typeCO);
restored_buffer_ = -1;
active_buffer_ = -1;
+
+ setFocusProxy(filter_);
}
void GuiRef::enableBoxes()
{
- bool const isFormatted =
+ bool const isFormatted =
(InsetRef::getName(typeCO->currentIndex()) == "formatted");
- bool const isLabelOnly =
+ bool const isLabelOnly =
(InsetRef::getName(typeCO->currentIndex()) == "labelonly");
bool const usingRefStyle = buffer().params().use_refstyle;
pluralCB->setEnabled(isFormatted && usingRefStyle);
- capsCB->setEnabled (isFormatted && usingRefStyle);
- noprefixCB->setEnabled (isLabelOnly && usingRefStyle);
+ capsCB->setEnabled(isFormatted && usingRefStyle);
+ noprefixCB->setEnabled(isLabelOnly);
}
// to which we are going (or from which we are returning) is
// restored in the dialog. It's a bit of a hack, but it works,
// and no-one seems to have any better idea.
- bool const toggled =
+ bool const toggled =
last_reference_.isEmpty() || last_reference_.isNull();
if (toggled)
last_reference_ = referenceED->text();
}
+void GuiRef::on_buttonBox_clicked(QAbstractButton * button)
+{
+ switch (buttonBox->standardButton(button)) {
+ case QDialogButtonBox::Ok:
+ slotOK();
+ break;
+ case QDialogButtonBox::Apply:
+ slotApply();
+ break;
+ case QDialogButtonBox::Cancel:
+ slotClose();
+ resetDialog();
+ break;
+ case QDialogButtonBox::Reset:
+ updateClicked();
+ break;
+ default:
+ break;
+ }
+}
+
+
void GuiRef::updateClicked()
{
updateRefs();
void GuiRef::updateContents()
{
- int orig_type = typeCO->currentIndex();
+ QString const orig_type =
+ typeCO->itemData(typeCO->currentIndex()).toString();
referenceED->clear();
nameED->clear();
+ typeCO->clear();
+
+ // FIXME Bring InsetMathRef on par with InsetRef
+ // (see #9798)
+ typeCO->addItem(qt_("<reference>"), "ref");
+ typeCO->addItem(qt_("(<reference>)"), "eqref");
+ typeCO->addItem(qt_("<page>"), "pageref");
+ typeCO->addItem(qt_("on page <page>"), "vpageref");
+ typeCO->addItem(qt_("<reference> on page <page>"), "vref");
+ typeCO->addItem(qt_("Textual reference"), "nameref");
+ if (bufferview()->cursor().inTexted()) {
+ typeCO->addItem(qt_("Formatted reference"), "formatted");
+ typeCO->addItem(qt_("Label only"), "labelonly");
+ } else
+ typeCO->addItem(qt_("Formatted reference"), "prettyref");
referenceED->setText(toqstr(params_["reference"]));
nameED->setText(toqstr(params_["name"]));
// restore type settings for new insets
bool const new_inset = params_["reference"].empty();
- if (new_inset)
- typeCO->setCurrentIndex(orig_type);
+ if (new_inset) {
+ int index = typeCO->findData(orig_type);
+ if (index == -1)
+ index = 0;
+ typeCO->setCurrentIndex(index);
+ }
else
- typeCO->setCurrentIndex(InsetRef::getType(params_.getCmdName()));
+ typeCO->setCurrentIndex(
+ typeCO->findData(toqstr(params_.getCmdName())));
typeCO->setEnabled(typeAllowed() && !isBufferReadonly());
if (!typeAllowed())
typeCO->setCurrentIndex(0);
{
last_reference_ = referenceED->text();
- params_.setCmdName(InsetRef::getName(typeCO->currentIndex()));
+ params_.setCmdName(fromqstr(typeCO->itemData(typeCO->currentIndex()).toString()));
params_["reference"] = qstring_to_ucs4(last_reference_);
params_["name"] = qstring_to_ucs4(nameED->text());
- params_["plural"] = pluralCB->isChecked() ?
+ params_["plural"] = pluralCB->isChecked() ?
from_ascii("true") : from_ascii("false");
- params_["caps"] = capsCB->isChecked() ?
+ params_["caps"] = capsCB->isChecked() ?
from_ascii("true") : from_ascii("false");
- params_["noprefix"] = noprefixCB->isChecked() ?
+ params_["noprefix"] = noprefixCB->isChecked() ?
from_ascii("true") : from_ascii("false");
restored_buffer_ = bufferCO->currentIndex();
}
QString const cat = refsCategories.at(i);
QTreeWidgetItem * item = new QTreeWidgetItem(refsTW);
item->setText(0, cat);
- for (int i = 0; i < refsStrings.size(); ++i) {
- QString const ref = refsStrings.at(i);
+ for (int j = 0; j < refsStrings.size(); ++j) {
+ QString const ref = refsStrings.at(j);
if ((ref.startsWith(cat + QString(":")))
|| (cat == qt_("<No prefix>")
&& (!ref.mid(1).contains(":") || ref.left(1).contains(":")))) {
sortingCO->setEnabled(!refs_.empty());
refsTW->setEnabled(!refs_.empty());
groupCB->setEnabled(!refs_.empty());
- // refsTW should only be the focus proxy when it is enabled
- setFocusProxy(refs_.empty() ? 0 : refsTW);
redoRefs();
}
}
-bool GuiRef::initialiseParams(std::string const & data)
+bool GuiRef::initialiseParams(std::string const & sdata)
{
- InsetCommand::string2params(data, params_);
+ InsetCommand::string2params(sdata, params_);
return true;
}
projects / lyx.git / blobdiff