1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 21:45:38 -05:00

Implement font family changes

This commit is contained in:
bbedward
2025-07-27 23:25:12 -04:00
parent 420891e047
commit b119fd511e
56 changed files with 422 additions and 246 deletions

View File

@@ -16,7 +16,7 @@ Column {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Output Device"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -44,7 +44,7 @@ Column {
color: Theme.primary
}
Text {
StyledText {
text: "Current: " + (root.currentSinkDisplayName || "None")
font.pixelSize: Theme.fontSizeMedium
color: Theme.primary
@@ -101,14 +101,14 @@ Column {
spacing: 2
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: AudioService.displayName(modelData)
font.pixelSize: Theme.fontSizeMedium
color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
font.weight: modelData === AudioService.sink ? Font.Medium : Font.Normal
}
Text {
StyledText {
text: {
if (AudioService.subtitle(modelData.name) && AudioService.subtitle(modelData.name) !== "")
return AudioService.subtitle(modelData.name) + (modelData === AudioService.sink ? " • Selected" : "");

View File

@@ -16,7 +16,7 @@ Column {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Input Device"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -44,7 +44,7 @@ Column {
color: Theme.primary
}
Text {
StyledText {
text: "Current: " + (root.currentSourceDisplayName || "None")
font.pixelSize: Theme.fontSizeMedium
color: Theme.primary
@@ -99,14 +99,14 @@ Column {
spacing: 2
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: AudioService.displayName(modelData)
font.pixelSize: Theme.fontSizeMedium
color: modelData === AudioService.source ? Theme.primary : Theme.surfaceText
font.weight: modelData === AudioService.source ? Font.Medium : Font.Normal
}
Text {
StyledText {
text: {
if (AudioService.subtitle(modelData.name) && AudioService.subtitle(modelData.name) !== "")
return AudioService.subtitle(modelData.name) + (modelData === AudioService.source ? " • Selected" : "");

View File

@@ -16,7 +16,7 @@ Column {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Microphone Level"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -112,7 +112,7 @@ Column {
visible: (micMouseArea.containsMouse && !root.micMuted) || micMouseArea.isDragging
opacity: visible ? 1 : 0
Text {
StyledText {
id: tooltipText
text: Math.round(root.micLevel) + "%"
font.pixelSize: Theme.fontSizeSmall

View File

@@ -12,7 +12,7 @@ Column {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Volume"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText

View File

@@ -19,7 +19,7 @@ Column {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Available Devices"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -52,7 +52,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
id: scanText
text: BluetoothService.adapter && BluetoothService.adapter.discovering ? "Stop Scanning" : "Scan"
@@ -103,7 +103,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Pairing Limitation"
font.pixelSize: Theme.fontSizeMedium
color: Theme.warning
@@ -112,7 +112,7 @@ Column {
}
}
Text {
StyledText {
text: "Quickshell does not support pairing devices that require pin or confirmation."
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.8)
@@ -188,7 +188,7 @@ Column {
spacing: 2
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: modelData.name || modelData.deviceName
font.pixelSize: Theme.fontSizeMedium
color: {
@@ -209,7 +209,7 @@ Column {
Row {
spacing: Theme.spacingS
Text {
StyledText {
text: {
if (modelData.pairing)
return "Pairing...";
@@ -236,7 +236,7 @@ Column {
visible: modelData.signalStrength !== undefined && modelData.signalStrength > 0 && !modelData.pairing && !modelData.blocked
}
Text {
StyledText {
text: (modelData.signalStrength !== undefined && modelData.signalStrength > 0) ? modelData.signalStrength + "%" : ""
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
@@ -268,7 +268,7 @@ Column {
border.width: 1
opacity: canConnect || isBusy ? 1 : 0.5
Text {
StyledText {
anchors.centerIn: parent
text: {
if (modelData.pairing)
@@ -349,7 +349,7 @@ Column {
}
}
Text {
StyledText {
text: "Scanning for devices..."
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -358,7 +358,7 @@ Column {
}
}
Text {
StyledText {
text: "Make sure your device is in pairing mode"
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
@@ -366,7 +366,7 @@ Column {
}
}
Text {
StyledText {
text: "No devices found. Put your device in pairing mode and click Start Scanning."
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)

View File

@@ -84,7 +84,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: root.deviceData && root.deviceData.connected ? "Disconnect" : "Connect"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -153,7 +153,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Forget Device"
font.pixelSize: Theme.fontSizeSmall
color: forgetArea.containsMouse ? Theme.error : Theme.surfaceText

View File

@@ -35,14 +35,14 @@ Rectangle {
spacing: 2
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: "Bluetooth"
font.pixelSize: Theme.fontSizeLarge
color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceText
font.weight: Font.Medium
}
Text {
StyledText {
text: BluetoothService.adapter && BluetoothService.adapter.enabled ? "Enabled" : "Disabled"
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)

View File

@@ -17,7 +17,7 @@ Column {
spacing: Theme.spacingM
visible: BluetoothService.adapter && BluetoothService.adapter.enabled
Text {
StyledText {
text: "Paired Devices"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -54,7 +54,7 @@ Column {
spacing: 2
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: modelData.name || modelData.deviceName
font.pixelSize: Theme.fontSizeMedium
color: modelData.connected ? Theme.primary : Theme.surfaceText
@@ -64,13 +64,13 @@ Column {
Row {
spacing: Theme.spacingXS
Text {
StyledText {
text: BluetoothDeviceState.toString(modelData.state)
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
}
Text {
StyledText {
text: {
if (modelData.batteryAvailable && modelData.battery > 0)
return "• " + Math.round(modelData.battery * 100) + "%";

View File

@@ -214,14 +214,14 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingXS
Text {
StyledText {
text: UserInfoService.fullName || UserInfoService.username || "User"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
font.weight: Font.Medium
}
Text {
StyledText {
text: "Uptime: " + (UserInfoService.uptime || "Unknown")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
@@ -381,7 +381,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Logout"
font.pixelSize: Theme.fontSizeSmall
color: logoutButton.containsMouse ? Theme.warning : Theme.surfaceText
@@ -431,7 +431,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Restart"
font.pixelSize: Theme.fontSizeSmall
color: rebootButton.containsMouse ? Theme.warning : Theme.surfaceText
@@ -481,7 +481,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Suspend"
font.pixelSize: Theme.fontSizeSmall
color: suspendButton.containsMouse ? Theme.primary : Theme.surfaceText
@@ -531,7 +531,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Shutdown"
font.pixelSize: Theme.fontSizeSmall
color: shutdownButton.containsMouse ? Theme.error : Theme.surfaceText

View File

@@ -33,7 +33,7 @@ ScrollView {
spacing: Theme.spacingM
visible: BrightnessService.brightnessAvailable
Text {
StyledText {
text: "Brightness"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -58,7 +58,7 @@ ScrollView {
}
}
Text {
StyledText {
text: "using ddc - changes may take a moment to apply"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
@@ -73,7 +73,7 @@ ScrollView {
width: parent.width
spacing: Theme.spacingM
Text {
StyledText {
text: "Display Settings"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -105,7 +105,7 @@ ScrollView {
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
StyledText {
text: "Night Mode"
font.pixelSize: Theme.fontSizeMedium
color: Prefs.nightModeEnabled ? Theme.primary : Theme.surfaceText
@@ -156,7 +156,7 @@ ScrollView {
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
StyledText {
text: Theme.isLightMode ? "Light Mode" : "Dark Mode"
font.pixelSize: Theme.fontSizeMedium
color: Theme.isLightMode ? Theme.primary : Theme.surfaceText

View File

@@ -39,7 +39,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Ethernet"
font.pixelSize: Theme.fontSizeMedium
color: NetworkService.networkStatus === "ethernet" ? Theme.primary : Theme.surfaceText
@@ -49,7 +49,7 @@ Rectangle {
}
}
Text {
StyledText {
text: NetworkService.ethernetConnected ? (NetworkService.ethernetIP || "Connected") : "Disconnected"
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)

View File

@@ -60,7 +60,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: {
if (!NetworkService.wifiEnabled) {
return "WiFi is off";
@@ -78,7 +78,7 @@ Rectangle {
}
}
Text {
StyledText {
text: {
if (!NetworkService.wifiEnabled) {
return "Turn on WiFi to see networks";

View File

@@ -101,7 +101,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: wifiContextMenuWindow.networkData && wifiContextMenuWindow.networkData.connected ? "Disconnect" : "Connect"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -182,7 +182,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Forget Network"
font.pixelSize: Theme.fontSizeSmall
color: forgetWifiArea.containsMouse ? Theme.error : Theme.surfaceText
@@ -233,7 +233,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Network Info"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText

View File

@@ -37,7 +37,7 @@ Column {
width: parent.width
spacing: Theme.spacingS
Text {
StyledText {
text: "Available Networks"
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
@@ -150,7 +150,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
spacing: 2
Text {
StyledText {
width: parent.width
text: modelData.ssid
font.pixelSize: Theme.fontSizeSmall
@@ -159,7 +159,7 @@ Column {
elide: Text.ElideRight
}
Text {
StyledText {
width: parent.width
text: {
if (modelData.connected)

View File

@@ -167,7 +167,7 @@ Item {
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.3)
}
Text {
StyledText {
anchors.horizontalCenter: parent.horizontalCenter
text: "WiFi is turned off"
font.pixelSize: Theme.fontSizeLarge
@@ -175,7 +175,7 @@ Item {
font.weight: Font.Medium
}
Text {
StyledText {
anchors.horizontalCenter: parent.horizontalCenter
text: "Turn on WiFi to see networks"
font.pixelSize: Theme.fontSizeMedium

View File

@@ -69,7 +69,7 @@ PanelWindow {
Row {
width: parent.width
Text {
StyledText {
text: "Power Options"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
@@ -119,7 +119,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Log Out"
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
@@ -166,7 +166,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Suspend"
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
@@ -213,7 +213,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Reboot"
font.pixelSize: Theme.fontSizeMedium
color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
@@ -260,7 +260,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Power Off"
font.pixelSize: Theme.fontSizeMedium
color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText