aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-04-04 15:10:34 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-04-05 11:24:06 +0000
commit0ee4322dfdc5e03eb4c50c0b826ad6aa58786b28 (patch)
tree0a6c106a88d951edbd9e73e99114e2e0239f0868 /src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
parent06703e17d4a68381a69577aac1289d7efff3d9ea (diff)
QmlDesigner: Auto close 3D import dialog on success
Fixes: QDS-6573 Change-Id: I790a88a683e1cf4ca846148a4cde01b07b2a1844 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp')
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 1f974419c7..6c5005546e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -724,11 +724,13 @@ void ItemLibraryAssetImportDialog::setCloseButtonState(bool importing)
void ItemLibraryAssetImportDialog::addError(const QString &error, const QString &srcPath)
{
+ m_closeOnFinish = false;
addFormattedMessage(m_outputFormatter, error, srcPath, Utils::StdErrFormat);
}
void ItemLibraryAssetImportDialog::addWarning(const QString &warning, const QString &srcPath)
{
+ m_closeOnFinish = false;
addFormattedMessage(m_outputFormatter, warning, srcPath, Utils::StdOutFormat);
}
@@ -777,6 +779,10 @@ void ItemLibraryAssetImportDialog::onImportFinished()
QString doneStr = tr("Import done.");
addInfo(doneStr);
setImportProgress(100, doneStr);
+ if (m_closeOnFinish) {
+ // Add small delay to allow user to visually confirm import finishing
+ QTimer::singleShot(1000, this, &ItemLibraryAssetImportDialog::onClose);
+ }
}
}
@@ -785,7 +791,7 @@ void ItemLibraryAssetImportDialog::onClose()
if (m_importer.isImporting()) {
addInfo(tr("Canceling import."));
m_importer.cancelImport();
- } else {
+ } else if (isVisible()) {
if (ui->progressBar->value() == 100) // import done successfully
accept();
else