Page MenuHomePhorge
Files F85629020

D336.1786146793.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D336.1786146793.diff
View Options

diff --git a/src/contents/ui/device-mgmt/Device.qml b/src/contents/ui/device-mgmt/Device.qml
--- a/src/contents/ui/device-mgmt/Device.qml
+++ b/src/contents/ui/device-mgmt/Device.qml
@@ -16,21 +16,24 @@
property var item
property var userId
property bool sendingVerification: false
+ property var title: item.deleted ? l10n.get('device-item-title-deleted', { deviceId: item.deviceId }) : item.deviceId
- Accessible.name: item.deviceId
+ Accessible.name: title
Accessible.description: item.displayName
contentItem: RowLayout {
ColumnLayout {
Label {
objectName: 'deviceIdLabel'
- text: item.deviceId
+ text: device.title
+ color: item.deleted ? Kirigami.Theme.disabledTextColor : Kirigami.Theme.textColor
}
Label {
objectName: 'displayNameLabel'
text: item.displayName
font: Kirigami.Theme.smallFont
visible: !!item.displayName
+ color: item.deleted ? Kirigami.Theme.disabledTextColor : Kirigami.Theme.textColor
}
Layout.fillWidth: true
}
diff --git a/src/device-mgmt/matrix-device.hpp b/src/device-mgmt/matrix-device.hpp
--- a/src/device-mgmt/matrix-device.hpp
+++ b/src/device-mgmt/matrix-device.hpp
@@ -32,4 +32,5 @@
LAGER_QT_READER(QString, curve25519Key);
LAGER_QT_READER(QString, displayName);
LAGER_QT_READER(QString, trustLevel);
+ LAGER_QT_READER(bool, deleted);
};
diff --git a/src/device-mgmt/matrix-device.cpp b/src/device-mgmt/matrix-device.cpp
--- a/src/device-mgmt/matrix-device.cpp
+++ b/src/device-mgmt/matrix-device.cpp
@@ -22,6 +22,7 @@
, LAGER_QT(curve25519Key)(m_device[&DeviceKeyInfo::curve25519Key].xform(strToQt))
, LAGER_QT(displayName)(m_device[&DeviceKeyInfo::displayName][lager::lenses::or_default].xform(strToQt))
, LAGER_QT(trustLevel)(m_device[&DeviceKeyInfo::trustLevel].xform(trustLevelToQString))
+ , LAGER_QT(deleted)(m_device[&DeviceKeyInfo::deleted])
{
}
diff --git a/src/l10n/cmn-Hans/100-ui.ftl b/src/l10n/cmn-Hans/100-ui.ftl
--- a/src/l10n/cmn-Hans/100-ui.ftl
+++ b/src/l10n/cmn-Hans/100-ui.ftl
@@ -355,6 +355,7 @@
device-set-trust-level-dialog-cancel = 取消
device-verify-action = 验证设备...
device-verification-request-failed = 无法发送验证请求。错误码：{ $errorCode }。错误讯息：{ $errorMsg }。
+device-item-title-deleted = （已删除） { $deviceId }
settings-page-title = 设置
settings-save = 保存设置
diff --git a/src/l10n/en/100-ui.ftl b/src/l10n/en/100-ui.ftl
--- a/src/l10n/en/100-ui.ftl
+++ b/src/l10n/en/100-ui.ftl
@@ -377,6 +377,7 @@
device-set-trust-level-dialog-cancel = Cancel
device-verify-action = Verify device...
device-verification-request-failed = Unable to send verification request. Error code: { $errorCode }. Error message: { $errorMsg }.
+device-item-title-deleted = (Deleted) { $deviceId }
settings-page-title = Settings
settings-save = Save settings
diff --git a/src/tests/quick-tests/tst_Device.qml b/src/tests/quick-tests/tst_Device.qml
--- a/src/tests/quick-tests/tst_Device.qml
+++ b/src/tests/quick-tests/tst_Device.qml
@@ -15,9 +15,16 @@
property var deviceItem: ({
deviceId: 'some-id',
displayName: 'name',
- trustLevel: 'unseen'
+ trustLevel: 'unseen',
+ deleted: false,
})
+ property var deletedDeviceItem: ({
+ deviceId: 'some-id',
+ displayName: 'name',
+ trustLevel: 'unseen',
+ deleted: true,
+ })
property var pushVerificationsPage: mockHelper.noop();
KazvDM.Device {
@@ -29,12 +36,9 @@
name: 'DeviceTest'
when: windowShown
- function initTestCase() {
- device.item = deviceItem;
- }
-
function init() {
item.mockHelper.clearAll();
+ device.item = deviceItem;
}
function test_device() {
@@ -42,6 +46,11 @@
verify(findChild(device, 'trustLevelLabel').text === l10n.get('device-trust-level-unseen'));
}
+ function test_deletedDevice() {
+ device.item = item.deletedDeviceItem;
+ verify(findChild(device, 'deviceIdLabel').text === l10n.get('device-item-title-deleted', { deviceId: 'some-id' }));
+ }
+
function test_verifyRequest() {
const action = findChild(device, 'requestVerifyAction');
verify(action.enabled);

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 4:53 PM (22 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1723013
Default Alt Text
D336.1786146793.diff (4 KB)

Event Timeline