Skip to content

Clarify menu bar labels #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbui merged 1 commit into from
Sep 10, 2026
Merged

Clarify menu bar labels #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Sources/cafectl/MenuBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ final class MenuBar: NSObject {
}
button.attributedTitle = NSAttributedString(string: image == nil ? "cafectl" : "")
button.imagePosition = image == nil ? .noImage : .imageOnly
statusItem.button?.toolTip = active.isEmpty ? "Sleep prevention off" :
"Prevent sleep: " + active.map { $0.rawValue.capitalized }.joined(separator: ", ")
statusItem.button?.toolTip = active.isEmpty ? "Keep awake off" :
"Keep awake: " + active.map { $0.rawValue.capitalized }.joined(separator: ", ")
commands.removeAll()
let menu = NSMenu()
menu.autoenablesItems = false
for mode in Mode.allCases {
guard let state = snapshot.modes[mode.rawValue] else { continue }
let name = mode.rawValue.capitalized
let toggle = item("Prevent \(mode.rawValue) sleep", command: .toggle(mode))
let toggle = item("Keep \(mode.rawValue) awake", command: .toggle(mode))
toggle.state = state.active ? .on : .off
toggle.image = NSImage(systemSymbolName: Self.symbol(mode), accessibilityDescription: name)
menu.addItem(toggle)
Expand All @@ -61,14 +61,14 @@ final class MenuBar: NSObject {
} else if let reason = state.blockedReason {
menu.addItem(label("\(state.automaticStart && !state.active ? "Waiting" : "Blocked"): \(reason)"))
}
let settings = NSMenuItem(title: "\(name) sleep options", action: nil, keyEquivalent: "")
let settings = NSMenuItem(title: "Automation options", action: nil, keyEquivalent: "")
let submenu = NSMenu()
submenu.autoenablesItems = false
let automatic = item("Enable automatically", command: .auto(mode, !state.automaticStart))
automatic.state = state.automaticStart ? .on : .off
submenu.addItem(automatic)
submenu.addItem(.separator())
let policyHeading = label("Allow sleep prevention")
let policyHeading = label("Power options")
policyHeading.indentationLevel = 0
submenu.addItem(policyHeading)
for policy in PowerPolicy.allCases {
Expand Down
Loading