diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index f60488f..cbfa866 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -15,7 +15,7 @@ Loader { sourceComponent: Rectangle { id: container radius: implicitHeight / 2 - color: Colors.base00 + color: Colors.surfaceContainer anchors.verticalCenter: parent.verticalCenter implicitWidth: UPower.displayDevice.isLaptopBattery ? root.implicitWidth + 20 : 0 implicitHeight: Settings.config.barHeight - 10 diff --git a/modules/bar/Clock.qml b/modules/bar/Clock.qml index ab5ad03..3598e6d 100644 --- a/modules/bar/Clock.qml +++ b/modules/bar/Clock.qml @@ -8,7 +8,7 @@ import qs.reusables Rectangle { id: container radius: implicitHeight / 2 - color: formatSwitch.containsMouse ? Colors.base01 : Colors.base00 + color: formatSwitch.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer anchors.verticalCenter: parent.verticalCenter implicitHeight: Settings.config.barHeight - 10 implicitWidth: root.implicitWidth + 20 diff --git a/modules/bar/Mpris.qml b/modules/bar/Mpris.qml index 350b2dd..f5314e4 100644 --- a/modules/bar/Mpris.qml +++ b/modules/bar/Mpris.qml @@ -10,7 +10,7 @@ Rectangle { visible: root.spotify != null radius: implicitHeight / 2 implicitHeight: Settings.config.barHeight - 10 - color: clickHandler.containsMouse ? Colors.base01 : Colors.base00 + color: clickHandler.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer implicitWidth: statusRow.width + 20 property var spotify: root.getSpotify() diff --git a/modules/bar/Network.qml b/modules/bar/Network.qml index 18bd6f7..ba4cc74 100644 --- a/modules/bar/Network.qml +++ b/modules/bar/Network.qml @@ -12,7 +12,7 @@ Rectangle { // You might want to make this transparent if you only want the "pills" to show implicitHeight: Settings.config.barHeight - 10 implicitWidth: mainLayout.implicitWidth + 20 - color: Colors.base00 + color: Colors.surfaceContainer radius: implicitHeight / 2 // --- Logic Functions --- diff --git a/modules/bar/SettingsIcon.qml b/modules/bar/SettingsIcon.qml index 0a3c02c..03a849e 100644 --- a/modules/bar/SettingsIcon.qml +++ b/modules/bar/SettingsIcon.qml @@ -7,7 +7,7 @@ import qs Rectangle { id: root radius: implicitHeight / 2 - color: pavuArea.containsMouse ? Colors.base01 : Colors.base00 + color: pavuArea.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer implicitWidth: Settings.config.barHeight - 8 implicitHeight: Settings.config.barHeight - 10 CustomIcon { diff --git a/modules/bar/SysTray.qml b/modules/bar/SysTray.qml index 1310988..812cb2b 100644 --- a/modules/bar/SysTray.qml +++ b/modules/bar/SysTray.qml @@ -8,7 +8,7 @@ Rectangle { implicitWidth: trayRow.implicitWidth + 10 implicitHeight: Settings.config.barHeight - 10 radius: implicitHeight / 2 - color: Colors.base00 + color: Colors.surfaceContainer readonly property var count: trayRepeater.count visible: trayRepeater.count > 0 diff --git a/modules/bar/Title.qml b/modules/bar/Title.qml index 22ae218..f861d2b 100644 --- a/modules/bar/Title.qml +++ b/modules/bar/Title.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts Rectangle { id: container radius: implicitHeight / 2 - color: Colors.base00 + color: Colors.surfaceContainer implicitWidth: root.implicitWidth implicitHeight: Settings.config.barHeight - 10 Item { diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index e04a431..3237cee 100644 --- a/modules/bar/Volume.qml +++ b/modules/bar/Volume.qml @@ -9,7 +9,7 @@ import qs Rectangle { id: root radius: implicitHeight / 2 - color: pavuArea.containsMouse ? Colors.base01 : Colors.base00 + color: pavuArea.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer implicitWidth: textRow.implicitWidth + 20 implicitHeight: Settings.config.barHeight - 10 property var sink: Pipewire.defaultAudioSink diff --git a/modules/bar/Workspaces.qml b/modules/bar/Workspaces.qml index 2a94de8..47a0542 100644 --- a/modules/bar/Workspaces.qml +++ b/modules/bar/Workspaces.qml @@ -8,7 +8,7 @@ import qs.reusables Rectangle { id: root - color: Colors.base00 + color: "transparent" implicitWidth: workspaceRow.implicitWidth + 10 implicitHeight: Settings.config.barHeight - 10 @@ -40,7 +40,7 @@ Rectangle { required property var modelData width: !modelData.focused ? 20 : 40 height: isOnMon ? Settings.config.barHeight - Settings.config.barHeight / 2 : 0 - color: modelData.focused ? Colors.base01 : Colors.base00 + color: modelData.focused ? Colors.primaryContainer : "transparent" Behavior on width { NumberAnimation { diff --git a/modules/widgets/settingsapp/Appearance.qml b/modules/widgets/settingsapp/Appearance.qml index 67dfbb8..f85b9a1 100644 --- a/modules/widgets/settingsapp/Appearance.qml +++ b/modules/widgets/settingsapp/Appearance.qml @@ -26,7 +26,7 @@ ClippingWrapperRectangle { } anchors.centerIn: parent clip: true - color: Colors.base01 + color: Colors.surfaceContainerHigh radius: 12 margin: 20 @@ -45,7 +45,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 bottomLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer implicitHeight: 30 child: RowLayout { id: fontLayout @@ -73,7 +73,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer child: RowLayout { id: floatingToggleLayout spacing: 40 @@ -102,7 +102,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer child: RowLayout { id: screenCornerLayout spacing: 40 @@ -131,7 +131,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer child: RowLayout { id: screenCornerRadiusLayout spacing: 5 @@ -174,7 +174,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer child: RowLayout { id: barControlsLayout spacing: 5 @@ -217,7 +217,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer child: RowLayout { id: barMarginLayout spacing: 5 @@ -257,7 +257,7 @@ ClippingWrapperRectangle { bottomRightRadius: 12 topRightRadius: 4 topLeftRadius: 4 - color: Colors.base01 + color: Colors.primaryContainer Layout.fillWidth: true RowLayout { id: translucencyLayout diff --git a/modules/widgets/settingsapp/MainWindow.qml b/modules/widgets/settingsapp/MainWindow.qml index 5eb63e0..5c77ea6 100644 --- a/modules/widgets/settingsapp/MainWindow.qml +++ b/modules/widgets/settingsapp/MainWindow.qml @@ -14,7 +14,7 @@ FloatingWindow { onClosed: { Settings.config.settingsShown = false; } - color: Colors.base00 + color: Colors.surfaceContainer title: "qs-settings" implicitWidth: 800 implicitHeight: 600 @@ -50,7 +50,7 @@ FloatingWindow { Layout.preferredWidth: 200 Layout.rightMargin: 0 margin: 20 - color: Colors.base00 + color: Colors.surfaceContainer radius: 12 ListView { id: pageView @@ -61,7 +61,7 @@ FloatingWindow { id: pageDelegate Rectangle { radius: 24 - color: ListView.isCurrentItem ? Colors.base01 : "transparent" + color: ListView.isCurrentItem ? Colors.primaryContainer : "transparent" implicitHeight: 30 implicitWidth: pageWrapper.width - 50 required property var modelData diff --git a/modules/widgets/wallswitcher/WallSwitcher.qml b/modules/widgets/wallswitcher/WallSwitcher.qml index 18f7448..215870f 100644 --- a/modules/widgets/wallswitcher/WallSwitcher.qml +++ b/modules/widgets/wallswitcher/WallSwitcher.qml @@ -23,7 +23,7 @@ FloatingWindow { } Process { id: wallustRunner - property string cmd: "wallust run " + Settings.config.currentWall + property string cmd: "matugen image " + Settings.config.currentWall + " --source-color-index 0" command: ["sh", "-c", cmd] } GlobalShortcut { diff --git a/reusables/CustomButton.qml b/reusables/CustomButton.qml index ddea156..7d43858 100644 --- a/reusables/CustomButton.qml +++ b/reusables/CustomButton.qml @@ -15,9 +15,7 @@ Button { } background: Rectangle { id: contentBackground - border.color: control.down ? Colors.primaryFixed : Colors.primary - border.width: 1 radius: parent.implicitHeight / 2 - color: Colors.surfaceContainerLow + color: Colors.surfaceContainerHigh } } diff --git a/reusables/CustomIcon.qml b/reusables/CustomIcon.qml index 536573f..8809f2f 100644 --- a/reusables/CustomIcon.qml +++ b/reusables/CustomIcon.qml @@ -1,7 +1,8 @@ import QtQuick import qs -CustomText { +Text { + color: Colors.onSurfaceColor id: root property real iconSize: 16 property real fill: 1 diff --git a/reusables/CustomSlider.qml b/reusables/CustomSlider.qml index ac4ae7c..b051b2a 100644 --- a/reusables/CustomSlider.qml +++ b/reusables/CustomSlider.qml @@ -20,7 +20,6 @@ Slider { height: parent.height color: Colors.primary radius: 2 - border.color: Colors.outline } } @@ -31,6 +30,5 @@ Slider { implicitHeight: control.implicitHeight - 2 radius: 13 color: control.pressed ? Colors.primary : Colors.surfaceContainerLowest - border.color: control.pressed ? Colors.surfaceContainerLowest : Colors.primary } } diff --git a/reusables/CustomSwitch.qml b/reusables/CustomSwitch.qml index decad5e..466f1ad 100644 --- a/reusables/CustomSwitch.qml +++ b/reusables/CustomSwitch.qml @@ -12,7 +12,6 @@ Switch { implicitHeight: parent.implicitHeight radius: 26 color: Colors.surfaceContainerLow - border.color: control.checked ? Colors.primary : Colors.onSurfaceColor Rectangle { implicitHeight: parent.implicitHeight - 6 diff --git a/reusables/CustomText.qml b/reusables/CustomText.qml index 2ec7ea7..643af2f 100644 --- a/reusables/CustomText.qml +++ b/reusables/CustomText.qml @@ -3,7 +3,7 @@ import qs import qs.settings Text { - color: Colors.base07 + color: Colors.onSurfaceColor font.family: Settings.config.font font.pixelSize: Settings.config.fontSize font.weight: Settings.config.fontWeight diff --git a/settings/Settings.qml b/settings/Settings.qml index d6dfd5e..9b362b0 100644 --- a/settings/Settings.qml +++ b/settings/Settings.qml @@ -33,7 +33,6 @@ Singleton { property double translucency: 1 property bool blackScreenCorners: true property bool settingsShown: true - property string schemeGenerator: "matugen" } } }