Commit 8c6e35f3 authored by Kai Uwe Broulik's avatar Kai Uwe Broulik 🍇
Browse files

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 9c78fa0f)
parent 1394d362
Pipeline #215238 passed with stage
in 29 minutes
......@@ -273,25 +273,15 @@ void CompositeUploadJob::slotResult(KJob *job) {
m_currentJobNum++;
startNextSubJob();
} else {
QPair<QString, QString> 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<QString, QString> 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);
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment