diff --git a/Xcodes/Backend/AppState.swift b/Xcodes/Backend/AppState.swift index 46a5d63..47c89dc 100644 --- a/Xcodes/Backend/AppState.swift +++ b/Xcodes/Backend/AppState.swift @@ -104,6 +104,12 @@ class AppState: ObservableObject { } } + @Published var terminateAfterLastWindowClosed = false { + didSet { + Current.defaults.set(terminateAfterLastWindowClosed, forKey: "terminateAfterLastWindowClosed") + } + } + // MARK: - Runtimes @Published var downloadableRuntimes: [DownloadableRuntime] = [] @@ -173,6 +179,7 @@ class AppState: ObservableObject { onSelectActionType = SelectedActionType(rawValue: Current.defaults.string(forKey: "onSelectActionType") ?? "none") ?? .none installPath = Current.defaults.string(forKey: "installPath") ?? Path.defaultInstallDirectory.string showOpenInRosettaOption = Current.defaults.bool(forKey: "showOpenInRosettaOption") ?? false + terminateAfterLastWindowClosed = Current.defaults.bool(forKey: "terminateAfterLastWindowClosed") ?? false } // MARK: Timer diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index c9531c5..77d2bf8 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -151,6 +151,11 @@ struct AdvancedPreferencePane: View { } } .groupBoxStyle(PreferencesGroupBoxStyle()) + + GroupBox(label: Text("Misc")) { + Toggle("TerminateAfterLastWindowClosed", isOn: $appState.terminateAfterLastWindowClosed) + } + .groupBoxStyle(PreferencesGroupBoxStyle()) } } } diff --git a/Xcodes/Resources/Localizable.xcstrings b/Xcodes/Resources/Localizable.xcstrings index 6d61d71..0d89440 100644 --- a/Xcodes/Resources/Localizable.xcstrings +++ b/Xcodes/Resources/Localizable.xcstrings @@ -14829,6 +14829,28 @@ } } }, + "Misc" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Misc" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "杂项" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "雜項" + } + } + } + }, "Moving" : { "extractionState" : "manual", "localizations" : { @@ -20721,6 +20743,28 @@ } } }, + "TerminateAfterLastWindowClosed" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Terminate App after last window is closed" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "在最后一个窗口关闭后终止App" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "在最後一個窗口關閉後終止 App" + } + } + } + }, "TrashingArchive" : { "extractionState" : "manual", "localizations" : { diff --git a/Xcodes/XcodesApp.swift b/Xcodes/XcodesApp.swift index 363c19b..a7835dd 100644 --- a/Xcodes/XcodesApp.swift +++ b/Xcodes/XcodesApp.swift @@ -166,6 +166,10 @@ class AppDelegate: NSObject, NSApplicationDelegate { } func applicationDidFinishLaunching(_: Notification) {} + + func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return Current.defaults.bool(forKey: "terminateAfterLastWindowClosed") ?? false + } } func localizeString(_ key: String, comment: String = "") -> String {