diff --git a/Platform/Assets.xcassets/Logo-Linux.imageset/Contents.json b/Platform/Assets.xcassets/Logo-Linux.imageset/Contents.json new file mode 100644 index 00000000..1454c22a --- /dev/null +++ b/Platform/Assets.xcassets/Logo-Linux.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "linux.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Platform/Assets.xcassets/Logo-Linux.imageset/linux.pdf b/Platform/Assets.xcassets/Logo-Linux.imageset/linux.pdf new file mode 100644 index 00000000..1e9a023f Binary files /dev/null and b/Platform/Assets.xcassets/Logo-Linux.imageset/linux.pdf differ diff --git a/Platform/Assets.xcassets/Logo-Windows.imageset/Contents.json b/Platform/Assets.xcassets/Logo-Windows.imageset/Contents.json new file mode 100644 index 00000000..0aeefd92 --- /dev/null +++ b/Platform/Assets.xcassets/Logo-Windows.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "windows.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Platform/Assets.xcassets/Logo-Windows.imageset/windows.pdf b/Platform/Assets.xcassets/Logo-Windows.imageset/windows.pdf new file mode 100644 index 00000000..cf9da0c7 Binary files /dev/null and b/Platform/Assets.xcassets/Logo-Windows.imageset/windows.pdf differ diff --git a/Platform/Assets.xcassets/Logo-macOS.imageset/Contents.json b/Platform/Assets.xcassets/Logo-macOS.imageset/Contents.json new file mode 100644 index 00000000..2f8eda72 --- /dev/null +++ b/Platform/Assets.xcassets/Logo-macOS.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "macos.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Platform/Assets.xcassets/Logo-macOS.imageset/macos.pdf b/Platform/Assets.xcassets/Logo-macOS.imageset/macos.pdf new file mode 100644 index 00000000..b9f771b0 Binary files /dev/null and b/Platform/Assets.xcassets/Logo-macOS.imageset/macos.pdf differ diff --git a/Platform/Shared/VMWizardOSView.swift b/Platform/Shared/VMWizardOSView.swift index e9155941..96bbb22a 100644 --- a/Platform/Shared/VMWizardOSView.swift +++ b/Platform/Shared/VMWizardOSView.swift @@ -29,7 +29,7 @@ struct VMWizardOSView: View { wizardState.isGuestToolsInstallRequested = false wizardState.next() } label: { - OperatingSystem(imageName: "mac", name: "macOS 12+") + OperatingSystem(imageName: "Logo-macOS", name: "macOS 12+") } } #endif @@ -40,7 +40,7 @@ struct VMWizardOSView: View { wizardState.isGuestToolsInstallRequested = false wizardState.next() } label: { - OperatingSystem(imageName: "macos", name: "Classic Mac OS") + OperatingSystem(imageName: "Logo-macOS", name: "Classic Mac OS") } } Button { @@ -49,18 +49,14 @@ struct VMWizardOSView: View { wizardState.isGuestToolsInstallRequested = true wizardState.next() } label: { - if wizardState.useVirtualization { - OperatingSystem(imageName: "windows-11", name: "Windows") - } else { - OperatingSystem(imageName: "windows-9x", name: "Windows") - } + OperatingSystem(imageName: "Logo-Windows", name: "Windows") } Button { wizardState.operatingSystem = .Linux wizardState.isGuestToolsInstallRequested = false wizardState.next() } label: { - OperatingSystem(imageName: "linux", name: "Linux") + OperatingSystem(imageName: "Logo-Linux", name: "Linux") } } header: { Text("Preconfigured") @@ -95,18 +91,13 @@ struct OperatingSystem: View { let imageName: String let name: LocalizedStringKey - private var imageURL: URL { - let path = Bundle.main.path(forResource: imageName, ofType: "png", inDirectory: "Icons")! - return URL(fileURLWithPath: path) - } - #if os(macOS) private var icon: Image { - Image(nsImage: NSImage(byReferencing: imageURL)) + Image(nsImage: NSImage(named: imageName)!) } #else private var icon: Image { - Image(uiImage: UIImage(contentsOfURL: imageURL)!) + Image(uiImage: UIImage(named: imageName)!) } #endif