Mirrors the Windows client's UI overhaul (commit97fa659+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 commit97fa659but 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.
138 lines
5.0 KiB
Swift
138 lines
5.0 KiB
Swift
import AppKit
|
|
import VoiceCatCore
|
|
|
|
// UserPickerSheet — a modal sheet for picking one user from the list of all connected server
|
|
// users. Used by the "Messages → New Private Message…" menu item so the user can start a PM
|
|
// with anyone on the server, not just the current channel. Mirrors the Windows client's
|
|
// `UserPickerDialog` (clients/windows/VoiceCat.App/Forms/UserPickerDialog.cs), adapted to the
|
|
// Mac sheet pattern used by the rest of the macOS client (InputSheet, MoveUserSheet, etc.).
|
|
|
|
final class UserPickerSheet: NSViewController, NSTableViewDataSource, NSTableViewDelegate {
|
|
|
|
/// Called with the selected user's ID, or `nil` if the user cancelled.
|
|
var onComplete: ((UInt32?) -> Void)?
|
|
|
|
private let users: [User]
|
|
private let tableView = NSTableView()
|
|
private var okButton: NSButton?
|
|
private var selectedRow: Int = -1
|
|
|
|
init(users: [User]) {
|
|
self.users = users
|
|
super.init(nibName: nil, bundle: nil)
|
|
}
|
|
|
|
required init?(coder: NSCoder) { fatalError() }
|
|
|
|
override func loadView() {
|
|
view = NSView(frame: NSRect(x: 0, y: 0, width: 300, height: 320))
|
|
}
|
|
|
|
override func viewDidLoad() {
|
|
super.viewDidLoad()
|
|
buildUI()
|
|
}
|
|
|
|
// MARK: - UI
|
|
|
|
private func buildUI() {
|
|
let titleLabel = NSTextField(labelWithString: "Select a user:")
|
|
titleLabel.font = .boldSystemFont(ofSize: 13)
|
|
titleLabel.setAccessibilityLabel("Select a user")
|
|
|
|
let col = NSTableColumn(identifier: NSUserInterfaceItemIdentifier("user"))
|
|
tableView.addTableColumn(col)
|
|
tableView.headerView = nil
|
|
tableView.dataSource = self
|
|
tableView.delegate = self
|
|
tableView.doubleAction = #selector(okClicked)
|
|
tableView.target = self
|
|
tableView.setAccessibilityLabel("User list")
|
|
|
|
let scroll = NSScrollView()
|
|
scroll.documentView = tableView
|
|
scroll.hasVerticalScroller = true
|
|
scroll.borderType = .bezelBorder
|
|
scroll.translatesAutoresizingMaskIntoConstraints = false
|
|
|
|
let cancelButton = NSButton(title: "Cancel", target: self, action: #selector(cancelClicked))
|
|
cancelButton.bezelStyle = .rounded
|
|
|
|
let okButton = NSButton(title: "OK", target: self, action: #selector(okClicked))
|
|
okButton.bezelStyle = .rounded
|
|
okButton.keyEquivalent = "\r"
|
|
okButton.isEnabled = false
|
|
self.okButton = okButton
|
|
|
|
let buttonRow = NSStackView(views: [NSView(), cancelButton, okButton])
|
|
buttonRow.orientation = .horizontal
|
|
buttonRow.spacing = 8
|
|
|
|
let stack = NSStackView(views: [titleLabel, scroll, buttonRow])
|
|
stack.orientation = .vertical
|
|
stack.spacing = 8
|
|
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),
|
|
])
|
|
}
|
|
|
|
override func viewDidAppear() {
|
|
super.viewDidAppear()
|
|
if users.count == 1 {
|
|
tableView.selectRowIndexes(IndexSet(integer: 0), byExtendingSelection: false)
|
|
}
|
|
}
|
|
|
|
// MARK: - Actions
|
|
|
|
@objc private func okClicked() {
|
|
guard selectedRow >= 0, selectedRow < users.count else { return }
|
|
let userId = users[selectedRow].id
|
|
dismiss(nil)
|
|
onComplete?(userId)
|
|
}
|
|
|
|
@objc private func cancelClicked() {
|
|
dismiss(nil)
|
|
onComplete?(nil)
|
|
}
|
|
|
|
// MARK: - NSTableViewDataSource / Delegate
|
|
|
|
func numberOfRows(in tableView: NSTableView) -> Int { users.count }
|
|
|
|
func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
|
|
let id = NSUserInterfaceItemIdentifier("userCell")
|
|
let cell = tableView.makeView(withIdentifier: id, owner: nil) as? NSTableCellView
|
|
?? makeCellView(identifier: id)
|
|
cell.textField?.stringValue = users[row].nickname
|
|
return cell
|
|
}
|
|
|
|
func tableViewSelectionDidChange(_ notification: Notification) {
|
|
selectedRow = tableView.selectedRow
|
|
okButton?.isEnabled = selectedRow >= 0
|
|
}
|
|
|
|
private func makeCellView(identifier: NSUserInterfaceItemIdentifier) -> NSTableCellView {
|
|
let cell = NSTableCellView()
|
|
cell.identifier = identifier
|
|
let tf = NSTextField(labelWithString: "")
|
|
tf.translatesAutoresizingMaskIntoConstraints = false
|
|
cell.addSubview(tf)
|
|
cell.textField = tf
|
|
NSLayoutConstraint.activate([
|
|
tf.leadingAnchor.constraint(equalTo: cell.leadingAnchor, constant: 4),
|
|
tf.trailingAnchor.constraint(equalTo: cell.trailingAnchor, constant: -4),
|
|
tf.centerYAnchor.constraint(equalTo: cell.centerYAnchor),
|
|
])
|
|
return cell
|
|
}
|
|
}
|