feat: added Widget activation threshold option to the Network module (#931)

2026-04-14 00:04:15 +09:00 · 2022-09-03 13:32:01 +02:00
parent 4dbf23b48b
commit 28a1b1987b
33 changed files with 124 additions and 7 deletions
--- a/Kit/module/settings.swift
+++ b/Kit/module/settings.swift
@@ -164,16 +164,19 @@ open class Settings: NSStackView, Settings_p {
    // MARK: - views
    
    private func settings() -> NSView {
-        let view: NSTabView = NSTabView()
-        view.widthAnchor.constraint(equalToConstant: Constants.Settings.width - Constants.Settings.margin*2).isActive = true
-        view.heightAnchor.constraint(equalToConstant: Constants.Settings.height - 40 - Constants.Widget.height - (Constants.Settings.margin*5)).isActive = true
+        let view: NSTabView = NSTabView(frame: NSRect(x: 0, y: 0,
+            width: Constants.Settings.width - Constants.Settings.margin*2,
+            height: Constants.Settings.height - 40 - Constants.Widget.height - (Constants.Settings.margin*5)
+        ))
+        view.widthAnchor.constraint(equalToConstant: view.frame.width).isActive = true
+        view.heightAnchor.constraint(equalToConstant: view.frame.height).isActive = true
        view.tabViewType = .topTabsBezelBorder
        view.tabViewBorderType = .line
        
        let moduleTab: NSTabViewItem = NSTabViewItem()
        moduleTab.label = localizedString("Module settings")
        moduleTab.view = {
-            let view = ScrollableStackView()
+            let view = ScrollableStackView(frame: view.frame)
            self.moduleSettingsContainer = view.stackView
            self.loadModuleSettings()
            return view
@@ -182,7 +185,7 @@ open class Settings: NSStackView, Settings_p {
        let widgetTab: NSTabViewItem = NSTabViewItem()
        widgetTab.label = localizedString("Widget settings")
        widgetTab.view = {
-            let view = ScrollableStackView()
+            let view = ScrollableStackView(frame: view.frame)
            view.stackView.spacing = 0
            self.widgetSettingsContainer = view.stackView
            self.loadWidgetSettings()
--- a/Modules/Net/main.swift
+++ b/Modules/Net/main.swift
@@ -109,6 +109,12 @@ public class Network: Module {
    private let ipUpdater = NSBackgroundActivityScheduler(identifier: "eu.exelban.Stats.Network.IP")
    private let usageReseter = NSBackgroundActivityScheduler(identifier: "eu.exelban.Stats.Network.Usage")
    
+    private var widgetActivationThreshold: Int {
+        get {
+            return Store.shared.int(key: "\(self.config.name)_widgetActivationThreshold", defaultValue: 0)
+        }
+    }
+    
    public init() {
        self.settingsView = Settings("Network")
        self.popupView = Popup("Network")
@@ -178,10 +184,19 @@ public class Network: Module {
        
        self.popupView.usageCallback(value)
        
+        var upload = value.bandwidth.upload
+        var download = value.bandwidth.download
+        let activationValue = Units(bytes: min(upload, download)).kilobytes
+        
+        if Double(self.widgetActivationThreshold) > activationValue {
+            upload = 0
+            download = 0
+        }
+        
        self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: Widget) in
            switch w.item {
-            case let widget as SpeedWidget: widget.setValue(upload: value.bandwidth.upload, download: value.bandwidth.download)
-            case let widget as NetworkChart: widget.setValue(upload: Double(value.bandwidth.upload), download: Double(value.bandwidth.download))
+            case let widget as SpeedWidget: widget.setValue(upload: upload, download: download)
+            case let widget as NetworkChart: widget.setValue(upload: Double(upload), download: Double(download))
            default: break
            }
        }
--- a/Modules/Net/settings.swift
+++ b/Modules/Net/settings.swift
@@ -18,6 +18,7 @@ internal class Settings: NSStackView, Settings_v {
    private var readerType: String = "interface"
    private var usageReset: String = AppUpdateInterval.atStart.rawValue
    private var VPNModeState: Bool = false
+    private var widgetActivationThreshold: Int = 0
    
    public var callback: (() -> Void) = {}
    public var callbackWhenUpdateNumberOfProcesses: (() -> Void) = {}
@@ -25,6 +26,7 @@ internal class Settings: NSStackView, Settings_v {
    
    private let title: String
    private var button: NSPopUpButton?
+    private var valueField: NSTextField?
    
    private var list: [Network_interface] = []
    
@@ -41,6 +43,7 @@ internal class Settings: NSStackView, Settings_v {
        self.readerType = Store.shared.string(key: "\(self.title)_reader", defaultValue: self.readerType)
        self.usageReset = Store.shared.string(key: "\(self.title)_usageReset", defaultValue: self.usageReset)
        self.VPNModeState = Store.shared.bool(key: "\(self.title)_VPNMode", defaultValue: self.VPNModeState)
+        self.widgetActivationThreshold = Store.shared.int(key: "\(self.title)_widgetActivationThreshold", defaultValue: self.widgetActivationThreshold)
        
        super.init(frame: NSRect(x: 0, y: 0, width: 0, height: 0))
        
@@ -69,6 +72,8 @@ internal class Settings: NSStackView, Settings_v {
    public func load(widgets: [widget_t]) {
        self.subviews.forEach{ $0.removeFromSuperview() }
        
+        self.addArrangedSubview(self.activationSlider())
+        
        self.addArrangedSubview(selectSettingsRowV1(
            title: localizedString("Number of top processes"),
            action: #selector(changeNumberOfProcesses),
@@ -151,6 +156,57 @@ internal class Settings: NSStackView, Settings_v {
        return view
    }
    
+    func activationSlider() -> NSView {
+        let view: NSStackView = NSStackView()
+        view.translatesAutoresizingMaskIntoConstraints = false
+        view.heightAnchor.constraint(equalToConstant: Constants.Settings.row * 1.5).isActive = true
+        view.orientation = .horizontal
+        view.alignment = .centerY
+        view.distribution = .fill
+        view.spacing = 0
+        
+        let titleField: NSTextField = LabelField(frame: NSRect(x: 0, y: 0, width: 0, height: 0), localizedString("Widget activation threshold"))
+        titleField.font = NSFont.systemFont(ofSize: 12, weight: .regular)
+        titleField.textColor = .textColor
+        
+        let container = NSStackView()
+        container.spacing = 0
+        container.orientation = .vertical
+        container.alignment = .centerX
+        container.distribution = .fillEqually
+        
+        var value = localizedString("Disabled")
+        if self.widgetActivationThreshold != 0 {
+            value = "\(self.widgetActivationThreshold) KB"
+        }
+        
+        let valueField: NSTextField = LabelField(frame: NSRect(x: 0, y: 0, width: 0, height: 0), value)
+        valueField.font = NSFont.systemFont(ofSize: 12, weight: .regular)
+        valueField.textColor = .textColor
+        self.valueField = valueField
+        
+        let slider = NSSlider()
+        slider.minValue = 0
+        slider.maxValue = 1024
+        slider.doubleValue = Double(self.widgetActivationThreshold)
+        slider.target = self
+        slider.isContinuous = true
+        slider.action = #selector(self.sliderCallback)
+        slider.sizeToFit()
+        
+        container.addArrangedSubview(valueField)
+        container.addArrangedSubview(slider)
+        
+        view.addArrangedSubview(titleField)
+        view.addArrangedSubview(NSView())
+        view.addArrangedSubview(container)
+        
+        container.widthAnchor.constraint(equalToConstant: 180).isActive = true
+        container.heightAnchor.constraint(equalTo: view.heightAnchor).isActive = true
+        
+        return view
+    }
+    
    @objc func handleSelection(_ sender: NSPopUpButton) {
        guard let item = sender.selectedItem, let id = item.identifier?.rawValue else { return }
        
@@ -204,4 +260,17 @@ internal class Settings: NSStackView, Settings_v {
        self.VPNModeState = state! == .on ? true : false
        Store.shared.set(key: "\(self.title)_VPNMode", value: self.VPNModeState)
    }
+    
+    @objc private func sliderCallback(_ sender: NSSlider) {
+        guard let valueField = self.valueField else { return }
+        
+        let value = Int(sender.doubleValue)
+        if value == 0 {
+            valueField.stringValue = localizedString("Disabled")
+        } else {
+            valueField.stringValue = "\(value) KB"
+        }
+        self.widgetActivationThreshold = value
+        Store.shared.set(key: "\(self.title)_widgetActivationThreshold", value: widgetActivationThreshold)
+    }
 }
--- a/Files/bg.lproj/Localizable.strings
+++ b/Files/bg.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Ниво";
--- a/Files/ca.lproj/Localizable.strings
+++ b/Files/ca.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nivell";
--- a/Files/cs.lproj/Localizable.strings
+++ b/Files/cs.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kanál";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Úroveň";
--- a/Files/da.lproj/Localizable.strings
+++ b/Files/da.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Niveau";
--- a/Files/de.lproj/Localizable.strings
+++ b/Files/de.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Ladezustand";
--- a/Files/el.lproj/Localizable.strings
+++ b/Files/el.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Κανάλι";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Επίπεδο";
--- a/Files/en.lproj/Localizable.strings
+++ b/Files/en.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Level";
--- a/Files/es.lproj/Localizable.strings
+++ b/Files/es.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nivel";
--- a/Files/fr.lproj/Localizable.strings
+++ b/Files/fr.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Niveau";
--- a/Files/he.lproj/Localizable.strings
+++ b/Files/he.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "רמה";
--- a/Files/hr.lproj/Localizable.strings
+++ b/Files/hr.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kanal";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Stanje";
--- a/Files/hu.lproj/Localizable.strings
+++ b/Files/hu.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Csatorna";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Töltöttségi szint";
--- a/Files/id.lproj/Localizable.strings
+++ b/Files/id.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Level";
--- a/Files/it.lproj/Localizable.strings
+++ b/Files/it.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Livello";
--- a/Files/ja.lproj/Localizable.strings
+++ b/Files/ja.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "充電残量";
--- a/Files/ko.lproj/Localizable.strings
+++ b/Files/ko.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "채널";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "잔량";
--- a/Files/nb.lproj/Localizable.strings
+++ b/Files/nb.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nivå";
--- a/Files/nl.lproj/Localizable.strings
+++ b/Files/nl.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Niveau";
--- a/Files/pl.lproj/Localizable.strings
+++ b/Files/pl.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kanał";
 "Common scale" = "Wspólna skala";
 "Autodetection" = "Autodetekcja";
+"Widget activation threshold" = "Próg aktywacji widżetu";

 // Battery
 "Level" = "Poziom naładowania";
--- a/Files/pt-BR.lproj/Localizable.strings
+++ b/Files/pt-BR.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nível";
--- a/Files/pt-PT.lproj/Localizable.strings
+++ b/Files/pt-PT.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nível";
--- a/Files/ro.lproj/Localizable.strings
+++ b/Files/ro.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nivel";
--- a/Files/ru.lproj/Localizable.strings
+++ b/Files/ru.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Канал";
 "Common scale" = "Общий масштаб";
 "Autodetection" = "Автоопределение";
+"Widget activation threshold" = "Порог активации виджета";

 // Battery
 "Level" = "Уровень заряда";
--- a/Files/sl.lproj/Localizable.strings
+++ b/Files/sl.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kanal";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Raven";
--- a/Files/sv.lproj/Localizable.strings
+++ b/Files/sv.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kanal";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Nivå";
--- a/Files/tr.lproj/Localizable.strings
+++ b/Files/tr.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Channel";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Doluluk";
--- a/Files/uk.lproj/Localizable.strings
+++ b/Files/uk.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Канал";
 "Common scale" = "Загальна шкала";
 "Autodetection" = "Автовизначення";
+"Widget activation threshold" = "Поріг активації віджета";

 // Battery
 "Level" = "Рівень заряду";
--- a/Files/vi.lproj/Localizable.strings
+++ b/Files/vi.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "Kênh";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "Dung lượng Pin";
--- a/Files/zh-Hans.lproj/Localizable.strings
+++ b/Files/zh-Hans.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "频道";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "电量";
--- a/Files/zh-Hant.lproj/Localizable.strings
+++ b/Files/zh-Hant.lproj/Localizable.strings
@@ -285,6 +285,7 @@
 "Channel" = "通道";
 "Common scale" = "Common scale";
 "Autodetection" = "Autodetection";
+"Widget activation threshold" = "Widget activation threshold";

 // Battery
 "Level" = "電量";