[Pkg-owncloud-commits] [owncloud-client] 167/218: GUI: Change tray menu order #3657

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 574c699382a6373c8e694680c25f07edd836efa4
Author: Markus Goetz <markus at woboq.com>
Date:   Sat Sep 26 00:24:51 2015 +0200

    GUI: Change tray menu order #3657
---
 src/gui/owncloudgui.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 14cc819..6cc71ba 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -317,18 +317,6 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
     actionOpenoC->setProperty(propertyAccountC, QVariant::fromValue(accountState->account()));
     QObject::connect(actionOpenoC, SIGNAL(triggered(bool)), SLOT(slotOpenOwnCloud()));
 
-    if (separateMenu) {
-        if (accountState->isSignedOut()) {
-            QAction* signin = menu->addAction(tr("Log in..."));
-            signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
-            connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin()));
-        } else {
-            QAction* signout = menu->addAction(tr("Log out"));
-            signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
-            connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
-        }
-    }
-
     FolderMan *folderMan = FolderMan::instance();
     bool firstFolder = true;
     bool singleSyncFolder = folderMan->map().size() == 1 && Theme::instance()->singleSyncFolder();
@@ -355,6 +343,20 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
         _folderOpenActionMapper->setMapping( action, folder->alias() );
         menu->addAction(action);
     }
+
+     menu->addSeparator();
+     if (separateMenu) {
+         if (accountState->isSignedOut()) {
+             QAction* signin = menu->addAction(tr("Log in..."));
+             signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
+             connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin()));
+         } else {
+             QAction* signout = menu->addAction(tr("Log out"));
+             signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
+             connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
+         }
+     }
+
 }
 
 void ownCloudGui::setupContextMenu()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git