utmapp/UTM
1
0
Fork 0
mirror of https://github.com/utmapp/UTM.git synced 2026-10-12 02:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: various tweaks to be more consistent

Browse Source 
Resolves #3984
This commit is contained in:
osy
2022-05-07 14:21:00 -07:00
parent aef143bee7
commit 9158e0b29e
16 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Platform/Shared/VMRemovableDrivesView.swift
+2 -2
View File
@@ -36,7 +36,7 @@ struct VMRemovableDrivesView: View {
@ViewBuilder private var shareMenuActions: some View {
Button(action: { shareDirectoryFileImportPresented.toggle() }) {
Label("Browse", systemImage: "doc.badge.plus")
Label("Browse…", systemImage: "doc.badge.plus")
}
if hasSharedDir {
Button(action: clearShareDirectory) {
@@ -92,7 +92,7 @@ struct VMRemovableDrivesView: View {
diskImageFileImportPresented = true
}
}, label: {
Label("Browse", systemImage: "doc.badge.plus")
Label("Browse…", systemImage: "doc.badge.plus")
})
.onChange(of: workaroundFileImporterBug) { doWorkaround in
/// Explanation see "SwiftUI FileImporter modal bug" above
Platform/Shared/VMWizardOSLinuxView.swift
+8 -8
View File
@@ -69,7 +69,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .kernel
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.padding(.leading, 1)
} header: {
@@ -85,7 +85,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .initialRamdisk
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
@@ -101,7 +101,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .initialRamdisk
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
@@ -126,7 +126,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .rootImage
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
Button {
wizardState.linuxRootImageURL = nil
@@ -139,7 +139,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .rootImage
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
Button {
wizardState.linuxRootImageURL = nil
@@ -161,7 +161,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .bootImage
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
@@ -179,7 +179,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .bootImage
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
@@ -211,7 +211,7 @@ struct VMWizardOSLinuxView: View {
selectImage = .bootImage
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}.disabled(wizardState.isBusy)
} header: {
Text("File Imported")
Platform/Shared/VMWizardOSMacView.swift
+1 -1
View File
@@ -40,7 +40,7 @@ struct VMWizardOSMacView: View {
Button {
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
Button {
wizardState.macRecoveryIpswURL = nil
Platform/Shared/VMWizardOSOtherView.swift
+1 -1
View File
@@ -35,7 +35,7 @@ struct VMWizardOSOtherView: View {
Button {
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
Platform/Shared/VMWizardOSWindowsView.swift
+1 -1
View File
@@ -67,7 +67,7 @@ struct VMWizardOSWindowsView: View {
Button {
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
.padding(.leading, 1)
Platform/Shared/VMWizardSharingView.swift
+3 -3
View File
@@ -35,7 +35,7 @@ struct VMWizardSharingView: View {
.font(.caption)
}
if !wizardState.useAppleVirtualization {
Toggle("Read only share?", isOn: $wizardState.sharingReadOnly)
Toggle("Share is read only", isOn: $wizardState.sharingReadOnly)
}
} header: {
Text("Directory Selected")
@@ -46,7 +46,7 @@ struct VMWizardSharingView: View {
Button {
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
Button {
@@ -61,7 +61,7 @@ struct VMWizardSharingView: View {
Button {
isFileImporterPresented.toggle()
} label: {
Text("Browse")
Text("Browse…")
}
.disabled(wizardState.isBusy)
Button {
Platform/iOS/Legacy/VMConfigDrivePickerViewController.m
+1 -1
View File
@@ -195,7 +195,7 @@
- (IBAction)addButton:(UIBarButtonItem *)sender {
UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedString(@"Would you like to import an existing disk image or create a new one?", @"VMConfigDrivePickerViewController") preferredStyle:UIAlertControllerStyleActionSheet];
UIAlertAction *import = [UIAlertAction actionWithTitle:NSLocalizedString(@"Import", @"Import button") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action){
UIAlertAction *import = [UIAlertAction actionWithTitle:NSLocalizedString(@"Import…", @"Import button") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action){
UIDocumentPickerViewController *picker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[@"public.item"] inMode:UIDocumentPickerModeImport];
picker.delegate = self;
picker.modalPresentationStyle = UIModalPresentationFormSheet;
Platform/iOS/Legacy/VMConfigSharingViewController.m
+1 -1
View File
@@ -42,7 +42,7 @@
- (void)showShareDirectoryOptions:(BOOL)visible animated:(BOOL)animated {
[self cells:self.directorySharingCells setHidden:!visible];
if (self.configuration.shareDirectoryName.length == 0) {
self.selectDirectoryCell.detailTextLabel.text = NSLocalizedString(@"Browse...", @"VMConfigSharingViewController");
self.selectDirectoryCell.detailTextLabel.text = NSLocalizedString(@"Browse…", @"VMConfigSharingViewController");
}
[self reloadDataAnimated:animated];
}
Platform/iOS/VMWizardView.swift
+2 -2
View File
@@ -80,14 +80,14 @@ fileprivate struct WizardWrapper: View {
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
if wizardState.currentPage == .start {
Button("Close") {
Button("Cancel") {
onDismiss()
}
}
}
ToolbarItem(placement: .navigationBarTrailing) {
if wizardState.hasNextButton {
Button("Next") {
Button("Continue") {
wizardState.next()
}
} else if wizardState.currentPage == .summary {
Platform/ko.lproj/Localizable.strings
+2 -2
View File
@@ -59,7 +59,7 @@
"Browse" = "선택";
/* VMConfigSharingViewController */
"Browse..." = "탐색...";
"Browse…" = "탐색";
/* Cancel button
VMConfigDirectoryPickerViewController
@@ -314,7 +314,7 @@
"Image Type" = "이미지 종류";
/* Import button */
"Import" = "추가";
"Import…" = "추가";
/* Save VM overlay */
"Importing %@..." = "%@ 추가중...";
Platform/macOS/VMAppleRemovableDrivesView.swift
+2 -2
View File
@@ -46,7 +46,7 @@ struct VMAppleRemovableDrivesView: View {
selectedSharedDirectoryBinding = $sharedDirectory
showFileImporter()
}, label: {
Label("Browse", systemImage: "doc.badge.plus")
Label("Browse…", systemImage: "doc.badge.plus")
})
if hasSharedDir {
// Clear button
@@ -75,7 +75,7 @@ struct VMAppleRemovableDrivesView: View {
selectedDiskImageBinding = $diskImage
showFileImporter()
}, label: {
Label("Browse", systemImage: "doc.badge.plus")
Label("Browse…", systemImage: "doc.badge.plus")
})
// Eject button
if diskImage.isExternal && diskImage.imageURL != nil {
Platform/macOS/VMConfigAppleBootView.swift
+3 -3
View File
@@ -96,7 +96,7 @@ struct VMConfigAppleBootView: View {
HStack {
TextField("Kernel Image", text: .constant(config.bootLoader?.linuxKernelURL?.lastPathComponent ?? ""))
.disabled(true)
Button("Browse") {
Button("Browse…") {
importBootloaderSelection = .kernel
importFileShown = true
}
@@ -107,7 +107,7 @@ struct VMConfigAppleBootView: View {
Button("Clear") {
config.bootLoader?.linuxInitialRamdiskURL = nil
}
Button("Browse") {
Button("Browse…") {
importBootloaderSelection = .ramdisk
importFileShown = true
}
@@ -123,7 +123,7 @@ struct VMConfigAppleBootView: View {
Button("Clear") {
config.macRecoveryIpswURL = nil
}
Button("Browse") {
Button("Browse…") {
importBootloaderSelection = .ipsw
importFileShown = true
}
Platform/macOS/VMConfigDrivesButtons.swift
+3 -3
View File
@@ -54,12 +54,12 @@ struct VMConfigNewDriveButton<Config: ObservableObject & UTMConfigurable>: View
Button(action: { importDrivePresented.toggle() }, label: {
if let _ = config as? UTMQemuConfiguration {
if newQemuDrive.removable {
Text("Browse")
Text("Browse…")
} else {
Text("Import")
Text("Import…")
}
} else {
Text("Import")
Text("Import…")
}
}).help("Select an existing disk image.")
Button(action: { addNewDrive(newQemuDrive) }, label: {
Platform/macOS/VMWizardView.swift
+10 -4
View File
@@ -63,20 +63,26 @@ struct VMWizardView: View {
.frame(width: 450, height: 450)
.toolbar {
ToolbarItem(placement: .automatic) {
Button("Close") {
presentationMode.wrappedValue.dismiss()
if wizardState.currentPage != .start {
Button("Cancel") {
presentationMode.wrappedValue.dismiss()
}
}
}
ToolbarItem(placement: .cancellationAction) {
if wizardState.currentPage != .start {
Button("Back") {
Button("Go Back") {
wizardState.back()
}
} else {
Button("Cancel") {
presentationMode.wrappedValue.dismiss()
}
}
}
ToolbarItem(placement: .confirmationAction) {
if wizardState.hasNextButton {
Button("Next") {
Button("Continue") {
wizardState.next()
}
} else if wizardState.currentPage == .summary {
Platform/zh-Hans.lproj/Localizable.strings
+5 -5
View File
@@ -77,7 +77,7 @@
"Bridged Interface" = "桥接接口";
/* VMConfigSharingViewController */
"Browse..." = "浏览";
"Browse…" = "浏览";
/* No comment provided by engineer. */
"Cancel" = "取消";
@@ -356,7 +356,7 @@
"Image Type" = "格式";
/* Import button */
"Import" = "导入";
"Import…" = "导入";
/* No comment provided by engineer. */
"Import Virtual Machine..." = "导入虚拟机...";
@@ -885,7 +885,7 @@
"Slower, but can run other CPU architectures." = "速度较慢，但虚拟机的CPU架构不受限制";
"Download prebuilt from UTM Gallery..." = "从UTM库下载预配置文件（可能需要手动导入安装镜像）";
"Close" = "关闭";
"Next" = "下一步";
"Continue" = "下一步";
"Generate Windows Installer ISO" = "获取 Windows 安装光盘";
"Boot ISO Image:" = "启动光盘镜像:";
"Boot VHDX Image:" = "启动 VHDX 磁盘镜像:";
@@ -925,7 +925,7 @@
//Share Directory
"Optionally select a directory to make accessible inside the VM. Note that support for shared directories varies by the guest operating system and may require additional guest drivers to be installed. See UTM support pages for more details." = "（可选）选择一个路径，以便在虚拟机内部访问。 请注意，对文件共享的支持因操作系统而异，并且可能需要安装额外的驱动程序。 有关更多详细信息，请参阅 UTM 支持页面";
"Read only share?" = "只读";
"Share is read only" = "只读";
//Summary
"Summary" = "总结";
@@ -1034,7 +1034,7 @@
"Preparing…" = "准备...";
//MacOS View
"Back" = "返回";
"Go Back" = "返回";
"New Drive" = "新建硬盘";
"Delete Drive" = "删除硬盘";
"IDE Drive" = "IDE 硬盘";
Platform/zh-Hant.lproj/Localizable.strings
+5 -5
View File
@@ -119,7 +119,7 @@
"Browse UTM Gallery" = "瀏覽 UTM 資源庫";
/* VMConfigSharingViewController */
"Browse..." = "瀏覽⋯";
"Browse…" = "瀏覽⋯";
/* Cancel button
VMConfigDirectoryPickerViewController
@@ -518,7 +518,7 @@
"Image Type" = "映像檔類型";
/* Import button */
"Import" = "匯入";
"Import…" = "匯入⋯";
/* No comment provided by engineer. */
"Import Drive" = "匯入磁碟機";
@@ -698,7 +698,7 @@
"New..." = "新增⋯";
/* No comment provided by engineer. */
"Next" = "下一步";
"Continue" = "下一步";
/* No button
VMDisplayViewController
@@ -806,7 +806,7 @@
"Read Only" = "唯讀";
/* No comment provided by engineer. */
"Read only share?" = "是否要唯讀共享？";
"Share is read only" = "是否要唯讀共享？";
/* No comment provided by engineer. */
"Removable" = "可卸除式";
@@ -1087,7 +1087,7 @@
"Zoom" = "縮放";
/* Manually added: Common > Button */
"Back" = "返回";
"Go Back" = "返回";
/* Manually added: Create a New Virtual Machine > macOS */
"To install macOS, you need to download a recovery IPSW. If you do not select an existing IPSW, the latest macOS IPSW will be downloaded from Apple." = "要安裝 macOS，您需要下載復原 IPSW。如果您這裡沒有選擇 IPSW，UTM 將會從 Apple 下載最新的 macOS IPSW。";