d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 10:40:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to improve the native menu situation on Qt 6.8

Browse source
This commit is contained in:
Nicolas Werner 2024-11-17 19:41:21 +01:00
parent 50859f2535
commit ae9d8ba4ae
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/CommunitiesList.qml
View file

@ -209,6 +209,13 @@ Page {
popup(parent);
}
Component.onCompleted: {
if (communityContextMenu.popupType != undefined) {
communityContextMenu.popupType = 2; // Popup.Native with fallback on older Qt (<6.8.0)
}
}
MenuItem {
checkable: true
checked: communityContextMenu.muted

20
resources/qml/MessageView.qml
View file

@ -447,6 +447,12 @@ Item {
ReportMessage {}
}
Component.onCompleted: {
if (messageContextMenuC.popupType != undefined) {
messageContextMenuC.popupType = 2; // Popup.Native with fallback on older Qt (<6.8.0)
}
}
MenuItem {
enabled: visible
text: qsTr("Go to &message")
@ -472,6 +478,7 @@ Item {
onTriggered: Clipboard.text = messageContextMenuC.link
}
MenuItem {
enabled: visible
id: reactionOption
text: qsTr("Re&act")
@ -483,6 +490,7 @@ Item {
})
}
MenuItem {
enabled: visible
text: qsTr("Repl&y")
visible: room ? room.permissions.canSend(MtxEvent.TextMessage) : false
@ -510,11 +518,13 @@ Item {
onTriggered: visible && room.pinnedMessages.includes(messageContextMenuC.eventId) ? room.unpin(messageContextMenuC.eventId) : room.pin(messageContextMenuC.eventId)
}
MenuItem {
enabled: visible
text: qsTr("&Read receipts")
onTriggered: room.showReadReceipts(messageContextMenuC.eventId)
}
MenuItem {
enabled: visible
text: qsTr("&Forward")
visible: messageContextMenuC.eventType == MtxEvent.ImageMessage || messageContextMenuC.eventType == MtxEvent.VideoMessage || messageContextMenuC.eventType == MtxEvent.AudioMessage || messageContextMenuC.eventType == MtxEvent.FileMessage || messageContextMenuC.eventType == MtxEvent.Sticker || messageContextMenuC.eventType == MtxEvent.TextMessage || messageContextMenuC.eventType == MtxEvent.LocationMessage || messageContextMenuC.eventType == MtxEvent.EmoteMessage || messageContextMenuC.eventType == MtxEvent.NoticeMessage
@ -526,9 +536,11 @@ Item {
}
}
MenuItem {
enabled: visible
text: qsTr("&Mark as read")
}
MenuItem {
enabled: visible
text: qsTr("View raw message")
onTriggered: room.viewRawMessage(messageContextMenuC.eventId)
@ -542,6 +554,7 @@ Item {
onTriggered: room.viewDecryptedRawMessage(messageContextMenuC.eventId)
}
MenuItem {
enabled: visible
text: qsTr("Remo&ve message")
visible: (room ? room.permissions.canRedact() : false) || messageContextMenuC.isSender
@ -605,6 +618,13 @@ Item {
open();
}
Component.onCompleted: {
if (replyContextMenuC.popupType != undefined) {
replyContextMenuC.popupType = 2; // Popup.Native with fallback on older Qt (<6.8.0)
}
}
MenuItem {
enabled: visible
text: qsTr("&Copy")

23
resources/qml/RoomList.qml
View file

@ -732,14 +732,6 @@ Page {
}
}
}
Component {
id: nestedSpaceMenuLevel
SpaceMenuLevel {
childMenu: rootSpaceMenu.childMenu
roomid: roomContextMenu.roomid
}
}
Menu {
id: roomContextMenu
@ -752,6 +744,21 @@ Page {
popup(parent);
}
Component.onCompleted: {
if (roomContextMenu.popupType != undefined) {
roomContextMenu.popupType = 2; // Popup.Native with fallback on older Qt (<6.8.0)
}
}
Component {
id: nestedSpaceMenuLevel
SpaceMenuLevel {
childMenu: rootSpaceMenu.childMenu
roomid: roomContextMenu.roomid
}
}
InputDialog {
id: newTag

9
resources/qml/TopBar.qml
View file

@ -239,9 +239,16 @@ Pane {
Menu {
id: roomOptionsMenu
Component.onCompleted: {
if (roomOptionsMenu.popupType != undefined) {
roomOptionsMenu.popupType = 2; // Popup.Native with fallback on older Qt (<6.8.0)
}
}
MenuItem {
text: qsTr("Invite users")
visible: room ? room.permissions.canInvite() : false
enabled: room ? room.permissions.canInvite() : false
onTriggered: TimelineManager.openInviteUsers(roomId)
}

2
resources/qml/components/SpaceMenuLevel.qml
View file

@ -82,7 +82,7 @@ Menu {
onObjectAdded: (idx, o) => {
spacesMenu.insertMenu(idx + (spacesMenu.position != -1 ? 6 : 0), o)
}
//onObjectRemoved: spacesMenu.removeMenu(object)
onObjectRemoved: (index, object) => tagsMenu.removeItem(object)
delegate: childMenu
}