From a89e9e2917f0e783ced39769b879b0f4c53e144a Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 4 Aug 2021 11:17:41 +0300 Subject: MT: Hide superfluous size information when running as package manager As the uncompressed size is only checked for already installed and new component selections (+ dependencies), it makes sense to show the size information for only these components in the ComponentSelectionPage "Size" column. This makes it easier to follow how the component selection affects installation size. Task-number: QTIFW-2293 Change-Id: Ic8feb505534a1726b6b3296eda7e1ae824292ece Reviewed-by: Katja Marttila --- src/libs/installer/component.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/libs/installer/component.cpp') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 0a768cd7f..d50c36c61 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -375,16 +375,20 @@ quint64 Component::updateUncompressedSize() { quint64 size = 0; - if (installAction() == ComponentModelHelper::Install - || installAction() == ComponentModelHelper::KeepInstalled) { + const bool installOrKeepInstalled = (installAction() == ComponentModelHelper::Install + || installAction() == ComponentModelHelper::KeepInstalled); + + if (installOrKeepInstalled) size = d->m_vars.value(scUncompressedSize).toLongLong(); - } foreach (Component* comp, d->m_allChildComponents) size += comp->updateUncompressedSize(); setValue(scUncompressedSizeSum, QString::number(size)); - setData(humanReadableSize(size), UncompressedSize); + if (size == 0 && !installOrKeepInstalled) + setData(QVariant(), UncompressedSize); + else + setData(humanReadableSize(size), UncompressedSize); return size; } -- cgit v1.2.3