diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 3edc650d1..3433e8e94 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -530,7 +530,6 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf return; } - QString itemFileName = shortenFilename(folder, progress.current_file); QString syncFileProgressString; @@ -546,6 +545,7 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf break; case Progress::StartDownload: case Progress::StartUpload: + case Progress::StartDelete: syncFileProgressString = tr("Start"); if( _hideProgressTimers.contains(item) ) { // The timer is still running. diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 1f3d3b8c6..2d95b8f47 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -434,6 +434,12 @@ Progress::Kind CSyncThread::csyncToProgressKind( enum csync_notify_type_e kind ) case CSYNC_NOTIFY_FINISHED_SYNC_SEQUENCE: pKind = Progress::EndSync; break; + case CSYNC_NOTIFY_START_DELETE: + pKind = Progress::StartDelete; + break; + case CSYNC_NOTIFY_END_DELETE: + pKind = Progress::EndDelete; + break; case CSYNC_NOTIFY_ERROR: pKind = Progress::Error; break; diff --git a/src/mirall/itemprogressdialog.cpp b/src/mirall/itemprogressdialog.cpp index 56adc1717..5205c8710 100644 --- a/src/mirall/itemprogressdialog.cpp +++ b/src/mirall/itemprogressdialog.cpp @@ -238,7 +238,7 @@ void ItemProgressDialog::slotProgressInfo( const QString& folder, const Progress } // Ingore other events than finishing an individual up- or download. - if( !(progress.kind == Progress::EndDownload || progress.kind == Progress::EndUpload)) { + if( !(progress.kind == Progress::EndDownload || progress.kind == Progress::EndUpload || progress.kind == Progress::EndDelete)) { return; } diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index 9c7314748..57c74b967 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -57,6 +57,12 @@ QString Progress::asString( Kind kind ) case EndSync: re = QObject::tr("finished"); break; + case StartDelete: + re = QObject::tr("start delete"); + break; + case EndDelete: + re = QObject::tr("deleted"); + break; default: Q_ASSERT(false); } diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h index 85d85ac05..94cb34d2c 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/mirall/progressdispatcher.h @@ -40,6 +40,8 @@ public: EndDownload, EndUpload, EndSync, + StartDelete, + EndDelete, Error } Kind;