diff options
| author | Camila <hello@camila.codes> | 2021-05-17 22:34:22 +0300 |
|---|---|---|
| committer | Camila (Rebase PR Action) <hello@camila.codes> | 2021-05-25 09:55:53 +0300 |
| commit | 46f7cd3884b97a2ef56431e16e15b345c495dac5 (patch) | |
| tree | ff883278551aa871524d26ff9d1d80667b7e1d8f /src/gui/tray/Window.qml | |
| parent | 1adde8d5474f59af550f1c389e640e30bf45f160 (diff) | |
User property isConnected instead of a invokable.
Remove unnecessary connection to refreshCurrentUserGui signal.
Signed-off-by: Camila <hello@camila.codes>
Diffstat (limited to 'src/gui/tray/Window.qml')
| -rw-r--r-- | src/gui/tray/Window.qml | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 8dd55743b..0112c8ade 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -35,17 +35,6 @@ Window { }
onVisibleChanged: {
- folderStateIndicator.source = ""
- folderStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId)
- ? Style.stateOnlineImageSource
- : Style.stateOfflineImageSource
-
- currentUserStatus.visible = UserModel.isUserConnected(UserModel.currentUserId) &&
- UserModel.currentUser.serverHasUserStatus
- currentAccountStatusIndicatorMouseHover.visible = currentUserStatus.visible
- currentAccountStatusIndicatorBackground.visible = currentUserStatus.visible
- currentAccountStatusIndicator.source = currentUserStatus.visible? UserModel.currentUser.statusIcon : ""
-
// HACK: reload account Instantiator immediately by restting it - could be done better I guess
// see also id:accountMenu below
userLineInstantiator.active = false;
@@ -54,18 +43,6 @@ Window { Connections {
target: UserModel
- onRefreshCurrentUserGui: {
- folderStateIndicator.source = ""
- folderStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId)
- ? Style.stateOnlineImageSource
- : Style.stateOfflineImageSource
-
- currentUserStatus.visible = UserModel.isUserConnected(UserModel.currentUserId) &&
- UserModel.currentUser.serverHasUserStatus
- currentAccountStatusIndicatorMouseHover.visible = currentUserStatus.visible
- currentAccountStatusIndicatorBackground.visible = currentUserStatus.visible
- currentAccountStatusIndicator.source = currentUserStatus.visible? UserModel.currentUser.statusIcon : ""
- }
onNewUserSelected: {
accountMenu.close();
}
@@ -341,8 +318,8 @@ Window { Rectangle {
id: currentAccountStatusIndicatorBackground
- visible: UserModel.isUserConnected(UserModel.currentUserId())
- && UserModel.currentUser.hasUserStatus
+ visible: UserModel.currentUser.isConnected
+ && UserModel.currentUser.serverHasUserStatus
width: Style.accountAvatarStateIndicatorSize + 2
height: width
anchors.bottom: currentAccountAvatar.bottom
@@ -353,8 +330,8 @@ Window { Rectangle {
id: currentAccountStatusIndicatorMouseHover
- visible: UserModel.isUserConnected(UserModel.currentUserId())
- && UserModel.currentUser.hasUserStatus
+ visible: UserModel.currentUser.isConnected
+ && UserModel.currentUser.serverHasUserStatus
width: Style.accountAvatarStateIndicatorSize + 2
height: width
anchors.bottom: currentAccountAvatar.bottom
@@ -366,7 +343,7 @@ Window { Image {
id: currentAccountStatusIndicator
- visible: UserModel.isUserConnected(UserModel.currentUserId())
+ visible: UserModel.currentUser.isConnected
source: UserModel.currentUser.statusIcon
cache: false
x: currentAccountStatusIndicatorBackground.x + 1
@@ -396,8 +373,8 @@ Window { }
Label {
id: currentUserStatus
- visible: UserModel.isUserConnected(UserModel.currentUserId()) &&
- UserModel.currentUserHasUserStatus() &&
+ visible: UserModel.currentUser.isConnected &&
+ UserModel.currentUser.serverHasUserStatus &&
UserModel.currentUser.statusMessage !== ""
width: Style.currentAccountLabelWidth
text: UserModel.currentUser.statusMessage !== ""
|