- change default widget mode for CPU. Now in bar chart will be total CPU usage, not per core)

- add option to switch between usage per core and total usage for CPU in bar chart widget

Modules/CPU/main.swift

@@ -37,8 +37,16 @@ public class CPU: Module {
     
     private var loadReader: LoadReader? = nil
     private let smc: UnsafePointer<SMCService>?
+    private let store: UnsafePointer<Store>
+    
+    private var usagePerCoreState: Bool {
+        get {
+            return self.store.pointee.bool(key: "\(self.config.name)_usagePerCore", defaultValue: false)
+        }
+    }
     
     public init(_ store: UnsafePointer<Store>, _ smc: UnsafePointer<SMCService>) {
+        self.store = store
         self.smc = smc
         self.settingsView = Settings("CPU", store: store)
         
@@ -86,7 +94,7 @@ public class CPU: Module {
             widget.setValue(value!.totalUsage)
         }
         if let widget = self.widget as? BarChart {
-            widget.setValue(value!.usagePerCore)
+            widget.setValue(self.usagePerCoreState ? value!.usagePerCore : [value!.totalUsage])
         }
     }
 }

Modules/CPU/settings.swift

@@ -14,6 +14,7 @@ import StatsKit
 import ModuleKit
 
 internal class Settings: NSView, Settings_v {
+    private var usagePerCoreState: Bool = false
     private var hyperthreadState: Bool = false
     private var updateIntervalValue: String = "1"
     private let listOfUpdateIntervals: [String] = ["1", "2", "3", "5", "10", "15", "30"]
@@ -24,11 +25,17 @@ internal class Settings: NSView, Settings_v {
     public var callback: (() -> Void) = {}
     public var setInterval: ((_ value: Double) -> Void) = {_ in }
     
+    private var hyperthreadView: NSView? = nil
+    
     public init(_ title: String, store: UnsafePointer<Store>) {
         self.title = title
         self.store = store
         self.hyperthreadState = store.pointee.bool(key: "\(self.title)_hyperhreading", defaultValue: self.hyperthreadState)
+        self.usagePerCoreState = store.pointee.bool(key: "\(self.title)_usagePerCore", defaultValue: self.usagePerCoreState)
         self.updateIntervalValue = store.pointee.string(key: "\(self.title)_updateInterval", defaultValue: self.updateIntervalValue)
+        if !self.usagePerCoreState {
+            self.hyperthreadState = false
+        }
         
         super.init(frame: CGRect(
             x: Constants.Settings.margin,
@@ -49,7 +56,7 @@ internal class Settings: NSView, Settings_v {
         self.subviews.forEach{ $0.removeFromSuperview() }
         
         let rowHeight: CGFloat = 30
-        let num: CGFloat = widget == .barChart ? 1 : 0
+        let num: CGFloat = widget == .barChart ? 2 : 0
         
         self.addSubview(SelectTitleRow(
             frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * num, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
@@ -61,11 +68,23 @@ internal class Settings: NSView, Settings_v {
         
         if widget == .barChart {
             self.addSubview(ToggleTitleRow(
+                frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * 1, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
+                title: "Show usage per core",
+                action: #selector(toggleUsagePerCore),
+                state: self.usagePerCoreState
+            ))
+            
+            self.hyperthreadView = ToggleTitleRow(
                 frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * 0, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight),
                 title: "Show hyper-threading cores",
                 action: #selector(toggleMultithreading),
                 state: self.hyperthreadState
-            ))
+            )
+            if !self.usagePerCoreState {
+                FindAndToggleEnableNSControlState(self.hyperthreadView, state: false)
+                FindAndToggleNSControlState(self.hyperthreadView, state: .off)
+            }
+            self.addSubview(self.hyperthreadView!)
         }
         
         self.setFrameSize(NSSize(width: self.frame.width, height: (rowHeight*(num+1)) + (Constants.Settings.margin*(2+num))))
@@ -81,6 +100,26 @@ internal class Settings: NSView, Settings_v {
         }
     }
     
+    @objc func toggleUsagePerCore(_ sender: NSControl) {
+        var state: NSControl.StateValue? = nil
+        if #available(OSX 10.15, *) {
+            state = sender is NSSwitch ? (sender as! NSSwitch).state: nil
+        } else {
+            state = sender is NSButton ? (sender as! NSButton).state: nil
+        }
+        
+        self.usagePerCoreState = state! == .on ? true : false
+        self.store.pointee.set(key: "\(self.title)_usagePerCore", value: self.usagePerCoreState)
+        self.callback()
+        
+        FindAndToggleEnableNSControlState(self.hyperthreadView, state: self.usagePerCoreState)
+        if !self.usagePerCoreState {
+            self.hyperthreadState = false
+            self.store.pointee.set(key: "\(self.title)_hyperhreading", value: self.hyperthreadState)
+            FindAndToggleNSControlState(self.hyperthreadView, state: .off)
+        }
+    }
+    
     @objc func toggleMultithreading(_ sender: NSControl) {
         var state: NSControl.StateValue? = nil
         if #available(OSX 10.15, *) {

StatsKit/extensions.swift

@@ -621,6 +621,12 @@ public func FindAndToggleNSControlState(_ view: NSView?, state: NSControl.StateV
     }
 }
 
+public func FindAndToggleEnableNSControlState(_ view: NSView?, state: Bool) {
+    if let control = view?.subviews.first(where: { $0 is NSControl }) {
+        ToggleEnableNSControlState(control as? NSControl, state: state)
+    }
+}
+
 public func ToggleNSControlState(_ control: NSControl?, state: NSControl.StateValue) {
     if #available(OSX 10.15, *) {
         if let checkbox = control as? NSSwitch {
@@ -633,6 +639,18 @@ public func ToggleNSControlState(_ control: NSControl?, state: NSControl.StateVa
     }
 }
 
+public func ToggleEnableNSControlState(_ control: NSControl?, state: Bool) {
+    if #available(OSX 10.15, *) {
+        if let checkbox = control as? NSSwitch {
+            checkbox.isEnabled = state
+        }
+    } else {
+        if let checkbox = control as? NSButton {
+            checkbox.isEnabled = state
+        }
+    }
+}
+
 public func dialogOKCancel(question: String, text: String) {
     let alert = NSAlert()
     alert.messageText = question