diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
| commit | c91e771d538d99c9353b779ac4dd0d93a77cca6b (patch) | |
| tree | a0b583cf945b5cd09622ccb68b9fc8ad0e369794 /resources/qml/TopBar.qml | |
| parent | Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements (diff) | |
| parent | Protect against replay attacks (diff) | |
| download | nheko-c91e771d538d99c9353b779ac4dd0d93a77cca6b.tar.xz | |
Merge origin/master and fix conflicts
Diffstat (limited to 'resources/qml/TopBar.qml')
| -rw-r--r-- | resources/qml/TopBar.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 58aba0c7..8543d02a 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -24,7 +24,7 @@ Rectangle { TapHandler { onSingleTapped: { if (room) - room.openRoomSettings(); + TimelineManager.openRoomSettings(room.roomId); eventPoint.accepted = true; } @@ -66,7 +66,7 @@ Rectangle { displayName: roomName onClicked: { if (room) - room.openRoomSettings(); + TimelineManager.openRoomSettings(room.roomId); } } @@ -111,22 +111,22 @@ Rectangle { Platform.MenuItem { visible: room ? room.permissions.canInvite() : false text: qsTr("Invite users") - onTriggered: TimelineManager.openInviteUsersDialog() + onTriggered: TimelineManager.openInviteUsers(room.roomId) } Platform.MenuItem { text: qsTr("Members") - onTriggered: TimelineManager.openMemberListDialog(room.roomId()) + onTriggered: TimelineManager.openRoomMembers(room.roomId) } Platform.MenuItem { text: qsTr("Leave room") - onTriggered: TimelineManager.openLeaveRoomDialog(room.roomId()) + onTriggered: TimelineManager.openLeaveRoomDialog(room.roomId) } Platform.MenuItem { text: qsTr("Settings") - onTriggered: room.openRoomSettings() + onTriggered: TimelineManager.openRoomSettings(room.roomId) } } |