Run a virtual iPhone on an Apple Silicon Mac.
Swift
Add Restart Guest to the Device menu and icons to menu items
Lakr233820fd84cfdd5
diff --git a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstringsindex e8a6da09..0c1fd440 100644--- a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings+++ b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings@@ -2503,6 +2503,40 @@}}},+ "Apps in the guest quit. The guest agent reconnects after the guest starts up." : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Apps in the guest quit. The guest agent reconnects after the guest starts up."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲスト内のアプリは終了します。ゲストの起動後、ゲストエージェントが再接続します。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트의 앱이 종료됩니다. 게스트가 시동되면 게스트 에이전트가 다시 연결됩니다."+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Các ứng dụng trong máy khách sẽ thoát. Tác nhân máy khách sẽ kết nối lại sau khi máy khách khởi động."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "客体中的 App 将退出。客体启动后,客体代理会重新连接。"+ }+ }+ }+ },"Armed, turns on after restart" : {"localizations" : {"ja" : {@@ -18809,6 +18843,108 @@}}},+ "Restart Guest" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Restart Guest"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲストを再起動"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트 재시동"+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Khởi động lại máy khách"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "重启客体"+ }+ }+ }+ },+ "Restart Guest…" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Restart Guest…"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲストを再起動…"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트 재시동…"+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Khởi động lại máy khách…"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "重启客体…"+ }+ }+ }+ },+ "Restart the guest?" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Restart the guest?"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲストを再起動しますか?"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트를 재시동하시겠습니까?"+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Khởi động lại máy khách?"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "要重启客体吗?"+ }+ }+ }+ },"Restarted %@ as PID %lld." : {"localizations" : {"en" : {@@ -23865,6 +24001,40 @@}}},+ "The guest refused the restart request." : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "The guest refused the restart request."+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲストが再起動の要求を拒否しました。"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트가 재시동 요청을 거부했습니다."+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Máy khách đã từ chối yêu cầu khởi động lại."+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "客体拒绝了重启请求。"+ }+ }+ }+ },"The guest reported no IPv4 or IPv6 addresses." : {"localizations" : {"ja" : {@@ -24941,6 +25111,40 @@}}},+ "Unable to Restart Guest" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Unable to Restart Guest"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "ゲストを再起動できません"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "게스트를 재시동할 수 없음"+ }+ },+ "vi" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Không thể khởi động lại máy khách"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "无法重启客体"+ }+ }+ }+ },"Unable to add the keychain item. Try again." : {"localizations" : {"en" : {diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/GuestCommunication/VPhoneGuestControl.swift b/VPhoneExecutable/VPhoneVirtualization/UI/GuestCommunication/VPhoneGuestControl.swiftindex 551e3784..35c85933 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/GuestCommunication/VPhoneGuestControl.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/GuestCommunication/VPhoneGuestControl.swift@@ -354,6 +354,15 @@ final class VPhoneGuestControl {return try await call("bootstrap.uninstall", params: ["roots": roots, "reboot": reboot, "force": true])}+ /// Asks the guest to restart. The guest usually restarts before it can+ /// reply, so a dropped connection is the expected result.+ func restartGuest() async throws {+ guard guestCapabilities.contains("system_control") else {+ throw ControlError.unsupportedCapability("system_control")+ }+ _ = try await call("system.reboot", params: ["force": true])+ }+func clipboardGet() async throws -> ClipboardContent {let (info, image) = try await sendRequest(["t": "clipboard_get"])return ClipboardContent(diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swiftindex 4b8a882a..2f4a7c4d 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift@@ -15,6 +15,7 @@ extension VPhoneMenuController {action: #selector(openAppBrowser),keyEquivalent: "a",modifiers: [.command, .shift],+ symbol: "square.grid.2x2",)browse.isEnabled = falseappsListItem = browse@@ -22,14 +23,18 @@ extension VPhoneMenuController {menu.addItem(NSMenuItem.separator())- let openURL = makeItem("Open URL…", action: #selector(openURL))+ let openURL = makeItem("Open URL…", action: #selector(openURL), symbol: "link")openURL.isEnabled = falseappsOpenURLItem = openURLmenu.addItem(openURL)menu.addItem(NSMenuItem.separator())- let install = makeItem("Install App Package…", action: #selector(installIPAFromDisk))+ let install = makeItem(+ "Install App Package…",+ action: #selector(installIPAFromDisk),+ symbol: "square.and.arrow.down",+ )install.isEnabled = falseinstallPackageItem = installmenu.addItem(install)diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBattery.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBattery.swiftindex 129dfb57..25805515 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBattery.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBattery.swift@@ -6,6 +6,7 @@ import IOKit.psextension VPhoneMenuController {func buildBatterySubmenu() -> NSMenuItem {let item = NSMenuItem(title: "Battery", action: nil, keyEquivalent: "")+ item.image = menuSymbol("battery.100")let menu = NSMenu(title: "Battery")// Sync togglediff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuCamera.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuCamera.swiftindex c35efa13..f0e95df8 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuCamera.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuCamera.swift@@ -6,6 +6,7 @@ import UniformTypeIdentifiersextension VPhoneMenuController {func buildCameraSubmenu() -> NSMenuItem {let item = NSMenuItem(title: "Camera", action: nil, keyEquivalent: "")+ item.image = menuSymbol("camera")let menu = NSMenu(title: "Camera")let status = NSMenuItem(@@ -43,6 +44,7 @@ extension VPhoneMenuController {let startStop = makeItem("Start Streaming",action: #selector(toggleCameraStreaming),+ symbol: "play",)startStop.isEnabled = falsecameraStartStopItem = startStop@@ -74,6 +76,7 @@ extension VPhoneMenuController {refreshCameraSourceCheckmarks()cameraStartStopItem?.isEnabled = falsecameraStartStopItem?.title = VPhoneLocalization.text("Start Streaming")+ cameraStartStopItem?.image = menuSymbol("play")}@objc func setCameraSourceTestPattern() {@@ -112,9 +115,11 @@ extension VPhoneMenuController {if cameraStartStopItem?.title == VPhoneLocalization.text("Start Streaming") {server.startStreaming()cameraStartStopItem?.title = VPhoneLocalization.text("Stop Streaming")+ cameraStartStopItem?.image = menuSymbol("stop")} else {server.stopStreaming()cameraStartStopItem?.title = VPhoneLocalization.text("Start Streaming")+ cameraStartStopItem?.image = menuSymbol("play")}}}diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swiftindex ea509383..2b2c935f 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift@@ -33,6 +33,7 @@ class VPhoneMenuController {var appsOpenURLItem: NSMenuItem?var settingsGetItem: NSMenuItem?var settingsSetItem: NSMenuItem?+ var restartGuestItem: NSMenuItem?var panelMenuItems: [VPhoneGuestPanel: NSMenuItem] = [:]var touchIDMonitor: VPhoneTouchIDMonitor? {didSet { touchIDMonitor?.isEnabled = touchIDMenuItem?.state == .on }@@ -151,13 +152,21 @@ class VPhoneMenuController {action: Selector,keyEquivalent: String = "",modifiers: NSEvent.ModifierFlags = .command,+ symbol: String? = nil,) -> NSMenuItem {let item = NSMenuItem(title: title, action: action, keyEquivalent: keyEquivalent)item.keyEquivalentModifierMask = modifiersitem.target = self+ item.image = symbol.flatMap(menuSymbol)return item}+ /// An SF Symbol for a menu item. Checkable items, value lists and status+ /// rows have none, so the icons mark actions, windows and submenus.+ func menuSymbol(_ name: String) -> NSImage? {+ NSImage(systemSymbolName: name, accessibilityDescription: nil)+ }+@objc private func findKeychain() {onFindPressed?()}diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swiftindex 59f33a46..710b097a 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift@@ -9,20 +9,31 @@ extension VPhoneMenuController {func buildDeviceMenu() -> NSMenuItem {let item = NSMenuItem(title: "Device", action: nil, keyEquivalent: "")let menu = NSMenu(title: "Device")+ menu.autoenablesItems = falsemenu.addItem(makeItem("Home Screen",action: #selector(sendHome),keyEquivalent: "h",modifiers: [.command, .shift],+ symbol: "house",))- menu.addItem(makeItem("Power", action: #selector(sendPower)))- menu.addItem(makeItem("Volume Up", action: #selector(sendVolumeUp)))- menu.addItem(makeItem("Volume Down", action: #selector(sendVolumeDown)))+ menu.addItem(makeItem("Power", action: #selector(sendPower), symbol: "power"))+ menu.addItem(makeItem("Volume Up", action: #selector(sendVolumeUp), symbol: "speaker.plus"))+ menu.addItem(makeItem("Volume Down", action: #selector(sendVolumeDown), symbol: "speaker.minus"))menu.addItem(NSMenuItem.separator())- menu.addItem(makeItem("Open Guest Spotlight", action: #selector(sendSpotlight)))- menu.addItem(makeItem("Type ASCII from Mac Clipboard", action: #selector(typeFromClipboard)))+ let restart = makeItem("Restart Guest…", action: #selector(restartGuest), symbol: "arrow.clockwise")+ restart.isEnabled = false+ restartGuestItem = restart+ menu.addItem(restart)menu.addItem(NSMenuItem.separator())- menu.addItem(makePanelItem(.controls, "Controls", keyEquivalent: "k"))+ menu.addItem(makeItem("Open Guest Spotlight", action: #selector(sendSpotlight), symbol: "magnifyingglass"))+ menu.addItem(makeItem(+ "Type ASCII from Mac Clipboard",+ action: #selector(typeFromClipboard),+ symbol: "keyboard",+ ))+ menu.addItem(NSMenuItem.separator())+ menu.addItem(makePanelItem(.controls, "Controls", keyEquivalent: "k", symbol: "slider.horizontal.3"))menu.addItem(NSMenuItem.separator())menu.addItem(buildLocationSubmenu())menu.addItem(buildBatterySubmenu())@@ -66,6 +77,38 @@ extension VPhoneMenuController {keySender.typeFromClipboard()}+ // MARK: - Restart++ func updateRestartAvailability(available: Bool) {+ restartGuestItem?.isEnabled = available+ }++ @objc func restartGuest() {+ VPhoneAlert.present(+ title: "Restart the guest?",+ message: "Apps in the guest quit. The guest agent reconnects after the guest starts up.",+ style: .warning,+ buttons: ["Restart Guest", "Cancel"],+ ) { response in+ guard response == .alertFirstButtonReturn else { return }+ Task {+ do {+ try await self.control.restartGuest()+ } catch let VPhoneGuestControl.ControlError.guestError(message) {+ print("[restart] guest refused: \(message)")+ VPhoneAlert.present(+ title: "Unable to Restart Guest",+ message: "The guest refused the restart request.",+ style: .warning,+ )+ } catch {+ // The guest restarts before it replies, so the connection+ // drops. onDisconnect updates the menus.+ }+ }+ }+ }+@objc func toggleTouchIDForwarding() {guard let monitor = touchIDMonitor, let item = touchIDMenuItem else { return }monitor.isEnabled.toggle()diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swiftindex ef0c9bc3..4646a66c 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift@@ -10,27 +10,31 @@ extension VPhoneMenuController {let menu = NSMenu(title: "Diagnostics")menu.autoenablesItems = false- menu.addItem(makePanelItem(.deviceInfo, "Device Info", keyEquivalent: "i"))- menu.addItem(makePanelItem(.processes, "Processes", keyEquivalent: "p"))- menu.addItem(makePanelItem(.services, "Services", keyEquivalent: "s"))+ menu.addItem(makePanelItem(.deviceInfo, "Device Info", keyEquivalent: "i", symbol: "info.circle"))+ menu.addItem(makePanelItem(.processes, "Processes", keyEquivalent: "p", symbol: "cpu"))+ menu.addItem(makePanelItem(.services, "Services", keyEquivalent: "s", symbol: "gearshape.2"))menu.addItem(NSMenuItem.separator())- menu.addItem(makePanelItem(.console, "Console", keyEquivalent: "l"))- menu.addItem(makePanelItem(.crashLogs, "Crash Logs", keyEquivalent: "c"))+ menu.addItem(makePanelItem(.console, "Console", keyEquivalent: "l", symbol: "terminal"))+ menu.addItem(makePanelItem(.crashLogs, "Crash Logs", keyEquivalent: "c", symbol: "exclamationmark.triangle"))menu.addItem(NSMenuItem.separator())- menu.addItem(makePanelItem(.uiInspector, "UI Inspector", keyEquivalent: "u"))+ menu.addItem(makePanelItem(.uiInspector, "UI Inspector", keyEquivalent: "u", symbol: "rectangle.dashed"))menu.addItem(NSMenuItem.separator())- let devModeStatus = makeItem("Developer Mode Status", action: #selector(devModeStatus))+ let devModeStatus = makeItem(+ "Developer Mode Status",+ action: #selector(devModeStatus),+ symbol: "hammer",+ )devModeStatus.isEnabled = falseconnectDevModeStatusItem = devModeStatusmenu.addItem(devModeStatus)- let ping = makeItem("Ping", action: #selector(sendPing))+ let ping = makeItem("Ping", action: #selector(sendPing), symbol: "dot.radiowaves.left.and.right")ping.isEnabled = falseconnectPingItem = pingmenu.addItem(ping)- let guestHash = makeItem("Guest Agent Hash", action: #selector(queryGuestHash))+ let guestHash = makeItem("Guest Agent Hash", action: #selector(queryGuestHash), symbol: "number")guestHash.isEnabled = falseconnectGuestHashItem = guestHashmenu.addItem(guestHash)@@ -40,12 +44,18 @@ extension VPhoneMenuController {}/// A menu item that opens one guest panel with ⌥⌘ plus the given key.- func makePanelItem(_ panel: VPhoneGuestPanel, _ title: String, keyEquivalent: String) -> NSMenuItem {+ func makePanelItem(+ _ panel: VPhoneGuestPanel,+ _ title: String,+ keyEquivalent: String,+ symbol: String,+ ) -> NSMenuItem {let item = makeItem(title,action: #selector(openPanel(_:)),keyEquivalent: keyEquivalent,modifiers: [.command, .option],+ symbol: symbol,)item.representedObject = panelitem.isEnabled = falsediff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuGuest.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuGuest.swiftindex 875a9b49..df50aa01 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuGuest.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuGuest.swift@@ -15,6 +15,7 @@ extension VPhoneMenuController {action: #selector(openFiles),keyEquivalent: "f",modifiers: [.command, .shift],+ symbol: "folder",)fileBrowser.isEnabled = falseconnectFileBrowserItem = fileBrowser@@ -25,6 +26,7 @@ extension VPhoneMenuController {action: #selector(openKeychain),keyEquivalent: "k",modifiers: [.command, .shift],+ symbol: "key",)keychainBrowser.isEnabled = falseconnectKeychainBrowserItem = keychainBrowser@@ -32,25 +34,38 @@ extension VPhoneMenuController {menu.addItem(NSMenuItem.separator())- let installBootstrap = makeItem("Install Bootstrap…", action: #selector(installBootstrap))+ let installBootstrap = makeItem(+ "Install Bootstrap…",+ action: #selector(installBootstrap),+ symbol: "arrow.down.circle",+ )installBootstrap.isEnabled = falseinstallBootstrapItem = installBootstrapmenu.addItem(installBootstrap)let installFromFile = makeItem(- "Install Bootstrap from File…", action: #selector(installBootstrapFromFile), modifiers: [.option],+ "Install Bootstrap from File…",+ action: #selector(installBootstrapFromFile),+ modifiers: [.option],+ symbol: "doc",)installFromFile.isAlternate = trueinstallFromFile.isEnabled = falseinstallBootstrapFromFileItem = installFromFilemenu.addItem(installFromFile)- let uninstallBootstrap = makeItem("Uninstall Bootstrap…", action: #selector(uninstallBootstrap))+ let uninstallBootstrap = makeItem(+ "Uninstall Bootstrap…",+ action: #selector(uninstallBootstrap),+ symbol: "trash",+ )uninstallBootstrap.isEnabled = falseuninstallBootstrapItem = uninstallBootstrapmenu.addItem(uninstallBootstrap)let uninstallNoRestart = makeItem(- "Uninstall Bootstrap Without Restarting…", action: #selector(uninstallBootstrapWithoutRestart),+ "Uninstall Bootstrap Without Restarting…",+ action: #selector(uninstallBootstrapWithoutRestart),modifiers: [.option],+ symbol: "trash",)uninstallNoRestart.isAlternate = trueuninstallNoRestart.isEnabled = false@@ -64,12 +79,17 @@ extension VPhoneMenuController {action: #selector(getClipboard),keyEquivalent: "c",modifiers: [.command, .shift],+ symbol: "doc.on.clipboard",)clipGet.isEnabled = falseclipboardGetItem = clipGetmenu.addItem(clipGet)- let clipSet = makeItem("Set Clipboard Text…", action: #selector(setClipboardText))+ let clipSet = makeItem(+ "Set Clipboard Text…",+ action: #selector(setClipboardText),+ symbol: "character.cursor.ibeam",+ )clipSet.isEnabled = falseclipboardSetItem = clipSetmenu.addItem(clipSet)@@ -81,12 +101,13 @@ extension VPhoneMenuController {action: #selector(readSetting),keyEquivalent: "p",modifiers: [.command, .shift],+ symbol: "gearshape",)settingsGet.isEnabled = falsesettingsGetItem = settingsGetmenu.addItem(settingsGet)- let settingsSet = makeItem("Write Preference…", action: #selector(writeSetting))+ let settingsSet = makeItem("Write Preference…", action: #selector(writeSetting), symbol: "pencil")settingsSet.isEnabled = falsesettingsSetItem = settingsSetmenu.addItem(settingsSet)diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuLocation.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuLocation.swiftindex b0401ef1..9c9ea160 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuLocation.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuLocation.swift@@ -51,6 +51,7 @@ private let locationReplayPoints: [VPhoneLocationProvider.ReplayPoint] = [extension VPhoneMenuController {func buildLocationSubmenu() -> NSMenuItem {let item = NSMenuItem(title: "Location", action: nil, keyEquivalent: "")+ item.image = menuSymbol("location")let menu = NSMenu(title: "Location")let toggle = makeItem("Sync Host Location", action: #selector(toggleLocationSync))@@ -62,6 +63,7 @@ extension VPhoneMenuController {menu.addItem(NSMenuItem.separator())let presets = NSMenuItem(title: "Preset Location", action: nil, keyEquivalent: "")+ presets.image = menuSymbol("mappin.and.ellipse")let presetsMenu = NSMenu(title: "Preset Location")for (index, preset) in locationPresets.enumerated() {let presetItem = makeItem(preset.title, action: #selector(setLocationPreset(_:)))@@ -75,12 +77,12 @@ extension VPhoneMenuController {menu.addItem(NSMenuItem.separator())- let replayStart = makeItem("Start Route Replay", action: #selector(startLocationReplay(_:)))+ let replayStart = makeItem("Start Route Replay", action: #selector(startLocationReplay(_:)), symbol: "play")replayStart.isEnabled = falselocationReplayStartItem = replayStartmenu.addItem(replayStart)- let replayStop = makeItem("Stop Route Replay", action: #selector(stopLocationReplay(_:)))+ let replayStop = makeItem("Stop Route Replay", action: #selector(stopLocationReplay(_:)), symbol: "stop")replayStop.isEnabled = falselocationReplayStopItem = replayStopmenu.addItem(replayStop)diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuRecord.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuRecord.swiftindex e3ee5d83..c24fd798 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuRecord.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuRecord.swift@@ -11,12 +11,21 @@ extension VPhoneMenuController {action: #selector(toggleRecording),keyEquivalent: "r",modifiers: [.command, .shift],+ symbol: "record.circle",)recordingItem = togglemenu.addItem(toggle)menu.addItem(NSMenuItem.separator())- menu.addItem(makeItem("Copy Screenshot to Mac Clipboard", action: #selector(copyScreenshotToClipboard)))- menu.addItem(makeItem("Save Screenshot to File", action: #selector(saveScreenshotToFile)))+ menu.addItem(makeItem(+ "Copy Screenshot to Mac Clipboard",+ action: #selector(copyScreenshotToClipboard),+ symbol: "camera.viewfinder",+ ))+ menu.addItem(makeItem(+ "Save Screenshot to File",+ action: #selector(saveScreenshotToFile),+ symbol: "square.and.arrow.down",+ ))item.submenu = menureturn item}@@ -26,6 +35,7 @@ extension VPhoneMenuController {Task { @MainActor inlet url = await screenRecorder?.stopRecording()recordingItem?.title = VPhoneLocalization.text("Start Recording")+ recordingItem?.image = menuSymbol("record.circle")if let url {showRecordingSavedAlert(url: url)}@@ -42,6 +52,7 @@ extension VPhoneMenuController {do {try screenRecorder?.startRecording(view: view)recordingItem?.title = VPhoneLocalization.text("Stop Recording")+ recordingItem?.image = menuSymbol("stop.circle")} catch {showCaptureAlert(title: "Recording", message: "Unable to start recording. Try again.", style: .warning)}diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/VPhoneVirtualMachineAppDelegate.swift b/VPhoneExecutable/VPhoneVirtualization/UI/VPhoneVirtualMachineAppDelegate.swiftindex 0549956b..2cb17e0c 100644--- a/VPhoneExecutable/VPhoneVirtualization/UI/VPhoneVirtualMachineAppDelegate.swift+++ b/VPhoneExecutable/VPhoneVirtualization/UI/VPhoneVirtualMachineAppDelegate.swift@@ -213,6 +213,7 @@ class VPhoneVirtualMachineAppDelegate: NSObject, NSApplicationDelegate {mc?.updateURLAvailability(available: caps.contains("url"))mc?.updateClipboardAvailability(available: caps.contains("clipboard"))mc?.updateSettingsAvailability(available: true)+ mc?.updateRestartAvailability(available: caps.contains("system_control"))mc?.updatePanelAvailability(capabilities: caps)if caps.contains("location") {mc?.updateLocationCapability(available: true)@@ -238,6 +239,7 @@ class VPhoneVirtualMachineAppDelegate: NSObject, NSApplicationDelegate {mc?.updateURLAvailability(available: false)mc?.updateClipboardAvailability(available: false)mc?.updateSettingsAvailability(available: false)+ mc?.updateRestartAvailability(available: false)mc?.updatePanelAvailability(capabilities: [])provider?.stopReplay()provider?.stopForwarding()