Remove accounts from system tray and simplify the menu even more

Fixes: #129

Author: TheOneRing

src/gui/owncloudgui.cpp

@@ -110,13 +110,8 @@ ownCloudGui::ownCloudGui(Application *parent)
 
     // init systray
     slotComputeOverallSyncStatus();
-    updateContextMenu();
+    setContextMenu();
     _tray->show();
-
-    connect(FolderMan::instance(), &FolderMan::folderSyncStateChange, this, &ownCloudGui::slotComputeOverallSyncStatus);
-    connect(FolderMan::instance(), &FolderMan::folderSyncStateChange, this, &ownCloudGui::updateContextMenu);
-    connect(FolderMan::instance(), &FolderMan::folderListChanged, this, &ownCloudGui::updateContextMenu);
-    connect(AccountManager::instance(), &AccountManager::accountsChanged, this, &ownCloudGui::updateContextMenu);
 }
 
 ownCloudGui::~ownCloudGui()
@@ -250,73 +245,29 @@ void ownCloudGui::hideAndShowTray()
     _tray->show();
 }
 
-void ownCloudGui::updateContextMenu()
+void ownCloudGui::setContextMenu()
 {
-    qDebug() << "updateContextMenu";
-    if (auto *menu = _tray->contextMenu()) {
-        menu->deleteLater();
-    }
+    Q_ASSERT(!_tray->contextMenu());
     auto *menu = new QMenu(Theme::instance()->appNameGUI());
 
-    const auto &accountList = AccountManager::instance()->accounts();
-
-    bool atLeastOnePaused = false;
-
-    for (auto *f : FolderMan::instance()->folders()) {
-        if (f->isSyncPaused()) {
-            atLeastOnePaused = true;
-        }
-    }
-
     menu->addAction(Theme::instance()->applicationIcon(), tr("Show %1").arg(Theme::instance()->appNameGUI()), this, &ownCloudGui::slotShowSettings);
-    menu->addSeparator();
-
-    if (accountList.isEmpty()) {
-        menu->addAction(tr("Create a new account"), this, &ownCloudGui::runNewAccountWizard);
-    } else {
-        if (atLeastOnePaused) {
-            menu->addAction(tr("Resume synchronization"), this, [this] { setPauseOnAllFoldersHelper(AccountManager::instance()->accounts(), false); });
-        } else {
-            menu->addAction(tr("Stop synchronization"), this, [this] { setPauseOnAllFoldersHelper(AccountManager::instance()->accounts(), true); });
-        }
-        menu->addSeparator();
-
-        // submenus for accounts
-        for (const auto &account : accountList) {
-            auto *accountMenu = menu->addMenu(account->account()->displayNameWithHost());
-            accountMenu->addAction(CommonStrings::showInWebBrowser(), this, [account] { QDesktopServices::openUrl(account->account()->url()); });
-
-            FolderMan *folderMan = FolderMan::instance();
-            const auto &map = folderMan->folders();
-            bool onePaused = false;
-            for (auto *folder : map) {
-                if (folder->accountState() != account.data()) {
-                    continue;
-                }
-
-                if (folder->isSyncPaused()) {
-                    onePaused = true;
-                }
-                accountMenu->addAction(CommonStrings::showInFileBrowser(folder->path()), this, [folder] {
-                    qCInfo(lcApplication) << "opening local URL " << folder->path();
-                    QDesktopServices::openUrl(QUrl::fromLocalFile(folder->path()));
-                });
-            }
-
-            accountMenu->addSeparator();
-            if (onePaused) {
-                accountMenu->addAction(tr("Resume synchronization"), this, [account, this] { setPauseOnAllFoldersHelper({account}, false); });
-            } else {
-                accountMenu->addAction(tr("Stop synchronization"), this, [account, this] { setPauseOnAllFoldersHelper({account}, true); });
-            }
-
-            if (account->isSignedOut()) {
-                accountMenu->addAction(tr("Log in..."), this, [account] { account->signIn(); });
-            } else {
-                accountMenu->addAction(tr("Log out"), this, [account] { account->signOutByUi(); });
+    auto *pauseResume = new QAction(menu);
+    auto updatePauseResumeAction = [pauseResume] {
+        pauseResume->setText(FolderMan::instance()->scheduler()->isRunning() ? tr("Pause synchronizations") : tr("Resume synchronizations"));
+    };
+    connect(pauseResume, &QAction::triggered, FolderMan::instance()->scheduler(), [] {
+        if (FolderMan::instance()->scheduler()->isRunning()) {
+            if (auto *currentSync = FolderMan::instance()->scheduler()->currentSync()) {
+                currentSync->slotTerminateSync(tr("Synchronization paused"));
             }
+            FolderMan::instance()->scheduler()->stop();
+        } else {
+            FolderMan::instance()->scheduler()->start();
         }
-    }
+    });
+    connect(FolderMan::instance()->scheduler(), &SyncScheduler::isRunningChanged, pauseResume, updatePauseResumeAction);
+    menu->addAction(pauseResume);
+    updatePauseResumeAction();
 
     if (_app->debugMode()) {
         menu->addSeparator();
@@ -336,6 +287,8 @@ void ownCloudGui::updateContextMenu()
         captivePortalCheckbox->setCheckable(true);
         captivePortalCheckbox->setChecked(NetworkInformation::instance()->isForcedCaptivePortal());
         connect(captivePortalCheckbox, &QAction::triggered, this, [](bool checked) { NetworkInformation::instance()->setForcedCaptivePortal(checked); });
+        connect(NetworkInformation::instance(), &NetworkInformation::isBehindCaptivePortalChanged, captivePortalCheckbox,
+            [captivePortalCheckbox] { captivePortalCheckbox->setChecked(NetworkInformation::instance()->isForcedCaptivePortal()); });
     }
 
     menu->addSeparator();
@@ -491,18 +444,6 @@ void ownCloudGui::runNewAccountWizard()
     }
 }
 
-void ownCloudGui::setPauseOnAllFoldersHelper(const QList<AccountStatePtr> &accounts, bool pause)
-{
-    for (auto *f : FolderMan::instance()->folders()) {
-        if (accounts.contains(f->accountState())) {
-            f->setSyncPaused(pause);
-            if (pause) {
-                f->slotTerminateSync(tr("User paused sync for account '%1'").arg(f->accountState()->account()->displayNameWithHost()));
-            }
-        }
-    }
-}
-
 void ownCloudGui::slotShowSettings()
 {
     raise();

src/gui/owncloudgui.h

@@ -76,9 +76,7 @@ public Q_SLOTS:
     void slotTrayMessageIfServerUnsupported(Account *account);
 
 private:
-    void setPauseOnAllFoldersHelper(const QList<AccountStatePtr> &accounts, bool pause);
-
-    void updateContextMenu();
+    void setContextMenu();
 
     Systray *_tray;
     SettingsDialog *_settingsDialog;

src/gui/scheduling/syncscheduler.cpp

@@ -193,22 +193,34 @@ void SyncScheduler::start()
 {
     _running = true;
     startNext();
+    Q_EMIT isRunningChanged();
 }
 
 void SyncScheduler::stop()
 {
     _running = false;
+    Q_EMIT isRunningChanged();
 }
 
 bool SyncScheduler::hasCurrentRunningSyncRunning() const
 {
     return _currentSync;
 }
 
+Folder *SyncScheduler::currentSync()
+{
+    return _currentSync;
+}
+
 void SyncScheduler::setPauseSyncWhenMetered(bool pauseSyncWhenMetered)
 {
     _pauseSyncWhenMetered = pauseSyncWhenMetered;
     if (!pauseSyncWhenMetered) {
         startNext();
     }
 }
+
+bool SyncScheduler::isRunning() const
+{
+    return _running;
+}

src/gui/scheduling/syncscheduler.h

@@ -55,9 +55,14 @@ class SyncScheduler : public QObject
     void stop();
 
     bool hasCurrentRunningSyncRunning() const;
+    Folder *currentSync();
 
     void setPauseSyncWhenMetered(bool pauseSyncWhenMetered);
 
+    bool isRunning() const;
+
+Q_SIGNALS:
+    void isRunningChanged();
 
 private:
     void startNext();