summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-04 04:19:10 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-04 04:19:10 +0200
commit0adf1828b047699b9d15e2abf08a1ae0b89da73b (patch)
treeb29fd7a91a33a1706367560288d67fb12329fd4c /gui
parent4f73091bb5bdbdb91329b9a4ef647fc8286d423c (diff)
downloadMultiMC-0adf1828b047699b9d15e2abf08a1ae0b89da73b.tar
MultiMC-0adf1828b047699b9d15e2abf08a1ae0b89da73b.tar.gz
MultiMC-0adf1828b047699b9d15e2abf08a1ae0b89da73b.tar.lz
MultiMC-0adf1828b047699b9d15e2abf08a1ae0b89da73b.tar.xz
MultiMC-0adf1828b047699b9d15e2abf08a1ae0b89da73b.zip
Download assets for 1.6 on application start (background task).
Diffstat (limited to 'gui')
-rw-r--r--gui/mainwindow.cpp8
-rw-r--r--gui/mainwindow.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 50d301ed..c4e8dc03 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -58,6 +58,7 @@
#include "BaseInstance.h"
#include "InstanceFactory.h"
#include "MinecraftProcess.h"
+#include "OneSixAssets.h"
#include "instancemodel.h"
#include "instancedelegate.h"
@@ -144,16 +145,20 @@ MainWindow::MainWindow ( QWidget *parent ) :
instList.at(0)->setName("TEST ITEM");
*/
+ //FIXME: WTF
if (!MinecraftVersionList::getMainList().isLoaded())
{
m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask();
startTask(m_versionLoadTask);
}
-
+ //FIXME: WTF X 2
if (!LWJGLVersionList::get().isLoaded())
{
LWJGLVersionList::get().loadList();
}
+ //FIXME: I guess you get the idea. This is a quick hack.
+ assets_downloader = new OneSixAssets();
+ assets_downloader->start();
}
MainWindow::~MainWindow()
@@ -162,6 +167,7 @@ MainWindow::~MainWindow()
delete proxymodel;
delete model;
delete drawer;
+ delete assets_downloader;
}
void MainWindow::instanceActivated ( QModelIndex index )
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 8ab90cc6..6fa83973 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -28,6 +28,7 @@ class KCategorizedView;
class KCategoryDrawer;
class MinecraftProcess;
class ConsoleWindow;
+class OneSixAssets;
namespace Ui
{
@@ -128,6 +129,7 @@ private:
InstanceList instList;
MinecraftProcess *proc;
ConsoleWindow *console;
+ OneSixAssets *assets_downloader;
// A pointer to the instance we are actively doing stuff with.
// This is set when the user launches an instance and is used to refer to that