diff options
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/installer/extractarchiveoperation.cpp | 5 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp index 128327855..12608a0d1 100644 --- a/src/libs/installer/extractarchiveoperation.cpp +++ b/src/libs/installer/extractarchiveoperation.cpp @@ -30,6 +30,7 @@ #include <QEventLoop> #include <QThreadPool> +#include <QFileInfo> namespace QInstaller { @@ -69,6 +70,9 @@ bool ExtractArchiveOperation::performOperation() m_files.clear(); + QFileInfo fileInfo(archivePath); + emit outputTextChanged(tr("Extracting \"%1\"").arg(fileInfo.fileName())); + QEventLoop loop; connect(&receiver, &Receiver::finished, &loop, &QEventLoop::quit); if (QThreadPool::globalInstance()->tryStart(runnable)) { @@ -126,7 +130,6 @@ bool ExtractArchiveOperation::testOperation() void ExtractArchiveOperation::fileFinished(const QString &filename) { m_files.prepend(filename); - emit outputTextChanged(QDir::toNativeSeparators(filename)); } } // namespace QInstaller diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index c20be0b78..167e806f8 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1867,9 +1867,11 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr const int opCount = operations.count(); // show only components which do something, MinimumProgress is only for progress calculation safeness + bool showDetailsLog = false; if (opCount > 1 || (opCount == 1 && operations.at(0)->name() != QLatin1String("MinimumProgress"))) { - ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("\nInstalling component %1") - .arg(component->displayName())); + ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("\nInstalling component %1...") + .arg(component->displayName())); + showDetailsLog = true; } foreach (Operation *operation, operations) { @@ -1953,6 +1955,9 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr component->setInstalled(); component->markAsPerformedInstallation(); + + if (showDetailsLog) + ProgressCoordinator::instance()->emitDetailTextChanged(tr("Done")); } // -- private |