Files
voice-cat/clients/apple/macOS/VoiceCatMac/Sheets/PttKeyCaptureSheet.swift
Talon 6ab78fa792 feat(macos): UI overhaul -- toolbar, unified log, PM windows, settings window, hotkeys
Mirrors the Windows client's UI overhaul (commit 97fa659 + 540ec13) adapted to
Mac-native conventions. The main window is now just toolbar + channels + users
+ chat; audio device settings moved to a modeless Settings window.

- NSToolbar: Join Voice, Share Screen Audio, Mute, Deafen (SF Symbol toggle
  buttons) + Output Volume slider (NSSlider 0-100, default 80). Voice actions,
  mute/deafen, and output volume moved out of the bottom panel into the toolbar
- Audio device settings (input mode, VAD sensitivity, PTT key, device picker,
  level meter) moved to a new SettingsWindowController -- a modeless window
  opened via the app menu's "Settings..." (Cmd+,) item. Source-of-truth for
  audio state lives in MainWindowController so voice start applies settings even
  before the window has been opened; SettingsWindowController reads from /
  writes back to those properties and applies changes live when voice is active.
  Level meter forwarded from handleLevel -> updateLevel(rms:)
- Unified log: chat NSTextView + activity NSTableView collapsed into a single
  NSTextView -- activity events in secondaryLabelColor (gray), chat in default
- Private messaging: scope dropdown removed; compose always sends to the
  current channel. Each PM conversation opens in its own modeless
  PrivateMessageWindowController. Incoming .textMessage with .private scope
  routed to the right window; outgoing PMs echoed by server arrive through the
  same path. "Send Private Message..." added to user context menu.
- Messages menu: "New Private Message..." (Cmd+Shift+N) opens a UserPickerSheet
  listing all server users so you can PM anyone on the server
- Channel tree now shows live user counts, e.g. "General (3)"; refreshChannelTree
  called on .userJoined/.userLeft (was missing)
- Voice menu: Join Voice (Cmd+Shift+V), Share Screen Audio (Cmd+Shift+S),
  Mute (Cmd+Shift+M), Deafen (Cmd+Shift+D) -- NSMenuItem key equivalents with
  [.command, .shift] mask, dispatched by the responder chain
- setOutputVolume(_:) wrapper added to VoiceCatClient.swift (was missing -- the
  C ABI + C# wrapper shipped in commit 97fa659 but the Swift wrapper was never
  added); wired end-to-end: toolbar slider -> client.setOutputVolume(gain)

Part A -- fixed and verified the previously-uncompiled Swift from the external
PCM feed/tap commit (615d2a8):
- Rebuilt the macOS xcframework slice (regenerated the module map from current
  voicecat.h, exposing vc_pcm_sink_cb / vc_stream_feed_pcm / vc_set_pcm_sink)
- Fixed feedPcm type bug: size_t imports as Int in Swift not UInt; the original
  UInt(samplesPerChannel) was wrong
- Added VoiceCatPcmSinkCallback typealias -- a Swift-idiomatic public alias for
  the C vc_pcm_sink_cb so consumers (tests, the macOS app) can declare a sink
  callback without directly importing the VoiceCatC C module. Mirrors the C#
  VcPcmSinkCallback delegate
- keyCodeName helper deduplicated (was in PttKeyCaptureSheet.swift +
  MainWindowController.swift -- now shared)

Platform-specific adaptations (vs. Windows): NSToolbar instead of ToolStrip;
global menu bar + NSMenuItem key equivalents (Cmd not Ctrl, responder-chain
dispatched, no custom key monitor needed); PM windows as modeless NSWindows;
picker as Mac sheet; gray = secondaryLabelColor; SF Symbols for toolbar icons.

swift test 10/10 (4 ExternalPcmTests + 6 VoiceCatClientSmokeTests against a
live server); xcodebuild Debug + Release BUILD SUCCEEDED with 0 Swift warnings.
2026-06-20 23:30:52 +02:00

104 lines
3.7 KiB
Swift

import AppKit
final class PttKeyCaptureSheet: NSViewController {
var onComplete: ((UInt16?) -> Void)?
private let currentKeyCode: UInt16
private var capturedKeyCode: UInt16?
private let instructionLabel = NSTextField(labelWithString: "Press the key you want to use for push-to-talk…")
private let captureView = KeyCaptureView()
init(currentKeyCode: UInt16) {
self.currentKeyCode = currentKeyCode
super.init(nibName: nil, bundle: nil)
}
required init?(coder: NSCoder) { fatalError() }
override func loadView() {
view = NSView(frame: NSRect(x: 0, y: 0, width: 320, height: 140))
}
override func viewDidLoad() {
super.viewDidLoad()
buildUI()
}
private func buildUI() {
let titleLabel = NSTextField(labelWithString: "Set Push-to-Talk Key")
titleLabel.font = .boldSystemFont(ofSize: 13)
instructionLabel.textColor = .secondaryLabelColor
instructionLabel.lineBreakMode = .byWordWrapping
instructionLabel.setAccessibilityLabel("Waiting for key press")
captureView.setAccessibilityLabel("Key capture area — press any key")
captureView.setAccessibilityRole(.textArea)
captureView.onKeyPressed = { [weak self] keyCode in
self?.capturedKeyCode = keyCode
self?.instructionLabel.stringValue = "Key captured: \(keyCodeName(keyCode)). Click Set to confirm."
}
let cancelButton = NSButton(title: "Cancel", target: self, action: #selector(cancelClicked))
cancelButton.bezelStyle = .rounded
let setButton = NSButton(title: "Set", target: self, action: #selector(setClicked))
setButton.bezelStyle = .rounded; setButton.keyEquivalent = "\r"
setButton.setAccessibilityLabel("Set captured key as PTT key")
let buttonRow = NSStackView(views: [NSView(), cancelButton, setButton])
buttonRow.orientation = .horizontal; buttonRow.spacing = 8
captureView.translatesAutoresizingMaskIntoConstraints = false
captureView.wantsLayer = true
captureView.layer?.backgroundColor = NSColor.controlBackgroundColor.cgColor
captureView.layer?.cornerRadius = 4
let stack = NSStackView(views: [titleLabel, instructionLabel, captureView, buttonRow])
stack.orientation = .vertical; stack.spacing = 10
stack.edgeInsets = NSEdgeInsets(top: 16, left: 16, bottom: 16, right: 16)
stack.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(stack)
NSLayoutConstraint.activate([
stack.topAnchor.constraint(equalTo: view.topAnchor),
stack.leadingAnchor.constraint(equalTo: view.leadingAnchor),
stack.trailingAnchor.constraint(equalTo: view.trailingAnchor),
stack.bottomAnchor.constraint(equalTo: view.bottomAnchor),
captureView.heightAnchor.constraint(equalToConstant: 28),
])
}
override func viewDidAppear() {
super.viewDidAppear()
view.window?.makeFirstResponder(captureView)
}
@objc private func setClicked() {
let key = capturedKeyCode
dismiss(nil)
onComplete?(key)
}
@objc private func cancelClicked() {
dismiss(nil)
onComplete?(nil)
}
}
// MARK: - Key capture view
private final class KeyCaptureView: NSView {
var onKeyPressed: ((UInt16) -> Void)?
override var acceptsFirstResponder: Bool { true }
override func keyDown(with event: NSEvent) {
onKeyPressed?(event.keyCode)
}
override func drawFocusRingMask() {
NSBezierPath(roundedRect: bounds, xRadius: 4, yRadius: 4).fill()
}
override var focusRingMaskBounds: NSRect { bounds }
}