Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add menu bar #571

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+472 −50
Open

Add menu bar #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77da4d6
Fix Localizable
cuba Nov 27, 2023
4304725
Add menu bar
cuba Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions Whisky.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
8C73E1342AF472FC00B6FB45 /* ProgramMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C73E1332AF472FC00B6FB45 /* ProgramMenuView.swift */; };
8CB681E52AED7C6F0018D319 /* WhiskyKit in Resources */ = {isa = PBXBuildFile; fileRef = 8CB681E42AED7C6F0018D319 /* WhiskyKit */; };
8CB681E72AED7CD00018D319 /* WhiskyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 8CB681E62AED7CD00018D319 /* WhiskyKit */; };
8CB681EA2AEDEDC20018D319 /* WhiskyBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */; };
8CB681EC2AEDEDE70018D319 /* BottleBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */; };
8CB681EE2AEDEE2F0018D319 /* ProgramBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */; };
8CB681F12AEDF9620018D319 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */; };
AB66A8642A4195B10006D238 /* Rosetta2.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB66A8632A4195B10006D238 /* Rosetta2.swift */; };
DB696FC82AFAE5DA0037EB2F /* PinCreationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB696FC72AFAE5DA0037EB2F /* PinCreationView.swift */; };
EB58FB552A499896002DC184 /* SemanticVersion in Frameworks */ = {isa = PBXBuildFile; productRef = EB58FB542A499896002DC184 /* SemanticVersion */; };
Expand Down Expand Up @@ -155,6 +159,10 @@
6EFDF6652AAE303300EF622F /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = "<group>"; };
8C73E1332AF472FC00B6FB45 /* ProgramMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramMenuView.swift; sourceTree = "<group>"; };
8CB681E42AED7C6F0018D319 /* WhiskyKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = WhiskyKit; sourceTree = "<group>"; };
8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiskyBarView.swift; sourceTree = "<group>"; };
8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottleBarView.swift; sourceTree = "<group>"; };
8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramBarView.swift; sourceTree = "<group>"; };
8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Extensions.swift"; sourceTree = "<group>"; };
AB66A8632A4195B10006D238 /* Rosetta2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rosetta2.swift; sourceTree = "<group>"; };
DB696FC72AFAE5DA0037EB2F /* PinCreationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinCreationView.swift; sourceTree = "<group>"; };
EEA5A2452A31DD65008274AE /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -266,6 +274,7 @@
6E40495429CCA19C006E3F1B /* Whisky */ = {
isa = PBXGroup;
children = (
8CB681EF2AEDF9450018D319 /* Extensions */,
EEA5A2452A31DD65008274AE /* AppDelegate.swift */,
6E5197CF29D71FF900CF655E /* Models */,
6E5197D029D7200700CF655E /* Utils */,
Expand Down Expand Up @@ -299,6 +308,7 @@
6E5197CD29D71FCD00CF655E /* Views */ = {
isa = PBXGroup;
children = (
8CB681E82AEDED9D0018D319 /* Menu Bar */,
63FFDE822ADEFADF00178665 /* Common */,
6E49E01F2AECB7D000009CAC /* Settings */,
6E6C0CF02A419A5800356232 /* Setup */,
Expand Down Expand Up @@ -382,6 +392,24 @@
path = WhiskyThumbnail;
sourceTree = "<group>";
};
8CB681E82AEDED9D0018D319 /* Menu Bar */ = {
isa = PBXGroup;
children = (
8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */,
8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */,
8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */,
);
path = "Menu Bar";
sourceTree = "<group>";
};
8CB681EF2AEDF9450018D319 /* Extensions */ = {
isa = PBXGroup;
children = (
8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -572,6 +600,7 @@
buildActionMask = 2147483647;
files = (
EEA5A2462A31DD65008274AE /* AppDelegate.swift in Sources */,
8CB681EE2AEDEE2F0018D319 /* ProgramBarView.swift in Sources */,
6E70A4A12A9A280C007799E9 /* WhiskyCmd.swift in Sources */,
6E40495829CCA19C006E3F1B /* ContentView.swift in Sources */,
6EF557982A410599001A4F09 /* SetupView.swift in Sources */,
Expand All @@ -589,13 +618,16 @@
6E17B6492AF4118F00831173 /* EnvironmentArgView.swift in Sources */,
6E6C0CF42A419A7600356232 /* RosettaView.swift in Sources */,
6E6C0CF82A419A8C00356232 /* GPTKInstallView.swift in Sources */,
8CB681F12AEDF9620018D319 /* Bundle+Extensions.swift in Sources */,
6E40498329CCA91B006E3F1B /* Bottle.swift in Sources */,
6E621CEF2A5F631300C9AAB3 /* Winetricks.swift in Sources */,
8CB681EA2AEDEDC20018D319 /* WhiskyBarView.swift in Sources */,
6E17B6462AF3FDC100831173 /* PinView.swift in Sources */,
6E064B1429DD331F00D9A2D2 /* SparkleView.swift in Sources */,
6E40495629CCA19C006E3F1B /* WhiskyApp.swift in Sources */,
8C73E1342AF472FC00B6FB45 /* ProgramMenuView.swift in Sources */,
6E50D98329CD6066008C39F6 /* BottleVM.swift in Sources */,
8CB681EC2AEDEDE70018D319 /* BottleBarView.swift in Sources */,
6E6915452A3265BB0085BBB7 /* Logger.swift in Sources */,
6E2B25C12B0E20F50084A67A /* PinAddView.swift in Sources */,
6E49E0212AECB7DB00009CAC /* SettingsView.swift in Sources */,
Expand Down Expand Up @@ -778,6 +810,7 @@
INFOPLIST_KEY_NSCameraUsageDescription = "A Windows application is trying to access the camera.";
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © Whisky";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "A Windows application is trying to access the microphone.";
INFOPLIST_KEY_UIStatusBarStyle = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
Expand Down
2 changes: 1 addition & 1 deletion Whisky/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}

func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
return false
}

private static var appUrl: URL? {
Expand Down
6 changes: 6 additions & 0 deletions Whisky/Assets.xcassets/MenuBar/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
12 changes: 12 additions & 0 deletions Whisky/Assets.xcassets/MenuBar/whisky.glass.symbolset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"symbols" : [
{
"filename" : "whisky.glass.svg",
"idiom" : "universal"
}
]
}