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

FolderStatusModel: Always update on sync state change.

Browse source 
Previously the icon and progress report could easily get
somewhat stale and go out of sync with the tray icon.
This commit is contained in:
Christian Kamm 2015-07-02 13:50:13 +02:00
parent 7e6804fda8
commit ba613a152a
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gui/folderstatusmodel.cpp
View file

@ -689,20 +689,11 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
emit dataChanged(index(folderIndex), index(folderIndex), roles);
}
void FolderStatusModel::slotHideProgress()
{
auto folderIndex = sender()->property("owncloud_folderIndex").toInt();
if (folderIndex < 0 || _folders.size() <= folderIndex) { return; }
_folders[folderIndex]._progress = SubFolderInfo::Progress();
emit dataChanged(index(folderIndex), index(folderIndex),
QVector<int>() << FolderStatusDelegate::AddProgressSpace);
}
void FolderStatusModel::slotFolderSyncStateChange()
{
Folder *f = qobject_cast<Folder*>(sender());
if( !f ) { return; }
int folderIndex = -1;
for (int i = 0; i < _folders.count(); ++i) {
if (_folders.at(i)._folder == f) {
@ -715,16 +706,12 @@ void FolderStatusModel::slotFolderSyncStateChange()
SyncResult::Status state = f->syncResult().status();
if (state == SyncResult::SyncPrepare) {
_folders[folderIndex]._progress = SubFolderInfo::Progress();
} else if (state == SyncResult::Success || state == SyncResult::Problem) {
// start a timer to stop the progress display
QTimer *timer;
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(slotHideProgress()));
connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
timer->setSingleShot(true);
timer->setProperty("owncloud_folderIndex", folderIndex);
timer->start(5000);
} else if (state == SyncResult::Error) {
_folders[folderIndex]._progress._progressString = f->syncResult().errorString();
}
// update the icon etc. now
slotUpdateFolderState(f);
}
void FolderStatusModel::resetFolders()

1
src/gui/folderstatusmodel.h
View file

@ -94,7 +94,6 @@ public slots:
private slots:
void slotUpdateDirectories(const QStringList &);
void slotHideProgress();
void slotFolderSyncStateChange();
void slotLscolFinishedWithError(QNetworkReply *r);