From 8c6e35f3b7c1ec9a50fea2b43443edd7e979c259 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 9 Aug 2022 12:53:10 +0200 Subject: [PATCH] compositeuploadjob: Set total and processed files This is the proper way to communicate progress. It has Plasma show the file name in case of single files and "n of m files" as before for multiple files. (cherry picked from commit 9c78fa0fff8323b7d7332a47371bb26c50ed49c2) --- core/backends/lan/compositeuploadjob.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/core/backends/lan/compositeuploadjob.cpp b/core/backends/lan/compositeuploadjob.cpp index a6c7adf3c..a02190b2c 100644 --- a/core/backends/lan/compositeuploadjob.cpp +++ b/core/backends/lan/compositeuploadjob.cpp @@ -273,25 +273,15 @@ void CompositeUploadJob::slotResult(KJob *job) { m_currentJobNum++; startNextSubJob(); } else { - QPair field2; - field2.first = QStringLiteral("Files"); - field2.second = i18np("Sent 1 file", "Sent %1 files", m_totalJobs); - Q_EMIT description(this, i18n("Sending to %1", Daemon::instance()->getDevice(this->m_deviceId)->name()), - { QString(), QString() }, field2 - ); emitResult(); } } void CompositeUploadJob::emitDescription(const QString& currentFileName) { - QPair field2; - - if (m_totalJobs > 1) { - field2.first = i18n("Progress"); - field2.second = i18n("Sending file %1 of %2", m_currentJobNum, m_totalJobs); - } - Q_EMIT description(this, i18n("Sending to %1", Daemon::instance()->getDevice(this->m_deviceId)->name()), - { i18n("File"), currentFileName }, field2 + { i18n("File"), currentFileName }, {} ); + + setProcessedAmount(Files, m_currentJobNum); + setTotalAmount(Files, m_totalJobs); }