1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-25 05:52:50 -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

@@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls
import qs.Common
import qs.Services
import qs.Widgets
Column {
anchors.fill: parent
@@ -57,7 +58,7 @@ Column {
height: 32
spacing: Theme.spacingM
Text {
StyledText {
text: "CPU"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
@@ -72,7 +73,7 @@ Column {
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: SysMonitorService.totalCpuUsage.toFixed(1) + "%"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -87,7 +88,7 @@ Column {
height: 1
}
Text {
StyledText {
text: SysMonitorService.cpuCount + " cores"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
@@ -115,7 +116,7 @@ Column {
height: 20
spacing: Theme.spacingS
Text {
StyledText {
text: "C" + index
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
@@ -156,7 +157,7 @@ Column {
}
Text {
StyledText {
text: SysMonitorService.perCoreCpuUsage[index] ? SysMonitorService.perCoreCpuUsage[index].toFixed(0) + "%" : "0%"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -195,14 +196,14 @@ Column {
anchors.verticalCenter: parent.verticalCenter
spacing: 4
Text {
StyledText {
text: "Memory"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
}
Text {
StyledText {
text: SysMonitorService.formatSystemMemory(SysMonitorService.usedMemoryKB) + " / " + SysMonitorService.formatSystemMemory(SysMonitorService.totalMemoryKB)
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
@@ -252,7 +253,7 @@ Column {
}
Text {
StyledText {
text: SysMonitorService.totalMemoryKB > 0 ? ((SysMonitorService.usedMemoryKB / SysMonitorService.totalMemoryKB) * 100).toFixed(1) + "% used" : "No data"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -270,14 +271,14 @@ Column {
anchors.verticalCenter: parent.verticalCenter
spacing: 4
Text {
StyledText {
text: "Swap"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
}
Text {
StyledText {
text: SysMonitorService.totalSwapKB > 0 ?
SysMonitorService.formatSystemMemory(SysMonitorService.usedSwapKB) + " / " + SysMonitorService.formatSystemMemory(SysMonitorService.totalSwapKB) :
"No swap configured"
@@ -323,7 +324,7 @@ Column {
}
}
Text {
StyledText {
text: SysMonitorService.totalSwapKB > 0 ? ((SysMonitorService.usedSwapKB / SysMonitorService.totalSwapKB) * 100).toFixed(1) + "% used" : "Not available"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -353,7 +354,7 @@ Column {
anchors.centerIn: parent
spacing: Theme.spacingXS
Text {
StyledText {
text: "Network"
font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Bold
@@ -368,13 +369,13 @@ Column {
Row {
spacing: 4
Text {
StyledText {
text: "↓"
font.pixelSize: Theme.fontSizeSmall
color: Theme.info
}
Text {
StyledText {
text: SysMonitorService.networkRxRate > 0 ? formatNetworkSpeed(SysMonitorService.networkRxRate) : "0 B/s"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -386,13 +387,13 @@ Column {
Row {
spacing: 4
Text {
StyledText {
text: "↑"
font.pixelSize: Theme.fontSizeSmall
color: Theme.error
}
Text {
StyledText {
text: SysMonitorService.networkTxRate > 0 ? formatNetworkSpeed(SysMonitorService.networkTxRate) : "0 B/s"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -419,7 +420,7 @@ Column {
anchors.centerIn: parent
spacing: Theme.spacingXS
Text {
StyledText {
text: "Disk"
font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Bold
@@ -434,13 +435,13 @@ Column {
Row {
spacing: 4
Text {
StyledText {
text: "R"
font.pixelSize: Theme.fontSizeSmall
color: Theme.primary
}
Text {
StyledText {
text: formatDiskSpeed(SysMonitorService.diskReadRate)
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -452,13 +453,13 @@ Column {
Row {
spacing: 4
Text {
StyledText {
text: "W"
font.pixelSize: Theme.fontSizeSmall
color: Theme.warning
}
Text {
StyledText {
text: formatDiskSpeed(SysMonitorService.diskWriteRate)
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold

View File

@@ -4,6 +4,7 @@ import Quickshell
import Quickshell.Io
import qs.Common
import qs.Services
import qs.Widgets
Popup {
id: processContextMenu
@@ -80,7 +81,7 @@ Popup {
radius: Theme.cornerRadiusSmall
color: copyPidArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
Text {
StyledText {
anchors.left: parent.left
anchors.leftMargin: Theme.spacingS
anchors.verticalCenter: parent.verticalCenter
@@ -110,7 +111,7 @@ Popup {
radius: Theme.cornerRadiusSmall
color: copyNameArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
Text {
StyledText {
anchors.left: parent.left
anchors.leftMargin: Theme.spacingS
anchors.verticalCenter: parent.verticalCenter
@@ -157,7 +158,7 @@ Popup {
enabled: processContextMenu.processData
opacity: enabled ? 1 : 0.5
Text {
StyledText {
anchors.left: parent.left
anchors.leftMargin: Theme.spacingS
anchors.verticalCenter: parent.verticalCenter
@@ -190,7 +191,7 @@ Popup {
enabled: processContextMenu.processData && processContextMenu.processData.pid > 1000
opacity: enabled ? 1 : 0.5
Text {
StyledText {
anchors.left: parent.left
anchors.leftMargin: Theme.spacingS
anchors.verticalCenter: parent.verticalCenter

View File

@@ -65,9 +65,10 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: process ? process.displayName : ""
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: Font.Medium
color: Theme.surfaceText
width: 250
@@ -96,9 +97,10 @@ Rectangle {
anchors.rightMargin: 194
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: SysMonitorService.formatCpuUsage(process ? process.cpu : 0)
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: Font.Bold
color: {
if (process && process.cpu > 80)
@@ -133,9 +135,10 @@ Rectangle {
anchors.rightMargin: 102
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: SysMonitorService.formatMemoryUsage(process ? process.memoryKB : 0)
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: Font.Bold
color: {
if (process && process.memoryKB > 1024 * 1024)
@@ -151,9 +154,10 @@ Rectangle {
}
Text {
StyledText {
text: process ? process.pid.toString() : ""
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
color: Theme.surfaceText
opacity: 0.7
width: 50

View File

@@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls
import qs.Common
import qs.Services
import qs.Widgets
Column {
id: root
@@ -31,9 +32,10 @@ Column {
anchors.leftMargin: 0
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: "Process"
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: SysMonitorService.sortBy === "name" ? Font.Bold : Font.Medium
color: Theme.surfaceText
opacity: SysMonitorService.sortBy === "name" ? 1.0 : 0.7
@@ -66,9 +68,10 @@ Column {
anchors.rightMargin: 200
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: "CPU"
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: SysMonitorService.sortBy === "cpu" ? Font.Bold : Font.Medium
color: Theme.surfaceText
opacity: SysMonitorService.sortBy === "cpu" ? 1.0 : 0.7
@@ -101,9 +104,10 @@ Column {
anchors.rightMargin: 112
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: "RAM"
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: SysMonitorService.sortBy === "memory" ? Font.Bold : Font.Medium
color: Theme.surfaceText
opacity: SysMonitorService.sortBy === "memory" ? 1.0 : 0.7
@@ -136,9 +140,10 @@ Column {
anchors.rightMargin: 53
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: "PID"
font.pixelSize: Theme.fontSizeSmall
font.family: Prefs.monoFontFamily
font.weight: SysMonitorService.sortBy === "pid" ? Font.Bold : Font.Medium
color: Theme.surfaceText
opacity: SysMonitorService.sortBy === "pid" ? 1.0 : 0.7
@@ -172,7 +177,7 @@ Column {
anchors.rightMargin: 8
anchors.verticalCenter: parent.verticalCenter
Text {
StyledText {
text: SysMonitorService.sortDescending ? "↓" : "↑"
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText

View File

@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Services
import qs.Widgets
Row {
width: parent.width
@@ -44,7 +45,7 @@ Row {
anchors.verticalCenter: parent.verticalCenter
spacing: 2
Text {
StyledText {
text: "CPU"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -52,14 +53,14 @@ Row {
opacity: SysMonitorService.sortBy === "cpu" ? 1 : 0.8
}
Text {
StyledText {
text: SysMonitorService.totalCpuUsage.toFixed(1) + "%"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
}
Text {
StyledText {
text: SysMonitorService.cpuCount + " cores"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -114,7 +115,7 @@ Row {
anchors.verticalCenter: parent.verticalCenter
spacing: 2
Text {
StyledText {
text: "Memory"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -122,14 +123,14 @@ Row {
opacity: SysMonitorService.sortBy === "memory" ? 1 : 0.8
}
Text {
StyledText {
text: SysMonitorService.formatSystemMemory(SysMonitorService.usedMemoryKB)
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
}
Text {
StyledText {
text: "of " + SysMonitorService.formatSystemMemory(SysMonitorService.totalMemoryKB)
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -168,7 +169,7 @@ Row {
anchors.verticalCenter: parent.verticalCenter
spacing: 2
Text {
StyledText {
text: "Swap"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -176,14 +177,14 @@ Row {
opacity: 0.8
}
Text {
StyledText {
text: SysMonitorService.totalSwapKB > 0 ? SysMonitorService.formatSystemMemory(SysMonitorService.usedSwapKB) : "None"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
}
Text {
StyledText {
text: SysMonitorService.totalSwapKB > 0 ? "of " + SysMonitorService.formatSystemMemory(SysMonitorService.totalSwapKB) : "No swap configured"
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText

View File

@@ -51,26 +51,26 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
spacing: Theme.spacingS
Text {
StyledText {
text: SysMonitorService.hostname
font.pixelSize: Theme.fontSizeXLarge
font.weight: Font.Light
color: Theme.surfaceText
}
Text {
StyledText {
text: SysMonitorService.distribution + " • " + SysMonitorService.architecture + " • " + SysMonitorService.kernelVersion
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
}
Text {
StyledText {
text: "Up " + UserInfoService.uptime + " • Boot: " + SysMonitorService.bootTime
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
}
Text {
StyledText {
text: "Load: " + SysMonitorService.loadAverage + " • " + SysMonitorService.processCount + " processes, " + SysMonitorService.threadCount + " threads"
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
@@ -94,7 +94,7 @@ ScrollView {
width: (parent.width - Theme.spacingXL) / 2
spacing: Theme.spacingS
Text {
StyledText {
text: SysMonitorService.cpuModel
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -103,7 +103,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: SysMonitorService.motherboard
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -118,7 +118,7 @@ ScrollView {
width: (parent.width - Theme.spacingXL) / 2
spacing: Theme.spacingS
Text {
StyledText {
text: SysMonitorService.formatMemory(SysMonitorService.totalMemoryMB) + " Memory"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -127,7 +127,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "BIOS " + SysMonitorService.biosVersion
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
@@ -171,7 +171,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: "Storage & Disks"
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
@@ -191,7 +191,7 @@ ScrollView {
height: 24
spacing: Theme.spacingS
Text {
StyledText {
text: "Device"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -200,7 +200,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "Mount"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -209,7 +209,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "Size"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -218,7 +218,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "Used"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -227,7 +227,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "Available"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -236,7 +236,7 @@ ScrollView {
elide: Text.ElideRight
}
Text {
StyledText {
text: "Use%"
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Bold
@@ -269,7 +269,7 @@ ScrollView {
anchors.fill: parent
spacing: Theme.spacingS
Text {
StyledText {
text: modelData.device
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -278,7 +278,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: modelData.mount
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -287,7 +287,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: modelData.size
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -296,7 +296,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: modelData.used
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -305,7 +305,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: modelData.avail
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
@@ -314,7 +314,7 @@ ScrollView {
anchors.verticalCenter: parent.verticalCenter
}
Text {
StyledText {
text: modelData.percent
font.pixelSize: Theme.fontSizeSmall
color: {