diff --git a/Gui/main.qml b/Gui/main.qml index e912e50..ef8fbdf 100644 --- a/Gui/main.qml +++ b/Gui/main.qml @@ -16,6 +16,8 @@ ApplicationWindow property string confile: "" property alias settingsFileDialog: settingsFiledialog + palette.text: Colors.foreground + TopBar { diff --git a/TeroStyle/Button.qml b/TeroStyle/Button.qml index 08dec39..2187b43 100644 --- a/TeroStyle/Button.qml +++ b/TeroStyle/Button.qml @@ -7,7 +7,7 @@ T.Button { id: control - icon.color: Colors.foreground + icon.color: Colors.primaryContrast icon.height: 21 icon.width: 21 implicitHeight: Math.max( @@ -32,7 +32,7 @@ T.Button { icon: control.icon text: control.text font: control.font - color: Colors.foreground + color: Colors.primaryContrast } onIconChanged: () => { diff --git a/TeroStyle/Colors.qml b/TeroStyle/Colors.qml index c5844a7..7ff7c35 100644 --- a/TeroStyle/Colors.qml +++ b/TeroStyle/Colors.qml @@ -6,10 +6,11 @@ QtObject { readonly property int dark: 0 readonly property int light: 1 - property int theme: dark + property int theme: Application.styleHints.colorScheme === Qt.ColorScheme.Light ? light : dark - readonly property color primary: "#b81a34" - readonly property color foreground: theme === dark ? "#fdfdfd" : "#110b0c" + property color primary: "#b81a34" + property color primaryContrast: "#fdfdfd" + property color foreground: theme === dark ? "#fdfdfd" : "#110b0c" readonly property color background: theme === dark ? "#303136" : "#eff1f5" readonly property color mantle: theme === dark ? "#1e1f22" : "#e7e9ef" readonly property color interactive: theme === dark ? "#878b97" : "#d9d9da" diff --git a/TeroStyle/Label.qml b/TeroStyle/Label.qml new file mode 100644 index 0000000..632f4e1 --- /dev/null +++ b/TeroStyle/Label.qml @@ -0,0 +1,5 @@ +import QtQuick.Controls + +Label { + color: Colors.foreground +} \ No newline at end of file diff --git a/TeroStyle/qmldir b/TeroStyle/qmldir index e95abc1..1cba2fe 100644 --- a/TeroStyle/qmldir +++ b/TeroStyle/qmldir @@ -5,4 +5,5 @@ singleton Typography Typography.qml Button Button.qml ComboBox ComboBox.qml Field Field.qml +Label Label.qml TextField TextField.qml \ No newline at end of file diff --git a/qml.qrc b/qml.qrc index bd61e1b..08cfe4a 100644 --- a/qml.qrc +++ b/qml.qrc @@ -52,8 +52,9 @@ TeroStyle/Button.qml TeroStyle/Colors.qml TeroStyle/ComboBox.qml - TeroStyle/Field.qml TeroStyle/Dimensions.qml + TeroStyle/Field.qml + TeroStyle/Label.qml TeroStyle/qmldir TeroStyle/TextField.qml TeroStyle/Typography.qml