Fixup the clipboard copy.

Signed-off-by: Adam Treat <treat.adam@gmail.com>
nomic-ai · Dec 19, 2024 · 495973a · 495973a
1 parent 69a74af
commit 495973a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/gpt4all-chat/qml/ChatItemView.qml b/gpt4all-chat/qml/ChatItemView.qml
@@ -534,9 +534,7 @@ GridLayout {
             name: qsTr("Copy")
             source: "qrc:/gpt4all/icons/copy.svg"
             onClicked: {
-                myTextArea.selectAll();
-                myTextArea.copy();
-                myTextArea.deselect();
+                chatModel.copyToClipboard(index);
             }
         }
 

diff --git a/gpt4all-chat/src/chatmodel.h b/gpt4all-chat/src/chatmodel.h
@@ -9,9 +9,11 @@
 
 #include <fmt/format.h>
 
+#include <QApplication>
 #include <QAbstractListModel>
 #include <QBuffer>
 #include <QByteArray>
+#include <QClipboard>
 #include <QDataStream>
 #include <QJsonDocument>
 #include <QHash>
@@ -293,6 +295,15 @@ class ChatItem : public QObject
         return code + result;
     }
 
+    QString clipboardContent() const
+    {
+        QStringList clipContent;
+        for (const ChatItem *item : subItems)
+            clipContent << item->clipboardContent();
+        clipContent << content();
+        return clipContent.join("");
+    }
+
     QList<ChatItem *> childItems() const
     {
         // We currently have leaf nodes at depth 3 with nodes at depth 2 as mere containers we don't
@@ -971,6 +982,16 @@ class ChatModel : public QAbstractListModel
         emit hasErrorChanged(value);
     }
 
+    Q_INVOKABLE void copyToClipboard(int index)
+    {
+        QMutexLocker locker(&m_mutex);
+        if (index < 0 || index >= m_chatItems.size())
+            return;
+        ChatItem *item = m_chatItems.at(index);
+        QClipboard *clipboard = QGuiApplication::clipboard();
+        clipboard->setText(item->clipboardContent(), QClipboard::Clipboard);
+    }
+
     qsizetype count() const { QMutexLocker locker(&m_mutex); return m_chatItems.size(); }
 
     std::vector<MessageItem> messageItems() const