summaryrefslogtreecommitdiffstats
path: root/application/MainWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-08-06 15:39:29 +0200
committerPetr Mrázek <peterix@gmail.com>2016-08-07 11:48:15 +0200
commitbc6d1b5304f715ad0d8be27efd6630f820572da4 (patch)
tree6f42bdd351664b6f828247b4860ee3ad723b0971 /application/MainWindow.h
parentc44d41ee9b132d4f757658bd62d4b115b7887fe3 (diff)
downloadMultiMC-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/MainWindow.h')
-rw-r--r--application/MainWindow.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/application/MainWindow.h b/application/MainWindow.h
index e3fb0467..3f0ec6e6 100644
--- a/application/MainWindow.h
+++ b/application/MainWindow.h
@@ -37,6 +37,7 @@ class MinecraftLauncher;
class BaseProfilerFactory;
class GroupView;
class ServerStatus;
+class InstanceWindow;
class MainWindow : public QMainWindow
{
@@ -54,6 +55,8 @@ public:
void checkSetDefaultJava();
void checkInstancePathForProblems();
+ InstanceWindow *showInstanceWindow(InstancePtr instance, QString page = QString());
+
private slots:
void onCatToggled(bool);
@@ -159,6 +162,8 @@ private slots:
*/
void downloadUpdates(GoUpdate::Status status);
+ void on_instanceWindowClose();
+
private:
void setCatBackground(bool enabled);
void updateInstanceToolIcon(QString new_icon);
@@ -195,4 +200,7 @@ private:
// managed by the application object
Task *m_versionLoadTask;
+
+ // map from instance ID to its window
+ QMap<QString, InstanceWindow *> m_instanceWindows;
};