AI/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update theme for menus (#2578)

Browse Source 
* Add radius to selected menu items, adust width to fit. Update colors.
* Fix server text color in chatview.

Signed-off-by: 3simplex <10260755+3Simplex@users.noreply.github.com>
This commit is contained in:
3Simplex 2024-07-10 10:36:20 -04:00 committed by GitHub
parent 0de6eba69e
commit 7340bf85e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gpt4all-chat/qml/ChatView.qml
View File

@ -408,7 +408,7 @@ Rectangle {
} }
delegate: ItemDelegate { delegate: ItemDelegate {
id: comboItemDelegate id: comboItemDelegate
width: comboItemPopup.width width: comboItemPopup.width -20
contentItem: Text { contentItem: Text {
text: name text: name
color: theme.textColor color: theme.textColor
@ -417,7 +417,8 @@ Rectangle {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
background: Rectangle { background: Rectangle {
color: highlighted ? theme.lightContrast : theme.darkContrast radius: 10
color: highlighted ? theme.menuHighlightColor : theme.menuBackgroundColor
} }
highlighted: comboBox.highlightedIndex === index highlighted: comboBox.highlightedIndex === index
} }
@ -451,7 +452,9 @@ Rectangle {
} }
background: Rectangle { background: Rectangle {
color: theme.controlBackground border.color: theme.menuBorderColor
border.width: 1
color: theme.menuBackgroundColor
radius: 10 radius: 10
} }
} }
@ -888,9 +891,7 @@ Rectangle {
color: { color: {
if (!currentChat.isServer) if (!currentChat.isServer)
return theme.textColor return theme.textColor
if (name === qsTr("Response: ")) return theme.white
return theme.white
return theme.black
} }
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
textFormat: TextEdit.PlainText textFormat: TextEdit.PlainText

5
gpt4all-chat/qml/ModelSettings.qml
View File

@ -62,7 +62,7 @@ MySettingsTab {
elide: Text.ElideRight elide: Text.ElideRight
} }
delegate: ItemDelegate { delegate: ItemDelegate {
width: comboBox.width width: comboBox.width -20
contentItem: Text { contentItem: Text {
text: name text: name
color: theme.textColor color: theme.textColor
@ -71,7 +71,8 @@ MySettingsTab {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
background: Rectangle { background: Rectangle {
color: highlighted ? theme.lightContrast : theme.darkContrast radius: 10
color: highlighted ? theme.menuHighlightColor : theme.menuBackgroundColor
} }
highlighted: comboBox.highlightedIndex === index highlighted: comboBox.highlightedIndex === index
} }

9
gpt4all-chat/qml/MyComboBox.qml
View File

@ -45,7 +45,7 @@ ComboBox {
} }
} }
delegate: ItemDelegate { delegate: ItemDelegate {
width: comboBox.width width: comboBox.width -20
contentItem: Text { contentItem: Text {
text: modelData text: modelData
color: theme.textColor color: theme.textColor
@ -54,7 +54,8 @@ ComboBox {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
background: Rectangle { background: Rectangle {
color: highlighted ? theme.lightContrast : theme.darkContrast radius: 10
color: highlighted ? theme.menuHighlightColor : theme.menuBackgroundColor
} }
highlighted: comboBox.highlightedIndex === index highlighted: comboBox.highlightedIndex === index
} }
@ -84,7 +85,9 @@ ComboBox {
} }
background: Rectangle { background: Rectangle {
color: theme.controlBackground color: theme.menuBackgroundColor//theme.controlBorder
border.color: theme.menuBorderColor //theme.controlBorder
border.width: 1
radius: 10 radius: 10
} }
} }

4
gpt4all-chat/qml/MyMenu.qml
View File

@ -14,7 +14,9 @@ Menu {
background: Rectangle { background: Rectangle {
implicitWidth: 220 implicitWidth: 220
implicitHeight: 40 implicitHeight: 40
color: theme.controlBackground color: theme.menuBackgroundColor
border.color: theme.menuBorderColor
border.width: 1
radius: 10 radius: 10
} }

4
gpt4all-chat/qml/MyMenuItem.qml
View File

@ -6,7 +6,9 @@ import QtQuick.Controls.Basic
MenuItem { MenuItem {
id: item id: item
background: Rectangle { background: Rectangle {
color: item.highlighted ? theme.lightContrast : theme.darkContrast radius: 10
width: parent.width -20
color: item.highlighted ? theme.menuHighlightColor : theme.menuBackgroundColor
} }
contentItem: Text { contentItem: Text {

43
gpt4all-chat/qml/Theme.qml
View File

@ -128,6 +128,10 @@ QtObject {
} }
} }
/*
These nolonger apply to anything (remove this?)
Replaced by menuHighlightColor & menuBackgroundColor now using different colors.
property color darkContrast: { property color darkContrast: {
switch (MySettings.chatTheme) { switch (MySettings.chatTheme) {
case "LegacyDark": case "LegacyDark":
@ -149,7 +153,7 @@ QtObject {
return gray0 return gray0
} }
} }
*/
property color controlBorder: { property color controlBorder: {
switch (MySettings.chatTheme) { switch (MySettings.chatTheme) {
case "LegacyDark": case "LegacyDark":
@ -219,6 +223,8 @@ QtObject {
return gray50 return gray50
} }
} }
/*
These nolonger apply to anything (remove this?)
property color containerForeground: { property color containerForeground: {
switch (MySettings.chatTheme) { switch (MySettings.chatTheme) {
@ -230,7 +236,7 @@ QtObject {
return gray300 return gray300
} }
} }
*/
property color containerBackground: { property color containerBackground: {
switch (MySettings.chatTheme) { switch (MySettings.chatTheme) {
case "LegacyDark": case "LegacyDark":
@ -1164,6 +1170,39 @@ QtObject {
} }
} }
property color menuBackgroundColor: {
switch (MySettings.chatTheme) {
case "LegacyDark":
return blue700
case "Dark":
return darkgray200
default:
return gray50
}
}
property color menuHighlightColor: {
switch (MySettings.chatTheme) {
case "LegacyDark":
return blue400
case "Dark":
return darkgray0
default:
return green100
}
}
property color menuBorderColor: {
switch (MySettings.chatTheme) {
case "LegacyDark":
return blue400
case "Dark":
return gray800
default:
return gray300
}
}
property real fontScale: MySettings.fontSize === "Small" ? 1 : property real fontScale: MySettings.fontSize === "Small" ? 1 :
MySettings.fontSize === "Medium" ? 1.3 : MySettings.fontSize === "Medium" ? 1.3 :
/* "Large" */ 1.8 /* "Large" */ 1.8