Page MenuHomePhorge
Files F85637547

D350.1786787592.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D350.1786787592.diff
View Options

diff --git a/src/contents/ui/CreateRoomPage.qml b/src/contents/ui/CreateRoomPage.qml
--- a/src/contents/ui/CreateRoomPage.qml
+++ b/src/contents/ui/CreateRoomPage.qml
@@ -102,33 +102,22 @@
Kirigami.FormData.label: l10n.get('create-room-invite-userids-prompt')
}
- ColumnLayout {
+ Flow {
+ Layout.fillWidth: true
+ Layout.bottomMargin: Kirigami.Units.gridUnit
+ spacing: Kirigami.Units.largeSpacing
+
Repeater {
model: createRoomPage.inviteUserIds.length
- delegate: Kirigami.SwipeListItem {
+ delegate: Kirigami.Chip {
objectName: 'inviteUserItem_' + index
- Layout.fillWidth: true
- Layout.minimumWidth: Kirigami.Units.gridUnit * 10
- contentItem: RowLayout {
- Label {
- Layout.fillWidth: true
- objectName: 'inviteUserIdLabel'
- text: createRoomPage.inviteUserIds[index]
- }
- }
+ text: createRoomPage.inviteUserIds[index]
- actions: [
- Kirigami.Action {
- objectName: 'removeInviteAction'
- icon.name: 'list-remove-symbolic'
- text: l10n.get('create-room-page-action-remove-invite')
- onTriggered: {
- createRoomPage.inviteUserIds.splice(index, 1);
- // trigger reactivity
- createRoomPage.inviteUserIds = createRoomPage.inviteUserIds;
- }
- }
- ]
+ onRemoved: {
+ createRoomPage.inviteUserIds.splice(index, 1);
+ // trigger reactivity
+ createRoomPage.inviteUserIds = [...createRoomPage.inviteUserIds];
+ }
}
}
}
@@ -146,9 +135,7 @@
text: l10n.get('create-room-page-action-add-invite')
Layout.fillWidth: true
onClicked: {
- createRoomPage.inviteUserIds.push(newInviteUserId.text);
- // trigger reactivity
- createRoomPage.inviteUserIds = createRoomPage.inviteUserIds;
+ createRoomPage.inviteUserIds = [...createRoomPage.inviteUserIds, newInviteUserId.text];
newInviteUserId.text = '';
}
}
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
@@ -327,7 +327,6 @@
create-room-page-add-invite-prompt = 添加一个新的受邀请用户：
create-room-page-add-invite-placeholder = Matrix id，例如 @foo:example.org
create-room-page-action-add-invite = 添加
-create-room-page-action-remove-invite = 移除
create-room-page-encrypted-prompt = 启用端对端加密
join-room-page-title = 加入房间
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
@@ -349,7 +349,6 @@
create-room-page-add-invite-prompt = Add a new user to invite:
create-room-page-add-invite-placeholder = Matrix id, e.g. @foo:example.org
create-room-page-action-add-invite = Add
-create-room-page-action-remove-invite = Remove
create-room-page-encrypted-prompt = Enable end-to-end encryption
join-room-page-title = Join room
diff --git a/src/tests/quick-tests/tst_CreateRoomPage.qml b/src/tests/quick-tests/tst_CreateRoomPage.qml
--- a/src/tests/quick-tests/tst_CreateRoomPage.qml
+++ b/src/tests/quick-tests/tst_CreateRoomPage.qml
@@ -219,15 +219,13 @@
// remove the second invite (bar)
tryVerify(() => findChild(createRoomPage, 'inviteUserItem_1'), 1000);
const inviteItem = findChild(createRoomPage, 'inviteUserItem_1');
- compare(findChild(inviteItem, 'inviteUserIdLabel').text, '@bar:example.org');
- findChild(inviteItem, 'removeInviteAction').trigger();
+ compare(inviteItem.text, '@bar:example.org');
+ inviteItem.removed();
tryVerify(() => {
- const label = findChild(
- findChild(createRoomPage, 'inviteUserItem_1'),
- 'inviteUserIdLabel'
- );
- return label && label.text === '@baz:example.org'
+ const i = findChild(createRoomPage, 'inviteUserItem_1');
+
+ return i && i.text === '@baz:example.org'
}, 50000);
tryVerify(() => item.matrixSession.createRoom.calledTimes() === 1, 1000);

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 15, 2:53 AM (22 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1729575
Default Alt Text
D350.1786787592.diff (4 KB)

Event Timeline