From 53e319d913cc834ed04d7c05f35fa0dae16342a2 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 19 Sep 2023 16:02:50 +0800 Subject: [PATCH] Preferences // Use ObjC instead. --- Preferences/Base.lproj/Preferences.xib | 11 ++++++---- Preferences/Preferences.h | 10 +++++++++ Preferences/Preferences.m | 11 ++++++++++ Preferences/Preferences.swift | 20 ------------------ vChewing.xcodeproj/project.pbxproj | 28 +++++++++----------------- 5 files changed, 37 insertions(+), 43 deletions(-) create mode 100644 Preferences/Preferences.h create mode 100644 Preferences/Preferences.m delete mode 100644 Preferences/Preferences.swift diff --git a/Preferences/Base.lproj/Preferences.xib b/Preferences/Base.lproj/Preferences.xib index af488e3c..63ebca7a 100644 --- a/Preferences/Base.lproj/Preferences.xib +++ b/Preferences/Base.lproj/Preferences.xib @@ -1,15 +1,15 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -39,6 +39,9 @@ Memo: This screen is only for testing whether customized IME preferences work in + + + diff --git a/Preferences/Preferences.h b/Preferences/Preferences.h new file mode 100644 index 00000000..64e263cf --- /dev/null +++ b/Preferences/Preferences.h @@ -0,0 +1,10 @@ +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface Preferences : NSPreferencePane +@property (strong) IBOutlet NSTextField *lblDisclaimer; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Preferences/Preferences.m b/Preferences/Preferences.m new file mode 100644 index 00000000..d2a216b4 --- /dev/null +++ b/Preferences/Preferences.m @@ -0,0 +1,11 @@ +#import "Preferences.h" + +@implementation Preferences + +-(void) mainViewDidLoad { + [[self mainView] setFrameSize: NSMakeSize(420.0f, 330.0f)]; + [_lblDisclaimer sizeToFit]; + [_lblDisclaimer setFrameSize: NSMakeSize(384.0f, 296.0f)]; +} + +@end diff --git a/Preferences/Preferences.swift b/Preferences/Preferences.swift deleted file mode 100644 index 04caea8b..00000000 --- a/Preferences/Preferences.swift +++ /dev/null @@ -1,20 +0,0 @@ -import PreferencePanes - -@objc(Preferences) -public class Preferences: NSPreferencePane { - @IBOutlet var lblDisclaimer: NSTextField! - override public func mainViewDidLoad() { - // let label: NSTextField = { - // let result = NSTextField() - // result.stringValue = "114514" - // result.font = NSFont.systemFont(ofSize: 12) - // result.isEditable = false - // result.isSelectable = false - // return result - // }() - // mainView.addSubview(label) - mainView.setFrameSize(.init(width: 420, height: 330.0)) - lblDisclaimer.sizeToFit() - lblDisclaimer.setFrameSize(.init(width: 384.0, height: 296.0)) - } -} diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index 8b5dc910..98a61b74 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 5B0E22A628FC11B900EB7ACA /* Preferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5B0E22A528FC11B900EB7ACA /* Preferences.tiff */; }; 5B0E22A928FC11B900EB7ACA /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B0E22A728FC11B900EB7ACA /* Preferences.xib */; }; 5B0E22B028FC17CB00EB7ACA /* Preferences.prefPane in Resources */ = {isa = PBXBuildFile; fileRef = 5B0E229F28FC11B900EB7ACA /* Preferences.prefPane */; }; - 5B0E22B228FC318C00EB7ACA /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0E22B128FC318C00EB7ACA /* Preferences.swift */; }; 5B0EF55D28CDBF7100F8F7CE /* frmClientListMgr.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B0EF55C28CDBF7100F8F7CE /* frmClientListMgr.xib */; }; 5B0EF55F28CDBF8E00F8F7CE /* CtlClientListMgr.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0EF55E28CDBF8E00F8F7CE /* CtlClientListMgr.swift */; }; 5B1C98B929436CEE0019B807 /* data-bpmf-reverse-lookup.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B1C98B729436CED0019B807 /* data-bpmf-reverse-lookup.json */; }; @@ -34,6 +33,8 @@ 5B70F4EA2A0BE900005EA8C4 /* MenuIcon-SCVIM.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B70F4E62A0BE900005EA8C4 /* MenuIcon-SCVIM.png */; }; 5B70F4EB2A0BE900005EA8C4 /* MenuIcon-SCVIM@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B70F4E72A0BE900005EA8C4 /* MenuIcon-SCVIM@2x.png */; }; 5B70F4EC2A0BE900005EA8C4 /* MenuIcon-TCVIM@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B70F4E82A0BE900005EA8C4 /* MenuIcon-TCVIM@2x.png */; }; + 5B72D55C2AB98B8300FB88CE /* Preferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B72D55A2AB98B8300FB88CE /* Preferences.h */; }; + 5B72D55D2AB98B8300FB88CE /* Preferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B72D55B2AB98B8300FB88CE /* Preferences.m */; }; 5B765F09293A253C00122315 /* PhraseEditorUI in Frameworks */ = {isa = PBXBuildFile; productRef = 5B765F08293A253C00122315 /* PhraseEditorUI */; }; 5B78EE0D28A562B4009456C1 /* VwrPrefPaneDevZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B78EE0C28A562B4009456C1 /* VwrPrefPaneDevZone.swift */; }; 5B7BC4B027AFFBE800F66C24 /* frmPrefWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B7BC4AE27AFFBE800F66C24 /* frmPrefWindow.xib */; }; @@ -165,7 +166,6 @@ 5B0E22A528FC11B900EB7ACA /* Preferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Preferences.tiff; sourceTree = ""; }; 5B0E22A828FC11B900EB7ACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Preferences.xib; sourceTree = ""; }; 5B0E22AA28FC11B900EB7ACA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 5B0E22B128FC318C00EB7ACA /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; 5B0EF55C28CDBF7100F8F7CE /* frmClientListMgr.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = frmClientListMgr.xib; sourceTree = ""; }; 5B0EF55E28CDBF8E00F8F7CE /* CtlClientListMgr.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CtlClientListMgr.swift; sourceTree = ""; }; 5B18BA6F27C7BD8B0056EB19 /* LICENSE-CHS.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "LICENSE-CHS.txt"; sourceTree = ""; }; @@ -198,6 +198,8 @@ 5B70F4E62A0BE900005EA8C4 /* MenuIcon-SCVIM.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MenuIcon-SCVIM.png"; sourceTree = ""; }; 5B70F4E72A0BE900005EA8C4 /* MenuIcon-SCVIM@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MenuIcon-SCVIM@2x.png"; sourceTree = ""; }; 5B70F4E82A0BE900005EA8C4 /* MenuIcon-TCVIM@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MenuIcon-TCVIM@2x.png"; sourceTree = ""; }; + 5B72D55A2AB98B8300FB88CE /* Preferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Preferences.h; sourceTree = ""; }; + 5B72D55B2AB98B8300FB88CE /* Preferences.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Preferences.m; sourceTree = ""; }; 5B765F07293A250000122315 /* vChewing_PhraseEditorUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = vChewing_PhraseEditorUI; path = Packages/vChewing_PhraseEditorUI; sourceTree = ""; }; 5B78EE0C28A562B4009456C1 /* VwrPrefPaneDevZone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VwrPrefPaneDevZone.swift; sourceTree = ""; }; 5B7BC4AF27AFFBE800F66C24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/frmPrefWindow.xib; sourceTree = ""; }; @@ -347,7 +349,8 @@ 5B0E22A028FC11B900EB7ACA /* Preferences */ = { isa = PBXGroup; children = ( - 5B0E22B128FC318C00EB7ACA /* Preferences.swift */, + 5B72D55A2AB98B8300FB88CE /* Preferences.h */, + 5B72D55B2AB98B8300FB88CE /* Preferences.m */, 5B0E22A528FC11B900EB7ACA /* Preferences.tiff */, 5B0E22A728FC11B900EB7ACA /* Preferences.xib */, 5B0E22AA28FC11B900EB7ACA /* Info.plist */, @@ -648,6 +651,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 5B72D55C2AB98B8300FB88CE /* Preferences.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -754,7 +758,7 @@ TargetAttributes = { 5B0E229E28FC11B900EB7ACA = { CreatedOnToolsVersion = 14.0; - LastSwiftMigration = 1400; + LastSwiftMigration = 1500; }; 6A0D4EA115FC0D2D00ABF4B3 = { LastSwiftMigration = 1400; @@ -956,7 +960,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5B0E22B228FC318C00EB7ACA /* Preferences.swift in Sources */, + 5B72D55D2AB98B8300FB88CE /* Preferences.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1157,13 +1161,6 @@ INFOPLIST_KEY_NSMainNibFile = Preferences; INFOPLIST_KEY_NSPrincipalClass = Preferences; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "$(LD_RUNPATH_SEARCH_PATHS_SHALLOW_BUNDLE_$(SHALLOW_BUNDLE))", - "@loader_path/../Frameworks", - "@loader_path/../../../../Frameworks", - /usr/lib/swift, - ); MACOSX_DEPLOYMENT_TARGET = 10.13.4; MARKETING_VERSION = 3.5.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -1206,13 +1203,6 @@ INFOPLIST_KEY_NSMainNibFile = Preferences; INFOPLIST_KEY_NSPrincipalClass = Preferences; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "$(LD_RUNPATH_SEARCH_PATHS_SHALLOW_BUNDLE_$(SHALLOW_BUNDLE))", - "@loader_path/../Frameworks", - "@loader_path/../../../../Frameworks", - /usr/lib/swift, - ); MACOSX_DEPLOYMENT_TARGET = 10.13.4; MARKETING_VERSION = 3.5.5; MTL_ENABLE_DEBUG_INFO = NO;