summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/background/Border.qml3
-rw-r--r--modules/bar/Panel.qml27
-rw-r--r--modules/bar/Pills.qml2
-rw-r--r--modules/bar/components/ActiveWindow.qml2
-rw-r--r--modules/bar/components/Clock.qml2
-rw-r--r--modules/bar/components/OsIcon.qml3
-rw-r--r--modules/bar/components/Power.qml3
-rw-r--r--modules/bar/components/StatusIcons.qml2
-rw-r--r--modules/bar/components/Tray.qml3
-rw-r--r--modules/bar/components/workspaces/ActiveIndicator.qml2
-rw-r--r--modules/bar/components/workspaces/OccupiedBg.qml3
-rw-r--r--modules/bar/components/workspaces/Workspace.qml4
-rw-r--r--modules/bar/components/workspaces/Workspaces.qml2
-rw-r--r--modules/launcher/ActionItem.qml4
-rw-r--r--modules/launcher/AppItem.qml3
-rw-r--r--modules/launcher/AppList.qml2
-rw-r--r--modules/launcher/Background.qml5
-rw-r--r--modules/launcher/Content.qml5
-rw-r--r--modules/launcher/ContentList.qml4
-rw-r--r--modules/launcher/WallpaperItem.qml2
-rw-r--r--modules/osd/Background.qml5
21 files changed, 48 insertions, 40 deletions
diff --git a/modules/background/Border.qml b/modules/background/Border.qml
index a11c565..e944299 100644
--- a/modules/background/Border.qml
+++ b/modules/background/Border.qml
@@ -1,4 +1,5 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
import Quickshell
import QtQuick
@@ -33,7 +34,7 @@ Scope {
id: rect
anchors.fill: parent
- color: Appearance.alpha(Appearance.colours.m3surface, false)
+ color: Colours.alpha(Colours.palette.m3surface, false)
visible: false
}
diff --git a/modules/bar/Panel.qml b/modules/bar/Panel.qml
index 741fa13..9dd5797 100644
--- a/modules/bar/Panel.qml
+++ b/modules/bar/Panel.qml
@@ -1,4 +1,5 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
import "components"
import "components/workspaces"
@@ -16,7 +17,7 @@ StyledRect {
}
vertical: BarConfig.vertical
- color: Appearance.alpha(Appearance.colours.m3surface, false)
+ color: Colours.alpha(Colours.palette.m3surface, false)
anchors.fill: parent
BoxLayout {
@@ -28,10 +29,10 @@ StyledRect {
spacing: 0
Module {
- color: Appearance.colours.mauve
+ color: Colours.palette.mauve
OsIcon {
- color: Appearance.on(Appearance.colours.mauve)
+ color: Colours.on(Colours.palette.mauve)
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
@@ -39,10 +40,10 @@ StyledRect {
}
Module {
- color: Appearance.colours.pink
+ color: Colours.palette.pink
ActiveWindow {
- colour: Appearance.on(Appearance.colours.pink)
+ colour: Colours.on(Colours.palette.pink)
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
@@ -76,10 +77,10 @@ StyledRect {
}
Module {
- color: Appearance.colours.green
+ color: Colours.palette.green
Clock {
- colour: Appearance.on(Appearance.colours.green)
+ colour: Colours.on(Colours.palette.green)
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
@@ -87,10 +88,10 @@ StyledRect {
}
Module {
- color: Appearance.colours.yellow
+ color: Colours.palette.yellow
Tray {
- colour: Appearance.on(Appearance.colours.yellow)
+ colour: Colours.on(Colours.palette.yellow)
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
@@ -98,10 +99,10 @@ StyledRect {
}
Module {
- color: Appearance.colours.peach
+ color: Colours.palette.peach
StatusIcons {
- colour: Appearance.on(Appearance.colours.peach)
+ colour: Colours.on(Colours.palette.peach)
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
@@ -109,7 +110,7 @@ StyledRect {
}
Module {
- color: Appearance.colours.m3error
+ color: Colours.palette.m3error
Layout.maximumWidth: BarConfig.sizes.height
Layout.maximumHeight: BarConfig.sizes.height
@@ -118,7 +119,7 @@ StyledRect {
x: (BarConfig.sizes.height - width) / 2
y: (BarConfig.sizes.height - height) / 2
- color: Appearance.colours.m3onError
+ color: Colours.palette.m3onError
anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter)
anchors.verticalCenter: root.get(parent.verticalCenter, undefined)
diff --git a/modules/bar/Pills.qml b/modules/bar/Pills.qml
index bb9d08f..7af9d6d 100644
--- a/modules/bar/Pills.qml
+++ b/modules/bar/Pills.qml
@@ -125,7 +125,7 @@ BoxLayout {
}
component Pill: PaddedRect {
- color: Appearance.alpha(Appearance.colours.m3surface, false)
+ color: Colours.alpha(Colours.palette.m3surface, false)
radius: Appearance.rounding.full
padding: BarConfig.vertical ? [Appearance.padding.large, 0] : [0, Appearance.padding.large]
diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml
index de568dd..eeea3ac 100644
--- a/modules/bar/components/ActiveWindow.qml
+++ b/modules/bar/components/ActiveWindow.qml
@@ -9,7 +9,7 @@ import QtQuick
StyledRect {
id: root
- property color colour: Appearance.colours.pink
+ property color colour: Colours.palette.pink
animate: true
clip: true
diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml
index f3e3701..3397222 100644
--- a/modules/bar/components/Clock.qml
+++ b/modules/bar/components/Clock.qml
@@ -6,7 +6,7 @@ import QtQuick
StyledRect {
id: root
- property color colour: Appearance.colours.peach
+ property color colour: Colours.palette.peach
MaterialIcon {
id: icon
diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml
index 0daa945..ce7d51b 100644
--- a/modules/bar/components/OsIcon.qml
+++ b/modules/bar/components/OsIcon.qml
@@ -1,4 +1,5 @@
import "root:/widgets"
+import "root:/services"
import "root:/utils"
import "root:/config"
@@ -6,5 +7,5 @@ StyledText {
text: Icons.osIcon
font.pointSize: Appearance.font.size.smaller
font.family: Appearance.font.family.mono
- color: Appearance.colours.yellow
+ color: Colours.palette.yellow
}
diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml
index 1124a55..7584747 100644
--- a/modules/bar/components/Power.qml
+++ b/modules/bar/components/Power.qml
@@ -1,9 +1,10 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
MaterialIcon {
text: "power_settings_new"
- color: Appearance.colours.m3error
+ color: Colours.palette.m3error
font.bold: true
font.pointSize: Appearance.font.size.normal
}
diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index 2721cc9..cb5dc58 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -8,7 +8,7 @@ import QtQuick
StyledRect {
id: root
- property color colour: Appearance.colours.rosewater
+ property color colour: Colours.palette.rosewater
animate: true
clip: true
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 98a7dfe..a635b76 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -1,4 +1,5 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
import Quickshell.Services.SystemTray
import QtQuick
@@ -6,7 +7,7 @@ import QtQuick
StyledRect {
id: root
- property color colour: Appearance.colours.lavender
+ property color colour: Colours.palette.lavender
animate: true
clip: true
diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index 2d43f19..a9d3e60 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -33,7 +33,7 @@ Rectangle {
visible: false
anchors.fill: parent
- color: Appearance.on(root.color)
+ color: Colours.on(root.color)
Behavior on color {
ColorAnimation {
diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml
index ccbc75f..ae9c333 100644
--- a/modules/bar/components/workspaces/OccupiedBg.qml
+++ b/modules/bar/components/workspaces/OccupiedBg.qml
@@ -1,6 +1,7 @@
pragma ComponentBehavior: Bound
import "root:/widgets"
+import "root:/services"
import "root:/config"
import Quickshell
import QtQuick
@@ -51,7 +52,7 @@ Item {
readonly property Workspace start: root.workspaces[modelData.start - 1 - root.groupOffset] ?? null
readonly property Workspace end: root.workspaces[modelData.end - 1 - root.groupOffset] ?? null
- color: Appearance.alpha(Appearance.colours.m3surfaceContainerHigh, true)
+ color: Colours.alpha(Colours.palette.m3surfaceContainerHigh, true)
radius: BarConfig.workspaces.rounded ? Appearance.rounding.full : 0
x: start?.x ?? 0
diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml
index 9edc8e4..7f4bc68 100644
--- a/modules/bar/components/workspaces/Workspace.qml
+++ b/modules/bar/components/workspaces/Workspace.qml
@@ -34,7 +34,7 @@ Item {
animate: true
text: Hyprland.activeWsId === root.ws ? activeLabel : root.isOccupied ? occupiedLabel : label
- color: BarConfig.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Appearance.colours.m3onSurface : Appearance.colours.m3outlineVariant
+ color: BarConfig.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Colours.palette.m3onSurface : Colours.palette.m3outlineVariant
horizontalAlignment: StyledText.AlignHCenter
verticalAlignment: StyledText.AlignVCenter
@@ -63,7 +63,7 @@ Item {
required property Hyprland.Client modelData
text: Icons.getAppCategoryIcon(modelData.wmClass, "terminal")
- color: Appearance.colours.m3onSurfaceVariant
+ color: Colours.palette.m3onSurfaceVariant
}
}
}
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index b2def7e..738f679 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -9,7 +9,7 @@ Item {
id: root
property alias vertical: layout.vertical
- property color colour: Appearance.colours.mauve
+ property color colour: Colours.palette.mauve
readonly property list<Workspace> workspaces: layout.children.filter(c => c.isWorkspace).sort((w1, w2) => w1.ws - w2.ws)
readonly property var occupied: Hyprland.workspaces.values.reduce((acc, curr) => {
diff --git a/modules/launcher/ActionItem.qml b/modules/launcher/ActionItem.qml
index f23cf0a..f4f7e2f 100644
--- a/modules/launcher/ActionItem.qml
+++ b/modules/launcher/ActionItem.qml
@@ -1,6 +1,6 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
-import Quickshell
import QtQuick
PaddedRect {
@@ -50,7 +50,7 @@ PaddedRect {
StyledText {
text: root.modelData.desc
font.pointSize: Appearance.font.size.small
- color: Appearance.alpha(Appearance.colours.m3outline, true)
+ color: Colours.alpha(Colours.palette.m3outline, true)
elide: Text.ElideRight
width: root.width - icon.width - Appearance.rounding.normal * 2
diff --git a/modules/launcher/AppItem.qml b/modules/launcher/AppItem.qml
index ea67682..dd0682f 100644
--- a/modules/launcher/AppItem.qml
+++ b/modules/launcher/AppItem.qml
@@ -1,4 +1,5 @@
import "root:/widgets"
+import "root:/services"
import "root:/config"
import Quickshell
import Quickshell.Widgets
@@ -52,7 +53,7 @@ PaddedRect {
StyledText {
text: root.modelData.comment || root.modelData.genericName || root.modelData.name
font.pointSize: Appearance.font.size.small
- color: Appearance.alpha(Appearance.colours.m3outline, true)
+ color: Colours.alpha(Colours.palette.m3outline, true)
elide: Text.ElideRight
width: root.width - icon.width - Appearance.rounding.normal * 2
diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index 5dfdf8b..dc58402 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -39,7 +39,7 @@ ListView {
highlight: StyledRect {
radius: Appearance.rounding.normal
- color: Appearance.alpha(Appearance.colours.m3surfaceContainerHigh, true)
+ color: Colours.alpha(Colours.palette.m3surfaceContainerHigh, true)
}
delegate: isAction ? actionItem : appItem
diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml
index 7bffd26..7dce14a 100644
--- a/modules/launcher/Background.qml
+++ b/modules/launcher/Background.qml
@@ -1,3 +1,4 @@
+import "root:/services"
import "root:/config"
import QtQuick
import QtQuick.Shapes
@@ -12,11 +13,11 @@ Shape {
readonly property real wrapperHeight: realWrapperHeight - 1 // Pixel issues :sob:
preferredRendererType: Shape.CurveRenderer
- opacity: Appearance.transparency.enabled ? Appearance.transparency.base : 1
+ opacity: Colours.transparency.enabled ? Colours.transparency.base : 1
ShapePath {
strokeWidth: -1
- fillColor: Appearance.colours.m3surface
+ fillColor: Colours.palette.m3surface
startY: root.wrapperHeight
diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml
index 41904f7..6ecced5 100644
--- a/modules/launcher/Content.qml
+++ b/modules/launcher/Content.qml
@@ -5,7 +5,6 @@ import "root:/services"
import "root:/config"
import Quickshell
import QtQuick
-import QtQuick.Controls
Item {
id: root
@@ -24,7 +23,7 @@ Item {
StyledRect {
id: listWrapper
- color: Appearance.alpha(Appearance.colours.m3surfaceContainer, true)
+ color: Colours.alpha(Colours.palette.m3surfaceContainer, true)
radius: root.rounding
implicitWidth: list.width + root.padding * 2
@@ -61,7 +60,7 @@ Item {
placeholderText: qsTr(`Type "${LauncherConfig.actionPrefix}" for commands`)
background: StyledRect {
- color: Appearance.alpha(Appearance.colours.m3surfaceContainer, true)
+ color: Colours.alpha(Colours.palette.m3surfaceContainer, true)
radius: root.rounding
}
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 253bcf0..5f8c783 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -139,7 +139,7 @@ Item {
id: icon
text: "manage_search"
- color: Appearance.colours.m3onSurfaceVariant
+ color: Colours.palette.m3onSurfaceVariant
font.pointSize: Appearance.font.size.extraLarge
anchors.verticalCenter: parent.verticalCenter
@@ -153,7 +153,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
text: qsTr("No results")
- color: Appearance.colours.m3onSurfaceVariant
+ color: Colours.palette.m3onSurfaceVariant
font.pointSize: Appearance.font.size.larger
font.weight: 500
}
diff --git a/modules/launcher/WallpaperItem.qml b/modules/launcher/WallpaperItem.qml
index c0b91d4..22f8eda 100644
--- a/modules/launcher/WallpaperItem.qml
+++ b/modules/launcher/WallpaperItem.qml
@@ -60,7 +60,7 @@ StyledRect {
opacity: root.PathView.isCurrentItem ? 0.7 : 0
anchors.fill: mask
radius: mask.radius
- color: Appearance.colours.m3shadow
+ color: Colours.palette.m3shadow
blur: 10
spread: 3
diff --git a/modules/osd/Background.qml b/modules/osd/Background.qml
index d8a35b0..a24e3fb 100644
--- a/modules/osd/Background.qml
+++ b/modules/osd/Background.qml
@@ -1,3 +1,4 @@
+import "root:/services"
import "root:/config"
import QtQuick
import QtQuick.Shapes
@@ -12,11 +13,11 @@ Shape {
readonly property real wrapperWidth: realWrapperWidth - 1 // Pixel issues :sob:
preferredRendererType: Shape.CurveRenderer
- opacity: Appearance.transparency.enabled ? Appearance.transparency.base : 1
+ opacity: Colours.transparency.enabled ? Colours.transparency.base : 1
ShapePath {
strokeWidth: -1
- fillColor: Appearance.colours.m3surface
+ fillColor: Colours.palette.m3surface
startX: root.wrapperWidth
generated by cgit v1.2.3-freya (git 2.51.1) at 2026-01-20 15:04:47 +0000