mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2209 from nextcloud/fix-pause-sync-states

Browse Source 
Fix pause sync states
This commit is contained in:
Kevin Ottens 2020-07-21 13:12:39 +02:00 committed by GitHub
commit f8fb26424d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/owncloudgui.cpp
View File

@ -79,7 +79,7 @@ ownCloudGui::ownCloudGui(Application *parent)
connect(_tray.data(), &Systray::pauseSync,
this, &ownCloudGui::slotPauseAllFolders);
connect(_tray.data(), &Systray::pauseSync,
connect(_tray.data(), &Systray::resumeSync,
this, &ownCloudGui::slotUnpauseAllFolders);
connect(_tray.data(), &Systray::openHelp,

8
src/gui/systray.cpp
View File

@ -105,6 +105,14 @@ void Systray::create()
}
hideWindow();
emit activated(QSystemTrayIcon::ActivationReason::Unknown);
const auto folderMap = FolderMan::instance()->map();
for (const auto *folder : folderMap) {
if (!folder->syncPaused()) {
_syncIsPaused = false;
break;
}
}
}
void Systray::slotNewUserSelected()

2
src/gui/systray.h
View File

@ -91,7 +91,7 @@ private:
QPoint computeWindowPosition(int width, int height) const;
bool _isOpen = false;
bool _syncIsPaused = false;
bool _syncIsPaused = true;
QPointer<QQmlApplicationEngine> _trayEngine;
};