From cd36f73f6bda5b9951a0a2370d02ab82d353835f Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Mon, 15 Jan 2018 11:12:22 +0100 Subject: [PATCH] Removes 'Log in to all accounts' and 'Log out to all accounts' from main menu. This is not an often used option and it should be fine if this can only be done from within the settings dialog. Signed-off-by: Camila San --- src/gui/owncloudgui.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 891470a5d2..10be7f430e 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -570,19 +570,12 @@ void ownCloudGui::updateContextMenu() bool isConfigured = (!accountList.isEmpty()); bool atLeastOneConnected = false; - bool atLeastOneSignedOut = false; - bool atLeastOneSignedIn = false; bool atLeastOnePaused = false; bool atLeastOneNotPaused = false; foreach (auto a, accountList) { if (a->isConnected()) { atLeastOneConnected = true; } - if (a->isSignedOut()) { - atLeastOneSignedOut = true; - } else { - atLeastOneSignedIn = true; - } } foreach (auto f, FolderMan::instance()->map()) { if (f->syncPaused()) { @@ -646,22 +639,6 @@ void ownCloudGui::updateContextMenu() QAction *action = _contextMenu->addAction(text); connect(action, &QAction::triggered, this, &ownCloudGui::slotPauseAllFolders); } - if (atLeastOneSignedIn) { - if (accountList.count() > 1) { - _actionLogout->setText(tr("Log out of all accounts")); - } else { - _actionLogout->setText(tr("Log out")); - } - _contextMenu->addAction(_actionLogout); - } - if (atLeastOneSignedOut) { - if (accountList.count() > 1) { - _actionLogin->setText(tr("Log in to all accounts...")); - } else { - _actionLogin->setText(tr("Log in...")); - } - _contextMenu->addAction(_actionLogin); - } _contextMenu->addAction(_actionQuit); if (_qdbusmenuWorkaround) {