From 06a2a87ff77dc8a8c499cdb2efc971d0f911e1fe Mon Sep 17 00:00:00 2001
From: Adam Treat <treat.adam@gmail.com>
Date: Mon, 24 Apr 2023 00:14:52 -0400
Subject: [PATCH] Fixes for some theme issues on macOS.

---
 qml/ModelDownloaderDialog.qml | 18 ++++++++++++++++++
 qml/NetworkDialog.qml         | 10 ++++++++--
 qml/ThumbsDownDialog.qml      | 10 ++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/qml/ModelDownloaderDialog.qml b/qml/ModelDownloaderDialog.qml
index f71ea8af..c366dbac 100644
--- a/qml/ModelDownloaderDialog.qml
+++ b/qml/ModelDownloaderDialog.qml
@@ -122,6 +122,24 @@ Dialog {
                         anchors.rightMargin: 10
                         width: 100
                         visible: downloading
+                        background: Rectangle {
+                            implicitWidth: 200
+                            implicitHeight: 30
+                            color: theme.backgroundDarkest
+                            radius: 3
+                        }
+
+                        contentItem: Item {
+                            implicitWidth: 200
+                            implicitHeight: 25
+
+                            Rectangle {
+                                width: itemProgressBar.visualPosition * parent.width
+                                height: parent.height
+                                radius: 2
+                                color: theme.backgroundLightest
+                            }
+                        }
                         Accessible.role: Accessible.ProgressBar
                         Accessible.name: qsTr("Download progressBar")
                         Accessible.description: qsTr("Shows the progress made in the download")
diff --git a/qml/NetworkDialog.qml b/qml/NetworkDialog.qml
index d13fd17b..ba93163e 100644
--- a/qml/NetworkDialog.qml
+++ b/qml/NetworkDialog.qml
@@ -119,7 +119,10 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
         alignment: Qt.AlignRight
         spacing: 10
         Button {
-            text: qsTr("Enable")
+            contentItem: Text {
+                color: theme.textColor
+                text: qsTr("Enable")
+            }
             background: Rectangle {
                 border.color: theme.backgroundLightest
                 border.width: 1
@@ -134,7 +137,10 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
             DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
         }
         Button {
-            text: qsTr("Cancel")
+            contentItem: Text {
+                color: theme.textColor
+                text: qsTr("Cancel")
+            }
             background: Rectangle {
                 border.color: theme.backgroundLightest
                 border.width: 1
diff --git a/qml/ThumbsDownDialog.qml b/qml/ThumbsDownDialog.qml
index 088be2ef..23d4b1a0 100644
--- a/qml/ThumbsDownDialog.qml
+++ b/qml/ThumbsDownDialog.qml
@@ -80,7 +80,10 @@ Dialog {
         alignment: Qt.AlignRight
         spacing: 10
         Button {
-            text: qsTr("Submit")
+            contentItem: Text {
+                color: theme.textColor
+                text: qsTr("Submit")
+            }
             background: Rectangle {
                 border.color: theme.backgroundLightest
                 border.width: 1
@@ -91,7 +94,10 @@ Dialog {
             DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
         }
         Button {
-            text: qsTr("Cancel")
+            contentItem: Text {
+                color: theme.textColor
+                text: qsTr("Cancel")
+            }
             background: Rectangle {
                 border.color: theme.backgroundLightest
                 border.width: 1