zach/z-bar-qt
1
1
Fork 0
Code Issues 24 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'main' into module/wifi
C++ / fmt (pull_request) Successful in 5s
Details
JS/TS / fmt (pull_request) Successful in 17s
Details
JS/TS / lint (pull_request) Successful in 16s
Details
Python / fmt (pull_request) Successful in 31s
Details
Python / lint (pull_request) Successful in 41s
Details
Python / test (pull_request) Successful in 1m5s
Details
Python / typecheck (pull_request) Successful in 1m15s
Details
Rust / clippy (pull_request) Failing after 12m43s
Details
Rust / fmt (pull_request) Failing after 12m57s
Details
Rust / build (pull_request) Failing after 13m33s
Details
Python / buildcheck (pull_request) Failing after 13m45s
Details
C++ / clang-tidy (pull_request) Failing after 14m23s
Details
C++ / build (pull_request) Failing after 14m25s
Details

Browse Source
This commit is contained in:
Inorishio
2026-08-15 20:38:54 +02:00
parent 954dc10fbb 5e97ea6867
commit 2d40ce33d1
377 changed files with 7398 additions and 8423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/SysTray/Popouts/BluetoothPopout.qml
+33 -32
View File
@@ -6,9 +6,10 @@ import QtQml.Models
import Quickshell
import Quickshell.Bluetooth
import ZShell.Components
import ZShell.Config
import qs.Services
import qs.Components
import qs.Helpers
import qs.Config
CustomClippingRect {
id: root
@@ -20,13 +21,13 @@ CustomClippingRect {
id: layout
anchors.fill: parent
anchors.margins: Appearance.padding.larger
spacing: Appearance.spacing.extraSmall / 2
anchors.margins: Tokens.padding.larger
spacing: Tokens.spacing.extraSmall / 2
CustomText {
Layout.rightMargin: Appearance.padding.extraSmall
Layout.topMargin: Appearance.padding.normal
font.pointSize: Appearance.font.size.large
Layout.rightMargin: Tokens.padding.extraSmall
Layout.topMargin: Tokens.padding.normal
font.pointSize: Tokens.font.size.large
text: qsTr("Bluetooth")
}
@@ -68,7 +69,7 @@ CustomClippingRect {
Layout.preferredHeight: contentHeight
interactive: false
section.property: "connected"
spacing: Appearance.spacing.extraSmall / 2
spacing: Tokens.spacing.extraSmall / 2
add: Transition {
Anim {
@@ -142,19 +143,19 @@ CustomClippingRect {
readonly property int connectedCount: rows.sortedConnected.length
readonly property bool connecting: Network.connectingNetwork === modelData
property int horizontalPadding: Appearance.padding.largeIncreased
property int horizontalPadding: Tokens.padding.largeIncreased
readonly property bool inConnectedGroup: index < connectedCount
required property int index
required property ListView list
readonly property bool loading: modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting // qmllint disable unresolved-type
required property BluetoothDevice modelData
property int verticalPadding: Appearance.padding.smaller
property int verticalPadding: Tokens.padding.smaller
first: !inConnectedGroup && index === connectedCount + 1
implicitHeight: rowLayout.implicitHeight + verticalPadding * 2
last: inConnectedGroup ? index === connectedCount - 1 : index === list.count - 1
radius: Appearance.rounding.small
radius: Tokens.rounding.small
Timer {
interval: 50
@@ -191,8 +192,8 @@ CustomClippingRect {
CustomText {
Layout.fillWidth: true
Layout.leftMargin: Appearance.spacing.extraSmall
Layout.rightMargin: Appearance.spacing.extraSmall
Layout.leftMargin: Tokens.spacing.extraSmall
Layout.rightMargin: Tokens.spacing.extraSmall
elide: Text.ElideRight
text: btItem.modelData.name
}
@@ -202,9 +203,9 @@ CustomClippingRect {
anchors.left: parent.left
anchors.right: parent.right
color: DynamicColors.palette.m3outline
color: Colors.palette.m3outline
elide: Text.ElideRight
font.pointSize: Appearance.font.size.small
font.pointSize: Tokens.font.size.small
text: btItem.modelData.connected ? (btItem.modelData.batteryAvailable ? qsTr("%1 battery left").arg(Math.round(btItem.modelData.battery * 100) + "%") : qsTr("Battery status unknown")) : btItem.modelData.address
}
}
@@ -217,7 +218,7 @@ CustomClippingRect {
MaterialIcon {
id: icon
font.pointSize: Appearance.font.size.large
font.pointSize: Tokens.font.size.large
opacity: btItem.connecting ? 0 : 1
text: btItem.modelData.batteryAvailable ? Icons.getBatteryIcon(btItem.modelData.battery) : "battery_unknown"
visible: btItem.modelData.state === BluetoothDeviceState.Connected // qmllint disable unresolved-type
@@ -245,10 +246,10 @@ CustomClippingRect {
}
ButtonRow {
spacing: Appearance.spacing.small
spacing: Tokens.spacing.small
IconTextButton {
font.pointSize: Appearance.font.size.small
font.pointSize: Tokens.font.size.small
icon: btItem.modelData.connected ? "link_off" : btItem.modelData.paired ? "link" : "add_link"
text: btItem.modelData.connected ? qsTr("Disconnect") : btItem.modelData.paired ? qsTr("Connect") : qsTr("Pair")
@@ -272,11 +273,11 @@ CustomClippingRect {
property bool first
property bool last
bottomLeftRadius: last ? Appearance.rounding.large : Appearance.rounding.extraSmall
bottomRightRadius: last ? Appearance.rounding.large : Appearance.rounding.extraSmall
color: DynamicColors.tPalette.m3surfaceContainer
topLeftRadius: first ? Appearance.rounding.large : Appearance.rounding.extraSmall
topRightRadius: first ? Appearance.rounding.large : Appearance.rounding.extraSmall
bottomLeftRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
bottomRightRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
color: Colors.tPalette.m3surfaceContainer
topLeftRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
topRightRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
Behavior on bottomLeftRadius {
Anim {
@@ -296,16 +297,16 @@ CustomClippingRect {
}
}
component StatusDivider: CustomText {
bottomPadding: Appearance.spacing.extraSmall
color: DynamicColors.palette.m3onSurfaceVariant
font.pointSize: Appearance.font.size.smaller
bottomPadding: Tokens.spacing.extraSmall
color: Colors.palette.m3onSurfaceVariant
font.pointSize: Tokens.font.size.smaller
text: {
const devices = Bluetooth.devices.values; // qmllint disable unresolved-type
const connectedCount = devices.filter(d => d.connected).length;
let available = qsTr("%1 device%2 available").arg(devices.length - connectedCount).arg(devices.length === 1 ? "" : "s");
return available;
}
topPadding: Appearance.spacing.small
topPadding: Tokens.spacing.small
}
component Toggle: CustomSwitch {
id: toggleItem
@@ -317,13 +318,13 @@ CustomClippingRect {
Layout.fillWidth: true
cLayer: 2
horizontalPadding: Appearance.padding.largeIncreased
horizontalPadding: Tokens.padding.largeIncreased
implicitHeight: Math.max(implicitContentHeight, implicitIndicatorHeight) + verticalPadding * 2
implicitWidth: implicitContentWidth + implicitIndicatorWidth + horizontalPadding * 2
indicator.anchors.right: right
indicator.anchors.rightMargin: toggleItem.horizontalPadding
indicator.anchors.verticalCenter: verticalCenter
verticalPadding: Appearance.padding.normal
verticalPadding: Tokens.padding.normal
background: ConnectedRect {
id: bg
@@ -338,7 +339,7 @@ CustomClippingRect {
anchors.left: parent.left
anchors.leftMargin: toggleItem.horizontalPadding
anchors.right: toggleItem.indicator.left
anchors.rightMargin: Appearance.spacing.normal
anchors.rightMargin: Tokens.spacing.normal
implicitHeight: column.implicitHeight
implicitWidth: column.implicitWidth
@@ -358,7 +359,7 @@ CustomClippingRect {
elide: Text.ElideRight
font: {
const f = Qt.font(label.font);
f.pointSize = Appearance.font.size.smaller;
f.pointSize = Tokens.font.size.smaller;
return f;
}
text: toggleItem.text
@@ -369,11 +370,11 @@ CustomClippingRect {
anchors.left: parent.left
anchors.right: parent.right
color: DynamicColors.palette.m3outline
color: Colors.palette.m3outline
elide: Text.ElideRight
font: {
const f = Qt.font(subtext.font);
f.pointSize = Appearance.font.size.small;
f.pointSize = Tokens.font.size.small;
return f;
}
text: toggleItem.subtext