Skip to content

Commit 62c03d7

Browse files
authored
Merge pull request #15988 from ronso0/filesize-displays
make file size displays consistent: use SI units (kB, MB, GB), 1 decimal
2 parents eeb11b8 + 650163b commit 62c03d7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/library/dlgtrackinfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ void DlgTrackInfo::replaceTrackRecord(
397397
QFileInfo info(trackLocation);
398398
if (info.exists() && info.isFile()) {
399399
int size = info.size();
400-
QString sizeStr = QLocale().formattedDataSize(size);
400+
QString sizeStr = QLocale().formattedDataSize(size, 1, QLocale::DataSizeSIFormat);
401401
txtFileSize->setText(sizeStr);
402402
}
403403

src/library/recording/dlgrecording.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ void DlgRecording::slotRecordingStateChanged(bool isRecording) {
148148

149149
// gets number of recorded bytes and update label
150150
void DlgRecording::slotBytesRecorded(int bytes) {
151-
double megabytes = bytes / 1048576.0;
152-
m_bytesRecordedStr = QString::number(megabytes,'f',2);
151+
m_bytesRecordedStr =
152+
QLocale().formattedDataSize(bytes, 1, QLocale::DataSizeSIFormat);
153153
refreshLabels();
154154
}
155155

@@ -162,7 +162,7 @@ void DlgRecording::slotDurationRecorded(const QString& durationRecorded) {
162162
// update label besides start/stop button
163163
void DlgRecording::refreshLabels() {
164164
QString recFile = m_pRecordingManager->getRecordingFile();
165-
QString recData = QString(QStringLiteral("(") + tr("%1 MiB written in %2") +
165+
QString recData = QString(QStringLiteral("(") + tr("%1 written in %2") +
166166
QStringLiteral(")"))
167167
.arg(m_bytesRecordedStr, m_durationRecordedStr);
168168
labelRecFilename->setText(recFile);

0 commit comments

Comments
 (0)