diff --git a/Kit/types.swift b/Kit/types.swift index cb07c290..e532633b 100644 --- a/Kit/types.swift +++ b/Kit/types.swift @@ -140,7 +140,16 @@ public let ShortLong: [KeyValue_t] = [ KeyValue_t(key: "long", value: "Long") ] -public let ReaderUpdateIntervals: [Int] = [1, 2, 3, 5, 10, 15, 30, 60] +public let ReaderUpdateIntervals: [KeyValue_t] = [ + KeyValue_t(key: "1", value: "1 sec"), + KeyValue_t(key: "2", value: "2 sec"), + KeyValue_t(key: "3", value: "3 sec"), + KeyValue_t(key: "5", value: "5 sec"), + KeyValue_t(key: "10", value: "10 sec"), + KeyValue_t(key: "15", value: "15 sec"), + KeyValue_t(key: "30", value: "30 sec"), + KeyValue_t(key: "60", value: "60 sec") +] public let NumbersOfProcesses: [Int] = [0, 3, 5, 8, 10, 15] public let NetworkReaders: [KeyValue_t] = [ diff --git a/Modules/CPU/settings.swift b/Modules/CPU/settings.swift index 790d2e4e..214edfdf 100644 --- a/Modules/CPU/settings.swift +++ b/Modules/CPU/settings.swift @@ -76,13 +76,13 @@ internal class Settings: NSStackView, Settings_v { 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateIntervalValue)" )), 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateTopIntervalValue)" )) ])) diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift index 35a0e6ca..e4a0e1d0 100644 --- a/Modules/Disk/main.swift +++ b/Modules/Disk/main.swift @@ -285,9 +285,6 @@ public class Disk: Module { switch w.item { case let widget as SpeedWidget: widget.setValue(upload: d.activity.write, download: d.activity.read) - if self.capacityReader?.interval != 1 { - self.settingsView.setUpdateInterval(value: 1) - } case let widget as NetworkChart: widget.setValue(upload: Double(d.activity.write), download: Double(d.activity.read)) if self.capacityReader?.interval != 1 { diff --git a/Modules/Disk/settings.swift b/Modules/Disk/settings.swift index 7ff6d482..da48bcc0 100644 --- a/Modules/Disk/settings.swift +++ b/Modules/Disk/settings.swift @@ -55,8 +55,8 @@ internal class Settings: NSStackView, Settings_v { 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateIntervalValue)" )) ])) diff --git a/Modules/GPU/settings.swift b/Modules/GPU/settings.swift index 1df1ffb6..37e5184d 100644 --- a/Modules/GPU/settings.swift +++ b/Modules/GPU/settings.swift @@ -50,8 +50,8 @@ internal class Settings: NSStackView, Settings_v { 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateIntervalValue)" )) ])) diff --git a/Modules/RAM/settings.swift b/Modules/RAM/settings.swift index 920acd8c..fd90abf7 100644 --- a/Modules/RAM/settings.swift +++ b/Modules/RAM/settings.swift @@ -51,13 +51,13 @@ internal class Settings: NSStackView, Settings_v { 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateIntervalValue)" )), 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateTopIntervalValue)" )) ])) diff --git a/Modules/Sensors/settings.swift b/Modules/Sensors/settings.swift index 55a4d11d..f1bc1dee 100644 --- a/Modules/Sensors/settings.swift +++ b/Modules/Sensors/settings.swift @@ -47,8 +47,8 @@ internal class Settings: NSStackView, Settings_v { 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" + items: ReaderUpdateIntervals, + selected: "\(self.updateIntervalValue)" )) ]))