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/ConsoleWindow.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/ConsoleWindow.h')
-rw-r--r-- | application/ConsoleWindow.h | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/application/ConsoleWindow.h b/application/ConsoleWindow.h deleted file mode 100644 index ac5a6fd1..00000000 --- a/application/ConsoleWindow.h +++ /dev/null @@ -1,66 +0,0 @@ -/* 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 <QMainWindow> -#include <QSystemTrayIcon> -#include "launch/LaunchTask.h" - -class QPushButton; -class PageContainer; -class ConsoleWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit ConsoleWindow(std::shared_ptr<LaunchTask> proc, QWidget *parent = 0); - virtual ~ConsoleWindow(); - - /** - * @brief specify if the window is allowed to close - * @param mayclose - * used to keep it alive while MC runs - */ - void setMayClose(bool mayclose); - -signals: - void isClosing(); - -private -slots: - void on_closeButton_clicked(); - void on_btnKillMinecraft_clicked(); - - void onSucceeded(); - void onFailed(QString reason); - void onProgressRequested(Task *task); - - // FIXME: add handlers for the other MinecraftLauncher signals (pre/post launch command - // failures) - - void iconActivated(QSystemTrayIcon::ActivationReason); - void toggleConsole(); -protected: - void closeEvent(QCloseEvent *); - -private: - std::shared_ptr<LaunchTask> m_proc; - bool m_mayclose = true; - QSystemTrayIcon *m_trayIcon = nullptr; - PageContainer *m_container = nullptr; - QPushButton *m_closeButton = nullptr; - QPushButton *m_killButton = nullptr; -}; |