Use QFontMetrics information for underlines (and friends) width and position

[lyx.git] / src / frontends / qt4 / GuiErrorList.cpp

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index b3ab09f79f48662d6d28650f5eedad8ed836bae7..9d908ad5e011e10def0aa943b45ac0a61331cc6c 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -18,7 +18,9 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "BufferList.h"
+#include "LyX.h"
 #include "ParIterator.h"
 #include "Text.h"
 
@@ -36,7 +38,7 @@ using namespace lyx::support;
 
 namespace {
 
-string const guiErrorType(string const s)
+string const guiErrorType(string const & s)
 {
        if (s == "docbook")
                return N_("DocBook");
@@ -63,6 +65,8 @@ GuiErrorList::GuiErrorList(GuiView & lv)
                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()));
 
@@ -102,6 +106,12 @@ void GuiErrorList::viewLog()
 }
 
 
+void GuiErrorList::showAnyway()
+{
+       dispatch(FuncRequest(LFUN_BUFFER_VIEW_CACHE));
+}
+
+
 void GuiErrorList::paramsToDialog()
 {
        setTitle(toqstr(name_));
@@ -114,16 +124,19 @@ void GuiErrorList::paramsToDialog()
        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_;
 }
 
@@ -148,47 +161,51 @@ bool GuiErrorList::initialiseParams(string const & data)
 
 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_)) {
+       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 info insets
-       while (dit.inset().lyxCode() == INFO_CODE)
-               dit.forwardPos();
-
-       // If this paragraph is empty, highlight the previous one
-       while (dit.paragraph().empty())
+       // 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 ? s - start : end - start;
        // end-of-paragraph cannot be highlighted, so highlight the last thing
        dit.pos() = range ? start : end - 1;
-       BufferView * bv = const_cast<BufferView *>(bufferview());
        // FIXME LFUN
        // If we used an LFUN, we would not need these lines:
        bv->putSelectionAt(dit, max(range, pos_type(1)), false);