Enable OK/Apply buttons when resetting to class defaults.

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

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index e5f6c536b4b868abb10d0c8ff99773bcf2d1d4ba..5b88d30c0827a2441eaf435108d54fe7c42c2773 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -23,6 +23,7 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <QDesktopServices>
 #include <QTextBrowser>
@@ -44,9 +45,9 @@ namespace frontend {
 // 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|.*> INFO - |\\(|\\\\).*$");
+QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|.*> INFO - |\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|.*> WARN - ).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|Underfull|Overfull|.*> WARN - ).*$");
 // Errors
 QRegExp exprError("^(!|.*---line [0-9]+ of file|.*> FATAL - |.*> ERROR - |Missing character: There is no ).*$");
 
@@ -133,10 +134,7 @@ GuiLog::GuiLog(GuiView & lv)
        highlighter = new LogHighlighter(logTB->document());
 
        logTB->setReadOnly(true);
-       QFont font(guiApp->typewriterFontName());
-       font.setFixedPitch(true);
-       font.setStyleHint(QFont::TypeWriter);
-       logTB->setFont(font);
+       logTB->setFont(guiApp->typewriterSystemFont());
 }
 
 
@@ -239,16 +237,20 @@ bool GuiLog::initialiseParams(string const & data)
 
        logTypeCO->setEnabled(logtype == "latex");
        logTypeCO->clear();
-       
+
        FileName log(logfile);
-       
+
        if (logtype == "latex") {
                type_ = LatexLog;
                logTypeCO->addItem(qt_("LaTeX"), toqstr(logtype));
                FileName tmp = log;
                tmp.changeExtension("blg");
-               if (tmp.exists())
-                       logTypeCO->addItem(qt_("BibTeX"), QString("bibtex"));
+               if (tmp.exists()) {
+                       if (support::contains(tmp.fileContents("UTF-8"), from_ascii("This is Biber")))
+                               logTypeCO->addItem(qt_("Biber"), QString("bibtex"));
+                       else
+                               logTypeCO->addItem(qt_("BibTeX"), QString("bibtex"));
+               }
                tmp.changeExtension("ilg");
                if (tmp.exists())
                        logTypeCO->addItem(qt_("Index"), QString("index"));
@@ -305,6 +307,8 @@ void GuiLog::getContents(ostream & ss) const
        // FIXME UNICODE
        // Our caller interprets the file contents as UTF8, but is that
        // correct?
+       // spitz: No it isn't (generally). The log file encoding depends on the TeX
+       // _output_ encoding (T1 etc.). We should account for that. See #10728.
        if (in) {
                ss << in.rdbuf();
                success = ss.good();
@@ -329,13 +333,6 @@ void GuiLog::getContents(ostream & ss) const
        }
 }
 
-/*
-void GuiLog::on_copyPB_clicked()
-{
-       theClipboard().put(fromqstr(logTB->toPlainText()));
-}
-*/
-
 
 Dialog * createGuiLog(GuiView & lv) { return new GuiLog(lv); }