morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: moved all modules settings to the new design

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-04-24 06:10:27 +02:00
parent ab4dcbfd94
commit f873fdaa3d
36 changed files with 901 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
Modules/CPU/settings.swift
View File

@@ -31,10 +31,10 @@ internal class Settings: NSStackView, Settings_v {
public var setInterval: ((_ value: Int) -> Void) = {_ in }
public var setTopInterval: ((_ value: Int) -> Void) = {_ in }
private var hyperthreadView: NSView? = nil
private var splitValueView: NSView? = nil
private var usagePerCoreView: NSView? = nil
private var groupByClustersView: NSView? = nil
private var hyperthreadView: NSSwitch? = nil
private var splitValueView: NSSwitch? = nil
private var usagePerCoreView: NSSwitch? = nil
private var groupByClustersView: NSSwitch? = nil
public init(_ module: ModuleType) {
self.title = module.rawValue
@@ -56,12 +56,6 @@ internal class Settings: NSStackView, Settings_v {
self.orientation = .vertical
self.distribution = .gravityAreas
self.translatesAutoresizingMaskIntoConstraints = false
self.edgeInsets = NSEdgeInsets(
top: Constants.Settings.margin,
left: Constants.Settings.margin,
bottom: Constants.Settings.margin,
right: Constants.Settings.margin
)
self.spacing = Constants.Settings.margin
}
@@ -79,78 +73,79 @@ internal class Settings: NSStackView, Settings_v {
hasIPG = CFBundleCreate(kCFAllocatorDefault, bundleURL) != nil
#endif
self.addArrangedSubview(selectSettingsRowV1(
title: localizedString("Update interval"),
action: #selector(changeUpdateInterval),
items: ReaderUpdateIntervals.map{ "\($0) sec" },
selected: "\(self.updateIntervalValue) sec"
))
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Update interval"), component: selectView(
action: #selector(self.changeUpdateInterval),
items: ReaderUpdateIntervals.map{ KeyValue_t(key: "\($0)", value: "\($0) sec") },
selected: "\(self.updateIntervalValue) sec"
)),
PreferencesRow(localizedString("Update interval for top processes"), component: selectView(
action: #selector(self.changeUpdateTopInterval),
items: ReaderUpdateIntervals.map{ KeyValue_t(key: "\($0)", value: "\($0) sec") },
selected: "\(self.updateTopIntervalValue) sec"
))
]))
self.addArrangedSubview(selectSettingsRowV1(
title: localizedString("Update interval for top processes"),
action: #selector(changeUpdateTopInterval),
items: ReaderUpdateIntervals.map{ "\($0) sec" },
selected: "\(self.updateTopIntervalValue) sec"
))
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Number of top processes"), component: selectView(
action: #selector(self.changeNumberOfProcesses),
items: NumbersOfProcesses.map{ KeyValue_t(key: "\($0)", value: "\($0)") },
selected: "\(self.numberOfProcesses)"
))
]))
if !widgets.filter({ $0 == .barChart }).isEmpty {
self.usagePerCoreView = toggleSettingRow(
title: localizedString("Show usage per core"),
action: #selector(toggleUsagePerCore),
self.splitValueView = switchView(
action: #selector(self.toggleSplitValue),
state: self.splitValueState
)
self.usagePerCoreView = switchView(
action: #selector(self.toggleUsagePerCore),
state: self.usagePerCoreState
)
self.addArrangedSubview(self.usagePerCoreView!)
if self.usagePerCoreState || self.clustersGroupState {
self.splitValueView?.isEnabled = false
self.splitValueView?.state = .off
}
var rows: [PreferencesRow] = [
PreferencesRow(localizedString("Show usage per core"), component: self.usagePerCoreView!)
]
#if arch(arm64)
self.groupByClustersView = toggleSettingRow(
title: localizedString("Cluster grouping"),
action: #selector(toggleClustersGroup),
self.groupByClustersView = switchView(
action: #selector(self.toggleClustersGroup),
state: self.clustersGroupState
)
self.addArrangedSubview(self.groupByClustersView!)
rows.append(PreferencesRow(localizedString("Cluster grouping"), component: self.groupByClustersView!))
#endif
if self.hasHyperthreadingCores {
self.hyperthreadView = toggleSettingRow(
title: localizedString("Show hyper-threading cores"),
action: #selector(toggleMultithreading),
self.hyperthreadView = switchView(
action: #selector(self.toggleMultithreading),
state: self.hyperthreadState
)
if !self.usagePerCoreState {
findAndToggleEnableNSControlState(self.hyperthreadView, state: false)
findAndToggleNSControlState(self.hyperthreadView, state: .off)
self.hyperthreadView?.isEnabled = false
self.hyperthreadView?.state = .off
}
self.addArrangedSubview(self.hyperthreadView!)
rows.append(PreferencesRow(localizedString("Show hyper-threading cores"), component: self.hyperthreadView!))
}
rows.append(PreferencesRow(localizedString("Split the value (System/User)"), component: self.splitValueView!))
self.splitValueView = toggleSettingRow(
title: localizedString("Split the value (System/User)"),
action: #selector(toggleSplitValue),
state: self.splitValueState
)
if self.usagePerCoreState || self.clustersGroupState {
findAndToggleEnableNSControlState(self.splitValueView, state: false)
findAndToggleNSControlState(self.splitValueView, state: .off)
}
self.addArrangedSubview(self.splitValueView!)
self.addArrangedSubview(PreferencesSection(rows))
}
#if arch(x86_64)
if hasIPG {
self.addArrangedSubview(toggleSettingRow(
title: "\(localizedString("CPU frequency")) (IPG)",
action: #selector(toggleIPG),
state: self.IPGState
))
self.addArrangedSubview(PreferencesSection([
PreferencesRow("\(localizedString("CPU frequency")) (IPG)", component: switchView(
action: #selector(self.toggleIPG),
state: self.IPGState
))
]))
}
#endif
self.addArrangedSubview(selectSettingsRowV1(
title: localizedString("Number of top processes"),
action: #selector(changeNumberOfProcesses),
items: NumbersOfProcesses.map{ "\($0)" },
selected: "\(self.numberOfProcesses)"
))
}
@objc private func changeUpdateInterval(_ sender: NSMenuItem) {
@@ -189,23 +184,23 @@ internal class Settings: NSStackView, Settings_v {
Store.shared.set(key: "\(self.title)_usagePerCore", value: self.usagePerCoreState)
self.callback()
findAndToggleEnableNSControlState(self.hyperthreadView, state: self.usagePerCoreState)
findAndToggleEnableNSControlState(self.splitValueView, state: !(self.usagePerCoreState || self.clustersGroupState))
self.hyperthreadView?.isEnabled = self.usagePerCoreState
self.splitValueView?.isEnabled = !(self.usagePerCoreState || self.clustersGroupState)
if !self.usagePerCoreState {
self.hyperthreadState = false
Store.shared.set(key: "\(self.title)_hyperhreading", value: self.hyperthreadState)
findAndToggleNSControlState(self.hyperthreadView, state: .off)
self.hyperthreadView?.state = .off
} else {
self.splitValueState = false
Store.shared.set(key: "\(self.title)_splitValue", value: self.splitValueState)
findAndToggleNSControlState(self.splitValueView, state: .off)
self.splitValueView?.state = .off
}
if self.clustersGroupState && self.usagePerCoreState {
self.clustersGroupState = false
Store.shared.set(key: "\(self.title)_clustersGroup", value: self.clustersGroupState)
findAndToggleNSControlState(self.groupByClustersView, state: .off)
self.groupByClustersView?.state = .off
}
}
@@ -259,10 +254,10 @@ internal class Settings: NSStackView, Settings_v {
self.clustersGroupState = state! == .on ? true : false
Store.shared.set(key: "\(self.title)_clustersGroup", value: self.clustersGroupState)
findAndToggleEnableNSControlState(self.splitValueView, state: !(self.usagePerCoreState || self.clustersGroupState))
self.splitValueView?.isEnabled = !(self.usagePerCoreState || self.clustersGroupState)
if self.clustersGroupState && self.usagePerCoreState {
findAndToggleNSControlState(self.usagePerCoreView, state: .off)
self.usagePerCoreView?.state = .off
let toggle: NSSwitch = NSSwitch()
toggle.state = .off
self.toggleUsagePerCore(toggle)