diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-08-06 15:39:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-08-07 11:48:15 +0200 |
| commit | bc6d1b5304f715ad0d8be27efd6630f820572da4 (patch) | |
| tree | 6f42bdd351664b6f828247b4860ee3ad723b0971 /application/pages/LogPage.h | |
| parent | c44d41ee9b132d4f757658bd62d4b115b7887fe3 (diff) | |
| download | MultiMC-bc6d1b5304f715ad0d8be27efd6630f820572da4.tar MultiMC-bc6d1b5304f715ad0d8be27efd6630f820572da4.tar.gz MultiMC-bc6d1b5304f715ad0d8be27efd6630f820572da4.tar.lz MultiMC-bc6d1b5304f715ad0d8be27efd6630f820572da4.tar.xz MultiMC-bc6d1b5304f715ad0d8be27efd6630f820572da4.zip | |
GH-338, GH-513, GH-700 Unify edit instance with console window
* The resulting instance window can be closed at any point.
* Main window is kept open and running instances are marked with a badge.
* Multiple instances can now run from the same MultiMC - it's even more **multi** now.
* MultiMC can be entirely closed, keeping Minecraft(s) running.
Diffstat (limited to 'application/pages/LogPage.h')
| -rw-r--r-- | application/pages/LogPage.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h index 9b694323..e902ad13 100644 --- a/application/pages/LogPage.h +++ b/application/pages/LogPage.h @@ -34,7 +34,7 @@ class LogPage : public QWidget, public BasePage Q_OBJECT public: - explicit LogPage(std::shared_ptr<LaunchTask> proc, QWidget *parent = 0); + explicit LogPage(InstancePtr instance, QWidget *parent = 0); virtual ~LogPage(); virtual QString displayName() const override { @@ -77,8 +77,11 @@ private slots: void findNextActivated(); void findPreviousActivated(); + void on_InstanceLaunchTask_changed(std::shared_ptr<LaunchTask> proc); + private: Ui::LogPage *ui; + InstancePtr m_instance; std::shared_ptr<LaunchTask> m_process; int m_last_scroll_value = 0; bool m_scroll_active = true; |