#include "Buffer.h"
#include "BufferView.h"
+#include "FuncRequest.h"
#include "ParIterator.h"
#include "Text.h"
connect(closePB, SIGNAL(clicked()),
this, SLOT(slotClose()));
- connect(errorsLW, SIGNAL(itemSelectionChanged()),
+ connect(viewLogPB, SIGNAL(clicked()),
+ this, SLOT(viewLog()));
+ connect(errorsLW, SIGNAL(currentRowChanged(int)),
this, SLOT(select()));
bc().setPolicy(ButtonPolicy::OkCancelPolicy);
void GuiErrorList::showEvent(QShowEvent * e)
{
- errorsLW->setCurrentRow(0);
select();
+ paramsToDialog();
e->accept();
}
void GuiErrorList::select()
{
int const item = errorsLW->row(errorsLW->currentItem());
- if (goTo(item))
- descriptionTB->setPlainText(toqstr(errorList()[item].description));
+ if (item == -1)
+ return;
+ goTo(item);
+ descriptionTB->setPlainText(
+ toqstr(errorList()[item].description));
+}
+
+
+void GuiErrorList::viewLog()
+{
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "latexlog"));
}
-void GuiErrorList::updateContents()
+void GuiErrorList::paramsToDialog()
{
setTitle(toqstr(name_));
errorsLW->clear();
ErrorList::const_iterator end = errorList().end();
for (; it != end; ++it)
errorsLW->addItem(toqstr(it->error));
+ errorsLW->setCurrentRow(0);
}
ErrorList const & GuiErrorList::errorList() const
{
- return bufferview()->buffer().errorList(error_type_);
+ return from_master_ ?
+ bufferview()->buffer().masterBuffer()->errorList(error_type_)
+ : bufferview()->buffer().errorList(error_type_);
}
-bool GuiErrorList::initialiseParams(string const & error_type)
+bool GuiErrorList::initialiseParams(string const & data)
{
+ from_master_ = prefixIs(data, "from_master|");
+ string error_type = data;
+ if (from_master_)
+ error_type = split(data, '|');
error_type_ = error_type;
- Buffer const & buf = bufferview()->buffer();
+ Buffer const * buf = from_master_ ?
+ bufferview()->buffer().masterBuffer()
+ : &bufferview()->buffer();
name_ = bformat(_("%1$s Errors (%2$s)"), _(error_type),
- from_utf8(buf.absFileName()));
+ from_utf8(buf->absFileName()));
+ paramsToDialog();
return true;
}
if (err.par_id == -1)
return false;
- Buffer & buf = buffer();
+ if (from_master_)
+ // FIXME: implement
+ return false;
+
+ Buffer const & buf = buffer();
DocIterator dit = buf.getParFromID(err.par_id);
- if (dit == doc_iterator_end(buf.inset())) {
+ if (dit == doc_iterator_end(&buf)) {
// FIXME: Happens when loading a read-only doc with
// unknown layout. Should this be the case?
LYXERR0("par id " << err.par_id << " not found");
pos_type const start = min(err.pos_start, end);
pos_type const range = end - start;
dit.pos() = start;
- bufferview()->putSelectionAt(dit, range, false);
+ BufferView * bv = const_cast<BufferView *>(bufferview());
// FIXME: If we used an LFUN, we would not need this line:
- bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+ bv->putSelectionAt(dit, range, false);
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
return true;
}
} // namespace lyx
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"