From bc6d1b5304f715ad0d8be27efd6630f820572da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 Aug 2016 15:39:29 +0200 Subject: 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. --- application/InstanceWindow.h | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 application/InstanceWindow.h (limited to 'application/InstanceWindow.h') diff --git a/application/InstanceWindow.h b/application/InstanceWindow.h new file mode 100644 index 00000000..7ffc4142 --- /dev/null +++ b/application/InstanceWindow.h @@ -0,0 +1,68 @@ +/* Copyright 2013-2015 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include +#include "LaunchInteraction.h" +#include +#include +#include "launch/LaunchTask.h" +#include "pages/BasePageContainer.h" + +class QPushButton; +class PageContainer; +class InstanceWindow : public QMainWindow, public BasePageContainer +{ + Q_OBJECT + +public: + explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0); + virtual ~InstanceWindow(); + + bool selectPage(QString pageId) override; + + QString instanceId(); + +signals: + void isClosing(); + +private +slots: + void on_closeButton_clicked(); + void on_btnKillMinecraft_clicked(); + + void onSucceeded(); + void onFailed(QString reason); + void onProgressRequested(Task *task); + + void on_InstanceLaunchTask_changed(std::shared_ptr proc); + void on_RunningState_changed(bool running); + +protected: + void closeEvent(QCloseEvent *) override; + +private: + void setKillButton(bool kill); + +private: + std::shared_ptr m_proc; + unique_qobject_ptr m_launchController; + InstancePtr m_instance; + bool m_mayclose = true; + PageContainer *m_container = nullptr; + QPushButton *m_closeButton = nullptr; + QPushButton *m_killButton = nullptr; +}; -- cgit v1.2.3