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: added a new option to the Network module which allows to auto reset data usage (#542)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-09-16 18:56:43 +02:00
parent c3578b8791
commit e6ed7977ec
2 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Modules/Net/settings.swift
View File

@@ -13,12 +13,14 @@ import Cocoa
import Kit
import SystemConfiguration
internal class Settings: NSView, Settings_v {
internal class Settings: NSStackView, Settings_v {
private var numberOfProcesses: Int = 8
private var readerType: String = "interface"
private var usageReset: String = AppUpdateInterval.atStart.rawValue
public var callback: (() -> Void) = {}
public var callbackWhenUpdateNumberOfProcesses: (() -> Void) = {}
public var usageResetCallback: (() -> Void) = {}
private let title: String
private var button: NSPopUpButton?
@@ -29,13 +31,9 @@ internal class Settings: NSView, Settings_v {
self.title = title
self.numberOfProcesses = Store.shared.int(key: "\(self.title)_processes", defaultValue: self.numberOfProcesses)
self.readerType = Store.shared.string(key: "\(self.title)_reader", defaultValue: self.readerType)
self.usageReset = Store.shared.string(key: "\(self.title)_usageReset", defaultValue: self.usageReset)
super.init(frame: CGRect(
x: 0,
y: 0,
width: Constants.Settings.width - (Constants.Settings.margin*2),
height: 0
))
super.init(frame: NSRect(x: 0, y: 0, width: Constants.Settings.width - (Constants.Settings.margin*2), height: 0))
for interface in SCNetworkInterfaceCopyAll() as NSArray {
if let bsdName = SCNetworkInterfaceGetBSDName(interface as! SCNetworkInterface),
@@ -44,7 +42,15 @@ internal class Settings: NSView, Settings_v {
}
}
self.canDrawConcurrently = true
self.orientation = .vertical
self.distribution = .gravityAreas
self.edgeInsets = NSEdgeInsets(
top: Constants.Settings.margin,
left: Constants.Settings.margin,
bottom: Constants.Settings.margin,
right: Constants.Settings.margin
)
self.spacing = Constants.Settings.margin
}
required init?(coder: NSCoder) {
@@ -54,48 +60,48 @@ internal class Settings: NSView, Settings_v {
public func load(widgets: [widget_t]) {
self.subviews.forEach{ $0.removeFromSuperview() }
let rowHeight: CGFloat = 30
let num: CGFloat = 2
let width: CGFloat = self.frame.width - (Constants.Settings.margin*2)
self.addSubview(selectTitleRow(
frame: NSRect(
x: Constants.Settings.margin,
y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * 2,
width: self.frame.width - (Constants.Settings.margin*2),
height: 30
),
self.addArrangedSubview(selectTitleRow(
frame: NSRect(x: 0, y: 0, width: width, height: Constants.Settings.row),
title: localizedString("Number of top processes"),
action: #selector(changeNumberOfProcesses),
items: NumbersOfProcesses.map{ "\($0)" },
selected: "\(self.numberOfProcesses)"
))
self.addSubview(selectRow(
frame: NSRect(
x: Constants.Settings.margin,
y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * 1,
width: self.frame.width - (Constants.Settings.margin*2),
height: 30
),
self.addArrangedSubview(selectRow(
frame: NSRect(x: 0, y: 0, width: width, height: Constants.Settings.row),
title: localizedString("Reader type"),
action: #selector(changeReaderType),
items: NetworkReaders,
selected: self.readerType
))
self.addArrangedSubview(selectRow(
frame: NSRect(x: 0, y: 0, width: width, height: Constants.Settings.row),
title: localizedString("Reset data usage"),
action: #selector(toggleUsageReset),
items: AppUpdateIntervals.dropLast(2),
selected: self.usageReset
))
self.addInterfaceSelector()
self.setFrameSize(NSSize(width: self.frame.width, height: (rowHeight*(num+1)) + (Constants.Settings.margin*(2+num))))
let h = self.arrangedSubviews.map({ $0.bounds.height + self.spacing }).reduce(0, +) - self.spacing + self.edgeInsets.top + self.edgeInsets.bottom
if self.frame.size.height != h {
self.setFrameSize(NSSize(width: self.bounds.width, height: h))
}
}
private func addInterfaceSelector() {
let view: NSView = NSView(frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin, width: self.frame.width, height: 30))
let view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: 30))
let rowTitle: NSTextField = LabelField(frame: NSRect(x: 0, y: (view.frame.height - 16)/2, width: view.frame.width - 52, height: 17), localizedString("Network interface"))
rowTitle.font = NSFont.systemFont(ofSize: 13, weight: .light)
rowTitle.textColor = .textColor
self.button = NSPopUpButton(frame: NSRect(x: view.frame.width - 200 - Constants.Settings.margin*2, y: 0, width: 200, height: 30))
self.button = NSPopUpButton(frame: NSRect(x: view.frame.width - 200 - Constants.Settings.margin*2, y: 0, width: 200, height: 26))
self.button?.target = self
self.button?.action = #selector(self.handleSelection)
self.button?.isEnabled = self.readerType == "interface"
@@ -124,7 +130,7 @@ internal class Settings: NSView, Settings_v {
view.addSubview(rowTitle)
view.addSubview(self.button!)
self.addSubview(view)
self.addArrangedSubview(view)
}
@objc func handleSelection(_ sender: NSPopUpButton) {
@@ -157,4 +163,13 @@ internal class Settings: NSView, Settings_v {
Store.shared.set(key: "\(self.title)_reader", value: key)
self.button?.isEnabled = self.readerType == "interface"
}
@objc private func toggleUsageReset(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String else {
return
}
self.usageReset = key
Store.shared.set(key: "\(self.title)_usageReset", value: key)
self.usageResetCallback()
}
}