mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Tray menu: Make sign in/out actions more consistent.

Browse source 
In particular:
* It's always possible to sign out, even if there's currently a
  network problem or the service is unavailable.
* You can only sign in when you explicitly signed out before.
This commit is contained in:
Christian Kamm 2015-07-15 15:05:30 +02:00
parent 3344249297
commit 65a3847a35
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gui/owncloudgui.cpp
View file

@ -295,14 +295,14 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
QObject::connect(actionOpenoC, SIGNAL(triggered(bool)), SLOT(slotOpenOwnCloud()));
if (separateMenu) {
if (accountState->isConnected()) {
QAction* signout = menu->addAction(tr("Sign out"));
signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
} else {
if (accountState->isSignedOut()) {
QAction* signin = menu->addAction(tr("Sign in..."));
signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin()));
} else {
QAction* signout = menu->addAction(tr("Sign out"));
signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
}
}
@ -340,12 +340,16 @@ void ownCloudGui::setupContextMenu()
bool isConfigured = (!accountList.isEmpty());
bool atLeastOneConnected = false;
bool atLeastOneDisconnected = false;
bool atLeastOneSignedOut = false;
bool atLeastOneSignedIn = false;
foreach (auto a, accountList) {
if (a->isConnected()) {
atLeastOneConnected = true;
}
if (a->isSignedOut()){
atLeastOneSignedOut = true;
} else {
atLeastOneDisconnected = true;
atLeastOneSignedIn = true;
}
}
@ -395,7 +399,7 @@ void ownCloudGui::setupContextMenu()
}
_contextMenu->addSeparator();
if (atLeastOneConnected) {
if (atLeastOneSignedIn) {
if (accountList.count() > 1) {
_actionLogout->setText(tr("Sign out everywhere"));
} else {
@ -403,7 +407,7 @@ void ownCloudGui::setupContextMenu()
}
_contextMenu->addAction(_actionLogout);
}
if (atLeastOneDisconnected) {
if (atLeastOneSignedOut) {
if (accountList.count() > 1) {
_actionLogin->setText(tr("Sign in everywhere..."));
} else {