Use the command-alternatives sequence as defined in menus.bind

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

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 138aeeff2145a1f666915e87ad9d8ba1fe7275c1..5b88d30c0827a2441eaf435108d54fe7c42c2773 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -18,11 +18,17 @@
 #include "qt_helpers.h"
 #include "Lexer.h"
 
+#include "frontends/Clipboard.h"
+
 #include "support/docstring.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
+#include <QDesktopServices>
 #include <QTextBrowser>
 #include <QSyntaxHighlighter>
+#include <QUrl>
 #include <QClipboard>
 
 #include <fstream>
@@ -36,12 +42,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:|.*> INFO - |\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|Package \\w+ Warning).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|Underfull|Overfull|.*> WARN - ).*$");
 // Errors
-QRegExp exprError("^!.*$");
+QRegExp exprError("^(!|.*---line [0-9]+ of file|.*> FATAL - |.*> ERROR - |Missing character: There is no ).*$");
 
 
 /////////////////////////////////////////////////////////////////////
@@ -117,6 +125,8 @@ GuiLog::GuiLog(GuiView & lv)
        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);
 
@@ -124,11 +134,7 @@ GuiLog::GuiLog(GuiView & lv)
        highlighter = new LogHighlighter(logTB->document());
 
        logTB->setReadOnly(true);
-       QFont font(guiApp->typewriterFontName());
-       font.setKerning(false);
-       font.setFixedPitch(true);
-       font.setStyleHint(QFont::TypeWriter);
-       logTB->setFont(font);
+       logTB->setFont(guiApp->typewriterSystemFont());
 }
 
 
@@ -146,6 +152,25 @@ void GuiLog::updateContents()
 }
 
 
+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());
@@ -164,6 +189,22 @@ void GuiLog::on_nextWarningPB_clicked()
 }
 
 
+void GuiLog::on_openDirPB_clicked()
+{
+       support::FileName dir = logfile_.onlyPath();
+       if (!dir.exists())
+               return;
+       QUrl qdir(QUrl::fromLocalFile(toqstr(from_utf8(dir.absFileName()))));
+       // Give hints in case of bugs
+       if (!qdir.isValid()) {
+               LYXERR0("QUrl is invalid!");
+               return;
+       }
+       if (!QDesktopServices::openUrl(qdir))
+               LYXERR0("Unable to open QUrl even though dir exists!");
+}
+
+
 void GuiLog::goTo(QRegExp const & exp) const
 {
        QTextCursor const newc =
@@ -194,19 +235,39 @@ 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;
+               logTypeCO->addItem(qt_("LaTeX"), toqstr(logtype));
+               FileName tmp = log;
+               tmp.changeExtension("blg");
+               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"));
        // FIXME: not sure "literate" still works.
-       else if (logtype == "literate")
+       } 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();
 
@@ -246,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();
@@ -256,7 +319,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."));
@@ -271,12 +334,6 @@ void GuiLog::getContents(ostream & ss) const
 }
 
 
-void GuiLog::on_copyPB_clicked()
-{
-       qApp->clipboard()->setText(logTB->toPlainText());
-}
-
-
 Dialog * createGuiLog(GuiView & lv) { return new GuiLog(lv); }