Skip to content
This repository was archived by the owner on May 11, 2025. It is now read-only.

Commit 79ba9e3

Browse files
committed
Add menu bar
1 parent 674f4bd commit 79ba9e3

17 files changed

Lines changed: 474 additions & 43 deletions

File tree

Whisky.xcodeproj/project.pbxproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
8C73E1342AF472FC00B6FB45 /* ProgramMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C73E1332AF472FC00B6FB45 /* ProgramMenuView.swift */; };
5656
8CB681E52AED7C6F0018D319 /* WhiskyKit in Resources */ = {isa = PBXBuildFile; fileRef = 8CB681E42AED7C6F0018D319 /* WhiskyKit */; };
5757
8CB681E72AED7CD00018D319 /* WhiskyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 8CB681E62AED7CD00018D319 /* WhiskyKit */; };
58+
8CB681EA2AEDEDC20018D319 /* WhiskyBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */; };
59+
8CB681EC2AEDEDE70018D319 /* BottleBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */; };
60+
8CB681EE2AEDEE2F0018D319 /* ProgramBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */; };
61+
8CB681F12AEDF9620018D319 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */; };
5862
AB66A8642A4195B10006D238 /* Rosetta2.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB66A8632A4195B10006D238 /* Rosetta2.swift */; };
5963
EB58FB552A499896002DC184 /* SemanticVersion in Frameworks */ = {isa = PBXBuildFile; productRef = EB58FB542A499896002DC184 /* SemanticVersion */; };
6064
EEA5A2462A31DD65008274AE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA5A2452A31DD65008274AE /* AppDelegate.swift */; };
@@ -150,6 +154,10 @@
150154
6EFDF6652AAE303300EF622F /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = "<group>"; };
151155
8C73E1332AF472FC00B6FB45 /* ProgramMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramMenuView.swift; sourceTree = "<group>"; };
152156
8CB681E42AED7C6F0018D319 /* WhiskyKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = WhiskyKit; sourceTree = "<group>"; };
157+
8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiskyBarView.swift; sourceTree = "<group>"; };
158+
8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottleBarView.swift; sourceTree = "<group>"; };
159+
8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramBarView.swift; sourceTree = "<group>"; };
160+
8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Extensions.swift"; sourceTree = "<group>"; };
153161
AB66A8632A4195B10006D238 /* Rosetta2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rosetta2.swift; sourceTree = "<group>"; };
154162
EEA5A2452A31DD65008274AE /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
155163
/* End PBXFileReference section */
@@ -257,6 +265,7 @@
257265
6E40495429CCA19C006E3F1B /* Whisky */ = {
258266
isa = PBXGroup;
259267
children = (
268+
8CB681EF2AEDF9450018D319 /* Extensions */,
260269
EEA5A2452A31DD65008274AE /* AppDelegate.swift */,
261270
6E5197CF29D71FF900CF655E /* Models */,
262271
6E5197D029D7200700CF655E /* Utils */,
@@ -290,6 +299,7 @@
290299
6E5197CD29D71FCD00CF655E /* Views */ = {
291300
isa = PBXGroup;
292301
children = (
302+
8CB681E82AEDED9D0018D319 /* Menu Bar */,
293303
63FFDE822ADEFADF00178665 /* Common */,
294304
6E49E01F2AECB7D000009CAC /* Settings */,
295305
6E6C0CF02A419A5800356232 /* Setup */,
@@ -373,6 +383,24 @@
373383
path = WhiskyThumbnail;
374384
sourceTree = "<group>";
375385
};
386+
8CB681E82AEDED9D0018D319 /* Menu Bar */ = {
387+
isa = PBXGroup;
388+
children = (
389+
8CB681E92AEDEDC20018D319 /* WhiskyBarView.swift */,
390+
8CB681EB2AEDEDE70018D319 /* BottleBarView.swift */,
391+
8CB681ED2AEDEE2F0018D319 /* ProgramBarView.swift */,
392+
);
393+
path = "Menu Bar";
394+
sourceTree = "<group>";
395+
};
396+
8CB681EF2AEDF9450018D319 /* Extensions */ = {
397+
isa = PBXGroup;
398+
children = (
399+
8CB681F02AEDF9620018D319 /* Bundle+Extensions.swift */,
400+
);
401+
path = Extensions;
402+
sourceTree = "<group>";
403+
};
376404
/* End PBXGroup section */
377405

378406
/* Begin PBXNativeTarget section */
@@ -563,6 +591,7 @@
563591
buildActionMask = 2147483647;
564592
files = (
565593
EEA5A2462A31DD65008274AE /* AppDelegate.swift in Sources */,
594+
8CB681EE2AEDEE2F0018D319 /* ProgramBarView.swift in Sources */,
566595
6E70A4A12A9A280C007799E9 /* WhiskyCmd.swift in Sources */,
567596
6E40495829CCA19C006E3F1B /* ContentView.swift in Sources */,
568597
6EF557982A410599001A4F09 /* SetupView.swift in Sources */,
@@ -578,13 +607,16 @@
578607
6E17B6492AF4118F00831173 /* EnvironmentArgView.swift in Sources */,
579608
6E6C0CF42A419A7600356232 /* RosettaView.swift in Sources */,
580609
6E6C0CF82A419A8C00356232 /* GPTKInstallView.swift in Sources */,
610+
8CB681F12AEDF9620018D319 /* Bundle+Extensions.swift in Sources */,
581611
6E40498329CCA91B006E3F1B /* Bottle.swift in Sources */,
582612
6E621CEF2A5F631300C9AAB3 /* Winetricks.swift in Sources */,
613+
8CB681EA2AEDEDC20018D319 /* WhiskyBarView.swift in Sources */,
583614
6E17B6462AF3FDC100831173 /* PinsView.swift in Sources */,
584615
6E064B1429DD331F00D9A2D2 /* SparkleView.swift in Sources */,
585616
6E40495629CCA19C006E3F1B /* WhiskyApp.swift in Sources */,
586617
8C73E1342AF472FC00B6FB45 /* ProgramMenuView.swift in Sources */,
587618
6E50D98329CD6066008C39F6 /* BottleVM.swift in Sources */,
619+
8CB681EC2AEDEDE70018D319 /* BottleBarView.swift in Sources */,
588620
6E6915452A3265BB0085BBB7 /* Logger.swift in Sources */,
589621
6E49E0212AECB7DB00009CAC /* SettingsView.swift in Sources */,
590622
6E7C07C02AAF570100F6E66B /* FileOpenView.swift in Sources */,
@@ -766,6 +798,7 @@
766798
INFOPLIST_KEY_NSCameraUsageDescription = "A Windows application is trying to access the camera.";
767799
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © Whisky";
768800
INFOPLIST_KEY_NSMicrophoneUsageDescription = "A Windows application is trying to access the microphone.";
801+
INFOPLIST_KEY_UIStatusBarStyle = "";
769802
LD_RUNPATH_SEARCH_PATHS = (
770803
"$(inherited)",
771804
"@executable_path/../Frameworks",

Whisky/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
3939
}
4040

4141
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
42-
return true
42+
return false
4343
}
4444

4545
private static var appUrl: URL? {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
},
6+
"symbols" : [
7+
{
8+
"filename" : "whisky.glass.svg",
9+
"idiom" : "universal"
10+
}
11+
]
12+
}

0 commit comments

Comments
 (0)