From 16e5740828a6f66c6437100f9e66c90bbee498d0 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 9 Apr 2012 09:44:05 +0200 Subject: Revert the 2.0 decision to always use KB for file-sizes The feedback on bugs.kde.org has shown that the previous behavior (= show size with best-matching unit) is preferred by most users. I initially wanted to make this configurable, but for implementing it in a non-hacky way extending KLocale from kdelibs would have been required. I'm not sure whether the usecase in Dolphin justifies having such a configuration in KLocale - however as kdelibs is frozen at the moment this is no option and the old behavior has been restored. BUG: 289850 FIXED-IN: 4.9.0 --- src/views/dolphinview.cpp | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 78fd56d50..872853642 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -539,9 +539,12 @@ QString DolphinView::statusBarText() const if (fileCount > 0 && folderCount > 0) { summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", - foldersText, filesText, fileSizeText(totalFileSize)); + foldersText, filesText, + KGlobal::locale()->formatByteSize(totalFileSize)); } else if (fileCount > 0) { - summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, fileSizeText(totalFileSize)); + summary = i18nc("@info:status files (size)", "%1 (%2)", + filesText, + KGlobal::locale()->formatByteSize(totalFileSize)); } else if (folderCount > 0) { summary = foldersText; } @@ -1471,27 +1474,4 @@ void DolphinView::updateWritableState() } } -QString DolphinView::fileSizeText(KIO::filesize_t fileSize) -{ - const KLocale* locale = KGlobal::locale(); - const unsigned int multiplier = (locale->binaryUnitDialect() == KLocale::MetricBinaryDialect) - ? 1000 : 1024; - - QString text; - if (fileSize < multiplier) { - // Show the size in bytes - text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitByte); - } else if (fileSize < multiplier * multiplier) { - // Show the size in kilobytes and always round up. This is done - // for consistency with the values shown e.g. in the "Size" column - // of the details-view. - fileSize += (multiplier / 2) - 1; - text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitKiloByte); - } else { - // Show the size in the best fitting unit having one decimal - text = locale->formatByteSize(fileSize, 1); - } - return text; -} - #include "dolphinview.moc" -- cgit v1.3