From d54e644d054a806503db431d932828cb45bdb0db Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Thu, 9 May 2024 09:35:54 -0400 Subject: [PATCH] ChatView: make context menus more intuitive (#2324) * ChatView: fix deprecation warning Signed-off-by: Jared Van Bortel * ChatView: make context menus more intuitive Signed-off-by: Jared Van Bortel --------- Signed-off-by: Jared Van Bortel --- gpt4all-chat/qml/ChatView.qml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gpt4all-chat/qml/ChatView.qml b/gpt4all-chat/qml/ChatView.qml index 23b2620e..9d597892 100644 --- a/gpt4all-chat/qml/ChatView.qml +++ b/gpt4all-chat/qml/ChatView.qml @@ -1069,7 +1069,7 @@ Rectangle { anchors.fill: parent acceptedButtons: Qt.RightButton - onClicked: { + onClicked: (mouse) => { if (mouse.button === Qt.RightButton) { conversationContextMenu.x = conversationMouseArea.mouseX conversationContextMenu.y = conversationMouseArea.mouseY @@ -1082,11 +1082,19 @@ Rectangle { id: conversationContextMenu MenuItem { text: qsTr("Copy") + enabled: myTextArea.selectedText !== "" + height: enabled ? implicitHeight : 0 onTriggered: myTextArea.copy() } MenuItem { - text: qsTr("Select All") - onTriggered: myTextArea.selectAll() + text: qsTr("Copy Message") + enabled: myTextArea.selectedText === "" + height: enabled ? implicitHeight : 0 + onTriggered: { + myTextArea.selectAll() + myTextArea.copy() + myTextArea.deselect() + } } } @@ -1441,7 +1449,7 @@ Rectangle { anchors.fill: parent acceptedButtons: Qt.RightButton - onClicked: { + onClicked: (mouse) => { if (mouse.button === Qt.RightButton) { textInputContextMenu.x = textInputMouseArea.mouseX textInputContextMenu.y = textInputMouseArea.mouseY @@ -1454,10 +1462,14 @@ Rectangle { id: textInputContextMenu MenuItem { text: qsTr("Cut") + enabled: textInput.selectedText !== "" + height: enabled ? implicitHeight : 0 onTriggered: textInput.cut() } MenuItem { text: qsTr("Copy") + enabled: textInput.selectedText !== "" + height: enabled ? implicitHeight : 0 onTriggered: textInput.copy() } MenuItem {