nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: migrate rest of the stuff to new font api

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-21 01:35:00 +10:00
parent 61555294e6
commit 9de9e7ec98
13 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/controls/StyledSwitch.qml
View file

@ -18,7 +18,7 @@ Switch {
color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer)
implicitWidth: implicitHeight * 1.7
implicitHeight: Tokens.font.body.medium.pointSize + Tokens.padding.smaller * 2
implicitHeight: Tokens.font.body.medium.pointSize + Tokens.padding.small * 2
StyledRect {
readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight

4
modules/bar/popouts/WirelessPassword.qml
View file

@ -468,7 +468,7 @@ ColumnLayout {
id: cancelButton
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
@ -483,7 +483,7 @@ ColumnLayout {
property bool hasError: false
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3primary
inactiveOnColour: Colours.palette.m3onPrimary
text: qsTr("Connect")

20
modules/controlcenter/bluetooth/DeviceList.qml
View file

@ -48,8 +48,8 @@ DeviceList {
icon: "power"
accent: "Tertiary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Toggle Bluetooth")
onClicked: {
@ -64,8 +64,8 @@ DeviceList {
icon: root.smallDiscoverable ? "group_search" : ""
label: root.smallDiscoverable ? "" : qsTr("Discoverable")
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Make discoverable")
onClicked: {
@ -80,8 +80,8 @@ DeviceList {
icon: "missing_controller"
label: root.smallPairable ? "" : qsTr("Pairable")
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Make pairable")
onClicked: {
@ -96,8 +96,8 @@ DeviceList {
icon: "bluetooth_searching"
accent: "Secondary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Scan for devices")
onClicked: {
@ -112,8 +112,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Bluetooth settings")
onClicked: {

4
modules/controlcenter/launcher/LauncherPane.qml
View file

@ -168,8 +168,8 @@ Item {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Launcher settings")
onClicked: {

4
modules/controlcenter/network/EthernetList.qml
View file

@ -39,8 +39,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
if (root.session.ethernet.active)

4
modules/controlcenter/network/NetworkSettings.qml
View file

@ -87,8 +87,8 @@ ColumnLayout {
TextButton {
Layout.fillWidth: true
Layout.topMargin: Tokens.spacing.normal
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.topMargin: Tokens.spacing.medium
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
text: qsTr("⚙ Manage VPN Providers")
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer

12
modules/controlcenter/network/NetworkingPane.qml
View file

@ -63,8 +63,8 @@ Item {
icon: "wifi"
accent: "Tertiary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Toggle WiFi")
onClicked: {
@ -77,8 +77,8 @@ Item {
icon: "wifi_find"
accent: "Secondary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Scan for networks")
onClicked: {
@ -91,8 +91,8 @@ Item {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Network settings")
onClicked: {

2
modules/controlcenter/network/VpnDetails.qml
View file

@ -96,7 +96,7 @@ DeviceDetails {
TextButton {
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
visible: root.providerEnabled
enabled: !VPN.connecting
inactiveColour: Colours.palette.m3primaryContainer

4
modules/controlcenter/network/WirelessDetails.qml
View file

@ -86,8 +86,8 @@ DeviceDetails {
TextButton {
Layout.fillWidth: true
Layout.topMargin: Tokens.spacing.normal
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.topMargin: Tokens.spacing.medium
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
visible: {
if (!root.network || !root.network.ssid) {
return false;

12
modules/controlcenter/network/WirelessList.qml
View file

@ -64,8 +64,8 @@ DeviceList {
icon: "wifi"
accent: "Tertiary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
Nmcli.toggleWifi(null);
@ -77,8 +77,8 @@ DeviceList {
icon: "wifi_find"
accent: "Secondary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
Nmcli.rescanWifi();
@ -90,8 +90,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.body.medium.pointSize
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
if (root.session.network.active)

4
modules/controlcenter/network/WirelessPasswordDialog.qml
View file

@ -395,7 +395,7 @@ Item {
id: cancelButton
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
@ -410,7 +410,7 @@ Item {
property bool hasError: false
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3primary
inactiveOnColour: Colours.palette.m3onPrimary
text: qsTr("Connect")

3
modules/lock/Resources.qml
View file

@ -80,8 +80,7 @@ GridLayout {
anchors.centerIn: parent
text: res.icon
color: res.colour
font.pointSize: (circ.arcRadius * 0.7) || 1
font.weight: 600
font: Tokens.font.icon.builders.medium.size((circ.arcRadius * 0.7) || 1).weight(600).build()
}
Behavior on value {

2
modules/sidebar/NotifDock.qml
View file

@ -182,7 +182,7 @@ Item {
icon: "clear_all"
radius: Tokens.rounding.normal
padding: Tokens.padding.normal
padding: Tokens.padding.medium
font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build()
onClicked: clearTimer.start()