summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-24 09:34:21 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-24 09:34:21 +0100
commit226c1bdae5ec615381965b6731f6496dffa3299e (patch)
tree6d437bf3aea4b3954d705f3fa11b78b3e3b42f99 /gui/ConsoleWindow.cpp
parent5e33da258c3b5159dba854eb4792d0852a1ca363 (diff)
downloadMultiMC-226c1bdae5ec615381965b6731f6496dffa3299e.tar
MultiMC-226c1bdae5ec615381965b6731f6496dffa3299e.tar.gz
MultiMC-226c1bdae5ec615381965b6731f6496dffa3299e.tar.lz
MultiMC-226c1bdae5ec615381965b6731f6496dffa3299e.tar.xz
MultiMC-226c1bdae5ec615381965b6731f6496dffa3299e.zip
Screenshot fixes, move some code around, fix some stuff
Diffstat (limited to 'gui/ConsoleWindow.cpp')
-rw-r--r--gui/ConsoleWindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index ccc037f2..d11e8aff 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -42,6 +42,8 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent)
connect(mcproc, SIGNAL(launch_failed(BaseInstance *)), this,
SLOT(onLaunchFailed(BaseInstance *)));
+ connect(ui->btnScreenshots, &QPushButton::clicked, this, &ConsoleWindow::uploadScreenshots);
+
restoreState(
QByteArray::fromBase64(MMC->settings()->get("ConsoleWindowState").toByteArray()));
restoreGeometry(
@@ -52,6 +54,7 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent)
auto icon = MMC->icons()->getIcon(iconKey);
setWindowIcon(icon);
m_trayIcon = new QSystemTrayIcon(icon, this);
+ // TODO add screenshot upload as a menu item in the tray icon
QString consoleTitle = tr("Console window for ") + name;
m_trayIcon->setToolTip(consoleTitle);
setWindowTitle(consoleTitle);