diff --git a/Whisky/Assets.xcassets/MenuBar/Contents.json b/Whisky/Assets.xcassets/MenuBar/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/Whisky/Assets.xcassets/MenuBar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/Contents.json b/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/Contents.json new file mode 100644 index 000000000..d4b340016 --- /dev/null +++ b/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "whisky.glass.svg", + "idiom" : "universal" + } + ] +} diff --git a/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/whisky.glass.svg b/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/whisky.glass.svg new file mode 100644 index 000000000..9d683161c --- /dev/null +++ b/Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/whisky.glass.svg @@ -0,0 +1,101 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from whisky.glass + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Whisky/Models/Bottle.swift b/Whisky/Models/Bottle.swift index 49292ba54..55be6a9f6 100644 --- a/Whisky/Models/Bottle.swift +++ b/Whisky/Models/Bottle.swift @@ -26,7 +26,7 @@ extension Bottle { static let logger = Logger( subsystem: Bundle.main.bundleIdentifier ?? Bundle.wiskeyBundleIdentifier, category: "Bottle" ) - + func openCDrive() { NSWorkspace.shared.open(url.appending(path: "drive_c")) } @@ -184,7 +184,7 @@ extension Bottle { func rename(newName: String) { settings.name = newName } - + @MainActor /// Open a panel to chose a file for running /// - Returns: URL of the file we wish to run @@ -202,7 +202,7 @@ extension Bottle { guard result == .OK else { return nil } return panel.urls.first } - + @MainActor /// Open an open panel, chose a file and attempt to run it /// - Returns: true or false if a file was run diff --git a/Whisky/Views/WhiskyApp.swift b/Whisky/Views/WhiskyApp.swift index 1d3838011..5e8ad75e2 100644 --- a/Whisky/Views/WhiskyApp.swift +++ b/Whisky/Views/WhiskyApp.swift @@ -115,7 +115,7 @@ struct WhiskyApp: App { } // MARK: - Menu bar - MenuBarExtra("menubar.title", systemImage: "wineglass") { + MenuBarExtra("menubar.title", image: "whisky.glass") { WhiskyBarView() } }