forked from qt-creator/qt-creator
AndroidSdkDownloader: Prolong the progress dialog for unarchiving
When the unarchiving task starts, change the label of the progress dialog into "Unarchiving..." and make the progress dialog infinite. Change-Id: Ib7faf1d6d1af75bcad21200e5bd43431b70da4cc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -96,6 +96,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
|
|||||||
m_progressDialog->setWindowModality(Qt::ApplicationModal);
|
m_progressDialog->setWindowModality(Qt::ApplicationModal);
|
||||||
m_progressDialog->setWindowTitle(dialogTitle());
|
m_progressDialog->setWindowTitle(dialogTitle());
|
||||||
m_progressDialog->setFixedSize(m_progressDialog->sizeHint());
|
m_progressDialog->setFixedSize(m_progressDialog->sizeHint());
|
||||||
|
m_progressDialog->setAutoClose(false);
|
||||||
connect(m_progressDialog.get(), &QProgressDialog::canceled, this, [this] {
|
connect(m_progressDialog.get(), &QProgressDialog::canceled, this, [this] {
|
||||||
m_progressDialog.release()->deleteLater();
|
m_progressDialog.release()->deleteLater();
|
||||||
m_taskTree.reset();
|
m_taskTree.reset();
|
||||||
@@ -154,7 +155,8 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
|
|||||||
};
|
};
|
||||||
|
|
||||||
const auto onUnarchiveSetup = [this, storage](Unarchiver &unarchiver) {
|
const auto onUnarchiveSetup = [this, storage](Unarchiver &unarchiver) {
|
||||||
m_progressDialog.reset();
|
m_progressDialog->setRange(0, 0);
|
||||||
|
m_progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
|
||||||
if (!*storage)
|
if (!*storage)
|
||||||
return TaskAction::StopWithError;
|
return TaskAction::StopWithError;
|
||||||
const FilePath sdkFileName = **storage;
|
const FilePath sdkFileName = **storage;
|
||||||
|
|||||||
Reference in New Issue
Block a user