From d6f3e6c23c6cf5df3f377d5b7d2bc80b5dc9cd0a Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 28 Jun 2022 14:06:24 +0800 Subject: [PATCH 1/5] Info.plist // Set both CHS and CHT instances of Squirrel. --- Info.plist | 46 ++++++++++++++++++++++++++------- en.lproj/InfoPlist.strings | 2 ++ zh-Hans.lproj/InfoPlist.strings | 2 ++ zh-Hant.lproj/InfoPlist.strings | 2 ++ 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/Info.plist b/Info.plist index 8150b9aad..90b49f1c8 100644 --- a/Info.plist +++ b/Info.plist @@ -2,6 +2,8 @@ + TISInputSourceID + im.rime.inputmethod.Squirrel.Rime CFBundleDevelopmentRegion English CFBundleExecutable @@ -24,18 +26,42 @@ tsInputModeListKey - im.rime.inputmethod.Squirrel + im.rime.inputmethod.SquirrelCHS - TISInputSourceID - im.rime.inputmethod.Squirrel.Rime TISIntendedLanguage - zh + zh-Hans tsInputModeAlternateMenuIconFileKey rime.pdf tsInputModeCharacterRepertoireKey - zh-Hans - zh-Hant + Hans + Han + + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeKeyEquivalentModifiersKey + 4608 + tsInputModeMenuIconFileKey + rime.pdf + tsInputModePaletteIconFileKey + rime.pdf + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smUnicodeScript + + im.rime.inputmethod.SquirrelCHT + + TISIntendedLanguage + zh-Hant + tsInputModeAlternateMenuIconFileKey + rime.pdf + tsInputModeCharacterRepertoireKey + + Hant + Han tsInputModeDefaultStateKey @@ -55,7 +81,8 @@ tsVisibleInputModeOrderedArrayKey - im.rime.inputmethod.Squirrel.Rime + im.rime.inputmethod.SquirrelCHS + im.rime.inputmethod.SquirrelCHT InputMethodConnectionName @@ -82,8 +109,9 @@ tsInputMethodCharacterRepertoireKey - zh-Hans - zh-Hant + Hans + Hant + Han tsInputMethodIconFileKey rime.pdf diff --git a/en.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings index f4cddf3b7..293077b7b 100644 --- a/en.lproj/InfoPlist.strings +++ b/en.lproj/InfoPlist.strings @@ -3,6 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, RIME Developers"; im.rime.inputmethod.Squirrel = "Squirrel"; +im.rime.inputmethod.SquirrelCHS = "Squirrel-CHS"; +im.rime.inputmethod.SquirrelCHT = "Squirrel-CHT"; CFBundleName = "Squirrel"; CFBundleDisplayName = "Squirrel"; diff --git a/zh-Hans.lproj/InfoPlist.strings b/zh-Hans.lproj/InfoPlist.strings index fe6d741fe..dccfa27b6 100644 --- a/zh-Hans.lproj/InfoPlist.strings +++ b/zh-Hans.lproj/InfoPlist.strings @@ -3,6 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; im.rime.inputmethod.Squirrel = "鼠须管"; +im.rime.inputmethod.SquirrelCHS = "鼠须管-简"; +im.rime.inputmethod.SquirrelCHT = "鼠须管-繁"; CFBundleName = "鼠须管"; CFBundleDisplayName = "鼠须管"; diff --git a/zh-Hant.lproj/InfoPlist.strings b/zh-Hant.lproj/InfoPlist.strings index 7faf84d0e..13fc06cc3 100644 --- a/zh-Hant.lproj/InfoPlist.strings +++ b/zh-Hant.lproj/InfoPlist.strings @@ -3,6 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; im.rime.inputmethod.Squirrel = "鼠鬚管"; +im.rime.inputmethod.SquirrelCHS = "鼠鬚管-簡"; +im.rime.inputmethod.SquirrelCHT = "鼠鬚管-繁"; CFBundleName = "鼠鬚管"; CFBundleDisplayName = "鼠鬚管"; From 07ed7b00a9a51f68e52b88cebd6859fe0f1076f8 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 28 Jun 2022 23:42:39 +0800 Subject: [PATCH 2/5] Info.plist // Apply Lotem's naming for instances. --- Info.plist | 8 ++++---- en.lproj/InfoPlist.strings | 4 ++-- zh-Hans.lproj/InfoPlist.strings | 4 ++-- zh-Hant.lproj/InfoPlist.strings | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Info.plist b/Info.plist index 90b49f1c8..3bd2aacf0 100644 --- a/Info.plist +++ b/Info.plist @@ -26,7 +26,7 @@ tsInputModeListKey - im.rime.inputmethod.SquirrelCHS + im.rime.inputmethod.Squirrel.Hans TISIntendedLanguage zh-Hans @@ -52,7 +52,7 @@ tsInputModeScriptKey smUnicodeScript - im.rime.inputmethod.SquirrelCHT + im.rime.inputmethod.Squirrel.Hant TISIntendedLanguage zh-Hant @@ -81,8 +81,8 @@ tsVisibleInputModeOrderedArrayKey - im.rime.inputmethod.SquirrelCHS - im.rime.inputmethod.SquirrelCHT + im.rime.inputmethod.Squirrel.Hans + im.rime.inputmethod.Squirrel.Hant InputMethodConnectionName diff --git a/en.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings index 293077b7b..14547e3fd 100644 --- a/en.lproj/InfoPlist.strings +++ b/en.lproj/InfoPlist.strings @@ -3,8 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, RIME Developers"; im.rime.inputmethod.Squirrel = "Squirrel"; -im.rime.inputmethod.SquirrelCHS = "Squirrel-CHS"; -im.rime.inputmethod.SquirrelCHT = "Squirrel-CHT"; +im.rime.inputmethod.Squirrel.Hans = "Squirrel-Hans"; +im.rime.inputmethod.Squirrel.Hant = "Squirrel-Hant"; CFBundleName = "Squirrel"; CFBundleDisplayName = "Squirrel"; diff --git a/zh-Hans.lproj/InfoPlist.strings b/zh-Hans.lproj/InfoPlist.strings index dccfa27b6..fa8295b0e 100644 --- a/zh-Hans.lproj/InfoPlist.strings +++ b/zh-Hans.lproj/InfoPlist.strings @@ -3,8 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; im.rime.inputmethod.Squirrel = "鼠须管"; -im.rime.inputmethod.SquirrelCHS = "鼠须管-简"; -im.rime.inputmethod.SquirrelCHT = "鼠须管-繁"; +im.rime.inputmethod.Squirrel.Hans = "鼠须管"; +im.rime.inputmethod.Squirrel.Hant = "鼠鬚管"; CFBundleName = "鼠须管"; CFBundleDisplayName = "鼠须管"; diff --git a/zh-Hant.lproj/InfoPlist.strings b/zh-Hant.lproj/InfoPlist.strings index 13fc06cc3..bcc9c4e77 100644 --- a/zh-Hant.lproj/InfoPlist.strings +++ b/zh-Hant.lproj/InfoPlist.strings @@ -3,8 +3,8 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; im.rime.inputmethod.Squirrel = "鼠鬚管"; -im.rime.inputmethod.SquirrelCHS = "鼠鬚管-簡"; -im.rime.inputmethod.SquirrelCHT = "鼠鬚管-繁"; +im.rime.inputmethod.Squirrel.Hans = "鼠须管"; +im.rime.inputmethod.Squirrel.Hant = "鼠鬚管"; CFBundleName = "鼠鬚管"; CFBundleDisplayName = "鼠鬚管"; From fb37e2bfc28094a847a4b62beb933050e0e94aa1 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Thu, 7 Jul 2022 21:06:42 +0800 Subject: [PATCH 3/5] IMK // Attempt to only register Squirrel-Hans during installation. --- input_source.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input_source.m b/input_source.m index ec8ba2d6f..b24b6a997 100644 --- a/input_source.m +++ b/input_source.m @@ -5,7 +5,7 @@ static NSString *const kSourceID = @"im.rime.inputmethod.Squirrel"; static NSString *const kInputModeID = - @"im.rime.inputmethod.Squirrel.Rime"; + @"im.rime.inputmethod.Squirrel.Rime.Hans"; void RegisterInputSource() { CFURLRef installedLocationURL = CFURLCreateFromFileSystemRepresentation( From 7badb6e07b5634b26d2b8b63469b219fc7484ba0 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 25 Jul 2022 22:30:40 +0800 Subject: [PATCH 4/5] Repo // Fix input source ID mistakes. --- Info.plist | 2 +- input_source.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Info.plist b/Info.plist index 3bd2aacf0..c3c016357 100644 --- a/Info.plist +++ b/Info.plist @@ -3,7 +3,7 @@ TISInputSourceID - im.rime.inputmethod.Squirrel.Rime + im.rime.inputmethod.Squirrel CFBundleDevelopmentRegion English CFBundleExecutable diff --git a/input_source.m b/input_source.m index b24b6a997..be983a142 100644 --- a/input_source.m +++ b/input_source.m @@ -5,7 +5,7 @@ static NSString *const kSourceID = @"im.rime.inputmethod.Squirrel"; static NSString *const kInputModeID = - @"im.rime.inputmethod.Squirrel.Rime.Hans"; + @"im.rime.inputmethod.Squirrel.Hans"; void RegisterInputSource() { CFURLRef installedLocationURL = CFURLCreateFromFileSystemRepresentation( From 97b69d6e45ac95aaad3ceaa24fd1ac5e53c58de6 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 25 Jul 2022 23:57:08 +0800 Subject: [PATCH 5/5] Attempt to tweak identifiers to fit Lotem's request. --- Info.plist | 10 +++++----- en.lproj/InfoPlist.strings | 6 +++--- input_source.m | 4 ++-- zh-Hans.lproj/InfoPlist.strings | 6 +++--- zh-Hant.lproj/InfoPlist.strings | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Info.plist b/Info.plist index c3c016357..da75ab5ca 100644 --- a/Info.plist +++ b/Info.plist @@ -3,7 +3,7 @@ TISInputSourceID - im.rime.inputmethod.Squirrel + im.rime.inputmethod.Squirrel.Rime CFBundleDevelopmentRegion English CFBundleExecutable @@ -26,7 +26,7 @@ tsInputModeListKey - im.rime.inputmethod.Squirrel.Hans + im.rime.inputmethod.Squirrel.Rime.Hans TISIntendedLanguage zh-Hans @@ -52,7 +52,7 @@ tsInputModeScriptKey smUnicodeScript - im.rime.inputmethod.Squirrel.Hant + im.rime.inputmethod.Squirrel.Rime.Hant TISIntendedLanguage zh-Hant @@ -81,8 +81,8 @@ tsVisibleInputModeOrderedArrayKey - im.rime.inputmethod.Squirrel.Hans - im.rime.inputmethod.Squirrel.Hant + im.rime.inputmethod.Squirrel.Rime.Hans + im.rime.inputmethod.Squirrel.Rime.Hant InputMethodConnectionName diff --git a/en.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings index 14547e3fd..c72ac004d 100644 --- a/en.lproj/InfoPlist.strings +++ b/en.lproj/InfoPlist.strings @@ -2,9 +2,9 @@ NSHumanReadableCopyright = "Copyleft 2017, RIME Developers"; -im.rime.inputmethod.Squirrel = "Squirrel"; -im.rime.inputmethod.Squirrel.Hans = "Squirrel-Hans"; -im.rime.inputmethod.Squirrel.Hant = "Squirrel-Hant"; +im.rime.inputmethod.Squirrel.Rime = "Squirrel"; +im.rime.inputmethod.Squirrel.Rime.Hans = "Squirrel-Hans"; +im.rime.inputmethod.Squirrel.Rime.Hant = "Squirrel-Hant"; CFBundleName = "Squirrel"; CFBundleDisplayName = "Squirrel"; diff --git a/input_source.m b/input_source.m index be983a142..0e78f85ac 100644 --- a/input_source.m +++ b/input_source.m @@ -3,9 +3,9 @@ static const unsigned char kInstallLocation[] = "/Library/Input Methods/Squirrel.app"; static NSString *const kSourceID = - @"im.rime.inputmethod.Squirrel"; + @"im.rime.inputmethod.Squirrel.Rime"; static NSString *const kInputModeID = - @"im.rime.inputmethod.Squirrel.Hans"; + @"im.rime.inputmethod.Squirrel.Rime.Hans"; void RegisterInputSource() { CFURLRef installedLocationURL = CFURLCreateFromFileSystemRepresentation( diff --git a/zh-Hans.lproj/InfoPlist.strings b/zh-Hans.lproj/InfoPlist.strings index fa8295b0e..2dd0b5e4d 100644 --- a/zh-Hans.lproj/InfoPlist.strings +++ b/zh-Hans.lproj/InfoPlist.strings @@ -2,9 +2,9 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; -im.rime.inputmethod.Squirrel = "鼠须管"; -im.rime.inputmethod.Squirrel.Hans = "鼠须管"; -im.rime.inputmethod.Squirrel.Hant = "鼠鬚管"; +im.rime.inputmethod.Squirrel.Rime = "鼠须管"; +im.rime.inputmethod.Squirrel.Rime.Hans = "鼠须管"; +im.rime.inputmethod.Squirrel.Rime.Hant = "鼠鬚管"; CFBundleName = "鼠须管"; CFBundleDisplayName = "鼠须管"; diff --git a/zh-Hant.lproj/InfoPlist.strings b/zh-Hant.lproj/InfoPlist.strings index bcc9c4e77..e06b7b315 100644 --- a/zh-Hant.lproj/InfoPlist.strings +++ b/zh-Hant.lproj/InfoPlist.strings @@ -2,9 +2,9 @@ NSHumanReadableCopyright = "Copyleft 2017, 式恕堂"; -im.rime.inputmethod.Squirrel = "鼠鬚管"; -im.rime.inputmethod.Squirrel.Hans = "鼠须管"; -im.rime.inputmethod.Squirrel.Hant = "鼠鬚管"; +im.rime.inputmethod.Squirrel.Rime = "鼠鬚管"; +im.rime.inputmethod.Squirrel.Rime.Hans = "鼠须管"; +im.rime.inputmethod.Squirrel.Rime.Hant = "鼠鬚管"; CFBundleName = "鼠鬚管"; CFBundleDisplayName = "鼠鬚管";