X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiErrorList.cpp;h=900fe86018bdedff8355b2ea049f0084cce50525;hb=ee7dd4a11ea21851e7e32164c66b37d3bc8ac31d;hp=e24357edca75e34fcbadaac6a83739d6f23a9061;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index e24357edca..900fe86018 100644
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -12,123 +12,179 @@
 
 #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 "BufferList.h"
 #include "ParIterator.h"
+#include "Text.h"
 
-#include "qt_helpers.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 namespace std;
+using namespace lyx::support;
 
-using std::string;
+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 {
 
-using support::bformat;
-
 GuiErrorList::GuiErrorList(GuiView & lv)
-	: GuiDialog(lv, "errorlist")
+	: GuiDialog(lv, "errorlist", qt_("Error List"))
 {
 	setupUi(this);
 
 	connect(closePB, SIGNAL(clicked()),
 		this, SLOT(slotClose()));
-	connect(errorsLW, SIGNAL(itemClicked(QListWidgetItem *)),
-		this, SLOT(select(QListWidgetItem *)));
+	connect(viewLogPB, SIGNAL(clicked()),
+		this, SLOT(viewLog()));
+	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::paramsToDialog()
 {
-	setViewTitle(name_);
+	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_);
+	if (&bufferview()->buffer() == buf_) {
+		error_list_ = from_master_ ?
+			bufferview()->buffer().masterBuffer()->errorList(error_type_)
+			: bufferview()->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)
 {
+	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;
+		return false;
 
-	Buffer & buf = buffer();
-	ParIterator pit = buf.getParFromID(err.par_id);
+	if (from_master_)
+		// FIXME: implement
+		return false;
 
-	if (pit == buf.par_iterator_end()) {
+	DocIterator dit = buf_->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?
 		LYXERR0("par id " << err.par_id << " not found");
-		return;
+		return false;
 	}
 
 	// 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 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;
-	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);
+	dit.pos() = start;
+	BufferView * bv = const_cast<BufferView *>(bufferview());
+	// FIXME LFUN
+	// If we used an LFUN, we would not need these lines:
+	bv->putSelectionAt(dit, range, false);
+	bv->processUpdateFlags(Update::Force | Update::FitCursor);
+	return true;
 }
 
 
@@ -138,4 +194,4 @@ Dialog * createGuiErrorList(GuiView & lv) { return new GuiErrorList(lv); }
 } // namespace lyx
 
 
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"