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: moved all modules settings to the new design

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-04-24 06:10:27 +02:00
parent ab4dcbfd94
commit f873fdaa3d
36 changed files with 901 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/GPU/config.plist
View File

@@ -73,5 +73,12 @@
<integer>4</integer>
</dict>
</dict>
<key>Settings</key>
<dict>
<key>popup</key>
<false/>
<key>notifications</key>
<true/>
</dict>
</dict>
</plist>

13
Modules/GPU/notifications.swift
View File

@@ -27,12 +27,13 @@ class Notifications: NotificationsWrapper {
self.usageLevel = Store.shared.string(key: "\(self.module)_notifications_usage", defaultValue: self.usageLevel)
self.addArrangedSubview(selectSettingsRow(
title: localizedString("Usage"),
action: #selector(self.changeUsage),
items: notificationLevels,
selected: self.usageLevel
))
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Usage"), component: selectView(
action: #selector(self.changeUsage),
items: notificationLevels,
selected: self.usageLevel
))
]))
}
required init?(coder: NSCoder) {

95
Modules/GPU/settings.swift
View File

@@ -37,12 +37,6 @@ internal class Settings: NSStackView, Settings_v {
self.wantsLayer = 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
}
@@ -53,51 +47,33 @@ internal class Settings: NSStackView, Settings_v {
public func load(widgets: [widget_t]) {
self.subviews.forEach{ $0.removeFromSuperview() }
self.addArrangedSubview(selectSettingsRowV1(
title: localizedString("Update interval"),
action: #selector(changeUpdateInterval),
items: ReaderUpdateIntervals.map{ "\($0) sec" },
selected: "\(self.updateIntervalValue) sec"
))
if !widgets.filter({ $0 == .mini }).isEmpty {
self.addArrangedSubview(toggleSettingRow(
title: localizedString("Show GPU type"),
action: #selector(toggleShowType),
state: self.showTypeValue
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"
))
]))
#if arch(x86_64)
if !widgets.filter({ $0 == .mini }).isEmpty {
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Show GPU type"), component: switchView(
action: #selector(self.toggleShowType),
state: self.showTypeValue
))
]))
}
#endif
self.addGPUSelector()
}
private func addGPUSelector() {
let view: NSStackView = NSStackView()
view.translatesAutoresizingMaskIntoConstraints = false
view.heightAnchor.constraint(equalToConstant: Constants.Settings.row).isActive = true
view.orientation = .horizontal
view.alignment = .centerY
view.distribution = .fill
view.spacing = 0
let title: NSTextField = LabelField(frame: NSRect(x: 0, y: 0, width: 0, height: 17), localizedString("GPU to show"))
title.font = NSFont.systemFont(ofSize: 13, weight: .light)
title.textColor = .textColor
let container: NSGridView = NSGridView(frame: NSRect(x: 0, y: 0, width: view.frame.width - 100, height: 26))
container.yPlacement = .center
container.xPlacement = .trailing
let button = NSPopUpButton(frame: NSRect(x: 0, y: 0, width: 200, height: 30))
button.target = self
button.action = #selector(self.handleSelection)
self.button = button
container.addRow(with: [button])
view.addArrangedSubview(title)
view.addArrangedSubview(NSView())
view.addArrangedSubview(container)
self.addArrangedSubview(view)
self.button = selectView(
action: #selector(self.handleSelection),
items: [],
selected: ""
)
self.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("GPU to show"), component: self.button!)
]))
}
internal func setList(_ gpus: GPUs) {
@@ -108,10 +84,7 @@ internal class Settings: NSStackView, Settings_v {
gpus.active().forEach{ list.append(KeyValue_t(key: $0.model, value: $0.model)) }
DispatchQueue.main.async(execute: {
guard let button = self.button else {
return
}
guard let button = self.button else { return }
if button.menu?.items.count != list.count {
let menu = NSMenu()
@@ -141,26 +114,14 @@ internal class Settings: NSStackView, Settings_v {
self.setInterval(value)
}
}
@objc private func handleSelection(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String else {
return
}
guard let key = sender.representedObject as? String else { return }
self.selectedGPU = key
Store.shared.set(key: "\(self.title)_gpu", value: key)
self.selectedGPUHandler(key)
}
@objc func toggleShowType(_ sender: NSControl) {
var state: NSControl.StateValue? = nil
if #available(OSX 10.15, *) {
state = sender is NSSwitch ? (sender as! NSSwitch).state: nil
} else {
state = sender is NSButton ? (sender as! NSButton).state: nil
}
self.showTypeValue = state! == .on ? true : false
@objc private func toggleShowType(_ sender: NSControl) {
self.showTypeValue = controlState(sender)
Store.shared.set(key: "\(self.title)_showType", value: self.showTypeValue)
self.callback()
}