Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Name the quit item VPhone and drop the toolbar display-mode menu

Jacky5cafdfa6fae0
diff --git a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
index 0ae942d6..1ff70f94 100644
--- a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
+++ b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
@@ -17596,36 +17596,36 @@
}
}
},
- "Quit vphone" : {
+ "Quit VPhone" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Quit vphone"
+ "value" : "Quit VPhone"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "vphone を終了"
+ "value" : "VPhone を終了"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "vphone 종료"
+ "value" : "VPhone 종료"
}
},
"vi" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Thoát vphone"
+ "value" : "Thoát VPhone"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "退出 vphone"
+ "value" : "退出 VPhone"
}
}
}
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Browsers/Keychain/VPhoneKeychainWindowController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Browsers/Keychain/VPhoneKeychainWindowController.swift
index 9f1c3556..33ff4aa3 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Browsers/Keychain/VPhoneKeychainWindowController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Browsers/Keychain/VPhoneKeychainWindowController.swift
@@ -44,6 +44,7 @@ class VPhoneKeychainWindowController: NSObject, NSToolbarDelegate {
toolbar.delegate = self
toolbar.displayMode = .iconOnly
toolbar.allowsUserCustomization = false
+ toolbar.allowsDisplayModeCustomization = false
window.toolbar = toolbar
NSApp.activate(ignoringOtherApps: true)
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
index 111ed128..772bb753 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
@@ -82,7 +82,7 @@ class VPhoneMenuController {
// App menu
let appMenuItem = NSMenuItem()
- let appMenu = NSMenu(title: "vphone")
+ let appMenu = NSMenu(title: "VPhone")
let buildItem = NSMenuItem(
title: VPhoneLocalization.format("Build: %@", Self.buildDescription()),
action: nil,
@@ -92,7 +92,7 @@ class VPhoneMenuController {
appMenu.addItem(buildItem)
appMenu.addItem(NSMenuItem.separator())
appMenu.addItem(
- withTitle: "Quit vphone",
+ withTitle: "Quit VPhone",
action: #selector(NSApplication.terminate(_:)),
keyEquivalent: "q",
)
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/VPhoneVirtualMachineWindowController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/VPhoneVirtualMachineWindowController.swift
index 3703dfac..1d4ee1b5 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/VPhoneVirtualMachineWindowController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/VPhoneVirtualMachineWindowController.swift
@@ -79,6 +79,7 @@ class VPhoneVirtualMachineWindowController: NSObject {
// narrow window truncates the title instead of moving it to overflow.
let toolbar = NSToolbar(identifier: "vphone-toolbar")
toolbar.displayMode = .iconOnly
+ toolbar.allowsDisplayModeCustomization = false
window.toolbar = toolbar
window.toolbarStyle = .unified
let homeAccessory = makeHomeAccessory()