Amend f441590c

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

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index bd60878514c6d8337643e7e570fe20fb8e09083d..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,6 +124,8 @@ 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());
 }
 
 
@@ -172,26 +184,28 @@ bool GuiErrorList::goTo(int item)
                return false;
        }
 
-       // Don't try to highlight the content of info and ert insets
-       while (dit.inset().lyxCode() == INFO_CODE
-              || dit.inset().lyxCode() == ERT_CODE) {
-               dit.pos() = dit.lastpos();
-               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);