SystemMonitor: add % support for RAM usage
This commit is contained in:
parent
38928abab7
commit
b6166a2a7c
6 changed files with 19 additions and 5 deletions
|
|
@ -34,6 +34,8 @@ RowLayout {
|
||||||
readonly property bool showCpuTemp: (widgetSettings.showCpuTemp !== undefined) ? widgetSettings.showCpuTemp : widgetMetadata.showCpuTemp
|
readonly property bool showCpuTemp: (widgetSettings.showCpuTemp !== undefined) ? widgetSettings.showCpuTemp : widgetMetadata.showCpuTemp
|
||||||
readonly property bool showMemoryUsage: (widgetSettings.showMemoryUsage
|
readonly property bool showMemoryUsage: (widgetSettings.showMemoryUsage
|
||||||
!== undefined) ? widgetSettings.showMemoryUsage : widgetMetadata.showMemoryUsage
|
!== undefined) ? widgetSettings.showMemoryUsage : widgetMetadata.showMemoryUsage
|
||||||
|
readonly property bool showMemoryAsPercent: (widgetSettings.showMemoryAsPercent
|
||||||
|
!== undefined) ? widgetSettings.showMemoryAsPercent : widgetMetadata.showMemoryAsPercent
|
||||||
readonly property bool showNetworkStats: (widgetSettings.showNetworkStats
|
readonly property bool showNetworkStats: (widgetSettings.showNetworkStats
|
||||||
!== undefined) ? widgetSettings.showNetworkStats : widgetMetadata.showNetworkStats
|
!== undefined) ? widgetSettings.showNetworkStats : widgetMetadata.showNetworkStats
|
||||||
|
|
||||||
|
|
@ -117,7 +119,7 @@ RowLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NText {
|
||||||
text: `${SystemStatService.memGb}G`
|
text: showMemoryAsPercent ? `${SystemStatService.memPercent}%` : `${SystemStatService.memGb}G`
|
||||||
font.family: Settings.data.ui.fontFixed
|
font.family: Settings.data.ui.fontFixed
|
||||||
font.pointSize: Style.fontSizeS * scaling
|
font.pointSize: Style.fontSizeS * scaling
|
||||||
font.weight: Style.fontWeightMedium
|
font.weight: Style.fontWeightMedium
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ ColumnLayout {
|
||||||
property bool valueShowCpuUsage: widgetData.showCpuUsage !== undefined ? widgetData.showCpuUsage : widgetMetadata.showCpuUsage
|
property bool valueShowCpuUsage: widgetData.showCpuUsage !== undefined ? widgetData.showCpuUsage : widgetMetadata.showCpuUsage
|
||||||
property bool valueShowCpuTemp: widgetData.showCpuTemp !== undefined ? widgetData.showCpuTemp : widgetMetadata.showCpuTemp
|
property bool valueShowCpuTemp: widgetData.showCpuTemp !== undefined ? widgetData.showCpuTemp : widgetMetadata.showCpuTemp
|
||||||
property bool valueShowMemoryUsage: widgetData.showMemoryUsage !== undefined ? widgetData.showMemoryUsage : widgetMetadata.showMemoryUsage
|
property bool valueShowMemoryUsage: widgetData.showMemoryUsage !== undefined ? widgetData.showMemoryUsage : widgetMetadata.showMemoryUsage
|
||||||
|
property bool valueShowMemoryAsPercent: widgetData.showMemoryAsPercent
|
||||||
|
!== undefined ? widgetData.showMemoryAsPercent : widgetMetadata.showMemoryAsPercent
|
||||||
property bool valueShowNetworkStats: widgetData.showNetworkStats
|
property bool valueShowNetworkStats: widgetData.showNetworkStats
|
||||||
!== undefined ? widgetData.showNetworkStats : widgetMetadata.showNetworkStats
|
!== undefined ? widgetData.showNetworkStats : widgetMetadata.showNetworkStats
|
||||||
|
|
||||||
|
|
@ -25,6 +27,7 @@ ColumnLayout {
|
||||||
settings.showCpuUsage = valueShowCpuUsage
|
settings.showCpuUsage = valueShowCpuUsage
|
||||||
settings.showCpuTemp = valueShowCpuTemp
|
settings.showCpuTemp = valueShowCpuTemp
|
||||||
settings.showMemoryUsage = valueShowMemoryUsage
|
settings.showMemoryUsage = valueShowMemoryUsage
|
||||||
|
settings.showMemoryAsPercent = valueShowMemoryAsPercent
|
||||||
settings.showNetworkStats = valueShowNetworkStats
|
settings.showNetworkStats = valueShowNetworkStats
|
||||||
return settings
|
return settings
|
||||||
}
|
}
|
||||||
|
|
@ -53,6 +56,14 @@ ColumnLayout {
|
||||||
onToggled: checked => valueShowMemoryUsage = checked
|
onToggled: checked => valueShowMemoryUsage = checked
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NToggle {
|
||||||
|
id: showMemoryAsPercent
|
||||||
|
Layout.fillWidth: true
|
||||||
|
label: "Show memory as percentage"
|
||||||
|
checked: valueShowMemoryAsPercent
|
||||||
|
onToggled: checked => valueShowMemoryAsPercent = checked
|
||||||
|
}
|
||||||
|
|
||||||
NToggle {
|
NToggle {
|
||||||
id: showNetworkStats
|
id: showNetworkStats
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,7 @@ Singleton {
|
||||||
"showCpuUsage": true,
|
"showCpuUsage": true,
|
||||||
"showCpuTemp": true,
|
"showCpuTemp": true,
|
||||||
"showMemoryUsage": true,
|
"showMemoryUsage": true,
|
||||||
|
"showMemoryAsPercent": false,
|
||||||
"showNetworkStats": false
|
"showNetworkStats": false
|
||||||
},
|
},
|
||||||
"Workspace": {
|
"Workspace": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue