From 3a37d77d1fbb544c9c46846b9a718ae048e6444f Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:18:56 +1000 Subject: [PATCH] feat: replace qml config module with c++ module --- components/Anim.qml | 6 +- components/CAnim.qml | 6 +- components/ConnectionHeader.qml | 8 +- components/ConnectionInfoSection.qml | 18 +- components/MaterialIcon.qml | 6 +- components/PropertyRow.qml | 8 +- components/SectionContainer.qml | 10 +- components/SectionHeader.qml | 6 +- components/StateLayer.qml | 6 +- components/StyledText.qml | 12 +- components/containers/StyledWindow.qml | 11 + components/controls/CircularIndicator.qml | 12 +- components/controls/CircularProgress.qml | 14 +- components/controls/CollapsibleSection.qml | 48 +- components/controls/CustomSpinBox.qml | 20 +- components/controls/FilledSlider.qml | 20 +- components/controls/IconButton.qml | 6 +- components/controls/IconTextButton.qml | 10 +- components/controls/Menu.qml | 18 +- components/controls/SpinBoxRow.qml | 10 +- components/controls/SplitButton.qml | 26 +- components/controls/SplitButtonRow.qml | 10 +- components/controls/StyledInputField.qml | 8 +- components/controls/StyledRadioButton.qml | 12 +- components/controls/StyledScrollBar.qml | 6 +- components/controls/StyledSlider.qml | 8 +- components/controls/StyledSwitch.qml | 22 +- components/controls/StyledTextField.qml | 10 +- components/controls/SwitchRow.qml | 10 +- components/controls/TextButton.qml | 8 +- components/controls/ToggleButton.qml | 22 +- components/controls/ToggleRow.qml | 4 +- components/controls/Tooltip.qml | 22 +- components/effects/InnerBorder.qml | 6 +- components/filedialog/CurrentItem.qml | 12 +- components/filedialog/DialogButtons.qml | 30 +- components/filedialog/FolderContents.qml | 40 +- components/filedialog/HeaderBar.qml | 32 +- components/filedialog/Sidebar.qml | 30 +- components/widgets/ExtraIndicator.qml | 16 +- config/Appearance.qml | 14 - config/AppearanceConfig.qml | 94 ---- config/BackgroundConfig.qml | 37 -- config/BarConfig.qml | 129 ----- config/BorderConfig.qml | 10 - config/Config.qml | 500 ------------------ config/ControlCenterConfig.qml | 10 - config/DashboardConfig.qml | 40 -- config/GeneralConfig.qml | 61 --- config/LauncherConfig.qml | 147 ----- config/LockConfig.qml | 15 - config/NotifsConfig.qml | 19 - config/OsdConfig.qml | 14 - config/ServiceConfig.qml | 24 - config/SessionConfig.qml | 29 - config/SidebarConfig.qml | 11 - config/UserPaths.qml | 11 - config/UtilitiesConfig.qml | 67 --- config/WInfoConfig.qml | 10 - modules/BatteryMonitor.qml | 2 +- modules/IdleMonitors.qml | 2 +- modules/areapicker/Picker.qml | 10 +- modules/background/Background.qml | 10 +- modules/background/DesktopClock.qml | 42 +- modules/background/Visualiser.qml | 10 +- modules/background/Wallpaper.qml | 18 +- modules/bar/Bar.qml | 6 +- modules/bar/BarWrapper.qml | 10 +- modules/bar/components/ActiveWindow.qml | 12 +- modules/bar/components/Clock.qml | 16 +- modules/bar/components/OsIcon.qml | 12 +- modules/bar/components/Power.qml | 10 +- modules/bar/components/Settings.qml | 10 +- modules/bar/components/SettingsIcon.qml | 10 +- modules/bar/components/StatusIcons.qml | 22 +- modules/bar/components/Tray.qml | 24 +- modules/bar/components/TrayItem.qml | 6 +- .../components/workspaces/ActiveIndicator.qml | 10 +- .../bar/components/workspaces/OccupiedBg.qml | 8 +- .../workspaces/SpecialWorkspaces.qml | 38 +- .../bar/components/workspaces/Workspace.qml | 10 +- .../bar/components/workspaces/Workspaces.qml | 14 +- modules/bar/popouts/ActiveWindow.qml | 20 +- modules/bar/popouts/Audio.qml | 20 +- modules/bar/popouts/Battery.qml | 38 +- modules/bar/popouts/Bluetooth.qml | 36 +- modules/bar/popouts/ClipWrapper.qml | 6 +- modules/bar/popouts/Content.qml | 10 +- modules/bar/popouts/LockStatus.qml | 4 +- modules/bar/popouts/Network.qml | 66 +-- modules/bar/popouts/TrayMenu.qml | 28 +- modules/bar/popouts/WirelessPassword.qml | 56 +- modules/bar/popouts/Wrapper.qml | 10 +- modules/bar/popouts/kblayout/KbLayout.qml | 32 +- .../bar/popouts/kblayout/KbLayoutModel.qml | 2 +- modules/controlcenter/ControlCenter.qml | 4 +- modules/controlcenter/NavRail.qml | 58 +- modules/controlcenter/Panes.qml | 6 +- modules/controlcenter/WindowTitle.qml | 12 +- .../appearance/AppearancePane.qml | 14 +- .../appearance/sections/AnimationsSection.qml | 4 +- .../appearance/sections/BackgroundSection.qml | 32 +- .../appearance/sections/BorderSection.qml | 6 +- .../sections/ColorSchemeSection.qml | 24 +- .../sections/ColorVariantSection.qml | 16 +- .../appearance/sections/FontsSection.qml | 46 +- .../appearance/sections/ScalesSection.qml | 8 +- .../appearance/sections/ThemeModeSection.qml | 2 +- .../sections/TransparencySection.qml | 6 +- modules/controlcenter/audio/AudioPane.qml | 96 ++-- modules/controlcenter/bluetooth/BtPane.qml | 2 +- modules/controlcenter/bluetooth/Details.qml | 142 ++--- .../controlcenter/bluetooth/DeviceList.qml | 56 +- modules/controlcenter/bluetooth/Settings.qml | 126 ++--- .../components/ConnectedButtonGroup.qml | 28 +- .../components/DeviceDetails.qml | 4 +- .../controlcenter/components/DeviceList.qml | 10 +- .../components/PaneTransition.qml | 18 +- .../components/ReadonlySlider.qml | 16 +- .../components/SettingsHeader.qml | 8 +- .../controlcenter/components/SliderInput.qml | 12 +- .../components/SplitPaneLayout.qml | 22 +- .../components/SplitPaneWithDetails.qml | 2 +- .../components/WallpaperGrid.qml | 24 +- .../controlcenter/dashboard/DashboardPane.qml | 20 +- .../dashboard/GeneralSection.qml | 6 +- .../dashboard/PerformanceSection.qml | 4 +- .../controlcenter/launcher/LauncherPane.qml | 84 +-- modules/controlcenter/launcher/Settings.qml | 24 +- .../controlcenter/network/EthernetDetails.qml | 10 +- .../controlcenter/network/EthernetList.qml | 34 +- .../controlcenter/network/EthernetPane.qml | 2 +- .../network/EthernetSettings.qml | 22 +- .../controlcenter/network/NetworkSettings.qml | 28 +- .../controlcenter/network/NetworkingPane.qml | 26 +- modules/controlcenter/network/VpnDetails.qml | 82 +-- modules/controlcenter/network/VpnList.qml | 128 ++--- modules/controlcenter/network/VpnSettings.qml | 28 +- .../controlcenter/network/WirelessDetails.qml | 14 +- .../controlcenter/network/WirelessList.qml | 48 +- .../controlcenter/network/WirelessPane.qml | 2 +- .../network/WirelessPasswordDialog.qml | 50 +- .../network/WirelessSettings.qml | 10 +- .../notifications/NotificationsPane.qml | 28 +- modules/controlcenter/taskbar/TaskbarPane.qml | 96 ++-- modules/dashboard/Content.qml | 18 +- modules/dashboard/Dash.qml | 18 +- modules/dashboard/LyricMenu.qml | 66 +-- modules/dashboard/LyricsView.qml | 12 +- modules/dashboard/Media.qml | 84 +-- modules/dashboard/Performance.qml | 142 ++--- modules/dashboard/Tabs.qml | 18 +- modules/dashboard/WeatherTab.qml | 72 +-- modules/dashboard/Wrapper.qml | 6 +- modules/dashboard/dash/Calendar.qml | 48 +- modules/dashboard/dash/DateTime.qml | 18 +- modules/dashboard/dash/Media.qml | 52 +- modules/dashboard/dash/Resources.qml | 16 +- modules/dashboard/dash/SmallWeather.qml | 12 +- modules/dashboard/dash/User.qml | 34 +- modules/drawers/ContentWindow.qml | 18 +- modules/drawers/Drawers.qml | 2 +- modules/drawers/Interactions.qml | 2 +- modules/drawers/Panels.qml | 4 +- modules/drawers/Regions.qml | 2 +- modules/launcher/AppList.qml | 28 +- modules/launcher/Content.qml | 20 +- modules/launcher/ContentList.qml | 24 +- modules/launcher/WallpaperList.qml | 4 +- modules/launcher/Wrapper.qml | 8 +- modules/launcher/items/ActionItem.qml | 20 +- modules/launcher/items/AppItem.qml | 18 +- modules/launcher/items/CalcItem.qml | 26 +- modules/launcher/items/SchemeItem.qml | 24 +- modules/launcher/items/VariantItem.qml | 22 +- modules/launcher/items/WallpaperItem.qml | 20 +- modules/launcher/services/Actions.qml | 2 +- modules/launcher/services/Apps.qml | 2 +- modules/launcher/services/M3Variants.qml | 2 +- modules/launcher/services/Schemes.qml | 2 +- modules/lock/Center.qml | 62 +-- modules/lock/Content.qml | 26 +- modules/lock/Fetch.qml | 38 +- modules/lock/InputField.qml | 16 +- modules/lock/LockSurface.qml | 54 +- modules/lock/Media.qml | 44 +- modules/lock/NotifDock.qml | 32 +- modules/lock/NotifGroup.qml | 46 +- modules/lock/Pam.qml | 2 +- modules/lock/Resources.qml | 24 +- modules/lock/WeatherInfo.qml | 44 +- modules/notifications/Content.qml | 28 +- modules/notifications/Notification.qml | 86 +-- modules/osd/Content.qml | 10 +- modules/osd/Wrapper.qml | 6 +- modules/session/Content.qml | 12 +- modules/session/Wrapper.qml | 6 +- modules/sidebar/Content.qml | 8 +- modules/sidebar/Notif.qml | 30 +- modules/sidebar/NotifActionList.qml | 20 +- modules/sidebar/NotifDock.qml | 42 +- modules/sidebar/NotifDockList.qml | 22 +- modules/sidebar/NotifGroup.qml | 56 +- modules/sidebar/NotifGroupList.qml | 14 +- modules/sidebar/Wrapper.qml | 10 +- modules/utilities/Content.qml | 4 +- modules/utilities/RecordingDeleteModal.qml | 32 +- modules/utilities/Wrapper.qml | 16 +- modules/utilities/cards/IdleInhibit.qml | 44 +- modules/utilities/cards/Record.qml | 60 +-- modules/utilities/cards/RecordingList.qml | 28 +- modules/utilities/cards/Toggles.qml | 26 +- modules/utilities/toasts/ToastItem.qml | 22 +- modules/utilities/toasts/Toasts.qml | 14 +- modules/windowinfo/Buttons.qml | 46 +- modules/windowinfo/Details.qml | 30 +- modules/windowinfo/Preview.qml | 18 +- modules/windowinfo/WindowInfo.qml | 12 +- services/Audio.qml | 2 +- services/Brightness.qml | 2 +- services/Colours.qml | 8 +- services/GameMode.qml | 2 +- services/Hypr.qml | 2 +- services/LyricsService.qml | 2 +- services/NetworkUsage.qml | 2 +- services/NotifData.qml | 2 +- services/Notifs.qml | 2 +- services/Players.qml | 2 +- services/Screens.qml | 2 +- services/SystemUsage.qml | 2 +- services/Time.qml | 2 +- services/VPN.qml | 2 +- services/Wallpapers.qml | 2 +- services/Weather.qml | 2 +- utils/Icons.qml | 2 +- utils/Paths.qml | 2 +- utils/SysInfo.qml | 2 +- 237 files changed, 2395 insertions(+), 3626 deletions(-) delete mode 100644 config/Appearance.qml delete mode 100644 config/AppearanceConfig.qml delete mode 100644 config/BackgroundConfig.qml delete mode 100644 config/BarConfig.qml delete mode 100644 config/BorderConfig.qml delete mode 100644 config/Config.qml delete mode 100644 config/ControlCenterConfig.qml delete mode 100644 config/DashboardConfig.qml delete mode 100644 config/GeneralConfig.qml delete mode 100644 config/LauncherConfig.qml delete mode 100644 config/LockConfig.qml delete mode 100644 config/NotifsConfig.qml delete mode 100644 config/OsdConfig.qml delete mode 100644 config/ServiceConfig.qml delete mode 100644 config/SessionConfig.qml delete mode 100644 config/SidebarConfig.qml delete mode 100644 config/UserPaths.qml delete mode 100644 config/UtilitiesConfig.qml delete mode 100644 config/WInfoConfig.qml diff --git a/components/Anim.qml b/components/Anim.qml index 505243a7..bf8eefb1 100644 --- a/components/Anim.qml +++ b/components/Anim.qml @@ -1,8 +1,8 @@ import QtQuick -import qs.config +import Caelestia.Config NumberAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } diff --git a/components/CAnim.qml b/components/CAnim.qml index f2f4e40f..3b7b7b2f 100644 --- a/components/CAnim.qml +++ b/components/CAnim.qml @@ -1,8 +1,8 @@ import QtQuick -import qs.config +import Caelestia.Config ColorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } diff --git a/components/ConnectionHeader.qml b/components/ConnectionHeader.qml index cdba17bc..36886803 100644 --- a/components/ConnectionHeader.qml +++ b/components/ConnectionHeader.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts import qs.components -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -9,14 +9,14 @@ ColumnLayout { required property string icon required property string title - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Layout.alignment: Qt.AlignHCenter MaterialIcon { Layout.alignment: Qt.AlignHCenter animate: true text: root.icon - font.pointSize: Appearance.font.size.extraLarge * 3 + font.pointSize: Tokens.font.size.extraLarge * 3 font.bold: true } @@ -24,7 +24,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter animate: true text: root.title - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.bold: true } } diff --git a/components/ConnectionInfoSection.qml b/components/ConnectionInfoSection.qml index 9063a6d2..bac3cc7c 100644 --- a/components/ConnectionInfoSection.qml +++ b/components/ConnectionInfoSection.qml @@ -2,14 +2,14 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property var deviceDetails - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { text: qsTr("IP Address") @@ -18,40 +18,40 @@ ColumnLayout { StyledText { text: root.deviceDetails?.ipAddress || qsTr("Not available") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Subnet Mask") } StyledText { text: root.deviceDetails?.subnet || qsTr("Not available") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Gateway") } StyledText { text: root.deviceDetails?.gateway || qsTr("Not available") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("DNS Servers") } StyledText { text: (root.deviceDetails && root.deviceDetails.dns && root.deviceDetails.dns.length > 0) ? root.deviceDetails.dns.join(", ") : qsTr("Not available") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small wrapMode: Text.Wrap Layout.maximumWidth: parent.width } diff --git a/components/MaterialIcon.qml b/components/MaterialIcon.qml index a1d19d3c..e85d39be 100644 --- a/components/MaterialIcon.qml +++ b/components/MaterialIcon.qml @@ -1,12 +1,12 @@ import qs.services -import qs.config +import Caelestia.Config StyledText { property real fill property int grade: Colours.light ? 0 : -25 - font.family: Appearance.font.family.material - font.pointSize: Appearance.font.size.larger + font.family: Tokens.font.family.material + font.pointSize: Tokens.font.size.larger font.variableAxes: ({ FILL: fill.toFixed(1), GRAD: grade, diff --git a/components/PropertyRow.qml b/components/PropertyRow.qml index 67315b9c..7f1a68bd 100644 --- a/components/PropertyRow.qml +++ b/components/PropertyRow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -11,16 +11,16 @@ ColumnLayout { required property string value property bool showTopMargin: false - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { - Layout.topMargin: root.showTopMargin ? Appearance.spacing.normal : 0 + Layout.topMargin: root.showTopMargin ? Tokens.spacing.normal : 0 text: root.label } StyledText { text: root.value color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } diff --git a/components/SectionContainer.qml b/components/SectionContainer.qml index 8b57cdd4..05b4523c 100644 --- a/components/SectionContainer.qml +++ b/components/SectionContainer.qml @@ -2,19 +2,19 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root default property alias content: contentColumn.data - property real contentSpacing: Appearance.spacing.larger + property real contentSpacing: Tokens.spacing.larger property bool alignTop: false Layout.fillWidth: true - implicitHeight: contentColumn.implicitHeight + Appearance.padding.large * 2 + implicitHeight: contentColumn.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh ColumnLayout { @@ -24,7 +24,7 @@ StyledRect { anchors.right: parent.right anchors.top: root.alignTop ? parent.top : undefined anchors.verticalCenter: root.alignTop ? undefined : parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large spacing: root.contentSpacing } diff --git a/components/SectionHeader.qml b/components/SectionHeader.qml index a7724769..107c6d36 100644 --- a/components/SectionHeader.qml +++ b/components/SectionHeader.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -13,9 +13,9 @@ ColumnLayout { spacing: 0 StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: root.title - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } diff --git a/components/StateLayer.qml b/components/StateLayer.qml index f3e3ea13..59c5cb23 100644 --- a/components/StateLayer.qml +++ b/components/StateLayer.qml @@ -1,6 +1,6 @@ import QtQuick import qs.services -import qs.config +import Caelestia.Config MouseArea { id: root @@ -63,7 +63,7 @@ MouseArea { properties: "implicitWidth,implicitHeight" from: 0 to: rippleAnim.radius * 2 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { target: ripple @@ -83,7 +83,7 @@ MouseArea { StyledRect { id: ripple - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.color opacity: 0 diff --git a/components/StyledText.qml b/components/StyledText.qml index 5bf8add3..051f5804 100644 --- a/components/StyledText.qml +++ b/components/StyledText.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.services -import qs.config +import Caelestia.Config Text { id: root @@ -11,13 +11,13 @@ Text { property string animateProp: "scale" property real animateFrom: 0 property real animateTo: 1 - property int animateDuration: Appearance.anim.durations.normal + property int animateDuration: Tokens.anim.durations.normal renderType: Text.NativeRendering textFormat: Text.PlainText color: Colours.palette.m3onSurface - font.family: Appearance.font.family.sans - font.pointSize: Appearance.font.size.smaller + font.family: Tokens.font.family.sans + font.pointSize: Tokens.font.size.smaller Behavior on color { CAnim {} @@ -29,12 +29,12 @@ Text { SequentialAnimation { Anim { to: root.animateFrom - easing.bezierCurve: Appearance.anim.curves.standardAccel + easing.bezierCurve: Tokens.anim.curves.standardAccel } PropertyAction {} Anim { to: root.animateTo - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } } diff --git a/components/containers/StyledWindow.qml b/components/containers/StyledWindow.qml index 0adca1fe..57f319c0 100644 --- a/components/containers/StyledWindow.qml +++ b/components/containers/StyledWindow.qml @@ -1,11 +1,22 @@ import Quickshell import Quickshell.Wayland +import Caelestia.Config // qmllint disable uncreatable-type PanelWindow { // qmllint enable uncreatable-type + id: root + required property string name + default property alias contentData: scope.data WlrLayershell.namespace: `caelestia-${name}` color: "transparent" + + ConfigScope { + id: scope + + anchors.fill: parent + screen: root.screen.name + } } diff --git a/components/controls/CircularIndicator.qml b/components/controls/CircularIndicator.qml index 84476500..8bfee428 100644 --- a/components/controls/CircularIndicator.qml +++ b/components/controls/CircularIndicator.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Templates import Caelestia.Internal import qs.services -import qs.config +import Caelestia.Config BusyIndicator { id: root @@ -19,8 +19,8 @@ BusyIndicator { Completing } - property real implicitSize: Appearance.font.size.normal * 3 - property real strokeWidth: Appearance.padding.small * 0.8 + property real implicitSize: Tokens.font.size.normal * 3 + property real strokeWidth: Tokens.padding.small * 0.8 property color fgColour: Colours.palette.m3primary property color bgColour: Colours.palette.m3secondaryContainer @@ -64,7 +64,7 @@ BusyIndicator { transitions: Transition { Anim { properties: "opacity,internalStrokeWidth" - duration: manager.completeEndDuration * Appearance.anim.durations.scale + duration: manager.completeEndDuration * Tokens.anim.durations.scale } } @@ -90,7 +90,7 @@ BusyIndicator { property: "progress" from: 0 to: 1 - duration: manager.duration * Appearance.anim.durations.scale + duration: manager.duration * Tokens.anim.durations.scale } NumberAnimation { @@ -99,7 +99,7 @@ BusyIndicator { property: "completeEndProgress" from: 0 to: 1 - duration: manager.completeEndDuration * Appearance.anim.durations.scale + duration: manager.completeEndDuration * Tokens.anim.durations.scale onFinished: { if (root.animState === CircularIndicator.Completing) root.animState = CircularIndicator.Stopped; diff --git a/components/controls/CircularProgress.qml b/components/controls/CircularProgress.qml index 8cd585ee..4cd5f9f7 100644 --- a/components/controls/CircularProgress.qml +++ b/components/controls/CircularProgress.qml @@ -2,16 +2,16 @@ import ".." import QtQuick import QtQuick.Shapes import qs.services -import qs.config +import Caelestia.Config Shape { id: root property real value property int startAngle: -90 - property int strokeWidth: Appearance.padding.smaller + property int strokeWidth: Tokens.padding.smaller property int padding: 0 - property int spacing: Appearance.spacing.small + property int spacing: Tokens.spacing.small property color fgColour: Colours.palette.m3primary property color bgColour: Colours.palette.m3secondaryContainer @@ -27,7 +27,7 @@ Shape { fillColor: "transparent" strokeColor: root.bgColour strokeWidth: root.strokeWidth - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { startAngle: root.startAngle + 360 * root.vValue + root.gapAngle @@ -40,7 +40,7 @@ Shape { Behavior on strokeColor { CAnim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -49,7 +49,7 @@ Shape { fillColor: "transparent" strokeColor: root.fgColour strokeWidth: root.strokeWidth - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { startAngle: root.startAngle @@ -62,7 +62,7 @@ Shape { Behavior on strokeColor { CAnim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index 7e164ebb..19c7da9b 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -18,14 +18,14 @@ ColumnLayout { signal toggleRequested - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Layout.fillWidth: true Item { id: sectionHeaderItem Layout.fillWidth: true - Layout.preferredHeight: Math.max(titleRow.implicitHeight + Appearance.padding.normal * 2, 48) + Layout.preferredHeight: Math.max(titleRow.implicitHeight + Tokens.padding.normal * 2, 48) RowLayout { id: titleRow @@ -33,13 +33,13 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.normal - anchors.rightMargin: Appearance.padding.normal - spacing: Appearance.spacing.normal + anchors.leftMargin: Tokens.padding.normal + anchors.rightMargin: Tokens.padding.normal + spacing: Tokens.spacing.normal StyledText { text: root.title - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -51,12 +51,12 @@ ColumnLayout { text: "expand_more" rotation: root.expanded ? 180 : 0 color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal Behavior on rotation { Anim { - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standard + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standard } } } @@ -70,7 +70,7 @@ ColumnLayout { anchors.fill: parent color: Colours.palette.m3onSurface - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal showHoverBackground: false } } @@ -79,12 +79,12 @@ ColumnLayout { id: contentWrapper Layout.fillWidth: true - Layout.preferredHeight: root.expanded ? (contentColumn.implicitHeight + Appearance.spacing.small * 2) : 0 + Layout.preferredHeight: root.expanded ? (contentColumn.implicitHeight + Tokens.spacing.small * 2) : 0 clip: true Behavior on Layout.preferredHeight { Anim { - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } @@ -92,14 +92,14 @@ ColumnLayout { id: backgroundRect anchors.fill: parent - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer) opacity: root.showBackground && root.expanded ? 1.0 : 0.0 visible: root.showBackground Behavior on opacity { Anim { - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } } @@ -109,16 +109,16 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right - y: Appearance.spacing.small - anchors.leftMargin: Appearance.padding.normal - anchors.rightMargin: Appearance.padding.normal - anchors.bottomMargin: Appearance.spacing.small - spacing: Appearance.spacing.small + y: Tokens.spacing.small + anchors.leftMargin: Tokens.padding.normal + anchors.rightMargin: Tokens.padding.normal + anchors.bottomMargin: Tokens.spacing.small + spacing: Tokens.spacing.small opacity: root.expanded ? 1.0 : 0.0 Behavior on opacity { Anim { - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } @@ -126,12 +126,12 @@ ColumnLayout { id: descriptionText Layout.fillWidth: true - Layout.topMargin: root.description !== "" ? Appearance.spacing.smaller : 0 - Layout.bottomMargin: root.description !== "" ? Appearance.spacing.small : 0 + Layout.topMargin: root.description !== "" ? Tokens.spacing.smaller : 0 + Layout.bottomMargin: root.description !== "" ? Tokens.spacing.small : 0 visible: root.description !== "" text: root.description color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small wrapMode: Text.Wrap } } diff --git a/components/controls/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml index f63b1402..6adb137c 100644 --- a/components/controls/CustomSpinBox.qml +++ b/components/controls/CustomSpinBox.qml @@ -4,7 +4,7 @@ import ".." import QtQuick import QtQuick.Layouts import qs.services -import qs.config +import Caelestia.Config RowLayout { id: root @@ -20,7 +20,7 @@ RowLayout { signal valueModified(value: real) - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small onValueChanged: { if (!root.isEditing) { @@ -73,23 +73,23 @@ RowLayout { root.isEditing = false; } - padding: Appearance.padding.small - leftPadding: Appearance.padding.normal - rightPadding: Appearance.padding.normal + padding: Tokens.padding.small + leftPadding: Tokens.padding.normal + rightPadding: Tokens.padding.normal background: StyledRect { implicitWidth: 100 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainerHigh } } StyledRect { - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.palette.m3primary implicitWidth: implicitHeight - implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2 + implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2 StateLayer { id: upState @@ -120,11 +120,11 @@ RowLayout { } StyledRect { - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.palette.m3primary implicitWidth: implicitHeight - implicitHeight: downIcon.implicitHeight + Appearance.padding.small * 2 + implicitHeight: downIcon.implicitHeight + Tokens.padding.small * 2 StateLayer { id: downState diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index c865482c..5a65722f 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -3,7 +3,7 @@ import "../effects" import QtQuick import QtQuick.Templates import qs.services -import qs.config +import Caelestia.Config Slider { id: root @@ -16,7 +16,7 @@ Slider { background: StyledRect { color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full StyledRect { anchors.left: parent.left @@ -51,7 +51,7 @@ Slider { anchors.fill: parent color: Colours.palette.m3inverseSurface - radius: Appearance.rounding.full + radius: Tokens.rounding.full MouseArea { id: handleInteraction @@ -70,8 +70,8 @@ Slider { function update(): void { animate = !moving; binding.when = moving; - font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger; - font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material; + font.pointSize = moving ? Tokens.font.size.small : Tokens.font.size.larger; + font.family = moving ? Tokens.font.family.sans : Tokens.font.family.material; } text: root.icon @@ -96,8 +96,8 @@ Slider { target: icon property: "scale" to: 0 - duration: Appearance.anim.durations.normal / 2 - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.normal / 2 + easing.bezierCurve: Tokens.anim.curves.standardAccel } ScriptAction { script: icon.update() @@ -106,8 +106,8 @@ Slider { target: icon property: "scale" to: 1 - duration: Appearance.anim.durations.normal / 2 - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.normal / 2 + easing.bezierCurve: Tokens.anim.curves.standardDecel } } } @@ -140,7 +140,7 @@ Slider { Behavior on value { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } diff --git a/components/controls/IconButton.qml b/components/controls/IconButton.qml index 56999894..60973094 100644 --- a/components/controls/IconButton.qml +++ b/components/controls/IconButton.qml @@ -1,7 +1,7 @@ import ".." import QtQuick import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -15,7 +15,7 @@ StyledRect { property alias icon: label.text property bool checked property bool toggle - property real padding: type === IconButton.Text ? Appearance.padding.small / 2 : Appearance.padding.smaller + property real padding: type === IconButton.Text ? Tokens.padding.small / 2 : Tokens.padding.smaller property alias font: label.font property int type: IconButton.Filled property bool disabled @@ -44,7 +44,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour implicitWidth: implicitHeight diff --git a/components/controls/IconTextButton.qml b/components/controls/IconTextButton.qml index d213b9be..1fbf74eb 100644 --- a/components/controls/IconTextButton.qml +++ b/components/controls/IconTextButton.qml @@ -2,7 +2,7 @@ import ".." import QtQuick import QtQuick.Layouts import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -17,8 +17,8 @@ StyledRect { property alias text: label.text property bool checked property bool toggle - property real horizontalPadding: Appearance.padding.normal - property real verticalPadding: Appearance.padding.smaller + property real horizontalPadding: Tokens.padding.normal + property real verticalPadding: Tokens.padding.smaller property alias font: label.font property int type: IconTextButton.Filled @@ -36,7 +36,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) color: type === IconTextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour implicitWidth: row.implicitWidth + horizontalPadding * 2 @@ -58,7 +58,7 @@ StyledRect { id: row anchors.centerIn: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { id: iconLabel diff --git a/components/controls/Menu.qml b/components/controls/Menu.qml index 320f318c..6c375767 100644 --- a/components/controls/Menu.qml +++ b/components/controls/Menu.qml @@ -5,7 +5,7 @@ import "../effects" import QtQuick import QtQuick.Layouts import qs.services -import qs.config +import Caelestia.Config Elevation { id: root @@ -16,7 +16,7 @@ Elevation { signal itemSelected(item: MenuItem) - radius: Appearance.rounding.small / 2 + radius: Tokens.rounding.small / 2 level: 2 implicitWidth: Math.max(200, column.implicitWidth) @@ -46,8 +46,8 @@ Elevation { readonly property bool active: modelData === root.active Layout.fillWidth: true - implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.normal * 2 color: Qt.alpha(Colours.palette.m3secondaryContainer, active ? 1 : 0) @@ -67,8 +67,8 @@ Elevation { id: menuOptionRow anchors.fill: parent - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.small MaterialIcon { Layout.alignment: Qt.AlignVCenter @@ -102,14 +102,14 @@ Elevation { Behavior on opacity { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial } } Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/components/controls/SpinBoxRow.qml b/components/controls/SpinBoxRow.qml index b2c6ef1a..c5e5c082 100644 --- a/components/controls/SpinBoxRow.qml +++ b/components/controls/SpinBoxRow.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -16,8 +16,8 @@ StyledRect { property var onValueModified: function (value) {} Layout.fillWidth: true - implicitHeight: row.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: row.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -30,8 +30,8 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml index 0e9aef8f..8759635c 100644 --- a/components/controls/SplitButton.qml +++ b/components/controls/SplitButton.qml @@ -2,7 +2,7 @@ import ".." import QtQuick import QtQuick.Layouts import qs.services -import qs.config +import Caelestia.Config Row { id: root @@ -12,8 +12,8 @@ Row { Tonal } - property real horizontalPadding: Appearance.padding.normal - property real verticalPadding: Appearance.padding.smaller + property real horizontalPadding: Tokens.padding.normal + property real verticalPadding: Tokens.padding.smaller property int type: SplitButton.Filled property bool disabled property bool menuOnTop @@ -33,12 +33,12 @@ Row { property color disabledColour: Qt.alpha(Colours.palette.m3onSurface, 0.1) property color disabledTextColour: Qt.alpha(Colours.palette.m3onSurface, 0.38) - spacing: Math.floor(Appearance.spacing.small / 2) + spacing: Math.floor(Tokens.spacing.small / 2) StyledRect { - radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) - topRightRadius: Appearance.rounding.small / 2 - bottomRightRadius: Appearance.rounding.small / 2 + radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) + topRightRadius: Tokens.rounding.small / 2 + bottomRightRadius: Tokens.rounding.small / 2 color: root.disabled ? root.disabledColour : root.colour implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2 @@ -62,7 +62,7 @@ Row { anchors.centerIn: parent anchors.horizontalCenterOffset: Math.floor(root.verticalPadding / 4) - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { id: iconLabel @@ -86,7 +86,7 @@ Row { Behavior on Layout.preferredWidth { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -96,9 +96,9 @@ Row { StyledRect { id: expandBtn - property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2 + property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.small / 2 - radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) topLeftRadius: rad bottomLeftRadius: rad color: root.disabled ? root.disabledColour : root.colour @@ -157,8 +157,8 @@ Row { anchors.top: parent.bottom anchors.right: parent.right - anchors.topMargin: Appearance.spacing.small - anchors.bottomMargin: Appearance.spacing.small + anchors.topMargin: Tokens.spacing.small + anchors.bottomMargin: Tokens.spacing.small } } } diff --git a/components/controls/SplitButtonRow.qml b/components/controls/SplitButtonRow.qml index a58e46d4..9082ce1d 100644 --- a/components/controls/SplitButtonRow.qml +++ b/components/controls/SplitButtonRow.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -21,8 +21,8 @@ StyledRect { signal selected(item: MenuItem) Layout.fillWidth: true - implicitHeight: row.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: row.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) clip: false @@ -33,8 +33,8 @@ StyledRect { id: row anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/components/controls/StyledInputField.qml b/components/controls/StyledInputField.qml index fb312128..7cbf26c5 100644 --- a/components/controls/StyledInputField.qml +++ b/components/controls/StyledInputField.qml @@ -4,7 +4,7 @@ import ".." import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -22,14 +22,14 @@ Item { signal editingFinished implicitWidth: 70 - implicitHeight: inputField.implicitHeight + Appearance.padding.small * 2 + implicitHeight: inputField.implicitHeight + Tokens.padding.small * 2 StyledRect { id: container anchors.fill: parent color: inputHover.containsMouse || inputField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: inputField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) opacity: root.enabled ? 1 : 0.5 @@ -55,7 +55,7 @@ Item { id: inputField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: root.horizontalAlignment validator: root.validator readOnly: root.readOnly diff --git a/components/controls/StyledRadioButton.qml b/components/controls/StyledRadioButton.qml index 458e6fe0..a2e99327 100644 --- a/components/controls/StyledRadioButton.qml +++ b/components/controls/StyledRadioButton.qml @@ -2,12 +2,12 @@ import QtQuick import QtQuick.Templates import qs.components import qs.services -import qs.config +import Caelestia.Config RadioButton { id: root - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight) @@ -17,7 +17,7 @@ RadioButton { implicitWidth: 20 implicitHeight: 20 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: "transparent" border.color: root.checked ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant border.width: 2 @@ -28,7 +28,7 @@ RadioButton { root.click(); } - anchors.margins: -Appearance.padding.smaller + anchors.margins: -Tokens.padding.smaller color: root.checked ? Colours.palette.m3onSurface : Colours.palette.m3primary z: -1 } @@ -38,7 +38,7 @@ RadioButton { implicitWidth: 8 implicitHeight: 8 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primary, root.checked ? 1 : 0) } @@ -52,6 +52,6 @@ RadioButton { font.pointSize: root.font.pointSize anchors.verticalCenter: parent.verticalCenter anchors.left: outerCircle.right - anchors.leftMargin: Appearance.spacing.smaller + anchors.leftMargin: Tokens.spacing.smaller } } diff --git a/components/controls/StyledScrollBar.qml b/components/controls/StyledScrollBar.qml index 4c30dda3..4cd86a4a 100644 --- a/components/controls/StyledScrollBar.qml +++ b/components/controls/StyledScrollBar.qml @@ -2,7 +2,7 @@ import ".." import QtQuick import QtQuick.Templates import qs.services -import qs.config +import Caelestia.Config ScrollBar { id: root @@ -45,7 +45,7 @@ ScrollBar { } } } - implicitWidth: Appearance.padding.small + implicitWidth: Tokens.padding.small contentItem: StyledRect { anchors.left: parent.left @@ -61,7 +61,7 @@ ScrollBar { return 0.6; return 0; } - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3secondary MouseArea { diff --git a/components/controls/StyledSlider.qml b/components/controls/StyledSlider.qml index 21b2f2cb..09349635 100644 --- a/components/controls/StyledSlider.qml +++ b/components/controls/StyledSlider.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Templates import qs.components import qs.services -import qs.config +import Caelestia.Config Slider { id: root @@ -18,7 +18,7 @@ Slider { implicitWidth: root.handle.x - root.implicitHeight / 6 color: Colours.palette.m3primary - radius: Appearance.rounding.full + radius: Tokens.rounding.full topRightRadius: root.implicitHeight / 15 bottomRightRadius: root.implicitHeight / 15 } @@ -33,7 +33,7 @@ Slider { implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6 color: Colours.palette.m3surfaceContainerHighest - radius: Appearance.rounding.full + radius: Tokens.rounding.full topLeftRadius: root.implicitHeight / 15 bottomLeftRadius: root.implicitHeight / 15 } @@ -46,7 +46,7 @@ Slider { implicitHeight: root.implicitHeight color: Colours.palette.m3primary - radius: Appearance.rounding.full + radius: Tokens.rounding.full MouseArea { anchors.fill: parent diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index b56410a9..92cde7da 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Shapes import QtQuick.Templates import qs.services -import qs.config +import Caelestia.Config Switch { id: root @@ -14,21 +14,21 @@ Switch { implicitHeight: implicitIndicatorHeight indicator: StyledRect { - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer) implicitWidth: implicitHeight * 1.7 - implicitHeight: Appearance.font.size.normal + Appearance.padding.smaller * 2 + implicitHeight: Tokens.font.size.normal + Tokens.padding.smaller * 2 StyledRect { readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.checked ? Colours.palette.m3onPrimary : Colours.layer(Colours.palette.m3outline, root.cLayer + 1) - x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.small / 2 : Appearance.padding.small / 2 + x: root.checked ? parent.implicitWidth - nonAnimWidth - Tokens.padding.small / 2 : Tokens.padding.small / 2 implicitWidth: nonAnimWidth - implicitHeight: parent.implicitHeight - Appearance.padding.small + implicitHeight: parent.implicitHeight - Tokens.padding.small anchors.verticalCenter: parent.verticalCenter StyledRect { @@ -83,15 +83,15 @@ Switch { anchors.centerIn: parent width: height - height: parent.implicitHeight - Appearance.padding.small * 2 + height: parent.implicitHeight - Tokens.padding.small * 2 preferredRendererType: Shape.CurveRenderer asynchronous: true ShapePath { - strokeWidth: Appearance.font.size.larger * 0.15 + strokeWidth: Tokens.font.size.larger * 0.15 strokeColor: root.checked ? Colours.palette.m3primary : Colours.palette.m3surfaceContainerHighest fillColor: "transparent" - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap startX: icon.start1.x startY: icon.start1.y @@ -145,8 +145,8 @@ Switch { } component PropAnim: PropertyAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml index bf8e5b54..9a810f79 100644 --- a/components/controls/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -4,15 +4,15 @@ import ".." import QtQuick import QtQuick.Controls import qs.services -import qs.config +import Caelestia.Config TextField { id: root color: Colours.palette.m3onSurface placeholderTextColor: Colours.palette.m3outline - font.family: Appearance.font.family.sans - font.pointSize: Appearance.font.size.smaller + font.family: Tokens.font.family.sans + font.pointSize: Tokens.font.size.smaller renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering cursorVisible: !readOnly @@ -25,7 +25,7 @@ TextField { implicitWidth: 2 color: Colours.palette.m3primary - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal Connections { function onCursorPositionChanged(): void { @@ -61,7 +61,7 @@ TextField { Behavior on opacity { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } diff --git a/components/controls/SwitchRow.qml b/components/controls/SwitchRow.qml index 076080b6..01a42dd9 100644 --- a/components/controls/SwitchRow.qml +++ b/components/controls/SwitchRow.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -13,8 +13,8 @@ StyledRect { property var onToggled: function (checked) {} Layout.fillWidth: true - implicitHeight: row.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: row.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -27,8 +27,8 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml index 1066910f..a74c49e1 100644 --- a/components/controls/TextButton.qml +++ b/components/controls/TextButton.qml @@ -1,7 +1,7 @@ import ".." import QtQuick import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -15,8 +15,8 @@ StyledRect { property alias text: label.text property bool checked property bool toggle - property real horizontalPadding: Appearance.padding.normal - property real verticalPadding: Appearance.padding.smaller + property real horizontalPadding: Tokens.padding.normal + property real verticalPadding: Tokens.padding.smaller property alias font: label.font property int type: TextButton.Filled @@ -47,7 +47,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) color: type === TextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour implicitWidth: label.implicitWidth + horizontalPadding * 2 diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml index 1531b8b4..4e4174b0 100644 --- a/components/controls/ToggleButton.qml +++ b/components/controls/ToggleButton.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -15,9 +15,9 @@ StyledRect { property string icon property string label property string accent: "Secondary" - property real iconSize: Appearance.font.size.large - property real horizontalPadding: Appearance.padding.large - property real verticalPadding: Appearance.padding.normal + property real iconSize: Tokens.font.size.large + property real horizontalPadding: Tokens.padding.large + property real verticalPadding: Tokens.padding.normal property string tooltip: "" property bool hovered: false @@ -26,10 +26,10 @@ StyledRect { Component.onCompleted: { hovered = toggleStateLayer.containsMouse; } - Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Appearance.padding.normal * 2 : toggled ? Appearance.padding.small * 2 : 0) + Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.normal * 2 : toggled ? Tokens.padding.small * 2 : 0) implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2 implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2 - radius: toggled || toggleStateLayer.pressed ? Appearance.rounding.small : Math.min(width, height) / 2 * Math.min(1, Appearance.rounding.scale) + radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.small : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale) color: toggled ? Colours.palette[`m3${accent.toLowerCase()}`] : Colours.palette[`m3${accent.toLowerCase()}Container`] Connections { @@ -57,7 +57,7 @@ StyledRect { id: toggleBtnInner anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { id: toggleBtnIcon @@ -87,15 +87,15 @@ StyledRect { Behavior on radius { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } diff --git a/components/controls/ToggleRow.qml b/components/controls/ToggleRow.qml index 2ec35dc7..01e9cc0e 100644 --- a/components/controls/ToggleRow.qml +++ b/components/controls/ToggleRow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.components.controls -import qs.config +import Caelestia.Config RowLayout { id: root @@ -12,7 +12,7 @@ RowLayout { property alias toggle: toggle Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml index d550cc92..fdb27bea 100644 --- a/components/controls/Tooltip.qml +++ b/components/controls/Tooltip.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Popup { id: root @@ -44,10 +44,10 @@ Popup { let newX = targetCenterX - tooltipWidth / 2; // Position tooltip above target - let newY = targetPos.y - tooltipHeight - Appearance.spacing.small; + let newY = targetPos.y - tooltipHeight - Tokens.spacing.small; // Keep within bounds - const padding = Appearance.padding.normal; + const padding = Tokens.padding.normal; if (newX < padding) { newX = padding; } else if (newX + tooltipWidth > (parent.width - padding)) { @@ -100,8 +100,8 @@ Popup { property: "opacity" from: 0 to: 1 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } @@ -110,19 +110,19 @@ Popup { property: "opacity" from: 1 to: 0 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } contentItem: StyledRect { id: tooltipRect - implicitWidth: tooltipText.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: tooltipText.implicitHeight + Appearance.padding.smaller * 2 + implicitWidth: tooltipText.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: tooltipText.implicitHeight + Tokens.padding.smaller * 2 color: Colours.palette.m3surfaceContainerHighest - radius: Appearance.rounding.small + radius: Tokens.rounding.small antialiasing: true // Add elevation for depth @@ -140,7 +140,7 @@ Popup { text: root.text color: Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } diff --git a/components/effects/InnerBorder.qml b/components/effects/InnerBorder.qml index 462f77af..2770c9bc 100644 --- a/components/effects/InnerBorder.qml +++ b/components/effects/InnerBorder.qml @@ -4,7 +4,7 @@ import ".." import QtQuick import QtQuick.Effects import qs.services -import qs.config +import Caelestia.Config StyledRect { property alias innerRadius: maskInner.radius @@ -37,8 +37,8 @@ StyledRect { id: maskInner anchors.fill: parent - anchors.margins: Appearance.padding.normal - radius: Appearance.rounding.small + anchors.margins: Tokens.padding.normal + radius: Tokens.rounding.small } } } diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index 0603a626..d410b13c 100644 --- a/components/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml @@ -2,15 +2,15 @@ import ".." import QtQuick import QtQuick.Shapes import qs.services -import qs.config +import Caelestia.Config Item { id: root required property var currentItem - implicitWidth: content.implicitWidth + Appearance.padding.larger + content.anchors.rightMargin - implicitHeight: currentItem ? content.implicitHeight + Appearance.padding.normal + content.anchors.bottomMargin : 0 + implicitWidth: content.implicitWidth + Tokens.padding.larger + content.anchors.rightMargin + implicitHeight: currentItem ? content.implicitHeight + Tokens.padding.normal + content.anchors.bottomMargin : 0 Shape { preferredRendererType: Shape.CurveRenderer @@ -18,7 +18,7 @@ Item { ShapePath { id: path - readonly property real rounding: Appearance.rounding.small + readonly property real rounding: Tokens.rounding.small readonly property bool flatten: root.implicitHeight < rounding * 2 readonly property real roundingY: flatten ? root.implicitHeight / 2 : rounding @@ -76,8 +76,8 @@ Item { anchors.right: parent.right anchors.bottom: parent.bottom - anchors.rightMargin: Appearance.padding.larger - Appearance.padding.small - anchors.bottomMargin: Appearance.padding.normal - Appearance.padding.small + anchors.rightMargin: Tokens.padding.larger - Tokens.padding.small + anchors.bottomMargin: Tokens.padding.normal - Tokens.padding.small Connections { function onCurrentItemChanged(): void { diff --git a/components/filedialog/DialogButtons.qml b/components/filedialog/DialogButtons.qml index 725f8fc9..94cbd72d 100644 --- a/components/filedialog/DialogButtons.qml +++ b/components/filedialog/DialogButtons.qml @@ -1,7 +1,7 @@ import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -9,7 +9,7 @@ StyledRect { required property var dialog required property FolderContents folder - implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2 color: Colours.tPalette.m3surfaceContainer @@ -17,9 +17,9 @@ StyledRect { id: inner anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: qsTr("Filter:") @@ -28,14 +28,14 @@ StyledRect { StyledRect { Layout.fillWidth: true Layout.fillHeight: true - Layout.rightMargin: Appearance.spacing.normal + Layout.rightMargin: Tokens.spacing.normal color: Colours.tPalette.m3surfaceContainerHigh - radius: Appearance.rounding.small + radius: Tokens.rounding.small StyledText { anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal text: `${root.dialog.filterLabel} (${root.dialog.filters.map(f => `*.${f}`).join(", ")})` } @@ -43,10 +43,10 @@ StyledRect { StyledRect { color: Colours.tPalette.m3surfaceContainerHigh - radius: Appearance.rounding.small + radius: Tokens.rounding.small - implicitWidth: cancelText.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: cancelText.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -60,7 +60,7 @@ StyledRect { id: selectText anchors.centerIn: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal text: qsTr("Select") color: root.dialog.selectionValid ? Colours.palette.m3onSurface : Colours.palette.m3outline @@ -69,10 +69,10 @@ StyledRect { StyledRect { color: Colours.tPalette.m3surfaceContainerHigh - radius: Appearance.rounding.small + radius: Tokens.rounding.small - implicitWidth: cancelText.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: cancelText.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -84,7 +84,7 @@ StyledRect { id: cancelText anchors.centerIn: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal text: qsTr("Cancel") } diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index 56a4a284..980bd3e1 100644 --- a/components/filedialog/FolderContents.qml +++ b/components/filedialog/FolderContents.qml @@ -10,7 +10,7 @@ import qs.components.controls import qs.components.filedialog import qs.components.images import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -42,8 +42,8 @@ Item { Rectangle { anchors.fill: parent - anchors.margins: Appearance.padding.small - radius: Appearance.rounding.small + anchors.margins: Tokens.padding.small + radius: Tokens.rounding.small } } @@ -59,14 +59,14 @@ Item { Layout.alignment: Qt.AlignHCenter text: "scan_delete" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 font.weight: 500 } StyledText { text: qsTr("This folder is empty") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } } @@ -80,10 +80,10 @@ Item { id: view anchors.fill: parent - anchors.margins: Appearance.padding.small + Appearance.padding.normal + anchors.margins: Tokens.padding.small + Tokens.padding.normal - cellWidth: Sizes.itemWidth + Appearance.spacing.small - cellHeight: Sizes.itemWidth + Appearance.spacing.small * 2 + Appearance.padding.normal * 2 + 1 + cellWidth: Sizes.itemWidth + Tokens.spacing.small + cellHeight: Sizes.itemWidth + Tokens.spacing.small * 2 + Tokens.padding.normal * 2 + 1 clip: true focus: true @@ -120,8 +120,8 @@ Item { properties: "opacity,scale" from: 0 to: 1 - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -140,12 +140,12 @@ Item { Anim { properties: "opacity,scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -153,7 +153,7 @@ Item { CurrentItem { anchors.right: parent.right anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small currentItem: view.currentItem } @@ -164,12 +164,12 @@ Item { required property int index required property FileSystemEntry modelData - readonly property real nonAnimHeight: icon.implicitHeight + name.anchors.topMargin + name.implicitHeight + Appearance.padding.normal * 2 + readonly property real nonAnimHeight: icon.implicitHeight + name.anchors.topMargin + name.implicitHeight + Tokens.padding.normal * 2 implicitWidth: Sizes.itemWidth implicitHeight: nonAnimHeight - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Qt.alpha(Colours.tPalette.m3surfaceContainerHighest, GridView.isCurrentItem ? Colours.tPalette.m3surfaceContainerHighest.a : 0) z: GridView.isCurrentItem || implicitHeight !== nonAnimHeight ? 1 : 0 clip: true @@ -192,9 +192,9 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top - anchors.topMargin: Appearance.padding.normal + anchors.topMargin: Tokens.padding.normal - implicitSize: Sizes.itemWidth - Appearance.padding.normal * 2 + implicitSize: Sizes.itemWidth - Tokens.padding.normal * 2 Component.onCompleted: { const file = item.modelData; @@ -215,8 +215,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: icon.bottom - anchors.topMargin: Appearance.spacing.small - anchors.margins: Appearance.padding.normal + anchors.topMargin: Tokens.spacing.small + anchors.margins: Tokens.padding.normal horizontalAlignment: Text.AlignHCenter elide: item.GridView.isCurrentItem ? Text.ElideNone : Text.ElideRight diff --git a/components/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml index b44ac58b..c114bbd8 100644 --- a/components/filedialog/HeaderBar.qml +++ b/components/filedialog/HeaderBar.qml @@ -4,15 +4,15 @@ import ".." import QtQuick import QtQuick.Layouts import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root required property var dialog - implicitWidth: inner.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: inner.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2 color: Colours.tPalette.m3surfaceContainer @@ -20,19 +20,19 @@ StyledRect { id: inner anchors.fill: parent - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.small Item { implicitWidth: implicitHeight - implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2 + implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2 StateLayer { function onClicked(): void { root.dialog.cwd.pop(); } - radius: Appearance.rounding.small + radius: Tokens.rounding.small disabled: root.dialog.cwd.length === 1 } @@ -49,7 +49,7 @@ StyledRect { StyledRect { Layout.fillWidth: true - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainerHigh implicitHeight: pathComponents.implicitHeight + pathComponents.anchors.margins * 2 @@ -58,10 +58,10 @@ StyledRect { id: pathComponents anchors.fill: parent - anchors.margins: Appearance.padding.small / 2 + anchors.margins: Tokens.padding.small / 2 anchors.leftMargin: 0 - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Repeater { model: root.dialog.cwd @@ -76,7 +76,7 @@ StyledRect { Loader { asynchronous: true - Layout.rightMargin: Appearance.spacing.small + Layout.rightMargin: Tokens.spacing.small active: folder.index > 0 sourceComponent: StyledText { text: "/" @@ -86,8 +86,8 @@ StyledRect { } Item { - implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Appearance.padding.small : 0) + folderName.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: folderName.implicitHeight + Appearance.padding.small * 2 + implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.small : 0) + folderName.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: folderName.implicitHeight + Tokens.padding.small * 2 Loader { asynchronous: true @@ -98,7 +98,7 @@ StyledRect { root.dialog.cwd = root.dialog.cwd.slice(0, folder.index + 1); } - radius: Appearance.rounding.small + radius: Tokens.rounding.small } } @@ -109,7 +109,7 @@ StyledRect { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.normal + anchors.leftMargin: Tokens.padding.normal active: folder.index === 0 && folder.modelData === "Home" sourceComponent: MaterialIcon { @@ -124,7 +124,7 @@ StyledRect { anchors.left: homeIcon.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: homeIcon.active ? Appearance.padding.small : 0 + anchors.leftMargin: homeIcon.active ? Tokens.padding.small : 0 text: folder.modelData color: folder.index < root.dialog.cwd.length - 1 ? Colours.palette.m3onSurfaceVariant : Colours.palette.m3onSurface diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index d6acb811..885185c9 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.filedialog import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -13,7 +13,7 @@ StyledRect { required property var dialog implicitWidth: Sizes.sidebarWidth - implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2 color: Colours.tPalette.m3surfaceContainer @@ -23,16 +23,16 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.small / 2 + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.small / 2 StyledText { Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.padding.small / 2 - Layout.bottomMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.padding.small / 2 + Layout.bottomMargin: Tokens.spacing.normal text: qsTr("Files") color: Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.bold: true } @@ -46,9 +46,9 @@ StyledRect { readonly property bool selected: modelData === root.dialog.cwd[root.dialog.cwd.length - 1] Layout.fillWidth: true - implicitHeight: placeInner.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: placeInner.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3secondaryContainer, selected ? 1 : 0) StateLayer { @@ -66,11 +66,11 @@ StyledRect { id: placeInner anchors.fill: parent - anchors.margins: Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large - anchors.rightMargin: Appearance.padding.large + anchors.margins: Tokens.padding.normal + anchors.leftMargin: Tokens.padding.large + anchors.rightMargin: Tokens.padding.large - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: { @@ -92,7 +92,7 @@ StyledRect { return "folder"; } color: place.selected ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: place.selected ? 1 : 0 Behavior on fill { @@ -104,7 +104,7 @@ StyledRect { Layout.fillWidth: true text: place.modelData color: place.selected ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } } diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index 44738d85..938f1ec1 100644 --- a/components/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -2,19 +2,19 @@ import ".." import "../effects" import QtQuick import qs.services -import qs.config +import Caelestia.Config StyledRect { required property int extra anchors.right: parent.right - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal color: Colours.palette.m3tertiary - radius: Appearance.rounding.small + radius: Tokens.rounding.small - implicitWidth: count.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: count.implicitHeight + Appearance.padding.small * 2 + implicitWidth: count.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: count.implicitHeight + Tokens.padding.small * 2 opacity: extra > 0 ? 1 : 0 scale: extra > 0 ? 1 : 0.5 @@ -38,14 +38,14 @@ StyledRect { Behavior on opacity { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial } } Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/config/Appearance.qml b/config/Appearance.qml deleted file mode 100644 index 489620a0..00000000 --- a/config/Appearance.qml +++ /dev/null @@ -1,14 +0,0 @@ -pragma Singleton - -import Quickshell - -Singleton { - // Literally just here to shorten accessing stuff :woe: - // Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Config.appearance.xxx` - readonly property AppearanceConfig.Rounding rounding: Config.appearance.rounding // qmllint disable missing-property - readonly property AppearanceConfig.Spacing spacing: Config.appearance.spacing // qmllint disable missing-property - readonly property AppearanceConfig.Padding padding: Config.appearance.padding // qmllint disable missing-property - readonly property AppearanceConfig.FontStuff font: Config.appearance.font // qmllint disable missing-property - readonly property AppearanceConfig.Anim anim: Config.appearance.anim // qmllint disable missing-property - readonly property AppearanceConfig.Transparency transparency: Config.appearance.transparency // qmllint disable missing-property -} diff --git a/config/AppearanceConfig.qml b/config/AppearanceConfig.qml deleted file mode 100644 index cee140f6..00000000 --- a/config/AppearanceConfig.qml +++ /dev/null @@ -1,94 +0,0 @@ -import Quickshell.Io - -JsonObject { - property Rounding rounding: Rounding {} - property Spacing spacing: Spacing {} - property Padding padding: Padding {} - property FontStuff font: FontStuff {} - property Anim anim: Anim {} - property Transparency transparency: Transparency {} - - component Rounding: JsonObject { - property real scale: 1 - property int small: 12 * scale - property int normal: 17 * scale - property int large: 25 * scale - property int full: 1000 * scale - } - - component Spacing: JsonObject { - property real scale: 1 - property int small: 7 * scale - property int smaller: 10 * scale - property int normal: 12 * scale - property int larger: 15 * scale - property int large: 20 * scale - } - - component Padding: JsonObject { - property real scale: 1 - property int small: 5 * scale - property int smaller: 7 * scale - property int normal: 10 * scale - property int larger: 12 * scale - property int large: 15 * scale - } - - component FontFamily: JsonObject { - property string sans: "Rubik" - property string mono: "CaskaydiaCove NF" - property string material: "Material Symbols Rounded" - property string clock: "Rubik" - } - - component FontSize: JsonObject { - property real scale: 1 - property int small: 11 * scale - property int smaller: 12 * scale - property int normal: 13 * scale - property int larger: 15 * scale - property int large: 18 * scale - property int extraLarge: 28 * scale - } - - component FontStuff: JsonObject { - property FontFamily family: FontFamily {} - property FontSize size: FontSize {} - } - - component AnimCurves: JsonObject { - property list emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1] - property list emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1] - property list emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1] - property list standard: [0.2, 0, 0, 1, 1, 1] - property list standardAccel: [0.3, 0, 1, 1, 1, 1] - property list standardDecel: [0, 0, 0, 1, 1, 1] - property list expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1] - property list expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1] - property list expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1] - } - - component AnimDurations: JsonObject { - property real scale: 1 - property int small: 200 * scale - property int normal: 400 * scale - property int large: 600 * scale - property int extraLarge: 1000 * scale - property int expressiveFastSpatial: 350 * scale - property int expressiveDefaultSpatial: 500 * scale - property int expressiveSlowSpatial: 650 * scale - } - - component Anim: JsonObject { - property real mediaGifSpeedAdjustment: 300 - property real sessionGifSpeed: 0.7 - property AnimCurves curves: AnimCurves {} - property AnimDurations durations: AnimDurations {} - } - - component Transparency: JsonObject { - property bool enabled: false - property real base: 0.85 - property real layers: 0.4 - } -} diff --git a/config/BackgroundConfig.qml b/config/BackgroundConfig.qml deleted file mode 100644 index 8383f524..00000000 --- a/config/BackgroundConfig.qml +++ /dev/null @@ -1,37 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property bool wallpaperEnabled: true - property DesktopClock desktopClock: DesktopClock {} - property Visualiser visualiser: Visualiser {} - - component DesktopClock: JsonObject { - property bool enabled: false - property real scale: 1.0 - property string position: "bottom-right" - property bool invertColors: false - property DesktopClockBackground background: DesktopClockBackground {} - property DesktopClockShadow shadow: DesktopClockShadow {} - } - - component DesktopClockBackground: JsonObject { - property bool enabled: false - property real opacity: 0.7 - property bool blur: true - } - - component DesktopClockShadow: JsonObject { - property bool enabled: true - property real opacity: 0.7 - property real blur: 0.4 - } - - component Visualiser: JsonObject { - property bool enabled: false - property bool autoHide: true - property bool blur: false - property real rounding: 1 - property real spacing: 1 - } -} diff --git a/config/BarConfig.qml b/config/BarConfig.qml deleted file mode 100644 index 463302ab..00000000 --- a/config/BarConfig.qml +++ /dev/null @@ -1,129 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool persistent: true - property bool showOnHover: true - property int dragThreshold: 20 - property ScrollActions scrollActions: ScrollActions {} - property Popouts popouts: Popouts {} - property Workspaces workspaces: Workspaces {} - property ActiveWindow activeWindow: ActiveWindow {} - property Tray tray: Tray {} - property Status status: Status {} - property Clock clock: Clock {} - property Sizes sizes: Sizes {} - property list excludedScreens: [] - - property list entries: [ - { - id: "logo", - enabled: true - }, - { - id: "workspaces", - enabled: true - }, - { - id: "spacer", - enabled: true - }, - { - id: "activeWindow", - enabled: true - }, - { - id: "spacer", - enabled: true - }, - { - id: "tray", - enabled: true - }, - { - id: "clock", - enabled: true - }, - { - id: "statusIcons", - enabled: true - }, - { - id: "power", - enabled: true - } - ] - - component ScrollActions: JsonObject { - property bool workspaces: true - property bool volume: true - property bool brightness: true - } - - component Popouts: JsonObject { - property bool activeWindow: true - property bool tray: true - property bool statusIcons: true - } - - component Workspaces: JsonObject { - property int shown: 5 - property bool activeIndicator: true - property bool occupiedBg: false - property bool showWindows: true - property bool showWindowsOnSpecialWorkspaces: showWindows - property int maxWindowIcons: 0 // 0 = unlimited - property bool activeTrail: false - property bool perMonitorWorkspaces: true - property string label: " " // if empty, will show workspace name's first letter - property string occupiedLabel: "󰮯" - property string activeLabel: "󰮯" - property string capitalisation: "preserve" // upper, lower, or preserve - relevant only if label is empty - property list specialWorkspaceIcons: [] - property list windowIcons: [ - { - regex: "steam(_app_(default|[0-9]+))?", - icon: "sports_esports" - } - ] - } - - component ActiveWindow: JsonObject { - property bool compact: false - property bool inverted: false - property bool showOnHover: true - } - - component Tray: JsonObject { - property bool background: false - property bool recolour: false - property bool compact: false - property list iconSubs: [] - property list hiddenIcons: [] - } - - component Status: JsonObject { - property bool showAudio: false - property bool showMicrophone: false - property bool showKbLayout: false - property bool showNetwork: true - property bool showWifi: true - property bool showBluetooth: true - property bool showBattery: true - property bool showLockStatus: true - } - - component Clock: JsonObject { - property bool background: false - property bool showDate: false - property bool showIcon: true - } - - component Sizes: JsonObject { - property int innerWidth: 40 - property int windowPreviewSize: 400 - property int trayMenuWidth: 300 - property int batteryWidth: 250 - property int networkWidth: 320 - property int kbLayoutWidth: 320 - } -} diff --git a/config/BorderConfig.qml b/config/BorderConfig.qml deleted file mode 100644 index 662320d9..00000000 --- a/config/BorderConfig.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Quickshell.Io -import qs.config - -JsonObject { - property int thickness: Config.appearance.padding.normal - property int rounding: Config.appearance.rounding.large - - readonly property int minThickness: 2 - readonly property int clampedThickness: Math.max(minThickness, thickness) -} diff --git a/config/Config.qml b/config/Config.qml deleted file mode 100644 index 997eaf1e..00000000 --- a/config/Config.qml +++ /dev/null @@ -1,500 +0,0 @@ -pragma Singleton - -import QtQuick -import Quickshell -import Quickshell.Io -import Caelestia -import qs.utils - -Singleton { - id: root - - property alias appearance: adapter.appearance - property alias general: adapter.general - property alias background: adapter.background - property alias bar: adapter.bar - property alias border: adapter.border - property alias dashboard: adapter.dashboard - property alias controlCenter: adapter.controlCenter - property alias launcher: adapter.launcher - property alias notifs: adapter.notifs - property alias osd: adapter.osd - property alias session: adapter.session - property alias winfo: adapter.winfo - property alias lock: adapter.lock - property alias utilities: adapter.utilities - property alias sidebar: adapter.sidebar - property alias services: adapter.services - property alias paths: adapter.paths - - property bool recentlySaved: false - - // Public save function - call this to persist config changes - function save(): void { - saveTimer.restart(); - recentlySaved = true; - recentSaveCooldown.restart(); - } - - // Helper function to serialize the config object - function serializeConfig(): var { - return { - appearance: serializeAppearance(), - general: serializeGeneral(), - background: serializeBackground(), - bar: serializeBar(), - border: serializeBorder(), - dashboard: serializeDashboard(), - controlCenter: serializeControlCenter(), - launcher: serializeLauncher(), - notifs: serializeNotifs(), - osd: serializeOsd(), - session: serializeSession(), - winfo: serializeWinfo(), - lock: serializeLock(), - utilities: serializeUtilities(), - sidebar: serializeSidebar(), - services: serializeServices(), - paths: serializePaths() - }; - } - - function serializeAppearance(): var { - return { - rounding: { - scale: appearance.rounding.scale - }, - spacing: { - scale: appearance.spacing.scale - }, - padding: { - scale: appearance.padding.scale - }, - font: { - family: { - sans: appearance.font.family.sans, - mono: appearance.font.family.mono, - material: appearance.font.family.material, - clock: appearance.font.family.clock - }, - size: { - scale: appearance.font.size.scale - } - }, - anim: { - mediaGifSpeedAdjustment: 300, - sessionGifSpeed: 0.7, - durations: { - scale: appearance.anim.durations.scale - } - }, - transparency: { - enabled: appearance.transparency.enabled, - base: appearance.transparency.base, - layers: appearance.transparency.layers - } - }; - } - - function serializeGeneral(): var { - return { - logo: general.logo, - excludedScreens: general.excludedScreens, - apps: { - terminal: general.apps.terminal, - audio: general.apps.audio, - playback: general.apps.playback, - explorer: general.apps.explorer - }, - idle: { - lockBeforeSleep: general.idle.lockBeforeSleep, - inhibitWhenAudio: general.idle.inhibitWhenAudio, - timeouts: general.idle.timeouts - }, - battery: { - warnLevels: general.battery.warnLevels, - criticalLevel: general.battery.criticalLevel - } - }; - } - - function serializeBackground(): var { - return { - enabled: background.enabled, - wallpaperEnabled: background.wallpaperEnabled, - desktopClock: { - enabled: background.desktopClock.enabled, - scale: background.desktopClock.scale, - position: background.desktopClock.position, - invertColors: background.desktopClock.invertColors, - background: { - enabled: background.desktopClock.background.enabled, - opacity: background.desktopClock.background.opacity, - blur: background.desktopClock.background.blur - }, - shadow: { - enabled: background.desktopClock.shadow.enabled, - opacity: background.desktopClock.shadow.opacity, - blur: background.desktopClock.shadow.blur - } - }, - visualiser: { - enabled: background.visualiser.enabled, - autoHide: background.visualiser.autoHide, - blur: background.visualiser.blur, - rounding: background.visualiser.rounding, - spacing: background.visualiser.spacing - } - }; - } - - function serializeBar(): var { - return { - persistent: bar.persistent, - showOnHover: bar.showOnHover, - dragThreshold: bar.dragThreshold, - scrollActions: { - workspaces: bar.scrollActions.workspaces, - volume: bar.scrollActions.volume, - brightness: bar.scrollActions.brightness - }, - popouts: { - activeWindow: bar.popouts.activeWindow, - tray: bar.popouts.tray, - statusIcons: bar.popouts.statusIcons - }, - workspaces: { - shown: bar.workspaces.shown, - activeIndicator: bar.workspaces.activeIndicator, - occupiedBg: bar.workspaces.occupiedBg, - showWindows: bar.workspaces.showWindows, - showWindowsOnSpecialWorkspaces: bar.workspaces.showWindowsOnSpecialWorkspaces, - maxWindowIcons: bar.workspaces.maxWindowIcons, - activeTrail: bar.workspaces.activeTrail, - perMonitorWorkspaces: bar.workspaces.perMonitorWorkspaces, - label: bar.workspaces.label, - occupiedLabel: bar.workspaces.occupiedLabel, - activeLabel: bar.workspaces.activeLabel, - capitalisation: bar.workspaces.capitalisation, - specialWorkspaceIcons: bar.workspaces.specialWorkspaceIcons, - windowIcons: bar.workspaces.windowIcons - }, - activeWindow: { - compact: bar.activeWindow.compact, - inverted: bar.activeWindow.inverted, - showOnHover: bar.activeWindow.showOnHover - }, - tray: { - background: bar.tray.background, - recolour: bar.tray.recolour, - compact: bar.tray.compact, - iconSubs: bar.tray.iconSubs, - hiddenIcons: bar.tray.hiddenIcons - }, - status: { - showAudio: bar.status.showAudio, - showMicrophone: bar.status.showMicrophone, - showKbLayout: bar.status.showKbLayout, - showNetwork: bar.status.showNetwork, - showWifi: bar.status.showWifi, - showBluetooth: bar.status.showBluetooth, - showBattery: bar.status.showBattery, - showLockStatus: bar.status.showLockStatus - }, - clock: { - background: bar.clock.background, - showDate: bar.clock.showDate, - showIcon: bar.clock.showIcon - }, - entries: bar.entries, - excludedScreens: bar.excludedScreens - }; - } - - function serializeBorder(): var { - return { - thickness: border.thickness, - rounding: border.rounding - }; - } - - function serializeDashboard(): var { - return { - enabled: dashboard.enabled, - showOnHover: dashboard.showOnHover, - mediaUpdateInterval: dashboard.mediaUpdateInterval, - resourceUpdateInterval: dashboard.resourceUpdateInterval, - dragThreshold: dashboard.dragThreshold, - performance: { - showBattery: dashboard.performance.showBattery, - showGpu: dashboard.performance.showGpu, - showCpu: dashboard.performance.showCpu, - showMemory: dashboard.performance.showMemory, - showStorage: dashboard.performance.showStorage, - showNetwork: dashboard.performance.showNetwork - } - }; - } - - function serializeControlCenter(): var { - return {}; - } - - function serializeLauncher(): var { - return { - enabled: launcher.enabled, - showOnHover: launcher.showOnHover, - maxShown: launcher.maxShown, - maxWallpapers: launcher.maxWallpapers, - specialPrefix: launcher.specialPrefix, - actionPrefix: launcher.actionPrefix, - enableDangerousActions: launcher.enableDangerousActions, - dragThreshold: launcher.dragThreshold, - vimKeybinds: launcher.vimKeybinds, - favouriteApps: launcher.favouriteApps, - hiddenApps: launcher.hiddenApps, - useFuzzy: { - apps: launcher.useFuzzy.apps, - actions: launcher.useFuzzy.actions, - schemes: launcher.useFuzzy.schemes, - variants: launcher.useFuzzy.variants, - wallpapers: launcher.useFuzzy.wallpapers - }, - actions: launcher.actions - }; - } - - function serializeNotifs(): var { - return { - expire: notifs.expire, - fullscreen: notifs.fullscreen, - defaultExpireTimeout: notifs.defaultExpireTimeout, - clearThreshold: notifs.clearThreshold, - expandThreshold: notifs.expandThreshold, - actionOnClick: notifs.actionOnClick, - groupPreviewNum: notifs.groupPreviewNum, - openExpanded: notifs.openExpanded - }; - } - - function serializeOsd(): var { - return { - enabled: osd.enabled, - hideDelay: osd.hideDelay, - enableBrightness: osd.enableBrightness, - enableMicrophone: osd.enableMicrophone - }; - } - - function serializeSession(): var { - return { - enabled: session.enabled, - dragThreshold: session.dragThreshold, - vimKeybinds: session.vimKeybinds, - icons: { - logout: session.icons.logout, - shutdown: session.icons.shutdown, - hibernate: session.icons.hibernate, - reboot: session.icons.reboot - }, - commands: { - logout: session.commands.logout, - shutdown: session.commands.shutdown, - hibernate: session.commands.hibernate, - reboot: session.commands.reboot - } - }; - } - - function serializeWinfo(): var { - return {}; - } - - function serializeLock(): var { - return { - recolourLogo: lock.recolourLogo, - enableFprint: lock.enableFprint, - maxFprintTries: lock.maxFprintTries, - hideNotifs: lock.hideNotifs - }; - } - - function serializeUtilities(): var { - const vpnProviders = []; - for (let i = 0; i < utilities.vpn.provider.length; i++) { - const p = utilities.vpn.provider[i]; - const provider = { - displayName: p.displayName, - enabled: p.enabled, - interface: p.interface, - name: p.name - }; - if (p.connectCmd && p.connectCmd.length > 0) { - provider.connectCmd = p.connectCmd; - } - if (p.disconnectCmd && p.disconnectCmd.length > 0) { - provider.disconnectCmd = p.disconnectCmd; - } - vpnProviders.push(provider); - } - - return { - enabled: utilities.enabled, - maxToasts: utilities.maxToasts, - toasts: { - configLoaded: utilities.toasts.configLoaded, - fullscreen: utilities.toasts.fullscreen, - chargingChanged: utilities.toasts.chargingChanged, - gameModeChanged: utilities.toasts.gameModeChanged, - dndChanged: utilities.toasts.dndChanged, - audioOutputChanged: utilities.toasts.audioOutputChanged, - audioInputChanged: utilities.toasts.audioInputChanged, - capsLockChanged: utilities.toasts.capsLockChanged, - numLockChanged: utilities.toasts.numLockChanged, - kbLayoutChanged: utilities.toasts.kbLayoutChanged, - vpnChanged: utilities.toasts.vpnChanged, - nowPlaying: utilities.toasts.nowPlaying - }, - vpn: { - enabled: utilities.vpn.enabled, - provider: vpnProviders - }, - quickToggles: utilities.quickToggles - }; - } - - function serializeSidebar(): var { - return { - enabled: sidebar.enabled, - dragThreshold: sidebar.dragThreshold - }; - } - - function serializeServices(): var { - return { - weatherLocation: services.weatherLocation, - useFahrenheit: services.useFahrenheit, - useFahrenheitPerformance: services.useFahrenheitPerformance, - useTwelveHourClock: services.useTwelveHourClock, - gpuType: services.gpuType, - visualiserBars: services.visualiserBars, - audioIncrement: services.audioIncrement, - brightnessIncrement: services.brightnessIncrement, - maxVolume: services.maxVolume, - smartScheme: services.smartScheme, - defaultPlayer: services.defaultPlayer, - playerAliases: services.playerAliases, - showLyrics: services.showLyrics, - lyricsBackend: services.lyricsBackend - }; - } - - function serializePaths(): var { - return { - wallpaperDir: paths.wallpaperDir, - lyricsDir: paths.lyricsDir, - sessionGif: paths.sessionGif, - mediaGif: paths.mediaGif, - noNotifsPic: paths.noNotifsPic, - lockNoNotifsPic: paths.lockNoNotifsPic - }; - } - - ElapsedTimer { - id: timer - } - - Timer { - id: saveTimer - - interval: 500 - onTriggered: { - timer.restart(); - try { - // Parse current config to preserve structure and comments if possible - let config = {}; - try { - config = JSON.parse(fileView.text()); - } catch (e) { - // If parsing fails, start with empty object - config = {}; - } - - // Update config with current values - config = root.serializeConfig(); - - // Save to file with pretty printing - fileView.setText(JSON.stringify(config, null, 2)); - } catch (e) { - Toaster.toast(qsTr("Failed to serialize config"), e.message, "settings_alert", Toast.Error); - } - } - } - - Timer { - id: recentSaveCooldown - - interval: 2000 - onTriggered: { - root.recentlySaved = false; - } - } - - FileView { - id: fileView - - path: `${Paths.config}/shell.json` - watchChanges: true - onFileChanged: { - // Prevent reload loop - don't reload if we just saved - if (!root.recentlySaved) { - timer.restart(); - reload(); - } else { - // Self-initiated save - reload without toast - reload(); - } - } - onLoaded: { - try { - JSON.parse(text()); - const elapsed = timer.elapsedMs(); - // Only show toast for external changes (not our own saves) and when elapsed time is meaningful - if (adapter.utilities.toasts.configLoaded && !root.recentlySaved && elapsed > 0) { // qmllint disable unresolved-type - Toaster.toast(qsTr("Config loaded"), qsTr("Config loaded in %1ms").arg(elapsed), "rule_settings"); // qmllint disable unresolved-type - } else if (adapter.utilities.toasts.configLoaded && root.recentlySaved && elapsed > 0) { // qmllint disable unresolved-type - Toaster.toast(qsTr("Config saved"), qsTr("Config reloaded in %1ms").arg(elapsed), "rule_settings"); - } - } catch (e) { - Toaster.toast(qsTr("Failed to load config"), e.message, "settings_alert", Toast.Error); - } - } - onLoadFailed: err => { - if (err !== FileViewError.FileNotFound) - Toaster.toast(qsTr("Failed to read config file"), FileViewError.toString(err), "settings_alert", Toast.Warning); - } - onSaveFailed: err => Toaster.toast(qsTr("Failed to save config"), FileViewError.toString(err), "settings_alert", Toast.Error) - - JsonAdapter { // qmllint disable unresolved-type - id: adapter - - property AppearanceConfig appearance: AppearanceConfig {} - property GeneralConfig general: GeneralConfig {} - property BackgroundConfig background: BackgroundConfig {} - property BarConfig bar: BarConfig {} - property BorderConfig border: BorderConfig {} - property DashboardConfig dashboard: DashboardConfig {} - property ControlCenterConfig controlCenter: ControlCenterConfig {} - property LauncherConfig launcher: LauncherConfig {} - property NotifsConfig notifs: NotifsConfig {} - property OsdConfig osd: OsdConfig {} - property SessionConfig session: SessionConfig {} - property WInfoConfig winfo: WInfoConfig {} - property LockConfig lock: LockConfig {} - property UtilitiesConfig utilities: UtilitiesConfig {} - property SidebarConfig sidebar: SidebarConfig {} - property ServiceConfig services: ServiceConfig {} - property UserPaths paths: UserPaths {} - } - } -} diff --git a/config/ControlCenterConfig.qml b/config/ControlCenterConfig.qml deleted file mode 100644 index a5889491..00000000 --- a/config/ControlCenterConfig.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Quickshell.Io - -JsonObject { - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property real heightMult: 0.7 - property real ratio: 16 / 9 - } -} diff --git a/config/DashboardConfig.qml b/config/DashboardConfig.qml deleted file mode 100644 index 0a16cc1f..00000000 --- a/config/DashboardConfig.qml +++ /dev/null @@ -1,40 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property bool showOnHover: true - property int mediaUpdateInterval: 500 - property int resourceUpdateInterval: 1000 - property int dragThreshold: 50 - property bool showDashboard: true - property bool showMedia: true - property bool showPerformance: true - property bool showWeather: true - property Sizes sizes: Sizes {} - property Performance performance: Performance {} - - component Performance: JsonObject { - property bool showBattery: true - property bool showGpu: true - property bool showCpu: true - property bool showMemory: true - property bool showStorage: true - property bool showNetwork: true - } - - component Sizes: JsonObject { - readonly property int tabIndicatorHeight: 3 - readonly property int tabIndicatorSpacing: 5 - readonly property int infoWidth: 200 - readonly property int infoIconSize: 25 - readonly property int dateTimeWidth: 110 - readonly property int mediaWidth: 200 - readonly property int mediaProgressSweep: 180 - readonly property int mediaProgressThickness: 8 - readonly property int resourceProgessThickness: 10 - readonly property int weatherWidth: 250 - readonly property int mediaCoverArtSize: 150 - readonly property int mediaVisualiserSize: 80 - readonly property int resourceSize: 200 - } -} diff --git a/config/GeneralConfig.qml b/config/GeneralConfig.qml deleted file mode 100644 index 0d1d1e19..00000000 --- a/config/GeneralConfig.qml +++ /dev/null @@ -1,61 +0,0 @@ -import Quickshell.Io - -JsonObject { - property string logo: "" - property list excludedScreens: [] - property Apps apps: Apps {} - property Idle idle: Idle {} - property Battery battery: Battery {} - - component Apps: JsonObject { - property list terminal: ["foot"] - property list audio: ["pavucontrol"] - property list playback: ["mpv"] - property list explorer: ["thunar"] - } - - component Idle: JsonObject { - property bool lockBeforeSleep: true - property bool inhibitWhenAudio: true - property list timeouts: [ - { - timeout: 180, - idleAction: "lock" - }, - { - timeout: 300, - idleAction: "dpms off", - returnAction: "dpms on" - }, - { - timeout: 600, - idleAction: ["systemctl", "suspend-then-hibernate"] - } - ] - } - - component Battery: JsonObject { - property list warnLevels: [ - { - level: 20, - title: qsTr("Low battery"), - message: qsTr("You might want to plug in a charger"), - icon: "battery_android_frame_2" - }, - { - level: 10, - title: qsTr("Did you see the previous message?"), - message: qsTr("You should probably plug in a charger now"), - icon: "battery_android_frame_1" - }, - { - level: 5, - title: qsTr("Critical battery level"), - message: qsTr("PLUG THE CHARGER RIGHT NOW!!"), - icon: "battery_android_alert", - critical: true - }, - ] - property int criticalLevel: 3 - } -} diff --git a/config/LauncherConfig.qml b/config/LauncherConfig.qml deleted file mode 100644 index 05088af0..00000000 --- a/config/LauncherConfig.qml +++ /dev/null @@ -1,147 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property bool showOnHover: false - property int maxShown: 7 - property int maxWallpapers: 9 // Warning: even numbers look bad - property string specialPrefix: "@" - property string actionPrefix: ">" - property bool enableDangerousActions: false // Allow actions that can cause losing data, like shutdown, reboot and logout - property int dragThreshold: 50 - property bool vimKeybinds: false - property list favouriteApps: [] - property list hiddenApps: [] - property UseFuzzy useFuzzy: UseFuzzy {} - property Sizes sizes: Sizes {} - - property list actions: [ - { - name: "Calculator", - icon: "calculate", - description: "Do simple math equations (powered by Qalc)", - command: ["autocomplete", "calc"], - enabled: true, - dangerous: false - }, - { - name: "Scheme", - icon: "palette", - description: "Change the current colour scheme", - command: ["autocomplete", "scheme"], - enabled: true, - dangerous: false - }, - { - name: "Wallpaper", - icon: "image", - description: "Change the current wallpaper", - command: ["autocomplete", "wallpaper"], - enabled: true, - dangerous: false - }, - { - name: "Variant", - icon: "colors", - description: "Change the current scheme variant", - command: ["autocomplete", "variant"], - enabled: true, - dangerous: false - }, - { - name: "Transparency", - icon: "opacity", - description: "Change shell transparency", - command: ["autocomplete", "transparency"], - enabled: false, - dangerous: false - }, - { - name: "Random", - icon: "casino", - description: "Switch to a random wallpaper", - command: ["caelestia", "wallpaper", "-r"], - enabled: true, - dangerous: false - }, - { - name: "Light", - icon: "light_mode", - description: "Change the scheme to light mode", - command: ["setMode", "light"], - enabled: true, - dangerous: false - }, - { - name: "Dark", - icon: "dark_mode", - description: "Change the scheme to dark mode", - command: ["setMode", "dark"], - enabled: true, - dangerous: false - }, - { - name: "Shutdown", - icon: "power_settings_new", - description: "Shutdown the system", - command: ["systemctl", "poweroff"], - enabled: true, - dangerous: true - }, - { - name: "Reboot", - icon: "cached", - description: "Reboot the system", - command: ["systemctl", "reboot"], - enabled: true, - dangerous: true - }, - { - name: "Logout", - icon: "exit_to_app", - description: "Log out of the current session", - command: ["loginctl", "terminate-user", ""], - enabled: true, - dangerous: true - }, - { - name: "Lock", - icon: "lock", - description: "Lock the current session", - command: ["loginctl", "lock-session"], - enabled: true, - dangerous: false - }, - { - name: "Sleep", - icon: "bedtime", - description: "Suspend then hibernate", - command: ["systemctl", "suspend-then-hibernate"], - enabled: true, - dangerous: false - }, - { - name: "Settings", - icon: "settings", - description: "Configure the shell", - command: ["caelestia", "shell", "controlCenter", "open"], - enabled: true, - dangerous: false - } - ] - - component UseFuzzy: JsonObject { - property bool apps: false - property bool actions: false - property bool schemes: false - property bool variants: false - property bool wallpapers: false - } - - component Sizes: JsonObject { - property int itemWidth: 600 - property int itemHeight: 57 - property int wallpaperWidth: 280 - property int wallpaperHeight: 200 - } -} diff --git a/config/LockConfig.qml b/config/LockConfig.qml deleted file mode 100644 index d0a9fb35..00000000 --- a/config/LockConfig.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool recolourLogo: false - property bool enableFprint: true - property int maxFprintTries: 3 - property bool hideNotifs: false - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property real heightMult: 0.7 - property real ratio: 16 / 9 - property int centerWidth: 600 - } -} diff --git a/config/NotifsConfig.qml b/config/NotifsConfig.qml deleted file mode 100644 index bd54b94b..00000000 --- a/config/NotifsConfig.qml +++ /dev/null @@ -1,19 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool expire: true - property string fullscreen: "on" - property int defaultExpireTimeout: 5000 - property real clearThreshold: 0.3 - property int expandThreshold: 20 - property bool actionOnClick: false - property int groupPreviewNum: 3 - property bool openExpanded: false // Show the notifichation in expanded state when opening - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property int width: 400 - property int image: 41 - property int badge: 20 - } -} diff --git a/config/OsdConfig.qml b/config/OsdConfig.qml deleted file mode 100644 index 543fc41e..00000000 --- a/config/OsdConfig.qml +++ /dev/null @@ -1,14 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property int hideDelay: 2000 - property bool enableBrightness: true - property bool enableMicrophone: false - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property int sliderWidth: 30 - property int sliderHeight: 150 - } -} diff --git a/config/ServiceConfig.qml b/config/ServiceConfig.qml deleted file mode 100644 index a9d7c3dc..00000000 --- a/config/ServiceConfig.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick -import Quickshell.Io - -JsonObject { - property string weatherLocation: "" // A lat,long pair or empty for autodetection, e.g. "37.8267,-122.4233" - property bool useFahrenheit: [Locale.ImperialUSSystem, Locale.ImperialSystem].includes(Qt.locale().measurementSystem) - property bool useFahrenheitPerformance: [Locale.ImperialUSSystem, Locale.ImperialSystem].includes(Qt.locale().measurementSystem) - property bool useTwelveHourClock: Qt.locale().timeFormat(Locale.ShortFormat).toLowerCase().includes("a") - property string gpuType: "" - property int visualiserBars: 45 - property real audioIncrement: 0.1 - property real brightnessIncrement: 0.1 - property real maxVolume: 1.0 - property bool smartScheme: true - property string defaultPlayer: "Spotify" - property list playerAliases: [ - { - "from": "com.github.th_ch.youtube_music", - "to": "YT Music" - } - ] - property bool showLyrics: false - property string lyricsBackend: "Auto" -} diff --git a/config/SessionConfig.qml b/config/SessionConfig.qml deleted file mode 100644 index 414f821a..00000000 --- a/config/SessionConfig.qml +++ /dev/null @@ -1,29 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property int dragThreshold: 30 - property bool vimKeybinds: false - property Icons icons: Icons {} - property Commands commands: Commands {} - - property Sizes sizes: Sizes {} - - component Icons: JsonObject { - property string logout: "logout" - property string shutdown: "power_settings_new" - property string hibernate: "downloading" - property string reboot: "cached" - } - - component Commands: JsonObject { - property list logout: ["loginctl", "terminate-user", ""] - property list shutdown: ["systemctl", "poweroff"] - property list hibernate: ["systemctl", "hibernate"] - property list reboot: ["systemctl", "reboot"] - } - - component Sizes: JsonObject { - property int button: 80 - } -} diff --git a/config/SidebarConfig.qml b/config/SidebarConfig.qml deleted file mode 100644 index a871562b..00000000 --- a/config/SidebarConfig.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property int dragThreshold: 80 - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property int width: 430 - } -} diff --git a/config/UserPaths.qml b/config/UserPaths.qml deleted file mode 100644 index 3726017c..00000000 --- a/config/UserPaths.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Quickshell.Io -import qs.utils - -JsonObject { - property string wallpaperDir: `${Paths.pictures}/Wallpapers` - property string lyricsDir: `${Paths.home}/Music/lyrics/` - property string sessionGif: "root:/assets/kurukuru.gif" - property string mediaGif: "root:/assets/bongocat.gif" - property string noNotifsPic: "root:/assets/dino.png" - property string lockNoNotifsPic: "root:/assets/dino.png" -} diff --git a/config/UtilitiesConfig.qml b/config/UtilitiesConfig.qml deleted file mode 100644 index 61cf1678..00000000 --- a/config/UtilitiesConfig.qml +++ /dev/null @@ -1,67 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool enabled: true - property int maxToasts: 4 - - property Sizes sizes: Sizes {} - property Toasts toasts: Toasts {} - property Vpn vpn: Vpn {} - - property list quickToggles: [ - { - id: "wifi", - enabled: true - }, - { - id: "bluetooth", - enabled: true - }, - { - id: "mic", - enabled: true - }, - { - id: "settings", - enabled: true - }, - { - id: "gameMode", - enabled: true - }, - { - id: "dnd", - enabled: true - }, - { - id: "vpn", - enabled: false - } - ] - - component Sizes: JsonObject { - property int width: 430 - property int toastWidth: 430 - } - - component Toasts: JsonObject { - property bool configLoaded: true - property string fullscreen: "off" - property bool chargingChanged: true - property bool gameModeChanged: true - property bool dndChanged: true - property bool audioOutputChanged: true - property bool audioInputChanged: true - property bool capsLockChanged: true - property bool numLockChanged: true - property bool kbLayoutChanged: true - property bool kbLimit: true - property bool vpnChanged: true - property bool nowPlaying: false - } - - component Vpn: JsonObject { - property bool enabled: false - property list provider: [] - } -} diff --git a/config/WInfoConfig.qml b/config/WInfoConfig.qml deleted file mode 100644 index 50257807..00000000 --- a/config/WInfoConfig.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Quickshell.Io - -JsonObject { - property Sizes sizes: Sizes {} - - component Sizes: JsonObject { - property real heightMult: 0.7 - property real detailsWidth: 500 - } -} diff --git a/modules/BatteryMonitor.qml b/modules/BatteryMonitor.qml index 0596a1aa..b6412283 100644 --- a/modules/BatteryMonitor.qml +++ b/modules/BatteryMonitor.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Services.UPower import Caelestia -import qs.config +import Caelestia.Config Scope { id: root diff --git a/modules/IdleMonitors.qml b/modules/IdleMonitors.qml index 440dc704..c396bc8b 100644 --- a/modules/IdleMonitors.qml +++ b/modules/IdleMonitors.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import Caelestia.Internal import qs.services -import qs.config +import Caelestia.Config Scope { id: root diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index e6272737..6234d192 100644 --- a/modules/areapicker/Picker.qml +++ b/modules/areapicker/Picker.qml @@ -8,7 +8,7 @@ import Quickshell.Wayland import Caelestia import qs.components import qs.services -import qs.config +import Caelestia.Config MouseArea { id: root @@ -167,7 +167,7 @@ MouseArea { target: root property: "opacity" to: 0 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } ExAnim { target: root @@ -278,7 +278,7 @@ MouseArea { Behavior on opacity { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } @@ -307,7 +307,7 @@ MouseArea { } component ExAnim: Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/background/Background.qml b/modules/background/Background.qml index 0f44b1a0..14669eab 100644 --- a/modules/background/Background.qml +++ b/modules/background/Background.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import qs.components.containers import qs.services -import qs.config +import Caelestia.Config Variants { model: Config.background.enabled ? Screens.screens : [] @@ -56,8 +56,8 @@ Variants { asynchronous: true active: Config.background.desktopClock.enabled - anchors.margins: Appearance.padding.large * 2 - anchors.leftMargin: Appearance.padding.large * 2 + Config.bar.sizes.innerWidth + Math.max(Appearance.padding.smaller, Config.border.thickness) + anchors.margins: Tokens.padding.large * 2 + anchors.leftMargin: Tokens.padding.large * 2 + Config.bar.sizes.innerWidth + Math.max(Tokens.padding.smaller, Config.border.thickness) state: Config.background.desktopClock.position states: [ @@ -146,8 +146,8 @@ Variants { transitions: Transition { AnchorAnimation { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index 67f77e44..43f3fcef 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -5,7 +5,7 @@ import QtQuick.Effects import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -23,8 +23,8 @@ Item { readonly property color safeSecondary: useLightSet ? Colours.palette.m3secondaryContainer : Colours.palette.m3secondary readonly property color safeTertiary: useLightSet ? Colours.palette.m3tertiaryContainer : Colours.palette.m3tertiary - implicitWidth: layout.implicitWidth + (Appearance.padding.large * 4 * root.clockScale) - implicitHeight: layout.implicitHeight + (Appearance.padding.large * 2 * root.clockScale) + implicitWidth: layout.implicitWidth + (Tokens.padding.large * 4 * root.clockScale) + implicitHeight: layout.implicitHeight + (Tokens.padding.large * 2 * root.clockScale) Item { id: clockContainer @@ -63,7 +63,7 @@ Item { visible: root.bgEnabled anchors.fill: parent - radius: Appearance.rounding.large * root.clockScale + radius: Tokens.rounding.large * root.clockScale opacity: Config.background.desktopClock.background.opacity color: Colours.palette.m3surface @@ -74,29 +74,29 @@ Item { id: layout anchors.centerIn: parent - spacing: Appearance.spacing.larger * root.clockScale + spacing: Tokens.spacing.larger * root.clockScale RowLayout { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: Time.hourStr - font.pointSize: Appearance.font.size.extraLarge * 3 * root.clockScale + font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale font.weight: Font.Bold color: root.safePrimary } StyledText { text: ":" - font.pointSize: Appearance.font.size.extraLarge * 3 * root.clockScale + font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale color: root.safeTertiary opacity: 0.8 - Layout.topMargin: -Appearance.padding.large * 1.5 * root.clockScale + Layout.topMargin: -Tokens.padding.large * 1.5 * root.clockScale } StyledText { text: Time.minuteStr - font.pointSize: Appearance.font.size.extraLarge * 3 * root.clockScale + font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale font.weight: Font.Bold color: root.safeSecondary } @@ -104,14 +104,14 @@ Item { Loader { asynchronous: true Layout.alignment: Qt.AlignTop - Layout.topMargin: Appearance.padding.large * 1.4 * root.clockScale + Layout.topMargin: Tokens.padding.large * 1.4 * root.clockScale active: Config.services.useTwelveHourClock visible: active sourceComponent: StyledText { text: Time.amPmStr - font.pointSize: Appearance.font.size.large * root.clockScale + font.pointSize: Tokens.font.size.large * root.clockScale color: root.safeSecondary } } @@ -120,9 +120,9 @@ Item { StyledRect { Layout.fillHeight: true Layout.preferredWidth: 4 * root.clockScale - Layout.topMargin: Appearance.spacing.larger * root.clockScale - Layout.bottomMargin: Appearance.spacing.larger * root.clockScale - radius: Appearance.rounding.full + Layout.topMargin: Tokens.spacing.larger * root.clockScale + Layout.bottomMargin: Tokens.spacing.larger * root.clockScale + radius: Tokens.rounding.full color: root.safePrimary opacity: 0.8 } @@ -132,7 +132,7 @@ Item { StyledText { text: Time.format("MMMM").toUpperCase() - font.pointSize: Appearance.font.size.large * root.clockScale + font.pointSize: Tokens.font.size.large * root.clockScale font.letterSpacing: 4 font.weight: Font.Bold color: root.safeSecondary @@ -140,7 +140,7 @@ Item { StyledText { text: Time.format("dd") - font.pointSize: Appearance.font.size.extraLarge * root.clockScale + font.pointSize: Tokens.font.size.extraLarge * root.clockScale font.letterSpacing: 2 font.weight: Font.Medium color: root.safePrimary @@ -148,7 +148,7 @@ Item { StyledText { text: Time.format("dddd") - font.pointSize: Appearance.font.size.larger * root.clockScale + font.pointSize: Tokens.font.size.larger * root.clockScale font.letterSpacing: 2 color: root.safeSecondary } @@ -158,14 +158,14 @@ Item { Behavior on clockScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on implicitWidth { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } diff --git a/modules/background/Visualiser.qml b/modules/background/Visualiser.qml index 2f59a300..ebb28dfa 100644 --- a/modules/background/Visualiser.qml +++ b/modules/background/Visualiser.qml @@ -7,7 +7,7 @@ import Caelestia.Internal import Caelestia.Services import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -60,14 +60,14 @@ Item { anchors.fill: parent anchors.margins: Config.border.thickness - anchors.leftMargin: Visibilities.bars.get(root.screen).exclusiveZone + Appearance.spacing.small * Config.background.visualiser.spacing + anchors.leftMargin: Visibilities.bars.get(root.screen).exclusiveZone + Tokens.spacing.small * Config.background.visualiser.spacing values: Audio.cava.values primaryColor: Qt.alpha(Colours.palette.m3primary, 0.7) secondaryColor: Qt.alpha(Colours.palette.m3inversePrimary, 0.7) - rounding: Appearance.rounding.small * Config.background.visualiser.rounding - spacing: Appearance.spacing.small * Config.background.visualiser.spacing - animationDuration: Appearance.anim.durations.normal + rounding: Tokens.rounding.small * Config.background.visualiser.rounding + spacing: Tokens.spacing.small * Config.background.visualiser.spacing + animationDuration: Tokens.anim.durations.normal Behavior on anchors.leftMargin { Anim {} diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index 10d743ba..f226d062 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -5,7 +5,7 @@ import qs.components import qs.components.filedialog import qs.components.images import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -43,30 +43,30 @@ Item { Row { anchors.centerIn: parent - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large MaterialIcon { text: "sentiment_stressed" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge * 5 + font.pointSize: Tokens.font.size.extraLarge * 5 } Column { anchors.verticalCenter: parent.verticalCenter - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: qsTr("Wallpaper missing?") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 font.bold: true } StyledRect { - implicitWidth: selectWallText.implicitWidth + Appearance.padding.large * 2 - implicitHeight: selectWallText.implicitHeight + Appearance.padding.small * 2 + implicitWidth: selectWallText.implicitWidth + Tokens.padding.large * 2 + implicitHeight: selectWallText.implicitHeight + Tokens.padding.small * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primary FileDialog { @@ -94,7 +94,7 @@ Item { text: qsTr("Set it now!") color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 3b99a44b..5d127f57 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -17,7 +17,7 @@ ColumnLayout { required property DrawerVisibilities visibilities required property BarPopouts.Wrapper popouts required property bool fullscreen - readonly property int vPadding: Appearance.padding.large + readonly property int vPadding: Tokens.padding.large function closeTray(): void { if (!Config.bar.tray.compact) @@ -102,7 +102,7 @@ ColumnLayout { } } - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Repeater { id: repeater diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml index ec9df2d1..8ea61505 100644 --- a/modules/bar/BarWrapper.qml +++ b/modules/bar/BarWrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.components -import qs.config +import Caelestia.Config import qs.utils import qs.modules.bar.popouts as BarPopouts @@ -18,7 +18,7 @@ Item { readonly property bool disabled: Strings.testRegexList(Config.bar.excludedScreens, screen.name) readonly property int clampedWidth: Math.max(Config.border.minThickness, implicitWidth) - readonly property int padding: Math.max(Appearance.padding.smaller, Config.border.thickness) + readonly property int padding: Math.max(Tokens.padding.smaller, Config.border.thickness) readonly property int contentWidth: Config.bar.sizes.innerWidth + padding * 2 readonly property int exclusiveZone: !disabled && (Config.bar.persistent || visibilities.bar) ? contentWidth : Config.border.thickness readonly property bool shouldBeVisible: !fullscreen && !disabled && (Config.bar.persistent || visibilities.bar || isHovered) @@ -57,8 +57,8 @@ Item { Anim { target: root property: "implicitWidth" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } }, Transition { @@ -68,7 +68,7 @@ Item { Anim { target: root property: "implicitWidth" - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } ] diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml index 0fa277ee..63cdb04a 100644 --- a/modules/bar/components/ActiveWindow.qml +++ b/modules/bar/components/ActiveWindow.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -86,8 +86,8 @@ Item { id: metrics text: root.windowTitle - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.smaller + font.family: Tokens.font.family.mono elide: Qt.ElideRight elideWidth: root.maxHeight - icon.height @@ -101,8 +101,8 @@ Item { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -111,7 +111,7 @@ Item { anchors.horizontalCenter: icon.horizontalCenter anchors.top: icon.bottom - anchors.topMargin: Appearance.spacing.small + anchors.topMargin: Tokens.spacing.small font.pointSize: metrics.font.pointSize font.family: metrics.font.family diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index 90ed78cf..ead13d9e 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -3,25 +3,25 @@ pragma ComponentBehavior: Bound import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root readonly property color colour: Colours.palette.m3tertiary - readonly property int padding: Config.bar.clock.background ? Appearance.padding.normal : Appearance.padding.small + readonly property int padding: Config.bar.clock.background ? Tokens.padding.normal : Tokens.padding.small implicitWidth: Config.bar.sizes.innerWidth implicitHeight: layout.implicitHeight + root.padding * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, Config.bar.clock.background ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.full + radius: Tokens.rounding.full Column { id: layout anchors.centerIn: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Loader { asynchronous: true @@ -43,8 +43,8 @@ StyledRect { horizontalAlignment: StyledText.AlignHCenter text: Time.format("ddd\nd") - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.sans + font.pointSize: Tokens.font.size.smaller + font.family: Tokens.font.family.sans color: root.colour } @@ -63,8 +63,8 @@ StyledRect { horizontalAlignment: StyledText.AlignHCenter text: Time.format(Config.services.useTwelveHourClock ? "hh\nmm\nA" : "hh\nmm") - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.smaller + font.family: Tokens.font.family.mono color: root.colour } } diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml index fc16a4fc..47a8c88f 100644 --- a/modules/bar/components/OsIcon.qml +++ b/modules/bar/components/OsIcon.qml @@ -2,14 +2,14 @@ import QtQuick import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { id: root - implicitWidth: Math.round(Appearance.font.size.large * 1.2) - implicitHeight: Math.round(Appearance.font.size.large * 1.2) + implicitWidth: Math.round(Tokens.font.size.large * 1.2) + implicitHeight: Math.round(Tokens.font.size.large * 1.2) MouseArea { anchors.fill: parent @@ -30,8 +30,8 @@ Item { id: caelestiaLogo Logo { - implicitWidth: Math.round(Appearance.font.size.large * 1.6) - implicitHeight: Math.round(Appearance.font.size.large * 1.6) + implicitWidth: Math.round(Tokens.font.size.large * 1.6) + implicitHeight: Math.round(Tokens.font.size.large * 1.6) } } @@ -40,7 +40,7 @@ Item { ColouredIcon { source: SysInfo.osLogo - implicitSize: Math.round(Appearance.font.size.large * 1.2) + implicitSize: Math.round(Tokens.font.size.large * 1.2) colour: Colours.palette.m3tertiary } } diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml index 5f573811..f3f4706a 100644 --- a/modules/bar/components/Power.qml +++ b/modules/bar/components/Power.qml @@ -1,14 +1,14 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root required property DrawerVisibilities visibilities - implicitWidth: icon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: icon.implicitHeight + Tokens.padding.small * 2 implicitHeight: icon.implicitHeight StateLayer { @@ -20,8 +20,8 @@ Item { anchors.fill: undefined anchors.centerIn: parent implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.small * 2 - radius: Appearance.rounding.full + implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 + radius: Tokens.rounding.full } MaterialIcon { @@ -33,6 +33,6 @@ Item { text: "power_settings_new" color: Colours.palette.m3error font.bold: true - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } diff --git a/modules/bar/components/Settings.qml b/modules/bar/components/Settings.qml index f6ed88af..f060225c 100644 --- a/modules/bar/components/Settings.qml +++ b/modules/bar/components/Settings.qml @@ -1,13 +1,13 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.controlcenter Item { id: root - implicitWidth: icon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: icon.implicitHeight + Tokens.padding.small * 2 implicitHeight: icon.implicitHeight StateLayer { @@ -21,8 +21,8 @@ Item { anchors.fill: undefined anchors.centerIn: parent implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.small * 2 - radius: Appearance.rounding.full + implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 + radius: Tokens.rounding.full } MaterialIcon { @@ -34,6 +34,6 @@ Item { text: "settings" color: Colours.palette.m3onSurface font.bold: true - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } diff --git a/modules/bar/components/SettingsIcon.qml b/modules/bar/components/SettingsIcon.qml index f6ed88af..f060225c 100644 --- a/modules/bar/components/SettingsIcon.qml +++ b/modules/bar/components/SettingsIcon.qml @@ -1,13 +1,13 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.controlcenter Item { id: root - implicitWidth: icon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: icon.implicitHeight + Tokens.padding.small * 2 implicitHeight: icon.implicitHeight StateLayer { @@ -21,8 +21,8 @@ Item { anchors.fill: undefined anchors.centerIn: parent implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.small * 2 - radius: Appearance.rounding.full + implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 + radius: Tokens.rounding.full } MaterialIcon { @@ -34,6 +34,6 @@ Item { text: "settings" color: Colours.palette.m3onSurface font.bold: true - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index 455e04ef..c32bc21f 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/modules/bar/components/StatusIcons.qml @@ -7,7 +7,7 @@ import Quickshell.Bluetooth import Quickshell.Services.UPower import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils StyledRect { @@ -17,11 +17,11 @@ StyledRect { readonly property alias items: iconColumn color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full clip: true implicitWidth: Config.bar.sizes.innerWidth - implicitHeight: iconColumn.implicitHeight + Appearance.padding.normal * 2 - (Config.bar.status.showLockStatus && !Hypr.capsLock && !Hypr.numLock ? iconColumn.spacing : 0) + implicitHeight: iconColumn.implicitHeight + Tokens.padding.normal * 2 - (Config.bar.status.showLockStatus && !Hypr.capsLock && !Hypr.numLock ? iconColumn.spacing : 0) ColumnLayout { id: iconColumn @@ -29,9 +29,9 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.bottomMargin: Appearance.padding.normal + anchors.bottomMargin: Tokens.padding.normal - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 // Lock keys status WrappedLoader { @@ -136,7 +136,7 @@ StyledRect { animate: true text: Hypr.kbLayout color: root.colour - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono } } @@ -172,7 +172,7 @@ StyledRect { active: Config.bar.status.showBluetooth sourceComponent: ColumnLayout { - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 // Bluetooth icon MaterialIcon { @@ -211,14 +211,14 @@ StyledRect { Anim { from: 1 to: 0 - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.standardAccel } Anim { from: 0 to: 1 - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.standardDecel } } } diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index 79b57755..76785813 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Services.SystemTray import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -14,8 +14,8 @@ StyledRect { readonly property alias items: items readonly property alias expandIcon: expandIcon - readonly property int padding: Config.bar.tray.background ? Appearance.padding.normal : Appearance.padding.small - readonly property int spacing: Config.bar.tray.background ? Appearance.spacing.small : 0 + readonly property int padding: Config.bar.tray.background ? Tokens.padding.normal : Tokens.padding.small + readonly property int spacing: Config.bar.tray.background ? Tokens.spacing.small : 0 property bool expanded @@ -32,7 +32,7 @@ StyledRect { implicitHeight: nonAnimHeight color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (Config.bar.tray.background && items.count > 0) ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.full + radius: Tokens.rounding.full Column { id: layout @@ -40,7 +40,7 @@ StyledRect { anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.topMargin: root.padding - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small opacity: root.expanded || !Config.bar.tray.compact ? 1 : 0 @@ -49,7 +49,7 @@ StyledRect { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } @@ -57,7 +57,7 @@ StyledRect { Anim { properties: "scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" @@ -91,16 +91,16 @@ StyledRect { sourceComponent: Item { implicitWidth: expandIconInner.implicitWidth - implicitHeight: expandIconInner.implicitHeight - Appearance.padding.small * 2 + implicitHeight: expandIconInner.implicitHeight - Tokens.padding.small * 2 MaterialIcon { id: expandIconInner anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom - anchors.bottomMargin: Config.bar.tray.background ? Appearance.padding.small : -Appearance.padding.small + anchors.bottomMargin: Config.bar.tray.background ? Tokens.padding.small : -Tokens.padding.small text: "expand_less" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large rotation: root.expanded ? 180 : 0 Behavior on rotation { @@ -116,8 +116,8 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml index c5cb9fe8..1320eb2a 100644 --- a/modules/bar/components/TrayItem.qml +++ b/modules/bar/components/TrayItem.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell.Services.SystemTray import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils MouseArea { @@ -13,8 +13,8 @@ MouseArea { required property SystemTrayItem modelData acceptedButtons: Qt.LeftButton | Qt.RightButton - implicitWidth: Appearance.font.size.small * 2 - implicitHeight: Appearance.font.size.small * 2 + implicitWidth: Tokens.font.size.small * 2 + implicitHeight: Tokens.font.size.small * 2 onClicked: event => { if (event.button === Qt.LeftButton) diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index d10086fd..0c785901 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -2,7 +2,7 @@ import QtQuick import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -42,9 +42,9 @@ StyledRect { clip: true y: offset + mask.y - implicitWidth: Config.bar.sizes.innerWidth - Appearance.padding.small * 2 + implicitWidth: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 implicitHeight: size - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primary Colouriser { @@ -70,7 +70,7 @@ StyledRect { enabled: Config.bar.workspaces.activeTrail EAnim { - duration: Appearance.anim.durations.normal * 2 + duration: Tokens.anim.durations.normal * 2 } } @@ -93,6 +93,6 @@ StyledRect { } component EAnim: Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml index 3f087160..891b1250 100644 --- a/modules/bar/components/workspaces/OccupiedBg.qml +++ b/modules/bar/components/workspaces/OccupiedBg.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -65,18 +65,18 @@ Item { anchors.horizontalCenter: root.horizontalCenter y: (start?.y ?? 0) - 1 - implicitWidth: Config.bar.sizes.innerWidth - Appearance.padding.small * 2 + 2 + implicitWidth: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 + 2 implicitHeight: start && end ? end.y + end.size - start.y + 2 : 0 color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full scale: 0 Component.onCompleted: scale = 1 Behavior on scale { Anim { - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml index cef8a990..741d4340 100644 --- a/modules/bar/components/workspaces/SpecialWorkspaces.qml +++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml @@ -7,7 +7,7 @@ import Quickshell.Hyprland import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -31,7 +31,7 @@ Item { Rectangle { anchors.fill: parent - radius: Appearance.rounding.full + radius: Tokens.rounding.full gradient: Gradient { orientation: Gradient.Vertical @@ -60,7 +60,7 @@ Item { anchors.left: parent.left anchors.right: parent.right - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitHeight: parent.height / 2 opacity: view.contentY > 0 ? 0 : 1 @@ -74,9 +74,9 @@ Item { anchors.left: parent.left anchors.right: parent.right - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitHeight: parent.height / 2 - opacity: view.contentY < view.contentHeight - parent.height + Appearance.padding.small ? 0 : 1 + opacity: view.contentY < view.contentHeight - parent.height + Tokens.padding.small ? 0 : 1 Behavior on opacity { Anim {} @@ -88,7 +88,7 @@ Item { id: view anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal interactive: false currentIndex: model.values.findIndex(w => w.name === root.activeSpecial) @@ -119,7 +119,7 @@ Item { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } @@ -127,12 +127,12 @@ Item { Anim { property: "scale" to: 0.5 - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } Anim { property: "opacity" to: 0 - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } @@ -140,7 +140,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" @@ -151,7 +151,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" @@ -175,7 +175,7 @@ Item { implicitHeight: (view.currentItem as SpecialWsDelegate)?.size ?? 0 color: Colours.palette.m3tertiary - radius: Appearance.rounding.full + radius: Tokens.rounding.full Colouriser { source: view @@ -192,13 +192,13 @@ Item { Behavior on y { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } Behavior on implicitHeight { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -213,7 +213,7 @@ Item { drag.target: view.contentItem drag.axis: Drag.YAxis drag.maximumY: 0 - drag.minimumY: Math.min(0, view.height - view.contentHeight - Appearance.padding.small) + drag.minimumY: Math.min(0, view.height - view.contentHeight - Tokens.padding.small) onPressed: event => startY = event.y @@ -233,7 +233,7 @@ Item { id: ws required property HyprlandWorkspace modelData - readonly property int size: label.Layout.preferredHeight + (hasWindows ? windows.implicitHeight + Appearance.padding.small : 0) + readonly property int size: label.Layout.preferredHeight + (hasWindows ? windows.implicitHeight + Tokens.padding.small : 0) property int wsId property string icon property bool hasWindows @@ -284,7 +284,7 @@ Item { asynchronous: true Layout.alignment: Qt.AlignHCenter | Qt.AlignTop - Layout.preferredHeight: Config.bar.sizes.innerWidth - Appearance.padding.small * 2 + Layout.preferredHeight: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 sourceComponent: ws.icon.length === 1 ? letterComp : iconComp @@ -328,7 +328,7 @@ Item { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } @@ -336,7 +336,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml index bfbdc2ac..af037051 100644 --- a/modules/bar/components/workspaces/Workspace.qml +++ b/modules/bar/components/workspaces/Workspace.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -18,7 +18,7 @@ ColumnLayout { readonly property bool isWorkspace: true // Flag for finding workspace children // Unanimated prop for others to use as reference - readonly property int size: implicitHeight + (hasWindows ? Appearance.padding.small : 0) + readonly property int size: implicitHeight + (hasWindows ? Tokens.padding.small : 0) readonly property int ws: groupOffset + index + 1 readonly property bool isOccupied: occupied[ws] ?? false @@ -33,7 +33,7 @@ ColumnLayout { id: indicator Layout.alignment: Qt.AlignHCenter | Qt.AlignTop - Layout.preferredHeight: Config.bar.sizes.innerWidth - Appearance.padding.small * 2 + Layout.preferredHeight: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 animate: true text: { @@ -74,7 +74,7 @@ ColumnLayout { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } @@ -82,7 +82,7 @@ ColumnLayout { Anim { properties: "scale" to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { properties: "x,y" diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml index bbbfdfbc..a0ccb775 100644 --- a/modules/bar/components/workspaces/Workspaces.qml +++ b/modules/bar/components/workspaces/Workspaces.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config StyledClippingRect { id: root @@ -28,10 +28,10 @@ StyledClippingRect { property real blur: onSpecial ? 1 : 0 implicitWidth: Config.bar.sizes.innerWidth - implicitHeight: layout.implicitHeight + Appearance.padding.small * 2 + implicitHeight: layout.implicitHeight + Tokens.padding.small * 2 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full Item { anchors.fill: parent @@ -51,7 +51,7 @@ StyledClippingRect { active: Config.bar.workspaces.occupiedBg anchors.fill: parent - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small sourceComponent: OccupiedBg { workspaces: workspaces @@ -64,7 +64,7 @@ StyledClippingRect { id: layout anchors.centerIn: parent - spacing: Math.floor(Appearance.spacing.small / 2) + spacing: Math.floor(Tokens.spacing.small / 2) Repeater { id: workspaces @@ -118,7 +118,7 @@ StyledClippingRect { asynchronous: true anchors.fill: parent - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small active: opacity > 0 @@ -140,7 +140,7 @@ StyledClippingRect { Behavior on blur { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml index 7e4bd60a..a37d81f9 100644 --- a/modules/bar/popouts/ActiveWindow.qml +++ b/modules/bar/popouts/ActiveWindow.qml @@ -4,7 +4,7 @@ import Quickshell.Wayland import Quickshell.Widgets import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -12,21 +12,21 @@ Item { required property PopoutState popouts - implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Appearance.padding.large * 2 + implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Tokens.padding.large * 2 implicitHeight: child.implicitHeight Column { id: child anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { id: detailsRow anchors.left: parent.left anchors.right: parent.right - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal IconImage { id: icon @@ -46,7 +46,7 @@ Item { StyledText { Layout.fillWidth: true text: Hypr.activeToplevel?.title ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } @@ -59,8 +59,8 @@ Item { } Item { - implicitWidth: expandIcon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: expandIcon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: expandIcon.implicitHeight + Tokens.padding.small * 2 + implicitHeight: expandIcon.implicitHeight + Tokens.padding.small * 2 Layout.alignment: Qt.AlignVCenter @@ -69,7 +69,7 @@ Item { root.popouts.detachRequested("winfo"); } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } MaterialIcon { @@ -80,14 +80,14 @@ Item { text: "chevron_right" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } ClippingWrapperRectangle { color: "transparent" - radius: Appearance.rounding.small + radius: Tokens.rounding.small ScreencopyView { id: preview diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml index 52ac3b80..50bf1915 100644 --- a/modules/bar/popouts/Audio.qml +++ b/modules/bar/popouts/Audio.qml @@ -7,15 +7,15 @@ import Quickshell.Services.Pipewire import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config Item { id: root required property PopoutState popouts - implicitWidth: layout.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: layout.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: layout.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: layout.implicitHeight + Tokens.padding.normal * 2 ButtonGroup { id: sinks @@ -30,7 +30,7 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: qsTr("Output device") @@ -53,7 +53,7 @@ Item { } StyledText { - Layout.topMargin: Appearance.spacing.smaller + Layout.topMargin: Tokens.spacing.smaller text: qsTr("Input device") font.weight: 500 } @@ -72,15 +72,15 @@ Item { } StyledText { - Layout.topMargin: Appearance.spacing.smaller - Layout.bottomMargin: -Appearance.spacing.small / 2 + Layout.topMargin: Tokens.spacing.smaller + Layout.bottomMargin: -Tokens.spacing.small / 2 text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`) font.weight: 500 } CustomMouseArea { Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 onWheel: event => { if (event.angleDelta.y > 0) @@ -105,10 +105,10 @@ Item { IconTextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer - verticalPadding: Appearance.padding.small + verticalPadding: Tokens.padding.small text: qsTr("Open settings") icon: "settings" diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index 86d903d2..2a11071e 100644 --- a/modules/bar/popouts/Battery.qml +++ b/modules/bar/popouts/Battery.qml @@ -4,12 +4,12 @@ import QtQuick import Quickshell.Services.UPower import qs.components import qs.services -import qs.config +import Caelestia.Config Column { id: root - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal width: Config.bar.sizes.batteryWidth StyledText { @@ -45,11 +45,11 @@ Column { height: active ? ((item as Item)?.implicitHeight ?? 0) : 0 sourceComponent: StyledRect { - implicitWidth: child.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: child.implicitHeight + Appearance.padding.smaller * 2 + implicitWidth: child.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: child.implicitHeight + Tokens.padding.smaller * 2 color: Colours.palette.m3error - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal Column { id: child @@ -58,7 +58,7 @@ Column { Row { anchors.horizontalCenter: parent.horizontalCenter - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { anchors.verticalCenter: parent.verticalCenter @@ -72,7 +72,7 @@ Column { anchors.verticalCenter: parent.verticalCenter text: qsTr("Performance Degraded") color: Colours.palette.m3onError - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono font.weight: 500 } @@ -109,17 +109,17 @@ Column { anchors.horizontalCenter: parent.horizontalCenter - implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Appearance.padding.normal * 2 + Appearance.spacing.large * 2 - implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Appearance.padding.small * 2 + implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.normal * 2 + Tokens.spacing.large * 2 + implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.small * 2 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full StyledRect { id: indicator color: Colours.palette.m3primary - radius: Appearance.rounding.full + radius: Tokens.rounding.full state: profiles.current states: [ @@ -148,9 +148,9 @@ Column { transitions: Transition { AnchorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -160,7 +160,7 @@ Column { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: Appearance.padding.small + anchors.leftMargin: Tokens.padding.small profile: PowerProfile.PowerSaver icon: "energy_savings_leaf" @@ -180,7 +180,7 @@ Column { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: Appearance.padding.small + anchors.rightMargin: Tokens.padding.small profile: PowerProfile.Performance icon: "rocket_launch" @@ -201,15 +201,15 @@ Column { required property string icon required property int profile - implicitWidth: icon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: icon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: icon.implicitHeight + Tokens.padding.small * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 StateLayer { function onClicked(): void { PowerProfiles.profile = parent.profile; } - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: profiles.current === parent.icon ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface } @@ -219,7 +219,7 @@ Column { anchors.centerIn: parent text: parent.icon - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large color: profiles.current === text ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface fill: profiles.current === text ? 1 : 0 diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml index 027b3d41..d5cc0f61 100644 --- a/modules/bar/popouts/Bluetooth.qml +++ b/modules/bar/popouts/Bluetooth.qml @@ -7,7 +7,7 @@ import Quickshell.Bluetooth import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -16,11 +16,11 @@ ColumnLayout { required property PopoutState popouts width: 300 - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { - Layout.topMargin: Appearance.padding.normal - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: Tokens.padding.normal + Layout.rightMargin: Tokens.padding.small text: qsTr("Bluetooth") font.weight: 500 } @@ -46,8 +46,8 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.spacing.small - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: Tokens.spacing.small + Layout.rightMargin: Tokens.padding.small text: { const devices = Bluetooth.devices.values; // qmllint disable unresolved-type let available = qsTr("%1 device%2 available").arg(devices.length).arg(devices.length === 1 ? "" : "s"); @@ -57,7 +57,7 @@ ColumnLayout { return available; } color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } Repeater { @@ -72,8 +72,8 @@ ColumnLayout { readonly property bool loading: modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting // qmllint disable unresolved-type Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - spacing: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + spacing: Tokens.spacing.small opacity: 0 scale: 0.7 @@ -96,8 +96,8 @@ ColumnLayout { } StyledText { - Layout.leftMargin: Appearance.spacing.small / 2 - Layout.rightMargin: Appearance.spacing.small / 2 + Layout.leftMargin: Tokens.spacing.small / 2 + Layout.rightMargin: Tokens.spacing.small / 2 Layout.fillWidth: true text: device.modelData.name elide: Text.ElideRight @@ -113,9 +113,9 @@ ColumnLayout { id: connectBtn implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.small + implicitHeight: connectIcon.implicitHeight + Tokens.padding.small - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primary, device.modelData.state === BluetoothDeviceState.Connected ? 1 : 0) // qmllint disable unresolved-type CircularIndicator { @@ -161,7 +161,7 @@ ColumnLayout { device.modelData.forget(); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full } MaterialIcon { @@ -175,10 +175,10 @@ ColumnLayout { IconTextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer - verticalPadding: Appearance.padding.small + verticalPadding: Tokens.padding.small text: qsTr("Open settings") icon: "settings" @@ -191,8 +191,8 @@ ColumnLayout { property alias toggle: toggle Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - spacing: Appearance.spacing.normal + Layout.rightMargin: Tokens.padding.small + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/modules/bar/popouts/ClipWrapper.qml b/modules/bar/popouts/ClipWrapper.qml index bf2a0049..810ac2e5 100644 --- a/modules/bar/popouts/ClipWrapper.qml +++ b/modules/bar/popouts/ClipWrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.components -import qs.config +import Caelestia.Config import qs.modules.bar.popouts // Need to import this module so the Wrapper type is the same as others Item { @@ -35,8 +35,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/bar/popouts/Content.qml b/modules/bar/popouts/Content.qml index 71a8c5eb..381d3ef0 100644 --- a/modules/bar/popouts/Content.qml +++ b/modules/bar/popouts/Content.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import Quickshell.Services.SystemTray import qs.components -import qs.config +import Caelestia.Config Item { id: root @@ -14,14 +14,14 @@ Item { readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null readonly property Item current: currentPopout?.item ?? null - implicitWidth: (currentPopout?.implicitWidth ?? 0) + Appearance.padding.large * 2 - implicitHeight: (currentPopout?.implicitHeight ?? 0) + Appearance.padding.large * 2 + implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.large * 2 + implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.large * 2 Item { id: content anchors.fill: parent - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large Popout { name: "activewindow" @@ -194,7 +194,7 @@ Item { SequentialAnimation { Anim { properties: "opacity,scale" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } PropertyAction { target: popout diff --git a/modules/bar/popouts/LockStatus.qml b/modules/bar/popouts/LockStatus.qml index 9b61e037..4d646a0c 100644 --- a/modules/bar/popouts/LockStatus.qml +++ b/modules/bar/popouts/LockStatus.qml @@ -1,10 +1,10 @@ import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: qsTr("Capslock: %1").arg(Hypr.capsLock ? "Enabled" : "Disabled") diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml index 53350ee7..6bcf6604 100644 --- a/modules/bar/popouts/Network.qml +++ b/modules/bar/popouts/Network.qml @@ -6,7 +6,7 @@ import Quickshell import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -19,15 +19,15 @@ ColumnLayout { property var passwordNetwork: null property bool showPasswordDialog: false - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small width: Config.bar.sizes.networkWidth // Wireless section StyledText { visible: root.view === "wireless" Layout.preferredHeight: visible ? implicitHeight : 0 - Layout.topMargin: visible ? Appearance.padding.normal : 0 - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: visible ? Tokens.padding.normal : 0 + Layout.rightMargin: Tokens.padding.small text: qsTr("Wireless") font.weight: 500 } @@ -43,11 +43,11 @@ ColumnLayout { StyledText { visible: root.view === "wireless" Layout.preferredHeight: visible ? implicitHeight : 0 - Layout.topMargin: visible ? Appearance.spacing.small : 0 - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: visible ? Tokens.spacing.small : 0 + Layout.rightMargin: Tokens.padding.small text: qsTr("%1 networks available").arg(Nmcli.networks.length) // qmllint disable missing-property color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } Repeater { @@ -70,8 +70,8 @@ ColumnLayout { visible: root.view === "wireless" Layout.preferredHeight: visible ? implicitHeight : 0 Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - spacing: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + spacing: Tokens.spacing.small opacity: 0 scale: 0.7 @@ -97,12 +97,12 @@ ColumnLayout { MaterialIcon { visible: networkItem.modelData.isSecure text: "lock" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.leftMargin: Appearance.spacing.small / 2 - Layout.rightMargin: Appearance.spacing.small / 2 + Layout.leftMargin: Tokens.spacing.small / 2 + Layout.rightMargin: Tokens.spacing.small / 2 Layout.fillWidth: true text: networkItem.modelData.ssid elide: Text.ElideRight @@ -112,9 +112,9 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: wirelessConnectIcon.implicitHeight + Appearance.padding.small + implicitHeight: wirelessConnectIcon.implicitHeight + Tokens.padding.small - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primary, networkItem.modelData.active ? 1 : 0) CircularIndicator { @@ -165,11 +165,11 @@ ColumnLayout { StyledRect { visible: root.view === "wireless" Layout.preferredHeight: visible ? implicitHeight : 0 - Layout.topMargin: visible ? Appearance.spacing.small : 0 + Layout.topMargin: visible ? Tokens.spacing.small : 0 Layout.fillWidth: true - implicitHeight: rescanBtn.implicitHeight + Appearance.padding.small * 2 + implicitHeight: rescanBtn.implicitHeight + Tokens.padding.small * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primaryContainer StateLayer { @@ -185,7 +185,7 @@ ColumnLayout { id: rescanBtn anchors.centerIn: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small opacity: Nmcli.scanning ? 0 : 1 MaterialIcon { @@ -210,9 +210,9 @@ ColumnLayout { CircularIndicator { anchors.centerIn: parent - strokeWidth: Appearance.padding.small / 2 + strokeWidth: Tokens.padding.small / 2 bgColour: "transparent" - implicitSize: parent.implicitHeight - Appearance.padding.smaller * 2 + implicitSize: parent.implicitHeight - Tokens.padding.smaller * 2 running: Nmcli.scanning } } @@ -221,8 +221,8 @@ ColumnLayout { StyledText { visible: root.view === "ethernet" Layout.preferredHeight: visible ? implicitHeight : 0 - Layout.topMargin: visible ? Appearance.padding.normal : 0 - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: visible ? Tokens.padding.normal : 0 + Layout.rightMargin: Tokens.padding.small text: qsTr("Ethernet") font.weight: 500 } @@ -230,11 +230,11 @@ ColumnLayout { StyledText { visible: root.view === "ethernet" Layout.preferredHeight: visible ? implicitHeight : 0 - Layout.topMargin: visible ? Appearance.spacing.small : 0 - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: visible ? Tokens.spacing.small : 0 + Layout.rightMargin: Tokens.padding.small text: qsTr("%1 devices available").arg(Nmcli.ethernetDevices.length) color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } Repeater { @@ -256,8 +256,8 @@ ColumnLayout { visible: root.view === "ethernet" Layout.preferredHeight: visible ? implicitHeight : 0 Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - spacing: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + spacing: Tokens.spacing.small opacity: 0 scale: 0.7 @@ -281,8 +281,8 @@ ColumnLayout { } StyledText { - Layout.leftMargin: Appearance.spacing.small / 2 - Layout.rightMargin: Appearance.spacing.small / 2 + Layout.leftMargin: Tokens.spacing.small / 2 + Layout.rightMargin: Tokens.spacing.small / 2 Layout.fillWidth: true text: ethernetItem.modelData.interface || qsTr("Unknown") elide: Text.ElideRight @@ -292,9 +292,9 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.small + implicitHeight: connectIcon.implicitHeight + Tokens.padding.small - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primary, ethernetItem.modelData.connected ? 1 : 0) CircularIndicator { @@ -374,8 +374,8 @@ ColumnLayout { property alias toggle: toggle Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - spacing: Appearance.spacing.normal + Layout.rightMargin: Tokens.padding.small + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml index 4347e39e..f39d64b0 100644 --- a/modules/bar/popouts/TrayMenu.qml +++ b/modules/bar/popouts/TrayMenu.qml @@ -6,7 +6,7 @@ import Quickshell import Quickshell.Widgets import qs.components import qs.services -import qs.config +import Caelestia.Config StackView { id: root @@ -45,8 +45,8 @@ StackView { property bool isSubMenu property bool shown - padding: Appearance.padding.smaller - spacing: Appearance.spacing.small + padding: Tokens.padding.smaller + spacing: Tokens.spacing.small opacity: shown ? 1 : 0 scale: shown ? 1 : 0.8 @@ -81,7 +81,7 @@ StackView { implicitWidth: Config.bar.sizes.trayMenuWidth implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: modelData.isSeparator ? Colours.palette.m3outlineVariant : "transparent" Loader { @@ -110,9 +110,9 @@ StackView { } } - anchors.margins: -Appearance.padding.small / 2 - anchors.leftMargin: -Appearance.padding.smaller - anchors.rightMargin: -Appearance.padding.smaller + anchors.margins: -Tokens.padding.small / 2 + anchors.leftMargin: -Tokens.padding.smaller + anchors.rightMargin: -Tokens.padding.smaller radius: item.radius disabled: !item.modelData.enabled @@ -138,7 +138,7 @@ StackView { id: label anchors.left: icon.right - anchors.leftMargin: icon.active ? Appearance.spacing.smaller : 0 + anchors.leftMargin: icon.active ? Tokens.spacing.smaller : 0 text: labelMetrics.elidedText color: item.modelData.enabled ? Colours.palette.m3onSurface : Colours.palette.m3outline @@ -152,7 +152,7 @@ StackView { font.family: label.font.family elide: Text.ElideRight - elideWidth: Config.bar.sizes.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + Appearance.spacing.normal : 0) + elideWidth: Config.bar.sizes.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + Tokens.spacing.normal : 0) } Loader { @@ -180,7 +180,7 @@ StackView { sourceComponent: Item { implicitWidth: back.implicitWidth - implicitHeight: back.implicitHeight + Appearance.spacing.small / 2 + implicitHeight: back.implicitHeight + Tokens.spacing.small / 2 Item { anchors.bottom: parent.bottom @@ -189,11 +189,11 @@ StackView { StyledRect { anchors.fill: parent - anchors.margins: -Appearance.padding.small / 2 - anchors.leftMargin: -Appearance.padding.smaller - anchors.rightMargin: -Appearance.padding.smaller * 2 + anchors.margins: -Tokens.padding.small / 2 + anchors.leftMargin: -Tokens.padding.smaller + anchors.rightMargin: -Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3secondaryContainer StateLayer { diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml index 8858273d..15317069 100644 --- a/modules/bar/popouts/WirelessPassword.qml +++ b/modules/bar/popouts/WirelessPassword.qml @@ -6,7 +6,7 @@ import Quickshell import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -69,9 +69,9 @@ ColumnLayout { } } - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal implicitWidth: 400 - implicitHeight: content.implicitHeight + Appearance.padding.large * 2 + implicitHeight: content.implicitHeight + Tokens.padding.large * 2 visible: shouldBeVisible || isClosing enabled: shouldBeVisible && !isClosing focus: enabled @@ -128,8 +128,8 @@ ColumnLayout { StyledRect { Layout.fillWidth: true Layout.preferredWidth: 400 - implicitHeight: content.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: content.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer visible: root.shouldBeVisible || root.isClosing opacity: root.shouldBeVisible && !root.isClosing ? 1 : 0 @@ -170,20 +170,20 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { Layout.alignment: Qt.AlignHCenter text: "lock" - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("Enter password") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -201,7 +201,7 @@ ColumnLayout { return qsTr("Network: Unknown"); } color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } Timer { @@ -237,7 +237,7 @@ ColumnLayout { id: statusText Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.spacing.small + Layout.topMargin: Tokens.spacing.small visible: connectButton.connecting || connectButton.hasError text: { if (connectButton.hasError) { @@ -249,10 +249,10 @@ ColumnLayout { return ""; } color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: 400 wrapMode: Text.WordWrap - Layout.maximumWidth: parent.width - Appearance.padding.large * 2 + Layout.maximumWidth: parent.width - Tokens.padding.large * 2 } FocusScope { @@ -261,9 +261,9 @@ ColumnLayout { property string passwordBuffer: "" objectName: "passwordContainer" - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large Layout.fillWidth: true - implicitHeight: Math.max(48, charList.implicitHeight + Appearance.padding.normal * 2) + implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.normal * 2) focus: true activeFocusOnTab: true @@ -336,7 +336,7 @@ ColumnLayout { StyledRect { anchors.fill: parent - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.shouldBeVisible ? 1 : 0) border.color: { @@ -369,7 +369,7 @@ ColumnLayout { hoverEnabled: false cursorShape: Qt.IBeamCursor - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } StyledText { @@ -378,8 +378,8 @@ ColumnLayout { anchors.centerIn: parent text: qsTr("Password") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.normal + font.family: Tokens.font.family.mono opacity: passwordContainer.passwordBuffer ? 0 : 1 Behavior on opacity { @@ -394,10 +394,10 @@ ColumnLayout { anchors.centerIn: parent implicitWidth: fullWidth - implicitHeight: Appearance.font.size.normal + implicitHeight: Tokens.font.size.normal orientation: Qt.Horizontal - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 interactive: false model: ScriptModel { @@ -411,7 +411,7 @@ ColumnLayout { implicitHeight: charList.implicitHeight color: Colours.palette.m3onSurface - radius: Appearance.rounding.small / 2 + radius: Tokens.rounding.small / 2 opacity: 0 scale: 0 @@ -454,8 +454,8 @@ ColumnLayout { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } @@ -467,15 +467,15 @@ ColumnLayout { } RowLayout { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal TextButton { id: cancelButton Layout.fillWidth: true - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer text: qsTr("Cancel") @@ -490,7 +490,7 @@ ColumnLayout { property bool hasError: false Layout.fillWidth: true - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 inactiveColour: Colours.palette.m3primary inactiveOnColour: Colours.palette.m3onPrimary text: qsTr("Connect") diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml index 04212e28..fbf5075f 100644 --- a/modules/bar/popouts/Wrapper.qml +++ b/modules/bar/popouts/Wrapper.qml @@ -6,7 +6,7 @@ import Quickshell.Hyprland import Quickshell.Wayland import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.controlcenter import qs.modules.windowinfo @@ -32,13 +32,13 @@ Item { property string detachedMode property string queuedMode - property int animLength: Appearance.anim.durations.expressiveDefaultSpatial - property list animCurve: Appearance.anim.curves.expressiveDefaultSpatial + property int animLength: Tokens.anim.durations.expressiveDefaultSpatial + property list animCurve: Tokens.anim.curves.expressiveDefaultSpatial function setAnims(detach: bool): void { const type = `expressive${detach ? "Slow" : "Default"}Spatial`; - animLength = Appearance.anim.durations[type]; - animCurve = Appearance.anim.curves[type]; + animLength = Tokens.anim.durations[type]; + animCurve = Tokens.anim.curves[type]; } function detach(mode: string): void { diff --git a/modules/bar/popouts/kblayout/KbLayout.qml b/modules/bar/popouts/kblayout/KbLayout.qml index 3e581902..5767de46 100644 --- a/modules/bar/popouts/kblayout/KbLayout.qml +++ b/modules/bar/popouts/kblayout/KbLayout.qml @@ -5,7 +5,7 @@ import QtQuick.Controls import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -14,7 +14,7 @@ ColumnLayout { kb.refresh(); } - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small width: Config.bar.sizes.kbLayoutWidth Component.onCompleted: kb.start() @@ -24,8 +24,8 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.padding.normal - Layout.rightMargin: Appearance.padding.small + Layout.topMargin: Tokens.padding.normal + Layout.rightMargin: Tokens.padding.small text: qsTr("Keyboard Layouts") font.weight: 500 } @@ -36,14 +36,14 @@ ColumnLayout { model: kb.visibleModel Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - Layout.topMargin: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + Layout.topMargin: Tokens.spacing.small clip: true interactive: true implicitHeight: Math.min(contentHeight, 320) visible: kb.visibleModel.count > 0 - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small add: Transition { NumberAnimation { @@ -88,7 +88,7 @@ ColumnLayout { readonly property bool isDisabled: layoutIndex > 3 width: list.width - height: Math.max(36, rowText.implicitHeight + Appearance.padding.small * 2) + height: Math.max(36, rowText.implicitHeight + Tokens.padding.small * 2) ToolTip.visible: isDisabled && layer.containsMouse ToolTip.text: "XKB limitation: maximum 4 layouts allowed" @@ -104,7 +104,7 @@ ColumnLayout { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter implicitHeight: parent.height - 4 - radius: Appearance.rounding.full + radius: Tokens.rounding.full enabled: !kbDelegate.isDisabled } @@ -114,8 +114,8 @@ ColumnLayout { anchors.verticalCenter: layer.verticalCenter anchors.left: layer.left anchors.right: layer.right - anchors.leftMargin: Appearance.padding.small - anchors.rightMargin: Appearance.padding.small + anchors.leftMargin: Tokens.padding.small + anchors.rightMargin: Tokens.padding.small text: kbDelegate.label elide: Text.ElideRight opacity: kbDelegate.isDisabled ? 0.4 : 1.0 @@ -126,8 +126,8 @@ ColumnLayout { Rectangle { visible: kb.activeLabel.length > 0 Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - Layout.topMargin: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + Layout.topMargin: Tokens.spacing.small implicitHeight: 1 color: Colours.palette.m3onSurfaceVariant @@ -139,9 +139,9 @@ ColumnLayout { visible: kb.activeLabel.length > 0 Layout.fillWidth: true - Layout.rightMargin: Appearance.padding.small - Layout.topMargin: Appearance.spacing.small - spacing: Appearance.spacing.small + Layout.rightMargin: Tokens.padding.small + Layout.topMargin: Tokens.spacing.small + spacing: Tokens.spacing.small opacity: 1 scale: 1 diff --git a/modules/bar/popouts/kblayout/KbLayoutModel.qml b/modules/bar/popouts/kblayout/KbLayoutModel.qml index 4caebbd2..b6535847 100644 --- a/modules/bar/popouts/kblayout/KbLayoutModel.qml +++ b/modules/bar/popouts/kblayout/KbLayoutModel.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell.Io import Caelestia -import qs.config +import Caelestia.Config // TODO: handle this better later diff --git a/modules/controlcenter/ControlCenter.qml b/modules/controlcenter/ControlCenter.qml index 5b067fc0..9b1f01ea 100644 --- a/modules/controlcenter/ControlCenter.qml +++ b/modules/controlcenter/ControlCenter.qml @@ -6,13 +6,13 @@ import Quickshell import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config Item { id: root required property ShellScreen screen - readonly property int rounding: floating ? 0 : Appearance.rounding.normal + readonly property int rounding: floating ? 0 : Tokens.rounding.normal property alias floating: session.floating property alias active: session.active diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml index 037ea0d6..706d9d98 100644 --- a/modules/controlcenter/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.controlcenter Item { @@ -15,23 +15,23 @@ Item { required property Session session required property bool initialOpeningComplete - implicitWidth: layout.implicitWidth + Appearance.padding.larger * 4 - implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 + implicitWidth: layout.implicitWidth + Tokens.padding.larger * 4 + implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 ColumnLayout { id: layout anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.larger * 2 - spacing: Appearance.spacing.normal + anchors.leftMargin: Tokens.padding.larger * 2 + spacing: Tokens.spacing.normal states: State { name: "expanded" when: root.session.navExpanded PropertyChanges { - layout.spacing: Appearance.spacing.small + layout.spacing: Tokens.spacing.small } } @@ -42,7 +42,7 @@ Item { } Loader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large asynchronous: true active: !root.session.floating visible: active @@ -51,10 +51,10 @@ Item { readonly property int nonAnimWidth: normalWinIcon.implicitWidth + (root.session.navExpanded ? normalWinLabel.anchors.leftMargin + normalWinLabel.implicitWidth : 0) + normalWinIcon.anchors.leftMargin * 2 implicitWidth: nonAnimWidth - implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Appearance.padding.normal * 2 : nonAnimWidth + implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Tokens.padding.normal * 2 : nonAnimWidth color: Colours.palette.m3primaryContainer - radius: Appearance.rounding.small + radius: Tokens.rounding.small StateLayer { id: normalWinState @@ -75,11 +75,11 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.large + anchors.leftMargin: Tokens.padding.large text: "select_window" color: Colours.palette.m3onPrimaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: 1 } @@ -88,7 +88,7 @@ Item { anchors.left: normalWinIcon.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal text: qsTr("Float window") color: Colours.palette.m3onPrimaryContainer @@ -96,22 +96,22 @@ Item { Behavior on opacity { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } Behavior on implicitWidth { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -123,7 +123,7 @@ Item { NavItem { required property int index - Layout.topMargin: index === 0 ? Appearance.spacing.large * 2 : 0 + Layout.topMargin: index === 0 ? Tokens.spacing.large * 2 : 0 icon: PaneRegistry.getByIndex(index).icon label: PaneRegistry.getByIndex(index).label } @@ -148,7 +148,7 @@ Item { expandedLabel.opacity: 1 smallLabel.opacity: 0 background.implicitWidth: icon.implicitWidth + icon.anchors.leftMargin * 2 + expandedLabel.anchors.leftMargin + expandedLabel.implicitWidth - background.implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 + background.implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2 item.implicitHeight: background.implicitHeight } } @@ -156,24 +156,24 @@ Item { transitions: Transition { Anim { property: "opacity" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } Anim { properties: "implicitWidth,implicitHeight" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } StyledRect { id: background - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3secondaryContainer, item.active ? 1 : 0) implicitWidth: icon.implicitWidth + icon.anchors.leftMargin * 2 - implicitHeight: icon.implicitHeight + Appearance.padding.small + implicitHeight: icon.implicitHeight + Tokens.padding.small StateLayer { function onClicked(): void { @@ -192,11 +192,11 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.large + anchors.leftMargin: Tokens.padding.large text: item.icon color: item.active ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: item.active ? 1 : 0 Behavior on fill { @@ -209,7 +209,7 @@ Item { anchors.left: icon.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal opacity: 0 text: item.label @@ -222,10 +222,10 @@ Item { anchors.horizontalCenter: icon.horizontalCenter anchors.top: icon.bottom - anchors.topMargin: Appearance.spacing.small / 2 + anchors.topMargin: Tokens.spacing.small / 2 text: item.label - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.capitalization: Font.Capitalize } } diff --git a/modules/controlcenter/Panes.qml b/modules/controlcenter/Panes.qml index 6a536410..c8718528 100644 --- a/modules/controlcenter/Panes.qml +++ b/modules/controlcenter/Panes.qml @@ -13,7 +13,7 @@ import QtQuick.Layouts import Quickshell.Widgets import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.controlcenter ClippingRectangle { @@ -58,7 +58,7 @@ ClippingRectangle { Timer { id: animationDelayTimer - interval: Appearance.anim.durations.normal + interval: Tokens.anim.durations.normal onTriggered: { layout.animationComplete = true; } @@ -67,7 +67,7 @@ ClippingRectangle { Timer { id: initialOpeningTimer - interval: Appearance.anim.durations.large + interval: Tokens.anim.durations.large running: true onTriggered: { layout.initialOpeningComplete = true; diff --git a/modules/controlcenter/WindowTitle.qml b/modules/controlcenter/WindowTitle.qml index a55445c5..1993446f 100644 --- a/modules/controlcenter/WindowTitle.qml +++ b/modules/controlcenter/WindowTitle.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -10,7 +10,7 @@ StyledRect { required property ShellScreen screen required property Session session - implicitHeight: text.implicitHeight + Appearance.padding.normal + implicitHeight: text.implicitHeight + Tokens.padding.normal color: Colours.tPalette.m3surfaceContainer StyledText { @@ -21,24 +21,24 @@ StyledRect { text: qsTr("Caelestia Settings - %1").arg(root.session.active) font.capitalization: Font.Capitalize - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } Item { anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal implicitWidth: implicitHeight - implicitHeight: closeIcon.implicitHeight + Appearance.padding.small + implicitHeight: closeIcon.implicitHeight + Tokens.padding.small StateLayer { function onClicked(): void { QsWindow.window.destroy(); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full } MaterialIcon { diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml index c0ccfcd7..472c654a 100644 --- a/modules/controlcenter/appearance/AppearancePane.qml +++ b/modules/controlcenter/appearance/AppearancePane.qml @@ -15,7 +15,7 @@ import qs.components.controls import qs.components.effects import qs.components.images import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -111,9 +111,9 @@ Item { StyledText { Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: Appearance.spacing.normal + Layout.bottomMargin: Tokens.spacing.normal text: qsTr("Wallpaper") - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 600 } @@ -122,7 +122,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true - Layout.bottomMargin: -Appearance.padding.large * 2 + Layout.bottomMargin: -Tokens.padding.large * 2 asynchronous: true active: { @@ -172,14 +172,14 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Appearance") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } diff --git a/modules/controlcenter/appearance/sections/AnimationsSection.qml b/modules/controlcenter/appearance/sections/AnimationsSection.qml index e4d8a033..e5e973e2 100644 --- a/modules/controlcenter/appearance/sections/AnimationsSection.qml +++ b/modules/controlcenter/appearance/sections/AnimationsSection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/BackgroundSection.qml b/modules/controlcenter/appearance/sections/BackgroundSection.qml index 8b50c124..95670d24 100644 --- a/modules/controlcenter/appearance/sections/BackgroundSection.qml +++ b/modules/controlcenter/appearance/sections/BackgroundSection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -37,9 +37,9 @@ CollapsibleSection { } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Desktop Clock") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -64,12 +64,12 @@ CollapsibleSection { rootPane.saveConfig(); } - contentSpacing: Appearance.spacing.small + contentSpacing: Tokens.spacing.small z: 1 StyledText { text: qsTr("Positioning") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -156,11 +156,11 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.small + contentSpacing: Tokens.spacing.small StyledText { text: qsTr("Shadow") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -174,7 +174,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -199,7 +199,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -225,11 +225,11 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.small + contentSpacing: Tokens.spacing.small StyledText { text: qsTr("Background") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -252,7 +252,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -278,9 +278,9 @@ CollapsibleSection { } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Visualiser") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -303,7 +303,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -328,7 +328,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/BorderSection.qml b/modules/controlcenter/appearance/sections/BorderSection.qml index e0c677cf..e92a28da 100644 --- a/modules/controlcenter/appearance/sections/BorderSection.qml +++ b/modules/controlcenter/appearance/sections/BorderSection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -43,7 +43,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml index b954cd45..69dff698 100644 --- a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml +++ b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml @@ -9,7 +9,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { title: qsTr("Color scheme") @@ -18,7 +18,7 @@ CollapsibleSection { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 Repeater { model: Schemes.list @@ -32,10 +32,10 @@ CollapsibleSection { readonly property bool isCurrent: schemeKey === Schemes.currentScheme color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal border.width: isCurrent ? 1 : 0 border.color: Colours.palette.m3primary - implicitHeight: schemeRow.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: schemeRow.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -65,9 +65,9 @@ CollapsibleSection { id: schemeRow anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { id: preview @@ -78,7 +78,7 @@ CollapsibleSection { border.color: Qt.alpha(`#${modelData.colours?.outline}`, 0.5) color: `#${modelData.colours?.surface}` - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitWidth: iconPlaceholder.implicitWidth implicitHeight: iconPlaceholder.implicitWidth @@ -87,7 +87,7 @@ CollapsibleSection { visible: false text: "circle" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } Item { @@ -105,7 +105,7 @@ CollapsibleSection { implicitWidth: preview.implicitWidth color: `#${modelData.colours?.primary}` - radius: Appearance.rounding.full + radius: Tokens.rounding.full } } } @@ -116,12 +116,12 @@ CollapsibleSection { StyledText { text: modelData.flavour ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: modelData.name ?? "" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideRight @@ -137,7 +137,7 @@ CollapsibleSection { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml index b3cc4cfb..8fbd80d9 100644 --- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml +++ b/modules/controlcenter/appearance/sections/ColorVariantSection.qml @@ -9,7 +9,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { title: qsTr("Color variant") @@ -18,7 +18,7 @@ CollapsibleSection { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 Repeater { model: M3Variants.list @@ -29,10 +29,10 @@ CollapsibleSection { Layout.fillWidth: true color: Qt.alpha(Colours.tPalette.m3surfaceContainer, modelData.variant === Schemes.currentVariant ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal border.width: modelData.variant === Schemes.currentVariant ? 1 : 0 border.color: Colours.palette.m3primary - implicitHeight: variantRow.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: variantRow.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -62,13 +62,13 @@ CollapsibleSection { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: modelData.icon - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: modelData.variant === Schemes.currentVariant ? 1 : 0 } @@ -82,7 +82,7 @@ CollapsibleSection { visible: modelData.variant === Schemes.currentVariant text: "check" color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/controlcenter/appearance/sections/FontsSection.qml b/modules/controlcenter/appearance/sections/FontsSection.qml index 47b738f1..562ea8d5 100644 --- a/modules/controlcenter/appearance/sections/FontsSection.qml +++ b/modules/controlcenter/appearance/sections/FontsSection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -38,7 +38,7 @@ CollapsibleSection { property alias contentHeight: sansFontList.contentHeight clip: true - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 model: Qt.fontFamilies() StyledScrollBar.vertical: StyledScrollBar { @@ -52,10 +52,10 @@ CollapsibleSection { width: ListView.view.width color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal border.width: isCurrent ? 1 : 0 border.color: Colours.palette.m3primary - implicitHeight: fontFamilySansRow.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: fontFamilySansRow.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -70,13 +70,13 @@ CollapsibleSection { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: modelData - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -90,7 +90,7 @@ CollapsibleSection { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } @@ -119,7 +119,7 @@ CollapsibleSection { property alias contentHeight: monoFontList.contentHeight clip: true - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 model: Qt.fontFamilies() StyledScrollBar.vertical: StyledScrollBar { @@ -133,10 +133,10 @@ CollapsibleSection { width: ListView.view.width color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal border.width: isCurrent ? 1 : 0 border.color: Colours.palette.m3primary - implicitHeight: fontFamilyMonoRow.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: fontFamilyMonoRow.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -151,13 +151,13 @@ CollapsibleSection { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: modelData - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -171,7 +171,7 @@ CollapsibleSection { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } @@ -202,7 +202,7 @@ CollapsibleSection { property alias contentHeight: materialFontList.contentHeight clip: true - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 model: Qt.fontFamilies().filter(f => f.startsWith("Material Symbols")) StyledScrollBar.vertical: StyledScrollBar { @@ -216,10 +216,10 @@ CollapsibleSection { width: ListView.view.width color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal border.width: isCurrent ? 1 : 0 border.color: Colours.palette.m3primary - implicitHeight: fontFamilyMaterialRow.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: fontFamilyMaterialRow.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -234,13 +234,13 @@ CollapsibleSection { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: modelData - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -254,7 +254,7 @@ CollapsibleSection { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } @@ -264,7 +264,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/ScalesSection.qml b/modules/controlcenter/appearance/sections/ScalesSection.qml index 6d5d5b30..8113f28c 100644 --- a/modules/controlcenter/appearance/sections/ScalesSection.qml +++ b/modules/controlcenter/appearance/sections/ScalesSection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -43,7 +43,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -67,7 +67,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/ThemeModeSection.qml b/modules/controlcenter/appearance/sections/ThemeModeSection.qml index c63c73aa..8857da56 100644 --- a/modules/controlcenter/appearance/sections/ThemeModeSection.qml +++ b/modules/controlcenter/appearance/sections/ThemeModeSection.qml @@ -6,7 +6,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { title: qsTr("Theme mode") diff --git a/modules/controlcenter/appearance/sections/TransparencySection.qml b/modules/controlcenter/appearance/sections/TransparencySection.qml index 77582f9c..2dc91b65 100644 --- a/modules/controlcenter/appearance/sections/TransparencySection.qml +++ b/modules/controlcenter/appearance/sections/TransparencySection.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config CollapsibleSection { id: root @@ -28,7 +28,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -53,7 +53,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/audio/AudioPane.qml b/modules/controlcenter/audio/AudioPane.qml index 172132f6..13885656 100644 --- a/modules/controlcenter/audio/AudioPane.qml +++ b/modules/controlcenter/audio/AudioPane.qml @@ -10,7 +10,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -38,15 +38,15 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Audio") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -64,15 +64,15 @@ Item { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: qsTr("Devices (%1)").arg(Audio.sinks.length) - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } } @@ -93,8 +93,8 @@ Item { Layout.fillWidth: true color: Audio.sink?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent" - radius: Appearance.rounding.normal - implicitHeight: outputRowLayout.implicitHeight + Appearance.padding.normal * 2 + radius: Tokens.rounding.normal + implicitHeight: outputRowLayout.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -108,13 +108,13 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: Audio.sink?.id === modelData.id ? "speaker" : "speaker_group" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: Audio.sink?.id === modelData.id ? 1 : 0 } @@ -141,15 +141,15 @@ Item { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: qsTr("Devices (%1)").arg(Audio.sources.length) - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } } @@ -170,8 +170,8 @@ Item { Layout.fillWidth: true color: Audio.source?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent" - radius: Appearance.rounding.normal - implicitHeight: inputRowLayout.implicitHeight + Appearance.padding.normal * 2 + radius: Tokens.rounding.normal + implicitHeight: inputRowLayout.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -185,13 +185,13 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "mic" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: Audio.source?.id === modelData.id ? 1 : 0 } @@ -229,7 +229,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "volume_up" @@ -242,19 +242,19 @@ Item { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: qsTr("Volume") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } @@ -306,15 +306,15 @@ Item { StyledText { text: "%" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal opacity: Audio.muted ? 0.5 : 1 } StyledRect { implicitWidth: implicitHeight - implicitHeight: muteIcon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: muteIcon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Audio.muted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer StateLayer { @@ -339,7 +339,7 @@ Item { id: outputVolumeSlider Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 value: Audio.volume enabled: !Audio.muted @@ -360,19 +360,19 @@ Item { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: qsTr("Volume") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } @@ -424,15 +424,15 @@ Item { StyledText { text: "%" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal opacity: Audio.sourceMuted ? 0.5 : 1 } StyledRect { implicitWidth: implicitHeight - implicitHeight: muteInputIcon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: muteInputIcon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Audio.sourceMuted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer StateLayer { @@ -457,7 +457,7 @@ Item { id: inputVolumeSlider Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 value: Audio.sourceVolume enabled: !Audio.sourceMuted @@ -478,11 +478,11 @@ Item { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Repeater { model: Audio.streams @@ -493,15 +493,15 @@ Item { required property int index Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "apps" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal fill: 0 } @@ -510,7 +510,7 @@ Item { elide: Text.ElideRight maximumLineCount: 1 text: Audio.getStreamName(modelData) - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } @@ -558,15 +558,15 @@ Item { StyledText { text: "%" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal opacity: Audio.getStreamMuted(modelData) ? 0.5 : 1 } StyledRect { implicitWidth: implicitHeight - implicitHeight: streamMuteIcon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: streamMuteIcon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Audio.getStreamMuted(modelData) ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer StateLayer { @@ -587,7 +587,7 @@ Item { StyledSlider { Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 value: Audio.getStreamVolume(modelData) enabled: !Audio.getStreamMuted(modelData) @@ -617,7 +617,7 @@ Item { visible: Audio.streams.length === 0 text: qsTr("No applications currently playing audio") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small horizontalAlignment: Text.AlignHCenter } } diff --git a/modules/controlcenter/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml index 97ea99c5..d5794254 100644 --- a/modules/controlcenter/bluetooth/BtPane.qml +++ b/modules/controlcenter/bluetooth/BtPane.qml @@ -9,7 +9,7 @@ import Quickshell.Widgets import qs.components import qs.components.containers import qs.components.controls -import qs.config +import Caelestia.Config SplitPaneWithDetails { id: root diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index 9b347acd..04b4ba01 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -10,7 +10,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils StyledFlickable { @@ -54,12 +54,12 @@ StyledFlickable { sections: [ Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Connection status") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -70,9 +70,9 @@ StyledFlickable { StyledRect { Layout.fillWidth: true - implicitHeight: deviceStatus.implicitHeight + Appearance.padding.large * 2 + implicitHeight: deviceStatus.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -81,9 +81,9 @@ StyledFlickable { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.larger + spacing: Tokens.spacing.larger Toggle { label: qsTr("Connected") @@ -113,12 +113,12 @@ StyledFlickable { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Device properties") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -129,9 +129,9 @@ StyledFlickable { StyledRect { Layout.fillWidth: true - implicitHeight: deviceProps.implicitHeight + Appearance.padding.large * 2 + implicitHeight: deviceProps.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -140,19 +140,19 @@ StyledFlickable { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.larger + spacing: Tokens.spacing.larger RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Item { id: renameDevice Layout.fillWidth: true - Layout.rightMargin: Appearance.spacing.small + Layout.rightMargin: Tokens.spacing.small implicitHeight: renameLabel.implicitHeight + deviceNameEdit.implicitHeight @@ -167,15 +167,15 @@ StyledFlickable { PropertyChanges { renameDevice.implicitHeight: deviceNameEdit.implicitHeight renameLabel.opacity: 0 - deviceNameEdit.padding: Appearance.padding.normal + deviceNameEdit.padding: Tokens.padding.normal } } transitions: Transition { AnchorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } Anim { properties: "implicitHeight,opacity,padding" @@ -189,7 +189,7 @@ StyledFlickable { text: qsTr("Device name") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledTextField { @@ -198,7 +198,7 @@ StyledFlickable { anchors.left: parent.left anchors.right: parent.right anchors.top: renameLabel.bottom - anchors.leftMargin: root.session.bt.editingDeviceName ? 0 : -Appearance.padding.normal + anchors.leftMargin: root.session.bt.editingDeviceName ? 0 : -Tokens.padding.normal text: root.device?.name ?? "" readOnly: !root.session.bt.editingDeviceName @@ -207,11 +207,11 @@ StyledFlickable { root.device.name = text; } - leftPadding: Appearance.padding.normal - rightPadding: Appearance.padding.normal + leftPadding: Tokens.padding.normal + rightPadding: Tokens.padding.normal background: StyledRect { - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 2 border.color: Colours.palette.m3primary opacity: root.session.bt.editingDeviceName ? 1 : 0 @@ -233,9 +233,9 @@ StyledFlickable { StyledRect { implicitWidth: implicitHeight - implicitHeight: cancelEditIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.palette.m3secondaryContainer opacity: root.session.bt.editingDeviceName ? 1 : 0 scale: root.session.bt.editingDeviceName ? 1 : 0.5 @@ -265,17 +265,17 @@ StyledFlickable { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } StyledRect { implicitWidth: implicitHeight - implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: root.session.bt.editingDeviceName ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: root.session.bt.editingDeviceName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0) StateLayer { @@ -322,12 +322,12 @@ StyledFlickable { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Device information") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -338,9 +338,9 @@ StyledFlickable { StyledRect { Layout.fillWidth: true - implicitHeight: deviceInfo.implicitHeight + Appearance.padding.large * 2 + implicitHeight: deviceInfo.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -349,9 +349,9 @@ StyledFlickable { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { text: root.device?.batteryAvailable ? qsTr("Device battery (%1%)").arg(root.device.battery * 100) : qsTr("Battery unavailable") @@ -360,15 +360,15 @@ StyledFlickable { RowLayout { id: batteryPercent - Layout.topMargin: Appearance.spacing.small / 2 + Layout.topMargin: Tokens.spacing.small / 2 Layout.fillWidth: true - Layout.preferredHeight: Appearance.padding.smaller - spacing: Appearance.spacing.small / 2 + Layout.preferredHeight: Tokens.padding.smaller + spacing: Tokens.spacing.small / 2 StyledRect { Layout.fillWidth: true Layout.fillHeight: true - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3secondaryContainer StyledRect { @@ -378,54 +378,54 @@ StyledFlickable { anchors.margins: parent.height * 0.25 implicitWidth: root.device?.batteryAvailable ? batteryPercent.width * root.device.battery : 0 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primary } } } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Dbus path") } StyledText { text: root.device?.dbusPath ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("MAC address") } StyledText { text: root.device?.address ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Bonded") } StyledText { text: root.device?.bonded ? qsTr("Yes") : qsTr("No") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("System name") } StyledText { text: root.device?.deviceName ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } } @@ -438,7 +438,7 @@ StyledFlickable { ColumnLayout { anchors.right: fabRoot.right anchors.bottom: fabRoot.top - anchors.bottomMargin: Appearance.padding.normal + anchors.bottomMargin: Tokens.padding.normal Repeater { id: fabMenu @@ -470,9 +470,9 @@ StyledFlickable { Layout.alignment: Qt.AlignRight - implicitHeight: fabMenuItemInner.implicitHeight + Appearance.padding.larger * 2 + implicitHeight: fabMenuItemInner.implicitHeight + Tokens.padding.larger * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primaryContainer opacity: 0 @@ -482,7 +482,7 @@ StyledFlickable { when: root.session.bt.fabMenuOpen PropertyChanges { - fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + Appearance.padding.large * 2 + fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + Tokens.padding.large * 2 fabMenuItem.opacity: 1 fabMenuItemInner.opacity: 1 } @@ -494,17 +494,17 @@ StyledFlickable { SequentialAnimation { PauseAnimation { - duration: (fabMenu.count - 1 - fabMenuItem.index) * Appearance.anim.durations.small / 8 + duration: (fabMenu.count - 1 - fabMenuItem.index) * Tokens.anim.durations.small / 8 } ParallelAnimation { Anim { property: "implicitWidth" - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { property: "opacity" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -514,17 +514,17 @@ StyledFlickable { SequentialAnimation { PauseAnimation { - duration: fabMenuItem.index * Appearance.anim.durations.small / 8 + duration: fabMenuItem.index * Tokens.anim.durations.small / 8 } ParallelAnimation { Anim { property: "implicitWidth" - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { property: "opacity" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -549,7 +549,7 @@ StyledFlickable { id: fabMenuItemInner anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal opacity: 0 MaterialIcon { @@ -567,7 +567,7 @@ StyledFlickable { Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -594,7 +594,7 @@ StyledFlickable { implicitWidth: 64 implicitHeight: 64 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: root.session.bt.fabMenuOpen ? Colours.palette.m3primary : Colours.palette.m3primaryContainer states: State { @@ -605,15 +605,15 @@ StyledFlickable { fabBg.implicitWidth: 48 fabBg.implicitHeight: 48 fabBg.radius: 48 / 2 - fab.font.pointSize: Appearance.font.size.larger + fab.font.pointSize: Tokens.font.size.larger } } transitions: Transition { Anim { properties: "implicitWidth,implicitHeight" - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { properties: "radius,font.pointSize" @@ -644,7 +644,7 @@ StyledFlickable { animate: true text: root.session.bt.fabMenuOpen ? "close" : "settings" color: root.session.bt.fabMenuOpen ? Colours.palette.m3onPrimary : Colours.palette.m3onPrimaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: 1 } } @@ -656,7 +656,7 @@ StyledFlickable { property alias toggle: toggle Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index b53829b9..ca76c8c1 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -10,7 +10,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils DeviceList { @@ -32,11 +32,11 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Bluetooth") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -48,9 +48,9 @@ DeviceList { toggled: Bluetooth.defaultAdapter?.enabled ?? false icon: "power" accent: "Tertiary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Toggle Bluetooth") onClicked: { @@ -64,9 +64,9 @@ DeviceList { toggled: Bluetooth.defaultAdapter?.discoverable ?? false icon: root.smallDiscoverable ? "group_search" : "" label: root.smallDiscoverable ? "" : qsTr("Discoverable") - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Make discoverable") onClicked: { @@ -80,9 +80,9 @@ DeviceList { toggled: Bluetooth.defaultAdapter?.pairable ?? false icon: "missing_controller" label: root.smallPairable ? "" : qsTr("Pairable") - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Make pairable") onClicked: { @@ -96,9 +96,9 @@ DeviceList { toggled: Bluetooth.defaultAdapter?.discovering ?? false icon: "bluetooth_searching" accent: "Secondary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Scan for devices") onClicked: { @@ -112,9 +112,9 @@ DeviceList { toggled: !root.session.bt.active icon: "settings" accent: "Primary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Bluetooth settings") onClicked: { @@ -137,10 +137,10 @@ DeviceList { readonly property bool connected: modelData && modelData.state === BluetoothDeviceState.Connected width: ListView.view ? ListView.view.width : undefined - implicitHeight: deviceInner.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: deviceInner.implicitHeight + Tokens.padding.normal * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal StateLayer { id: stateLayer @@ -155,15 +155,15 @@ DeviceList { id: deviceInner anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: device.connected ? Colours.palette.m3primaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh StyledRect { @@ -178,7 +178,7 @@ DeviceList { anchors.centerIn: parent text: Icons.getBluetoothIcon(device.modelData ? device.modelData.icon : "") color: device.connected ? Colours.palette.m3onPrimaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: device.connected ? 1 : 0 Behavior on fill { @@ -202,7 +202,7 @@ DeviceList { Layout.fillWidth: true text: (device.modelData ? device.modelData.address : "") + (device.connected ? qsTr(" (Connected)") : (device.modelData && device.modelData.bonded) ? qsTr(" (Paired)") : "") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } } @@ -211,9 +211,9 @@ DeviceList { id: connectBtn implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0) CircularIndicator { diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index 6936c1ea..bd09deeb 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -9,14 +9,14 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "bluetooth" @@ -24,9 +24,9 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Adapter status") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -37,9 +37,9 @@ ColumnLayout { StyledRect { Layout.fillWidth: true - implicitHeight: adapterStatus.implicitHeight + Appearance.padding.large * 2 + implicitHeight: adapterStatus.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -48,9 +48,9 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.larger + spacing: Tokens.spacing.larger Toggle { label: qsTr("Powered") @@ -85,9 +85,9 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Adapter properties") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -98,9 +98,9 @@ ColumnLayout { StyledRect { Layout.fillWidth: true - implicitHeight: adapterSettings.implicitHeight + Appearance.padding.large * 2 + implicitHeight: adapterSettings.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -109,13 +109,13 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.larger + spacing: Tokens.spacing.larger RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -127,28 +127,28 @@ ColumnLayout { property bool expanded - implicitWidth: adapterPicker.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: adapterPicker.implicitHeight + Appearance.padding.smaller * 2 + implicitWidth: adapterPicker.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: adapterPicker.implicitHeight + Tokens.padding.smaller * 2 StateLayer { function onClicked(): void { adapterPickerButton.expanded = !adapterPickerButton.expanded; } - radius: Appearance.rounding.small + radius: Tokens.rounding.small } RowLayout { id: adapterPicker anchors.fill: parent - anchors.margins: Appearance.padding.normal - anchors.topMargin: Appearance.padding.smaller - anchors.bottomMargin: Appearance.padding.smaller - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.normal + anchors.topMargin: Tokens.padding.smaller + anchors.bottomMargin: Tokens.padding.smaller + spacing: Tokens.spacing.normal StyledText { - Layout.leftMargin: Appearance.padding.small + Layout.leftMargin: Tokens.padding.small text: Bluetooth.defaultAdapter?.name ?? qsTr("None") } @@ -170,8 +170,8 @@ ColumnLayout { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } @@ -185,7 +185,7 @@ ColumnLayout { implicitHeight: adapterPickerButton.expanded ? adapterList.implicitHeight : adapterPickerButton.implicitHeight color: Colours.palette.m3secondaryContainer - radius: Appearance.rounding.small + radius: Tokens.rounding.small opacity: adapterPickerButton.expanded ? 1 : 0 scale: adapterPickerButton.expanded ? 1 : 0.7 @@ -207,7 +207,7 @@ ColumnLayout { required property BluetoothAdapter modelData Layout.fillWidth: true - implicitHeight: adapterInner.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: adapterInner.implicitHeight + Tokens.padding.normal * 2 StateLayer { function onClicked(): void { @@ -224,12 +224,12 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true - Layout.leftMargin: Appearance.padding.small + Layout.leftMargin: Tokens.padding.small text: adapter.modelData.name color: Colours.palette.m3onSecondaryContainer } @@ -250,15 +250,15 @@ ColumnLayout { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -267,7 +267,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -287,13 +287,13 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Item { id: renameAdapter Layout.fillWidth: true - Layout.rightMargin: Appearance.spacing.small + Layout.rightMargin: Tokens.spacing.small implicitHeight: renameLabel.implicitHeight + adapterNameEdit.implicitHeight @@ -308,15 +308,15 @@ ColumnLayout { PropertyChanges { renameAdapter.implicitHeight: adapterNameEdit.implicitHeight renameLabel.opacity: 0 - adapterNameEdit.padding: Appearance.padding.normal + adapterNameEdit.padding: Tokens.padding.normal } } transitions: Transition { AnchorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } Anim { properties: "implicitHeight,opacity,padding" @@ -330,7 +330,7 @@ ColumnLayout { text: qsTr("Rename adapter (currently does not work)") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledTextField { @@ -339,7 +339,7 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.top: renameLabel.bottom - anchors.leftMargin: root.session.bt.editingAdapterName ? 0 : -Appearance.padding.normal + anchors.leftMargin: root.session.bt.editingAdapterName ? 0 : -Tokens.padding.normal text: root.session.bt.currentAdapter?.name ?? "" readOnly: !root.session.bt.editingAdapterName @@ -347,11 +347,11 @@ ColumnLayout { root.session.bt.editingAdapterName = false; } - leftPadding: Appearance.padding.normal - rightPadding: Appearance.padding.normal + leftPadding: Tokens.padding.normal + rightPadding: Tokens.padding.normal background: StyledRect { - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 2 border.color: Colours.palette.m3primary opacity: root.session.bt.editingAdapterName ? 1 : 0 @@ -373,9 +373,9 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: cancelEditIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.palette.m3secondaryContainer opacity: root.session.bt.editingAdapterName ? 1 : 0 scale: root.session.bt.editingAdapterName ? 1 : 0.5 @@ -405,17 +405,17 @@ ColumnLayout { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } StyledRect { implicitWidth: implicitHeight - implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: root.session.bt.editingAdapterName ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) + radius: root.session.bt.editingAdapterName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0) StateLayer { @@ -448,9 +448,9 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Adapter information") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -461,9 +461,9 @@ ColumnLayout { StyledRect { Layout.fillWidth: true - implicitHeight: adapterInfo.implicitHeight + Appearance.padding.large * 2 + implicitHeight: adapterInfo.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -472,9 +472,9 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { text: qsTr("Adapter state") @@ -483,29 +483,29 @@ ColumnLayout { StyledText { text: Bluetooth.defaultAdapter ? BluetoothAdapterState.toString(Bluetooth.defaultAdapter.state) : qsTr("Unknown") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Dbus path") } StyledText { text: Bluetooth.defaultAdapter?.dbusPath ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Adapter id") } StyledText { text: Bluetooth.defaultAdapter?.adapterId ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } } @@ -516,7 +516,7 @@ ColumnLayout { property alias toggle: toggle Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml index 15b1896c..e95fa094 100644 --- a/modules/controlcenter/components/ConnectedButtonGroup.qml +++ b/modules/controlcenter/components/ConnectedButtonGroup.qml @@ -5,7 +5,7 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -16,8 +16,8 @@ StyledRect { property int rows: 1 // Number of rows Layout.fillWidth: true - implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) clip: true @@ -29,21 +29,21 @@ StyledRect { id: layout anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { visible: root.title !== "" text: root.title - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } GridLayout { id: buttonGrid Layout.alignment: Qt.AlignHCenter - rowSpacing: Appearance.spacing.small - columnSpacing: Appearance.spacing.small + rowSpacing: Tokens.spacing.small + columnSpacing: Tokens.spacing.small rows: root.rows columns: Math.ceil(root.options.length / root.rows) @@ -81,13 +81,13 @@ StyledRect { // Match utilities Toggles radius styling // Each button has full rounding (not connected) since they have spacing - radius: stateLayer.pressed ? Appearance.rounding.small / 2 : internalChecked ? Appearance.rounding.small : Appearance.rounding.normal + radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal // Match utilities Toggles inactive color inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) // Adjust width similar to utilities toggles - Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Appearance.padding.large : internalChecked ? Appearance.padding.smaller : 0) + Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0) onClicked: { if (modelData.onToggled && root.rootItem && modelData.propertyName) { @@ -98,15 +98,15 @@ StyledRect { Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on radius { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/controlcenter/components/DeviceDetails.qml b/modules/controlcenter/components/DeviceDetails.qml index c150abd7..5fc4d0ed 100644 --- a/modules/controlcenter/components/DeviceDetails.qml +++ b/modules/controlcenter/components/DeviceDetails.qml @@ -7,7 +7,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.components.effects -import qs.config +import Caelestia.Config Item { id: root @@ -30,7 +30,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Loader { id: headerLoader diff --git a/modules/controlcenter/components/DeviceList.qml b/modules/controlcenter/components/DeviceList.qml index 2134d8cf..8a65fc0c 100644 --- a/modules/controlcenter/components/DeviceList.qml +++ b/modules/controlcenter/components/DeviceList.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -27,7 +27,7 @@ ColumnLayout { signal itemSelected(var item) - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Loader { id: headerLoader @@ -41,13 +41,13 @@ ColumnLayout { RowLayout { Layout.fillWidth: true Layout.topMargin: root.headerComponent ? 0 : 0 - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small visible: root.title !== "" || root.description !== "" StyledText { visible: root.title !== "" text: root.title - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -78,7 +78,7 @@ ColumnLayout { model: root.model delegate: root.delegate - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 interactive: false clip: false } diff --git a/modules/controlcenter/components/PaneTransition.qml b/modules/controlcenter/components/PaneTransition.qml index ac9c3371..a025f7d0 100644 --- a/modules/controlcenter/components/PaneTransition.qml +++ b/modules/controlcenter/components/PaneTransition.qml @@ -1,7 +1,7 @@ pragma ComponentBehavior: Bound import QtQuick -import qs.config +import Caelestia.Config SequentialAnimation { id: root @@ -20,9 +20,9 @@ SequentialAnimation { property: "opacity" from: root.opacityFrom to: root.opacityTo - duration: Appearance.anim.durations.normal / 2 + duration: Tokens.anim.durations.normal / 2 easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardAccel + easing.bezierCurve: Tokens.anim.curves.standardAccel } NumberAnimation { @@ -30,9 +30,9 @@ SequentialAnimation { property: "scale" from: root.scaleFrom to: root.scaleTo - duration: Appearance.anim.durations.normal / 2 + duration: Tokens.anim.durations.normal / 2 easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardAccel + easing.bezierCurve: Tokens.anim.curves.standardAccel } } @@ -53,9 +53,9 @@ SequentialAnimation { property: "opacity" from: root.opacityTo to: root.opacityFrom - duration: Appearance.anim.durations.normal / 2 + duration: Tokens.anim.durations.normal / 2 easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } NumberAnimation { @@ -63,9 +63,9 @@ SequentialAnimation { property: "scale" from: root.scaleTo to: root.scaleFrom - duration: Appearance.anim.durations.normal / 2 + duration: Tokens.anim.durations.normal / 2 easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } } } diff --git a/modules/controlcenter/components/ReadonlySlider.qml b/modules/controlcenter/components/ReadonlySlider.qml index 10527045..e1bff137 100644 --- a/modules/controlcenter/components/ReadonlySlider.qml +++ b/modules/controlcenter/components/ReadonlySlider.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -17,16 +17,16 @@ ColumnLayout { property string suffix: "" property bool readonly: false - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { visible: root.label !== "" text: root.label - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: root.readonly ? Colours.palette.m3outline : Colours.palette.m3onSurface } @@ -38,20 +38,20 @@ ColumnLayout { visible: root.readonly text: "lock" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { text: Math.round(root.value) + (root.suffix !== "" ? " " + root.suffix : "") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: root.readonly ? Colours.palette.m3outline : Colours.palette.m3onSurface } } StyledRect { Layout.fillWidth: true - implicitHeight: Appearance.padding.normal - radius: Appearance.rounding.full + implicitHeight: Tokens.padding.normal + radius: Tokens.rounding.full color: Colours.layer(Colours.palette.m3surfaceContainerHighest, 1) opacity: root.readonly ? 0.5 : 1.0 diff --git a/modules/controlcenter/components/SettingsHeader.qml b/modules/controlcenter/components/SettingsHeader.qml index 6d392f5e..425a9e8e 100644 --- a/modules/controlcenter/components/SettingsHeader.qml +++ b/modules/controlcenter/components/SettingsHeader.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts import qs.components -import qs.config +import Caelestia.Config Item { id: root @@ -18,19 +18,19 @@ Item { id: column anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { Layout.alignment: Qt.AlignHCenter text: root.icon - font.pointSize: Appearance.font.size.extraLarge * 3 + font.pointSize: Tokens.font.size.extraLarge * 3 font.bold: true } StyledText { Layout.alignment: Qt.AlignHCenter text: root.title - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.bold: true } } diff --git a/modules/controlcenter/components/SliderInput.qml b/modules/controlcenter/components/SliderInput.qml index df3acf41..1c1f29be 100644 --- a/modules/controlcenter/components/SliderInput.qml +++ b/modules/controlcenter/components/SliderInput.qml @@ -6,7 +6,7 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -52,7 +52,7 @@ ColumnLayout { return parseFloat(text); } - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Component.onCompleted: { // Set initialized flag after a brief delay to allow component to fully load @@ -71,12 +71,12 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { visible: root.label !== "" text: root.label - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -138,7 +138,7 @@ ColumnLayout { visible: root.suffix !== "" text: root.suffix color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } @@ -146,7 +146,7 @@ ColumnLayout { id: slider Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 from: root.from to: root.to diff --git a/modules/controlcenter/components/SplitPaneLayout.qml b/modules/controlcenter/components/SplitPaneLayout.qml index 5bf5c41a..cff20ec7 100644 --- a/modules/controlcenter/components/SplitPaneLayout.qml +++ b/modules/controlcenter/components/SplitPaneLayout.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell.Widgets import qs.components import qs.components.effects -import qs.config +import Caelestia.Config RowLayout { id: root @@ -32,9 +32,9 @@ RowLayout { id: leftClippingRect anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal anchors.leftMargin: 0 - anchors.rightMargin: Appearance.padding.normal / 2 + anchors.rightMargin: Tokens.padding.normal / 2 radius: leftBorder.innerRadius color: "transparent" @@ -43,9 +43,9 @@ RowLayout { id: leftLoader anchors.fill: parent - anchors.margins: Appearance.padding.large + Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large - anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2 + anchors.margins: Tokens.padding.large + Tokens.padding.normal + anchors.leftMargin: Tokens.padding.large + anchors.rightMargin: Tokens.padding.large + Tokens.padding.normal / 2 asynchronous: true sourceComponent: root.leftContent @@ -62,7 +62,7 @@ RowLayout { id: leftBorder leftThickness: 0 - rightThickness: Appearance.padding.normal / 2 + rightThickness: Tokens.padding.normal / 2 } } @@ -76,9 +76,9 @@ RowLayout { id: rightClippingRect anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal anchors.leftMargin: 0 - anchors.rightMargin: Appearance.padding.normal / 2 + anchors.rightMargin: Tokens.padding.normal / 2 radius: rightBorder.innerRadius color: "transparent" @@ -87,7 +87,7 @@ RowLayout { id: rightLoader anchors.fill: parent - anchors.margins: Appearance.padding.large * 2 + anchors.margins: Tokens.padding.large * 2 asynchronous: true sourceComponent: root.rightContent @@ -103,7 +103,7 @@ RowLayout { InnerBorder { id: rightBorder - leftThickness: Appearance.padding.normal / 2 + leftThickness: Tokens.padding.normal / 2 } } } diff --git a/modules/controlcenter/components/SplitPaneWithDetails.qml b/modules/controlcenter/components/SplitPaneWithDetails.qml index e8dcb269..dcc472d9 100644 --- a/modules/controlcenter/components/SplitPaneWithDetails.qml +++ b/modules/controlcenter/components/SplitPaneWithDetails.qml @@ -7,7 +7,7 @@ import Quickshell.Widgets import qs.components import qs.components.containers import qs.components.effects -import qs.config +import Caelestia.Config Item { id: root diff --git a/modules/controlcenter/components/WallpaperGrid.qml b/modules/controlcenter/components/WallpaperGrid.qml index 6a65c8e1..b85ec556 100644 --- a/modules/controlcenter/components/WallpaperGrid.qml +++ b/modules/controlcenter/components/WallpaperGrid.qml @@ -8,18 +8,18 @@ import qs.components.controls import qs.components.effects import qs.components.images import qs.services -import qs.config +import Caelestia.Config GridView { id: root required property Session session - readonly property int minCellWidth: 200 + Appearance.spacing.normal + readonly property int minCellWidth: 200 + Tokens.spacing.normal readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth)) cellWidth: width / columnsCount - cellHeight: 140 + Appearance.spacing.normal + cellHeight: 140 + Tokens.spacing.normal model: Wallpapers.list @@ -33,8 +33,8 @@ GridView { required property var modelData required property int index readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent - readonly property real itemMargin: Appearance.spacing.normal / 2 - readonly property real itemRadius: Appearance.rounding.normal + readonly property real itemMargin: Tokens.spacing.normal / 2 + readonly property real itemRadius: Tokens.rounding.normal width: root.cellWidth height: root.cellHeight @@ -130,7 +130,7 @@ GridView { anchors.right: parent.right anchors.bottom: parent.bottom - implicitHeight: filenameText.implicitHeight + Appearance.padding.normal * 1.5 + implicitHeight: filenameText.implicitHeight + Tokens.padding.normal * 1.5 radius: 0 gradient: Gradient { @@ -190,12 +190,12 @@ GridView { MaterialIcon { anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small visible: isCurrent text: "check_circle" color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } @@ -205,12 +205,12 @@ GridView { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.leftMargin: Appearance.padding.normal + Appearance.spacing.normal / 2 - anchors.rightMargin: Appearance.padding.normal + Appearance.spacing.normal / 2 - anchors.bottomMargin: Appearance.padding.normal + anchors.leftMargin: Tokens.padding.normal + Tokens.spacing.normal / 2 + anchors.rightMargin: Tokens.padding.normal + Tokens.spacing.normal / 2 + anchors.bottomMargin: Tokens.padding.normal text: modelData.name - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller font.weight: 500 color: isCurrent ? Colours.palette.m3primary : Colours.palette.m3onSurface elide: Text.ElideMiddle diff --git a/modules/controlcenter/dashboard/DashboardPane.qml b/modules/controlcenter/dashboard/DashboardPane.qml index bd6b9d5f..d2e95801 100644 --- a/modules/controlcenter/dashboard/DashboardPane.qml +++ b/modules/controlcenter/dashboard/DashboardPane.qml @@ -11,7 +11,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -66,9 +66,9 @@ Item { id: dashboardClippingRect anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal anchors.leftMargin: 0 - anchors.rightMargin: Appearance.padding.normal + anchors.rightMargin: Tokens.padding.normal radius: dashboardBorder.innerRadius color: "transparent" @@ -77,9 +77,9 @@ Item { id: dashboardLoader anchors.fill: parent - anchors.margins: Appearance.padding.large + Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large - anchors.rightMargin: Appearance.padding.large + anchors.margins: Tokens.padding.large + Tokens.padding.normal + anchors.leftMargin: Tokens.padding.large + anchors.rightMargin: Tokens.padding.large asynchronous: true sourceComponent: dashboardContentComponent @@ -90,7 +90,7 @@ Item { id: dashboardBorder leftThickness: 0 - rightThickness: Appearance.padding.normal + rightThickness: Tokens.padding.normal } Component { @@ -113,14 +113,14 @@ Item { anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Dashboard") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } } diff --git a/modules/controlcenter/dashboard/GeneralSection.qml b/modules/controlcenter/dashboard/GeneralSection.qml index 61e83d3c..6294a05d 100644 --- a/modules/controlcenter/dashboard/GeneralSection.qml +++ b/modules/controlcenter/dashboard/GeneralSection.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config SectionContainer { id: root @@ -17,7 +17,7 @@ SectionContainer { StyledText { text: qsTr("General Settings") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SwitchRow { @@ -40,7 +40,7 @@ SectionContainer { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SwitchRow { Layout.fillWidth: true diff --git a/modules/controlcenter/dashboard/PerformanceSection.qml b/modules/controlcenter/dashboard/PerformanceSection.qml index eebf5fd2..1a0b6482 100644 --- a/modules/controlcenter/dashboard/PerformanceSection.qml +++ b/modules/controlcenter/dashboard/PerformanceSection.qml @@ -6,7 +6,7 @@ import Quickshell.Services.UPower import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config SectionContainer { id: root @@ -22,7 +22,7 @@ SectionContainer { StyledText { text: qsTr("Performance Resources") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } ConnectedButtonGroup { diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml index 677cf418..51989c63 100644 --- a/modules/controlcenter/launcher/LauncherPane.qml +++ b/modules/controlcenter/launcher/LauncherPane.qml @@ -14,7 +14,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -150,14 +150,14 @@ Item { anchors.fill: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Launcher") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -169,9 +169,9 @@ Item { toggled: !root.session.launcher.active icon: "settings" accent: "Primary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Launcher settings") onClicked: { @@ -187,9 +187,9 @@ Item { } StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Applications (%1)").arg(root.searchText ? root.filteredApps.length : allAppsDb.apps.length) - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } @@ -200,11 +200,11 @@ Item { StyledRect { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal - Layout.bottomMargin: Appearance.spacing.small + Layout.topMargin: Tokens.spacing.normal + Layout.bottomMargin: Tokens.spacing.small color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitHeight: Math.max(searchIcon.implicitHeight, searchField.implicitHeight, clearIcon.implicitHeight) @@ -213,7 +213,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: Appearance.padding.normal + anchors.leftMargin: Tokens.padding.normal text: "search" color: Colours.palette.m3onSurfaceVariant @@ -224,11 +224,11 @@ Item { anchors.left: searchIcon.right anchors.right: clearIcon.left - anchors.leftMargin: Appearance.spacing.small - anchors.rightMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small + anchors.rightMargin: Tokens.spacing.small - topPadding: Appearance.padding.normal - bottomPadding: Appearance.padding.normal + topPadding: Tokens.padding.normal + bottomPadding: Tokens.padding.normal placeholderText: qsTr("Search applications...") @@ -242,7 +242,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: Appearance.padding.normal + anchors.rightMargin: Tokens.padding.normal width: searchField.text ? implicitWidth : implicitWidth / 2 opacity: { @@ -270,13 +270,13 @@ Item { Behavior on width { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -297,7 +297,7 @@ Item { Layout.fillHeight: true model: root.filteredApps - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 clip: true StyledScrollBar.vertical: StyledScrollBar { @@ -313,7 +313,7 @@ Item { implicitHeight: 40 color: isSelected ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent" - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal opacity: 0 @@ -338,9 +338,9 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal IconImage { asynchronous: true @@ -355,7 +355,7 @@ Item { StyledText { Layout.fillWidth: true text: modelData.name || modelData.entry?.name || qsTr("Unknown") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Loader { @@ -518,12 +518,12 @@ Item { readonly property var displayedApp: parent && parent.displayedApp !== undefined ? parent.displayedApp : null anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 - Layout.topMargin: Appearance.padding.large * 2 + Layout.leftMargin: Tokens.padding.large * 2 + Layout.rightMargin: Tokens.padding.large * 2 + Layout.topMargin: Tokens.padding.large * 2 visible: displayedApp === null icon: "apps" title: qsTr("Launcher Applications") @@ -531,23 +531,23 @@ Item { Item { Layout.alignment: Qt.AlignHCenter - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 - Layout.topMargin: Appearance.padding.large * 2 + Layout.leftMargin: Tokens.padding.large * 2 + Layout.rightMargin: Tokens.padding.large * 2 + Layout.topMargin: Tokens.padding.large * 2 visible: displayedApp !== null implicitWidth: Math.max(appIconImage.implicitWidth, appTitleText.implicitWidth) - implicitHeight: appIconImage.implicitHeight + Appearance.spacing.normal + appTitleText.implicitHeight + implicitHeight: appIconImage.implicitHeight + Tokens.spacing.normal + appTitleText.implicitHeight ColumnLayout { anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal IconImage { id: appIconImage asynchronous: true Layout.alignment: Qt.AlignHCenter - implicitSize: Appearance.font.size.extraLarge * 3 * 2 + implicitSize: Tokens.font.size.extraLarge * 3 * 2 source: { const app = appDetailsLayout.displayedApp; if (!app) @@ -565,7 +565,7 @@ Item { Layout.alignment: Qt.AlignHCenter text: displayedApp ? (displayedApp.name || displayedApp.entry?.name || qsTr("Application Details")) : "" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.bold: true } } @@ -574,9 +574,9 @@ Item { Item { Layout.fillWidth: true Layout.fillHeight: true - Layout.topMargin: Appearance.spacing.large - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 + Layout.topMargin: Tokens.spacing.large + Layout.leftMargin: Tokens.padding.large * 2 + Layout.rightMargin: Tokens.padding.large * 2 StyledFlickable { id: detailsFlickable @@ -595,10 +595,10 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SwitchRow { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal visible: appDetailsLayout.displayedApp !== null label: qsTr("Mark as favourite") checked: root.favouriteChecked @@ -631,7 +631,7 @@ Item { } } SwitchRow { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal visible: appDetailsLayout.displayedApp !== null label: qsTr("Hide from launcher") checked: root.hideFromLauncherChecked diff --git a/modules/controlcenter/launcher/Settings.qml b/modules/controlcenter/launcher/Settings.qml index 95fc2fb0..1641570c 100644 --- a/modules/controlcenter/launcher/Settings.qml +++ b/modules/controlcenter/launcher/Settings.qml @@ -8,14 +8,14 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "apps" @@ -23,7 +23,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("General") description: qsTr("General launcher settings") } @@ -67,13 +67,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Display") description: qsTr("Display and appearance settings") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Max shown items") @@ -94,13 +94,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Prefixes") description: qsTr("Command prefix settings") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Special prefix") @@ -115,7 +115,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Fuzzy search") description: qsTr("Fuzzy search settings") } @@ -168,13 +168,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Sizes") description: qsTr("Size settings for launcher items") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Item width") @@ -201,13 +201,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Hidden apps") description: qsTr("Applications hidden from launcher") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Total hidden") diff --git a/modules/controlcenter/network/EthernetDetails.qml b/modules/controlcenter/network/EthernetDetails.qml index 9b78ccaf..e6128a31 100644 --- a/modules/controlcenter/network/EthernetDetails.qml +++ b/modules/controlcenter/network/EthernetDetails.qml @@ -9,7 +9,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config DeviceDetails { id: root @@ -43,7 +43,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Connection status") @@ -69,7 +69,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Device properties") @@ -77,7 +77,7 @@ DeviceDetails { } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Interface") @@ -100,7 +100,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Connection information") diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml index 4fcd5b92..44048265 100644 --- a/modules/controlcenter/network/EthernetList.qml +++ b/modules/controlcenter/network/EthernetList.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config DeviceList { id: root @@ -23,11 +23,11 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Settings") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -39,9 +39,9 @@ DeviceList { toggled: !root.session.ethernet.active icon: "settings" accent: "Primary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller onClicked: { if (root.session.ethernet.active) @@ -62,10 +62,10 @@ DeviceList { readonly property bool isActive: root.activeItem && modelData && root.activeItem.interface === modelData.interface width: ListView.view ? ListView.view.width : undefined - implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, ethernetItem.isActive ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal StateLayer { id: stateLayer @@ -79,15 +79,15 @@ DeviceList { id: rowLayout anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh StyledRect { @@ -101,7 +101,7 @@ DeviceList { anchors.centerIn: parent text: "cable" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: modelData.connected ? 1 : 0 color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface @@ -124,13 +124,13 @@ DeviceList { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected") color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: modelData.connected ? 500 : 400 elide: Text.ElideRight } @@ -141,9 +141,9 @@ DeviceList { id: connectBtn implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0) StateLayer { diff --git a/modules/controlcenter/network/EthernetPane.qml b/modules/controlcenter/network/EthernetPane.qml index 8fb833fd..a2699c78 100644 --- a/modules/controlcenter/network/EthernetPane.qml +++ b/modules/controlcenter/network/EthernetPane.qml @@ -6,7 +6,7 @@ import QtQuick import Quickshell.Widgets import qs.components import qs.components.containers -import qs.config +import Caelestia.Config SplitPaneWithDetails { id: root diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml index 3d99c47c..7a37316c 100644 --- a/modules/controlcenter/network/EthernetSettings.qml +++ b/modules/controlcenter/network/EthernetSettings.qml @@ -8,14 +8,14 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "cable" @@ -23,9 +23,9 @@ ColumnLayout { } StyledText { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large text: qsTr("Ethernet devices") - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } @@ -36,9 +36,9 @@ ColumnLayout { StyledRect { Layout.fillWidth: true - implicitHeight: ethernetInfo.implicitHeight + Appearance.padding.large * 2 + implicitHeight: ethernetInfo.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { @@ -47,9 +47,9 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { text: qsTr("Total devices") @@ -58,18 +58,18 @@ ColumnLayout { StyledText { text: qsTr("%1").arg(Nmcli.ethernetDevices.length) color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("Connected devices") } StyledText { text: qsTr("%1").arg(Nmcli.ethernetDevices.filter(d => d.connected).length) color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } } diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml index 15ac56d2..6a1bc6df 100644 --- a/modules/controlcenter/network/NetworkSettings.qml +++ b/modules/controlcenter/network/NetworkSettings.qml @@ -10,14 +10,14 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "router" @@ -25,13 +25,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Ethernet") description: qsTr("Ethernet device information") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Total devices") @@ -46,7 +46,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Wireless") description: qsTr("WiFi network settings") } @@ -62,7 +62,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("VPN") description: qsTr("VPN provider settings") visible: Config.utilities.vpn.enabled || Config.utilities.vpn.provider.length > 0 @@ -88,8 +88,8 @@ ColumnLayout { TextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.topMargin: Tokens.spacing.normal + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 text: qsTr("⚙ Manage VPN Providers") inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer @@ -101,13 +101,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Current connection") description: qsTr("Active network connection information") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Network") @@ -141,20 +141,20 @@ ColumnLayout { parent: Overlay.overlay anchors.centerIn: parent - width: Math.min(600, parent.width - Appearance.padding.large * 2) - height: Math.min(700, parent.height - Appearance.padding.large * 2) + width: Math.min(600, parent.width - Tokens.padding.large * 2) + height: Math.min(700, parent.height - Tokens.padding.large * 2) modal: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: StyledRect { color: Colours.palette.m3surface - radius: Appearance.rounding.large + radius: Tokens.rounding.large } StyledFlickable { anchors.fill: parent - anchors.margins: Appearance.padding.large * 1.5 + anchors.margins: Tokens.padding.large * 1.5 flickableDirection: Flickable.VerticalFlick contentHeight: vpnSettingsContent.height clip: true diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml index 990c4a26..2829a114 100644 --- a/modules/controlcenter/network/NetworkingPane.qml +++ b/modules/controlcenter/network/NetworkingPane.qml @@ -12,7 +12,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -43,15 +43,15 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Network") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -63,9 +63,9 @@ Item { toggled: Nmcli.wifiEnabled icon: "wifi" accent: "Tertiary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Toggle WiFi") onClicked: { @@ -77,9 +77,9 @@ Item { toggled: Nmcli.scanning icon: "wifi_find" accent: "Secondary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Scan for networks") onClicked: { @@ -91,9 +91,9 @@ Item { toggled: !root.session.ethernet.active && !root.session.network.active icon: "settings" accent: "Primary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller tooltip: qsTr("Network settings") onClicked: { diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml index b02f4c49..214e4eb3 100644 --- a/modules/controlcenter/network/VpnDetails.qml +++ b/modules/controlcenter/network/VpnDetails.qml @@ -10,7 +10,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils DeviceDetails { @@ -37,7 +37,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Connection status") @@ -92,12 +92,12 @@ DeviceDetails { RowLayout { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal - spacing: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal + spacing: Tokens.spacing.normal TextButton { Layout.fillWidth: true - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 visible: root.providerEnabled enabled: !VPN.connecting inactiveColour: Colours.palette.m3primaryContainer @@ -149,7 +149,7 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal visible: root.providerEnabled && VPN.status.state === "needs-auth" && VPN.status.authUrl !== "" text: qsTr("Open Login Page") inactiveColour: Colours.palette.m3tertiaryContainer @@ -162,10 +162,10 @@ DeviceDetails { StyledText { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal visible: root.providerEnabled && VPN.status.state === "needs-auth" && VPN.status.authUrl === "" text: qsTr("Click 'Connect' to generate authentication URL") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap @@ -175,7 +175,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Provider details") @@ -183,7 +183,7 @@ DeviceDetails { } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Provider") @@ -262,8 +262,8 @@ DeviceDetails { parent: Overlay.overlay anchors.centerIn: parent - width: Math.min(400, parent.width - Appearance.padding.large * 2) - padding: Appearance.padding.large * 1.5 + width: Math.min(400, parent.width - Tokens.padding.large * 2) + padding: Tokens.padding.large * 1.5 modal: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside @@ -276,15 +276,15 @@ DeviceDetails { property: "opacity" from: 0 to: 1 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { property: "scale" from: 0.7 to: 1 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } @@ -293,15 +293,15 @@ DeviceDetails { property: "opacity" from: 1 to: 0 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { property: "scale" from: 1 to: 0.7 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } @@ -311,7 +311,7 @@ DeviceDetails { background: StyledRect { color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.large + radius: Tokens.rounding.large Elevation { anchors.fill: parent @@ -322,21 +322,21 @@ DeviceDetails { } contentItem: ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { text: qsTr("Edit VPN Provider") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 StyledText { text: qsTr("Display Name") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -344,7 +344,7 @@ DeviceDetails { Layout.fillWidth: true implicitHeight: 40 color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -359,7 +359,7 @@ DeviceDetails { id: displayNameField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: editVpnDialog.displayName onTextChanged: editVpnDialog.displayName = text @@ -369,11 +369,11 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 StyledText { text: qsTr("Interface (e.g., wg0, torguard)") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -381,7 +381,7 @@ DeviceDetails { Layout.fillWidth: true implicitHeight: 40 color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -396,7 +396,7 @@ DeviceDetails { id: interfaceNameField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: editVpnDialog.interfaceName onTextChanged: editVpnDialog.interfaceName = text @@ -406,12 +406,12 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 visible: editVpnDialog.connectCmd.length > 0 StyledText { text: qsTr("Connect Command") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -419,7 +419,7 @@ DeviceDetails { Layout.fillWidth: true implicitHeight: 40 color: connectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: connectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -434,7 +434,7 @@ DeviceDetails { id: connectCmdFieldEdit anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: editVpnDialog.connectCmd onTextChanged: editVpnDialog.connectCmd = text @@ -444,12 +444,12 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 visible: editVpnDialog.disconnectCmd.length > 0 StyledText { text: qsTr("Disconnect Command") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -457,7 +457,7 @@ DeviceDetails { Layout.fillWidth: true implicitHeight: 40 color: disconnectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: disconnectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -472,7 +472,7 @@ DeviceDetails { id: disconnectCmdFieldEdit anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: editVpnDialog.disconnectCmd onTextChanged: editVpnDialog.disconnectCmd = text @@ -481,9 +481,9 @@ DeviceDetails { } RowLayout { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal TextButton { Layout.fillWidth: true diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml index 8522f972..5ca385cb 100644 --- a/modules/controlcenter/network/VpnList.qml +++ b/modules/controlcenter/network/VpnList.qml @@ -9,7 +9,7 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -18,7 +18,7 @@ ColumnLayout { property bool showHeader: true property int pendingSwitchIndex: -1 - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Connections { function onConnectedChanged() { @@ -77,7 +77,7 @@ ColumnLayout { Layout.preferredHeight: contentHeight interactive: false - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller model: ScriptModel { values: Config.utilities.vpn.provider.map((provider, index) => { @@ -104,10 +104,10 @@ ColumnLayout { required property int index width: ListView.view ? ListView.view.width : undefined - implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (root.session && root.session.vpn && root.session.vpn.active === modelData) ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal StateLayer { function onClicked(): void { @@ -123,15 +123,15 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: modelData.enabled && VPN.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh MaterialIcon { @@ -139,7 +139,7 @@ ColumnLayout { anchors.centerIn: parent text: modelData.enabled && VPN.connected ? "vpn_key" : "vpn_key_off" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: modelData.enabled && VPN.connected ? 1 : 0 color: modelData.enabled && VPN.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface } @@ -160,7 +160,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true @@ -197,7 +197,7 @@ ColumnLayout { return Colours.palette.m3tertiary; return Colours.palette.m3onSurface; } - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: modelData.enabled && VPN.connected ? 500 : 400 elide: Text.ElideRight } @@ -206,9 +206,9 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primaryContainer, VPN.connected && modelData.enabled ? 1 : 0) StateLayer { @@ -267,9 +267,9 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: deleteIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: deleteIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: "transparent" StateLayer { @@ -366,8 +366,8 @@ ColumnLayout { parent: Overlay.overlay x: Math.round((parent.width - width) / 2) y: Math.round((parent.height - height) / 2) - implicitWidth: Math.min(400, parent.width - Appearance.padding.large * 2) - padding: Appearance.padding.large * 1.5 + implicitWidth: Math.min(400, parent.width - Tokens.padding.large * 2) + padding: Tokens.padding.large * 1.5 modal: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside @@ -381,15 +381,15 @@ ColumnLayout { property: "opacity" from: 0 to: 1 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.emphasized } Anim { property: "scale" from: 0.7 to: 1 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -400,15 +400,15 @@ ColumnLayout { property: "opacity" from: 1 to: 0 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } Anim { property: "scale" from: 1 to: 0.7 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -423,7 +423,7 @@ ColumnLayout { background: StyledRect { color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.large + radius: Tokens.rounding.large Elevation { anchors.fill: parent @@ -434,8 +434,8 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.emphasized } } } @@ -445,8 +445,8 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.emphasized } } @@ -454,20 +454,20 @@ ColumnLayout { id: selectionContent anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal visible: vpnDialog.currentState === "selection" opacity: vpnDialog.currentState === "selection" ? 1 : 0 Behavior on opacity { Anim { - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } } StyledText { text: qsTr("Add VPN Provider") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -476,11 +476,11 @@ ColumnLayout { text: qsTr("Choose a provider to add") wrapMode: Text.WordWrap color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } TextButton { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true text: qsTr("NetBird") inactiveColour: Colours.tPalette.m3surfaceContainerHigh @@ -564,7 +564,7 @@ ColumnLayout { } TextButton { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true text: qsTr("Cancel") inactiveColour: Colours.palette.m3secondaryContainer @@ -577,30 +577,30 @@ ColumnLayout { id: formContent anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal visible: vpnDialog.currentState === "form" opacity: vpnDialog.currentState === "form" ? 1 : 0 Behavior on opacity { Anim { - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } } StyledText { text: vpnDialog.editIndex >= 0 ? qsTr("Edit VPN Provider") : qsTr("Add %1 VPN").arg(vpnDialog.displayName) - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 StyledText { text: qsTr("Display Name") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -608,7 +608,7 @@ ColumnLayout { Layout.fillWidth: true implicitHeight: 40 color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -623,7 +623,7 @@ ColumnLayout { id: displayNameField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: vpnDialog.displayName onTextChanged: vpnDialog.displayName = text @@ -633,11 +633,11 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 StyledText { text: qsTr("Interface (e.g., wg0, torguard)") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -645,7 +645,7 @@ ColumnLayout { Layout.fillWidth: true implicitHeight: 40 color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -660,7 +660,7 @@ ColumnLayout { id: interfaceNameField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: vpnDialog.interfaceName onTextChanged: vpnDialog.interfaceName = text @@ -670,12 +670,12 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 visible: vpnDialog.editIndex >= 0 ? (vpnDialog.connectCmd.length > 0) : (vpnDialog.providerName === "custom") StyledText { text: qsTr("Connect Command (e.g., wg-quick up wg0)") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -683,7 +683,7 @@ ColumnLayout { Layout.fillWidth: true implicitHeight: 40 color: connectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: connectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -698,7 +698,7 @@ ColumnLayout { id: connectCmdField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: vpnDialog.connectCmd onTextChanged: vpnDialog.connectCmd = text @@ -708,12 +708,12 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller / 2 + spacing: Tokens.spacing.smaller / 2 visible: vpnDialog.editIndex >= 0 ? (vpnDialog.connectCmd.length > 0) : (vpnDialog.providerName === "custom") StyledText { text: qsTr("Disconnect Command (e.g., wg-quick down wg0)") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -721,7 +721,7 @@ ColumnLayout { Layout.fillWidth: true implicitHeight: 40 color: disconnectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.small + radius: Tokens.rounding.small border.width: 1 border.color: disconnectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3) @@ -736,7 +736,7 @@ ColumnLayout { id: disconnectCmdField anchors.centerIn: parent - width: parent.width - Appearance.padding.normal + width: parent.width - Tokens.padding.normal horizontalAlignment: TextInput.AlignLeft text: vpnDialog.disconnectCmd onTextChanged: vpnDialog.disconnectCmd = text @@ -745,9 +745,9 @@ ColumnLayout { } RowLayout { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal TextButton { Layout.fillWidth: true @@ -822,8 +822,8 @@ ColumnLayout { target: selectionContent property: "opacity" to: 0 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } } @@ -838,8 +838,8 @@ ColumnLayout { target: formContent property: "opacity" to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.emphasized } } } diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml index 80732fde..d8dd09d1 100644 --- a/modules/controlcenter/network/VpnSettings.qml +++ b/modules/controlcenter/network/VpnSettings.qml @@ -11,14 +11,14 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "vpn_key" @@ -26,7 +26,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("General") description: qsTr("VPN configuration") } @@ -43,20 +43,20 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Providers") description: qsTr("Manage VPN providers") } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal ListView { Layout.fillWidth: true Layout.preferredHeight: contentHeight interactive: false - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller model: ScriptModel { values: Config.utilities.vpn.provider.map((provider, index) => { @@ -84,18 +84,18 @@ ColumnLayout { width: ListView.view ? ListView.view.width : undefined implicitHeight: 60 color: Colours.tPalette.m3surfaceContainerHigh - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal RowLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.normal MaterialIcon { text: modelData.isActive ? "vpn_key" : "vpn_key_off" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large color: modelData.isActive ? Colours.palette.m3primary : Colours.palette.m3outline } @@ -110,7 +110,7 @@ ColumnLayout { StyledText { text: qsTr("%1 • %2").arg(modelData.name).arg(modelData.interface || qsTr("No interface")) - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline } } @@ -186,7 +186,7 @@ ColumnLayout { TextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal text: qsTr("+ Add Provider") inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer @@ -198,13 +198,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Quick Add") description: qsTr("Add common VPN providers") } SectionContainer { - contentSpacing: Appearance.spacing.smaller + contentSpacing: Tokens.spacing.smaller TextButton { Layout.fillWidth: true diff --git a/modules/controlcenter/network/WirelessDetails.qml b/modules/controlcenter/network/WirelessDetails.qml index 913e5d75..b6d7e77e 100644 --- a/modules/controlcenter/network/WirelessDetails.qml +++ b/modules/controlcenter/network/WirelessDetails.qml @@ -10,7 +10,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils DeviceDetails { @@ -64,7 +64,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Connection status") @@ -86,8 +86,8 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.topMargin: Appearance.spacing.normal - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.topMargin: Tokens.spacing.normal + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 visible: { if (!root.network || !root.network.ssid) { return false; @@ -112,7 +112,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Network properties") @@ -120,7 +120,7 @@ DeviceDetails { } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("SSID") @@ -155,7 +155,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionHeader { title: qsTr("Connection information") diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml index bff142d3..878986d1 100644 --- a/modules/controlcenter/network/WirelessList.qml +++ b/modules/controlcenter/network/WirelessList.qml @@ -11,7 +11,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils DeviceList { @@ -34,7 +34,7 @@ DeviceList { visible: Nmcli.scanning text: qsTr("Scanning...") color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } @@ -48,11 +48,11 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Settings") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -64,9 +64,9 @@ DeviceList { toggled: Nmcli.wifiEnabled icon: "wifi" accent: "Tertiary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller onClicked: { Nmcli.toggleWifi(null); @@ -77,9 +77,9 @@ DeviceList { toggled: Nmcli.scanning icon: "wifi_find" accent: "Secondary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller onClicked: { Nmcli.rescanWifi(); @@ -90,9 +90,9 @@ DeviceList { toggled: !root.session.network.active icon: "settings" accent: "Primary" - iconSize: Appearance.font.size.normal - horizontalPadding: Appearance.padding.normal - verticalPadding: Appearance.padding.smaller + iconSize: Tokens.font.size.normal + horizontalPadding: Tokens.padding.normal + verticalPadding: Tokens.padding.smaller onClicked: { if (root.session.network.active) @@ -110,10 +110,10 @@ DeviceList { required property var modelData width: ListView.view ? ListView.view.width : undefined - implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal StateLayer { function onClicked(): void { @@ -130,15 +130,15 @@ DeviceList { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: modelData.active ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh MaterialIcon { @@ -146,7 +146,7 @@ DeviceList { anchors.centerIn: parent text: Icons.getNetworkIcon(modelData.strength, modelData.isSecure) - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: modelData.active ? 1 : 0 color: modelData.active ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface } @@ -167,7 +167,7 @@ DeviceList { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true @@ -182,7 +182,7 @@ DeviceList { return qsTr("Open"); } color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: modelData.active ? 500 : 400 elide: Text.ElideRight } @@ -191,9 +191,9 @@ DeviceList { StyledRect { implicitWidth: implicitHeight - implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0) StateLayer { diff --git a/modules/controlcenter/network/WirelessPane.qml b/modules/controlcenter/network/WirelessPane.qml index cccf8222..02af096d 100644 --- a/modules/controlcenter/network/WirelessPane.qml +++ b/modules/controlcenter/network/WirelessPane.qml @@ -6,7 +6,7 @@ import QtQuick import Quickshell.Widgets import qs.components import qs.components.containers -import qs.config +import Caelestia.Config SplitPaneWithDetails { id: root diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index 8700f1c4..14fb565a 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -10,7 +10,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -99,9 +99,9 @@ Item { anchors.centerIn: parent implicitWidth: 400 - implicitHeight: content.implicitHeight + Appearance.padding.large * 2 + implicitHeight: content.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surface opacity: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0 scale: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0.7 @@ -142,20 +142,20 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { Layout.alignment: Qt.AlignHCenter text: "lock" - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("Enter password") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -163,14 +163,14 @@ Item { Layout.alignment: Qt.AlignHCenter text: root.network ? qsTr("Network: %1").arg(root.network.ssid) : "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { id: statusText Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.spacing.small + Layout.topMargin: Tokens.spacing.small visible: connectButton.connecting || connectButton.hasError text: { if (connectButton.hasError) { @@ -182,10 +182,10 @@ Item { return ""; } color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: 400 wrapMode: Text.WordWrap - Layout.maximumWidth: parent.width - Appearance.padding.large * 2 + Layout.maximumWidth: parent.width - Tokens.padding.large * 2 } Item { @@ -193,9 +193,9 @@ Item { property string passwordBuffer: "" - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large Layout.fillWidth: true - implicitHeight: Math.max(48, charList.implicitHeight + Appearance.padding.normal * 2) + implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.normal * 2) focus: true Keys.onPressed: event => { if (!activeFocus) { @@ -261,7 +261,7 @@ Item { StyledRect { anchors.fill: parent - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.visible ? 1 : 0) border.color: { @@ -302,8 +302,8 @@ Item { anchors.centerIn: parent text: qsTr("Password") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.normal + font.family: Tokens.font.family.mono opacity: passwordContainer.passwordBuffer ? 0 : 1 Behavior on opacity { @@ -318,10 +318,10 @@ Item { anchors.centerIn: parent implicitWidth: fullWidth - implicitHeight: Appearance.font.size.normal + implicitHeight: Tokens.font.size.normal orientation: Qt.Horizontal - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 interactive: false model: ScriptModel { @@ -335,7 +335,7 @@ Item { implicitHeight: charList.implicitHeight color: Colours.palette.m3onSurface - radius: Appearance.rounding.small / 2 + radius: Tokens.rounding.small / 2 opacity: 0 scale: 0 @@ -378,8 +378,8 @@ Item { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } @@ -391,15 +391,15 @@ Item { } RowLayout { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal TextButton { id: cancelButton Layout.fillWidth: true - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer text: qsTr("Cancel") @@ -414,7 +414,7 @@ Item { property bool hasError: false Layout.fillWidth: true - Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2 + Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2 inactiveColour: Colours.palette.m3primary inactiveOnColour: Colours.palette.m3onPrimary text: qsTr("Connect") diff --git a/modules/controlcenter/network/WirelessSettings.qml b/modules/controlcenter/network/WirelessSettings.qml index 7b929bf9..bce381ba 100644 --- a/modules/controlcenter/network/WirelessSettings.qml +++ b/modules/controlcenter/network/WirelessSettings.qml @@ -8,14 +8,14 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root required property Session session - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SettingsHeader { icon: "wifi" @@ -23,7 +23,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("WiFi status") description: qsTr("General WiFi settings") } @@ -39,13 +39,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Appearance.spacing.large + Layout.topMargin: Tokens.spacing.large title: qsTr("Network information") description: qsTr("Current network connection") } SectionContainer { - contentSpacing: Appearance.spacing.small / 2 + contentSpacing: Tokens.spacing.small / 2 PropertyRow { label: qsTr("Connected network") diff --git a/modules/controlcenter/notifications/NotificationsPane.qml b/modules/controlcenter/notifications/NotificationsPane.qml index 8d58e9e8..5768e478 100644 --- a/modules/controlcenter/notifications/NotificationsPane.qml +++ b/modules/controlcenter/notifications/NotificationsPane.qml @@ -11,7 +11,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -66,9 +66,9 @@ Item { id: notificationsClippingRect anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal anchors.leftMargin: 0 - anchors.rightMargin: Appearance.padding.normal + anchors.rightMargin: Tokens.padding.normal color: "transparent" radius: notificationsBorder.innerRadius @@ -77,9 +77,9 @@ Item { id: notificationsLoader anchors.fill: parent - anchors.margins: Appearance.padding.large + Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large - anchors.rightMargin: Appearance.padding.large + anchors.margins: Tokens.padding.large + Tokens.padding.normal + anchors.leftMargin: Tokens.padding.large + anchors.rightMargin: Tokens.padding.large sourceComponent: notificationsContentComponent } @@ -89,7 +89,7 @@ Item { id: notificationsBorder leftThickness: 0 - rightThickness: Appearance.padding.normal + rightThickness: Tokens.padding.normal } Component { @@ -111,13 +111,13 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal ColumnLayout { Layout.fillWidth: true Layout.maximumWidth: 500 Layout.alignment: Qt.AlignTop - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionContainer { Layout.fillWidth: true @@ -125,7 +125,7 @@ Item { StyledText { text: qsTr("Notifications") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SplitButtonRow { @@ -220,7 +220,7 @@ Item { ColumnLayout { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionContainer { Layout.fillWidth: true @@ -228,7 +228,7 @@ Item { StyledText { text: qsTr("Toast settings") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SplitButtonRow { @@ -316,8 +316,8 @@ Item { GridLayout { Layout.fillWidth: true columns: 2 - columnSpacing: Appearance.spacing.normal - rowSpacing: Appearance.spacing.normal + columnSpacing: Tokens.spacing.normal + rowSpacing: Tokens.spacing.normal SwitchRow { Layout.fillWidth: true diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml index d61e932d..7ec57775 100644 --- a/modules/controlcenter/taskbar/TaskbarPane.qml +++ b/modules/controlcenter/taskbar/TaskbarPane.qml @@ -11,7 +11,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -126,9 +126,9 @@ Item { id: taskbarClippingRect anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal anchors.leftMargin: 0 - anchors.rightMargin: Appearance.padding.normal + anchors.rightMargin: Tokens.padding.normal radius: taskbarBorder.innerRadius color: "transparent" @@ -137,9 +137,9 @@ Item { id: taskbarLoader anchors.fill: parent - anchors.margins: Appearance.padding.large + Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large - anchors.rightMargin: Appearance.padding.large + anchors.margins: Tokens.padding.large + Tokens.padding.normal + anchors.leftMargin: Tokens.padding.large + anchors.rightMargin: Tokens.padding.large asynchronous: true sourceComponent: taskbarContentComponent @@ -150,7 +150,7 @@ Item { id: taskbarBorder leftThickness: 0 - rightThickness: Appearance.padding.normal + rightThickness: Tokens.padding.normal } Component { @@ -173,14 +173,14 @@ Item { anchors.right: parent.right anchors.top: parent.top - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { text: qsTr("Taskbar") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } } @@ -191,7 +191,7 @@ Item { StyledText { text: qsTr("Status Icons") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } ConnectedButtonGroup { @@ -270,14 +270,14 @@ Item { id: mainRowLayout Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal ColumnLayout { id: leftColumnLayout Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionContainer { Layout.fillWidth: true @@ -285,13 +285,13 @@ Item { StyledText { text: qsTr("Workspaces") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledRect { Layout.fillWidth: true - implicitHeight: workspacesShownRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -304,8 +304,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -326,8 +326,8 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -340,8 +340,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -360,8 +360,8 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: workspacesOccupiedBgRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -374,8 +374,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -394,8 +394,8 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: workspacesShowWindowsRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -408,8 +408,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -428,8 +428,8 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -442,8 +442,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -464,8 +464,8 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: workspacesPerMonitorRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal + implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.large * 2 + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) Behavior on implicitHeight { @@ -478,8 +478,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -503,7 +503,7 @@ Item { StyledText { text: qsTr("Scroll Actions") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } ConnectedButtonGroup { @@ -544,7 +544,7 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionContainer { Layout.fillWidth: true @@ -552,7 +552,7 @@ Item { StyledText { text: qsTr("Clock") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SwitchRow { @@ -589,7 +589,7 @@ Item { StyledText { text: qsTr("Bar Behavior") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SwitchRow { @@ -611,7 +611,7 @@ Item { } SectionContainer { - contentSpacing: Appearance.spacing.normal + contentSpacing: Tokens.spacing.normal SliderInput { Layout.fillWidth: true @@ -642,7 +642,7 @@ Item { StyledText { text: qsTr("Active window") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SwitchRow { @@ -670,7 +670,7 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal SectionContainer { Layout.fillWidth: true @@ -678,7 +678,7 @@ Item { StyledText { text: qsTr("Popouts") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } SwitchRow { @@ -715,7 +715,7 @@ Item { StyledText { text: qsTr("Tray Settings") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } ConnectedButtonGroup { @@ -756,7 +756,7 @@ Item { StyledText { text: qsTr("Monitors") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } ConnectedButtonGroup { diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index 957389f8..a07aca41 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -6,7 +6,7 @@ import Quickshell import Quickshell.Widgets import qs.components import qs.components.filedialog -import qs.config +import Caelestia.Config Item { id: root @@ -66,8 +66,8 @@ Item { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: Appearance.padding.normal - anchors.margins: Appearance.padding.large + anchors.topMargin: Tokens.padding.normal + anchors.margins: Tokens.padding.large nonAnimWidth: root.nonAnimWidth - anchors.margins * 2 dashState: root.dashState @@ -81,9 +81,9 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: "transparent" Flickable { @@ -199,15 +199,15 @@ Item { Behavior on implicitWidth { Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.emphasized } } Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.emphasized } } } diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml index 59620d88..3de9fb6b 100644 --- a/modules/dashboard/Dash.qml +++ b/modules/dashboard/Dash.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import qs.components import qs.components.filedialog import qs.services -import qs.config +import Caelestia.Config GridLayout { id: root @@ -12,8 +12,8 @@ GridLayout { required property DashboardState dashState required property FileDialog facePicker - rowSpacing: Appearance.spacing.normal - columnSpacing: Appearance.spacing.normal + rowSpacing: Tokens.spacing.normal + columnSpacing: Tokens.spacing.normal Rect { Layout.column: 2 @@ -21,7 +21,7 @@ GridLayout { Layout.preferredWidth: user.implicitWidth Layout.preferredHeight: user.implicitHeight - radius: Appearance.rounding.large + radius: Tokens.rounding.large User { id: user @@ -37,7 +37,7 @@ GridLayout { Layout.preferredWidth: Config.dashboard.sizes.weatherWidth Layout.fillHeight: true - radius: Appearance.rounding.large * 1.5 + radius: Tokens.rounding.large * 1.5 SmallWeather {} } @@ -47,7 +47,7 @@ GridLayout { Layout.preferredWidth: dateTime.implicitWidth Layout.fillHeight: true - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal DateTime { id: dateTime @@ -61,7 +61,7 @@ GridLayout { Layout.fillWidth: true Layout.preferredHeight: calendar.implicitHeight - radius: Appearance.rounding.large + radius: Tokens.rounding.large Calendar { id: calendar @@ -76,7 +76,7 @@ GridLayout { Layout.preferredWidth: resources.implicitWidth Layout.fillHeight: true - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal Resources { id: resources @@ -90,7 +90,7 @@ GridLayout { Layout.preferredWidth: media.implicitWidth Layout.fillHeight: true - radius: Appearance.rounding.large * 2 + radius: Tokens.rounding.large * 2 Media { id: media diff --git a/modules/dashboard/LyricMenu.qml b/modules/dashboard/LyricMenu.qml index 54b43eec..b311ff7c 100644 --- a/modules/dashboard/LyricMenu.qml +++ b/modules/dashboard/LyricMenu.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -19,7 +19,7 @@ StyledRect { implicitHeight: contentHeight - radius: Appearance.rounding.large + radius: Tokens.rounding.large color: Colours.tPalette.m3surfaceContainer Loader { @@ -29,31 +29,31 @@ StyledRect { sourceComponent: ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal // Header: icon, backend selector, refresh, toggle RowLayout { Layout.fillWidth: true - spacing: Appearance.padding.small + spacing: Tokens.padding.small MaterialIcon { text: "lyrics" fill: 1 color: Colours.palette.m3primary - font.pointSize: Appearance.spacing.large + font.pointSize: Tokens.spacing.large } Rectangle { Layout.preferredHeight: 24 Layout.preferredWidth: 80 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.15) StyledText { anchors.centerIn: parent text: LyricsService.preferredBackend - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3primary } @@ -73,14 +73,14 @@ StyledRect { Rectangle { Layout.preferredHeight: 24 Layout.preferredWidth: 60 - radius: Appearance.rounding.small + radius: Tokens.rounding.small visible: LyricsService.preferredBackend === "Auto" color: LyricsService.backend === "Local" ? Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.15) : Qt.rgba(Colours.palette.m3secondary.r, Colours.palette.m3secondary.g, Colours.palette.m3secondary.b, 0.15) StyledText { anchors.centerIn: parent text: LyricsService.backend - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: LyricsService.backend === "Local" ? Colours.palette.m3tertiary : Colours.palette.m3secondary } } @@ -105,7 +105,7 @@ StyledRect { Layout.fillWidth: true text: LyricsService.preferredBackend === "Local" ? "Loaded File:" : "Fetched Candidates:" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight visible: LyricsService.preferredBackend === "Local" ? LyricsService.loadedLocalFile.length > 0 : LyricsService.candidatesModel.count > 0 } @@ -115,12 +115,12 @@ StyledRect { Layout.fillWidth: true Layout.preferredHeight: 48 visible: LyricsService.preferredBackend === "Local" && LyricsService.loadedLocalFile.length > 0 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.1) ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small spacing: 0 StyledText { @@ -130,7 +130,7 @@ StyledRect { const parts = path.split('/'); return parts[parts.length - 1]; } - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3tertiary elide: Text.ElideMiddle } @@ -145,7 +145,7 @@ StyledRect { } return ""; } - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideMiddle } @@ -164,7 +164,7 @@ StyledRect { model: LyricsService.candidatesModel clip: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small visible: LyricsService.candidatesModel.count > 0 opacity: visible ? 1 : 0 @@ -186,7 +186,7 @@ StyledRect { Behavior on scale { NumberAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small easing.type: Easing.OutCubic } } @@ -195,7 +195,7 @@ StyledRect { id: background anchors.fill: parent - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: delegateRoot.pressed ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.25) : delegateRoot.hovered ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.06) : Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.03) @@ -204,12 +204,12 @@ StyledRect { Behavior on color { ColorAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } Behavior on border.width { NumberAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -228,8 +228,8 @@ StyledRect { Row { anchors.fill: parent - anchors.margins: Appearance.padding.normal - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.normal + spacing: Tokens.spacing.small // Active indicator bar Rectangle { @@ -241,7 +241,7 @@ StyledRect { Behavior on color { ColorAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -253,7 +253,7 @@ StyledRect { Text { text: delegateRoot.title - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.bold: true color: delegateRoot.hovered ? Colours.palette.m3primary : Colours.palette.m3onSurface width: parent.width @@ -261,14 +261,14 @@ StyledRect { Behavior on color { ColorAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } Text { text: delegateRoot.artist - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant elide: Text.ElideRight } @@ -286,19 +286,19 @@ StyledRect { // Manual search ColumnLayout { Layout.fillWidth: true - spacing: Appearance.padding.small + spacing: Tokens.padding.small StyledText { Layout.fillWidth: true text: "Manual Search" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant elide: Text.ElideRight } RowLayout { Layout.fillWidth: true - spacing: Appearance.padding.small + spacing: Tokens.padding.small StyledInputField { id: searchTitle @@ -336,18 +336,18 @@ StyledRect { // Offset controls RowLayout { Layout.fillWidth: true - spacing: Appearance.padding.small + spacing: Tokens.padding.small MaterialIcon { text: "contrast_square" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large color: Colours.palette.m3secondary } StyledText { text: "Offset" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -368,7 +368,7 @@ StyledRect { horizontalAlignment: TextInput.AlignHCenter color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal selectByMouse: true text: (LyricsService.offset >= 0 ? "+" : "") + LyricsService.offset.toFixed(1) + "s" onEditingFinished: { diff --git a/modules/dashboard/LyricsView.qml b/modules/dashboard/LyricsView.qml index 285e92f8..b0ef99a3 100644 --- a/modules/dashboard/LyricsView.qml +++ b/modules/dashboard/LyricsView.qml @@ -4,7 +4,7 @@ import Quickshell import qs.components import qs.components.containers import qs.services -import qs.config +import Caelestia.Config StyledListView { id: root @@ -19,7 +19,7 @@ StyledListView { preferredHighlightEnd: height / 2 + 30 highlightRangeMode: ListView.ApplyRange highlightFollowsCurrentItem: true - highlightMoveDuration: LyricsService.isManualSeeking ? 0 : Appearance.anim.durations.normal + highlightMoveDuration: LyricsService.isManualSeeking ? 0 : Tokens.anim.durations.normal layer.enabled: true layer.effect: ShaderEffect { required property Item source @@ -46,7 +46,7 @@ StyledListView { property bool isCurrent: ListView.isCurrentItem width: ListView.view.width - height: hasContent ? (lyricText.contentHeight + Appearance.spacing.large) : 0 + height: hasContent ? (lyricText.contentHeight + Tokens.spacing.large) : 0 MultiEffect { id: effect @@ -84,19 +84,19 @@ StyledListView { anchors.centerIn: parent horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: delegateRoot.isCurrent ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant font.bold: delegateRoot.isCurrent scale: delegateRoot.isCurrent ? 1.15 : 1.0 Behavior on color { CAnim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } Behavior on scale { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 4c838a5f..d8ed44b3 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -9,7 +9,7 @@ import Caelestia.Services import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -18,7 +18,7 @@ Item { required property DrawerVisibilities visibilities readonly property bool needsKeyboard: lyricMenuOpen - readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Config.dashboard.sizes.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Appearance.padding.large * 2 + readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Config.dashboard.sizes.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Tokens.padding.large * 2 readonly property real detailsHeightWithoutLyrics: details.implicitHeight - lyricsViewInDetails.implicitHeight property bool lyricMenuOpen: false @@ -52,7 +52,7 @@ Item { } } - implicitWidth: cover.implicitWidth + Config.dashboard.sizes.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Appearance.padding.large * 2 + implicitWidth: cover.implicitWidth + Config.dashboard.sizes.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Tokens.padding.large * 2 implicitHeight: nonAnimHeight Behavior on implicitHeight { @@ -61,7 +61,7 @@ Item { Behavior on playerProgress { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } @@ -106,8 +106,8 @@ Item { readonly property real centerX: width / 2 readonly property real centerY: height / 2 - readonly property real innerX: cover.implicitWidth / 2 + Appearance.spacing.small - readonly property real innerY: cover.implicitHeight / 2 + Appearance.spacing.small + readonly property real innerX: cover.implicitWidth / 2 + Tokens.spacing.small + readonly property real innerY: cover.implicitHeight / 2 + Tokens.spacing.small property color colour: Colours.palette.m3primary anchors.fill: cover @@ -136,8 +136,8 @@ Item { readonly property real cos: Math.cos(angle) readonly property real sin: Math.sin(angle) - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap - strokeWidth: 360 / Config.services.visualiserBars - Appearance.spacing.small / 4 + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + strokeWidth: 360 / Config.services.visualiserBars - Tokens.spacing.small / 4 strokeColor: Colours.palette.m3primary startX: visualiser.centerX + (visualiser.innerX + strokeWidth / 2) * cos @@ -159,7 +159,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: Appearance.padding.large + Config.dashboard.sizes.mediaVisualiserSize + anchors.leftMargin: Tokens.padding.large + Config.dashboard.sizes.mediaVisualiserSize implicitWidth: Config.dashboard.sizes.mediaCoverArtSize implicitHeight: Config.dashboard.sizes.mediaCoverArtSize @@ -201,9 +201,9 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: visualiser.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { id: title @@ -215,7 +215,7 @@ Item { horizontalAlignment: Text.AlignHCenter text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title") color: Players.active ? Colours.palette.m3primary : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } @@ -230,7 +230,7 @@ Item { visible: !!Players.active text: Players.active?.trackAlbum || qsTr("Unknown album") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } @@ -259,15 +259,15 @@ Item { id: controls Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.spacing.small - Layout.bottomMargin: Appearance.spacing.smaller + Layout.topMargin: Tokens.spacing.small + Layout.bottomMargin: Tokens.spacing.smaller - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small PlayerControl { type: IconButton.Text icon: Players.active?.shuffle ? "shuffle_on" : "shuffle" - font.pointSize: Math.round(Appearance.font.size.large) + font.pointSize: Math.round(Tokens.font.size.large) disabled: !Players.active?.shuffleSupported onClicked: Players.active.shuffle = !Players.active?.shuffle } @@ -275,7 +275,7 @@ Item { PlayerControl { type: IconButton.Text icon: "skip_previous" - font.pointSize: Math.round(Appearance.font.size.large * 1.5) + font.pointSize: Math.round(Tokens.font.size.large * 1.5) disabled: !Players.active?.canGoPrevious onClicked: Players.active?.previous() } @@ -284,9 +284,9 @@ Item { icon: Players.active?.isPlaying ? "pause" : "play_arrow" label.animate: true toggle: true - padding: Appearance.padding.small / 2 + padding: Tokens.padding.small / 2 checked: Players.active?.isPlaying ?? false - font.pointSize: Math.round(Appearance.font.size.large * 1.5) + font.pointSize: Math.round(Tokens.font.size.large * 1.5) disabled: !Players.active?.canTogglePlaying onClicked: Players.active?.togglePlaying() } @@ -294,7 +294,7 @@ Item { PlayerControl { type: IconButton.Text icon: "skip_next" - font.pointSize: Math.round(Appearance.font.size.large * 1.5) + font.pointSize: Math.round(Tokens.font.size.large * 1.5) disabled: !Players.active?.canGoNext onClicked: Players.active?.next() } @@ -302,7 +302,7 @@ Item { PlayerControl { type: IconButton.Text icon: "lyrics" - font.pointSize: Math.round(Appearance.font.size.large) + font.pointSize: Math.round(Tokens.font.size.large) onClicked: root.lyricMenuOpen = !root.lyricMenuOpen } } @@ -312,7 +312,7 @@ Item { enabled: !!Players.active implicitWidth: 280 - implicitHeight: Appearance.padding.normal * 3 + implicitHeight: Tokens.padding.normal * 3 onMoved: { const active = Players.active; @@ -356,7 +356,7 @@ Item { text: root.lengthStr(Players.active?.position ?? -1) color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledText { @@ -366,7 +366,7 @@ Item { text: root.lengthStr(Players.active?.length ?? -1) color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } } @@ -377,14 +377,14 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: playerChanger.parent == leftSection ? -playerChanger.height : 0 anchors.left: details.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal visible: lyricMenu.height === 0 || opacity > 0 opacity: lyricMenu.height === 0 ? 1 : 0 Behavior on opacity { NumberAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.OutCubic } } @@ -402,7 +402,7 @@ Item { height: visualiser.height * 0.75 playing: Players.active?.isPlaying ?? false - speed: Audio.beatTracker.bpm / Appearance.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type + speed: Audio.beatTracker.bpm / Tokens.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit @@ -416,9 +416,9 @@ Item { anchors.top: parent.top anchors.left: details.right anchors.right: parent.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal - contentHeight: !root.lyricsShowingDebounced ? root.detailsHeightWithoutLyrics + Appearance.padding.large * 5 : root.detailsHeightWithoutLyrics + lyricsViewInDetails.implicitHeight + contentHeight: !root.lyricsShowingDebounced ? root.detailsHeightWithoutLyrics + Tokens.padding.large * 5 : root.detailsHeightWithoutLyrics + lyricsViewInDetails.implicitHeight visible: root.lyricMenuOpen || height > 0 height: root.lyricMenuOpen ? implicitHeight : 0 @@ -426,7 +426,7 @@ Item { Behavior on height { NumberAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.OutCubic } } @@ -437,14 +437,14 @@ Item { parent: !root.lyricsShowingDebounced ? details : leftSection Layout.alignment: Qt.AlignHCenter - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small PlayerControl { type: IconButton.Text icon: "move_up" inactiveOnColour: Colours.palette.m3secondary - padding: Appearance.padding.small - font.pointSize: Appearance.font.size.large + padding: Tokens.padding.small + font.pointSize: Tokens.font.size.large disabled: !Players.active?.canRaise onClicked: { Players.active?.raise(); @@ -482,8 +482,8 @@ Item { type: IconButton.Text icon: "delete" inactiveOnColour: Colours.palette.m3error - padding: Appearance.padding.small - font.pointSize: Appearance.font.size.large + padding: Tokens.padding.small + font.pointSize: Tokens.font.size.large disabled: !Players.active?.canQuit onClicked: Players.active?.quit() } @@ -498,15 +498,15 @@ Item { } component PlayerControl: IconButton { - Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Appearance.padding.large : internalChecked ? Appearance.padding.smaller : 0) - radius: stateLayer.pressed ? Appearance.rounding.small / 2 : internalChecked ? Appearance.rounding.small : implicitHeight / 2 - radiusAnim.duration: Appearance.anim.durations.expressiveFastSpatial - radiusAnim.easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0) + radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : implicitHeight / 2 + radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial + radiusAnim.easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index 75198254..13ab57a7 100644 --- a/modules/dashboard/Performance.qml +++ b/modules/dashboard/Performance.qml @@ -6,12 +6,12 @@ import Caelestia.Internal import qs.components import qs.components.misc import qs.services -import qs.config +import Caelestia.Config Item { id: root - readonly property int minWidth: 400 + 400 + Appearance.spacing.normal + 120 + Appearance.padding.large * 2 + readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.large * 2 function displayTemp(temp: real): string { return `${Math.ceil(Config.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${Config.services.useFahrenheitPerformance ? "F" : "C"}`; @@ -26,32 +26,32 @@ Item { anchors.centerIn: parent width: 400 height: 350 - radius: Appearance.rounding.large + radius: Tokens.rounding.large color: Colours.tPalette.m3surfaceContainer visible: !Config.dashboard.performance.showCpu && !(Config.dashboard.performance.showGpu && SystemUsage.gpuType !== "NONE") && !Config.dashboard.performance.showMemory && !Config.dashboard.performance.showStorage && !Config.dashboard.performance.showNetwork && !(UPower.displayDevice.isLaptopBattery && Config.dashboard.performance.showBattery) ColumnLayout { anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { Layout.alignment: Qt.AlignHCenter text: "tune" - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 color: Colours.palette.m3onSurfaceVariant } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("No widgets enabled") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large color: Colours.palette.m3onSurface } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("Enable widgets in dashboard settings") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } } @@ -62,7 +62,7 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal visible: !placeholder.visible Ref { @@ -73,11 +73,11 @@ Item { id: mainColumn Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal visible: Config.dashboard.performance.showCpu || (Config.dashboard.performance.showGpu && SystemUsage.gpuType !== "NONE") HeroCard { @@ -115,7 +115,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal visible: Config.dashboard.performance.showMemory || Config.dashboard.performance.showStorage || Config.dashboard.performance.showNetwork GaugeCard { @@ -166,7 +166,7 @@ Item { property real animatedPercentage: 0 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.large + radius: Tokens.rounding.large Component.onCompleted: animatedPercentage = percentage onPercentageChanged: animatedPercentage = percentage @@ -181,13 +181,13 @@ Item { ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.small // Header Section ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { text: { @@ -214,14 +214,14 @@ Item { return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`; } - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large color: batteryTank.accentColor } StyledText { Layout.fillWidth: true text: qsTr("Battery") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: Colours.palette.m3onSurface } } @@ -238,7 +238,7 @@ Item { StyledText { Layout.alignment: Qt.AlignRight text: `${Math.round(batteryTank.percentage * 100)}%` - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: Font.Medium color: batteryTank.accentColor } @@ -263,7 +263,7 @@ Item { return `${min}m`; } - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller color: Colours.palette.m3onSurfaceVariant } } @@ -271,7 +271,7 @@ Item { Behavior on animatedPercentage { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -282,19 +282,19 @@ Item { property color accentColor: Colours.palette.m3primary Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { text: parent.icon fill: 1 color: parent.accentColor - font.pointSize: Appearance.spacing.large + font.pointSize: Tokens.spacing.large } StyledText { Layout.fillWidth: true text: parent.title - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } } @@ -308,7 +308,7 @@ Item { property real animatedValue: 0 color: bgColor - radius: Appearance.rounding.full + radius: Tokens.rounding.full Component.onCompleted: animatedValue = value onValueChanged: animatedValue = value @@ -318,12 +318,12 @@ Item { anchors.bottom: parent.bottom width: parent.width * progressBar.animatedValue color: progressBar.fgColor - radius: Appearance.rounding.full + radius: Tokens.rounding.full } Behavior on animatedValue { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -346,7 +346,7 @@ Item { property real animatedTemp: 0 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.large + radius: Tokens.rounding.large Component.onCompleted: { animatedUsage = usage; animatedTemp = tempProgress; @@ -365,10 +365,10 @@ Item { CardHeader { anchors.left: parent.left anchors.top: parent.top - anchors.leftMargin: Appearance.padding.large - anchors.topMargin: Math.round(Appearance.padding.large * 1.2) + anchors.leftMargin: Tokens.padding.large + anchors.topMargin: Math.round(Tokens.padding.large * 1.2) - width: parent.width - anchors.leftMargin - usageColumn.anchors.rightMargin - usageLabel.width - Appearance.spacing.normal + width: parent.width - anchors.leftMargin - usageColumn.anchors.rightMargin - usageLabel.width - Tokens.spacing.normal icon: heroCard.icon title: heroCard.title accentColor: heroCard.accentColor @@ -378,23 +378,23 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.margins: Math.round(Appearance.padding.large * 1.2) - anchors.bottomMargin: Math.round(Appearance.padding.large * 1.3) + anchors.margins: Math.round(Tokens.padding.large * 1.2) + anchors.bottomMargin: Math.round(Tokens.padding.large * 1.3) - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Row { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { text: heroCard.secondaryValue - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: Font.Medium } StyledText { text: heroCard.secondaryLabel - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant anchors.baseline: parent.children[0].baseline } @@ -414,7 +414,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large anchors.rightMargin: 32 spacing: 0 @@ -423,14 +423,14 @@ Item { anchors.right: parent.right text: heroCard.mainLabel - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: Colours.palette.m3onSurfaceVariant } StyledText { anchors.right: parent.right text: heroCard.mainValue - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: Font.Medium color: heroCard.accentColor } @@ -438,13 +438,13 @@ Item { Behavior on animatedUsage { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } Behavior on animatedTemp { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -462,15 +462,15 @@ Item { property real animatedPercentage: 0 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.large + radius: Tokens.rounding.large clip: true Component.onCompleted: animatedPercentage = percentage onPercentageChanged: animatedPercentage = percentage ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.smaller + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.smaller CardHeader { icon: gaugeCard.icon @@ -496,7 +496,7 @@ Item { StyledText { anchors.centerIn: parent text: `${Math.round(gaugeCard.percentage * 100)}%` - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: Font.Medium color: gaugeCard.accentColor } @@ -505,14 +505,14 @@ Item { StyledText { Layout.alignment: Qt.AlignHCenter text: gaugeCard.subtitle - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller color: Colours.palette.m3onSurfaceVariant } } Behavior on animatedPercentage { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -529,7 +529,7 @@ Item { property color accentColor: Colours.palette.m3secondary color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.large + radius: Tokens.rounding.large clip: true Component.onCompleted: { diskCount = SystemUsage.disks.length; @@ -567,8 +567,8 @@ Item { ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.smaller + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.smaller CardHeader { icon: "hard_disk" @@ -585,7 +585,7 @@ Item { MaterialIcon { text: "unfold_more" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal visible: storageGaugeCard.diskCount > 1 opacity: 0.7 ToolTip.visible: hintHover.hovered @@ -616,7 +616,7 @@ Item { StyledText { anchors.centerIn: parent text: storageGaugeCard.currentDisk ? `${Math.round(storageGaugeCard.currentDisk.perc * 100)}%` : "—" - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: Font.Medium color: storageGaugeCard.accentColor } @@ -632,14 +632,14 @@ Item { const totalFmt = SystemUsage.formatKib(storageGaugeCard.currentDisk.total); return `${usedFmt.value.toFixed(1)} / ${Math.floor(totalFmt.value)} ${totalFmt.unit}`; } - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller color: Colours.palette.m3onSurfaceVariant } } Behavior on animatedPercentage { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -650,7 +650,7 @@ Item { property color accentColor: Colours.palette.m3primary color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.large + radius: Tokens.rounding.large clip: true Ref { @@ -659,8 +659,8 @@ Item { ColumnLayout { anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.small CardHeader { icon: "swap_vert" @@ -710,7 +710,7 @@ Item { Behavior on smoothMax { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -719,7 +719,7 @@ Item { StyledText { anchors.centerIn: parent text: qsTr("Collecting data...") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant visible: NetworkUsage.downloadBuffer.count < 2 opacity: 0.6 @@ -729,17 +729,17 @@ Item { // Download row RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "download" color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: qsTr("Download") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -752,7 +752,7 @@ Item { const fmt = NetworkUsage.formatBytes(NetworkUsage.downloadSpeed ?? 0); return fmt ? `${fmt.value.toFixed(1)} ${fmt.unit}` : "0.0 B/s"; } - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: Font.Medium color: Colours.palette.m3tertiary } @@ -761,17 +761,17 @@ Item { // Upload row RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "upload" color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: qsTr("Upload") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -784,7 +784,7 @@ Item { const fmt = NetworkUsage.formatBytes(NetworkUsage.uploadSpeed ?? 0); return fmt ? `${fmt.value.toFixed(1)} ${fmt.unit}` : "0.0 B/s"; } - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: Font.Medium color: Colours.palette.m3secondary } @@ -793,17 +793,17 @@ Item { // Session totals RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "history" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: qsTr("Total") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } @@ -817,7 +817,7 @@ Item { const up = NetworkUsage.formatBytesTotal(NetworkUsage.uploadTotal ?? 0); return (down && up) ? `↓${down.value.toFixed(1)}${down.unit} ↑${up.value.toFixed(1)}${up.unit}` : "↓0.0B ↑0.0B"; } - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } } diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index 7d8ff051..94556aca 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -7,7 +7,7 @@ import Quickshell.Widgets import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -77,7 +77,7 @@ Item { implicitHeight: parent.implicitHeight * 2 color: Colours.palette.m3primary - radius: Appearance.rounding.full + radius: Tokens.rounding.full } Behavior on x { @@ -163,16 +163,16 @@ Item { properties: "implicitWidth,implicitHeight" from: 0 to: rippleAnim.radius * 2 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { target: ripple property: "opacity" to: 0 - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } @@ -185,7 +185,7 @@ Item { implicitHeight: parent.height + Config.dashboard.sizes.tabIndicatorSpacing * 2 color: "transparent" - radius: Appearance.rounding.small + radius: Tokens.rounding.small StyledRect { id: stateLayer @@ -203,7 +203,7 @@ Item { StyledRect { id: ripple - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurface opacity: 0 @@ -223,7 +223,7 @@ Item { text: tab.iconName color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant fill: tab.current ? 1 : 0 - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large Behavior on fill { Anim {} diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml index a87ce29a..78be9ad7 100644 --- a/modules/dashboard/WeatherTab.qml +++ b/modules/dashboard/WeatherTab.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -17,26 +17,26 @@ Item { id: layout anchors.fill: parent - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller RowLayout { - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large + Layout.leftMargin: Tokens.padding.large + Layout.rightMargin: Tokens.padding.large Layout.fillWidth: true Column { - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { text: Weather.city || qsTr("Loading...") - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 600 color: Colours.palette.m3onSurface } StyledText { text: new Date().toLocaleDateString(Qt.locale(), "dddd, MMMM d") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3onSurfaceVariant } } @@ -46,7 +46,7 @@ Item { } Row { - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large WeatherStat { icon: "wb_twilight" @@ -66,40 +66,40 @@ Item { StyledRect { Layout.fillWidth: true - implicitHeight: bigInfoRow.implicitHeight + Appearance.padding.small * 2 + implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small * 2 - radius: Appearance.rounding.large * 2 + radius: Tokens.rounding.large * 2 color: Colours.tPalette.m3surfaceContainer RowLayout { id: bigInfoRow anchors.centerIn: parent - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large MaterialIcon { Layout.alignment: Qt.AlignVCenter text: Weather.icon - font.pointSize: Appearance.font.size.extraLarge * 3 + font.pointSize: Tokens.font.size.extraLarge * 3 color: Colours.palette.m3secondary animate: true } ColumnLayout { Layout.alignment: Qt.AlignVCenter - spacing: -Appearance.spacing.small + spacing: -Tokens.spacing.small StyledText { text: Weather.temp - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 font.weight: 500 color: Colours.palette.m3primary } StyledText { - Layout.leftMargin: Appearance.padding.small + Layout.leftMargin: Tokens.padding.small text: Weather.description - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal color: Colours.palette.m3onSurfaceVariant } } @@ -108,7 +108,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller DetailCard { icon: "water_drop" @@ -131,18 +131,18 @@ Item { } StyledText { - Layout.topMargin: Appearance.spacing.normal - Layout.leftMargin: Appearance.padding.normal + Layout.topMargin: Tokens.spacing.normal + Layout.leftMargin: Tokens.padding.normal visible: forecastRepeater.count > 0 text: qsTr("7-Day Forecast") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 600 color: Colours.palette.m3onSurface } RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller Repeater { id: forecastRepeater @@ -156,30 +156,30 @@ Item { required property var modelData Layout.fillWidth: true - implicitHeight: forecastItemColumn.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.normal * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { id: forecastItemColumn anchors.centerIn: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { Layout.alignment: Qt.AlignHCenter text: forecastItem.index === 0 ? qsTr("Today") : new Date(forecastItem.modelData.date).toLocaleDateString(Qt.locale(), "ddd") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 600 color: Colours.palette.m3primary } StyledText { - Layout.topMargin: -Appearance.spacing.small / 2 + Layout.topMargin: -Tokens.spacing.small / 2 Layout.alignment: Qt.AlignHCenter text: new Date(forecastItem.modelData.date).toLocaleDateString(Qt.locale(), "MMM d") - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small opacity: 0.7 color: Colours.palette.m3onSurfaceVariant } @@ -187,7 +187,7 @@ Item { MaterialIcon { Layout.alignment: Qt.AlignHCenter text: forecastItem.modelData.icon - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge color: Colours.palette.m3secondary } @@ -213,17 +213,17 @@ Item { Layout.fillWidth: true Layout.preferredHeight: 60 - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer Row { anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: detailRoot.icon color: detailRoot.colour - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large anchors.verticalCenter: parent.verticalCenter } @@ -233,7 +233,7 @@ Item { StyledText { text: detailRoot.label - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller opacity: 0.7 horizontalAlignment: Text.AlignLeft } @@ -254,23 +254,23 @@ Item { property string value property color colour - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { text: weatherStat.icon - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge color: weatherStat.colour } Column { StyledText { text: weatherStat.label - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller color: Colours.palette.m3onSurfaceVariant } StyledText { text: weatherStat.value - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small font.weight: 600 color: Colours.palette.m3onSurface } diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index 566f616a..e01dc0f0 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -5,7 +5,7 @@ import Quickshell import Caelestia import qs.components import qs.components.filedialog -import qs.config +import Caelestia.Config import qs.utils Item { @@ -40,8 +40,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml index 64e43f5c..d415a031 100644 --- a/modules/dashboard/dash/Calendar.qml +++ b/modules/dashboard/dash/Calendar.qml @@ -7,7 +7,7 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config CustomMouseArea { id: root @@ -35,18 +35,18 @@ CustomMouseArea { id: inner anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.small + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.small RowLayout { id: monthNavigationRow Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Item { implicitWidth: implicitHeight - implicitHeight: prevMonthText.implicitHeight + Appearance.padding.small * 2 + implicitHeight: prevMonthText.implicitHeight + Tokens.padding.small * 2 StateLayer { id: prevMonthStateLayer @@ -55,7 +55,7 @@ CustomMouseArea { root.dashState.currentDate = new Date(root.currYear, root.currMonth - 1, 1); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full } MaterialIcon { @@ -64,7 +64,7 @@ CustomMouseArea { anchors.centerIn: parent text: "chevron_left" color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 700 } } @@ -72,8 +72,8 @@ CustomMouseArea { Item { Layout.fillWidth: true - implicitWidth: monthYearDisplay.implicitWidth + Appearance.padding.small * 2 - implicitHeight: monthYearDisplay.implicitHeight + Appearance.padding.small * 2 + implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.small * 2 + implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.small * 2 StateLayer { function onClicked(): void { @@ -81,11 +81,11 @@ CustomMouseArea { } anchors.fill: monthYearDisplay - anchors.margins: -Appearance.padding.small - anchors.leftMargin: -Appearance.padding.normal - anchors.rightMargin: -Appearance.padding.normal + anchors.margins: -Tokens.padding.small + anchors.leftMargin: -Tokens.padding.normal + anchors.rightMargin: -Tokens.padding.normal - radius: Appearance.rounding.full + radius: Tokens.rounding.full disabled: { const now = new Date(); return root.currMonth === now.getMonth() && root.currYear === now.getFullYear(); @@ -98,7 +98,7 @@ CustomMouseArea { anchors.centerIn: parent text: grid.title color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 font.capitalization: Font.Capitalize } @@ -106,7 +106,7 @@ CustomMouseArea { Item { implicitWidth: implicitHeight - implicitHeight: nextMonthText.implicitHeight + Appearance.padding.small * 2 + implicitHeight: nextMonthText.implicitHeight + Tokens.padding.small * 2 StateLayer { id: nextMonthStateLayer @@ -115,7 +115,7 @@ CustomMouseArea { root.dashState.currentDate = new Date(root.currYear, root.currMonth + 1, 1); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full } MaterialIcon { @@ -124,7 +124,7 @@ CustomMouseArea { anchors.centerIn: parent text: "chevron_right" color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 700 } } @@ -167,7 +167,7 @@ CustomMouseArea { required property var model implicitWidth: implicitHeight - implicitHeight: text.implicitHeight + Appearance.padding.small * 2 + implicitHeight: text.implicitHeight + Tokens.padding.small * 2 StyledText { id: text @@ -184,7 +184,7 @@ CustomMouseArea { return Colours.palette.m3onSurfaceVariant; } opacity: dayItem.model.today || dayItem.model.month === grid.month ? 1 : 0.4 - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal font.weight: 500 } } @@ -208,7 +208,7 @@ CustomMouseArea { implicitHeight: today?.implicitHeight ?? 0 clip: true - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primary opacity: todayItem ? 1 : 0 @@ -236,15 +236,15 @@ CustomMouseArea { Behavior on x { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on y { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml index 7f786a19..1b43b137 100644 --- a/modules/dashboard/dash/DateTime.qml +++ b/modules/dashboard/dash/DateTime.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -24,8 +24,8 @@ Item { Layout.alignment: Qt.AlignHCenter text: Time.hourStr color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.family: Appearance.font.family.clock + font.pointSize: Tokens.font.size.extraLarge + font.family: Tokens.font.family.clock font.weight: 600 } @@ -33,8 +33,8 @@ Item { Layout.alignment: Qt.AlignHCenter text: "•••" color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge * 0.9 - font.family: Appearance.font.family.clock + font.pointSize: Tokens.font.size.extraLarge * 0.9 + font.family: Tokens.font.family.clock } StyledText { @@ -42,8 +42,8 @@ Item { Layout.alignment: Qt.AlignHCenter text: Time.minuteStr color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.family: Appearance.font.family.clock + font.pointSize: Tokens.font.size.extraLarge + font.family: Tokens.font.family.clock font.weight: 600 } @@ -57,8 +57,8 @@ Item { sourceComponent: StyledText { text: Time.amPmStr color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.large - font.family: Appearance.font.family.clock + font.pointSize: Tokens.font.size.large + font.family: Tokens.font.family.clock font.weight: 600 } } diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index 4f50531c..d6cfa76a 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -3,7 +3,7 @@ import QtQuick.Shapes import Caelestia.Services import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -20,7 +20,7 @@ Item { Behavior on playerProgress { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } @@ -43,13 +43,13 @@ Item { fillColor: "transparent" strokeColor: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) strokeWidth: Config.dashboard.sizes.mediaProgressThickness - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { centerX: cover.x + cover.width / 2 centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small + radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small + radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 sweepAngle: Config.dashboard.sizes.mediaProgressSweep } @@ -63,13 +63,13 @@ Item { fillColor: "transparent" strokeColor: Colours.palette.m3primary strokeWidth: Config.dashboard.sizes.mediaProgressThickness - capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap + capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { centerX: cover.x + cover.width / 2 centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small + radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small + radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 sweepAngle: Config.dashboard.sizes.mediaProgressSweep * root.playerProgress } @@ -86,7 +86,7 @@ Item { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.large + Config.dashboard.sizes.mediaProgressThickness + Appearance.spacing.small + anchors.margins: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small implicitHeight: width color: Colours.tPalette.m3surfaceContainerHigh @@ -119,15 +119,15 @@ Item { anchors.top: cover.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.normal + anchors.topMargin: Tokens.spacing.normal animate: true horizontalAlignment: Text.AlignHCenter text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title") color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal - width: parent.implicitWidth - Appearance.padding.large * 2 + width: parent.implicitWidth - Tokens.padding.large * 2 elide: Text.ElideRight } @@ -136,15 +136,15 @@ Item { anchors.top: title.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.small + anchors.topMargin: Tokens.spacing.small animate: true horizontalAlignment: Text.AlignHCenter text: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small - width: parent.implicitWidth - Appearance.padding.large * 2 + width: parent.implicitWidth - Tokens.padding.large * 2 elide: Text.ElideRight } @@ -153,14 +153,14 @@ Item { anchors.top: album.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.small + anchors.topMargin: Tokens.spacing.small animate: true horizontalAlignment: Text.AlignHCenter text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist") color: Colours.palette.m3secondary - width: parent.implicitWidth - Appearance.padding.large * 2 + width: parent.implicitWidth - Tokens.padding.large * 2 elide: Text.ElideRight } @@ -169,9 +169,9 @@ Item { anchors.top: artist.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.smaller + anchors.topMargin: Tokens.spacing.smaller - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Control { function onClicked(): void { @@ -208,12 +208,12 @@ Item { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: Appearance.spacing.small - anchors.bottomMargin: Appearance.padding.large - anchors.margins: Appearance.padding.large * 2 + anchors.topMargin: Tokens.spacing.small + anchors.bottomMargin: Tokens.padding.large + anchors.margins: Tokens.padding.large * 2 playing: Players.active?.isPlaying ?? false - speed: Audio.beatTracker.bpm / Appearance.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type + speed: Audio.beatTracker.bpm / Tokens.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit @@ -228,7 +228,7 @@ Item { function onClicked(): void { } - implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Appearance.padding.small + implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Tokens.padding.small implicitHeight: implicitWidth StateLayer { @@ -237,7 +237,7 @@ Item { } disabled: !control.canUse - radius: Appearance.rounding.full + radius: Tokens.rounding.full } MaterialIcon { @@ -249,7 +249,7 @@ Item { animate: true text: control.icon color: control.canUse ? Colours.palette.m3onSurface : Colours.palette.m3outline - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index f5ac4556..3dec14f2 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -2,7 +2,7 @@ import QtQuick import qs.components import qs.components.misc import qs.services -import qs.config +import Caelestia.Config Row { id: root @@ -10,8 +10,8 @@ Row { anchors.top: parent.top anchors.bottom: parent.bottom - padding: Appearance.padding.large - spacing: Appearance.spacing.normal + padding: Tokens.padding.large + spacing: Tokens.spacing.normal Ref { service: SystemUsage @@ -44,19 +44,19 @@ Row { anchors.top: parent.top anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large implicitWidth: icon.implicitWidth StyledRect { anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.bottom: icon.top - anchors.bottomMargin: Appearance.spacing.small + anchors.bottomMargin: Tokens.spacing.small implicitWidth: Config.dashboard.sizes.resourceProgessThickness color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full StyledRect { anchors.left: parent.left @@ -65,7 +65,7 @@ Row { implicitHeight: res.value * parent.height color: res.colour - radius: Appearance.rounding.full + radius: Tokens.rounding.full } } @@ -80,7 +80,7 @@ Row { Behavior on value { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } diff --git a/modules/dashboard/dash/SmallWeather.qml b/modules/dashboard/dash/SmallWeather.qml index 666a2701..dbc5ac3e 100644 --- a/modules/dashboard/dash/SmallWeather.qml +++ b/modules/dashboard/dash/SmallWeather.qml @@ -1,7 +1,7 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -21,7 +21,7 @@ Item { animate: true text: Weather.icon color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 } Column { @@ -29,9 +29,9 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.large + anchors.leftMargin: Tokens.spacing.large - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { anchors.horizontalCenter: parent.horizontalCenter @@ -39,7 +39,7 @@ Item { animate: true text: Weather.temp color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 500 } @@ -50,7 +50,7 @@ Item { text: Weather.description elide: Text.ElideRight - width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Appearance.padding.large * 2) + width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Tokens.padding.large * 2) } } } diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 7dc47f74..03ca0e6b 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -4,7 +4,7 @@ import qs.components.effects import qs.components.filedialog import qs.components.images import qs.services -import qs.config +import Caelestia.Config import qs.utils Row { @@ -13,14 +13,14 @@ Row { required property DrawerVisibilities visibilities required property FileDialog facePicker - padding: Appearance.padding.large - spacing: Appearance.spacing.normal + padding: Tokens.padding.large + spacing: Tokens.spacing.normal StyledClippingRect { implicitWidth: info.implicitHeight implicitHeight: info.implicitHeight - radius: Appearance.rounding.large + radius: Tokens.rounding.large color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) MaterialIcon { @@ -52,7 +52,7 @@ Row { Behavior on opacity { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial } } } @@ -60,10 +60,10 @@ Row { StyledRect { anchors.centerIn: parent - implicitWidth: selectIcon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: selectIcon.implicitHeight + Appearance.padding.small * 2 + implicitWidth: selectIcon.implicitHeight + Tokens.padding.small * 2 + implicitHeight: selectIcon.implicitHeight + Tokens.padding.small * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.palette.m3primary scale: parent.containsMouse ? 1 : 0.5 opacity: parent.containsMouse ? 1 : 0 @@ -85,19 +85,19 @@ Row { text: "frame_person" color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge } Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial } } } @@ -108,7 +108,7 @@ Row { id: info anchors.verticalCenter: parent.verticalCenter - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Item { id: line @@ -123,7 +123,7 @@ Row { anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2 source: SysInfo.osLogo - implicitSize: Math.floor(Appearance.font.size.normal * 1.34) + implicitSize: Math.floor(Tokens.font.size.normal * 1.34) colour: Colours.palette.m3primary } @@ -134,7 +134,7 @@ Row { anchors.left: icon.right anchors.leftMargin: icon.anchors.leftMargin text: `: ${SysInfo.osPrettyName || SysInfo.osName}` - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal width: Config.dashboard.sizes.infoWidth elide: Text.ElideRight @@ -175,7 +175,7 @@ Row { fill: 1 text: line.icon color: line.colour - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { @@ -185,7 +185,7 @@ Row { anchors.left: icon.right anchors.leftMargin: icon.anchors.leftMargin text: `: ${line.text}` - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal width: Config.dashboard.sizes.infoWidth elide: Text.ElideRight diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml index ff0e847a..ce2196bf 100644 --- a/modules/drawers/ContentWindow.qml +++ b/modules/drawers/ContentWindow.qml @@ -10,7 +10,7 @@ import Caelestia.Blobs import qs.components import qs.components.containers import qs.services -import qs.config +import Caelestia.Config import qs.modules.bar StyledWindow { @@ -73,25 +73,25 @@ StyledWindow { Behavior on borderThickness { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on borderRounding { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on shadowOpacity { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -221,8 +221,8 @@ StyledWindow { Behavior on extraWidth { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml index ed886b31..a55e42d0 100644 --- a/modules/drawers/Drawers.qml +++ b/modules/drawers/Drawers.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.services -import qs.config +import Caelestia.Config Variants { model: Screens.screens diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml index ad17a0f2..fc782ddb 100644 --- a/modules/drawers/Interactions.qml +++ b/modules/drawers/Interactions.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import Quickshell import qs.components import qs.components.controls -import qs.config +import Caelestia.Config import qs.modules.bar as Bar import qs.modules.bar.popouts as BarPopouts diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml index 0d567414..83f30499 100644 --- a/modules/drawers/Panels.qml +++ b/modules/drawers/Panels.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.components -import qs.config +import Caelestia.Config import qs.modules.bar as Bar import qs.modules.dashboard as Dashboard import qs.modules.launcher as Launcher @@ -138,7 +138,7 @@ Item { anchors.bottom: sidebar.visible ? parent.bottom : utilities.top anchors.right: sidebar.left - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal } Sidebar.Wrapper { diff --git a/modules/drawers/Regions.qml b/modules/drawers/Regions.qml index d4281762..022d9661 100644 --- a/modules/drawers/Regions.qml +++ b/modules/drawers/Regions.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell -import qs.config +import Caelestia.Config import qs.modules.bar as Bar Region { diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml index 15d6e44a..7ce6038d 100644 --- a/modules/launcher/AppList.qml +++ b/modules/launcher/AppList.qml @@ -6,7 +6,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.modules.launcher.items import qs.modules.launcher.services @@ -22,7 +22,7 @@ StyledListView { onValuesChanged: root.currentIndex = 0 } - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small orientation: Qt.Vertical implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxShown, count) - spacing @@ -32,7 +32,7 @@ StyledListView { highlightFollowsCurrentItem: false highlight: StyledRect { - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.palette.m3onSurface opacity: 0.08 @@ -42,8 +42,8 @@ StyledListView { Behavior on y { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -118,16 +118,16 @@ StyledListView { property: "opacity" from: 1 to: 0 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardAccel } Anim { target: root property: "scale" from: 1 to: 0.9 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardAccel } } PropertyAction { @@ -140,16 +140,16 @@ StyledListView { property: "opacity" from: 0 to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { target: root property: "scale" from: 0.9 to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardDecel } } PropertyAction { @@ -197,7 +197,7 @@ StyledListView { addDisplaced: Transition { Anim { property: "y" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } Anim { properties: "opacity,scale" diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml index 8076eb54..49178db7 100644 --- a/modules/launcher/Content.qml +++ b/modules/launcher/Content.qml @@ -4,7 +4,7 @@ import QtQuick import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.modules.launcher.services Item { @@ -14,8 +14,8 @@ Item { required property var panels required property real maxHeight - readonly property int padding: Appearance.padding.large - readonly property int rounding: Appearance.rounding.large + readonly property int padding: Tokens.padding.large + readonly property int rounding: Tokens.rounding.large implicitWidth: listWrapper.width + padding * 2 implicitHeight: searchWrapper.height + listWrapper.height + padding * 2 @@ -47,7 +47,7 @@ Item { id: searchWrapper color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full anchors.left: parent.left anchors.right: parent.right @@ -72,11 +72,11 @@ Item { anchors.left: searchIcon.right anchors.right: clearIcon.left - anchors.leftMargin: Appearance.spacing.small - anchors.rightMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small + anchors.rightMargin: Tokens.spacing.small - topPadding: Appearance.padding.larger - bottomPadding: Appearance.padding.larger + topPadding: Tokens.padding.larger + bottomPadding: Tokens.padding.larger placeholderText: qsTr("Type \"%1\" for commands").arg(Config.launcher.actionPrefix) @@ -176,13 +176,13 @@ Item { Behavior on width { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index 775b193f..d36cfad9 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -4,7 +4,7 @@ import QtQuick import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -60,7 +60,7 @@ Item { property: "opacity" from: 1 to: 0 - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } PropertyAction {} Anim { @@ -68,7 +68,7 @@ Item { property: "opacity" from: 0 to: 1 - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } } @@ -110,8 +110,8 @@ Item { opacity: root.currentList?.count === 0 ? 1 : 0 scale: root.currentList?.count === 0 ? 1 : 0.5 - spacing: Appearance.spacing.normal - padding: Appearance.padding.large + spacing: Tokens.spacing.normal + padding: Tokens.padding.large anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter @@ -119,7 +119,7 @@ Item { MaterialIcon { text: root.state === "wallpapers" ? "wallpaper_slideshow" : "manage_search" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge anchors.verticalCenter: parent.verticalCenter } @@ -130,14 +130,14 @@ Item { StyledText { text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger font.weight: 500 } StyledText { text: root.state === "wallpapers" && Wallpapers.list.length === 0 ? qsTr("Try putting some wallpapers in %1").arg(Paths.shortenHome(Paths.wallsdir)) : qsTr("Try searching for something else") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } @@ -154,8 +154,8 @@ Item { enabled: root.visibilities.launcher Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.emphasizedDecel } } @@ -163,8 +163,8 @@ Item { enabled: root.visibilities.launcher Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.emphasizedDecel } } } diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml index ad03e9de..dc2dd003 100644 --- a/modules/launcher/WallpaperList.qml +++ b/modules/launcher/WallpaperList.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import qs.components.controls import qs.services -import qs.config +import Caelestia.Config PathView { id: root @@ -15,7 +15,7 @@ PathView { required property var panels required property var content - readonly property int itemWidth: Config.launcher.sizes.wallpaperWidth * 0.8 + Appearance.padding.larger * 2 + readonly property int itemWidth: Config.launcher.sizes.wallpaperWidth * 0.8 + Tokens.padding.larger * 2 readonly property int numItems: { const screen = (QsWindow.window as QsWindow)?.screen; diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index 5dfffeae..fda2a111 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.components -import qs.config +import Caelestia.Config import qs.modules.launcher.services Item { @@ -16,7 +16,7 @@ Item { readonly property bool shouldBeActive: visibilities.launcher && Config.launcher.enabled readonly property real maxHeight: { - let max = screen.height - Config.border.thickness * 2 - Appearance.spacing.large; + let max = screen.height - Config.border.thickness * 2 - Tokens.spacing.large; if (visibilities.dashboard) max -= panels.dashboard.nonAnimHeight; return max; @@ -41,8 +41,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml index a3ef00dd..c0fb4ac2 100644 --- a/modules/launcher/items/ActionItem.qml +++ b/modules/launcher/items/ActionItem.qml @@ -1,7 +1,7 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -19,27 +19,27 @@ Item { root.modelData?.onClicked(root.list); } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } Item { anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller + anchors.leftMargin: Tokens.padding.larger + anchors.rightMargin: Tokens.padding.larger + anchors.margins: Tokens.padding.smaller MaterialIcon { id: icon text: root.modelData?.icon ?? "" - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge anchors.verticalCenter: parent.verticalCenter } Item { anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal anchors.verticalCenter: icon.verticalCenter implicitWidth: parent.width - icon.width @@ -49,18 +49,18 @@ Item { id: name text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { id: desc text: root.modelData?.desc ?? "" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideRight - width: root.width - icon.width - Appearance.rounding.normal * 2 + width: root.width - icon.width - Tokens.rounding.normal * 2 anchors.top: name.bottom } diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml index 0b64c3da..e021275c 100644 --- a/modules/launcher/items/AppItem.qml +++ b/modules/launcher/items/AppItem.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Widgets import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils import qs.modules.launcher.services @@ -24,14 +24,14 @@ Item { root.visibilities.launcher = false; } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } Item { anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller + anchors.leftMargin: Tokens.padding.larger + anchors.rightMargin: Tokens.padding.larger + anchors.margins: Tokens.padding.smaller IconImage { id: icon @@ -45,7 +45,7 @@ Item { Item { anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal anchors.verticalCenter: icon.verticalCenter implicitWidth: parent.width - icon.width - favouriteIcon.width @@ -55,18 +55,18 @@ Item { id: name text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { id: comment text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? "" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideRight - width: root.width - icon.width - favouriteIcon.width - Appearance.rounding.normal * 2 + width: root.width - icon.width - favouriteIcon.width - Tokens.rounding.normal * 2 anchors.top: name.bottom } diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index 369b35ef..a016f585 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -4,7 +4,7 @@ import Quickshell import Caelestia import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -32,20 +32,20 @@ Item { root.onClicked(); } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } RowLayout { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.larger + anchors.margins: Tokens.padding.larger - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal MaterialIcon { text: "function" - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge Layout.alignment: Qt.AlignVCenter } @@ -69,11 +69,11 @@ Item { StyledRect { color: Colours.palette.m3tertiary - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal clip: true - implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Appearance.padding.small * 2 + implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.small * 2 Layout.alignment: Qt.AlignVCenter @@ -93,11 +93,11 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: icon.left - anchors.rightMargin: Appearance.spacing.small + anchors.rightMargin: Tokens.spacing.small text: qsTr("Open in calculator") color: Colours.palette.m3onTertiary - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal opacity: stateLayer.containsMouse ? 1 : 0 @@ -111,16 +111,16 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: Appearance.padding.normal + anchors.rightMargin: Tokens.padding.normal text: "open_in_new" color: Colours.palette.m3onTertiary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } Behavior on implicitWidth { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } } diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml index 6cc47aa4..2fbfabaa 100644 --- a/modules/launcher/items/SchemeItem.qml +++ b/modules/launcher/items/SchemeItem.qml @@ -1,7 +1,7 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.launcher.services Item { @@ -20,14 +20,14 @@ Item { root.modelData?.onClicked(root.list); } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } Item { anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller + anchors.leftMargin: Tokens.padding.larger + anchors.rightMargin: Tokens.padding.larger + anchors.margins: Tokens.padding.smaller StyledRect { id: preview @@ -38,7 +38,7 @@ Item { border.color: Qt.alpha(`#${root.modelData?.colours?.outline}`, 0.5) color: `#${root.modelData?.colours?.surface}` - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitWidth: parent.height * 0.8 implicitHeight: parent.height * 0.8 @@ -57,27 +57,27 @@ Item { implicitWidth: preview.implicitWidth color: `#${root.modelData?.colours?.primary}` - radius: Appearance.rounding.full + radius: Tokens.rounding.full } } } Column { anchors.left: preview.right - anchors.leftMargin: Appearance.spacing.normal + anchors.leftMargin: Tokens.spacing.normal anchors.verticalCenter: parent.verticalCenter - width: parent.width - preview.width - anchors.leftMargin - (current.active ? current.width + Appearance.spacing.normal : 0) + width: parent.width - preview.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.normal : 0) spacing: 0 StyledText { text: root.modelData?.flavour ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideRight @@ -98,7 +98,7 @@ Item { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml index b63539b7..73f66994 100644 --- a/modules/launcher/items/VariantItem.qml +++ b/modules/launcher/items/VariantItem.qml @@ -1,7 +1,7 @@ import QtQuick import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.modules.launcher.services Item { @@ -20,40 +20,40 @@ Item { root.modelData?.onClicked(root.list); } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } Item { anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller + anchors.leftMargin: Tokens.padding.larger + anchors.rightMargin: Tokens.padding.larger + anchors.margins: Tokens.padding.smaller MaterialIcon { id: icon text: root.modelData?.icon ?? "" - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge anchors.verticalCenter: parent.verticalCenter } Column { anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.larger + anchors.leftMargin: Tokens.spacing.larger anchors.verticalCenter: icon.verticalCenter - width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Appearance.spacing.normal : 0) + width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.normal : 0) spacing: 0 StyledText { text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } StyledText { text: root.modelData?.description ?? "" - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small color: Colours.palette.m3outline elide: Text.ElideRight @@ -74,7 +74,7 @@ Item { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml index beb93426..7ffa75f7 100644 --- a/modules/launcher/items/WallpaperItem.qml +++ b/modules/launcher/items/WallpaperItem.qml @@ -4,7 +4,7 @@ import qs.components import qs.components.effects import qs.components.images import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -21,8 +21,8 @@ Item { opacity = Qt.binding(() => PathView.onPath ? 1 : 0); } - implicitWidth: image.width + Appearance.padding.larger * 2 - implicitHeight: image.height + label.height + Appearance.spacing.small / 2 + Appearance.padding.large + Appearance.padding.normal + implicitWidth: image.width + Tokens.padding.larger * 2 + implicitHeight: image.height + label.height + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.normal StateLayer { function onClicked(): void { @@ -30,7 +30,7 @@ Item { root.visibilities.launcher = false; } - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal } Elevation { @@ -48,9 +48,9 @@ Item { id: image anchors.horizontalCenter: parent.horizontalCenter - y: Appearance.padding.large + y: Tokens.padding.large color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal implicitWidth: Config.launcher.sizes.wallpaperWidth implicitHeight: implicitWidth / 16 * 9 @@ -59,7 +59,7 @@ Item { anchors.centerIn: parent text: "image" color: Colours.tPalette.m3outline - font.pointSize: Appearance.font.size.extraLarge * 2 + font.pointSize: Tokens.font.size.extraLarge * 2 font.weight: 600 } @@ -76,15 +76,15 @@ Item { id: label anchors.top: image.bottom - anchors.topMargin: Appearance.spacing.small / 2 + anchors.topMargin: Tokens.spacing.small / 2 anchors.horizontalCenter: parent.horizontalCenter - width: image.width - Appearance.padding.normal * 2 + width: image.width - Tokens.padding.normal * 2 horizontalAlignment: Text.AlignHCenter elide: Text.ElideRight renderType: Text.QtRendering text: root.modelData.relativePath - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Behavior on scale { diff --git a/modules/launcher/services/Actions.qml b/modules/launcher/services/Actions.qml index 2a76012f..29ed6905 100644 --- a/modules/launcher/services/Actions.qml +++ b/modules/launcher/services/Actions.qml @@ -4,7 +4,7 @@ import ".." import QtQuick import Quickshell import qs.services -import qs.config +import Caelestia.Config import qs.utils Searcher { diff --git a/modules/launcher/services/Apps.qml b/modules/launcher/services/Apps.qml index 1f1f3570..57461ffb 100644 --- a/modules/launcher/services/Apps.qml +++ b/modules/launcher/services/Apps.qml @@ -2,7 +2,7 @@ pragma Singleton import Quickshell import Caelestia -import qs.config +import Caelestia.Config import qs.utils Searcher { diff --git a/modules/launcher/services/M3Variants.qml b/modules/launcher/services/M3Variants.qml index a951b8c6..d7d7bf56 100644 --- a/modules/launcher/services/M3Variants.qml +++ b/modules/launcher/services/M3Variants.qml @@ -3,7 +3,7 @@ pragma Singleton import ".." import QtQuick import Quickshell -import qs.config +import Caelestia.Config import qs.utils Searcher { diff --git a/modules/launcher/services/Schemes.qml b/modules/launcher/services/Schemes.qml index d389aa17..571cb101 100644 --- a/modules/launcher/services/Schemes.qml +++ b/modules/launcher/services/Schemes.qml @@ -4,7 +4,7 @@ import ".." import QtQuick import Quickshell import Quickshell.Io -import qs.config +import Caelestia.Config import qs.utils Searcher { diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index 73b6e670..95cd6018 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -6,7 +6,7 @@ import qs.components import qs.components.controls import qs.components.images import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -20,18 +20,18 @@ ColumnLayout { Layout.fillWidth: false Layout.fillHeight: true - spacing: Appearance.spacing.large * 2 + spacing: Tokens.spacing.large * 2 RowLayout { Layout.alignment: Qt.AlignHCenter - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { Layout.alignment: Qt.AlignVCenter text: Time.hourStr color: Colours.palette.m3secondary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) - font.family: Appearance.font.family.clock + font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale) + font.family: Tokens.font.family.clock font.bold: true } @@ -39,8 +39,8 @@ ColumnLayout { Layout.alignment: Qt.AlignVCenter text: ":" color: Colours.palette.m3primary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) - font.family: Appearance.font.family.clock + font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale) + font.family: Tokens.font.family.clock font.bold: true } @@ -48,14 +48,14 @@ ColumnLayout { Layout.alignment: Qt.AlignVCenter text: Time.minuteStr color: Colours.palette.m3secondary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) - font.family: Appearance.font.family.clock + font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale) + font.family: Tokens.font.family.clock font.bold: true } Loader { asynchronous: true - Layout.leftMargin: Appearance.spacing.small + Layout.leftMargin: Tokens.spacing.small Layout.alignment: Qt.AlignVCenter active: Config.services.useTwelveHourClock @@ -64,8 +64,8 @@ ColumnLayout { sourceComponent: StyledText { text: Time.amPmStr color: Colours.palette.m3primary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * 2 * root.centerScale) - font.family: Appearance.font.family.clock + font.pointSize: Math.floor(Tokens.font.size.extraLarge * 2 * root.centerScale) + font.family: Tokens.font.family.clock font.bold: true } } @@ -73,24 +73,24 @@ ColumnLayout { StyledText { Layout.alignment: Qt.AlignHCenter - Layout.topMargin: -Appearance.padding.large * 2 + Layout.topMargin: -Tokens.padding.large * 2 text: Time.format("dddd, d MMMM yyyy") color: Colours.palette.m3tertiary - font.pointSize: Math.floor(Appearance.font.size.extraLarge * root.centerScale) - font.family: Appearance.font.family.mono + font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale) + font.family: Tokens.font.family.mono font.bold: true } StyledClippingRect { - Layout.topMargin: Appearance.spacing.large * 2 + Layout.topMargin: Tokens.spacing.large * 2 Layout.alignment: Qt.AlignHCenter implicitWidth: root.centerWidth / 2 implicitHeight: root.centerWidth / 2 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full MaterialIcon { anchors.centerIn: parent @@ -113,10 +113,10 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter implicitWidth: root.centerWidth * 0.8 - implicitHeight: input.implicitHeight + Appearance.padding.small * 2 + implicitHeight: input.implicitHeight + Tokens.padding.small * 2 color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full focus: true onActiveFocusChanged: { @@ -147,12 +147,12 @@ ColumnLayout { id: input anchors.fill: parent - anchors.margins: Appearance.padding.small - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.small + spacing: Tokens.spacing.normal Item { implicitWidth: implicitHeight - implicitHeight: fprintIcon.implicitHeight + Appearance.padding.small * 2 + implicitHeight: fprintIcon.implicitHeight + Tokens.padding.small * 2 MaterialIcon { id: fprintIcon @@ -188,10 +188,10 @@ ColumnLayout { StyledRect { implicitWidth: implicitHeight - implicitHeight: enterIcon.implicitHeight + Appearance.padding.small * 2 + implicitHeight: enterIcon.implicitHeight + Tokens.padding.small * 2 color: root.lock.pam.buffer ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full StateLayer { function onClicked(): void { @@ -215,7 +215,7 @@ ColumnLayout { Item { Layout.fillWidth: true - Layout.topMargin: -Appearance.spacing.large + Layout.topMargin: -Tokens.spacing.large implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight) @@ -272,7 +272,7 @@ ColumnLayout { color: Colours.palette.m3onSurfaceVariant animateProp: "opacity" - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono horizontalAlignment: Qt.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere lineHeight: 1.2 @@ -327,8 +327,8 @@ ColumnLayout { opacity: 0 color: Colours.palette.m3error - font.pointSize: Appearance.font.size.small - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.small + font.family: Tokens.font.family.mono horizontalAlignment: Qt.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere @@ -397,13 +397,13 @@ ColumnLayout { target: message property: "scale" to: 0.7 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } Anim { target: message property: "opacity" to: 0 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } @@ -412,7 +412,7 @@ ColumnLayout { component FlashAnim: NumberAnimation { target: message property: "opacity" - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small easing.type: Easing.Linear } } diff --git a/modules/lock/Content.qml b/modules/lock/Content.qml index 4427099f..17578031 100644 --- a/modules/lock/Content.qml +++ b/modules/lock/Content.qml @@ -2,25 +2,25 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config RowLayout { id: root required property var lock - spacing: Appearance.spacing.large * 2 + spacing: Tokens.spacing.large * 2 ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { Layout.fillWidth: true implicitHeight: weather.implicitHeight - topLeftRadius: Appearance.rounding.large - radius: Appearance.rounding.small + topLeftRadius: Tokens.rounding.large + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer WeatherInfo { @@ -34,7 +34,7 @@ RowLayout { Layout.fillWidth: true Layout.fillHeight: true - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer Fetch {} @@ -44,8 +44,8 @@ RowLayout { Layout.fillWidth: true implicitHeight: media.implicitHeight - bottomLeftRadius: Appearance.rounding.large - radius: Appearance.rounding.small + bottomLeftRadius: Tokens.rounding.large + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer Media { @@ -62,14 +62,14 @@ RowLayout { ColumnLayout { Layout.fillWidth: true - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { Layout.fillWidth: true implicitHeight: resources.implicitHeight - topRightRadius: Appearance.rounding.large - radius: Appearance.rounding.small + topRightRadius: Tokens.rounding.large + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer Resources { @@ -81,8 +81,8 @@ RowLayout { Layout.fillWidth: true Layout.fillHeight: true - bottomRightRadius: Appearance.rounding.large - radius: Appearance.rounding.small + bottomRightRadius: Tokens.rounding.large + radius: Tokens.rounding.small color: Colours.tPalette.m3surfaceContainer NotifDock { diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml index ab6de7b6..d3ba56e3 100644 --- a/modules/lock/Fetch.qml +++ b/modules/lock/Fetch.qml @@ -6,36 +6,36 @@ import Quickshell.Services.UPower import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { id: root anchors.fill: parent - anchors.margins: Appearance.padding.large * 2 - anchors.topMargin: Appearance.padding.large + anchors.margins: Tokens.padding.large * 2 + anchors.topMargin: Tokens.padding.large - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { Layout.fillWidth: true Layout.fillHeight: false - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { - implicitWidth: prompt.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: prompt.implicitHeight + Appearance.padding.normal * 2 + implicitWidth: prompt.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: prompt.implicitHeight + Tokens.padding.normal * 2 color: Colours.palette.m3primary - radius: Appearance.rounding.small + radius: Tokens.rounding.small MonoText { id: prompt anchors.centerIn: parent text: ">" - font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal + font.pointSize: root.width > 400 ? Tokens.font.size.larger : Tokens.font.size.normal color: Colours.palette.m3onPrimary } } @@ -43,7 +43,7 @@ ColumnLayout { MonoText { Layout.fillWidth: true text: "caelestiafetch.sh" - font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal + font.pointSize: root.width > 400 ? Tokens.font.size.larger : Tokens.font.size.normal elide: Text.ElideRight } @@ -71,10 +71,10 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - Layout.topMargin: Appearance.padding.normal - Layout.bottomMargin: Appearance.padding.normal + Layout.topMargin: Tokens.padding.normal + Layout.bottomMargin: Tokens.padding.normal Layout.leftMargin: iconLoader.active ? 0 : width * 0.1 - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal WrappedLoader { Layout.fillWidth: true @@ -125,18 +125,18 @@ ColumnLayout { active: root.height > 180 sourceComponent: RowLayout { - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large Repeater { - model: Math.max(0, Math.min(8, root.width / (Appearance.font.size.larger * 2 + Appearance.spacing.large))) + model: Math.max(0, Math.min(8, root.width / (Tokens.font.size.larger * 2 + Tokens.spacing.large))) StyledRect { required property int index implicitWidth: implicitHeight - implicitHeight: Appearance.font.size.larger * 2 + implicitHeight: Tokens.font.size.larger * 2 color: Colours.palette[`term${index}`] - radius: Appearance.rounding.small + radius: Tokens.rounding.small } } } @@ -168,11 +168,11 @@ ColumnLayout { component FetchText: MonoText { Layout.fillWidth: true - font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal + font.pointSize: root.width > 400 ? Tokens.font.size.larger : Tokens.font.size.normal elide: Text.ElideRight } component MonoText: StyledText { - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono } } diff --git a/modules/lock/InputField.qml b/modules/lock/InputField.qml index 1286267a..fdae94f7 100644 --- a/modules/lock/InputField.qml +++ b/modules/lock/InputField.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -49,8 +49,8 @@ Item { animate: true color: root.pam.passwd.active ? Colours.palette.m3secondary : Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.normal + font.family: Tokens.font.family.mono opacity: root.buffer ? 0 : 1 @@ -74,10 +74,10 @@ Item { anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0 implicitWidth: fullWidth - implicitHeight: Appearance.font.size.normal + implicitHeight: Tokens.font.size.normal orientation: Qt.Horizontal - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 interactive: false model: ScriptModel { @@ -91,7 +91,7 @@ Item { implicitHeight: charList.implicitHeight color: Colours.palette.m3onSurface - radius: Appearance.rounding.small / 2 + radius: Tokens.rounding.small / 2 opacity: 0 scale: 0 @@ -134,8 +134,8 @@ Item { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml index 46862f83..c0c1bfd3 100644 --- a/modules/lock/LockSurface.qml +++ b/modules/lock/LockSurface.qml @@ -5,7 +5,7 @@ import QtQuick.Effects import Quickshell.Wayland import qs.components import qs.services -import qs.config +import Caelestia.Config WlSessionLockSurface { id: root @@ -33,8 +33,8 @@ WlSessionLockSurface { target: lockContent properties: "implicitWidth,implicitHeight" to: lockContent.size - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } Anim { target: lockBg @@ -45,30 +45,30 @@ WlSessionLockSurface { target: content property: "scale" to: 0 - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } Anim { target: content property: "opacity" to: 0 - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } Anim { target: lockIcon property: "opacity" to: 1 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } Anim { target: background property: "opacity" to: 0 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } SequentialAnimation { PauseAnimation { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } Anim { target: lockContent @@ -93,7 +93,7 @@ WlSessionLockSurface { target: background property: "opacity" to: 1 - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } SequentialAnimation { ParallelAnimation { @@ -101,15 +101,15 @@ WlSessionLockSurface { target: lockContent property: "scale" to: 1 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } Anim { target: lockContent property: "rotation" to: 360 - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.standardAccel } } ParallelAnimation { @@ -117,7 +117,7 @@ WlSessionLockSurface { target: lockIcon property: "rotation" to: 360 - easing.bezierCurve: Appearance.anim.curves.standardDecel + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { target: lockIcon @@ -133,27 +133,27 @@ WlSessionLockSurface { target: content property: "scale" to: 1 - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } Anim { target: lockBg property: "radius" - to: Appearance.rounding.large * 1.5 + to: Tokens.rounding.large * 1.5 } Anim { target: lockContent property: "implicitWidth" to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } Anim { target: lockContent property: "implicitHeight" to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -179,8 +179,8 @@ WlSessionLockSurface { Item { id: lockContent - readonly property int size: lockIcon.implicitHeight + Appearance.padding.large * 4 - readonly property int radius: size / 4 * Appearance.rounding.scale + readonly property int size: lockIcon.implicitHeight + Tokens.padding.large * 4 + readonly property int radius: size / 4 * Tokens.rounding.scale anchors.centerIn: parent implicitWidth: size @@ -210,7 +210,7 @@ WlSessionLockSurface { anchors.centerIn: parent text: "lock" - font.pointSize: Appearance.font.size.extraLarge * 4 + font.pointSize: Tokens.font.size.extraLarge * 4 font.bold: true rotation: 180 } @@ -219,8 +219,8 @@ WlSessionLockSurface { id: content anchors.centerIn: parent - width: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio - Appearance.padding.large * 2 - height: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult - Appearance.padding.large * 2 + width: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio - Tokens.padding.large * 2 + height: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult - Tokens.padding.large * 2 lock: root opacity: 0 diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml index 9d2a0367..c93d830e 100644 --- a/modules/lock/Media.qml +++ b/modules/lock/Media.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -34,7 +34,7 @@ Item { Behavior on opacity { Anim { - duration: Appearance.anim.durations.extraLarge + duration: Tokens.anim.durations.extraLarge } } } @@ -69,14 +69,14 @@ Item { anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large StyledText { - Layout.topMargin: Appearance.padding.large - Layout.bottomMargin: Appearance.spacing.larger + Layout.topMargin: Tokens.padding.large + Layout.bottomMargin: Tokens.spacing.larger text: qsTr("Now playing") color: Colours.palette.m3onSurfaceVariant - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono font.weight: 500 } @@ -86,8 +86,8 @@ Item { text: Players.active?.trackArtist ?? qsTr("No media") color: Colours.palette.m3primary horizontalAlignment: Text.AlignHCenter - font.pointSize: Appearance.font.size.large - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.large + font.family: Tokens.font.family.mono font.weight: 600 elide: Text.ElideRight } @@ -97,17 +97,17 @@ Item { animate: true text: Players.active?.trackTitle ?? qsTr("No media") horizontalAlignment: Text.AlignHCenter - font.pointSize: Appearance.font.size.larger - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.larger + font.family: Tokens.font.family.mono elide: Text.ElideRight } RowLayout { Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.spacing.large * 1.2 - Layout.bottomMargin: Appearance.padding.large + Layout.topMargin: Tokens.spacing.large * 1.2 + Layout.bottomMargin: Tokens.padding.large - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large PlayerControl { function onClicked(): void { @@ -154,12 +154,12 @@ Item { function onClicked(): void { } - Layout.preferredWidth: implicitWidth + (controlState.pressed ? Appearance.padding.normal * 2 : active ? Appearance.padding.small * 2 : 0) - implicitWidth: controlIcon.implicitWidth + Appearance.padding.large * 2 - implicitHeight: controlIcon.implicitHeight + Appearance.padding.normal * 2 + Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.normal * 2 : active ? Tokens.padding.small * 2 : 0) + implicitWidth: controlIcon.implicitWidth + Tokens.padding.large * 2 + implicitHeight: controlIcon.implicitHeight + Tokens.padding.normal * 2 color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`] - radius: active || controlState.pressed ? Appearance.rounding.normal : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Appearance.rounding.scale) + radius: active || controlState.pressed ? Tokens.rounding.normal : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale) Elevation { anchors.fill: parent @@ -183,7 +183,7 @@ Item { anchors.centerIn: parent color: control.active ? Colours.palette[`m3on${control.colour}`] : Colours.palette[`m3on${control.colour}Container`] - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large fill: control.active ? 1 : 0 Behavior on fill { @@ -193,15 +193,15 @@ Item { Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on radius { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml index 50fe2153..131eeec2 100644 --- a/modules/lock/NotifDock.qml +++ b/modules/lock/NotifDock.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -17,15 +17,15 @@ ColumnLayout { required property var lock anchors.fill: parent - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true text: Notifs.list.length > 0 ? qsTr("%1 notification%2").arg(Notifs.list.length).arg(Notifs.list.length === 1 ? "" : "s") : qsTr("Notifications") color: Colours.palette.m3outline - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono font.weight: 500 elide: Text.ElideRight } @@ -36,7 +36,7 @@ ColumnLayout { Layout.fillWidth: true Layout.fillHeight: true - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: "transparent" Loader { @@ -46,7 +46,7 @@ ColumnLayout { opacity: Notifs.list.length > 0 && !Config.lock.hideNotifs ? 0 : 1 sourceComponent: ColumnLayout { - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large Image { asynchronous: true @@ -65,15 +65,15 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter text: Config.lock.hideNotifs ? qsTr("Unlock for Notifications") : qsTr("No Notifications") color: Colours.palette.m3outlineVariant - font.pointSize: Appearance.font.size.large - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.large + font.family: Tokens.font.family.mono font.weight: 500 } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.extraLarge + duration: Tokens.anim.durations.extraLarge } } } @@ -81,7 +81,7 @@ ColumnLayout { StyledListView { anchors.fill: parent visible: !Config.lock.hideNotifs - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small clip: true model: ScriptModel { @@ -103,8 +103,8 @@ ColumnLayout { property: "scale" from: 0 to: 1 - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -126,8 +126,8 @@ ColumnLayout { } Anim { property: "y" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -138,8 +138,8 @@ ColumnLayout { } Anim { property: "y" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml index 133dc626..c8e5426e 100644 --- a/modules/lock/NotifGroup.qml +++ b/modules/lock/NotifGroup.qml @@ -8,7 +8,7 @@ import Quickshell.Services.Notifications import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils StyledRect { @@ -46,10 +46,10 @@ StyledRect { anchors.left: parent?.left anchors.right: parent?.right - implicitHeight: content.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: content.implicitHeight + Tokens.padding.normal * 2 clip: true - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: root.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) RowLayout { @@ -58,9 +58,9 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop @@ -99,14 +99,14 @@ StyledRect { MaterialIcon { text: Icons.getNotifIcon(root.notifs[0]?.summary, root.urgency) color: root.urgency === "critical" ? Colours.palette.m3onError : root.urgency === "low" ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } ClippingRectangle { anchors.fill: parent color: root.urgency === "critical" ? Colours.palette.m3error : root.urgency === "low" ? Colours.layer(Colours.palette.m3surfaceContainerHighest, 3) : Colours.palette.m3secondaryContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full Loader { asynchronous: true @@ -126,7 +126,7 @@ StyledRect { implicitHeight: Config.notifs.sizes.badge color: root.urgency === "critical" ? Colours.palette.m3error : root.urgency === "low" ? Colours.palette.m3surfaceContainerHighest : Colours.palette.m3secondaryContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full ColouredIcon { anchors.centerIn: parent @@ -140,21 +140,21 @@ StyledRect { } ColumnLayout { - Layout.topMargin: -Appearance.padding.small - Layout.bottomMargin: -Appearance.padding.small / 2 - (root.expanded ? 0 : spacing) + Layout.topMargin: -Tokens.padding.small + Layout.bottomMargin: -Tokens.padding.small / 2 - (root.expanded ? 0 : spacing) Layout.fillWidth: true - spacing: Math.round(Appearance.spacing.small / 2) + spacing: Math.round(Tokens.spacing.small / 2) RowLayout { Layout.bottomMargin: -parent.spacing Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true text: root.modelData color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } @@ -162,15 +162,15 @@ StyledRect { animate: true text: root.notifs[0]?.timeStr ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledRect { - implicitWidth: expandBtn.implicitWidth + Appearance.padding.smaller * 2 - implicitHeight: groupCount.implicitHeight + Appearance.padding.small + implicitWidth: expandBtn.implicitWidth + Tokens.padding.smaller * 2 + implicitHeight: groupCount.implicitHeight + Tokens.padding.small color: root.urgency === "critical" ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) - radius: Appearance.rounding.full + radius: Tokens.rounding.full opacity: root.notifs.length > Config.notifs.groupPreviewNum ? 1 : 0 Layout.preferredWidth: root.notifs.length > Config.notifs.groupPreviewNum ? implicitWidth : 0 @@ -187,20 +187,20 @@ StyledRect { id: expandBtn anchors.centerIn: parent - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { id: groupCount - Layout.leftMargin: Appearance.padding.small / 2 + Layout.leftMargin: Tokens.padding.small / 2 animate: true text: root.notifs.length color: root.urgency === "critical" ? Colours.palette.m3onError : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } MaterialIcon { - Layout.rightMargin: -Appearance.padding.small / 2 + Layout.rightMargin: -Tokens.padding.small / 2 animate: true text: root.expanded ? "expand_less" : "expand_more" color: root.urgency === "critical" ? Colours.palette.m3onError : Colours.palette.m3onSurface @@ -298,8 +298,8 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/lock/Pam.qml b/modules/lock/Pam.qml index 8345ebc4..8f780ea0 100644 --- a/modules/lock/Pam.qml +++ b/modules/lock/Pam.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Io import Quickshell.Wayland import Quickshell.Services.Pam -import qs.config +import Caelestia.Config Scope { id: root diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index 33c0e4c0..59a470d0 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -4,17 +4,17 @@ import qs.components import qs.components.controls import qs.components.misc import qs.services -import qs.config +import Caelestia.Config GridLayout { id: root anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - rowSpacing: Appearance.spacing.large - columnSpacing: Appearance.spacing.large + rowSpacing: Tokens.spacing.large + columnSpacing: Tokens.spacing.large rows: 2 columns: 2 @@ -23,28 +23,28 @@ GridLayout { } Resource { - Layout.topMargin: Appearance.padding.large + Layout.topMargin: Tokens.padding.large icon: "memory" value: SystemUsage.cpuPerc colour: Colours.palette.m3primary } Resource { - Layout.topMargin: Appearance.padding.large + Layout.topMargin: Tokens.padding.large icon: "thermostat" value: Math.min(1, SystemUsage.cpuTemp / 90) colour: Colours.palette.m3secondary } Resource { - Layout.bottomMargin: Appearance.padding.large + Layout.bottomMargin: Tokens.padding.large icon: "memory_alt" value: SystemUsage.memPerc colour: Colours.palette.m3secondary } Resource { - Layout.bottomMargin: Appearance.padding.large + Layout.bottomMargin: Tokens.padding.large icon: "hard_disk" value: SystemUsage.storagePerc colour: Colours.palette.m3tertiary @@ -61,17 +61,17 @@ GridLayout { implicitHeight: width color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - radius: Appearance.rounding.large + radius: Tokens.rounding.large CircularProgress { id: circ anchors.fill: parent value: res.value - padding: Appearance.padding.large * 3 + padding: Tokens.padding.large * 3 fgColour: res.colour bgColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 3) - strokeWidth: width < 200 ? Appearance.padding.smaller : Appearance.padding.normal + strokeWidth: width < 200 ? Tokens.padding.smaller : Tokens.padding.normal } MaterialIcon { @@ -86,7 +86,7 @@ GridLayout { Behavior on value { Anim { - duration: Appearance.anim.durations.large + duration: Tokens.anim.durations.large } } } diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml index 213bf155..2a8d058e 100644 --- a/modules/lock/WeatherInfo.qml +++ b/modules/lock/WeatherInfo.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -13,14 +13,14 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.large * 2 + anchors.margins: Tokens.padding.large * 2 - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Loader { asynchronous: true - Layout.topMargin: Appearance.padding.large * 2 - Layout.bottomMargin: -Appearance.padding.large + Layout.topMargin: Tokens.padding.large * 2 + Layout.bottomMargin: -Tokens.padding.large Layout.alignment: Qt.AlignHCenter active: root.rootHeight > 610 @@ -29,24 +29,24 @@ ColumnLayout { sourceComponent: StyledText { text: qsTr("Weather") color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 500 } } RowLayout { Layout.fillWidth: true - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large MaterialIcon { animate: true text: Weather.icon color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 2.5 + font.pointSize: Tokens.font.size.extraLarge * 2.5 } ColumnLayout { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { Layout.fillWidth: true @@ -54,7 +54,7 @@ ColumnLayout { animate: true text: Weather.description color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 elide: Text.ElideRight } @@ -65,19 +65,19 @@ ColumnLayout { animate: true text: qsTr("Humidity: %1%").arg(Weather.humidity) color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } } Loader { asynchronous: true - Layout.rightMargin: Appearance.padding.smaller + Layout.rightMargin: Tokens.padding.smaller active: root.width > 400 visible: active sourceComponent: ColumnLayout { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { Layout.fillWidth: true @@ -86,7 +86,7 @@ ColumnLayout { text: Weather.temp color: Colours.palette.m3primary horizontalAlignment: Text.AlignRight - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 500 elide: Text.ElideLeft } @@ -98,7 +98,7 @@ ColumnLayout { text: qsTr("Feels like: %1").arg(Weather.feelsLike) color: Colours.palette.m3outline horizontalAlignment: Text.AlignRight - font.pointSize: Appearance.font.size.smaller + font.pointSize: Tokens.font.size.smaller elide: Text.ElideLeft } } @@ -109,15 +109,15 @@ ColumnLayout { id: forecastLoader asynchronous: true - Layout.topMargin: Appearance.spacing.smaller - Layout.bottomMargin: Appearance.padding.large * 2 + Layout.topMargin: Tokens.spacing.smaller + Layout.bottomMargin: Tokens.padding.large * 2 Layout.fillWidth: true active: root.rootHeight > 820 visible: active sourceComponent: RowLayout { - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large Repeater { model: { @@ -137,7 +137,7 @@ ColumnLayout { required property var modelData Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small StyledText { Layout.fillWidth: true @@ -147,13 +147,13 @@ ColumnLayout { } color: Colours.palette.m3outline horizontalAlignment: Text.AlignHCenter - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger } MaterialIcon { Layout.alignment: Qt.AlignHCenter text: forecastHour.modelData?.icon ?? "cloud_alert" - font.pointSize: Appearance.font.size.extraLarge * 1.5 + font.pointSize: Tokens.font.size.extraLarge * 1.5 font.weight: 500 } @@ -161,7 +161,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C` color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger } } } diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index bd18276e..c9f934aa 100644 --- a/modules/notifications/Content.qml +++ b/modules/notifications/Content.qml @@ -5,7 +5,7 @@ import qs.components import qs.components.containers import qs.components.widgets import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -13,7 +13,7 @@ Item { required property DrawerVisibilities visibilities required property Item osdPanel required property Item sessionPanel - readonly property int padding: Appearance.padding.large + readonly property int padding: Tokens.padding.large anchors.top: parent.top anchors.bottom: parent.bottom @@ -25,7 +25,7 @@ Item { if (count === 0) return 0; - let height = (count - 1) * Appearance.spacing.smaller; + let height = (count - 1) * Tokens.spacing.smaller; for (let i = 0; i < count; i++) height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0; @@ -49,7 +49,7 @@ Item { anchors.margins: root.padding color: "transparent" - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal StyledListView { id: list @@ -89,9 +89,9 @@ Item { let height = 0; for (let i = 0; i < count; i++) { - height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Appearance.spacing.smaller; + height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.smaller; - if (height - Appearance.spacing.smaller >= scrollY) + if (height - Tokens.spacing.smaller >= scrollY) return i; } @@ -110,9 +110,9 @@ Item { let height = 0; for (let i = count - 1; i >= 0; i--) { - height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Appearance.spacing.smaller; + height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.smaller; - if (height - Appearance.spacing.smaller >= scrollY) + if (height - Tokens.spacing.smaller >= scrollY) return count - i - 1; } @@ -140,7 +140,7 @@ Item { } implicitWidth: notif.implicitWidth - implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Appearance.spacing.smaller) + implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Tokens.spacing.smaller) ListView.onRemove: removeAnim.start() @@ -171,8 +171,8 @@ Item { target: notif property: "x" to: (notif.x >= 0 ? Config.notifs.sizes.width : -Config.notifs.sizes.width) * 2 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized + duration: Tokens.anim.durations.normal + easing.bezierCurve: Tokens.anim.curves.emphasized } PropertyAction { target: wrapper @@ -183,7 +183,7 @@ Item { ClippingRectangle { anchors.top: parent.top - anchors.topMargin: wrapper.idx === 0 ? 0 : Appearance.spacing.smaller + anchors.topMargin: wrapper.idx === 0 ? 0 : Tokens.spacing.smaller color: "transparent" radius: notif.radius @@ -199,8 +199,8 @@ Item { } component Anim: NumberAnimation { - duration: Appearance.anim.durations.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 7b580a74..b7d90fe7 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -9,7 +9,7 @@ import Quickshell.Services.Notifications import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils StyledRect { @@ -23,7 +23,7 @@ StyledRect { property bool expanded: Config.notifs.openExpanded color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal implicitWidth: Config.notifs.sizes.width implicitHeight: inner.implicitHeight @@ -36,7 +36,7 @@ StyledRect { Behavior on x { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Tokens.anim.curves.emphasizedDecel } } @@ -95,14 +95,14 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal implicitHeight: root.nonAnimHeight Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -119,7 +119,7 @@ StyledRect { visible: root.hasImage || root.hasAppIcon sourceComponent: ClippingRectangle { - radius: Appearance.rounding.full + radius: Tokens.rounding.full implicitWidth: Config.notifs.sizes.image implicitHeight: Config.notifs.sizes.image @@ -147,7 +147,7 @@ StyledRect { anchors.bottom: root.hasImage ? image.bottom : undefined sourceComponent: StyledRect { - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) : Colours.palette.m3secondaryContainer implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image @@ -175,14 +175,14 @@ StyledRect { asynchronous: true active: !root.hasAppIcon anchors.centerIn: parent - anchors.horizontalCenterOffset: -Appearance.font.size.large * 0.02 - anchors.verticalCenterOffset: Appearance.font.size.large * 0.02 + anchors.horizontalCenterOffset: -Tokens.font.size.large * 0.02 + anchors.verticalCenterOffset: Tokens.font.size.large * 0.02 sourceComponent: MaterialIcon { text: Icons.getNotifIcon(root.modelData.summary, root.modelData.urgency) color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } @@ -207,9 +207,9 @@ StyledRect { PathAngleArc { id: progressArc - radiusX: progressIndicator.width / 2 - Appearance.padding.small / 2 + radiusX: progressIndicator.width / 2 - Tokens.padding.small / 2 centerX: progressIndicator.width / 2 - radiusY: progressIndicator.height / 2 - Appearance.padding.small / 2 + radiusY: progressIndicator.height / 2 - Tokens.padding.small / 2 centerY: progressIndicator.height / 2 startAngle: -90 @@ -217,7 +217,7 @@ StyledRect { Behavior on sweepAngle { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Tokens.anim.curves.emphasizedDecel } } } @@ -229,13 +229,13 @@ StyledRect { anchors.top: parent.top anchors.left: image.right - anchors.leftMargin: Appearance.spacing.smaller + anchors.leftMargin: Tokens.spacing.smaller animate: true text: appNameMetrics.elidedText maximumLineCount: 1 color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small opacity: root.expanded ? 1 : 0 @@ -251,7 +251,7 @@ StyledRect { font.family: appName.font.family font.pointSize: appName.font.pointSize elide: Text.ElideRight - elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Appearance.spacing.small * 3 + elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Tokens.spacing.small * 3 } StyledText { @@ -259,7 +259,7 @@ StyledRect { anchors.top: parent.top anchors.left: image.right - anchors.leftMargin: Appearance.spacing.smaller + anchors.leftMargin: Tokens.spacing.smaller animate: true text: summaryMetrics.elidedText @@ -286,9 +286,9 @@ StyledRect { property: "maximumLineCount" } AnchorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } @@ -304,7 +304,7 @@ StyledRect { font.family: summary.font.family font.pointSize: summary.font.pointSize elide: Text.ElideRight - elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Appearance.spacing.small * 3 + elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Tokens.spacing.small * 3 } StyledText { @@ -312,11 +312,11 @@ StyledRect { anchors.top: parent.top anchors.left: summary.right - anchors.leftMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small text: "•" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small states: State { name: "expanded" @@ -330,9 +330,9 @@ StyledRect { transitions: Transition { AnchorAnimation { - duration: Appearance.anim.durations.normal + duration: Tokens.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Tokens.anim.curves.standard } } } @@ -342,13 +342,13 @@ StyledRect { anchors.top: parent.top anchors.left: timeSep.right - anchors.leftMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small animate: true horizontalAlignment: Text.AlignLeft text: root.modelData.timeStr color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } Item { @@ -365,7 +365,7 @@ StyledRect { root.expanded = !root.expanded; } - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface } @@ -376,7 +376,7 @@ StyledRect { animate: true text: root.expanded ? "expand_less" : "expand_more" - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } @@ -386,13 +386,13 @@ StyledRect { anchors.left: summary.left anchors.right: expandBtn.left anchors.top: summary.bottom - anchors.rightMargin: Appearance.spacing.small + anchors.rightMargin: Tokens.spacing.small animate: true textFormat: root.bodyTextFormat text: bodyPreviewMetrics.elidedText color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small opacity: root.expanded ? 0 : 1 @@ -417,13 +417,13 @@ StyledRect { anchors.left: summary.left anchors.right: expandBtn.left anchors.top: summary.bottom - anchors.rightMargin: Appearance.spacing.small + anchors.rightMargin: Tokens.spacing.small animate: true textFormat: root.bodyTextFormat text: root.modelData.body color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small wrapMode: Text.WrapAtWordBoundaryOrAnywhere height: text ? implicitHeight : 0 @@ -447,9 +447,9 @@ StyledRect { anchors.horizontalCenter: parent.horizontalCenter anchors.top: body.bottom - anchors.topMargin: Appearance.spacing.small + anchors.topMargin: Tokens.spacing.small - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller opacity: root.expanded ? 1 : 0 @@ -483,20 +483,20 @@ StyledRect { required property var modelData - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2 - Layout.preferredHeight: actionText.height + Appearance.padding.small * 2 - implicitWidth: actionText.width + Appearance.padding.normal * 2 - implicitHeight: actionText.height + Appearance.padding.small * 2 + Layout.preferredWidth: actionText.width + Tokens.padding.normal * 2 + Layout.preferredHeight: actionText.height + Tokens.padding.small * 2 + implicitWidth: actionText.width + Tokens.padding.normal * 2 + implicitHeight: actionText.height + Tokens.padding.small * 2 StateLayer { function onClicked(): void { action.modelData.invoke(); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface } @@ -506,7 +506,7 @@ StyledRect { anchors.centerIn: parent text: actionTextMetrics.elidedText color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } TextMetrics { @@ -518,7 +518,7 @@ StyledRect { elide: Text.ElideRight elideWidth: { const numActions = root.modelData.actions.length + 1; - return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2; + return (inner.width - actions.spacing * (numActions - 1)) / numActions - Tokens.padding.normal * 2; } } } diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index 5ec6ad98..b0022fd6 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -20,14 +20,14 @@ Item { required property bool sourceMuted required property real brightness - implicitWidth: layout.implicitWidth + Appearance.padding.large * 2 - implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 + implicitWidth: layout.implicitWidth + Tokens.padding.large * 2 + implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 ColumnLayout { id: layout anchors.centerIn: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal // Speaker volume CustomMouseArea { @@ -117,7 +117,7 @@ Item { Behavior on Layout.preferredHeight { Anim { - easing.bezierCurve: Appearance.anim.curves.emphasized + easing.bezierCurve: Tokens.anim.curves.emphasized } } diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 487b611f..1c593e84 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -46,8 +46,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/session/Content.qml b/modules/session/Content.qml index 0f64ec4b..b84a5a42 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config import qs.utils Column { @@ -12,8 +12,8 @@ Column { required property DrawerVisibilities visibilities - padding: Appearance.padding.large - spacing: Appearance.spacing.large + padding: Tokens.padding.large + spacing: Tokens.spacing.large SessionButton { id: logout @@ -53,7 +53,7 @@ Column { playing: visible asynchronous: true - speed: Appearance.anim.sessionGifSpeed + speed: Tokens.anim.sessionGifSpeed source: Paths.absolutePath(Config.paths.sessionGif) } @@ -85,7 +85,7 @@ Column { implicitWidth: Config.session.sizes.button implicitHeight: Config.session.sizes.button - radius: Appearance.rounding.large + radius: Tokens.rounding.large color: button.activeFocus ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer Keys.onEnterPressed: Quickshell.execDetached(button.command) @@ -128,7 +128,7 @@ Column { text: button.icon color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 500 } } diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index 0d2d3b42..f211cfbe 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.components -import qs.config +import Caelestia.Config Item { id: root @@ -23,8 +23,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/sidebar/Content.qml b/modules/sidebar/Content.qml index 7dbbd06c..c6016967 100644 --- a/modules/sidebar/Content.qml +++ b/modules/sidebar/Content.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -14,13 +14,13 @@ Item { id: layout anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { Layout.fillWidth: true Layout.fillHeight: true - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainerLow NotifDock { @@ -30,7 +30,7 @@ Item { } StyledRect { - Layout.topMargin: Appearance.padding.large - layout.spacing + Layout.topMargin: Tokens.padding.large - layout.spacing Layout.fillWidth: true implicitHeight: 1 diff --git a/modules/sidebar/Notif.qml b/modules/sidebar/Notif.qml index 5ccdc97e..aa80d068 100644 --- a/modules/sidebar/Notif.qml +++ b/modules/sidebar/Notif.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell import qs.components import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -16,11 +16,11 @@ StyledRect { required property DrawerVisibilities visibilities readonly property StyledText body: (expandedContent.item as ExpandedBody)?.body ?? null - readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Appearance.padding.normal * 2 : summaryHeightMetrics.height + readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Tokens.padding.normal * 2 : summaryHeightMetrics.height implicitHeight: nonAnimHeight - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: { const c = root.modelData?.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2); return expanded ? c : Qt.alpha(c, 0); @@ -32,12 +32,12 @@ StyledRect { name: "expanded" PropertyChanges { - summary.anchors.margins: Appearance.padding.normal - dummySummary.anchors.margins: Appearance.padding.normal - compactBody.anchors.margins: Appearance.padding.normal - timeStr.anchors.margins: Appearance.padding.normal - expandedContent.anchors.margins: Appearance.padding.normal - summary.width: root.width - Appearance.padding.normal * 2 - timeStr.implicitWidth - Appearance.spacing.small + summary.anchors.margins: Tokens.padding.normal + dummySummary.anchors.margins: Tokens.padding.normal + compactBody.anchors.margins: Tokens.padding.normal + timeStr.anchors.margins: Tokens.padding.normal + expandedContent.anchors.margins: Tokens.padding.normal + summary.width: root.width - Tokens.padding.normal * 2 - timeStr.implicitWidth - Tokens.spacing.small summary.maximumLineCount: Number.MAX_SAFE_INTEGER } } @@ -86,7 +86,7 @@ StyledRect { anchors.top: parent.top anchors.left: dummySummary.right anchors.right: parent.right - anchors.leftMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small sourceComponent: StyledText { text: String(root.modelData?.body ?? "").replace(/\n/g, " ") @@ -106,7 +106,7 @@ StyledRect { animate: true text: root.modelData?.timeStr ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } } @@ -117,22 +117,22 @@ StyledRect { anchors.top: summary.bottom anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: Appearance.spacing.small / 2 + anchors.topMargin: Tokens.spacing.small / 2 sourceComponent: ExpandedBody {} } Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } component ExpandedBody: ColumnLayout { readonly property alias body: bodyText - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { id: bodyText diff --git a/modules/sidebar/NotifActionList.qml b/modules/sidebar/NotifActionList.qml index 84e6103c..320fd1a3 100644 --- a/modules/sidebar/NotifActionList.qml +++ b/modules/sidebar/NotifActionList.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.containers import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -94,7 +94,7 @@ Item { id: actionList anchors.fill: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Repeater { model: [ @@ -114,11 +114,11 @@ Item { Layout.fillWidth: true Layout.fillHeight: true - implicitWidth: actionInner.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: actionInner.implicitHeight + Appearance.padding.small * 2 + implicitWidth: actionInner.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: actionInner.implicitHeight + Tokens.padding.small * 2 - Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Appearance.padding.large : 0) - radius: actionStateLayer.pressed ? Appearance.rounding.small / 2 : Appearance.rounding.small + Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Tokens.padding.large : 0) + radius: actionStateLayer.pressed ? Tokens.rounding.small / 2 : Tokens.rounding.small color: Colours.layer(Colours.palette.m3surfaceContainerHighest, 4) Timer { @@ -183,15 +183,15 @@ Item { Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on radius { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml index 11ce4dac..a819f52b 100644 --- a/modules/sidebar/NotifDock.qml +++ b/modules/sidebar/NotifDock.qml @@ -8,7 +8,7 @@ import qs.components.containers import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils Item { @@ -19,7 +19,7 @@ Item { readonly property int notifCount: Notifs.list.reduce((acc, n) => n.closed ? acc : acc + 1, 0) anchors.fill: parent - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal Component.onCompleted: Notifs.list.forEach(n => n.popup = false) @@ -29,7 +29,7 @@ Item { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.small + anchors.margins: Tokens.padding.small implicitHeight: Math.max(count.implicitHeight, titleText.implicitHeight) @@ -43,8 +43,8 @@ Item { text: root.notifCount color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.normal + font.family: Tokens.font.family.mono font.weight: 500 Behavior on anchors.leftMargin { @@ -62,12 +62,12 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: count.right anchors.right: parent.right - anchors.leftMargin: Appearance.spacing.small + anchors.leftMargin: Tokens.spacing.small text: root.notifCount > 0 ? qsTr("notification%1").arg(root.notifCount === 1 ? "" : "s") : qsTr("Notifications") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.normal - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.normal + font.family: Tokens.font.family.mono font.weight: 500 elide: Text.ElideRight } @@ -80,9 +80,9 @@ Item { anchors.right: parent.right anchors.top: title.bottom anchors.bottom: parent.bottom - anchors.topMargin: Appearance.spacing.smaller + anchors.topMargin: Tokens.spacing.smaller - radius: Appearance.rounding.small + radius: Tokens.rounding.small color: "transparent" Loader { @@ -92,7 +92,7 @@ Item { opacity: root.notifCount > 0 ? 0 : 1 sourceComponent: ColumnLayout { - spacing: Appearance.spacing.large + spacing: Tokens.spacing.large Image { asynchronous: true @@ -111,15 +111,15 @@ Item { Layout.alignment: Qt.AlignHCenter text: qsTr("No Notifications") color: Colours.palette.m3outlineVariant - font.pointSize: Appearance.font.size.large - font.family: Appearance.font.family.mono + font.pointSize: Tokens.font.size.large + font.family: Tokens.font.family.mono font.weight: 500 } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.extraLarge + duration: Tokens.anim.durations.extraLarge } } } @@ -177,7 +177,7 @@ Item { asynchronous: true anchors.right: parent.right anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal scale: root.notifCount > 0 ? 1 : 0.5 opacity: root.notifCount > 0 ? 1 : 0 @@ -187,9 +187,9 @@ Item { id: clearBtn icon: "clear_all" - radius: Appearance.rounding.normal - padding: Appearance.padding.normal - font.pointSize: Math.round(Appearance.font.size.large * 1.2) + radius: Tokens.rounding.normal + padding: Tokens.padding.normal + font.pointSize: Math.round(Tokens.font.size.large * 1.2) onClicked: clearTimer.start() Elevation { @@ -202,14 +202,14 @@ Item { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial } } } diff --git a/modules/sidebar/NotifDockList.qml b/modules/sidebar/NotifDockList.qml index c40a1e01..80d091c3 100644 --- a/modules/sidebar/NotifDockList.qml +++ b/modules/sidebar/NotifDockList.qml @@ -5,7 +5,7 @@ import Quickshell import Caelestia.Components import qs.components import qs.services -import qs.config +import Caelestia.Config LazyListView { id: root @@ -18,7 +18,7 @@ LazyListView { anchors.right: parent?.right implicitHeight: contentHeight - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small readyDelay: 1 cacheBuffer: 400 asynchronous: true @@ -33,7 +33,7 @@ LazyListView { useCustomViewport: true viewport: Qt.rect(0, container.contentY, width, container.height) - removeDuration: Appearance.anim.durations.normal + removeDuration: Tokens.anim.durations.normal model: ScriptModel { values: { @@ -129,8 +129,8 @@ LazyListView { enabled: notif.LazyListView.ready Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -140,15 +140,15 @@ LazyListView { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on x { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } @@ -159,7 +159,7 @@ LazyListView { target: root.container property: "contentY" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml index 0efea542..3d624bfc 100644 --- a/modules/sidebar/NotifGroup.qml +++ b/modules/sidebar/NotifGroup.qml @@ -7,7 +7,7 @@ import Quickshell.Services.Notifications import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config import qs.utils StyledRect { @@ -51,9 +51,9 @@ StyledRect { readonly property int urgency: groupProps.urgency readonly property int nonAnimHeight: { - const headerHeight = header.implicitHeight + (root.expanded ? Math.round(Appearance.spacing.small / 2) : 0); + const headerHeight = header.implicitHeight + (root.expanded ? Math.round(Tokens.spacing.small / 2) : 0); const columnHeight = headerHeight + notifList.layoutHeight + column.Layout.topMargin + column.Layout.bottomMargin; - return Math.round(Math.max(Config.notifs.sizes.image, columnHeight) + Appearance.padding.normal * 2); + return Math.round(Math.max(Config.notifs.sizes.image, columnHeight) + Tokens.padding.normal * 2); } readonly property bool expanded: props.expandedNotifs.includes(modelData) @@ -73,10 +73,10 @@ StyledRect { anchors.left: parent?.left anchors.right: parent?.right - implicitHeight: content.implicitHeight + Appearance.padding.normal * 2 + implicitHeight: content.implicitHeight + Tokens.padding.normal * 2 clip: true - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.layer(Colours.palette.m3surfaceContainer, 2) RowLayout { @@ -85,9 +85,9 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.margins: Appearance.padding.normal + anchors.margins: Tokens.padding.normal - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop @@ -126,14 +126,14 @@ StyledRect { MaterialIcon { text: Icons.getNotifIcon(root.notifs[0]?.summary, root.urgency) color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } StyledClippingRect { anchors.fill: parent color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.urgency === NotificationUrgency.Low ? Colours.layer(Colours.palette.m3surfaceContainerHigh, 3) : Colours.palette.m3secondaryContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full Loader { asynchronous: true @@ -153,7 +153,7 @@ StyledRect { implicitHeight: Config.notifs.sizes.badge color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.urgency === NotificationUrgency.Low ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3secondaryContainer - radius: Appearance.rounding.full + radius: Tokens.rounding.full ColouredIcon { anchors.centerIn: parent @@ -169,23 +169,23 @@ StyledRect { ColumnLayout { id: column - Layout.topMargin: -Appearance.padding.small - Layout.bottomMargin: -Appearance.padding.small / 2 + Layout.topMargin: -Tokens.padding.small + Layout.bottomMargin: -Tokens.padding.small / 2 Layout.fillWidth: true spacing: 0 RowLayout { id: header - Layout.bottomMargin: root.expanded ? Math.round(Appearance.spacing.small / 2) : 0 + Layout.bottomMargin: root.expanded ? Math.round(Tokens.spacing.small / 2) : 0 Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller StyledText { Layout.fillWidth: true text: root.modelData color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } @@ -193,15 +193,15 @@ StyledRect { animate: true text: root.notifs.find(n => !n.closed)?.timeStr ?? "" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } StyledRect { - implicitWidth: expandBtn.implicitWidth + Appearance.padding.smaller * 2 - implicitHeight: groupCount.implicitHeight + Appearance.padding.small + implicitWidth: expandBtn.implicitWidth + Tokens.padding.smaller * 2 + implicitHeight: groupCount.implicitHeight + Tokens.padding.small color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHigh, 3) - radius: Appearance.rounding.full + radius: Tokens.rounding.full StateLayer { function onClicked(): void { @@ -215,36 +215,36 @@ StyledRect { id: expandBtn anchors.centerIn: parent - spacing: Appearance.spacing.small / 2 + spacing: Tokens.spacing.small / 2 StyledText { id: groupCount - Layout.leftMargin: Appearance.padding.small / 2 + Layout.leftMargin: Tokens.padding.small / 2 animate: true text: root.notifCount color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small } MaterialIcon { - Layout.rightMargin: -Appearance.padding.small / 2 + Layout.rightMargin: -Tokens.padding.small / 2 text: "expand_more" color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface rotation: root.expanded ? 180 : 0 - Layout.topMargin: root.expanded ? -Math.floor(Appearance.padding.smaller / 2) : 0 + Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.smaller / 2) : 0 Behavior on rotation { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on Layout.topMargin { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/sidebar/NotifGroupList.qml b/modules/sidebar/NotifGroupList.qml index aeec4c62..32d8d678 100644 --- a/modules/sidebar/NotifGroupList.qml +++ b/modules/sidebar/NotifGroupList.qml @@ -6,7 +6,7 @@ import Quickshell import Caelestia.Components import qs.components import qs.services -import qs.config +import Caelestia.Config LazyListView { id: root @@ -22,12 +22,12 @@ LazyListView { Layout.fillWidth: true implicitHeight: contentHeight - spacing: Math.round(Appearance.spacing.small / 2) + spacing: Math.round(Tokens.spacing.small / 2) asynchronous: true readyDelay: 1 cacheBuffer: 400 - removeDuration: Appearance.anim.durations.normal + removeDuration: Tokens.anim.durations.normal useCustomViewport: true viewport: { @@ -132,8 +132,8 @@ LazyListView { enabled: notif.LazyListView.ready Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -147,8 +147,8 @@ LazyListView { Behavior on x { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml index eefd11a0..446a5b30 100644 --- a/modules/sidebar/Wrapper.qml +++ b/modules/sidebar/Wrapper.qml @@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import qs.components -import qs.config +import Caelestia.Config Item { id: root @@ -20,8 +20,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -31,13 +31,13 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom anchors.left: parent.left - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large anchors.bottomMargin: 0 active: root.shouldBeActive || root.visible sourceComponent: Content { - implicitWidth: Config.sidebar.sizes.width - Appearance.padding.large * 2 + implicitWidth: Config.sidebar.sizes.width - Tokens.padding.large * 2 props: root.props visibilities: root.visibilities } diff --git a/modules/utilities/Content.qml b/modules/utilities/Content.qml index 6dcfedcd..7ecb46ff 100644 --- a/modules/utilities/Content.qml +++ b/modules/utilities/Content.qml @@ -2,7 +2,7 @@ import "cards" import QtQuick import QtQuick.Layouts import qs.components -import qs.config +import Caelestia.Config import qs.modules.bar.popouts as BarPopouts Item { @@ -19,7 +19,7 @@ Item { id: layout anchors.fill: parent - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal IdleInhibit {} diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml index 4d6d8af2..9d89fb8f 100644 --- a/modules/utilities/RecordingDeleteModal.qml +++ b/modules/utilities/RecordingDeleteModal.qml @@ -8,7 +8,7 @@ import qs.components import qs.components.controls import qs.components.effects import qs.services -import qs.config +import Caelestia.Config Loader { id: root @@ -33,9 +33,9 @@ Loader { Item { anchors.fill: parent - anchors.margins: -Appearance.padding.large - anchors.rightMargin: -Appearance.padding.large - Config.border.thickness - anchors.bottomMargin: -Appearance.padding.large - Config.border.thickness + anchors.margins: -Tokens.padding.large + anchors.rightMargin: -Tokens.padding.large - Config.border.thickness + anchors.bottomMargin: -Tokens.padding.large - Config.border.thickness opacity: 0.5 StyledRect { @@ -130,15 +130,15 @@ Loader { StyledRect { anchors.centerIn: parent - radius: Appearance.rounding.large + radius: Tokens.rounding.large color: Colours.palette.m3surfaceContainerHigh scale: 0 Component.onCompleted: scale = Qt.binding(() => root.props.recordingConfirmDelete ? 1 : 0) - width: Math.min(parent.width - Appearance.padding.large * 2, implicitWidth) - implicitWidth: deleteConfirmationLayout.implicitWidth + Appearance.padding.large * 3 - implicitHeight: deleteConfirmationLayout.implicitHeight + Appearance.padding.large * 3 + width: Math.min(parent.width - Tokens.padding.large * 2, implicitWidth) + implicitWidth: deleteConfirmationLayout.implicitWidth + Tokens.padding.large * 3 + implicitHeight: deleteConfirmationLayout.implicitHeight + Tokens.padding.large * 3 MouseArea { anchors.fill: parent @@ -155,26 +155,26 @@ Loader { id: deleteConfirmationLayout anchors.fill: parent - anchors.margins: Appearance.padding.large * 1.5 - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large * 1.5 + spacing: Tokens.spacing.normal StyledText { text: qsTr("Delete recording?") - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } StyledText { Layout.fillWidth: true text: qsTr("Recording '%1' will be permanently deleted.").arg(deleteConfirmation.path) color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small wrapMode: Text.WrapAtWordBoundaryOrAnywhere } RowLayout { - Layout.topMargin: Appearance.spacing.normal + Layout.topMargin: Tokens.spacing.normal Layout.alignment: Qt.AlignRight - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal TextButton { text: qsTr("Cancel") @@ -195,8 +195,8 @@ Loader { Behavior on scale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index cb4bcaa0..6d666894 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell import qs.components -import qs.config +import Caelestia.Config import qs.modules.sidebar as Sidebar import qs.modules.bar.popouts as BarPopouts @@ -47,8 +47,8 @@ Item { Anim { property: "sidebarLerp" - duration: Appearance.anim.durations.expressiveDefaultSpatial / 2 - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.expressiveDefaultSpatial / 2 + easing.bezierCurve: Tokens.anim.curves.standardAccel } }, Transition { @@ -56,16 +56,16 @@ Item { Anim { property: "sidebarLerp" - duration: Appearance.anim.durations.expressiveDefaultSpatial / 2 - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.expressiveDefaultSpatial / 2 + easing.bezierCurve: Tokens.anim.curves.standardDecel } } ] Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } @@ -74,7 +74,7 @@ Item { anchors.top: parent.top anchors.left: parent.left - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large asynchronous: true active: root.shouldBeActive || root.visible diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml index 20d232a3..30176f29 100644 --- a/modules/utilities/cards/IdleInhibit.qml +++ b/modules/utilities/cards/IdleInhibit.qml @@ -3,15 +3,15 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root Layout.fillWidth: true - implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Appearance.padding.large * 2 + implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer clip: true @@ -21,14 +21,14 @@ StyledRect { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledRect { implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: IdleInhibitor.enabled ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer MaterialIcon { @@ -37,7 +37,7 @@ StyledRect { anchors.centerIn: parent text: "coffee" color: IdleInhibitor.enabled ? Colours.palette.m3onSecondary : Colours.palette.m3onSecondaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } @@ -48,7 +48,7 @@ StyledRect { StyledText { Layout.fillWidth: true text: qsTr("Keep Awake") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } @@ -56,7 +56,7 @@ StyledRect { Layout.fillWidth: true text: IdleInhibitor.enabled ? qsTr("Preventing sleep mode") : qsTr("Normal power management") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } } @@ -73,9 +73,9 @@ StyledRect { asynchronous: true anchors.bottom: parent.bottom anchors.left: parent.left - anchors.topMargin: Appearance.spacing.larger - anchors.bottomMargin: IdleInhibitor.enabled ? Appearance.padding.large : -implicitHeight - anchors.leftMargin: Appearance.padding.large + anchors.topMargin: Tokens.spacing.larger + anchors.bottomMargin: IdleInhibitor.enabled ? Tokens.padding.large : -implicitHeight + anchors.leftMargin: Tokens.padding.large opacity: IdleInhibitor.enabled ? 1 : 0 scale: IdleInhibitor.enabled ? 1 : 0.5 @@ -83,10 +83,10 @@ StyledRect { Component.onCompleted: active = Qt.binding(() => opacity > 0) sourceComponent: StyledRect { - implicitWidth: activeText.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: activeText.implicitHeight + Appearance.padding.small * 2 + implicitWidth: activeText.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: activeText.implicitHeight + Tokens.padding.small * 2 - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Colours.palette.m3primary StyledText { @@ -95,20 +95,20 @@ StyledRect { anchors.centerIn: parent text: qsTr("Active since %1").arg(Qt.formatTime(IdleInhibitor.enabledSince, Config.services.useTwelveHourClock ? "hh:mm a" : "hh:mm")) color: Colours.palette.m3onPrimary - font.pointSize: Math.round(Appearance.font.size.small * 0.9) + font.pointSize: Math.round(Tokens.font.size.small * 0.9) } } Behavior on anchors.bottomMargin { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } Behavior on opacity { Anim { - duration: Appearance.anim.durations.small + duration: Tokens.anim.durations.small } } @@ -119,8 +119,8 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml index 9dd16ec5..97d88dde 100644 --- a/modules/utilities/cards/Record.qml +++ b/modules/utilities/cards/Record.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -16,28 +16,28 @@ StyledRect { Layout.fillWidth: true implicitHeight: layout.implicitHeight + layout.anchors.margins * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { id: layout anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal RowLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal z: 1 StyledRect { implicitWidth: implicitHeight implicitHeight: { - const h = icon.implicitHeight + Appearance.padding.smaller * 2; + const h = icon.implicitHeight + Tokens.padding.smaller * 2; return h - (h % 2); } - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Recorder.running ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer MaterialIcon { @@ -48,7 +48,7 @@ StyledRect { anchors.verticalCenterOffset: 1.5 text: "screen_record" color: Recorder.running ? Colours.palette.m3onSecondary : Colours.palette.m3onSecondaryContainer - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } @@ -59,7 +59,7 @@ StyledRect { StyledText { Layout.fillWidth: true text: qsTr("Screen Recorder") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } @@ -67,7 +67,7 @@ StyledRect { Layout.fillWidth: true text: Recorder.paused ? qsTr("Recording paused") : Recorder.running ? qsTr("Recording running") : qsTr("Recording off") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small + font.pointSize: Tokens.font.size.small elide: Text.ElideRight } } @@ -131,15 +131,15 @@ StyledRect { target: listOrControls property: "scale" to: 0.7 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardAccel } Anim { target: listOrControls property: "opacity" to: 0 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardAccel } } PropertyAction { @@ -158,15 +158,15 @@ StyledRect { target: listOrControls property: "scale" to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardDecel } Anim { target: listOrControls property: "opacity" to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel + duration: Tokens.anim.durations.small + easing.bezierCurve: Tokens.anim.curves.standardDecel } } } @@ -187,14 +187,14 @@ StyledRect { id: recordingControls RowLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledRect { - radius: Appearance.rounding.full + radius: Tokens.rounding.full color: Recorder.paused ? Colours.palette.m3tertiary : Colours.palette.m3error - implicitWidth: recText.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: recText.implicitHeight + Appearance.padding.smaller * 2 + implicitWidth: recText.implicitWidth + Tokens.padding.normal * 2 + implicitHeight: recText.implicitHeight + Tokens.padding.smaller * 2 StyledText { id: recText @@ -203,7 +203,7 @@ StyledRect { animate: true text: Recorder.paused ? "PAUSED" : "REC" color: Recorder.paused ? Colours.palette.m3onTertiary : Colours.palette.m3onError - font.family: Appearance.font.family.mono + font.family: Tokens.font.family.mono } Behavior on implicitWidth { @@ -218,14 +218,14 @@ StyledRect { Anim { from: 1 to: 0 - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasizedAccel + duration: Tokens.anim.durations.large + easing.bezierCurve: Tokens.anim.curves.emphasizedAccel } Anim { from: 0 to: 1 - duration: Appearance.anim.durations.extraLarge - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + duration: Tokens.anim.durations.extraLarge + easing.bezierCurve: Tokens.anim.curves.emphasizedDecel } } } @@ -246,7 +246,7 @@ StyledRect { return qsTr("Recording for %1").arg(time); } - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } Item { @@ -259,7 +259,7 @@ StyledRect { toggle: true checked: Recorder.paused type: IconButton.Tonal - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large onClicked: { Recorder.togglePause(); internalChecked = Recorder.paused; @@ -270,7 +270,7 @@ StyledRect { icon: "stop" inactiveColour: Colours.palette.m3error inactiveOnColour: Colours.palette.m3onError - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large onClicked: Recorder.stop() } } diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index 7fb56f3b..57b7ad64 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -9,7 +9,7 @@ import qs.components import qs.components.containers import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.utils ColumnLayout { @@ -27,19 +27,19 @@ ColumnLayout { onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller MaterialIcon { Layout.alignment: Qt.AlignVCenter text: "list" - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } StyledText { Layout.alignment: Qt.AlignVCenter Layout.fillWidth: true text: qsTr("Recordings") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } IconButton { @@ -61,8 +61,8 @@ ColumnLayout { } Layout.fillWidth: true - Layout.rightMargin: -Appearance.spacing.small - implicitHeight: (Appearance.font.size.larger + Appearance.padding.small) * (root.props.recordingListExpanded ? 10 : 3) + Layout.rightMargin: -Tokens.spacing.small + implicitHeight: (Tokens.font.size.larger + Tokens.padding.small) * (root.props.recordingListExpanded ? 10 : 3) clip: true StyledScrollBar.vertical: StyledScrollBar { @@ -77,14 +77,14 @@ ColumnLayout { anchors.left: list.contentItem.left anchors.right: list.contentItem.right - anchors.rightMargin: Appearance.spacing.small - spacing: Appearance.spacing.small / 2 + anchors.rightMargin: Tokens.spacing.small + spacing: Tokens.spacing.small / 2 Component.onCompleted: baseName = modelData.baseName StyledText { Layout.fillWidth: true - Layout.rightMargin: Appearance.spacing.small / 2 + Layout.rightMargin: Tokens.spacing.small / 2 text: { const time = recording.baseName; const matches = time.match(/^recording_(\d{4})(\d{2})(\d{2})_(\d{2})-(\d{2})-(\d{2})/); @@ -169,13 +169,13 @@ ColumnLayout { active: opacity > 0 sourceComponent: ColumnLayout { - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small MaterialIcon { Layout.alignment: Qt.AlignHCenter text: "scan_delete" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge opacity: root.props.recordingListExpanded ? 1 : 0 scale: root.props.recordingListExpanded ? 1 : 0 @@ -195,7 +195,7 @@ ColumnLayout { } RowLayout { - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller MaterialIcon { Layout.alignment: Qt.AlignHCenter @@ -233,8 +233,8 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 2b14a9ae..65b5a627 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -6,7 +6,7 @@ import Quickshell.Bluetooth import qs.components import qs.components.controls import qs.services -import qs.config +import Caelestia.Config import qs.modules.bar.popouts as BarPopouts StyledRect { @@ -38,21 +38,21 @@ StyledRect { readonly property bool needExtraRow: quickToggles.length > 6 Layout.fillWidth: true - implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 + implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: Colours.tPalette.m3surfaceContainer ColumnLayout { id: layout anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.large + spacing: Tokens.spacing.normal StyledText { text: qsTr("Quick Toggles") - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } QuickToggleRow { @@ -69,7 +69,7 @@ StyledRect { property var rowModel: [] Layout.fillWidth: true - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Repeater { model: parent.rowModel @@ -154,17 +154,17 @@ StyledRect { component Toggle: IconButton { Layout.fillWidth: true - Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Appearance.padding.large : internalChecked ? Appearance.padding.smaller : 0) - radius: stateLayer.pressed ? Appearance.rounding.small / 2 : internalChecked ? Appearance.rounding.small : Appearance.rounding.normal + Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0) + radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) toggle: true - radiusAnim.duration: Appearance.anim.durations.expressiveFastSpatial - radiusAnim.easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial + radiusAnim.easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial Behavior on Layout.preferredWidth { Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Tokens.anim.durations.expressiveFastSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial } } } diff --git a/modules/utilities/toasts/ToastItem.qml b/modules/utilities/toasts/ToastItem.qml index 52473a48..756160fc 100644 --- a/modules/utilities/toasts/ToastItem.qml +++ b/modules/utilities/toasts/ToastItem.qml @@ -4,7 +4,7 @@ import Caelestia import qs.components import qs.components.effects import qs.services -import qs.config +import Caelestia.Config StyledRect { id: root @@ -13,9 +13,9 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right - implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2 - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: { if (root.modelData.type === Toast.Success) return Colours.palette.m3successContainer; @@ -50,13 +50,13 @@ StyledRect { id: layout anchors.fill: parent - anchors.margins: Appearance.padding.smaller - anchors.leftMargin: Appearance.padding.normal - anchors.rightMargin: Appearance.padding.normal - spacing: Appearance.spacing.normal + anchors.margins: Tokens.padding.smaller + anchors.leftMargin: Tokens.padding.normal + anchors.rightMargin: Tokens.padding.normal + spacing: Tokens.spacing.normal StyledRect { - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal color: { if (root.modelData.type === Toast.Success) return Colours.palette.m3success; @@ -68,7 +68,7 @@ StyledRect { } implicitWidth: implicitHeight - implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2 + implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2 MaterialIcon { id: icon @@ -84,7 +84,7 @@ StyledRect { return Colours.palette.m3onError; return Colours.palette.m3onSurfaceVariant; } - font.pointSize: Math.round(Appearance.font.size.large * 1.2) + font.pointSize: Math.round(Tokens.font.size.large * 1.2) } } @@ -106,7 +106,7 @@ StyledRect { return Colours.palette.m3onErrorContainer; return Colours.palette.m3onSurface; } - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal elide: Text.ElideRight } diff --git a/modules/utilities/toasts/Toasts.qml b/modules/utilities/toasts/Toasts.qml index 1ef072e9..32fb56fc 100644 --- a/modules/utilities/toasts/Toasts.qml +++ b/modules/utilities/toasts/Toasts.qml @@ -5,12 +5,12 @@ import Quickshell import Caelestia import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root - readonly property int spacing: Appearance.spacing.small + readonly property int spacing: Tokens.spacing.small property bool flag function shouldShowToast(toast: Toast): bool { @@ -23,7 +23,7 @@ Item { return false; } - implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2 + implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.normal * 2 implicitHeight: { let h = -spacing; for (let i = 0; i < repeater.count; i++) { @@ -111,8 +111,8 @@ Item { properties: "opacity,scale" from: 0 to: 1 - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } ParallelAnimation { @@ -148,8 +148,8 @@ Item { Behavior on anchors.bottomMargin { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: Tokens.anim.durations.expressiveDefaultSpatial + easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } } } diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml index 3f0bf4de..6ddda9b3 100644 --- a/modules/windowinfo/Buttons.qml +++ b/modules/windowinfo/Buttons.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell.Widgets import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -14,14 +14,14 @@ ColumnLayout { property bool moveToWsExpanded anchors.fill: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small RowLayout { - Layout.topMargin: Appearance.padding.large - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large + Layout.topMargin: Tokens.padding.large + Layout.leftMargin: Tokens.padding.large + Layout.rightMargin: Tokens.padding.large - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal StyledText { Layout.fillWidth: true @@ -31,10 +31,10 @@ ColumnLayout { StyledRect { color: Colours.palette.m3primary - radius: Appearance.rounding.small + radius: Tokens.rounding.small - implicitWidth: moveToWsIcon.implicitWidth + Appearance.padding.small * 2 - implicitHeight: moveToWsIcon.implicitHeight + Appearance.padding.small + implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.small * 2 + implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.small StateLayer { function onClicked(): void { @@ -52,27 +52,27 @@ ColumnLayout { animate: true text: root.moveToWsExpanded ? "expand_more" : "keyboard_arrow_right" color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } WrapperItem { Layout.fillWidth: true - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 + Layout.leftMargin: Tokens.padding.large * 2 + Layout.rightMargin: Tokens.padding.large * 2 Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0 clip: true - topMargin: Appearance.spacing.normal - bottomMargin: Appearance.spacing.normal + topMargin: Tokens.spacing.normal + bottomMargin: Tokens.spacing.normal GridLayout { id: wsGrid - rowSpacing: Appearance.spacing.smaller - columnSpacing: Appearance.spacing.normal + rowSpacing: Tokens.spacing.smaller + columnSpacing: Tokens.spacing.normal columns: 5 Repeater { @@ -102,11 +102,11 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large - Layout.bottomMargin: Appearance.padding.large + Layout.leftMargin: Tokens.padding.large + Layout.rightMargin: Tokens.padding.large + Layout.bottomMargin: Tokens.padding.large - spacing: root.client?.lastIpcObject.floating ? Appearance.spacing.normal : Appearance.spacing.small + spacing: root.client?.lastIpcObject.floating ? Tokens.spacing.normal : Tokens.spacing.small Button { function onClicked(): void { @@ -155,10 +155,10 @@ ColumnLayout { function onClicked(): void { } - radius: Appearance.rounding.small + radius: Tokens.rounding.small Layout.fillWidth: true - implicitHeight: label.implicitHeight + Appearance.padding.small * 2 + implicitHeight: label.implicitHeight + Tokens.padding.small * 2 StateLayer { id: stateLayer @@ -177,7 +177,7 @@ ColumnLayout { animate: true color: parent.onColor - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } } diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml index 3934a993..1f274ca8 100644 --- a/modules/windowinfo/Details.qml +++ b/modules/windowinfo/Details.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import Quickshell.Hyprland import qs.components import qs.services -import qs.config +import Caelestia.Config ColumnLayout { id: root @@ -11,15 +11,15 @@ ColumnLayout { required property HyprlandToplevel client anchors.fill: parent - spacing: Appearance.spacing.small + spacing: Tokens.spacing.small Label { - Layout.topMargin: Appearance.padding.large * 2 + Layout.topMargin: Tokens.padding.large * 2 text: root.client?.title ?? qsTr("No active client") wrapMode: Text.WrapAtWordBoundaryOrAnywhere - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large font.weight: 500 } @@ -27,16 +27,16 @@ ColumnLayout { text: root.client?.lastIpcObject.class ?? qsTr("No active client") color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.larger + font.pointSize: Tokens.font.size.larger } StyledRect { Layout.fillWidth: true Layout.preferredHeight: 1 - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 - Layout.topMargin: Appearance.spacing.normal - Layout.bottomMargin: Appearance.spacing.large + Layout.leftMargin: Tokens.padding.large * 2 + Layout.rightMargin: Tokens.padding.large * 2 + Layout.topMargin: Tokens.spacing.normal + Layout.bottomMargin: Tokens.spacing.large color: Colours.palette.m3secondary } @@ -130,11 +130,11 @@ ColumnLayout { required property string text property alias color: icon.color - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large + Layout.leftMargin: Tokens.padding.large + Layout.rightMargin: Tokens.padding.large Layout.fillWidth: true - spacing: Appearance.spacing.smaller + spacing: Tokens.spacing.smaller MaterialIcon { id: icon @@ -149,13 +149,13 @@ ColumnLayout { text: detail.text elide: Text.ElideRight - font.pointSize: Appearance.font.size.normal + font.pointSize: Tokens.font.size.normal } } component Label: StyledText { - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large + Layout.leftMargin: Tokens.padding.large + Layout.rightMargin: Tokens.padding.large Layout.fillWidth: true elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml index 2683e544..4946205c 100644 --- a/modules/windowinfo/Preview.qml +++ b/modules/windowinfo/Preview.qml @@ -7,7 +7,7 @@ import Quickshell.Hyprland import Quickshell.Wayland import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -15,7 +15,7 @@ Item { required property ShellScreen screen required property HyprlandToplevel client - Layout.preferredWidth: preview.implicitWidth + Appearance.padding.large * 2 + Layout.preferredWidth: preview.implicitWidth + Tokens.padding.large * 2 Layout.fillHeight: true StyledClippingRect { @@ -24,13 +24,13 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.bottom: label.top - anchors.topMargin: Appearance.padding.large - anchors.bottomMargin: Appearance.spacing.normal + anchors.topMargin: Tokens.padding.large + anchors.bottomMargin: Tokens.spacing.normal implicitWidth: view.implicitWidth color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.small + radius: Tokens.rounding.small Loader { asynchronous: true @@ -44,14 +44,14 @@ Item { Layout.alignment: Qt.AlignHCenter text: "web_asset_off" color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge * 3 + font.pointSize: Tokens.font.size.extraLarge * 3 } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("No active client") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge + font.pointSize: Tokens.font.size.extraLarge font.weight: 500 } @@ -59,7 +59,7 @@ Item { Layout.alignment: Qt.AlignHCenter text: qsTr("Try switching to a window") color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.large + font.pointSize: Tokens.font.size.large } } } @@ -82,7 +82,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom - anchors.bottomMargin: Appearance.padding.large + anchors.bottomMargin: Tokens.padding.large animate: true text: { diff --git a/modules/windowinfo/WindowInfo.qml b/modules/windowinfo/WindowInfo.qml index d7cfc2fa..a0079128 100644 --- a/modules/windowinfo/WindowInfo.qml +++ b/modules/windowinfo/WindowInfo.qml @@ -4,7 +4,7 @@ import Quickshell import Quickshell.Hyprland import qs.components import qs.services -import qs.config +import Caelestia.Config Item { id: root @@ -19,9 +19,9 @@ Item { id: child anchors.fill: parent - anchors.margins: Appearance.padding.large + anchors.margins: Tokens.padding.large - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Preview { screen: root.screen @@ -29,7 +29,7 @@ Item { } ColumnLayout { - spacing: Appearance.spacing.normal + spacing: Tokens.spacing.normal Layout.preferredWidth: Config.winfo.sizes.detailsWidth Layout.fillHeight: true @@ -39,7 +39,7 @@ Item { Layout.fillHeight: true color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal Details { client: root.client @@ -51,7 +51,7 @@ Item { Layout.preferredHeight: buttons.implicitHeight color: Colours.tPalette.m3surfaceContainer - radius: Appearance.rounding.normal + radius: Tokens.rounding.normal Buttons { id: buttons diff --git a/services/Audio.qml b/services/Audio.qml index e2d936a0..ad679149 100644 --- a/services/Audio.qml +++ b/services/Audio.qml @@ -6,7 +6,7 @@ import Quickshell.Io import Quickshell.Services.Pipewire import Caelestia import Caelestia.Services -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Brightness.qml b/services/Brightness.qml index 6e828d91..5e7d7f81 100644 --- a/services/Brightness.qml +++ b/services/Brightness.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.components.misc -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Colours.qml b/services/Colours.qml index 8a26e119..fd4698de 100644 --- a/services/Colours.qml +++ b/services/Colours.qml @@ -6,7 +6,7 @@ import Quickshell import Quickshell.Io import Caelestia import qs.services -import qs.config +import Caelestia.Config import qs.utils Singleton { @@ -115,9 +115,9 @@ Singleton { } component Transparency: QtObject { - readonly property bool enabled: Appearance.transparency.enabled - readonly property real base: Math.max(0, Math.min(1, Appearance.transparency.base - (root.light ? 0.1 : 0))) - readonly property real layers: Appearance.transparency.layers + readonly property bool enabled: Tokens.transparency.enabled + readonly property real base: Math.max(0, Math.min(1, Tokens.transparency.base - (root.light ? 0.1 : 0))) + readonly property real layers: Tokens.transparency.layers onEnabledChanged: debounceTimer.restart() onBaseChanged: debounceTimer.restart() diff --git a/services/GameMode.qml b/services/GameMode.qml index 3a3fb7bd..ac1b235d 100644 --- a/services/GameMode.qml +++ b/services/GameMode.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Io import Caelestia import qs.services -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Hypr.qml b/services/Hypr.qml index 98c6e718..2c307e2a 100644 --- a/services/Hypr.qml +++ b/services/Hypr.qml @@ -7,7 +7,7 @@ import Quickshell.Io import Caelestia import Caelestia.Internal import qs.components.misc -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/LyricsService.qml b/services/LyricsService.qml index a6b94f27..7fd63670 100644 --- a/services/LyricsService.qml +++ b/services/LyricsService.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import Quickshell.Io import Caelestia -import qs.config +import Caelestia.Config import qs.utils Singleton { diff --git a/services/NetworkUsage.qml b/services/NetworkUsage.qml index 1f74c97b..e0cc61b3 100644 --- a/services/NetworkUsage.qml +++ b/services/NetworkUsage.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import Caelestia.Internal -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/NotifData.qml b/services/NotifData.qml index d84183e5..ac781ad5 100644 --- a/services/NotifData.qml +++ b/services/NotifData.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Services.Notifications import Caelestia import qs.services -import qs.config +import Caelestia.Config import qs.utils QtObject { diff --git a/services/Notifs.qml b/services/Notifs.qml index 9ea5beff..f2205fc0 100644 --- a/services/Notifs.qml +++ b/services/Notifs.qml @@ -8,7 +8,7 @@ import Quickshell.Services.Notifications import Caelestia import qs.components.misc import qs.services -import qs.config +import Caelestia.Config import qs.utils Singleton { diff --git a/services/Players.qml b/services/Players.qml index 526b0044..f3c6ab3f 100644 --- a/services/Players.qml +++ b/services/Players.qml @@ -6,7 +6,7 @@ import Quickshell.Io import Quickshell.Services.Mpris import Caelestia import qs.components.misc -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Screens.qml b/services/Screens.qml index 9fed887f..7e1b85df 100644 --- a/services/Screens.qml +++ b/services/Screens.qml @@ -1,7 +1,7 @@ pragma Singleton import Quickshell -import qs.config +import Caelestia.Config import qs.utils Singleton { diff --git a/services/SystemUsage.qml b/services/SystemUsage.qml index 79691fea..e1dc4947 100644 --- a/services/SystemUsage.qml +++ b/services/SystemUsage.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import Quickshell.Io -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Time.qml b/services/Time.qml index d41c9142..f92c69a1 100644 --- a/services/Time.qml +++ b/services/Time.qml @@ -2,7 +2,7 @@ pragma Singleton import QtQuick import Quickshell -import qs.config +import Caelestia.Config Singleton { property alias enabled: clock.enabled diff --git a/services/VPN.qml b/services/VPN.qml index bc0addce..ac82a394 100644 --- a/services/VPN.qml +++ b/services/VPN.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import Caelestia -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/services/Wallpapers.qml b/services/Wallpapers.qml index 602abb20..a42d926e 100644 --- a/services/Wallpapers.qml +++ b/services/Wallpapers.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Io import Caelestia.Models import qs.services -import qs.config +import Caelestia.Config import qs.utils Searcher { diff --git a/services/Weather.qml b/services/Weather.qml index 40c4d895..e5037c40 100644 --- a/services/Weather.qml +++ b/services/Weather.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import Caelestia -import qs.config +import Caelestia.Config import qs.utils Singleton { diff --git a/utils/Icons.qml b/utils/Icons.qml index aded0f4b..1d958cff 100644 --- a/utils/Icons.qml +++ b/utils/Icons.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import Quickshell.Services.Notifications -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/utils/Paths.qml b/utils/Paths.qml index b0926348..aa967913 100644 --- a/utils/Paths.qml +++ b/utils/Paths.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import Caelestia -import qs.config +import Caelestia.Config Singleton { id: root diff --git a/utils/SysInfo.qml b/utils/SysInfo.qml index 74c94e9b..8081340e 100644 --- a/utils/SysInfo.qml +++ b/utils/SysInfo.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import Quickshell.Io -import qs.config +import Caelestia.Config import qs.utils Singleton {