kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix issue when non-error messages were incorrectly colored red.

Browse Source
This commit is contained in:
Clinton Stimpson 2008-04-14 16:15:28 -04:00
parent 629afe07ce
commit 3052d2c854
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/QtDialog/CMakeSetupDialog.cxx
View File

@ -138,6 +138,7 @@ CMakeSetupDialog::CMakeSetupDialog()
// fixed pitch font in output window // fixed pitch font in output window
QFont outputFont("Courier"); QFont outputFont("Courier");
this->Output->setFont(outputFont); this->Output->setFont(outputFont);
this->ErrorFormat.setForeground(QBrush(Qt::red));
// start the cmake worker thread // start the cmake worker thread
this->CMakeThread = new QCMakeThread(this); this->CMakeThread = new QCMakeThread(this);
@ -512,32 +513,17 @@ void CMakeSetupDialog::showProgress(const QString& /*msg*/, float percent)
{ {
this->ProgressBar->setValue(qRound(percent * 100)); this->ProgressBar->setValue(qRound(percent * 100));
} }
void CMakeSetupDialog::error(const QString& message) void CMakeSetupDialog::error(const QString& message)
{ {
QStringList messages = message.split('\n'); this->Output->setCurrentCharFormat(this->ErrorFormat);
foreach(QString m, messages) this->Output->append(message);
{
// make sure we escape html tags in the cmake messages
m.replace(QString("&"), QString("&"));
m.replace(QString("<"), QString("&lt;"));
m.replace(QString(">"), QString("&gt;"));
m.replace(QString(" "), QString("&nbsp;"));
this->Output->append(QString("<b><font color=red>%1</font></b>").arg(m));
}
} }
void CMakeSetupDialog::message(const QString& message) void CMakeSetupDialog::message(const QString& message)
{ {
QStringList messages = message.split('\n'); this->Output->setCurrentCharFormat(this->MessageFormat);
foreach(QString m, messages) this->Output->append(message);
{
// make sure we escape html tags in the cmake messages
m.replace(QString("&"), QString("&amp;"));
m.replace(QString("<"), QString("&lt;"));
m.replace(QString(">"), QString("&gt;"));
this->Output->append(m);
}
} }
void CMakeSetupDialog::setEnabledState(bool enabled) void CMakeSetupDialog::setEnabledState(bool enabled)

3
Source/QtDialog/CMakeSetupDialog.h
View File

@ -99,6 +99,9 @@ protected:
QAction* InstallForCommandLineAction; QAction* InstallForCommandLineAction;
State CurrentState; State CurrentState;
QTextCharFormat ErrorFormat;
QTextCharFormat MessageFormat;
}; };
// QCMake instance on a thread // QCMake instance on a thread