summaryrefslogtreecommitdiffstats
path: root/api/logic/launch/LaunchTask.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-08-08 00:00:11 +0200
committerPetr Mrázek <peterix@gmail.com>2016-08-10 00:28:33 +0200
commitfc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a (patch)
tree26d0c907fcfdbf93da37d19f731962609c65464f /api/logic/launch/LaunchTask.h
parent74b4343c43cb0f3fc85cf27d1159349d0b3f32e6 (diff)
downloadMultiMC-fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.tar
MultiMC-fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.tar.gz
MultiMC-fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.tar.lz
MultiMC-fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.tar.xz
MultiMC-fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.zip
NOISSUE rework of minecraft log
Now uses a model and a list view instead of text This lets mmc keep track of the contents regardless of whether the instance windows are open This is currently missing a way to select and copy text from the log.
Diffstat (limited to 'api/logic/launch/LaunchTask.h')
-rw-r--r--api/logic/launch/LaunchTask.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/api/logic/launch/LaunchTask.h b/api/logic/launch/LaunchTask.h
index 447445ca..f2fb3a2c 100644
--- a/api/logic/launch/LaunchTask.h
+++ b/api/logic/launch/LaunchTask.h
@@ -17,6 +17,8 @@
#pragma once
#include <QProcess>
+#include <QObjectPtr.h>
+#include "LogModel.h"
#include "BaseInstance.h"
#include "MessageLevel.h"
#include "LoggedProcess.h"
@@ -80,6 +82,8 @@ public: /* methods */
*/
virtual bool abort() override;
+ shared_qobject_ptr<LogModel> getLogModel();
+
public:
QString substituteVariables(const QString &cmd) const;
QString censorPrivateInfo(QString in);
@@ -98,13 +102,6 @@ signals:
void requestLogging();
- /**
- * @brief emitted when we want to log something
- * @param text the text to log
- * @param level the level to log at
- */
- void log(QString text, MessageLevel::Enum level = MessageLevel::MultiMC);
-
public slots:
void onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC);
void onLogLine(QString line, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC);
@@ -114,6 +111,7 @@ public slots:
protected: /* data */
InstancePtr m_instance;
+ shared_qobject_ptr<LogModel> m_logModel;
QList <std::shared_ptr<LaunchStep>> m_steps;
QMap<QString, QString> m_censorFilter;
int currentStep = -1;