#include "GuiErrorList.h"
+#include "GuiView.h"
#include "qt_helpers.h"
#include "Buffer.h"
#include "BufferView.h"
+#include "FuncRequest.h"
+#include "BufferList.h"
#include "ParIterator.h"
#include "Text.h"
using namespace std;
using namespace lyx::support;
+namespace {
+
+string const guiErrorType(string const s)
+{
+ if (s == "docbook")
+ return N_("DocBook");
+ else if (s == "literate")
+ return N_("Literate");
+ else if (s == "platex")
+ return N_("pLaTeX");
+ else if (s == "latex")
+ return N_("LaTeX");
+ return s;
+}
+
+} // namespace anon
+
namespace lyx {
namespace frontend {
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::updateContents()
+void GuiErrorList::viewLog()
+{
+ if (&buffer() != buf_) {
+ if (!theBufferList().isLoaded(buf_))
+ return;
+ FuncRequest fr(LFUN_BUFFER_SWITCH, buf_->absFileName());
+ dispatch(fr);
+ }
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "latexlog"));
+}
+
+
+void GuiErrorList::paramsToDialog()
{
setTitle(toqstr(name_));
errorsLW->clear();
descriptionTB->setPlainText(QString());
- ErrorList::const_iterator it = errorList().begin();
- ErrorList::const_iterator end = errorList().end();
- for (; it != end; ++it)
+ ErrorList const & el = errorList();
+ ErrorList::const_iterator it = el.begin();
+ ErrorList::const_iterator const en = el.end();
+ for (; it != en; ++it)
errorsLW->addItem(toqstr(it->error));
+ errorsLW->setCurrentRow(0);
}
ErrorList const & GuiErrorList::errorList() const
{
- return bufferview()->buffer().errorList(error_type_);
+ Buffer const * buffer = from_master_
+ ? bufferview()->buffer().masterBuffer()
+ : &bufferview()->buffer();
+ if (buffer == buf_)
+ error_list_ = buffer->errorList(error_type_);
+
+ return error_list_;
}
-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();
- name_ = bformat(_("%1$s Errors (%2$s)"), _(error_type),
- from_utf8(buf.absFileName()));
+ buf_ = from_master_ ?
+ bufferview()->buffer().masterBuffer()
+ : &bufferview()->buffer();
+ name_ = bformat(_("%1$s Errors (%2$s)"),
+ _(guiErrorType(error_type)),
+ from_utf8(buf_->absFileName()));
+ paramsToDialog();
return true;
}
if (err.par_id == -1)
return false;
- Buffer & buf = buffer();
- DocIterator dit = buf.getParFromID(err.par_id);
+ Buffer const * errbuf = err.buffer ? err.buffer : buf_;
+
+ if (&buffer() != errbuf) {
+ if (!theBufferList().isLoaded(errbuf))
+ return false;
+ FuncRequest fr(LFUN_BUFFER_SWITCH, errbuf->absFileName());
+ dispatch(fr);
+ }
+
+ DocIterator dit = errbuf->getParFromID(err.par_id);
- if (dit == doc_iterator_end(buf.inset())) {
- // FIXME: Happens when loading a read-only doc with
- // unknown layout. Should this be the case?
+ if (dit == doc_iterator_end(errbuf)) {
+ // FIXME: Happens when loading a read-only doc with
+ // unknown layout. Should this be the case?
LYXERR0("par id " << err.par_id << " not found");
return false;
}
+ // Don't try to highlight the content of non-editable insets
+ while (!dit.inset().editable())
+ dit.backwardPos();
+
// Now make the selection.
+ BufferView * bv = const_cast<BufferView *>(bufferview());
+ if (bv->selectIfEmpty(dit)) {
+ // The paragraph is empty but can be selected
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
+ return true;
+ }
+ if (dit.empty()) {
+ // The paragraph is empty and cannot be selected
+ return false;
+ }
// if pos_end is 0, this means it is end-of-paragraph
pos_type const s = dit.paragraph().size();
pos_type const end = err.pos_end ? min(err.pos_end, s) : s;
pos_type const start = min(err.pos_start, end);
- pos_type const range = end - start;
- dit.pos() = start;
- bufferview()->putSelectionAt(dit, range, false);
- // FIXME: If we used an LFUN, we would not need this line:
- bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+ pos_type const range = end == start ? s - start : end - start;
+ // end-of-paragraph cannot be highlighted, so highlight the last thing
+ dit.pos() = range ? start : end - 1;
+ // FIXME LFUN
+ // If we used an LFUN, we would not need these lines:
+ bv->putSelectionAt(dit, max(range, pos_type(1)), false);
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
return true;
}
} // namespace lyx
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"