diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-11 22:21:37 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-06-30 07:16:20 +0200 |
| commit | 34ddfc7ecc2b0450b3d501e65cb4203ac747ed42 (patch) | |
| tree | c53d32ac89aa996347901ea64f25909231a75895 /application/pages | |
| parent | d14a61b0df38d150e1449b19b7eee411e91e5211 (diff) | |
| download | MultiMC-34ddfc7ecc2b0450b3d501e65cb4203ac747ed42.tar MultiMC-34ddfc7ecc2b0450b3d501e65cb4203ac747ed42.tar.gz MultiMC-34ddfc7ecc2b0450b3d501e65cb4203ac747ed42.tar.lz MultiMC-34ddfc7ecc2b0450b3d501e65cb4203ac747ed42.tar.xz MultiMC-34ddfc7ecc2b0450b3d501e65cb4203ac747ed42.zip | |
GH-1053 base process and launch refactor, part 1
Diffstat (limited to 'application/pages')
| -rw-r--r-- | application/pages/LogPage.cpp | 13 | ||||
| -rw-r--r-- | application/pages/LogPage.h | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp index 3fade26f..0b88193c 100644 --- a/application/pages/LogPage.cpp +++ b/application/pages/LogPage.cpp @@ -7,11 +7,11 @@ #include <QScrollBar> #include <QShortcut> -#include "BaseProcess.h" +#include "BaseLauncher.h" #include <settings/Setting.h> #include "GuiUtil.h" -LogPage::LogPage(BaseProcess *proc, QWidget *parent) +LogPage::LogPage(BaseLauncher *proc, QWidget *parent) : QWidget(parent), ui(new Ui::LogPage), m_process(proc) { ui->setupUi(this); @@ -148,14 +148,14 @@ void LogPage::write(QString data, MessageLevel::Enum mode) { if (!m_write_active) { - if (mode != MessageLevel::PrePost && mode != MessageLevel::MultiMC) + if (mode != MessageLevel::MultiMC) { return; } } if(m_stopOnOverflow && m_write_active) { - if(mode != MessageLevel::PrePost && mode != MessageLevel::MultiMC) + if(mode != MessageLevel::MultiMC) { if(ui->text->blockCount() >= ui->text->maximumBlockCount()) { @@ -231,11 +231,6 @@ void LogPage::write(QString data, MessageLevel::Enum mode) format.setBackground(QColor("black")); break; } - case MessageLevel::PrePost: - { - format.setForeground(QColor("grey")); - break; - } case MessageLevel::Info: case MessageLevel::Message: default: diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h index 0cbf3d23..a420a75f 100644 --- a/application/pages/LogPage.h +++ b/application/pages/LogPage.h @@ -18,7 +18,7 @@ #include <QWidget> #include "BaseInstance.h" -#include "BaseProcess.h" +#include "BaseLauncher.h" #include "BasePage.h" #include <MultiMC.h> @@ -33,7 +33,7 @@ class LogPage : public QWidget, public BasePage Q_OBJECT public: - explicit LogPage(BaseProcess *proc, QWidget *parent = 0); + explicit LogPage(BaseLauncher *proc, QWidget *parent = 0); virtual ~LogPage(); virtual QString displayName() const override { @@ -77,7 +77,7 @@ private slots: private: Ui::LogPage *ui; - BaseProcess *m_process; + BaseLauncher *m_process; int m_last_scroll_value = 0; bool m_scroll_active = true; int m_saved_offset = 0; |