diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2017-12-05 06:34:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 06:34:47 +0200 |
| commit | fa598e86dbce096b5439ae704dd18cc5b1289191 (patch) | |
| tree | 66f9ecd51775c9e184b1679fc2d6fecc74fb1d8a /src/installationmanager.cpp | |
| parent | c64e12a289066c6b4834c43a49ff631a33b2f3ce (diff) | |
| parent | ffdc5ca7ccb24bc937ed5418b7a6e5a1b7d719dd (diff) | |
Merge pull request #135 from LePresidente/QT5.7
All changes done for 2.1.0
Diffstat (limited to 'src/installationmanager.cpp')
| -rw-r--r-- | src/installationmanager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 9be4cdd9..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,9 +421,10 @@ void InstallationManager::updateProgress(float percentage) void InstallationManager::updateProgressFile(QString const &fileName)
{
- if (m_InstallationProgress != nullptr) {
- m_InstallationProgress->setLabelText(fileName);
- }
+ if (m_InstallationProgress != nullptr) {
+ m_InstallationProgress->setLabelText(fileName);
+ QCoreApplication::processEvents();
+ }
}
@@ -563,6 +566,7 @@ bool InstallationManager::doInstall(GuessedValue<QString> &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<InstallationManager, void, float>(this, &InstallationManager::updateProgress),
|