Merge pull request #650 from LorenDB/qml-all-the-things

Open room members when member info label clicked

4 files changed, 19 insertions, 10 deletions

diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml

index bc8a90d2..641a08be 100644
--- a/resources/qml/RoomMembers.qml
+++ b/resources/qml/RoomMembers.qml
@@ -41,7 +41,7 @@ ApplicationWindow {
             displayName: members.roomName
             Layout.alignment: Qt.AlignHCenter
             url: members.avatarUrl.replace("mxc://", "image://MxcImage/")
-            onClicked: Rooms.currentRoom.openRoomSettings(members.roomId)
+            onClicked: TimelineManager.openRoomSettings(members.roomId)
         }
 
         ElidedLabel {
@@ -57,7 +57,7 @@ ApplicationWindow {
             hoverEnabled: true
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Invite more people")
-            onClicked: Rooms.currentRoom.openInviteUsers()
+            onClicked: TimelineManager.openInviteUsers(members.roomId)
         }
 
         ScrollView {
@@ -121,7 +121,6 @@ ApplicationWindow {
                 footer: Item {
                     width: parent.width
                     visible: (members.numUsersLoaded < members.memberCount) && members.loadingMoreMembers
-
                     // use the default height if it's visible, otherwise no height at all
                     height: membersLoadingSpinner.height
                     anchors.margins: Nheko.paddingMedium
diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml

index 2701edf9..b4936f3e 100644
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
@@ -4,7 +4,7 @@
 
 import "./ui"
 import Qt.labs.platform 1.1 as Platform
-import QtQuick 2.9
+import QtQuick 2.15
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.3
@@ -105,6 +105,16 @@ ApplicationWindow {
             MatrixText {
                 text: qsTr("%1 member(s)").arg(roomSettings.memberCount)
                 Layout.alignment: Qt.AlignHCenter
+
+                TapHandler {
+                    onTapped: TimelineManager.openRoomMembers(roomSettings.roomId)
+                }
+
+                CursorShape {
+                    cursorShape: Qt.PointingHandCursor
+                    anchors.fill: parent
+                }
+
             }
 
         }
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml

index f71c18e2..8e226639 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -133,7 +133,7 @@ Page {
     }
 
     Connections {
-        target: Rooms.currentRoom
+        target: TimelineManager
         onOpenRoomMembersDialog: {
             var membersDialog = roomMembersComponent.createObject(timelineRoot, {
                 "members": members,
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml

index 48491f84..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,12 +111,12 @@ Rectangle {
                 Platform.MenuItem {
                     visible: room ? room.permissions.canInvite() : false
                     text: qsTr("Invite users")
-                    onTriggered: Rooms.currentRoom.openInviteUsers()
+                    onTriggered: TimelineManager.openInviteUsers(room.roomId)
                 }
 
                 Platform.MenuItem {
                     text: qsTr("Members")
-                    onTriggered: Rooms.currentRoom.openRoomMembers()
+                    onTriggered: TimelineManager.openRoomMembers(room.roomId)
                 }
 
                 Platform.MenuItem {
@@ -126,7 +126,7 @@ Rectangle {
 
                 Platform.MenuItem {
                     text: qsTr("Settings")
-                    onTriggered: room.openRoomSettings()
+                    onTriggered: TimelineManager.openRoomSettings(room.roomId)
                 }
 
             }