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

- update readers update interval (moved to one list of intervals)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-10-23 15:12:05 +02:00
parent 86aaa57a21
commit e7a57ca64e
14 changed files with 130 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/Sensors/settings.swift
View File

@@ -15,15 +15,14 @@ import ModuleKit
internal class Settings: NSView, Settings_v {
private var unitsValue: String = "system"
private var updateIntervalValue: String = "3"
private let listOfUpdateIntervals: [String] = ["1", "2", "3", "5", "10", "15", "30"]
private var updateIntervalValue: Int = 3
private let title: String
private let store: UnsafePointer<Store>
private var button: NSPopUpButton?
private let list: UnsafeMutablePointer<[Sensor_t]>
public var callback: (() -> Void) = {}
public var setInterval: ((_ value: Double) -> Void) = {_ in }
public var setInterval: ((_ value: Int) -> Void) = {_ in }
public init(_ title: String, store: UnsafePointer<Store>, list: UnsafeMutablePointer<[Sensor_t]>) {
self.title = title
@@ -40,7 +39,7 @@ internal class Settings: NSView, Settings_v {
self.wantsLayer = true
self.canDrawConcurrently = true
self.updateIntervalValue = store.pointee.string(key: "\(self.title)_updateInterval", defaultValue: self.updateIntervalValue)
self.updateIntervalValue = store.pointee.int(key: "\(self.title)_updateInterval", defaultValue: self.updateIntervalValue)
self.unitsValue = store.pointee.string(key: "temperature_units", defaultValue: self.unitsValue)
}
@@ -77,7 +76,7 @@ internal class Settings: NSView, Settings_v {
frame: NSRect(x: Constants.Settings.margin, y: height - rowHeight, width: view.frame.width, height: rowHeight),
title: LocalizedString("Update interval"),
action: #selector(changeUpdateInterval),
items: self.listOfUpdateIntervals.map{ "\($0) sec" },
items: ReaderUpdateIntervals.map{ "\($0) sec" },
selected: "\(self.updateIntervalValue) sec"
))
@@ -145,11 +144,9 @@ internal class Settings: NSView, Settings_v {
}
@objc private func changeUpdateInterval(_ sender: NSMenuItem) {
let newUpdateInterval = sender.title.replacingOccurrences(of: " sec", with: "")
self.updateIntervalValue = newUpdateInterval
store.pointee.set(key: "\(self.title)_updateInterval", value: self.updateIntervalValue)
if let value = Double(self.updateIntervalValue) {
if let value = Int(sender.title.replacingOccurrences(of: " sec", with: "")) {
self.updateIntervalValue = value
self.store.pointee.set(key: "\(self.title)_updateInterval", value: value)
self.setInterval(value)
}
}