#include <QPushButton>
#include <QToolTip>
#include <QCloseEvent>
+#include <QHeaderView>
using namespace std;
using namespace lyx::support;
at_ref_ = false;
- // Enabling is set in updateRefs. Disable for now in case no
- // call to updateContents follows (e.g. read-only documents).
- sortCB->setEnabled(false);
- caseSensitiveCB->setEnabled(false);
- caseSensitiveCB->setChecked(false);
- refsTW->setEnabled(false);
- gotoPB->setEnabled(false);
-
refsTW->setColumnCount(1);
refsTW->header()->setVisible(false);
this, SLOT(changed_adaptor()));
connect(referenceED, SIGNAL(textChanged(QString)),
this, SLOT(changed_adaptor()));
- connect(findLE, SIGNAL(textEdited(QString)),
+ connect(findLE, SIGNAL(textEdited(QString)),
this, SLOT(filterLabels()));
- connect(csFindCB, SIGNAL(clicked()),
+ connect(csFindCB, SIGNAL(clicked()),
this, SLOT(filterLabels()));
connect(nameED, SIGNAL(textChanged(QString)),
this, SLOT(changed_adaptor()));
bc().setOK(okPB);
bc().setApply(applyPB);
bc().setCancel(closePB);
- bc().addReadOnly(refsTW);
- bc().addReadOnly(sortCB);
- bc().addReadOnly(caseSensitiveCB);
- bc().addReadOnly(nameED);
- bc().addReadOnly(referenceED);
bc().addReadOnly(typeCO);
- bc().addReadOnly(bufferCO);
restored_buffer_ = -1;
active_buffer_ = -1;
}
+void GuiRef::enableView(bool enable)
+{
+ if (!enable)
+ // In the opposite case, updateContents() will be called anyway.
+ updateContents();
+ GuiDialog::enableView(enable);
+}
+
+
void GuiRef::changed_adaptor()
{
changed();
void GuiRef::refHighlighted(QTreeWidgetItem * sel)
{
- if (isBufferReadonly())
- return;
-
if (sel->childCount() > 0) {
sel->setExpanded(true);
return;
if (at_ref_)
gotoRef();
gotoPB->setEnabled(true);
- if (typeAllowed())
+ if (typeAllowed() && !isBufferReadonly())
typeCO->setEnabled(true);
nameED->setHidden(!nameAllowed());
nameL->setHidden(!nameAllowed());
if (isBufferReadonly())
return;
+ if (sel->childCount()) {
+ sel->setExpanded(false);
+ return;
+ }
+
/* int const cur_item = refsTW->currentRow();
bool const cur_item_selected = cur_item >= 0 ?
refsLB->isSelected(cur_item) : false;*/
{
int orig_type = typeCO->currentIndex();
- referenceED->setText(toqstr(params_["reference"]));
+ referenceED->clear();
+ nameED->clear();
+ referenceED->setText(toqstr(params_["reference"]));
nameED->setText(toqstr(params_["name"]));
- nameED->setHidden(!nameAllowed() && !isBufferReadonly());
- nameL->setHidden(!nameAllowed() && !isBufferReadonly());
+ nameED->setHidden(!nameAllowed());
+ nameL->setHidden(!nameAllowed());
// restore type settings for new insets
if (params_["reference"].empty())
// insert buffer list
bufferCO->clear();
- FileNameList const & buffers = theBufferList().fileNames();
+ FileNameList const buffers(theBufferList().fileNames());
for (FileNameList::const_iterator it = buffers.begin();
it != buffers.end(); ++it) {
- bufferCO->addItem(toqstr(makeDisplayPath(it->absFilename())));
+ bufferCO->addItem(toqstr(makeDisplayPath(it->absFileName())));
}
int const thebuffer = theBufferList().bufferNum(buffer().fileName());
QStringList refsStrings;
QStringList refsCategories;
vector<docstring>::const_iterator iter;
+ bool noprefix = false;
for (iter = refs_.begin(); iter != refs_.end(); ++iter) {
QString const lab = toqstr(*iter);
refsStrings.append(lab);
- if (groupCB->isChecked() && lab.contains(":")) {
- QString const pref = lab.split(':')[0];
- if (!pref.isEmpty() && !refsCategories.contains(pref))
- refsCategories.append(pref);
+ if (groupCB->isChecked()) {
+ if (lab.contains(":")) {
+ QString const pref = lab.split(':')[0];
+ if (!refsCategories.contains(pref)) {
+ if (!pref.isEmpty())
+ refsCategories.append(pref);
+ else
+ noprefix = true;
+ }
+ }
+ else
+ noprefix = true;
}
}
// sort categories case-intensively
qSort(refsCategories.begin(), refsCategories.end(),
caseInsensitiveLessThan /*defined above*/);
- refsCategories.insert(0, qt_("<No prefix>"));
+ if (noprefix)
+ refsCategories.insert(0, qt_("<No prefix>"));
if (sortCB->isEnabled() && sortCB->isChecked()) {
if(caseSensitiveCB->isEnabled() && caseSensitiveCB->isChecked())
qSort(refsStrings.begin(), refsStrings.end(),
caseInsensitiveLessThan /*defined above*/);
}
-
+
if (groupCB->isChecked()) {
QList<QTreeWidgetItem *> refsCats;
for (int i = 0; i < refsCategories.size(); ++i) {
QString const ref = refsStrings.at(i);
if ((ref.startsWith(cat + QString(":")))
|| (cat == qt_("<No prefix>")
- && !ref.contains(":"))) {
- QTreeWidgetItem * child =
- new QTreeWidgetItem(item);
- child->setText(0, ref);
- item->addChild(child);
+ && (!ref.mid(1).contains(":") || ref.left(1).contains(":")))) {
+ QTreeWidgetItem * child =
+ new QTreeWidgetItem(item);
+ child->setText(0, ref);
+ item->addChild(child);
}
}
refsCats.append(item);
QTreeWidgetItemIterator it(refsTW);
while (*it) {
if ((*it)->text(0) == textToFind) {
- refsTW->setCurrentItem(*it);
+ refsTW->setCurrentItem(*it);
refsTW->setItemSelected(*it, !newInset);
//Make sure selected item is visible
refsTW->scrollToItem(*it);
refs_.clear();
int const the_buffer = bufferCO->currentIndex();
if (the_buffer != -1) {
- FileName const & name = theBufferList().fileNames()[the_buffer];
+ FileNameList const names(theBufferList().fileNames());
+ FileName const & name = names[the_buffer];
Buffer const * buf = theBufferList().getBuffer(name);
buf->getLabelList(refs_);
- }
+ }
sortCB->setEnabled(!refs_.empty());
caseSensitiveCB->setEnabled(sortCB->isEnabled() && sortCB->isChecked());
refsTW->setEnabled(!refs_.empty());
+ groupCB->setEnabled(!refs_.empty());
// refsTW should only be the focus proxy when it is enabled
setFocusProxy(refs_.empty() ? 0 : refsTW);
gotoPB->setEnabled(!refs_.empty());
bool GuiRef::initialiseParams(std::string const & data)
{
- InsetCommand::string2params("ref", data, params_);
+ InsetCommand::string2params(data, params_);
return true;
}
void GuiRef::dispatchParams()
{
- std::string const lfun = InsetCommand::params2string("ref", params_);
+ std::string const lfun = InsetCommand::params2string(params_);
dispatch(FuncRequest(getLfun(), lfun));
}