From a834e913a593091b3d5580dbd3b9c8a7063093c0 Mon Sep 17 00:00:00 2001 From: ShikiSuen <3164826+ShikiSuen@users.noreply.github.com> Date: Sat, 20 Aug 2022 20:51:08 +0800 Subject: [PATCH 1/4] PrefWindow // Stop rebooting on ticking the 2nd checkbox of the DevZone. --- Source/WindowControllers/ctlPrefWindow.swift | 1 + Source/WindowNIBs/Base.lproj/frmPrefWindow.xib | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WindowControllers/ctlPrefWindow.swift b/Source/WindowControllers/ctlPrefWindow.swift index 26decb55..161ed061 100644 --- a/Source/WindowControllers/ctlPrefWindow.swift +++ b/Source/WindowControllers/ctlPrefWindow.swift @@ -240,6 +240,7 @@ class ctlPrefWindow: NSWindowController { } @IBAction func updateIMKCandidateEnableStatusAction(_: Any) { + NSLog("vChewing App self-terminated due to enabling / disabling IMK candidate window.") NSApplication.shared.terminate(nil) } diff --git a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib index 5d59da3c..26169615 100644 --- a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib +++ b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib @@ -1111,7 +1111,6 @@ Features listed here may not work as expected. - From ed85b54eb7c7aa265e5a9271b7cdf61455831c2d Mon Sep 17 00:00:00 2001 From: ShikiSuen <3164826+ShikiSuen@users.noreply.github.com> Date: Sat, 20 Aug 2022 21:32:36 +0800 Subject: [PATCH 2/4] Repo // Fix looped crashes with client apps on macOS 10.11-10.13. --- Source/Modules/IMEModules/mgrPrefs.swift | 7 +------ Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Modules/IMEModules/mgrPrefs.swift b/Source/Modules/IMEModules/mgrPrefs.swift index 37451445..5391a5b9 100644 --- a/Source/Modules/IMEModules/mgrPrefs.swift +++ b/Source/Modules/IMEModules/mgrPrefs.swift @@ -415,12 +415,7 @@ public enum mgrPrefs { // MARK: - Settings (Tier 2) @UserDefault(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false) - static var useIMKCandidateWindow: Bool { - didSet { - NSLog("vChewing App self-terminated due to enabling / disabling IMK candidate window.") - NSApplication.shared.terminate(nil) - } - } + static var useIMKCandidateWindow: Bool @UserDefault(key: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue, defaultValue: false) static var handleDefaultCandidateFontsByLangIdentifier: Bool diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift index 50809c62..266c2e4d 100644 --- a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift +++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift @@ -47,6 +47,8 @@ struct suiPrefPaneDevZone: View { LocalizedStringKey("Use IMK Candidate Window instead (will reboot the IME)"), isOn: $selUseIMKCandidateWindow.onChange { mgrPrefs.useIMKCandidateWindow = selUseIMKCandidateWindow + NSLog("vChewing App self-terminated due to enabling / disabling IMK candidate window.") + NSApplication.shared.terminate(nil) } ) Text(LocalizedStringKey("IMK candidate window is plagued with issues and incapabilities.")) From 144ef08aeb4d540daf78d4d6d310e825b872a488 Mon Sep 17 00:00:00 2001 From: ShikiSuen <3164826+ShikiSuen@users.noreply.github.com> Date: Sat, 20 Aug 2022 22:53:16 +0800 Subject: [PATCH 3/4] AboutWindow // Credits fix. --- Source/WindowNIBs/zh-Hant.lproj/frmAboutWindow.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WindowNIBs/zh-Hant.lproj/frmAboutWindow.strings b/Source/WindowNIBs/zh-Hant.lproj/frmAboutWindow.strings index ea056ee2..f378b8f4 100644 --- a/Source/WindowNIBs/zh-Hant.lproj/frmAboutWindow.strings +++ b/Source/WindowNIBs/zh-Hant.lproj/frmAboutWindow.strings @@ -24,7 +24,7 @@ // "lblCopyright.title" = "© 2021-2022 vChewing Project."; /* Class = "NSTextFieldCell"; title = "vChewing macOS Development: Shiki Suen, Isaac Xen, Hiraku Wang, etc.\nvChewing Phrase Database Maintained by Shiki Suen."; ObjectID = "lblCredits"; */ -"lblCredits.title" = "威注音 macOS 程式研发：Shiki Suen, Isaac Xen, Hiraku Wang, 等。\n威注音词库维护：Shiki Suen。"; +"lblCredits.title" = "威注音 macOS 程式研發：Shiki Suen, Isaac Xen, Hiraku Wang, 等。\n威注音詞庫維護：Shiki Suen。"; "xCD-lx-zY7.title" = "網站"; From a8adf81cc1d766c75f9c39407a5ebc7a241fb54a Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 20 Aug 2022 21:40:18 +0800 Subject: [PATCH 4/4] Bump version to 2.0.0 SP1 Build 2001. --- Update-Info.plist | 2 +- vChewing.xcodeproj/project.pbxproj | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Update-Info.plist b/Update-Info.plist index 3a2f79e4..9e337514 100644 --- a/Update-Info.plist +++ b/Update-Info.plist @@ -5,7 +5,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 2000 + 2001 UpdateInfoEndpoint https://gitee.com/vchewing/vChewing-macOS/raw/main/Update-Info.plist UpdateInfoSite diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index f477f0b0..96a01632 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -1421,7 +1421,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1460,7 +1460,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -1497,7 +1497,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; @@ -1547,7 +1547,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1678,7 +1678,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; @@ -1733,7 +1733,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; @@ -1777,7 +1777,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1819,7 +1819,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2000; + CURRENT_PROJECT_VERSION = 2001; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu99;