#include "GuiErrorList.h"
+#include "GuiView.h"
+#include "qt_helpers.h"
+
#include "Buffer.h"
#include "BufferView.h"
-#include "debug.h"
-#include "gettext.h"
-#include "Text.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "BufferList.h"
+#include "LyX.h"
#include "ParIterator.h"
+#include "Text.h"
+#include "TexRow.h"
-#include "qt_helpers.h"
-
-// FIXME: those two headers are needed because of the
-// WorkArea::redraw() call below.
-#include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
-
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include <QListWidget>
-#include <QTextBrowser>
#include <QPushButton>
-#include <QCloseEvent>
+#include <QShowEvent>
+#include <QTextBrowser>
-using std::endl;
-using std::string;
+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 == "latex")
+ // This covers all LaTeX variants
+ // (LaTeX, PDFLaTeX, XeTeX, LuaTeX, pLaTeX)
+ return N_("LaTeX");
+ return s;
+}
+
+} // namespace
namespace lyx {
namespace frontend {
-using support::bformat;
-
-GuiErrorList::GuiErrorList(LyXView & lv)
- : GuiDialog(lv, "errorlist")
+GuiErrorList::GuiErrorList(GuiView & lv)
+ : GuiDialog(lv, "errorlist", qt_("Error List")), buf_(0), from_master_(false)
{
setupUi(this);
connect(closePB, SIGNAL(clicked()),
this, SLOT(slotClose()));
- connect(errorsLW, SIGNAL(itemActivated(QListWidgetItem *)),
- this, SLOT(slotClose()));
- connect(errorsLW, SIGNAL(itemClicked(QListWidgetItem *)),
- this, SLOT(select(QListWidgetItem *)));
+ connect(viewLogPB, SIGNAL(clicked()),
+ this, SLOT(viewLog()));
+ connect(showAnywayPB, SIGNAL(clicked()),
+ this, SLOT(showAnyway()));
+ connect(errorsLW, SIGNAL(currentRowChanged(int)),
+ this, SLOT(select()));
bc().setPolicy(ButtonPolicy::OkCancelPolicy);
bc().setCancel(closePB);
}
-void GuiErrorList::closeEvent(QCloseEvent * e)
+void GuiErrorList::showEvent(QShowEvent * e)
{
- slotClose();
+ select();
+ paramsToDialog();
e->accept();
}
-void GuiErrorList::showEvent(QShowEvent * e)
+void GuiErrorList::select()
{
- errorsLW->setCurrentRow(0);
- select(errorsLW->item(0));
- e->accept();
+ int const item = errorsLW->row(errorsLW->currentItem());
+ if (item == -1)
+ return;
+ goTo(item);
+ descriptionTB->setPlainText(
+ toqstr(errorList()[item].description));
}
-void GuiErrorList::select(QListWidgetItem * wi)
+void GuiErrorList::viewLog()
{
- int const item = errorsLW->row(wi);
- goTo(item);
- descriptionTB->setPlainText(toqstr(errorList()[item].description));
+ 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::updateContents()
+void GuiErrorList::showAnyway()
{
- setViewTitle(name_);
+ 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
{
- 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;
}
-void GuiErrorList::goTo(int item)
+bool GuiErrorList::goTo(int item)
{
ErrorItem const & err = errorList()[item];
+ if (TexRow::isNone(err.start))
+ return false;
- if (err.par_id == -1)
- return;
-
- Buffer & buf = buffer();
- ParIterator pit = buf.getParFromID(err.par_id);
+ Buffer const * errbuf = err.buffer ? err.buffer : buf_;
- if (pit == buf.par_iterator_end()) {
- lyxerr << "par id " << err.par_id << " not found" << endl;
- return;
+ if (&buffer() != errbuf) {
+ if (!theBufferList().isLoaded(errbuf))
+ return false;
+ FuncRequest fr(LFUN_BUFFER_SWITCH, errbuf->absFileName());
+ dispatch(fr);
}
-
- // Now make the selection.
- // This should be implemented using an LFUN. (Angus)
- // if pos_end is 0, this means it is end-of-paragraph
- pos_type const end = err.pos_end ? std::min(err.pos_end, pit->size())
- : pit->size();
- pos_type const start = std::min(err.pos_start, end);
- pos_type const range = end - start;
- DocIterator const dit = makeDocIterator(pit, start);
- bufferview()->putSelectionAt(dit, range, false);
- // FIXME: If we used an LFUN, we would not need this line:
- bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+ dispatch(TexRow::goToFunc(err.start, err.end));
+ return true;
}
-Dialog * createGuiErrorList(LyXView & lv) { return new GuiErrorList(lv); }
+Dialog * createGuiErrorList(GuiView & lv) { return new GuiErrorList(lv); }
} // namespace frontend
} // namespace lyx
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"
projects / lyx.git / blobdiff