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

feat: moved network base setting to module from widget (#1635)

Browse Source 
Co-authored-by: Justin Harrell <justin@harrell.io>
This commit is contained in:
justinharrell
2023-10-21 12:28:58 -04:00
committed by GitHub
parent 021123968d
commit 24b29ccbfe
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Kit/Widgets/Speed.swift
View File

@@ -15,7 +15,6 @@ public class SpeedWidget: WidgetWrapper {
private var icon: String = "dots"
private var state: Bool = false
private var valueState: Bool = true
private var baseValue: String = "byte"
private var unitsState: Bool = true
private var monochromeState: Bool = false
private var valueColorState: Bool = false
@@ -58,6 +57,10 @@ public class SpeedWidget: WidgetWrapper {
}
}
private var base: DataSizeBase {
DataSizeBase(rawValue: Store.shared.string(key: "\(self.title)_base", defaultValue: "byte")) ?? .byte
}
public init(title: String, config: NSDictionary?, preview: Bool = false) {
let widgetTitle: String = title
if config != nil {
@@ -80,8 +83,7 @@ public class SpeedWidget: WidgetWrapper {
if !preview {
self.valueState = Store.shared.bool(key: "\(self.title)_\(self.type.rawValue)_value", defaultValue: self.valueState)
self.icon = Store.shared.string(key: "\(self.title)_\(self.type.rawValue)_icon", defaultValue: self.baseValue)
self.baseValue = Store.shared.string(key: "\(self.title)_base", defaultValue: self.baseValue)
self.icon = Store.shared.string(key: "\(self.title)_\(self.type.rawValue)_icon", defaultValue: self.icon)
self.unitsState = Store.shared.bool(key: "\(self.title)_\(self.type.rawValue)_units", defaultValue: self.unitsState)
self.monochromeState = Store.shared.bool(key: "\(self.title)_\(self.type.rawValue)_monochrome", defaultValue: self.monochromeState)
self.valueColorState = Store.shared.bool(key: "\(self.title)_\(self.type.rawValue)_valueColor", defaultValue: self.valueColorState)
@@ -186,7 +188,6 @@ public class SpeedWidget: WidgetWrapper {
NSAttributedString.Key.paragraphStyle: style
]
let base: DataSizeBase = DataSizeBase(rawValue: self.baseValue) ?? .byte
let rect = CGRect(x: offset.x, y: (height-size)/2 + offset.y + 1, width: rowWidth - (Constants.Widget.margin.x*2), height: size)
let value = NSAttributedString.init(
string: Units(bytes: value).getReadableSpeed(base: base, omitUnits: !self.unitsState),
@@ -299,7 +300,6 @@ public class SpeedWidget: WidgetWrapper {
NSAttributedString.Key.paragraphStyle: style
]
let base: DataSizeBase = DataSizeBase(rawValue: self.baseValue) ?? .byte
var rect = CGRect(x: Constants.Widget.margin.x + x, y: 1, width: rowWidth - (Constants.Widget.margin.x*2), height: rowHeight)
let download = NSAttributedString.init(
string: Units(bytes: self.downloadValue).getReadableSpeed(base: base, omitUnits: !self.unitsState),
@@ -424,13 +424,6 @@ public class SpeedWidget: WidgetWrapper {
view.addArrangedSubview(self.transparentIconView!)
findAndToggleEnableNSControlState(self.transparentIconView!, state: self.icon != "none")
view.addArrangedSubview(selectSettingsRow(
title: localizedString("Base"),
action: #selector(toggleBase),
items: SpeedBase,
selected: self.baseValue
))
view.addArrangedSubview(toggleSettingRow(
title: localizedString("Value"),
action: #selector(toggleValue),
@@ -513,12 +506,6 @@ public class SpeedWidget: WidgetWrapper {
self.display()
}
@objc private func toggleBase(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String else { return }
self.baseValue = key
Store.shared.set(key: "\(self.title)_base", value: self.baseValue)
}
@objc private func toggleMonochrome(_ sender: NSControl) {
self.monochromeState = controlState(sender)
Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_monochrome", value: self.monochromeState)

16
Modules/Net/settings.swift
View File

@@ -21,6 +21,7 @@ internal class Settings: NSStackView, Settings_v, NSTextFieldDelegate {
private var widgetActivationThreshold: Int = 0
private var ICMPHost: String = "1.1.1.1"
private var publicIPRefreshInterval: String = "never"
private var baseValue: String = "byte"
public var callback: (() -> Void) = {}
public var callbackWhenUpdateNumberOfProcesses: (() -> Void) = {}
@@ -50,6 +51,7 @@ internal class Settings: NSStackView, Settings_v, NSTextFieldDelegate {
self.widgetActivationThreshold = Store.shared.int(key: "\(self.title)_widgetActivationThreshold", defaultValue: self.widgetActivationThreshold)
self.ICMPHost = Store.shared.string(key: "\(self.title)_ICMPHost", defaultValue: self.ICMPHost)
self.publicIPRefreshInterval = Store.shared.string(key: "\(self.title)_publicIPRefreshInterval", defaultValue: self.publicIPRefreshInterval)
self.baseValue = Store.shared.string(key: "\(self.title)_base", defaultValue: self.baseValue)
super.init(frame: NSRect(x: 0, y: 0, width: 0, height: 0))
@@ -78,6 +80,13 @@ internal class Settings: NSStackView, Settings_v, NSTextFieldDelegate {
public func load(widgets: [widget_t]) {
self.subviews.forEach{ $0.removeFromSuperview() }
self.addArrangedSubview(selectSettingsRow(
title: localizedString("Base"),
action: #selector(toggleBase),
items: SpeedBase,
selected: self.baseValue
))
self.addArrangedSubview(self.activationSlider())
self.addArrangedSubview(selectSettingsRowV1(
@@ -124,6 +133,7 @@ internal class Settings: NSStackView, Settings_v, NSTextFieldDelegate {
placeholder: localizedString("Leave empty to disable the check"),
width: 220
))
}
private func interfaceSelector() -> NSView {
@@ -297,4 +307,10 @@ internal class Settings: NSStackView, Settings_v, NSTextFieldDelegate {
Store.shared.set(key: "\(self.title)_publicIPRefreshInterval", value: self.publicIPRefreshInterval)
self.publicIPRefreshIntervalCallback()
}
@objc private func toggleBase(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String else { return }
self.baseValue = key
Store.shared.set(key: "\(self.title)_base", value: self.baseValue)
}
}