From 5ac3099b37b6ad933df2445e7407161e5f4833bd Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 17 Jul 2020 14:56:02 +0200 Subject: [PATCH 1/5] Fixed copy/paste bug, resulting in a wrong signal ::pauseSync used instead of ::resumeSync Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/owncloudgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index c6f3aa66e8..22876641d3 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -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, From 82c70f0c9558a4d49c09060124ac905d68d7770b Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Fri, 17 Jul 2020 15:18:03 +0200 Subject: [PATCH 2/5] Properly set syncPause state on Systray creation when account init is done Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/systray.cpp | 5 +++++ src/gui/systray.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 79105c8ce1..3d33edc771 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -105,6 +105,11 @@ void Systray::create() } hideWindow(); emit activated(QSystemTrayIcon::ActivationReason::Unknown); + foreach (Folder *f, FolderMan::instance()->map()) { + if (!f->syncPaused()) { + _syncIsPaused = false; + } + } } void Systray::slotNewUserSelected() diff --git a/src/gui/systray.h b/src/gui/systray.h index e4d27c0658..b78aa72ee2 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -91,7 +91,7 @@ private: QPoint computeWindowPosition(int width, int height) const; bool _isOpen = false; - bool _syncIsPaused = false; + bool _syncIsPaused = true; QPointer _trayEngine; }; From dbdf40ea450960f32a442c7535dbe015f8e1f401 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Mon, 20 Jul 2020 19:55:57 +0200 Subject: [PATCH 3/5] Replaced Qt foreach by C++11 ranged for loop Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/systray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 3d33edc771..66a6388bac 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -105,8 +105,8 @@ void Systray::create() } hideWindow(); emit activated(QSystemTrayIcon::ActivationReason::Unknown); - foreach (Folder *f, FolderMan::instance()->map()) { - if (!f->syncPaused()) { + for (const auto *folderMap : FolderMan::instance()->map()) { + if(!folderMap->syncPaused()) { _syncIsPaused = false; } } From cd3a72822e52f98da41e0b727cd525294213f9e6 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Tue, 21 Jul 2020 11:44:52 +0200 Subject: [PATCH 4/5] Get a const auto for the FolderMap to iterate over Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/systray.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 66a6388bac..01778d2234 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -105,8 +105,10 @@ void Systray::create() } hideWindow(); emit activated(QSystemTrayIcon::ActivationReason::Unknown); - for (const auto *folderMap : FolderMan::instance()->map()) { - if(!folderMap->syncPaused()) { + + const auto folderMap = FolderMan::instance()->map(); + for (const auto *folder : folderMap) { + if(!folder->syncPaused()) { _syncIsPaused = false; } } From a07db657d5cf1073b99122aa1345e05283ce0abd Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Tue, 21 Jul 2020 12:44:45 +0200 Subject: [PATCH 5/5] sigh, too Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/systray.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 01778d2234..23ffa5429f 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -108,8 +108,9 @@ void Systray::create() const auto folderMap = FolderMan::instance()->map(); for (const auto *folder : folderMap) { - if(!folder->syncPaused()) { + if (!folder->syncPaused()) { _syncIsPaused = false; + break; } } }