diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:34:45 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:34:45 +0100 |
commit | 0cb8ff40b26401a707781c2c4171d3ec6c114077 (patch) | |
tree | 0e075c830b67f8b15d5359d06d1026987dc5c124 /gui/dialogs/ProgressDialog.h | |
parent | f028aa76bc5d28b7fc4d1ea4e194895690e9944e (diff) | |
download | MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.gz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.lz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.tar.xz MultiMC-0cb8ff40b26401a707781c2c4171d3ec6c114077.zip |
Finish preliminary offline support
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort
YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
Diffstat (limited to 'gui/dialogs/ProgressDialog.h')
-rw-r--r-- | gui/dialogs/ProgressDialog.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/dialogs/ProgressDialog.h b/gui/dialogs/ProgressDialog.h index 0029d3ec..fe63a826 100644 --- a/gui/dialogs/ProgressDialog.h +++ b/gui/dialogs/ProgressDialog.h @@ -35,6 +35,7 @@ public: void updateSize(); int exec(ProgressProvider *task); + void setSkipButton(bool present, QString label = QString()); ProgressProvider *getTask(); @@ -47,7 +48,10 @@ slots: void changeStatus(const QString &status); void changeProgress(qint64 current, qint64 total); -signals: + +private +slots: + void on_skipButton_clicked(bool checked); protected: virtual void keyPressEvent(QKeyEvent *e); |