*
* \author John Levon
* \author Angus Leeming
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "GuiApplication.h"
#include "qt_helpers.h"
-#include "support/gettext.h"
#include "Lexer.h"
-#include <QCloseEvent>
+#include "support/docstring.h"
+#include "support/gettext.h"
+
#include <QTextBrowser>
#include <QSyntaxHighlighter>
#include <QClipboard>
namespace lyx {
namespace frontend {
+
+// Regular expressions needed at several places
+// Information
+QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|\\(|\\\\).*$");
+// Warnings
+QRegExp exprWarning("^(LaTeX Warning|Package \\w+ Warning).*$");
+// Errors
+QRegExp exprError("^!.*$");
+
+
/////////////////////////////////////////////////////////////////////
//
// LogHighlighter
void LogHighlighter::highlightBlock(QString const & text)
{
// Info
- QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|\\(|\\\\).*$");
- int index = text.indexOf(exprInfo);
+ int index = exprInfo.indexIn(text);
while (index >= 0) {
int length = exprInfo.matchedLength();
setFormat(index, length, infoFormat);
- index = text.indexOf(exprInfo, index + length);
+ index = exprInfo.indexIn(text, index + length);
}
// LaTeX Warning:
- QRegExp exprWarning("^LaTeX Warning.*$");
- index = text.indexOf(exprWarning);
+ index = exprWarning.indexIn(text);
while (index >= 0) {
int length = exprWarning.matchedLength();
setFormat(index, length, warningFormat);
- index = text.indexOf(exprWarning, index + length);
+ index = exprWarning.indexIn(text, index + length);
}
// ! error
- QRegExp exprError("^!.*$");
- index = text.indexOf(exprError);
+ index = exprError.indexIn(text);
while (index >= 0) {
int length = exprError.matchedLength();
setFormat(index, length, errorFormat);
- index = text.indexOf(exprError, index + length);
+ index = exprError.indexIn(text, index + length);
}
}
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(updatePB, SIGNAL(clicked()), this, SLOT(updateContents()));
+ connect(findPB, SIGNAL(clicked()), this, SLOT(find()));
+ // FIXME: find via returnPressed() does not work!
+ connect(findLE, SIGNAL(returnPressed()), this, SLOT(find()));
bc().setPolicy(ButtonPolicy::OkCancelPolicy);
getContents(ss);
logTB->setPlainText(toqstr(ss.str()));
+
+ nextErrorPB->setEnabled(contains(exprError));
+ nextWarningPB->setEnabled(contains(exprWarning));
+}
+
+
+void GuiLog::find()
+{
+ logTB->find(findLE->text());
+}
+
+
+void GuiLog::on_nextErrorPB_clicked()
+{
+ goTo(exprError);
+}
+
+
+void GuiLog::on_nextWarningPB_clicked()
+{
+ goTo(exprWarning);
+}
+
+
+void GuiLog::goTo(QRegExp const & exp) const
+{
+ QTextCursor const newc =
+ logTB->document()->find(exp, logTB->textCursor());
+ logTB->setTextCursor(newc);
+}
+
+
+bool GuiLog::contains(QRegExp const & exp) const
+{
+ return !logTB->document()->find(exp, logTB->textCursor()).isNull();
}
bool GuiLog::initialiseParams(string const & data)
{
istringstream is(data);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(is);
string logtype, logfile;
if (logtype == "latex")
type_ = LatexLog;
+ // FIXME: not sure "literate" still works.
else if (logtype == "literate")
type_ = LiterateLog;
else if (logtype == "lyx2lyx")
return false;
logfile_ = FileName(logfile);
+
+ updateContents();
+
return true;
}
} // namespace frontend
} // namespace lyx
-#include "GuiLog_moc.cpp"
+#include "moc_GuiLog.cpp"