Page MenuHomePhorge
Files F85645105

D355.1787512801.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D355.1787512801.diff
View Options

diff --git a/src/contents/ui/Main.qml b/src/contents/ui/Main.qml
--- a/src/contents/ui/Main.qml
+++ b/src/contents/ui/Main.qml
@@ -264,6 +264,31 @@
objectName: 'remove-related-to-event'
icon.name: 'window-close-symbolic'
text: l10n.get('action-settings-remove-related-to-event-action')
+ },
+ Kirigami.Action {
+ objectName: 'room-invite-accept-action'
+ icon.name: 'checkmark'
+ text: l10n.get('room-invite-accept-action')
+ },
+ Kirigami.Action {
+ objectName: 'room-invite-reject-action'
+ icon.name: 'im-ban-kick-user'
+ text: l10n.get('room-invite-reject-action')
+ },
+ Kirigami.Action {
+ objectName: 'pinnedEventsAction'
+ icon.name: 'pin'
+ text: l10n.get('action-settings-room-pinned-events-action')
+ },
+ Kirigami.Action {
+ objectName: 'scrollToLatestAction'
+ icon.name: "go-down"
+ text: l10n.get("room-timeline-scroll-to-latest-action")
+ },
+ Kirigami.Action {
+ objectName: 'room-settings-action'
+ icon.name: 'settings-configure'
+ text: l10n.get('room-settings-action')
}
]
}
@@ -272,7 +297,6 @@
id: globalActionCollection
children: [
root.globalDrawer,
- root.contextDrawer,
root.roomPageActions
]
shortcutsConfig: kazvConfig
diff --git a/src/contents/ui/RoomPage.qml b/src/contents/ui/RoomPage.qml
--- a/src/contents/ui/RoomPage.qml
+++ b/src/contents/ui/RoomPage.qml
@@ -100,43 +100,37 @@
}
actions: [
- Kirigami.Action {
+ Kazv.KazvAction {
id: acceptInviteAction
- icon.name: 'checkmark'
- text: l10n.get('room-invite-accept-action')
+ objectName: 'room-invite-accept-action'
visible: isInvite
onTriggered: joinRoomHandler.call()
},
- Kirigami.Action {
+ Kazv.KazvAction {
id: rejectInviteAction
- icon.name: 'im-ban-kick-user'
- text: l10n.get('room-invite-reject-action')
+ objectName: 'room-invite-reject-action'
visible: isInvite
onTriggered: leaveRoomHandler.call()
},
- Kirigami.Action {
+ Kazv.KazvAction {
id: pinnedEventsAction
objectName: 'pinnedEventsAction'
- icon.name: 'pin'
+ text: l10n.get('room-pinned-events-action', { count: roomPage.pinnedEvents.count })
visible: roomPage.pinnedEvents.count
enabled: roomPage.pinnedEvents.count
- text: l10n.get('room-pinned-events-action', { count: roomPage.pinnedEvents.count })
onTriggered: activateRoomPinnedEventsPage(room)
},
- Kirigami.Action {
+ Kazv.KazvAction {
id: scrollToLatestAction
objectName: 'scrollToLatestAction'
- icon.name: "go-down"
enabled: !roomTimelineView.atYEnd
- text: l10n.get("room-timeline-scroll-to-latest-action")
onTriggered: {
roomTimelineView.positionViewAtBeginning();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
id: roomSettingsAction
- icon.name: 'settings-configure'
- text: l10n.get('room-settings-action')
+ objectName: 'room-settings-action'
onTriggered: activateRoomSettingsPage(room)
}
]
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
@@ -45,6 +45,7 @@
action-settings-shortcut-conflict-continue = 继续
action-settings-shortcut-conflict-cancel = 取消
action-settings-remove-related-to-event-action = 取消回复或编辑
+action-settings-room-pinned-events-action = 查看置顶消息
empty-room-page-title = 没有选中房间
empty-room-page-description = 当前没有选中的房间。
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
@@ -45,6 +45,7 @@
action-settings-shortcut-conflict-continue = Continue
action-settings-shortcut-conflict-cancel = Cancel
action-settings-remove-related-to-event-action = Cancel reply or edit
+action-settings-room-pinned-events-action = View pinned messages
empty-room-page-title = No rooms selected
empty-room-page-description = There is no room selected now.

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 12:20 PM (22 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1734349
Default Alt Text
D355.1787512801.diff (4 KB)

Event Timeline