From 4623aa44f58575b6d2ceb0b047945ffeb0081f65 Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 14 Dec 2013 10:06:32 +0000 Subject: Add status shown specifically when downloading assets --- logic/OneSixUpdate.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'logic/OneSixUpdate.cpp') diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index 4228fc44..66950fc4 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -248,6 +248,7 @@ void OneSixUpdate::assetIndexFinished() } if(dls.size()) { + setStatus("Getting the assets files from Mojang..."); auto job = new NetJob("Assets for " + inst->name()); for(auto dl: dls) job->addNetAction(dl); -- cgit v1.2.3 From 5a3043398e45cbe39455609a42463f2e6e5d3fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 15 Dec 2013 15:00:09 +0100 Subject: Use asset sizes from the index to make the progress bar better --- logic/OneSixUpdate.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'logic/OneSixUpdate.cpp') diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index 66950fc4..62332267 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -243,6 +243,7 @@ void OneSixUpdate::assetIndexFinished() auto objectDL = MD5EtagDownload::make( QUrl("http://" + URLConstants::RESOURCE_BASE + objectName), objectFile.filePath()); + objectDL->m_total_progress = object.size; dls.append(objectDL); } } -- cgit v1.2.3 From dd9e04000ccd02a868138de9276f8fb93b855550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 15 Dec 2013 18:10:51 +0100 Subject: Improve group changing, update instance on version change Gives a list of existing groups to choose from. Instances are updated as long as there is at least one valid account. --- logic/OneSixUpdate.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'logic/OneSixUpdate.cpp') diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index 62332267..696eeff0 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -54,11 +54,9 @@ void OneSixUpdate::executeTask() if (m_only_prepare) { - if (m_inst->shouldUpdate()) - { - emitFailed("Unable to update instance in offline mode."); - return; - } + /* + * FIXME: in offline mode, do not proceed! + */ setStatus("Testing the Java installation."); QString java_path = m_inst->settings().get("JavaPath").toString(); -- cgit v1.2.3