diff options
| author | Stiepen22 <stiepen22@gmx.de> | 2013-09-08 15:02:52 +0200 |
|---|---|---|
| committer | Stiepen22 <stiepen22@gmx.de> | 2013-09-08 15:02:52 +0200 |
| commit | dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9 (patch) | |
| tree | fa72bb238a11e2f98cf6816c4a8540f2abb0efc9 /gui | |
| parent | 5cac21ca6387a3cbd5492b933c5ad6d7b76b8bc7 (diff) | |
| download | MultiMC-dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9.tar MultiMC-dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9.tar.gz MultiMC-dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9.tar.lz MultiMC-dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9.tar.xz MultiMC-dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9.zip | |
Added console coloring and made the log not contain any usernames/session ids
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/consolewindow.cpp | 8 | ||||
| -rw-r--r-- | gui/mainwindow.cpp | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gui/consolewindow.cpp b/gui/consolewindow.cpp index aba876c8..8ea90d45 100644 --- a/gui/consolewindow.cpp +++ b/gui/consolewindow.cpp @@ -23,7 +23,7 @@ void ConsoleWindow::writeColor(QString text, const char *color) { // append a paragraph if (color != nullptr) - ui->text->appendHtml(QString("<font color=%1>%2</font>").arg(color).arg(text)); + ui->text->appendHtml(QString("<font color=\"%1\">%2</font>").arg(color).arg(text)); else ui->text->appendPlainText(text); // scroll down @@ -46,6 +46,12 @@ void ConsoleWindow::write(QString data, MessageLevel::Enum mode) else if (mode == MessageLevel::Warning) while(iter.hasNext()) writeColor(iter.next(), "orange"); + else if (mode == MessageLevel::Fatal) + while(iter.hasNext()) + writeColor(iter.next(), "pink"); + else if (mode == MessageLevel::Debug) + while(iter.hasNext()) + writeColor(iter.next(), "green"); // TODO: implement other MessageLevels else while(iter.hasNext()) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 82ae41d9..152773e7 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -556,6 +556,7 @@ void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response) connect(proc, SIGNAL(log(QString, MessageLevel::Enum)), console, SLOT(write(QString, MessageLevel::Enum))); connect(proc, SIGNAL(ended()), this, SLOT(instanceEnded())); + proc->setLogin(m_activeLogin.username, m_activeLogin.sessionID); proc->launch(); } |