mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show deletes in progress.

Browse source
This commit is contained in:
Klaas Freitag 2013-08-03 21:33:19 +02:00
parent 4ce92f1a98
commit 16d81db117
5 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mirall/accountsettings.cpp
View file

@ -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.

6
src/mirall/csyncthread.cpp
View file

@ -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;

2
src/mirall/itemprogressdialog.cpp
View file

@ -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;
}

6
src/mirall/progressdispatcher.cpp
View file

@ -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);
}

2
src/mirall/progressdispatcher.h
View file

@ -40,6 +40,8 @@ public:
EndDownload,
EndUpload,
EndSync,
StartDelete,
EndDelete,
Error
} Kind;