From f6ffdc76d91def95ace9e6b35e8a202ab851f696 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Sun, 4 Feb 2024 22:14:45 -0500 Subject: Move the device list into a separate scroll area Scrolling the device list alongside all other user info is not a very great UX, so I've fixed it. --- resources/qml/dialogs/UserProfile.qml | 805 +++++++++++++++++----------------- 1 file changed, 402 insertions(+), 403 deletions(-) diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml index 614ecb56..7939a81a 100644 --- a/resources/qml/dialogs/UserProfile.qml +++ b/resources/qml/dialogs/UserProfile.qml @@ -31,498 +31,499 @@ ApplicationWindow { onActivated: userProfileDialog.close() } - ListView { - id: devicelist + ColumnLayout { + id: contentL - property int selectedTab: 0 - - Layout.fillHeight: true - Layout.fillWidth: true - clip: true - spacing: 8 - boundsBehavior: Flickable.StopAtBounds anchors.fill: parent anchors.margins: 10 - footerPositioning: ListView.OverlayFooter - - header: ColumnLayout { - id: contentL - - width: devicelist.width - spacing: Nheko.paddingMedium - - Avatar { - id: displayAvatar - - url: profile.avatarUrl.replace("mxc://", "image://MxcImage/") - Layout.preferredHeight: 130 - Layout.preferredWidth: 130 - displayName: profile.displayName - userid: profile.userid - Layout.alignment: Qt.AlignHCenter - onClicked: TimelineManager.openImageOverlay(null, profile.avatarUrl, "", 0, 0) - - ImageButton { - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: profile.isGlobalUserProfile ? qsTr("Change avatar globally.") : qsTr("Change avatar. Will only apply to this room.") - anchors.left: displayAvatar.left - anchors.top: displayAvatar.top - anchors.leftMargin: Nheko.paddingMedium - anchors.topMargin: Nheko.paddingMedium - visible: profile.isSelf - image: ":/icons/icons/ui/edit.svg" - onClicked: profile.changeAvatar() - } - - } - Spinner { - Layout.alignment: Qt.AlignHCenter - running: profile.isLoading - visible: profile.isLoading - foreground: palette.mid + spacing: Nheko.paddingMedium + + Avatar { + id: displayAvatar + + url: profile.avatarUrl.replace("mxc://", "image://MxcImage/") + Layout.preferredHeight: 130 + Layout.preferredWidth: 130 + displayName: profile.displayName + userid: profile.userid + Layout.alignment: Qt.AlignHCenter + onClicked: TimelineManager.openImageOverlay(null, profile.avatarUrl, "", 0, 0) + + ImageButton { + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: profile.isGlobalUserProfile ? qsTr("Change avatar globally.") : qsTr("Change avatar. Will only apply to this room.") + anchors.left: displayAvatar.left + anchors.top: displayAvatar.top + anchors.leftMargin: Nheko.paddingMedium + anchors.topMargin: Nheko.paddingMedium + visible: profile.isSelf + image: ":/icons/icons/ui/edit.svg" + onClicked: profile.changeAvatar() } - Text { - id: errorText + } - color: "red" - visible: opacity > 0 - opacity: 0 - Layout.alignment: Qt.AlignHCenter - } + Spinner { + Layout.alignment: Qt.AlignHCenter + running: profile.isLoading + visible: profile.isLoading + foreground: palette.mid + } - SequentialAnimation { - id: hideErrorAnimation + Text { + id: errorText - running: false + color: "red" + visible: opacity > 0 + opacity: 0 + Layout.alignment: Qt.AlignHCenter + } - PauseAnimation { - duration: 4000 - } + SequentialAnimation { + id: hideErrorAnimation - NumberAnimation { - target: errorText - property: 'opacity' - to: 0 - duration: 1000 - } + running: false + PauseAnimation { + duration: 4000 } - Connections { - function onDisplayError(errorMessage) { - errorText.text = errorMessage; - errorText.opacity = 1; - hideErrorAnimation.restart(); - } - - target: profile + NumberAnimation { + target: errorText + property: 'opacity' + to: 0 + duration: 1000 } - TextInput { - id: displayUsername - - property bool isUsernameEditingAllowed - - readOnly: !isUsernameEditingAllowed - text: profile.displayName - font.pixelSize: 20 - color: TimelineManager.userColor(profile.userid, palette.window) - font.bold: true - Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: parent.width - (Nheko.paddingSmall * 2) - usernameChangeButton.anchors.leftMargin - (usernameChangeButton.width * 2) - horizontalAlignment: TextInput.AlignHCenter - wrapMode: TextInput.Wrap - selectByMouse: true - onAccepted: { - profile.changeUsername(displayUsername.text); - displayUsername.isUsernameEditingAllowed = false; - } - - ImageButton { - id: usernameChangeButton - visible: profile.isSelf - anchors.leftMargin: Nheko.paddingSmall - anchors.left: displayUsername.right - anchors.verticalCenter: displayUsername.verticalCenter - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: profile.isGlobalUserProfile ? qsTr("Change display name globally.") : qsTr("Change display name. Will only apply to this room.") - image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg" - onClicked: { - if (displayUsername.isUsernameEditingAllowed) { - profile.changeUsername(displayUsername.text); - displayUsername.isUsernameEditingAllowed = false; - } else { - displayUsername.isUsernameEditingAllowed = true; - displayUsername.focus = true; - displayUsername.selectAll(); - } - } - } + } + Connections { + function onDisplayError(errorMessage) { + errorText.text = errorMessage; + errorText.opacity = 1; + hideErrorAnimation.restart(); } - MatrixText { - text: profile.userid - Layout.alignment: Qt.AlignHCenter + target: profile + } + + TextInput { + id: displayUsername + + property bool isUsernameEditingAllowed + + readOnly: !isUsernameEditingAllowed + text: profile.displayName + font.pixelSize: 20 + color: TimelineManager.userColor(profile.userid, palette.window) + font.bold: true + Layout.alignment: Qt.AlignHCenter + Layout.maximumWidth: parent.width - (Nheko.paddingSmall * 2) - usernameChangeButton.anchors.leftMargin - (usernameChangeButton.width * 2) + horizontalAlignment: TextInput.AlignHCenter + wrapMode: TextInput.Wrap + selectByMouse: true + onAccepted: { + profile.changeUsername(displayUsername.text); + displayUsername.isUsernameEditingAllowed = false; } - MatrixText { - id: statusMsg - text: qsTr("Status: %1").arg(userStatus) - visible: userStatus != "" - Layout.fillWidth: true - horizontalAlignment: TextEdit.AlignHCenter - Layout.leftMargin: Nheko.paddingMedium - Layout.rightMargin: Nheko.paddingMedium - font.pointSize: Math.floor(fontMetrics.font.pointSize * 0.9) - - property string userStatus: Presence.userStatus(profile.userid) - Connections { - target: Presence - function onPresenceChanged(id) { - if (id == profile.userid) statusMsg.userStatus = Presence.userStatus(profile.userid); + ImageButton { + id: usernameChangeButton + visible: profile.isSelf + anchors.leftMargin: Nheko.paddingSmall + anchors.left: displayUsername.right + anchors.verticalCenter: displayUsername.verticalCenter + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: profile.isGlobalUserProfile ? qsTr("Change display name globally.") : qsTr("Change display name. Will only apply to this room.") + image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg" + onClicked: { + if (displayUsername.isUsernameEditingAllowed) { + profile.changeUsername(displayUsername.text); + displayUsername.isUsernameEditingAllowed = false; + } else { + displayUsername.isUsernameEditingAllowed = true; + displayUsername.focus = true; + displayUsername.selectAll(); } } } - RowLayout { - visible: !profile.isGlobalUserProfile - Layout.alignment: Qt.AlignHCenter - spacing: Nheko.paddingSmall - - MatrixText { - id: displayRoomname - - text: qsTr("Room: %1").arg(profile.room ? profile.room.roomName : "") - ToolTip.text: qsTr("This is a room-specific profile. The user's name and avatar may be different from their global versions.") - ToolTip.visible: ma.hovered - Layout.maximumWidth: parent.parent.width - (parent.spacing * 3) - 16 - horizontalAlignment: TextEdit.AlignHCenter + } - HoverHandler { - id: ma - } + MatrixText { + text: profile.userid + Layout.alignment: Qt.AlignHCenter + } + MatrixText { + id: statusMsg + text: qsTr("Status: %1").arg(userStatus) + visible: userStatus != "" + Layout.fillWidth: true + horizontalAlignment: TextEdit.AlignHCenter + Layout.leftMargin: Nheko.paddingMedium + Layout.rightMargin: Nheko.paddingMedium + font.pointSize: Math.floor(fontMetrics.font.pointSize * 0.9) + + property string userStatus: Presence.userStatus(profile.userid) + Connections { + target: Presence + function onPresenceChanged(id) { + if (id == profile.userid) statusMsg.userStatus = Presence.userStatus(profile.userid); } + } + } - ImageButton { - image: ":/icons/icons/ui/world.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Open the global profile for this user.") - onClicked: profile.openGlobalProfile() - } + RowLayout { + visible: !profile.isGlobalUserProfile + Layout.alignment: Qt.AlignHCenter + spacing: Nheko.paddingSmall - } + MatrixText { + id: displayRoomname + + text: qsTr("Room: %1").arg(profile.room ? profile.room.roomName : "") + ToolTip.text: qsTr("This is a room-specific profile. The user's name and avatar may be different from their global versions.") + ToolTip.visible: ma.hovered + Layout.maximumWidth: parent.parent.width - (parent.spacing * 3) - 16 + horizontalAlignment: TextEdit.AlignHCenter - Button { - id: verifyUserButton + HoverHandler { + id: ma + } - text: qsTr("Verify") - Layout.alignment: Qt.AlignHCenter - enabled: profile.userVerified != Crypto.Verified - visible: profile.userVerified != Crypto.Verified && !profile.isSelf && profile.userVerificationEnabled - onClicked: profile.verify() } - EncryptionIndicator { - Layout.preferredHeight: 32 - Layout.preferredWidth: 32 - encrypted: profile.userVerificationEnabled - trust: profile.userVerified - Layout.alignment: Qt.AlignHCenter - ToolTip.visible: false + ImageButton { + image: ":/icons/icons/ui/world.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Open the global profile for this user.") + onClicked: profile.openGlobalProfile() } - RowLayout { - // ImageButton{ - // image:":/icons/icons/ui/volume-off-indicator.svg" - // Layout.margins: { - // left: 5 - // right: 5 - // } - // ToolTip.visible: hovered - // ToolTip.text: qsTr("Ignore messages from this user.") - // onClicked : { - // profile.ignoreUser() - // } - // } - - Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: 10 - spacing: Nheko.paddingSmall - - ImageButton { - Layout.preferredHeight: 24 - Layout.preferredWidth: 24 - image: ":/icons/icons/ui/chat.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Start a private chat.") - onClicked: profile.startChat() - } + } - ImageButton { - Layout.preferredHeight: 24 - Layout.preferredWidth: 24 - image: ":/icons/icons/ui/round-remove-button.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Kick the user.") - onClicked: profile.kickUser() - visible: !profile.isGlobalUserProfile && profile.room.permissions.canKick() - } + Button { + id: verifyUserButton - ImageButton { - Layout.preferredHeight: 24 - Layout.preferredWidth: 24 - image: ":/icons/icons/ui/ban.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Ban the user.") - onClicked: profile.banUser() - visible: !profile.isGlobalUserProfile && profile.room.permissions.canBan() - } + text: qsTr("Verify") + Layout.alignment: Qt.AlignHCenter + enabled: profile.userVerified != Crypto.Verified + visible: profile.userVerified != Crypto.Verified && !profile.isSelf && profile.userVerificationEnabled + onClicked: profile.verify() + } - ImageButton { - Layout.preferredHeight: 24 - Layout.preferredWidth: 24 - image: ":/icons/icons/ui/volume-off-indicator.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: profile.ignored ? qsTr("Unignore the user.") : qsTr("Ignore the user.") - buttonTextColor: profile.ignored ? Nheko.theme.red : palette.buttonText - onClicked: profile.ignored = !profile.ignored - visible: !profile.isSelf - } + EncryptionIndicator { + Layout.preferredHeight: 32 + Layout.preferredWidth: 32 + encrypted: profile.userVerificationEnabled + trust: profile.userVerified + Layout.alignment: Qt.AlignHCenter + ToolTip.visible: false + } - ImageButton { - Layout.preferredHeight: 24 - Layout.preferredWidth: 24 - image: ":/icons/icons/ui/refresh.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Refresh device list.") - onClicked: profile.refreshDevices() - } + RowLayout { + // ImageButton{ + // image:":/icons/icons/ui/volume-off-indicator.svg" + // Layout.margins: { + // left: 5 + // right: 5 + // } + // ToolTip.visible: hovered + // ToolTip.text: qsTr("Ignore messages from this user.") + // onClicked : { + // profile.ignoreUser() + // } + // } + + Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: 10 + spacing: Nheko.paddingSmall + + ImageButton { + Layout.preferredHeight: 24 + Layout.preferredWidth: 24 + image: ":/icons/icons/ui/chat.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Start a private chat.") + onClicked: profile.startChat() } - TabBar { - id: tabbar - visible: !profile.isSelf - Layout.fillWidth: true - - onCurrentIndexChanged: devicelist.selectedTab = currentIndex + ImageButton { + Layout.preferredHeight: 24 + Layout.preferredWidth: 24 + image: ":/icons/icons/ui/round-remove-button.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Kick the user.") + onClicked: profile.kickUser() + visible: !profile.isGlobalUserProfile && profile.room.permissions.canKick() + } + ImageButton { + Layout.preferredHeight: 24 + Layout.preferredWidth: 24 + image: ":/icons/icons/ui/ban.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Ban the user.") + onClicked: profile.banUser() + visible: !profile.isGlobalUserProfile && profile.room.permissions.canBan() + } - NhekoTabButton { - text: qsTr("Devices") - } - NhekoTabButton { - text: qsTr("Shared Rooms") - } + ImageButton { + Layout.preferredHeight: 24 + Layout.preferredWidth: 24 + image: ":/icons/icons/ui/volume-off-indicator.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: profile.ignored ? qsTr("Unignore the user.") : qsTr("Ignore the user.") + buttonTextColor: profile.ignored ? Nheko.theme.red : palette.buttonText + onClicked: profile.ignored = !profile.ignored + visible: !profile.isSelf + } - Layout.bottomMargin: Nheko.paddingMedium + ImageButton { + Layout.preferredHeight: 24 + Layout.preferredWidth: 24 + image: ":/icons/icons/ui/refresh.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Refresh device list.") + onClicked: profile.refreshDevices() } } - model: (selectedTab == 0) ? devicesModel : sharedRoomsModel + TabBar { + id: tabbar + visible: !profile.isSelf + Layout.fillWidth: true - DelegateModel { - id: devicesModel - model: profile.deviceList - delegate: RowLayout { - required property int verificationStatus - required property string deviceId - required property string deviceName - required property string lastIp - required property var lastTs + onCurrentIndexChanged: devicelist.selectedTab = currentIndex - width: devicelist.width - spacing: 4 - ColumnLayout { - spacing: 0 + NhekoTabButton { + text: qsTr("Devices") + } + NhekoTabButton { + text: qsTr("Shared Rooms") + } - Layout.leftMargin: Nheko.paddingMedium - Layout.rightMargin: Nheko.paddingMedium - RowLayout { - Text { - Layout.fillWidth: true - Layout.alignment: Qt.AlignLeft - elide: Text.ElideRight - font.bold: true - color: palette.text - text: deviceId - } + Layout.bottomMargin: Nheko.paddingMedium + } + + ListView { + id: devicelist + + property int selectedTab: 0 + + Layout.fillHeight: true + Layout.fillWidth: true + clip: true + spacing: 8 + boundsBehavior: Flickable.StopAtBounds + footerPositioning: ListView.OverlayFooter + ScrollBar.vertical: ScrollBar {} + + model: (selectedTab == 0) ? devicesModel : sharedRoomsModel + + DelegateModel { + id: devicesModel + model: profile.deviceList + delegate: RowLayout { + required property int verificationStatus + required property string deviceId + required property string deviceName + required property string lastIp + required property var lastTs + + width: devicelist.width + spacing: 4 + + ColumnLayout { + spacing: 0 + + Layout.leftMargin: Nheko.paddingMedium + Layout.rightMargin: Nheko.paddingMedium + RowLayout { + Text { + Layout.fillWidth: true + Layout.alignment: Qt.AlignLeft + elide: Text.ElideRight + font.bold: true + color: palette.text + text: deviceId + } - Image { - Layout.preferredHeight: 16 - Layout.preferredWidth: 16 - visible: profile.isSelf && verificationStatus != VerificationStatus.NOT_APPLICABLE - sourceSize.height: 16 * Screen.devicePixelRatio - sourceSize.width: 16 * Screen.devicePixelRatio - source: { - switch (verificationStatus) { - case VerificationStatus.VERIFIED: - return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?" + Nheko.theme.green; - case VerificationStatus.UNVERIFIED: - return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?" + Nheko.theme.orange; - case VerificationStatus.SELF: - return "image://colorimage/:/icons/icons/ui/checkmark.svg?" + Nheko.theme.green; - default: - return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?" + Nheko.theme.orange; + Image { + Layout.preferredHeight: 16 + Layout.preferredWidth: 16 + visible: profile.isSelf && verificationStatus != VerificationStatus.NOT_APPLICABLE + sourceSize.height: 16 * Screen.devicePixelRatio + sourceSize.width: 16 * Screen.devicePixelRatio + source: { + switch (verificationStatus) { + case VerificationStatus.VERIFIED: + return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?" + Nheko.theme.green; + case VerificationStatus.UNVERIFIED: + return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?" + Nheko.theme.orange; + case VerificationStatus.SELF: + return "image://colorimage/:/icons/icons/ui/checkmark.svg?" + Nheko.theme.green; + default: + return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?" + Nheko.theme.orange; + } } } - } - ImageButton { - Layout.alignment: Qt.AlignTop - image: ":/icons/icons/ui/power-off.svg" - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Sign out this device.") - onClicked: profile.signOutDevice(deviceId) - visible: profile.isSelf + ImageButton { + Layout.alignment: Qt.AlignTop + image: ":/icons/icons/ui/power-off.svg" + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Sign out this device.") + onClicked: profile.signOutDevice(deviceId) + visible: profile.isSelf + } + } - } + RowLayout { + id: deviceNameRow - RowLayout { - id: deviceNameRow + property bool isEditingAllowed - property bool isEditingAllowed + TextInput { + id: deviceNameField - TextInput { - id: deviceNameField + readOnly: !deviceNameRow.isEditingAllowed + text: deviceName + color: palette.text + Layout.alignment: Qt.AlignLeft + Layout.fillWidth: true + selectByMouse: true + onAccepted: { + profile.changeDeviceName(deviceId, deviceNameField.text); + deviceNameRow.isEditingAllowed = false; + } + } - readOnly: !deviceNameRow.isEditingAllowed - text: deviceName - color: palette.text - Layout.alignment: Qt.AlignLeft - Layout.fillWidth: true - selectByMouse: true - onAccepted: { - profile.changeDeviceName(deviceId, deviceNameField.text); - deviceNameRow.isEditingAllowed = false; + ImageButton { + visible: profile.isSelf + hoverEnabled: true + ToolTip.visible: hovered + ToolTip.text: qsTr("Change device name.") + image: deviceNameRow.isEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg" + onClicked: { + if (deviceNameRow.isEditingAllowed) { + profile.changeDeviceName(deviceId, deviceNameField.text); + deviceNameRow.isEditingAllowed = false; + } else { + deviceNameRow.isEditingAllowed = true; + deviceNameField.focus = true; + deviceNameField.selectAll(); + } + } } + } - ImageButton { + Text { visible: profile.isSelf - hoverEnabled: true - ToolTip.visible: hovered - ToolTip.text: qsTr("Change device name.") - image: deviceNameRow.isEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg" - onClicked: { - if (deviceNameRow.isEditingAllowed) { - profile.changeDeviceName(deviceId, deviceNameField.text); - deviceNameRow.isEditingAllowed = false; - } else { - deviceNameRow.isEditingAllowed = true; - deviceNameField.focus = true; - deviceNameField.selectAll(); - } - } + Layout.fillWidth: true + Layout.alignment: Qt.AlignLeft + elide: Text.ElideRight + color: palette.text + text: qsTr("Last seen %1 from %2").arg(new Date(lastTs).toLocaleString(Locale.ShortFormat)).arg(lastIp ? lastIp : "???") } } - Text { - visible: profile.isSelf - Layout.fillWidth: true - Layout.alignment: Qt.AlignLeft - elide: Text.ElideRight - color: palette.text - text: qsTr("Last seen %1 from %2").arg(new Date(lastTs).toLocaleString(Locale.ShortFormat)).arg(lastIp ? lastIp : "???") + Image { + Layout.preferredHeight: 16 + Layout.preferredWidth: 16 + visible: !profile.isSelf && verificationStatus != VerificationStatus.NOT_APPLICABLE + source: { + switch (verificationStatus) { + case VerificationStatus.VERIFIED: + return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?" + Nheko.theme.green; + case VerificationStatus.UNVERIFIED: + return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?" + Nheko.theme.orange; + case VerificationStatus.SELF: + return "image://colorimage/:/icons/icons/ui/checkmark.svg?" + Nheko.theme.green; + default: + return "image://colorimage/:/icons/icons/ui/shield-filled.svg?" + Nheko.theme.red; + } + } } - } + Button { + id: verifyButton - Image { - Layout.preferredHeight: 16 - Layout.preferredWidth: 16 - visible: !profile.isSelf && verificationStatus != VerificationStatus.NOT_APPLICABLE - source: { - switch (verificationStatus) { - case VerificationStatus.VERIFIED: - return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?" + Nheko.theme.green; - case VerificationStatus.UNVERIFIED: - return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?" + Nheko.theme.orange; - case VerificationStatus.SELF: - return "image://colorimage/:/icons/icons/ui/checkmark.svg?" + Nheko.theme.green; - default: - return "image://colorimage/:/icons/icons/ui/shield-filled.svg?" + Nheko.theme.red; + visible: verificationStatus == VerificationStatus.UNVERIFIED && (profile.isSelf || !profile.userVerificationEnabled) + text: (verificationStatus != VerificationStatus.VERIFIED) ? qsTr("Verify") : qsTr("Unverify") + onClicked: { + if (verificationStatus == VerificationStatus.VERIFIED) + profile.unverify(deviceId); + else + profile.verify(deviceId); } } - } - - Button { - id: verifyButton - visible: verificationStatus == VerificationStatus.UNVERIFIED && (profile.isSelf || !profile.userVerificationEnabled) - text: (verificationStatus != VerificationStatus.VERIFIED) ? qsTr("Verify") : qsTr("Unverify") - onClicked: { - if (verificationStatus == VerificationStatus.VERIFIED) - profile.unverify(deviceId); - else - profile.verify(deviceId); - } } - } - } - DelegateModel { - id: sharedRoomsModel - model: profile.sharedRooms - delegate: RowLayout { - required property string roomId - required property string roomName - required property string avatarUrl + DelegateModel { + id: sharedRoomsModel + model: profile.sharedRooms + delegate: RowLayout { + required property string roomId + required property string roomName + required property string avatarUrl - width: devicelist.width - spacing: 4 + width: devicelist.width + spacing: 4 - Avatar { - id: avatar + Avatar { + id: avatar - enabled: false - Layout.alignment: Qt.AlignVCenter - Layout.leftMargin: Nheko.paddingMedium + enabled: false + Layout.alignment: Qt.AlignVCenter + Layout.leftMargin: Nheko.paddingMedium - property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 1.6) - Layout.preferredHeight: avatarSize - Layout.preferredWidth: avatarSize - url: avatarUrl.replace("mxc://", "image://MxcImage/") - roomid: roomId - displayName: roomName - } + property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 1.6) + Layout.preferredHeight: avatarSize + Layout.preferredWidth: avatarSize + url: avatarUrl.replace("mxc://", "image://MxcImage/") + roomid: roomId + displayName: roomName + } - ElidedLabel { - Layout.alignment: Qt.AlignVCenter - color: palette.text - Layout.fillWidth: true - elideWidth: width - fullText: roomName - textFormat: Text.PlainText - Layout.rightMargin: Nheko.paddingMedium - } + ElidedLabel { + Layout.alignment: Qt.AlignVCenter + color: palette.text + Layout.fillWidth: true + elideWidth: width + fullText: roomName + textFormat: Text.PlainText + Layout.rightMargin: Nheko.paddingMedium + } - Item { - Layout.fillWidth: true + Item { + Layout.fillWidth: true + } } } } - footer: DialogButtonBox { + DialogButtonBox { z: 2 - width: devicelist.width + Layout.fillWidth: true alignment: Qt.AlignRight standardButtons: DialogButtonBox.Ok onAccepted: userProfileDialog.close() @@ -533,7 +534,5 @@ ApplicationWindow { } } - } - } -- cgit v1.2.3