From a1ec6f2150dee4924f1c806dd9efbe5c36b0c865 Mon Sep 17 00:00:00 2001
From: Adam Treat <treat.adam@gmail.com>
Date: Thu, 27 Jun 2024 07:16:11 -0400
Subject: [PATCH] Change the divider height and color to be more consistent.

Signed-off-by: Adam Treat <treat.adam@gmail.com>
---
 gpt4all-chat/qml/ApplicationSettings.qml |  6 +++---
 gpt4all-chat/qml/ChatDrawer.qml          |  8 ++++----
 gpt4all-chat/qml/ChatView.qml            |  2 +-
 gpt4all-chat/qml/CollectionsDrawer.qml   |  2 +-
 gpt4all-chat/qml/LocalDocsSettings.qml   | 10 +++++-----
 gpt4all-chat/qml/ModelSettings.qml       |  4 ++--
 gpt4all-chat/qml/MySettingsStack.qml     |  2 +-
 gpt4all-chat/qml/Theme.qml               |  9 +--------
 8 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/gpt4all-chat/qml/ApplicationSettings.qml b/gpt4all-chat/qml/ApplicationSettings.qml
index f58f7e9d..19aee29e 100644
--- a/gpt4all-chat/qml/ApplicationSettings.qml
+++ b/gpt4all-chat/qml/ApplicationSettings.qml
@@ -77,7 +77,7 @@ MySettingsTab {
 
             Rectangle {
                 Layout.fillWidth: true
-                height: 2
+                height: 1
                 color: theme.settingsDivider
             }
         }
@@ -307,7 +307,7 @@ MySettingsTab {
 
             Rectangle {
                 Layout.fillWidth: true
-                height: 2
+                height: 1
                 color: theme.settingsDivider
             }
         }
@@ -463,7 +463,7 @@ MySettingsTab {
             Layout.column: 0
             Layout.columnSpan: 3
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.settingsDivider
         }
     }
diff --git a/gpt4all-chat/qml/ChatDrawer.qml b/gpt4all-chat/qml/ChatDrawer.qml
index c00291d4..f9f59c9b 100644
--- a/gpt4all-chat/qml/ChatDrawer.qml
+++ b/gpt4all-chat/qml/ChatDrawer.qml
@@ -23,7 +23,7 @@ Rectangle {
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.right: parent.right
-        width: 2
+        width: 1
         color: theme.dividerColor
     }
 
@@ -44,8 +44,8 @@ Rectangle {
             anchors.right: parent.right
             anchors.margins: 20
             font.pixelSize: theme.fontSizeLarger
-            topPadding: 20
-            bottomPadding: 20
+            topPadding: 24
+            bottomPadding: 24
             text: qsTr("\uFF0B New chat")
             Accessible.description: qsTr("Create a new chat")
             onClicked: {
@@ -59,7 +59,7 @@ Rectangle {
             id: divider
             anchors.top: newChat.bottom
             anchors.margins: 20
-            anchors.topMargin: 15
+            anchors.topMargin: 14
             anchors.left: parent.left
             anchors.right: parent.right
             height: 1
diff --git a/gpt4all-chat/qml/ChatView.qml b/gpt4all-chat/qml/ChatView.qml
index 62676b5f..b9a017c3 100644
--- a/gpt4all-chat/qml/ChatView.qml
+++ b/gpt4all-chat/qml/ChatView.qml
@@ -525,7 +525,7 @@ Rectangle {
             anchors.left: parent.left
             anchors.right: parent.right
             color: theme.conversationDivider
-            height: 2
+            height: 1
         }
 
         CollectionsDrawer {
diff --git a/gpt4all-chat/qml/CollectionsDrawer.qml b/gpt4all-chat/qml/CollectionsDrawer.qml
index 724d4917..9331c082 100644
--- a/gpt4all-chat/qml/CollectionsDrawer.qml
+++ b/gpt4all-chat/qml/CollectionsDrawer.qml
@@ -21,7 +21,7 @@ Rectangle {
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.left: parent.left
-        width: 2
+        width: 1
         color: theme.dividerColor
     }
 
diff --git a/gpt4all-chat/qml/LocalDocsSettings.qml b/gpt4all-chat/qml/LocalDocsSettings.qml
index ebb484c2..17aab8cb 100644
--- a/gpt4all-chat/qml/LocalDocsSettings.qml
+++ b/gpt4all-chat/qml/LocalDocsSettings.qml
@@ -31,7 +31,7 @@ MySettingsTab {
         Rectangle {
             Layout.bottomMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.settingsDivider
         }
 
@@ -92,7 +92,7 @@ MySettingsTab {
         Rectangle {
             Layout.bottomMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.grayRed500
         }
 
@@ -154,7 +154,7 @@ MySettingsTab {
         Rectangle {
             Layout.bottomMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.grayRed500
         }
 
@@ -184,7 +184,7 @@ MySettingsTab {
         Rectangle {
             Layout.bottomMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.settingsDivider
         }
 
@@ -254,7 +254,7 @@ MySettingsTab {
         Rectangle {
             Layout.topMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.settingsDivider
         }
      }
diff --git a/gpt4all-chat/qml/ModelSettings.qml b/gpt4all-chat/qml/ModelSettings.qml
index 1e5cbe89..f1ab3631 100644
--- a/gpt4all-chat/qml/ModelSettings.qml
+++ b/gpt4all-chat/qml/ModelSettings.qml
@@ -38,7 +38,7 @@ MySettingsTab {
 
             Rectangle {
                 Layout.fillWidth: true
-                height: 2
+                height: 1
                 color: theme.settingsDivider
             }
         }
@@ -803,7 +803,7 @@ MySettingsTab {
             Layout.columnSpan: 2
             Layout.topMargin: 15
             Layout.fillWidth: true
-            height: 2
+            height: 1
             color: theme.settingsDivider
         }
     }
diff --git a/gpt4all-chat/qml/MySettingsStack.qml b/gpt4all-chat/qml/MySettingsStack.qml
index e02ad0a9..3d0776c7 100644
--- a/gpt4all-chat/qml/MySettingsStack.qml
+++ b/gpt4all-chat/qml/MySettingsStack.qml
@@ -57,7 +57,7 @@ Item {
         anchors.rightMargin: 15
         anchors.left: parent.left
         anchors.right: parent.right
-        height: 2
+        height: 1
         color: theme.settingsDivider
     }
 
diff --git a/gpt4all-chat/qml/Theme.qml b/gpt4all-chat/qml/Theme.qml
index 2de24404..79a20ad4 100644
--- a/gpt4all-chat/qml/Theme.qml
+++ b/gpt4all-chat/qml/Theme.qml
@@ -195,14 +195,7 @@ QtObject {
     }
 
     property color conversationDivider: {
-        switch (MySettings.chatTheme) {
-            case "LegacyDark":
-                return blue900;
-            case "Dark":
-                return darkgray100;
-            default:
-                return gray100;
-        }
+        return dividerColor;
     }
 
     property color settingsDivider: {