diff --git a/applets/systemloadviewer/package/contents/config/main.xml b/applets/systemloadviewer/package/contents/config/main.xml --- a/applets/systemloadviewer/package/contents/config/main.xml +++ b/applets/systemloadviewer/package/contents/config/main.xml @@ -9,9 +9,6 @@ blue - - green - yellow diff --git a/applets/systemloadviewer/package/contents/ui/ColorSettings.qml b/applets/systemloadviewer/package/contents/ui/ColorSettings.qml --- a/applets/systemloadviewer/package/contents/ui/ColorSettings.qml +++ b/applets/systemloadviewer/package/contents/ui/ColorSettings.qml @@ -28,7 +28,6 @@ property alias cfg_memApplicationColor: memApplicationColorPicker.color property alias cfg_memBuffersColor: memBuffersColorPicker.color - property alias cfg_memCachedColor: memCachedColorPicker.color property alias cfg_cpuUserColor: cpuUserColorPicker.color property alias cfg_cpuIOWaitColor: cpuIOWaitColorPicker.color property alias cfg_cpuSysColor: cpuSysColorPicker.color @@ -116,15 +115,6 @@ id: memBuffersColorPicker } - Label { - text: i18nc("@label:chooser", "Cached:") - Layout.alignment: Qt.AlignRight - } - - KQuickControls.ColorButton { - id: memCachedColorPicker - } - Label { text: i18nc("@title:group", "Swap") Layout.columnSpan: 2 diff --git a/applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml b/applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml --- a/applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml +++ b/applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml @@ -48,11 +48,9 @@ theme.linkColor] property var memoryColors: setColorsManually ? [plasmoid.configuration.memApplicationColor, - plasmoid.configuration.memBuffersColor, - plasmoid.configuration.memCachedColor] + plasmoid.configuration.memBuffersColor] : [theme.buttonFocusColor, - theme.visitedLinkColor, - theme.highlightColor] + theme.visitedLinkColor] property var swapColors: setColorsManually ? [plasmoid.configuration.swapUsedColor] : [theme.highlightColor] @@ -139,7 +137,6 @@ property string memFree: memPhysical + "free" property string memApplication: memPhysical + "application" property string memBuffers: memPhysical + "buf" - property string memCached: memPhysical + "cached" property string memUsed: memPhysical + "used" property string swap: "mem/swap/" property string swapUsed: swap + "used" @@ -151,7 +148,7 @@ property var totalCpuLoadProportions: [.0, .0, .0, .0] property int maxCpuIndex: 0 - property var memoryUsageProportions: [.0, .0, .0] + property var memoryUsageProportions: [.0, .0] property double swapUsageProportion: .0 property var cacheUsageProportions: [.0, .0] @@ -162,7 +159,7 @@ function sources() { var array = [niceLoad, userLoad, sysLoad, ioWait, memFree, memApplication, memBuffers, - memCached, memUsed, swapUsed, swapFree, + memUsed, swapUsed, swapFree, averageClock, totalLoad, cores, cacheDirty, cacheWriteback] @@ -199,10 +196,6 @@ else if (sourceName == memBuffers) { memoryUsageProportions[1] = fitMemoryUsage(data.value) } - else if (sourceName == memCached) { - memoryUsageProportions[2] = fitMemoryUsage(data.value) - memoryUsageProportionsChanged() - } else if (sourceName == swapUsed) { swapUsageProportion = fitSwapUsage(data.value) swapUsageProportionChanged()