X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiLog.cpp;h=320b9773168e9af324df13e25efd8c834f77e97f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=a02544dda085eef396505ca1b3f3f8d210fddc50;hpb=2012beb58e62d04b9c2fc2bc0bc3d60fa095e03e;p=lyx.git

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index a02544dda0..320b977316 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -5,6 +5,7 @@
  *
  * \author John Levon
  * \author Angus Leeming
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,9 +16,12 @@
 
 #include "GuiApplication.h"
 #include "qt_helpers.h"
-#include "support/gettext.h"
 #include "Lexer.h"
 
+#include "support/docstring.h"
+#include "support/FileName.h"
+#include "support/gettext.h"
+
 #include <QTextBrowser>
 #include <QSyntaxHighlighter>
 #include <QClipboard>
@@ -31,6 +35,16 @@ using namespace lyx::support;
 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
@@ -65,28 +79,25 @@ LogHighlighter::LogHighlighter(QTextDocument * parent)
 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);
 	}
 }
 
@@ -104,6 +115,11 @@ GuiLog::GuiLog(GuiView & lv)
 
 	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()));
+	connect(logTypeCO, SIGNAL(activated(int)),
+		this, SLOT(typeChanged(int)));
 
 	bc().setPolicy(ButtonPolicy::OkCancelPolicy);
 
@@ -127,13 +143,67 @@ void GuiLog::updateContents()
 	getContents(ss);
 
 	logTB->setPlainText(toqstr(ss.str()));
+
+	nextErrorPB->setEnabled(contains(exprError));
+	nextWarningPB->setEnabled(contains(exprWarning));
+}
+
+
+void GuiLog::typeChanged(int i)
+{
+	string const type =
+		fromqstr(logTypeCO->itemData(i).toString());
+	string ext;
+	if (type == "latex")
+		ext = "log";
+	else if (type == "bibtex")
+		ext = "blg";
+	else if (type == "index")
+		ext = "ilg";
+
+	if (!ext.empty())
+		logfile_.changeExtension(ext);
+
+	updateContents();
+}
+
+
+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;
@@ -146,18 +216,38 @@ bool GuiLog::initialiseParams(string const & data)
 		// Parsing of the data failed.
 		return false;
 
-	if (logtype == "latex")
+	logTypeCO->setEnabled(logtype == "latex");
+	logTypeCO->clear();
+	
+	FileName log(logfile);
+	
+	if (logtype == "latex") {
 		type_ = LatexLog;
-	else if (logtype == "literate")
+		logTypeCO->addItem(qt_("LaTeX"), toqstr(logtype));
+		FileName tmp = log;
+		tmp.changeExtension("blg");
+		if (tmp.exists())
+			logTypeCO->addItem(qt_("BibTeX"), QString("bibtex"));
+		tmp.changeExtension("ilg");
+		if (tmp.exists())
+			logTypeCO->addItem(qt_("Index"), QString("index"));
+	// FIXME: not sure "literate" still works.
+	} else if (logtype == "literate") {
 		type_ = LiterateLog;
-	else if (logtype == "lyx2lyx")
+		logTypeCO->addItem(qt_("Literate"), toqstr(logtype));
+	} else if (logtype == "lyx2lyx") {
 		type_ = Lyx2lyxLog;
-	else if (logtype == "vc")
+		logTypeCO->addItem(qt_("LyX2LyX"), toqstr(logtype));
+	} else if (logtype == "vc") {
 		type_ = VCLog;
-	else
+		logTypeCO->addItem(qt_("Version Control"), toqstr(logtype));
+	} else
 		return false;
 
-	logfile_ = FileName(logfile);
+	logfile_ = log;
+
+	updateContents();
+
 	return true;
 }
 
@@ -204,7 +294,7 @@ void GuiLog::getContents(ostream & ss) const
 
 	switch (type_) {
 	case LatexLog:
-		ss << to_utf8(_("No LaTeX log file found."));
+		ss << to_utf8(_("Log file not found."));
 		break;
 	case LiterateLog:
 		ss << to_utf8(_("No literate programming build log file found."));
@@ -231,4 +321,4 @@ Dialog * createGuiLog(GuiView & lv) { return new GuiLog(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiLog_moc.cpp"
+#include "moc_GuiLog.cpp"