summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'gui/MainWindow.h')
-rw-r--r--gui/MainWindow.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 59cfa3c9..befe93e6 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -31,7 +31,6 @@ class KCategorizedView;
class KCategoryDrawer;
class MinecraftProcess;
class ConsoleWindow;
-class OneSixAssets;
namespace Ui
{
@@ -110,18 +109,13 @@ slots:
* If no default account is selected, prompts the user to pick an account.
*/
void doLaunch();
-
- /*!
- * Launches the given instance with the given account.
- */
- void doLaunchInst(BaseInstance* instance, MojangAccountPtr account);
/*!
* Opens an input dialog, allowing the user to input their password and refresh its access token.
* This function will execute the proper Yggdrasil task to refresh the access token.
* Returns true if successful. False if the user cancelled.
*/
- bool doRefreshToken(MojangAccountPtr account, const QString& errorMsg="");
+ bool loginWithPassword(MojangAccountPtr account, const QString& errorMsg="");
/*!
* Launches the given instance with the given account.
@@ -132,7 +126,7 @@ slots:
/*!
* Prepares the given instance for launch with the given account.
*/
- void prepareLaunch(BaseInstance* instance, MojangAccountPtr account);
+ void updateInstance(BaseInstance* instance, MojangAccountPtr account);
void onGameUpdateError(QString error);
@@ -161,11 +155,18 @@ slots:
void startTask(Task *task);
+ void updateAvailable(QString repo, QString versionName, int versionId);
+
void activeAccountChanged();
void changeActiveAccount();
void repopulateAccountsMenu();
+
+ /*!
+ * Runs the DownloadUpdateTask and installs updates.
+ */
+ void downloadUpdates(QString repo, int versionId, bool installOnExit=false);
protected:
bool eventFilter(QObject *obj, QEvent *ev);
@@ -178,7 +179,6 @@ private:
InstanceProxyModel *proxymodel;
MinecraftProcess *proc;
ConsoleWindow *console;
- OneSixAssets *assets_downloader;
LabeledToolButton *renameButton;
QToolButton *changeIconButton;