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 f0f8b95d2abbbf372d766a545f46c66f5f4008c3..106fb36b4acfc883fe34a5276a5b0baed98463d3 100644 (file)
--- 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 34672dc378f4196923cb55fff2221f1ab6d299df..8245888f994913446de089867d6f130f2d95d0a3 100644 (file)
--- 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 3f23cad56f80e6a9fe8cfd9f1d7652bbf89963a1..ce1cda2c47e32c53011b30c32150d6f8768b5ca4 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -30,6 +30,7 @@ Window {
         currentAccountAvatar.source = "image://avatars/currentUser"\r
         currentAccountUser.text = userModelBackend.currentUserName();\r
         currentAccountServer.text = userModelBackend.currentUserServer();\r
+        openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();\r
         trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;\r
         currentAccountStateIndicator.source = ""\r
         currentAccountStateIndicator.source = userModelBackend.isUserConnected(userModelBackend.currentUserId()) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"\r
@@ -52,6 +53,7 @@ Window {
         }\r
         onNewUserSelected: {\r
             accountMenu.close();\r
+            openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();\r
             trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;\r
         }\r
     }\r
@@ -360,6 +362,7 @@ Window {
                     Layout.preferredWidth:  Style.trayWindowHeaderHeight\r
                     Layout.preferredHeight: Style.trayWindowHeaderHeight\r
                     flat: true\r
+                    visible: userModelBackend.currentUserHasLocalFolder()\r
 \r
                     icon.source: "qrc:///client/theme/white/folder.svg"\r
                     icon.width: Style.headerButtonIconSize\r