From c63c531f1b3b829e89ed5003eabd47c9b0fb5865 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 2 Mar 2024 22:04:29 +0800 Subject: [PATCH] MainAssembly // Include remaining AppDelegate IBOutlets. --- .../Sources/MainAssembly/AppDelegate.swift | 6 ++++++ Source/Modules/AppDelegateImpl.swift | 20 ------------------- vChewing.xcodeproj/project.pbxproj | 4 ---- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 Source/Modules/AppDelegateImpl.swift diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/AppDelegate.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/AppDelegate.swift index 105b669e..3f68e265 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/AppDelegate.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/AppDelegate.swift @@ -169,4 +169,10 @@ public extension AppDelegate { } return currentMemorySize } + + // New About Window + @IBAction func about(_: Any) { + CtlAboutUI.show() + NSApp.popup() + } } diff --git a/Source/Modules/AppDelegateImpl.swift b/Source/Modules/AppDelegateImpl.swift deleted file mode 100644 index 06f20afd..00000000 --- a/Source/Modules/AppDelegateImpl.swift +++ /dev/null @@ -1,20 +0,0 @@ -// (c) 2011 and onwards The OpenVanilla Project (MIT License). -// All possible vChewing-specific modifications are of: -// (c) 2021 and onwards The vChewing Project (MIT-NTL License). -// ==================== -// This code is released under the MIT license (SPDX-License-Identifier: MIT) -// ... with NTL restriction stating that: -// No trademark license is granted to use the trade names, trademarks, service -// marks, or product names of Contributor, except as required to fulfill notice -// requirements defined in MIT License. - -import AppKit -import MainAssembly - -extension AppDelegate { - // New About Window - @IBAction func about(_: Any) { - CtlAboutUI.show() - NSApp.popup() - } -} diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index e39bf78c..514a05fe 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -64,7 +64,6 @@ 6ACA41FA15FC1D9000935EF6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6ACA41EA15FC1D9000935EF6 /* InfoPlist.strings */; }; 6ACA41FC15FC1D9000935EF6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6ACA41EE15FC1D9000935EF6 /* Localizable.strings */; }; 6ACA420215FC1E5200935EF6 /* vChewing.app in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EA215FC0D2D00ABF4B3 /* vChewing.app */; }; - D427F76C278CA2B0004A2160 /* AppDelegateImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D427F76B278CA1BA004A2160 /* AppDelegateImpl.swift */; }; D47B92C027972AD100458394 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D47B92BF27972AC800458394 /* main.swift */; }; D4E33D8F27A838F0006DB1CF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D4E33D8D27A838F0006DB1CF /* InfoPlist.strings */; }; /* End PBXBuildFile section */ @@ -184,7 +183,6 @@ 6ACA41EB15FC1D9000935EF6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 6ACA41EF15FC1D9000935EF6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 6ACA41F215FC1D9000935EF6 /* Installer-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Installer-Info.plist"; path = "Installer/Installer-Info.plist"; sourceTree = SOURCE_ROOT; }; - D427F76B278CA1BA004A2160 /* AppDelegateImpl.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = AppDelegateImpl.swift; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; D47B92BF27972AC800458394 /* main.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = main.swift; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; D4E33D8E27A838F0006DB1CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = ""; }; /* End PBXFileReference section */ @@ -431,7 +429,6 @@ 6A0D4F1215FC0EB100ABF4B3 /* Modules */ = { isa = PBXGroup; children = ( - D427F76B278CA1BA004A2160 /* AppDelegateImpl.swift */, D47B92BF27972AC800458394 /* main.swift */, ); path = Modules; @@ -711,7 +708,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D427F76C278CA2B0004A2160 /* AppDelegateImpl.swift in Sources */, D47B92C027972AD100458394 /* main.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0;