Add destination to ProgressDialog

Elide the text if necessary. Only show the destination directory.

1 files changed, 6 insertions, 4 deletions

diff --git a/filewidget.cpp b/filewidget.cpp
index 6905c53..a539f82 100644
--- a/filewidget.cpp
+++ b/filewidget.cpp
@@ -45,7 +45,7 @@
 FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(0), mCopyToMapper(0) {
     mFileCopier = new FileCopier(this);
     mCopyProgress = new ProgressDialog;
-    connect(mFileCopier, SIGNAL(newFile(QString,qint64)), this, SLOT(setupProgress(QString,qint64)));
+    connect(mFileCopier, SIGNAL(newFile(QString,QString,qint64)), this, SLOT(setupProgress(QString,QString,qint64)));
     connect(mFileCopier, SIGNAL(bytesRead(qint64)), this, SLOT(setCopyProgress(qint64)));
     connect(mFileCopier, SIGNAL(finished()), this, SLOT(hideCopyProgress()));
     connect(mFileCopier, SIGNAL(success(bool,QString)), this, SLOT(copySuccess(bool,QString)));
@@ -511,12 +511,14 @@ void FileWidget::addAsOrigin(){
     mOrignDlg->show();
 }
 
-void FileWidget::setupProgress(QString file, qint64 size){
+void FileWidget::setupProgress(QString file, QString dest, qint64 size){
     mCopyProgress->setMaximum(size / 1024 / 1024);
     mCopyProgress->setValue(0);
     QFileInfo fi(file);
-    QString progressLabel = QString(tr("Copying %1")).arg(fi.fileName());
-    mCopyProgress->setLabelText(progressLabel);
+    QString srcLabel = QString(tr("Copying %1")).arg(fi.fileName());
+    QFileInfo fi2(dest);
+    QString dstLabel = QString(tr("to %2")).arg(QDir::toNativeSeparators(fi2.absolutePath()));
+    mCopyProgress->setLabelText(srcLabel, dstLabel);
 }
 
 void FileWidget::setCopyProgress(qint64 bytes){