diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index ed403aa9..e4c820f8 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -273,6 +273,9 @@ Page {
color: colors.base
}
}
+
+ property variant userProfile
+
Row {
height: userName.height
spacing: 8
@@ -287,8 +290,10 @@ Page {
MouseArea {
anchors.fill: parent
onClicked: {
- userProfile.user_data = modelData
- userProfile.show()
+ if(userProfile) userProfile.destroy()
+ var component = Qt.createComponent("UserProfile.qml");
+ userProfile = component.createObject(timelineRoot,{user_data : modelData});
+ userProfile.show();
}
cursorShape: Qt.PointingHandCursor
propagateComposedEvents: true
@@ -303,26 +308,17 @@ Page {
MouseArea {
anchors.fill: parent
+ Layout.alignment: Qt.AlignHCenter
onClicked: {
- userProfile.user_data = modelData
- userProfile.show()
+ if(userProfile) userProfile.destroy()
+ var component = Qt.createComponent("UserProfile.qml")
+ userProfile = component.createObject(timelineRoot,{user_data : modelData})
+ userProfile.show()
}
cursorShape: Qt.PointingHandCursor
propagateComposedEvents: true
}
}
-
- Label {
- color: colors.buttonText
- text: timelineManager.userStatus(modelData.userId)
- textFormat: Text.PlainText
- elide: Text.ElideRight
- width: chat.delegateMaxWidth - parent.spacing*2 - userName.implicitWidth - avatarSize
- font.italic: true
- }
- UserProfile{
- id: userProfile
- }
}
}
}
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index ae91abc4..f29fb4c1 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -16,25 +16,16 @@ ApplicationWindow{
Layout.alignment: Qt.AlignHCenter
palette: colors
- onAfterRendering: {
- userProfileAvatar.url = chat.model.avatarUrl(user_data.userId).replace("mxc://", "image://MxcImage/")
- userProfileName.text = user_data.userName
- matrixUserID.text = user_data.userId
- userProfile.userId = user_data.userId
- log_devices()
- }
-
- function log_devices()
- {
- console.log(userProfile.deviceList);
- userProfile.deviceList.forEach((item,index)=>{
- console.log(item.device_id)
- console.log(item.display_name)
- })
- }
-
- UserProfileContent{
- id: userProfile
+ UserProfileList{
+ id: userProfileList
+ userId: user_data.userId
+ onUserIdChanged : {
+ console.log(userId)
+ userProfileList.updateDeviceList()
+ }
+ onDeviceListUpdated : {
+ modelDeviceList.deviceList = userProfileList
+ }
}
background: Item{
@@ -52,6 +43,7 @@ ApplicationWindow{
Avatar{
id: userProfileAvatar
+ url:chat.model.avatarUrl(user_data.userId).replace("mxc://", "image://MxcImage/")
height: 130
width: 130
displayName: modelData.userName
@@ -60,12 +52,14 @@ ApplicationWindow{
Label{
id: userProfileName
+ text: user_data.userName
fontSizeMode: Text.HorizontalFit
Layout.alignment: Qt.AlignHCenter
}
Label{
id: matrixUserID
+ text: user_data.userId
fontSizeMode: Text.HorizontalFit
Layout.alignment: Qt.AlignHCenter
}
@@ -78,9 +72,29 @@ ApplicationWindow{
ScrollBar.horizontal.policy: ScrollBar.AlwaysOn
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
- Label {
- text: "ABC"
- font.pixelSize: 700
+ ListView{
+ id: deviceList
+ anchors.fill: parent
+ clip: true
+ spacing: 10
+
+ model: UserProfileModel{
+ id: modelDeviceList
+ }
+
+ delegate: RowLayout{
+ width: parent.width
+ Text{
+ Layout.fillWidth: true
+ color: colors.text
+ text: deviceID
+ }
+ Text{
+ Layout.fillWidth: true
+ color:colors.text
+ text: displayName
+ }
+ }
}
}
|
