summaryrefslogtreecommitdiffstats
path: root/application/MainWindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'application/MainWindow.h')
-rw-r--r--application/MainWindow.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/application/MainWindow.h b/application/MainWindow.h
index 2a70f17c..e4c281dc 100644
--- a/application/MainWindow.h
+++ b/application/MainWindow.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
#include "minecraft/auth/MojangAccount.h"
#include "net/NetJob.h"
#include "updater/GoUpdate.h"
+#include <modplatform/FtbPackDownloader.h>
class LaunchController;
class NewsChecker;
@@ -74,6 +75,10 @@ private slots:
void on_actionChangeInstGroup_triggered();
void on_actionChangeInstIcon_triggered();
+ void on_changeIconButton_clicked(bool)
+ {
+ on_actionChangeInstIcon_triggered();
+ }
void on_actionViewInstanceFolder_triggered();
@@ -81,11 +86,11 @@ private slots:
void on_actionViewSelectedInstFolder_triggered();
- void on_actionRefresh_triggered();
+ void refreshInstances();
void on_actionViewCentralModsFolder_triggered();
- void on_actionCheckUpdate_triggered();
+ void checkForUpdates();
void on_actionSettings_triggered();
@@ -109,11 +114,15 @@ private slots:
void on_actionDeleteInstance_triggered();
- void on_actionDeleteGroup_triggered();
+ void deleteGroup();
void on_actionExportInstance_triggered();
void on_actionRenameInstance_triggered();
+ void on_renameButton_clicked(bool)
+ {
+ on_actionRenameInstance_triggered();
+ }
void on_actionEditInstance_triggered();
@@ -177,6 +186,7 @@ private:
void runModalTask(Task *task);
void instanceFromVersion(QString instName, QString instGroup, QString instIcon, BaseVersionPtr version);
void instanceFromZipPack(QString instName, QString instGroup, QString instIcon, QUrl url);
+ void instanceFromFtbPack(FtbPackDownloader *downloader, QString instName, QString instGroup, QString instIcon);
void finalizeInstance(InstancePtr inst);
private:
@@ -185,14 +195,11 @@ private:
// these are managed by Qt's memory management model!
GroupView *view = nullptr;
InstanceProxyModel *proxymodel = nullptr;
- LabeledToolButton *renameButton = nullptr;
- QToolButton *changeIconButton = nullptr;
QToolButton *newsLabel = nullptr;
QLabel *m_statusLeft = nullptr;
ServerStatus *m_statusRight = nullptr;
QMenu *accountMenu = nullptr;
QToolButton *accountMenuButton = nullptr;
- QAction *manageAccountsAction = nullptr;
unique_qobject_ptr<NetJob> skin_download_job;
unique_qobject_ptr<NewsChecker> m_newsChecker;