X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiLog.cpp;h=320b9773168e9af324df13e25efd8c834f77e97f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=0a678982e1929a613b88cd8a65faccb0a98f997e;hpb=c9ea6e6eef090b863fb54445010f24443b15eb23;p=lyx.git diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp index 0a678982e1..320b977316 100644 --- a/src/frontends/qt4/GuiLog.cpp +++ b/src/frontends/qt4/GuiLog.cpp @@ -4,6 +4,8 @@ * Licence details can be found in the file COPYING. * * \author John Levon + * \author Angus Leeming + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -12,22 +14,37 @@ #include "GuiLog.h" -#include "ControlLog.h" +#include "GuiApplication.h" #include "qt_helpers.h" +#include "Lexer.h" -#include "frontends/Application.h" +#include "support/docstring.h" +#include "support/FileName.h" +#include "support/gettext.h" -#include #include #include +#include +#include #include +using namespace std; +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 @@ -62,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); } } @@ -94,14 +108,18 @@ void LogHighlighter::highlightBlock(QString const & text) // ///////////////////////////////////////////////////////////////////// -GuiLogDialog::GuiLogDialog(LyXView & lv) - : GuiDialog(lv, "log") +GuiLog::GuiLog(GuiView & lv) + : GuiDialog(lv, "log", qt_("LaTeX Log")), type_(LatexLog) { setupUi(this); - setController(new ControlLog(*this)); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); - connect(updatePB, SIGNAL(clicked()), this, SLOT(updateClicked())); + 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); @@ -109,7 +127,7 @@ GuiLogDialog::GuiLogDialog(LyXView & lv) highlighter = new LogHighlighter(logTB->document()); logTB->setReadOnly(true); - QFont font(toqstr(theApp()->typewriterFontName())); + QFont font(guiApp->typewriterFontName()); font.setKerning(false); font.setFixedPitch(true); font.setStyleHint(QFont::TypeWriter); @@ -117,36 +135,190 @@ GuiLogDialog::GuiLogDialog(LyXView & lv) } -ControlLog & GuiLogDialog::controller() const +void GuiLog::updateContents() +{ + setTitle(toqstr(title())); + + ostringstream ss; + getContents(ss); + + logTB->setPlainText(toqstr(ss.str())); + + nextErrorPB->setEnabled(contains(exprError)); + nextWarningPB->setEnabled(contains(exprWarning)); +} + + +void GuiLog::typeChanged(int i) { - return static_cast(Dialog::controller()); + 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 GuiLogDialog::closeEvent(QCloseEvent * e) +void GuiLog::find() { - slotWMHide(); - e->accept(); + logTB->find(findLE->text()); } -void GuiLogDialog::updateClicked() +void GuiLog::on_nextErrorPB_clicked() { - update_contents(); + goTo(exprError); } -void GuiLogDialog::update_contents() +void GuiLog::on_nextWarningPB_clicked() { - setViewTitle(controller().title()); + goTo(exprWarning); +} - std::ostringstream ss; - controller().getContents(ss); - logTB->setPlainText(toqstr(ss.str())); +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; + lex.setStream(is); + + string logtype, logfile; + lex >> logtype; + if (lex) { + lex.next(true); + logfile = lex.getString(); + } + if (!lex) + // Parsing of the data failed. + return false; + + 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")); + tmp.changeExtension("ilg"); + if (tmp.exists()) + logTypeCO->addItem(qt_("Index"), QString("index")); + // FIXME: not sure "literate" still works. + } else if (logtype == "literate") { + type_ = LiterateLog; + logTypeCO->addItem(qt_("Literate"), toqstr(logtype)); + } else if (logtype == "lyx2lyx") { + type_ = Lyx2lyxLog; + logTypeCO->addItem(qt_("LyX2LyX"), toqstr(logtype)); + } else if (logtype == "vc") { + type_ = VCLog; + logTypeCO->addItem(qt_("Version Control"), toqstr(logtype)); + } else + return false; + + logfile_ = log; + + updateContents(); + + return true; } + +void GuiLog::clearParams() +{ + logfile_.erase(); +} + + +docstring GuiLog::title() const +{ + switch (type_) { + case LatexLog: + return _("LaTeX Log"); + case LiterateLog: + return _("Literate Programming Build Log"); + case Lyx2lyxLog: + return _("lyx2lyx Error Log"); + case VCLog: + return _("Version Control Log"); + default: + return docstring(); + } +} + + +void GuiLog::getContents(ostream & ss) const +{ + ifstream in(logfile_.toFilesystemEncoding().c_str()); + + bool success = false; + + // FIXME UNICODE + // Our caller interprets the file contents as UTF8, but is that + // correct? + if (in) { + ss << in.rdbuf(); + success = ss.good(); + } + + if (success) + return; + + switch (type_) { + case LatexLog: + ss << to_utf8(_("Log file not found.")); + break; + case LiterateLog: + ss << to_utf8(_("No literate programming build log file found.")); + break; + case Lyx2lyxLog: + ss << to_utf8(_("No lyx2lyx error log file found.")); + break; + case VCLog: + ss << to_utf8(_("No version control log file found.")); + break; + } +} + + +void GuiLog::on_copyPB_clicked() +{ + qApp->clipboard()->setText(logTB->toPlainText()); +} + + +Dialog * createGuiLog(GuiView & lv) { return new GuiLog(lv); } + + } // namespace frontend } // namespace lyx -#include "GuiLog_moc.cpp" +#include "moc_GuiLog.cpp"