Use QFontMetrics information for underlines (and friends) width and position

[lyx.git] / src / frontends / qt4 / GuiLog.cpp

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index f45992eef7ca33b2172087838751a9f3d0975191..14e7aaf73a035fd7b95fd33eb4eb8a1a76d15059 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -18,6 +18,8 @@
 #include "qt_helpers.h"
 #include "Lexer.h"
 
+#include "frontends/Clipboard.h"
+
 #include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -37,12 +39,14 @@ namespace frontend {
 
 
 // Regular expressions needed at several places
+// FIXME: These regexes are incomplete. It would be good if we could collect those used in LaTeX::scanLogFile
+//        and LaTeX::scanBlgFile and re-use them here!(spitz, 2013-05-27)
 // Information
-QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|\\(|\\\\).*$");
+QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|.*> INFO - |\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|.*> WARN - ).*$");
 // Errors
-QRegExp exprError("^(!|.*---line [0-9]+ of file).*$");
+QRegExp exprError("^(!|.*---line [0-9]+ of file|.*> FATAL - |.*> ERROR - |Missing character: There is no ).*$");
 
 
 /////////////////////////////////////////////////////////////////////
@@ -128,7 +132,6 @@ GuiLog::GuiLog(GuiView & lv)
 
        logTB->setReadOnly(true);
        QFont font(guiApp->typewriterFontName());
-       font.setKerning(false);
        font.setFixedPitch(true);
        font.setStyleHint(QFont::TypeWriter);
        logTB->setFont(font);
@@ -311,7 +314,7 @@ void GuiLog::getContents(ostream & ss) const
 
 void GuiLog::on_copyPB_clicked()
 {
-       qApp->clipboard()->setText(logTB->toPlainText());
+       theClipboard().put(fromqstr(logTB->toPlainText()));
 }