From e7fb2b0050f0db90c9f223dc8a84adafbf72c5e2 Mon Sep 17 00:00:00 2001 From: Adam Treat Date: Mon, 22 May 2023 22:13:42 -0400 Subject: [PATCH] Minor tweaks to look and feel for some dialogs and button. --- gpt4all-chat/qml/ModelDownloaderDialog.qml | 3 ++- gpt4all-chat/qml/MyButton.qml | 2 +- gpt4all-chat/qml/SettingsDialog.qml | 31 +++++++++++++++++----- gpt4all-chat/qml/Theme.qml | 3 ++- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gpt4all-chat/qml/ModelDownloaderDialog.qml b/gpt4all-chat/qml/ModelDownloaderDialog.qml index d885e621..bc5671fe 100644 --- a/gpt4all-chat/qml/ModelDownloaderDialog.qml +++ b/gpt4all-chat/qml/ModelDownloaderDialog.qml @@ -13,9 +13,10 @@ Dialog { modal: true opacity: 0.9 closePolicy: LLM.chatListModel.currentChat.modelList.length === 0 ? Popup.NoAutoClose : (Popup.CloseOnEscape | Popup.CloseOnPressOutside) + padding: 20 + bottomPadding: 30 background: Rectangle { anchors.fill: parent - anchors.margins: -20 color: theme.backgroundDarkest border.width: 1 border.color: theme.dialogBorder diff --git a/gpt4all-chat/qml/MyButton.qml b/gpt4all-chat/qml/MyButton.qml index 7b95453b..0e10a6e0 100644 --- a/gpt4all-chat/qml/MyButton.qml +++ b/gpt4all-chat/qml/MyButton.qml @@ -9,7 +9,7 @@ Button { contentItem: Text { text: myButton.text horizontalAlignment: Text.AlignHCenter - color: theme.textColor + color: myButton.enabled ? theme.textColor : theme.mutedTextColor Accessible.role: Accessible.Button Accessible.name: text } diff --git a/gpt4all-chat/qml/SettingsDialog.qml b/gpt4all-chat/qml/SettingsDialog.qml index 31d4087d..bd538852 100644 --- a/gpt4all-chat/qml/SettingsDialog.qml +++ b/gpt4all-chat/qml/SettingsDialog.qml @@ -12,9 +12,10 @@ Dialog { id: settingsDialog modal: true opacity: 0.9 + padding: 20 + bottomPadding: 30 background: Rectangle { anchors.fill: parent - anchors.margins: -20 color: theme.backgroundDarkest border.width: 1 border.color: theme.dialogBorder @@ -131,6 +132,7 @@ Dialog { TabBar { id: settingsTabBar width: parent.width / 1.5 + z: 200 TabButton { id: genSettingsButton @@ -146,21 +148,28 @@ Dialog { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - height: 1 ? genSettingsButton.checked : 0 + height: genSettingsButton.checked + color: theme.tabBorder + } + Rectangle { + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.right: parent.right + height: !genSettingsButton.checked color: theme.tabBorder } Rectangle { anchors.top: parent.top anchors.bottom: parent.bottom anchors.left: parent.left - width: 1 ? genSettingsButton.checked : 0 + width: genSettingsButton.checked color: theme.tabBorder } Rectangle { anchors.top: parent.top anchors.bottom: parent.bottom anchors.right: parent.right - width: 1 ? genSettingsButton.checked : 0 + width: genSettingsButton.checked color: theme.tabBorder } } @@ -183,21 +192,28 @@ Dialog { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - height: 1 ? appSettingsButton.checked : 0 + height: appSettingsButton.checked + color: theme.tabBorder + } + Rectangle { + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.right: parent.right + height: !appSettingsButton.checked color: theme.tabBorder } Rectangle { anchors.top: parent.top anchors.bottom: parent.bottom anchors.left: parent.left - width: 1 ? appSettingsButton.checked : 0 + width: appSettingsButton.checked color: theme.tabBorder } Rectangle { anchors.top: parent.top anchors.bottom: parent.bottom anchors.right: parent.right - width: 1 ? appSettingsButton.checked : 0 + width: appSettingsButton.checked color: theme.tabBorder } } @@ -209,6 +225,7 @@ Dialog { StackLayout { anchors.top: settingsTabBar.bottom + anchors.topMargin: -1 width: parent.width height: availableHeight currentIndex: settingsTabBar.currentIndex diff --git a/gpt4all-chat/qml/Theme.qml b/gpt4all-chat/qml/Theme.qml index 6417550d..d54555f0 100644 --- a/gpt4all-chat/qml/Theme.qml +++ b/gpt4all-chat/qml/Theme.qml @@ -6,6 +6,7 @@ QtObject { property color textColor: "#d1d5db" property color textErrorColor: "red" property color backgroundDarkest: "#202123" + property color backgroundDarker: "#222326" property color backgroundDark: "#242528" property color backgroundLight: "#343541" property color backgroundLighter: "#444654" @@ -14,7 +15,7 @@ QtObject { property color userColor: "#ec86bf" property color assistantColor: "#10a37f" property color linkColor: "white" - property color tabBorder: "#aaa" + property color tabBorder: "#2C2D35" property real fontSizeLarge: Qt.application.font.pixelSize property real fontSizeLarger: Qt.application.font.pixelSize + 2 }