Adding DeviceList for userprofile
2 files changed, 17 insertions, 9 deletions
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index f019ee25..ae91abc4 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2
import QtQuick.Window 2.3
+import im.nheko 1.0
+
ApplicationWindow{
property var user_data
property var colors: currentActivePalette
@@ -18,7 +20,21 @@ ApplicationWindow{
userProfileAvatar.url = chat.model.avatarUrl(user_data.userId).replace("mxc://", "image://MxcImage/")
userProfileName.text = user_data.userName
matrixUserID.text = user_data.userId
- console.log("this is happening");
+ 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
}
background: Item{
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 2c9486ae..dd637e59 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -267,11 +267,7 @@ ApplicationWindow {
model: 7
delegate: Rectangle {
color: "transparent"
-<<<<<<< HEAD
- implicitHeight: Qt.application.font.pixelSize * 3
-=======
implicitHeight: Qt.application.font.pixelSize * 8
->>>>>>> Add DeviceVerificationFlow dummy and verification test button
implicitWidth: col.width
ColumnLayout {
id: col
@@ -414,11 +410,7 @@ ApplicationWindow {
property string title: "Verification timed out"
ColumnLayout {
spacing: 16
-<<<<<<< HEAD
- Label {
-=======
Text {
->>>>>>> Add DeviceVerificationFlow dummy and verification test button
Layout.maximumWidth: 400
Layout.fillHeight: true
Layout.fillWidth: true
|
