summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-05-18 19:07:01 +0200
committerPetr Mrázek <peterix@gmail.com>2014-05-18 19:07:01 +0200
commit911ac19a56fa1a5f8dd4798385022813cd0b9d07 (patch)
tree607971d32b1c6e18bb5d6570800fa7e3bd11878d /gui/ConsoleWindow.h
parent7f2a16917e347db2ffcdd5a148feda71f6f3a47e (diff)
downloadMultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar
MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.gz
MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.lz
MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.xz
MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.zip
Screenshot upload dialog(s) now have the console window as parent.
Diffstat (limited to 'gui/ConsoleWindow.h')
-rw-r--r--gui/ConsoleWindow.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h
index e21da33c..17c64392 100644
--- a/gui/ConsoleWindow.h
+++ b/gui/ConsoleWindow.h
@@ -51,7 +51,6 @@ private:
signals:
void isClosing();
- void uploadScreenshots();
public
slots:
@@ -71,9 +70,11 @@ slots:
private
slots:
void on_closeButton_clicked();
+ void on_btnScreenshots_clicked();
void on_btnKillMinecraft_clicked();
- void onEnded(BaseInstance *instance, int code, QProcess::ExitStatus status);
- void onLaunchFailed(BaseInstance *instance);
+
+ void onEnded(InstancePtr instance, int code, QProcess::ExitStatus status);
+ void onLaunchFailed(InstancePtr instance);
// FIXME: add handlers for the other MinecraftProcess signals (pre/post launch command
// failures)