#include "Buffer.h"
#include "BufferView.h"
#include "FuncRequest.h"
+#include "FuncStatus.h"
#include "BufferList.h"
+#include "LyX.h"
#include "ParIterator.h"
#include "Text.h"
namespace {
-string const guiErrorType(string const s)
+string const guiErrorType(string const & s)
{
if (s == "docbook")
return N_("DocBook");
this, SLOT(slotClose()));
connect(viewLogPB, SIGNAL(clicked()),
this, SLOT(viewLog()));
+ connect(showAnywayPB, SIGNAL(clicked()),
+ this, SLOT(showAnyway()));
connect(errorsLW, SIGNAL(currentRowChanged(int)),
this, SLOT(select()));
}
+void GuiErrorList::showAnyway()
+{
+ dispatch(FuncRequest(LFUN_BUFFER_VIEW_CACHE));
+}
+
+
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);
+ showAnywayPB->setEnabled(
+ lyx::getStatus(FuncRequest(LFUN_BUFFER_VIEW_CACHE)).enabled());
}
ErrorList const & GuiErrorList::errorList() const
{
- if (&bufferview()->buffer() == buf_) {
- error_list_ = from_master_ ?
- bufferview()->buffer().masterBuffer()->errorList(error_type_)
- : 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::goTo(int item)
{
- if (&buffer() != buf_) {
- if (!theBufferList().isLoaded(buf_))
- return false;
- FuncRequest fr(LFUN_BUFFER_SWITCH, buf_->absFileName());
- dispatch(fr);
- }
ErrorItem const & err = errorList()[item];
if (err.par_id == -1)
return false;
- if (from_master_)
- // FIXME: implement
- return false;
+ 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 = buf_->getParFromID(err.par_id);
+ DocIterator dit = errbuf->getParFromID(err.par_id);
- if (dit == doc_iterator_end(buf_)) {
- // 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 s = dit.lastpos();
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 * bv = const_cast<BufferView *>(bufferview());
- // FIXME: If we used an LFUN, we would not need this line:
- bv->putSelectionAt(dit, range, false);
+ 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;
}