diff --git a/other/quickshell/bar/Power.qml b/other/quickshell/bar/Power.qml index 5805b08..6c917d9 100644 --- a/other/quickshell/bar/Power.qml +++ b/other/quickshell/bar/Power.qml @@ -13,7 +13,7 @@ Item { readonly property bool isPluggedIn: isCharging || chargeState == UPowerDeviceState.PendingCharge readonly property real percentage: UPower.displayDevice.percentage readonly property bool isLow: percentage <= 0.20 - readonly property bool isLaptop: UPowerDevice.isLaptop // hardcoded because this doesnt work UPowerDevice.isLaptopBattery + readonly property bool isLaptop: true // hardcoded because this doesnt work UPowerDevice.isLaptopBattery width: 32 height: 32 diff --git a/other/quickshell/bar/mpris/PlayersPopup.qml b/other/quickshell/bar/mpris/PlayersPopup.qml index 8732062..4ab56b2 100644 --- a/other/quickshell/bar/mpris/PlayersPopup.qml +++ b/other/quickshell/bar/mpris/PlayersPopup.qml @@ -9,6 +9,7 @@ import Quickshell.Widgets import Quickshell.Wayland import Quickshell.Hyprland import Quickshell.Services.Mpris +import "../../theme" as Theme import "../.." import "../../components" import ".." @@ -26,7 +27,7 @@ PopupWindow { item: wrapper } - color: "transparent" + color: Theme.Colors.playerPopupColor1 property Scope positionInfo: Scope { id: positionInfo @@ -65,7 +66,7 @@ PopupWindow { id: wrapper implicitWidth: 500 implicitHeight: popupContent.implicitHeight + popupContent.anchors.margins * 2 - color: "#824524" + color: Theme.Colors.playerPopupColor2 x: 200 y: -wrapper.height @@ -149,7 +150,7 @@ PopupWindow { anchors.centerIn: parent implicitWidth: 50 implicitHeight: 50 - color: "#824524" + color: Theme.Colors.playerPopupColor3 } RowLayout { @@ -231,7 +232,7 @@ PopupWindow { anchors.centerIn: parent text: MprisController.activePlayer.identity font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor4 } } @@ -277,7 +278,7 @@ PopupWindow { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter implicitHeight: 128 implicitWidth: 128 - color: "transparent" + color: Theme.Colors.playerPopupColor5 Image { id: img @@ -298,7 +299,7 @@ PopupWindow { text: flickable.track.title font.pointSize: albumLabel.font.pointSize + 1 font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor6 elide: Text.ElideRight Layout.maximumWidth: Math.min(300, implicitWidth) } @@ -308,7 +309,7 @@ PopupWindow { text: flickable.track.album opacity: 0.8 font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor7 Layout.maximumWidth: Math.min(300, implicitWidth) } @@ -316,7 +317,7 @@ PopupWindow { text: flickable.track.artist opacity: 0.8 font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor8 Layout.maximumWidth: Math.min(300, implicitWidth) } } @@ -445,7 +446,7 @@ PopupWindow { Layout.preferredWidth: lengthLabel.implicitWidth text: positionInfo.timeStr(positionInfo.position) font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor9 } Slider { @@ -474,7 +475,7 @@ PopupWindow { implicitHeight: 24 width: slider.availableWidth height: implicitHeight - color: "#824524" + color: Theme.Colors.playerPopupColor10 Rectangle { anchors.margins: 8 @@ -482,7 +483,7 @@ PopupWindow { y: anchors.topMargin width: slider.visualPosition * (parent.width - anchors.leftMargin - anchors.rightMargin) height: parent.height - anchors.topMargin - anchors.bottomMargin - color: "#8D804B" + color: Theme.Colors.playerPopupColor11 } } @@ -492,7 +493,7 @@ PopupWindow { implicitWidth: 16 implicitHeight: 16 rotation: 45 - color: "#8D804B" + color: Theme.Colors.playerPopupColor12 } Connections { @@ -520,7 +521,7 @@ PopupWindow { id: lengthLabel text: positionInfo.timeStr(positionInfo.length) font.family: "BigBlueTermPlusNerdFont" - color: "white" + color: Theme.Colors.playerPopupColor13 } } } diff --git a/other/quickshell/bar/systray/SysTray.qml b/other/quickshell/bar/systray/SysTray.qml index 25df5f4..8e393c2 100644 --- a/other/quickshell/bar/systray/SysTray.qml +++ b/other/quickshell/bar/systray/SysTray.qml @@ -16,7 +16,7 @@ Rectangle { implicitWidth: row.implicitWidth + 10 Layout.fillHeight: true - color: "transparent" + color: Theme.Colors.sysTrayColor1 RowLayout { id: row @@ -126,7 +126,7 @@ Rectangle { Rectangle { anchors.fill: parent - color: Theme.Colors.sysTrayColor2 + color: Theme.Colors.sysTrayColor3 MenuView { id: menuView anchors.fill: parent diff --git a/other/quickshell/theme/Colors.qml b/other/quickshell/theme/Colors.qml index f942b4c..5021268 100644 --- a/other/quickshell/theme/Colors.qml +++ b/other/quickshell/theme/Colors.qml @@ -3,52 +3,76 @@ pragma Singleton import QtQuick QtObject { - readonly property color text: "#9292B6" - readonly property color background: "#3B253F" - - - - // dont know what they are - readonly property color playersLabel: "white" - readonly property color menuCheckBoxChecked1: "#C5E3EE" - readonly property color menuCheckBoxChecked2: "#90ACAD" - readonly property color menuCheckBoxShapePath: "transparent" - readonly property color menuChildrenRevealerShapePath: "transparent" - readonly property color menuItemColor1: "#824524" - readonly property color menuItemColor2: "white" - readonly property color menuItemColor3: "#bbbbbb" - readonly property color menuRadioButtonColor1: "#C5E3EE" - readonly property color menuRadioButtonColor2: "#90ACAD" - readonly property color menuViewColor: "#824524" - readonly property color sysTrayColor1: "transparent" - readonly property color sysTrayColor2: "#9B5B36" - readonly property color barColor1: "transparent" - readonly property color barColor2: "#3B253F" - readonly property color barColor3: "#BE850E" - readonly property color barColor4: "#3B253F" - readonly property color barColor5: "#BE850E" - readonly property color powerColor1: "black" - readonly property color powerColor2: "red" - readonly property color powerColor3: "#EEA939" - readonly property color powerColor4: "#EEA939" - readonly property color timeColor1: "white" - readonly property color tooltipColor1: "transparent" - readonly property color tooltipColor2: "#3B253F" - readonly property color tooltipBackupColor1: "transparent" - readonly property color tooltipBackupColor2: "#10ff0000" - readonly property color tooltipBackupColor3: "#10ff0000" - readonly property color tooltipBackupColor4: "red" - readonly property color volumeColor1: "#9B5B36" - readonly property color volumeColor2: "#824524" - readonly property color volumeColor3: "#8D804B" - readonly property color volumeColor4: "#8D804B" - readonly property color workspacesColor1: "#C0DB4C" - readonly property color workspacesColor2: "#59622D" - readonly property color ropeColor1: "#DAC99B" - readonly property color ropeColor2: "transparent" - readonly property color displayColor1: "#9292B6" - readonly property color displayColor2: "#9292B6" - readonly property color notifsOverlayColor1: "transparent" - readonly property color screenshotOverlayColor1: "#44000000" - readonly property color screenshotOverlayColor2: "#824524" + // General colors + readonly property color text: "#FBF1C7" + readonly property color background: "#1d2021" + readonly property color lighterBackground: "#504945" + readonly property color border: "#BE850E" + readonly property color white: "white" + readonly property color transparent: "transparent" + readonly property color black: "#1D2021" + readonly property color red: "#CC241D" + readonly property color accentYellow: "#D79921" + readonly property color fgaccentBeige: "#EBDBB2" + readonly property color accentGreen: "#B8BB26" + readonly property color woodBrown: "#824524" + // each variables is only used once in the qml config + + // mpris player + readonly property color playersLabel: white // original color: "white" + readonly property color playerPopupColor1: transparent // original color: "transparent" + readonly property color playerPopupColor2: woodBrown // Mpris player background original color: "#824524" + readonly property color playerPopupColor3: woodBrown // Mpris icon color original color: "#824524" + readonly property color playerPopupColor4: text // Mpris controller text (ex: librewolf/vlc) original color: "#white" + readonly property color playerPopupColor5: transparent // original color: "#transparent" + readonly property color playerPopupColor6: text // Mpris title text original color: "#white" + readonly property color playerPopupColor7: text // Mpris album text original color: "#white" + readonly property color playerPopupColor8: text // Mpris album text original color: "#white" + readonly property color playerPopupColor9: text // Mpris curent time video/sound text original color: "#white" + readonly property color playerPopupColor10: woodBrown // Mpris slider background original color: "#824524" + readonly property color playerPopupColor11: accentGreen // Mpris slider line original color: "#8D804B" + readonly property color playerPopupColor12: accentGreen // Mpris slider head original color: "#8D804B" + readonly property color playerPopupColor13: text // Mpris lenght of video/sound text original color: "white" + readonly property color menuCheckBoxChecked1: "#C5E3EE" // original color: "#C5E3EE" + readonly property color menuCheckBoxChecked2: "#90ACAD" // original color: "#90ACAD" + readonly property color menuCheckBoxShapePath: transparent // original color: "transparent" + readonly property color menuChildrenRevealerShapePath: transparent // original color: "transparent" + readonly property color menuItemColor1: lighterBackground // original color: "#824524" + readonly property color menuItemColor2: white // original color: "white" + readonly property color menuItemColor3: "#bbbbbb" // original color: "#bbbbbb" + readonly property color menuRadioButtonColor1: "#C5E3EE" // original color: "#C5E3EE" + readonly property color menuRadioButtonColor2: "#90ACAD" // original color: "#90ACAD" + readonly property color menuViewColor: "#824524" // original color: "#824524" + readonly property color sysTrayColor1: transparent // original color: "transparent" + readonly property color sysTrayColor2: white // original color: "transparent" + readonly property color sysTrayColor3: lighterBackground // systray dropdown color original color: "#9B5B36" + readonly property color barColor1: transparent // original color: "transparent" + readonly property color barColor2: background // Left block bar background original color: "#3B253F" + readonly property color barColor3: border // Left block bar border original color: "#BE850E" + readonly property color barColor4: background // Right block bar background original color: "#3B253F" + readonly property color barColor5: border // Right block bar border original color: "#BE850E" + readonly property color powerColor1: black // Battery indicator empty color original color: "black" + readonly property color powerColor2: red // original color: "red" + readonly property color powerColor3: accentYellow // Battery indicator normal color original color: "#EEA939" + readonly property color powerColor4: accentYellow // Battery indicator normal color original color: "#EEA939" + readonly property color timeColor1: white // original color: "white" + readonly property color tooltipColor1: transparent// original color: "transparent" + readonly property color tooltipColor2: "#3B253F" // original color: "#3B253F" + readonly property color tooltipBackupColor1: transparent // original color: "transparent" + readonly property color tooltipBackupColor2: "#10ff0000" // original color: "#10ff0000" + readonly property color tooltipBackupColor3: "#10ff0000" // original color: "#10ff0000" + readonly property color tooltipBackupColor4: red // original color: "red" + readonly property color volumeColor1: "#9B5B36" // original color: "#9B5B36" + readonly property color volumeColor2: woodBrown // original color: "#824524" + readonly property color volumeColor3: accentGreen // Volume slider bar unmuted original color: "#8D804B" + readonly property color volumeColor4: accentGreen // Volume slider head unmuted and muted original color: "#8D804B" + readonly property color workspacesColor1: "#C0DB4C" // original color: "#C0DB4C" + readonly property color workspacesColor2: "#59622D" // original color: "#59622D" + readonly property color ropeColor1: fgaccentBeige // Rope color original color: "#DAC99B" + readonly property color ropeColor2: transparent // original color: "transparent" + readonly property color displayColor1: text // Notification's title color original color: "#9292B6" + readonly property color displayColor2: text // Notification's body color original color: "#9292B6" + readonly property color notifsOverlayColor1: transparent // original color: "transparent" + readonly property color screenshotOverlayColor1: "#44000000" // original color: "#44000000" + readonly property color screenshotOverlayColor2: woodBrown // original color: "#824524" }