diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index cbfa866..f60488f 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.surfaceContainer + color: Colors.base00 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 3598e6d..ab5ad03 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.primaryContainer : Colors.surfaceContainer + color: formatSwitch.containsMouse ? Colors.base01 : Colors.base00 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 f5314e4..350b2dd 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.primaryContainer : Colors.surfaceContainer + color: clickHandler.containsMouse ? Colors.base01 : Colors.base00 implicitWidth: statusRow.width + 20 property var spotify: root.getSpotify() diff --git a/modules/bar/Network.qml b/modules/bar/Network.qml index ba4cc74..18bd6f7 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.surfaceContainer + color: Colors.base00 radius: implicitHeight / 2 // --- Logic Functions --- diff --git a/modules/bar/SettingsIcon.qml b/modules/bar/SettingsIcon.qml index 03a849e..0a3c02c 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.primaryContainer : Colors.surfaceContainer + color: pavuArea.containsMouse ? Colors.base01 : Colors.base00 implicitWidth: Settings.config.barHeight - 8 implicitHeight: Settings.config.barHeight - 10 CustomIcon { diff --git a/modules/bar/SysTray.qml b/modules/bar/SysTray.qml index 812cb2b..1310988 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.surfaceContainer + color: Colors.base00 readonly property var count: trayRepeater.count visible: trayRepeater.count > 0 diff --git a/modules/bar/Title.qml b/modules/bar/Title.qml index f861d2b..22ae218 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.surfaceContainer + color: Colors.base00 implicitWidth: root.implicitWidth implicitHeight: Settings.config.barHeight - 10 Item { diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index 3237cee..e04a431 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.primaryContainer : Colors.surfaceContainer + color: pavuArea.containsMouse ? Colors.base01 : Colors.base00 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 b64a61a..2a94de8 100644 --- a/modules/bar/Workspaces.qml +++ b/modules/bar/Workspaces.qml @@ -8,7 +8,7 @@ import qs.reusables Rectangle { id: root - color: Colors.surfaceContainer + color: Colors.base00 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.primary : Colors.surfaceContainer + color: modelData.focused ? Colors.base01 : Colors.base00 Behavior on width { NumberAnimation { @@ -54,8 +54,6 @@ Rectangle { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter text: parent.modelData.id - color: parent.modelData.focused ? Colors.onPrimaryColor : Colors.onSurfaceColor - opacity: workspaceNumber.modelData.focused ? 1 : 0.5 } MouseArea { anchors.fill: parent diff --git a/modules/widgets/MainWindow.qml b/modules/widgets/MainWindow.qml deleted file mode 100644 index 841fb93..0000000 --- a/modules/widgets/MainWindow.qml +++ /dev/null @@ -1,98 +0,0 @@ -pragma ComponentBehavior: Bound -import QtQuick -import QtQuick.Layouts -import Quickshell -import QtQuick.Dialogs -import Quickshell.Widgets -import qs -import qs.settings -import qs.reusables - -FloatingWindow { - id: root - visible: Settings.config.settingsShown - onClosed: { - Settings.config.settingsShown = false; - } - color: Colors.surface - title: "qs-settings" - implicitWidth: 800 - implicitHeight: 600 - ListModel { - id: pageModel - ListElement { - text: "welcomePage" - source: "WelcomePage.qml" - } - ListElement { - text: "Appearance" - source: "Appearance.qml" - } - ListElement { - text: "Matugen" - source: "Matugen.qml" - } - ListElement { - text: "test" - source: "WelcomePage.qml" - } - } - RowLayout { - id: windowLayout - clip: true - anchors.fill: parent - spacing: 10 - - ClippingWrapperRectangle { - id: pageWrapper - Layout.margins: 20 - Layout.fillHeight: true - Layout.preferredWidth: 200 - Layout.rightMargin: 0 - margin: 20 - color: Colors.surfaceContainerLow - radius: 12 - ListView { - id: pageView - clip: true - model: pageModel - delegate: pageDelegate - Component { - id: pageDelegate - Rectangle { - radius: 24 - color: ListView.isCurrentItem ? Colors.surfaceContainerHigh : "transparent" - implicitHeight: 30 - implicitWidth: pageWrapper.width - 50 - required property var modelData - required property int index - CustomText { - id: delegateText - leftPadding: 10 - anchors.verticalCenter: parent.verticalCenter - text: parent.modelData.text - } - MouseArea { - id: clickHandler - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - acceptedButtons: Qt.LeftButton - onClicked: { - contentLoader.source = parent.modelData.source; - pageView.currentIndex = parent.index; - } - } - } - } - } - } - Loader { - id: contentLoader - Layout.leftMargin: 0 - Layout.fillHeight: true - Layout.fillWidth: true - Layout.margins: 20 - source: pageModel.get(pageView.currentIndex).source - } - } -} diff --git a/modules/widgets/settingsapp/Appearance.qml b/modules/widgets/settingsapp/Appearance.qml index ae7e5c8..67dfbb8 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.surfaceContainerLow + color: Colors.base01 radius: 12 margin: 20 @@ -45,7 +45,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 bottomLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 implicitHeight: 30 child: RowLayout { id: fontLayout @@ -73,7 +73,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 child: RowLayout { id: floatingToggleLayout spacing: 40 @@ -102,7 +102,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 child: RowLayout { id: screenCornerLayout spacing: 40 @@ -131,7 +131,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 child: RowLayout { id: screenCornerRadiusLayout spacing: 5 @@ -174,7 +174,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 child: RowLayout { id: barControlsLayout spacing: 5 @@ -217,7 +217,7 @@ ClippingWrapperRectangle { bottomRightRadius: 4 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 child: RowLayout { id: barMarginLayout spacing: 5 @@ -257,7 +257,7 @@ ClippingWrapperRectangle { bottomRightRadius: 12 topRightRadius: 4 topLeftRadius: 4 - color: Colors.surfaceContainerHigh + color: Colors.base01 Layout.fillWidth: true RowLayout { id: translucencyLayout diff --git a/modules/widgets/settingsapp/MainWindow.qml b/modules/widgets/settingsapp/MainWindow.qml index f17a7e1..5eb63e0 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.surface + color: Colors.base00 title: "qs-settings" implicitWidth: 800 implicitHeight: 600 @@ -50,7 +50,7 @@ FloatingWindow { Layout.preferredWidth: 200 Layout.rightMargin: 0 margin: 20 - color: Colors.surfaceContainerLow + color: Colors.base00 radius: 12 ListView { id: pageView @@ -61,7 +61,7 @@ FloatingWindow { id: pageDelegate Rectangle { radius: 24 - color: ListView.isCurrentItem ? Colors.surfaceContainerHigh : "transparent" + color: ListView.isCurrentItem ? Colors.base01 : "transparent" implicitHeight: 30 implicitWidth: pageWrapper.width - 50 required property var modelData diff --git a/reusables/CustomText.qml b/reusables/CustomText.qml index 643af2f..2ec7ea7 100644 --- a/reusables/CustomText.qml +++ b/reusables/CustomText.qml @@ -3,7 +3,7 @@ import qs import qs.settings Text { - color: Colors.onSurfaceColor + color: Colors.base07 font.family: Settings.config.font font.pixelSize: Settings.config.fontSize font.weight: Settings.config.fontWeight