dedup qml: convert more buttons to MyButton

gpt4all-chat/qml/ModelDownloaderDialog.qml

@@ -229,21 +229,11 @@ Dialog {
                             Accessible.description: qsTr("Whether the file is already installed on your system")
                         }
 
-                        Button {
+                        MyButton {
                             id: removeButton
-                            contentItem: Text {
+                            text: "Remove"
-                                color: theme.textColor
-                                text: "Remove"
-                            }
                             anchors.right: parent.right
                             anchors.rightMargin: 20
-                            background: Rectangle {
-                                opacity: .5
-                                border.color: theme.backgroundLightest
-                                border.width: 1
-                                radius: 10
-                                color: theme.backgroundLight
-                            }
                             onClicked: {
                                 Download.removeModel(modelData.filename);
                             }
@@ -300,12 +290,9 @@ Dialog {
                         }
                     }
 
-                    Button {
+                    MyButton {
                         id: downloadButton
-                        contentItem: Text {
+                        text: downloading ? qsTr("Cancel") : qsTr("Download")
-                            color: theme.textColor
-                            text: downloading ? "Cancel" : "Download"
-                        }
                         anchors.top: modelName.top
                         anchors.right: parent.right
                         anchors.topMargin: 15
@@ -320,17 +307,9 @@ Dialog {
                                 Download.cancelDownload(modelData.filename);
                             }
                         }
-                        background: Rectangle {
-                            opacity: .5
-                            border.color: theme.backgroundLightest
-                            border.width: 1
-                            radius: 10
-                            color: theme.backgroundLight
-                        }
                         Accessible.role: Accessible.Button
                         Accessible.name: text
                         Accessible.description: qsTr("Cancel/Download button to stop/start the download")
-
                     }
                 }
 
@@ -439,23 +418,11 @@ Dialog {
                     radius: 10
                 }
             }
-            Button {
+            MyButton {
                 text: qsTr("Browse")
-                contentItem: Text {
+                Accessible.role: Accessible.Button
-                    text: qsTr("Browse")
+                Accessible.name: text
-                    horizontalAlignment: Text.AlignHCenter
+                Accessible.description: qsTr("Opens a folder picker dialog to choose where to save model files")
-                    color: theme.textColor
-                    Accessible.role: Accessible.Button
-                    Accessible.name: text
-                    Accessible.description: qsTr("Opens a folder picker dialog to choose where to save model files")
-                }
-                background: Rectangle {
-                    opacity: .5
-                    border.color: theme.backgroundLightest
-                    border.width: 1
-                    radius: 10
-                    color: theme.backgroundLight
-                }
                 onClicked: modelPathDialog.open()
             }
         }

gpt4all-chat/qml/NetworkDialog.qml

@@ -117,40 +117,18 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
         padding: 20
         alignment: Qt.AlignRight
         spacing: 10
-        Button {
+        MyButton {
-            contentItem: Text {
+            text: qsTr("Enable")
-                color: theme.textColor
-                text: qsTr("Enable")
-            }
-            background: Rectangle {
-                border.color: theme.backgroundLightest
-                border.width: 1
-                radius: 10
-                color: theme.backgroundLight
-            }
             Accessible.role: Accessible.Button
             Accessible.name: text
             Accessible.description: qsTr("Enable opt-in button")
-
-            padding: 15
             DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
         }
-        Button {
+        MyButton {
-            contentItem: Text {
+            text: qsTr("Cancel")
-                color: theme.textColor
-                text: qsTr("Cancel")
-            }
-            background: Rectangle {
-                border.color: theme.backgroundLightest
-                border.width: 1
-                radius: 10
-                color: theme.backgroundLight
-            }
             Accessible.role: Accessible.Button
             Accessible.name: text
             Accessible.description: qsTr("Cancel opt-in button")
-
-            padding: 15
             DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
         }
         background: Rectangle {

gpt4all-chat/qml/NewVersionDialog.qml

@@ -43,30 +43,13 @@ Dialog {
             color: theme.textColor
         }
 
-        Button {
+        MyButton {
             id: button
             anchors.left: label.right
             anchors.leftMargin: 10
             anchors.verticalCenter: label.verticalCenter
             padding: 20
-            contentItem: Text {
+            text: qsTr("Update")
-                text: qsTr("Update")
-                horizontalAlignment: Text.AlignHCenter
-                color: theme.textColor
-
-                Accessible.role: Accessible.Button
-                Accessible.name: text
-                Accessible.description: qsTr("Use this to launch an external application that will check for updates to the installer")
-            }
-
-            background: Rectangle {
-                opacity: .5
-                border.color: theme.backgroundLightest
-                border.width: 1
-                radius: 10
-                color: theme.backgroundLight
-            }
-
             onClicked: {
                 if (!LLM.checkForUpdates())
                     checkForUpdatesError.open()

gpt4all-chat/qml/ThumbsDownDialog.qml

@@ -77,32 +77,18 @@ Dialog {
         padding: 20
         alignment: Qt.AlignRight
         spacing: 10
-        Button {
+        MyButton {
-            contentItem: Text {
+            text: qsTr("Submit")
-                color: theme.textColor
+            Accessible.role: Accessible.Button
-                text: qsTr("Submit")
+            Accessible.name: text
-            }
+            Accessible.description: qsTr("Submits the user's response")
-            background: Rectangle {
-                border.color: theme.backgroundLightest
-                border.width: 1
-                radius: 10
-                color: theme.backgroundLight
-            }
-            padding: 15
             DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
         }
-        Button {
+        MyButton {
-            contentItem: Text {
+            text: qsTr("Cancel")
-                color: theme.textColor
+            Accessible.role: Accessible.Button
-                text: qsTr("Cancel")
+            Accessible.name: text
-            }
+            Accessible.description: qsTr("Closes the response dialog")
-            background: Rectangle {
-                border.color: theme.backgroundLightest
-                border.width: 1
-                radius: 10
-                color: theme.backgroundLight
-            }
-            padding: 15
             DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
         }
         background: Rectangle {