diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml
index 5d3a8f1e..d5cc4c6d 100644
--- a/resources/qml/InviteDialog.qml
+++ b/resources/qml/InviteDialog.qml
@@ -2,50 +2,28 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import im.nheko 1.0
-import "./types"
ApplicationWindow {
id: inviteDialogRoot
property string roomId
property string roomName
- property list<Invitee> invitees
+ property InviteesModel invitees
function addInvite() {
if (inviteeEntry.text.match("@.+?:.{3,}"))
{
- invitees.push(inviteeComponent.createObject(
- inviteDialogRoot, {
- "invitee": inviteeEntry.text
- }));
+ invitees.addUser(inviteeEntry.text);
inviteeEntry.clear();
}
}
- function accept() {
- if (inviteeEntry.text !== "")
- addInvite();
-
- var inviteeStringList = ["temp"]; // the "temp" element exists to declare this as a string array
- for (var i = 0; i < invitees.length; ++i)
- inviteeStringList.push(invitees[i].invitee);
- inviteeStringList.shift(); // remove the first item
-
- TimelineManager.inviteUsers(inviteDialogRoot.roomId, inviteeStringList);
- }
-
title: qsTr("Invite users to ") + roomName
x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
height: 380
width: 340
- Component {
- id: inviteeComponent
-
- Invitee {}
- }
-
// TODO: make this work in the TextField
Shortcut {
sequence: "Ctrl+Enter"
@@ -74,7 +52,7 @@ ApplicationWindow {
}
Button {
- text: qsTr("Invite")
+ text: qsTr("Add")
onClicked: if (inviteeEntry.text !== "") addInvite()
}
}
@@ -85,9 +63,53 @@ ApplicationWindow {
Layout.fillWidth: true
Layout.fillHeight: true
model: invitees
- delegate: Label {
- text: model.invitee
+
+ delegate: RowLayout {
+ spacing: 10
+
+ Avatar {
+ width: avatarSize
+ height: avatarSize
+ userid: model.mxid
+ url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
+ displayName: model.displayName
+ onClicked: TimelineManager.timeline.openUserProfile(model.mxid)
+ }
+
+ ColumnLayout {
+ spacing: 5
+
+ Label {
+ text: model.displayName
+ color: TimelineManager.userColor(model ? model.mxid : "", colors.window)
+ font.pointSize: 12
+ }
+
+ Label {
+ text: model.mxid
+ color: colors.buttonText
+ font.pointSize: 10
+ }
+
+ Item {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+ }
+ }
}
+// delegate: RowLayout {
+// spacing: 10
+
+// Avatar {
+// url: model.avatarUrl
+// width: 20
+// height: width
+// }
+
+// Label {
+// text: model.displayName + " (" + model.mxid + ")"
+// }
+// }
}
}
@@ -98,7 +120,7 @@ ApplicationWindow {
text: qsTr("Invite")
DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
onClicked: {
- inviteDialogRoot.accept();
+ invitees.accept();
inviteDialogRoot.close();
}
}
diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml
index 4406c1b0..d31fe319 100644
--- a/resources/qml/RoomMembers.qml
+++ b/resources/qml/RoomMembers.qml
@@ -44,6 +44,15 @@ ApplicationWindow {
Layout.alignment: Qt.AlignHCenter
}
+ ImageButton {
+ Layout.alignment: Qt.AlignHCenter
+ image: ":/icons/icons/ui/add-square-button.png"
+ hoverEnabled: true
+ ToolTip.visible: hovered
+ ToolTip.text: qsTr("Invite more people")
+ onClicked: TimelineManager.timeline.openInviteUsersDialog()
+ }
+
ScrollView {
clip: false
palette: colors
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index 5316e20d..ecd0bdb7 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -89,6 +89,12 @@ Page {
}
}
+ Component {
+ id: inviteDialog
+
+ InviteDialog {
+ }
+ }
Connections {
target: TimelineManager
@@ -116,6 +122,38 @@ Page {
}
}
+ Connections {
+ target: TimelineManager.timeline
+ onOpenRoomMembersDialog: {
+ var membersDialog = roomMembersComponent.createObject(timelineRoot, {
+ "members": members,
+ "roomName": TimelineManager.timeline.roomName
+ });
+ membersDialog.show();
+ }
+ }
+
+ Connections {
+ target: TimelineManager.timeline
+ onOpenRoomSettingsDialog: {
+ var roomSettings = roomSettingsComponent.createObject(timelineRoot, {
+ "roomSettings": settings
+ });
+ roomSettings.show();
+ }
+ }
+
+ Connections {
+ target: TimelineManager.timeline
+ onOpenInviteUsersDialog: {
+ var dialog = inviteDialog.createObject(timelineRoot, {
+ "roomId": TimelineManager.timeline.roomId,
+ "roomName": TimelineManager.timeline.roomName
+ });
+ dialog.show();
+ }
+ }
+
ChatPage {
anchors.fill: parent
}
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 148a5817..d515b9b4 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -157,7 +157,6 @@ Item {
Layout.alignment: Qt.AlignHCenter
enabled: false
}
-
MatrixText {
text: parent.roomName
font.pixelSize: 24
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
index 72dbe604..6cf747c5 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -21,12 +21,6 @@ Rectangle {
z: 3
color: Nheko.colors.window
- Component {
- id: inviteDialog
-
- InviteDialog {}
- }
-
TapHandler {
onSingleTapped: {
if (room)
@@ -117,13 +111,7 @@ Rectangle {
Platform.MenuItem {
visible: room ? room.permissions.canInvite() : false
text: qsTr("Invite users")
- onTriggered: {
- var dialog = inviteDialog.createObject(topBar, {
- "roomId": room.roomId,
- "roomName": room.roomName
- });
- dialog.show();
- }
+ onTriggered: TimelineManager.timeline.openInviteUsers()
}
Platform.MenuItem {
diff --git a/resources/qml/types/Invitee.qml b/resources/qml/types/Invitee.qml
deleted file mode 100644
index fbc0b781..00000000
--- a/resources/qml/types/Invitee.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.12
-
-Item {
- property string invitee
-}
diff --git a/resources/res.qrc b/resources/res.qrc
index ad7b6665..f8c040e4 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -176,7 +176,6 @@
<file>qml/components/FlatButton.qml</file>
<file>qml/RoomMembers.qml</file>
<file>qml/InviteDialog.qml</file>
- <file>qml/types/Invitee.qml</file>
</qresource>
<qresource prefix="/media">
<file>media/ring.ogg</file>
|
