Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

menu: gate Connect actions on connection state (#161)

TastyHeadphones033960c9c068
diff --git a/sources/vphone-cli/VPhoneAppDelegate.swift b/sources/vphone-cli/VPhoneAppDelegate.swift
index 1d442367..f4881767 100644
--- a/sources/vphone-cli/VPhoneAppDelegate.swift
+++ b/sources/vphone-cli/VPhoneAppDelegate.swift
@@ -141,6 +141,7 @@ class VPhoneAppDelegate: NSObject, NSApplicationDelegate {
// Wire location toggle through onConnect/onDisconnect
control.onConnect = { [weak mc, weak provider = locationProvider] caps in
+ mc?.updateConnectAvailability(available: true)
if caps.contains("location") {
mc?.updateLocationCapability(available: true)
// Auto-resume if user had toggle on
@@ -152,6 +153,7 @@ class VPhoneAppDelegate: NSObject, NSApplicationDelegate {
}
}
control.onDisconnect = { [weak mc, weak provider = locationProvider] in
+ mc?.updateConnectAvailability(available: false)
provider?.stopReplay()
provider?.stopForwarding()
mc?.updateLocationCapability(available: false)
diff --git a/sources/vphone-cli/VPhoneMenuConnect.swift b/sources/vphone-cli/VPhoneMenuConnect.swift
index 8af497b3..41c9d759 100644
--- a/sources/vphone-cli/VPhoneMenuConnect.swift
+++ b/sources/vphone-cli/VPhoneMenuConnect.swift
@@ -6,16 +6,42 @@ extension VPhoneMenuController {
func buildConnectMenu() -> NSMenuItem {
let item = NSMenuItem()
let menu = NSMenu(title: "Connect")
- menu.addItem(makeItem("File Browser", action: #selector(openFiles)))
+
+ let fileBrowser = makeItem("File Browser", action: #selector(openFiles))
+ fileBrowser.isEnabled = false
+ connectFileBrowserItem = fileBrowser
+ menu.addItem(fileBrowser)
+
menu.addItem(NSMenuItem.separator())
- menu.addItem(makeItem("Developer Mode Status", action: #selector(devModeStatus)))
+
+ let devModeStatus = makeItem("Developer Mode Status", action: #selector(devModeStatus))
+ devModeStatus.isEnabled = false
+ connectDevModeStatusItem = devModeStatus
+ menu.addItem(devModeStatus)
+
menu.addItem(NSMenuItem.separator())
- menu.addItem(makeItem("Ping", action: #selector(sendPing)))
- menu.addItem(makeItem("Guest Version", action: #selector(queryGuestVersion)))
+
+ let ping = makeItem("Ping", action: #selector(sendPing))
+ ping.isEnabled = false
+ connectPingItem = ping
+ menu.addItem(ping)
+
+ let guestVersion = makeItem("Guest Version", action: #selector(queryGuestVersion))
+ guestVersion.isEnabled = false
+ connectGuestVersionItem = guestVersion
+ menu.addItem(guestVersion)
+
item.submenu = menu
return item
}
+ func updateConnectAvailability(available: Bool) {
+ connectFileBrowserItem?.isEnabled = available
+ connectDevModeStatusItem?.isEnabled = available
+ connectPingItem?.isEnabled = available
+ connectGuestVersionItem?.isEnabled = available
+ }
+
@objc func openFiles() {
onFilesPressed?()
}
diff --git a/sources/vphone-cli/VPhoneMenuController.swift b/sources/vphone-cli/VPhoneMenuController.swift
index 4d5f5a7b..7abfb303 100644
--- a/sources/vphone-cli/VPhoneMenuController.swift
+++ b/sources/vphone-cli/VPhoneMenuController.swift
@@ -10,6 +10,10 @@ class VPhoneMenuController {
weak var vm: VPhoneVirtualMachine?
var onFilesPressed: (() -> Void)?
+ var connectFileBrowserItem: NSMenuItem?
+ var connectDevModeStatusItem: NSMenuItem?
+ var connectPingItem: NSMenuItem?
+ var connectGuestVersionItem: NSMenuItem?
var locationProvider: VPhoneLocationProvider?
var locationMenuItem: NSMenuItem?
var locationPresetMenuItem: NSMenuItem?