#include "GuiErrorList.h"
+#include "qt_helpers.h"
+
#include "Buffer.h"
#include "BufferView.h"
-#include "support/debug.h"
-#include "support/gettext.h"
-#include "Text.h"
+#include "FuncRequest.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>
-
-using std::string;
+#include <QShowEvent>
+#include <QTextBrowser>
+using namespace std;
+using namespace lyx::support;
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));
+ 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 end = errorList().end();
for (; it != end; ++it)
errorsLW->addItem(toqstr(it->error));
+ errorsLW->setCurrentRow(0);
}
ErrorList const & GuiErrorList::errorList() const
{
- return bufferview()->buffer().errorList(error_type_);
+ return from_master_ ?
+ bufferview()->buffer().masterBuffer()->errorList(error_type_)
+ : bufferview()->buffer().errorList(error_type_);
}
-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();
+ Buffer const * buf = from_master_ ?
+ bufferview()->buffer().masterBuffer()
+ : &bufferview()->buffer();
name_ = bformat(_("%1$s Errors (%2$s)"), _(error_type),
- from_utf8(buf.absFileName()));
+ from_utf8(buf->absFileName()));
+ paramsToDialog();
return true;
}
-void GuiErrorList::goTo(int item)
+bool GuiErrorList::goTo(int item)
{
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()) {
+ Buffer const & buf = buffer();
+ 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);
+ dit.pos() = start;
+ BufferView * bv = const_cast<BufferView *>(bufferview());
// FIXME: If we used an LFUN, we would not need this line:
- bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+ bv->putSelectionAt(dit, range, false);
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
+ return true;
}
} // namespace lyx
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"