github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-09-10 12:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Latest rc5 fixes (#2492)

Browse Source 
* Adjust the size of the new conversation tray to enlarge a bit.

* Add themeable code syntax highlighting.

* Change the default size to a larger context chunk for localdocs.

Signed-off-by: Adam Treat <treat.adam@gmail.com>
This commit is contained in:
AT
2024-06-30 19:15:01 -04:00
committed by GitHub
parent 4a1a3c48e8
commit 37dbd56153
5 changed files with 348 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
gpt4all-chat/chatviewtextprocessor.h
View File

@@ -16,12 +16,57 @@ class QPainter;
class QTextDocument;
class QTextFormat;
struct CodeColors {
Q_GADGET
Q_PROPERTY(QColor defaultColor MEMBER defaultColor)
Q_PROPERTY(QColor keywordColor MEMBER keywordColor)
Q_PROPERTY(QColor functionColor MEMBER functionColor)
Q_PROPERTY(QColor functionCallColor MEMBER functionCallColor)
Q_PROPERTY(QColor commentColor MEMBER commentColor)
Q_PROPERTY(QColor stringColor MEMBER stringColor)
Q_PROPERTY(QColor numberColor MEMBER numberColor)
Q_PROPERTY(QColor headerColor MEMBER headerColor)
Q_PROPERTY(QColor backgroundColor MEMBER backgroundColor)
public:
QColor defaultColor;
QColor keywordColor;
QColor functionColor;
QColor functionCallColor;
QColor commentColor;
QColor stringColor;
QColor numberColor;
QColor headerColor;
QColor backgroundColor;
QColor preprocessorColor = keywordColor;
QColor typeColor = numberColor;
QColor arrowColor = functionColor;
QColor commandColor = functionCallColor;
QColor variableColor = numberColor;
QColor keyColor = functionColor;
QColor valueColor = stringColor;
QColor parameterColor = stringColor;
QColor attributeNameColor = numberColor;
QColor attributeValueColor = stringColor;
QColor specialCharacterColor = functionColor;
QColor doctypeColor = commentColor;
};
Q_DECLARE_METATYPE(CodeColors)
class SyntaxHighlighter : public QSyntaxHighlighter {
Q_OBJECT
public:
SyntaxHighlighter(QObject *parent);
~SyntaxHighlighter();
void highlightBlock(const QString &text) override;
CodeColors codeColors() const { return m_codeColors; }
void setCodeColors(const CodeColors &colors) { m_codeColors = colors; }
private:
CodeColors m_codeColors;
};
struct ContextLink {
@@ -43,6 +88,7 @@ class ChatViewTextProcessor : public QObject
Q_PROPERTY(QQuickTextDocument* textDocument READ textDocument WRITE setTextDocument NOTIFY textDocumentChanged())
Q_PROPERTY(bool shouldProcessText READ shouldProcessText WRITE setShouldProcessText NOTIFY shouldProcessTextChanged())
Q_PROPERTY(qreal fontPixelSize READ fontPixelSize WRITE setFontPixelSize NOTIFY fontPixelSizeChanged())
Q_PROPERTY(CodeColors codeColors READ codeColors WRITE setCodeColors NOTIFY codeColorsChanged())
QML_ELEMENT
public:
explicit ChatViewTextProcessor(QObject *parent = nullptr);
@@ -50,9 +96,6 @@ public:
QQuickTextDocument* textDocument() const;
void setTextDocument(QQuickTextDocument* textDocument);
Q_INVOKABLE void setLinkColor(const QColor &c) { m_linkColor = c; }
Q_INVOKABLE void setHeaderColor(const QColor &c) { m_headerColor = c; }
Q_INVOKABLE bool tryCopyAtPosition(int position) const;
bool shouldProcessText() const;
@@ -61,10 +104,14 @@ public:
qreal fontPixelSize() const;
void setFontPixelSize(qreal b);
CodeColors codeColors() const;
void setCodeColors(const CodeColors &colors);
Q_SIGNALS:
void textDocumentChanged();
void shouldProcessTextChanged();
void fontPixelSizeChanged();
void codeColorsChanged();
private Q_SLOTS:
void handleTextChanged();
@@ -76,8 +123,6 @@ private:
SyntaxHighlighter *m_syntaxHighlighter;
QVector<ContextLink> m_links;
QVector<CodeCopy> m_copies;
QColor m_linkColor;
QColor m_headerColor;
bool m_shouldProcessText = false;
bool m_isProcessingText = false;
qreal m_fontPixelSize;