Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F85651574
D358.1788086747.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
18 KB
Referenced Files
None
Subscribers
None
D358.1788086747.diff
View Options
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -273,6 +273,12 @@
shortcuts/ActionItem.qml
shortcuts/ActionSettings.qml
shortcuts/ShortcutInput.qml
+ shortcuts/GlobalDrawerActions.qml
+ shortcuts/RoomPageActions.qml
+ shortcuts/BubbleActions.qml
+ shortcuts/RoomListActions.qml
+ shortcuts/DialogActions.qml
+ shortcuts/SettingsActions.qml
MessageNotification.qml
Notifier.qml
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
@@ -161,74 +161,56 @@
titleIcon: "applications-graphics"
property var actionGroupName: l10n.get('action-group-global-drawer-actions')
actions: [
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'switch-account'
- text: l10n.get('global-drawer-action-switch-account')
- icon.name: 'system-switch-user'
onTriggered: switchAccount()
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'hard-logout'
- text: l10n.get('global-drawer-action-hard-logout')
- icon.name: 'application-exit'
onTriggered: confirmLogoutPopup.open()
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'save'
- text: l10n.get('global-drawer-action-save-session')
- icon.name: 'document-save'
onTriggered: {
recordLastSession()
matrixSdk.serializeToFile()
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'configure-shortcuts'
- text: l10n.get('global-drawer-action-configure-shortcuts')
- icon.name: 'configure-shortcuts'
onTriggered: {
pushActionSettingsPage();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'settings'
- text: l10n.get('global-drawer-action-settings')
- icon.name: 'configure'
onTriggered: {
pushSettingsPage();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'create-room'
enabled: root.loggedIn
- icon.name: 'contact-new'
- text: l10n.get('global-drawer-action-create-room')
onTriggered: {
pushCreateRoomPage();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'join-room'
enabled: root.loggedIn
- text: l10n.get('global-drawer-action-join-room')
- icon.name: 'list-add-user'
onTriggered: {
pushJoinRoomPage();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'verifications'
enabled: root.loggedIn
- icon.name: 'checkmark'
- text: l10n.get('global-drawer-action-verifications')
onTriggered: {
pushVerificationsPage();
}
},
- Kirigami.Action {
+ Kazv.KazvAction {
objectName: 'aboutAction'
- text: l10n.get('global-drawer-action-about')
- icon.name: 'help-about'
onTriggered: pageStack.pushDialogLayer(Qt.resolvedUrl('About.qml'))
}
]
@@ -241,174 +223,16 @@
property var actionGroupName: l10n.get('action-group-context-drawer-actions')
}
- property var roomPageActions: QtObject {
- property var actionGroupName: l10n.get('action-group-room-page-actions')
- property list<Kirigami.Action> actions: [
- Kirigami.Action {
- objectName: 'send-message'
- icon.name: 'document-send'
- text: l10n.get('send-message-box-send')
- property var defaultShortcut: 'Ctrl+Return'
- },
- Kirigami.Action {
- objectName: 'send-file'
- icon.name: 'document-open-data'
- text: l10n.get('send-message-box-send-file')
- },
- Kirigami.Action {
- objectName: 'send-stickers'
- icon.name: 'smiley'
- text: l10n.get('send-message-box-stickers')
- },
- Kirigami.Action {
- 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')
- }
- ]
- }
-
- property var bubbleContextActions: QtObject {
- property var actionGroupName: l10n.get('action-group-bubble-context-menu-actions')
- property list<Kirigami.Action> actions: [
- Kirigami.Action {
- objectName: 'replyToMenuItem'
- icon.name: 'edit-reply'
- text: l10n.get('event-reply-action')
- },
- Kirigami.Action {
- objectName: 'editMenuItem'
- icon.name: 'document-edit'
- text: l10n.get('event-edit-action')
- },
- Kirigami.Action {
- objectName: 'deleteMenuItem'
- icon.name: 'edit-delete'
- text: l10n.get('event-delete')
- },
- Kirigami.Action {
- objectName: 'reactMenuItem'
- icon.name: 'face-smile'
- text: l10n.get('event-react-action')
- },
- Kirigami.Action {
- objectName: 'pinUnpinMenuItem'
- icon.name: 'pin'
- text: l10n.get('event-pin-action')
- },
- Kirigami.Action {
- objectName: 'view-source'
- icon.name: 'text-html'
- text: l10n.get('event-view-source')
- },
- Kirigami.Action {
- objectName: 'viewHistoryMenuItem'
- icon.name: 'view-history'
- text: l10n.get('event-view-history')
- },
- Kirigami.Action {
- objectName: 'popupAction'
- icon.name: 'view-more-horizontal-symbolic'
- text: l10n.get('event-popup-action')
- },
- Kirigami.Action {
- objectName: 'requestKeyAction'
- icon.name: 'dialog-password'
- text: l10n.get('event-request-key-action')
- },
- Kirigami.Action {
- objectName: 'add-sticker-action'
- icon.name: 'smiley'
- text: l10n.get('media-file-menu-add-sticker-action')
- },
- Kirigami.Action {
- objectName: 'media-view-action'
- icon.name: 'document-open'
- text: l10n.get('media-file-menu-option-view')
- },
- Kirigami.Action {
- objectName: 'media-save-action'
- icon.name: 'document-save-as'
- text: l10n.get('media-file-menu-option-save-as')
- }
- ]
- }
-
- property var roomListContextActions: QtObject {
- property var actionGroupName: l10n.get('action-group-room-list-context-menu-actions')
- property list<Kirigami.Action> actions: [
- Kirigami.Action {
- objectName: 'toggle-favourite'
- icon.name: 'starred-symbolic'
- text: l10n.get('room-list-view-room-item-fav-action')
- },
- Kirigami.Action {
- objectName: 'room-more-settings'
- icon.name: 'view-more-horizontal-symbolic'
- text: l10n.get('room-list-view-room-item-more-action')
- }
- ]
- }
-
- property var dialogActions: QtObject {
- property var actionGroupName: l10n.get('action-group-dialog-actions')
- property list<Kirigami.Action> actions: [
- Kirigami.Action {
- objectName: 'dialog-accept'
- text: l10n.get('dialog-accept-action')
- },
- Kirigami.Action {
- objectName: 'dialog-reject'
- text: l10n.get('dialog-reject-action')
- }
- ]
- }
-
- property var settingsActions: QtObject {
- property var actionGroupName: l10n.get('action-group-settings-actions')
- property list<Kirigami.Action> actions: [
- Kirigami.Action {
- objectName: 'settings-save'
- icon.name: 'document-save'
- text: l10n.get('settings-save')
- }
- ]
- }
-
property var actionCollection: KazvShortcuts.ActionCollection {
id: globalActionCollection
+
children: [
- root.globalDrawer,
- root.roomPageActions,
- root.bubbleContextActions,
- root.roomListContextActions,
- root.dialogActions,
- root.settingsActions
+ KazvShortcuts.GlobalDrawerActions {},
+ KazvShortcuts.RoomPageActions {},
+ KazvShortcuts.BubbleActions {},
+ KazvShortcuts.RoomListActions {},
+ KazvShortcuts.DialogActions {},
+ KazvShortcuts.SettingsActions {}
]
shortcutsConfig: kazvConfig
}
diff --git a/src/contents/ui/shortcuts/ActionCollection.qml b/src/contents/ui/shortcuts/ActionCollection.qml
--- a/src/contents/ui/shortcuts/ActionCollection.qml
+++ b/src/contents/ui/shortcuts/ActionCollection.qml
@@ -11,11 +11,11 @@
default property var data
/// Children of the action collection. Will be used for action lookup.
- property var children: []
+ property list<QtObject> children: []
/// Name of the group.
property var actionGroupName: ''
/// The actions of this ActionCollection.
- property var actions: []
+ property list<QtObject> actions: []
property var shortcutsConfig
diff --git a/src/contents/ui/shortcuts/BubbleActions.qml b/src/contents/ui/shortcuts/BubbleActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/BubbleActions.qml
@@ -0,0 +1,77 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-bubble-context-menu-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'replyToMenuItem'
+ icon.name: 'edit-reply'
+ text: l10n.get('event-reply-action')
+ },
+ Kirigami.Action {
+ objectName: 'editMenuItem'
+ icon.name: 'document-edit'
+ text: l10n.get('event-edit-action')
+ },
+ Kirigami.Action {
+ objectName: 'deleteMenuItem'
+ icon.name: 'edit-delete'
+ text: l10n.get('event-delete')
+ },
+ Kirigami.Action {
+ objectName: 'reactMenuItem'
+ icon.name: 'face-smile'
+ text: l10n.get('event-react-action')
+ },
+ Kirigami.Action {
+ objectName: 'pinUnpinMenuItem'
+ icon.name: 'pin'
+ text: l10n.get('event-pin-action')
+ },
+ Kirigami.Action {
+ objectName: 'view-source'
+ icon.name: 'text-html'
+ text: l10n.get('event-view-source')
+ },
+ Kirigami.Action {
+ objectName: 'viewHistoryMenuItem'
+ icon.name: 'view-history'
+ text: l10n.get('event-view-history')
+ },
+ Kirigami.Action {
+ objectName: 'popupAction'
+ icon.name: 'view-more-horizontal-symbolic'
+ text: l10n.get('event-popup-action')
+ },
+ Kirigami.Action {
+ objectName: 'requestKeyAction'
+ icon.name: 'dialog-password'
+ text: l10n.get('event-request-key-action')
+ },
+ Kirigami.Action {
+ objectName: 'add-sticker-action'
+ icon.name: 'smiley'
+ text: l10n.get('media-file-menu-add-sticker-action')
+ },
+ Kirigami.Action {
+ objectName: 'media-view-action'
+ icon.name: 'document-open'
+ text: l10n.get('media-file-menu-option-view')
+ },
+ Kirigami.Action {
+ objectName: 'media-save-action'
+ icon.name: 'document-save-as'
+ text: l10n.get('media-file-menu-option-save-as')
+ }
+ ]
+}
diff --git a/src/contents/ui/shortcuts/DialogActions.qml b/src/contents/ui/shortcuts/DialogActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/DialogActions.qml
@@ -0,0 +1,25 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-dialog-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'dialog-accept'
+ text: l10n.get('dialog-accept-action')
+ },
+ Kirigami.Action {
+ objectName: 'dialog-reject'
+ text: l10n.get('dialog-reject-action')
+ }
+ ]
+}
diff --git a/src/contents/ui/shortcuts/GlobalDrawerActions.qml b/src/contents/ui/shortcuts/GlobalDrawerActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/GlobalDrawerActions.qml
@@ -0,0 +1,62 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-global-drawer-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'switch-account'
+ text: l10n.get('global-drawer-action-switch-account')
+ icon.name: 'system-switch-user'
+ },
+ Kirigami.Action {
+ objectName: 'hard-logout'
+ text: l10n.get('global-drawer-action-hard-logout')
+ icon.name: 'application-exit'
+ },
+ Kirigami.Action {
+ objectName: 'save'
+ text: l10n.get('global-drawer-action-save-session')
+ icon.name: 'document-save'
+ },
+ Kirigami.Action {
+ objectName: 'configure-shortcuts'
+ text: l10n.get('global-drawer-action-configure-shortcuts')
+ icon.name: 'configure-shortcuts'
+ },
+ Kirigami.Action {
+ objectName: 'settings'
+ text: l10n.get('global-drawer-action-settings')
+ icon.name: 'configure'
+ },
+ Kirigami.Action {
+ objectName: 'create-room'
+ icon.name: 'contact-new'
+ text: l10n.get('global-drawer-action-create-room')
+ },
+ Kirigami.Action {
+ objectName: 'join-room'
+ text: l10n.get('global-drawer-action-join-room')
+ icon.name: 'list-add-user'
+ },
+ Kirigami.Action {
+ objectName: 'verifications'
+ icon.name: 'checkmark'
+ text: l10n.get('global-drawer-action-verifications')
+ },
+ Kirigami.Action {
+ objectName: 'aboutAction'
+ text: l10n.get('global-drawer-action-about')
+ icon.name: 'help-about'
+ }
+ ]
+}
diff --git a/src/contents/ui/shortcuts/RoomListActions.qml b/src/contents/ui/shortcuts/RoomListActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/RoomListActions.qml
@@ -0,0 +1,27 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-room-list-context-menu-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'toggle-favourite'
+ icon.name: 'starred-symbolic'
+ text: l10n.get('room-list-view-room-item-fav-action')
+ },
+ Kirigami.Action {
+ objectName: 'room-more-settings'
+ icon.name: 'view-more-horizontal-symbolic'
+ text: l10n.get('room-list-view-room-item-more-action')
+ }
+ ]
+}
diff --git a/src/contents/ui/shortcuts/RoomPageActions.qml b/src/contents/ui/shortcuts/RoomPageActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/RoomPageActions.qml
@@ -0,0 +1,63 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-room-page-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'send-message'
+ icon.name: 'document-send'
+ text: l10n.get('send-message-box-send')
+ property var defaultShortcut: 'Ctrl+Return'
+ },
+ Kirigami.Action {
+ objectName: 'send-file'
+ icon.name: 'document-open-data'
+ text: l10n.get('send-message-box-send-file')
+ },
+ Kirigami.Action {
+ objectName: 'send-stickers'
+ icon.name: 'smiley'
+ text: l10n.get('send-message-box-stickers')
+ },
+ Kirigami.Action {
+ 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')
+ }
+ ]
+}
diff --git a/src/contents/ui/shortcuts/SettingsActions.qml b/src/contents/ui/shortcuts/SettingsActions.qml
new file mode 100644
--- /dev/null
+++ b/src/contents/ui/shortcuts/SettingsActions.qml
@@ -0,0 +1,22 @@
+/*
+ * This file is part of kazv.
+ * SPDX-FileCopyrightText: 2026 nannanko <nannanko@kazv.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import QtQml
+
+import org.kde.kirigami as Kirigami
+
+import '.' as Shortcuts
+
+Shortcuts.ActionCollection {
+ actionGroupName: l10n.get('action-group-settings-actions')
+ actions: [
+ Kirigami.Action {
+ objectName: 'settings-save'
+ icon.name: 'document-save'
+ text: l10n.get('settings-save')
+ }
+ ]
+}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Aug 30, 3:45 AM (22 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1738251
Default Alt Text
D358.1788086747.diff (18 KB)
Attached To
Mode
D358: Extract action groups into separate QML files
Attached
Detach File
Event Timeline
Log In to Comment