From: Stephan Beyer <s-beyer@gmx.net>
Date: Sat, 6 Jun 2020 19:08:48 +0000 (+0200)
Subject: Hide openLocalFolderButton if no local folder is configured
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~169^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=749070a29c4412ac471479ebd9e262d4518c3674;p=nextcloud-desktop.git

Hide openLocalFolderButton if no local folder is configured

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index f0f8b95d2..106fb36b4 100644
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -768,6 +768,11 @@ bool UserModel::currentUserHasActivities()
     return _users[currentUserIndex()]->hasActivities();
 }
 
+bool UserModel::currentUserHasLocalFolder()
+{
+    return _users[currentUserIndex()]->getFolder() != nullptr;
+}
+
 void UserModel::fetchCurrentActivityModel()
 {
     _users[currentUserId()]->slotRefresh();
diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h
index 34672dc37..8245888f9 100644
--- a/src/gui/tray/UserModel.h
+++ b/src/gui/tray/UserModel.h
@@ -101,6 +101,7 @@ public:
     Q_INVOKABLE QString currentUserName();
     Q_INVOKABLE QString currentUserServer();
     Q_INVOKABLE bool currentUserHasActivities();
+    Q_INVOKABLE bool currentUserHasLocalFolder();
     Q_INVOKABLE bool currentServerHasTalk();
     Q_INVOKABLE int currentUserId();
     Q_INVOKABLE bool isUserConnected(const int &id);
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 3f23cad56..ce1cda2c4 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -30,6 +30,7 @@ Window {
         currentAccountAvatar.source = "image://avatars/currentUser"
         currentAccountUser.text = userModelBackend.currentUserName();
         currentAccountServer.text = userModelBackend.currentUserServer();
+        openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();
         trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;
         currentAccountStateIndicator.source = ""
         currentAccountStateIndicator.source = userModelBackend.isUserConnected(userModelBackend.currentUserId()) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
@@ -52,6 +53,7 @@ Window {
         }
         onNewUserSelected: {
             accountMenu.close();
+            openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();
             trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;
         }
     }
@@ -360,6 +362,7 @@ Window {
                     Layout.preferredWidth:  Style.trayWindowHeaderHeight
                     Layout.preferredHeight: Style.trayWindowHeaderHeight
                     flat: true
+                    visible: userModelBackend.currentUserHasLocalFolder()
 
                     icon.source: "qrc:///client/theme/white/folder.svg"
                     icon.width: Style.headerButtonIconSize