Permalink
Browse files

Bug 761471 - Do not allow ligatures in log output

Replacing QTextEdit by QTextBrowser.
Need to have 1 <pre> block as otherwise an empty line appears between 2 blocks appears as data is read in parts.
  • Loading branch information...
albert-github committed Feb 6, 2016
1 parent 8640121 commit 894bdfdf268ba24a268fa72d7b33899a9f3a126b
Showing with 19 additions and 10 deletions.
  1. +17 −8 addon/doxywizard/doxywizard.cpp
  2. +2 −2 addon/doxywizard/doxywizard.h
View
25 addon/doxywizard/doxywizard.cpp 100644 → 100755
@@ -10,7 +10,7 @@
#include <QVBoxLayout>
#include <QLineEdit>
#include <QLabel>
#include <QTextEdit>
#include <QTextBrowser>
#include <QStatusBar>
#include <QProcess>
#include <QTimer>
@@ -31,6 +31,10 @@
const int messageTimeout = 5000; //!< status bar message timeout in milliseconds.
#define APPQT(x) QString::fromLatin1("<qt><pre>") + x + QString::fromLatin1("</pre></qt>")
static QString text1 = QString::fromLatin1("");
MainWindow &MainWindow::instance()
{
static MainWindow *theInstance = new MainWindow;
@@ -101,7 +105,9 @@ MainWindow::MainWindow()
runTabLayout->addLayout(runLayout);
runTabLayout->addWidget(new QLabel(tr("Output produced by doxygen")));
QGridLayout *grid = new QGridLayout;
m_outputLog = new QTextEdit;
//m_outputLog = new QTextEdit;
m_outputLog = new QTextBrowser;
//m_outputLog = new QPlainTextEdit;
m_outputLog->setReadOnly(true);
m_outputLog->setFontFamily(QString::fromLatin1("courier"));
m_outputLog->setMinimumWidth(600);
@@ -474,11 +480,12 @@ void MainWindow::runDoxygen()
args << QString::fromLatin1("-"); // read config from stdin
m_outputLog->clear();
text1 = QString::fromLatin1("");
m_runProcess->start(doxygenPath + QString::fromLatin1("doxygen"), args);
if (!m_runProcess->waitForStarted())
{
m_outputLog->append(QString::fromLatin1("*** Failed to run doxygen\n"));
m_outputLog->append(APPQT(QString::fromLatin1("*** Failed to run doxygen\n")));
return;
}
QTextStream t(m_runProcess);
@@ -487,7 +494,7 @@ void MainWindow::runDoxygen()
if (m_runProcess->state() == QProcess::NotRunning)
{
m_outputLog->append(QString::fromLatin1("*** Failed to run doxygen\n"));
m_outputLog->append(APPQT(QString::fromLatin1("*** Failed to run doxygen\n")));
}
else
{
@@ -517,7 +524,9 @@ void MainWindow::readStdout()
QString text = QString::fromUtf8(data);
if (!text.isEmpty())
{
m_outputLog->append(text.trimmed());
text1 += text;
m_outputLog->clear();
m_outputLog->append(APPQT(text1.trimmed()));
}
}
}
@@ -526,11 +535,11 @@ void MainWindow::runComplete()
{
if (m_running)
{
m_outputLog->append(tr("*** Doxygen has finished\n"));
m_outputLog->append(APPQT(tr("*** Doxygen has finished\n")));
}
else
{
m_outputLog->append(tr("*** Cancelled by user\n"));
m_outputLog->append(APPQT(tr("*** Cancelled by user\n")));
}
m_outputLog->ensureCursorVisible();
m_run->setText(tr("Run doxygen"));
@@ -592,7 +601,7 @@ void MainWindow::showSettings()
QTextStream t(&text);
m_expert->writeConfig(t,true);
m_outputLog->clear();
m_outputLog->append(text);
m_outputLog->append(APPQT(text));
m_outputLog->ensureCursorVisible();
m_saveLog->setEnabled(true);
}
View
4 addon/doxywizard/doxywizard.h 100644 → 100755
@@ -10,7 +10,7 @@ class Wizard;
class QLabel;
class QLineEdit;
class QPushButton;
class QTextEdit;
class QTextBrowser;
class QMenu;
class QProcess;
class QTimer;
@@ -69,7 +69,7 @@ class MainWindow : public QMainWindow
QPushButton *m_saveLog;
QPushButton *m_launchHtml;
QPushButton *m_launchPdf;
QTextEdit *m_outputLog;
QTextBrowser *m_outputLog;
QLabel *m_runStatus;
Expert *m_expert;
Wizard *m_wizard;

0 comments on commit 894bdfd

Please sign in to comment.