From 8d5c67296f7e8b87a8feb70e32c3a89713f80fbe Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Tue, 7 Nov 2017 22:18:55 -0600 Subject: Forcing the progress window to resize seems to hang the extraction process --- src/installationmanager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/installationmanager.cpp') diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 9be4cdd9..d2d131fd 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -420,7 +420,12 @@ void InstallationManager::updateProgress(float percentage) void InstallationManager::updateProgressFile(QString const &fileName) { if (m_InstallationProgress != nullptr) { - m_InstallationProgress->setLabelText(fileName); + if (fileName.size() > 30) { + m_InstallationProgress->setLabelText("..." + fileName.right(27)); + } + else { + m_InstallationProgress->setLabelText(fileName); + } } } -- cgit v1.3.1 From 092596f57afe6c44a11465d1df5522e48d185297 Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Tue, 7 Nov 2017 23:31:07 -0600 Subject: Don't truncate, bypass the issue by fixing the progress window size --- src/installationmanager.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/installationmanager.cpp') diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index d2d131fd..9a70f8bd 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -187,6 +187,7 @@ bool InstallationManager::unpackSingleFile(const QString &fileName) m_InstallationProgress->setWindowTitle(tr("Extracting files")); m_InstallationProgress->setWindowModality(Qt::WindowModal); + m_InstallationProgress->setFixedSize(600, 100); m_InstallationProgress->show(); bool res = m_ArchiveHandler->extract(QDir::tempPath(), @@ -274,6 +275,7 @@ QStringList InstallationManager::extractFiles(const QStringList &filesOrig, bool m_InstallationProgress->windowFlags() & (~Qt::WindowContextHelpButtonHint)); m_InstallationProgress->setWindowTitle(tr("Extracting files")); m_InstallationProgress->setWindowModality(Qt::WindowModal); + m_InstallationProgress->setFixedSize(600, 100); m_InstallationProgress->show(); // unpack only the files we need for the installer @@ -419,14 +421,10 @@ void InstallationManager::updateProgress(float percentage) void InstallationManager::updateProgressFile(QString const &fileName) { - if (m_InstallationProgress != nullptr) { - if (fileName.size() > 30) { - m_InstallationProgress->setLabelText("..." + fileName.right(27)); - } - else { - m_InstallationProgress->setLabelText(fileName); - } - } + if (m_InstallationProgress != nullptr) { + m_InstallationProgress->setLabelText(fileName); + QCoreApplication::processEvents(); + } } @@ -568,6 +566,7 @@ bool InstallationManager::doInstall(GuessedValue &modName, int modID, m_InstallationProgress->setWindowFlags( m_InstallationProgress->windowFlags() & (~Qt::WindowContextHelpButtonHint)); m_InstallationProgress->setWindowModality(Qt::WindowModal); + m_InstallationProgress->setFixedSize(600, 100); m_InstallationProgress->show(); if (!m_ArchiveHandler->extract(targetDirectory, new MethodCallback(this, &InstallationManager::updateProgress), -- cgit v1.3.1