Skip to content

Commit 7a40097

Browse files
tianjianjiangclaude
andcommitted
fix: revert unrelated InputState/pbxproj changes, restore master's number input pattern
Reverts InputStateChineseNumber/RomanNumber/EnclosedNumber references back to master's unified InputStateNumber. Restores NumberInputHelper.swift, Localizable.stringsdict, collectUserFileIssues, Issue 753 tone key code, and MACOSX_DEPLOYMENT_TARGET 11.0. Keeps only the contextual user model integration changes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 1fdf1cb commit 7a40097

2 files changed

Lines changed: 175 additions & 221 deletions

File tree

McBopomofo.xcodeproj/project.pbxproj

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
9BFBCAEED2ED8369BC7D6ED5 /* walk_strategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CBDA16D485EE2E7F11D171B /* walk_strategy.cpp */; };
2121
A71A7066B7F904D314C65992 /* contextual_user_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C960E407C381A6E5F4100F2 /* contextual_user_model.cpp */; };
2222
6A660A702EAF371000D53D7B /* ByteBlockBackedDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A660A6F2EAF371000D53D7B /* ByteBlockBackedDictionary.cpp */; };
23+
6A68C1C32EC7F2C0005284A0 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 6A68C1C12EC7F2C0005284A0 /* Localizable.stringsdict */; };
2324
6A6ED16B2797650A0012872E /* template-phrases-replacement.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6A6ED1632797650A0012872E /* template-phrases-replacement.txt */; };
2425
6A6ED16C2797650A0012872E /* template-data.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6A6ED1652797650A0012872E /* template-data.txt */; };
2526
6A6ED16D2797650A0012872E /* template-exclude-phrases-plain-bpmf.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6A6ED1672797650A0012872E /* template-exclude-phrases-plain-bpmf.txt */; };
@@ -54,6 +55,7 @@
5455
D427F7B4279086DC004A2160 /* InputSourceHelper in Frameworks */ = {isa = PBXBuildFile; productRef = D427F7B3279086DC004A2160 /* InputSourceHelper */; };
5556
D427F7B6279086F6004A2160 /* InputSourceHelper in Frameworks */ = {isa = PBXBuildFile; productRef = D427F7B5279086F6004A2160 /* InputSourceHelper */; };
5657
D427F7C127908EFC004A2160 /* OpenCCBridge in Frameworks */ = {isa = PBXBuildFile; productRef = D427F7C027908EFC004A2160 /* OpenCCBridge */; };
58+
D4314F0D2ED3690F0071DD71 /* NumberInputHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4314F0C2ED369090071DD71 /* NumberInputHelper.swift */; };
5759
D436E23F2CD20BA700C6155D /* AssociatedPhrasesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D436E23E2CD20B9E00C6155D /* AssociatedPhrasesTests.swift */; };
5860
D43737C92DF9C35800D9707C /* InputMethodController+KeyHandlerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43737C82DF9C35100D9707C /* InputMethodController+KeyHandlerDelegate.swift */; };
5961
D43737CB2DF9C48300D9707C /* InputMethodController+CandidateControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43737CA2DF9C48200D9707C /* InputMethodController+CandidateControllerDelegate.swift */; };
@@ -146,6 +148,8 @@
146148
4C960E407C381A6E5F4100F2 /* contextual_user_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = contextual_user_model.cpp; sourceTree = "<group>"; };
147149
6A660A6E2EAF371000D53D7B /* ByteBlockBackedDictionary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ByteBlockBackedDictionary.h; sourceTree = "<group>"; };
148150
6A660A6F2EAF371000D53D7B /* ByteBlockBackedDictionary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ByteBlockBackedDictionary.cpp; sourceTree = "<group>"; };
151+
6A68C1C22EC7F2C0005284A0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
152+
6A68C1C42EC7F6B7005284A0 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
149153
6A6ED1642797650A0012872E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text; name = Base; path = "Base.lproj/template-phrases-replacement.txt"; sourceTree = "<group>"; };
150154
6A6ED1662797650A0012872E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text; name = Base; path = "Base.lproj/template-data.txt"; sourceTree = "<group>"; };
151155
6A6ED1682797650A0012872E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text; name = Base; path = "Base.lproj/template-exclude-phrases-plain-bpmf.txt"; sourceTree = "<group>"; };
@@ -201,6 +205,7 @@
201205
D427F7AC27907B7E004A2160 /* NotifierUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = NotifierUI; path = Packages/NotifierUI; sourceTree = "<group>"; };
202206
D427F7B2279086B5004A2160 /* InputSourceHelper */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = InputSourceHelper; path = Packages/InputSourceHelper; sourceTree = "<group>"; };
203207
D427F7BF27908EAC004A2160 /* OpenCCBridge */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenCCBridge; path = Packages/OpenCCBridge; sourceTree = "<group>"; };
208+
D4314F0C2ED369090071DD71 /* NumberInputHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberInputHelper.swift; sourceTree = "<group>"; };
204209
D436E23E2CD20B9E00C6155D /* AssociatedPhrasesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssociatedPhrasesTests.swift; sourceTree = "<group>"; };
205210
D43737C82DF9C35100D9707C /* InputMethodController+KeyHandlerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InputMethodController+KeyHandlerDelegate.swift"; sourceTree = "<group>"; };
206211
D43737CA2DF9C48200D9707C /* InputMethodController+CandidateControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InputMethodController+CandidateControllerDelegate.swift"; sourceTree = "<group>"; };
@@ -331,6 +336,7 @@
331336
D4CB1A5A2B3891FB006EA984 /* DictionaryService.swift */,
332337
D456576D279E4F7B00DF6BC9 /* KeyHandlerInput.swift */,
333338
D461B791279DAC010070E734 /* InputState.swift */,
339+
D4314F0C2ED369090071DD71 /* NumberInputHelper.swift */,
334340
D427F76B278CA1BA004A2160 /* AppDelegate.swift */,
335341
D44FB74427915555003C80A6 /* Preferences.swift */,
336342
D47F7DCF278C0897002F9DD7 /* NonModalAlertWindowController.swift */,
@@ -465,6 +471,7 @@
465471
6A93050C279877FF00D370DA /* McBopomofoInstaller-Bridging-Header.h */,
466472
D4F0BBE2279B08900071253C /* BundleTranslocate.h */,
467473
D4F0BBE3279B08900071253C /* BundleTranslocate.m */,
474+
6A68C1C12EC7F2C0005284A0 /* Localizable.stringsdict */,
468475
);
469476
path = Installer;
470477
sourceTree = "<group>";
@@ -690,6 +697,7 @@
690697
6ACA41FA15FC1D9000935EF6 /* InfoPlist.strings in Resources */,
691698
6A225A1F23679F2600F685C6 /* NotarizedArchives in Resources */,
692699
6ACA41FB15FC1D9000935EF6 /* License.rtf in Resources */,
700+
6A68C1C32EC7F2C0005284A0 /* Localizable.stringsdict in Resources */,
693701
6ACA41FC15FC1D9000935EF6 /* Localizable.strings in Resources */,
694702
6ACA41FD15FC1D9000935EF6 /* MainMenu.xib in Resources */,
695703
);
@@ -744,6 +752,7 @@
744752
D4A13D5A27A59F0B003BE359 /* InputMethodController.swift in Sources */,
745753
D44FB74527915565003C80A6 /* Preferences.swift in Sources */,
746754
6A660A702EAF371000D53D7B /* ByteBlockBackedDictionary.cpp in Sources */,
755+
D4314F0D2ED3690F0071DD71 /* NumberInputHelper.swift in Sources */,
747756
D4E569DC27A34D0E00AC2CEF /* KeyHandler.mm in Sources */,
748757
6A4F5F982879E838008C4307 /* reading_grid.cpp in Sources */,
749758
9BFBCAEED2ED8369BC7D6ED5 /* walk_strategy.cpp in Sources */,
@@ -833,6 +842,15 @@
833842
name = MainMenu.xib;
834843
sourceTree = "<group>";
835844
};
845+
6A68C1C12EC7F2C0005284A0 /* Localizable.stringsdict */ = {
846+
isa = PBXVariantGroup;
847+
children = (
848+
6A68C1C22EC7F2C0005284A0 /* en */,
849+
6A68C1C42EC7F6B7005284A0 /* zh-Hant */,
850+
);
851+
name = Localizable.stringsdict;
852+
sourceTree = "<group>";
853+
};
836854
6A6ED1632797650A0012872E /* template-phrases-replacement.txt */ = {
837855
isa = PBXVariantGroup;
838856
children = (
@@ -1092,7 +1110,7 @@
10921110
"$(inherited)",
10931111
"@executable_path/../Frameworks",
10941112
);
1095-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1113+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10961114
ONLY_ACTIVE_ARCH = YES;
10971115
PRODUCT_BUNDLE_IDENTIFIER = org.openvanilla.inputmethod.McBopomofo;
10981116
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1147,7 +1165,7 @@
11471165
"$(inherited)",
11481166
"@executable_path/../Frameworks",
11491167
);
1150-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1168+
MACOSX_DEPLOYMENT_TARGET = 11.0;
11511169
PRODUCT_BUNDLE_IDENTIFIER = org.openvanilla.inputmethod.McBopomofo;
11521170
PRODUCT_NAME = "$(TARGET_NAME)";
11531171
SDKROOT = macosx;
@@ -1182,7 +1200,7 @@
11821200
GCC_WARN_ABOUT_RETURN_TYPE = YES;
11831201
GCC_WARN_UNINITIALIZED_AUTOS = YES;
11841202
GCC_WARN_UNUSED_VARIABLE = YES;
1185-
MACOSX_DEPLOYMENT_TARGET = 10.13;
1203+
MACOSX_DEPLOYMENT_TARGET = 11.0;
11861204
ONLY_ACTIVE_ARCH = YES;
11871205
OTHER_CFLAGS = "";
11881206
OTHER_LDFLAGS = "";
@@ -1208,7 +1226,7 @@
12081226
GCC_WARN_ABOUT_RETURN_TYPE = YES;
12091227
GCC_WARN_UNINITIALIZED_AUTOS = YES;
12101228
GCC_WARN_UNUSED_VARIABLE = YES;
1211-
MACOSX_DEPLOYMENT_TARGET = 10.13;
1229+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12121230
OTHER_CFLAGS = "";
12131231
OTHER_LDFLAGS = "";
12141232
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1252,7 +1270,7 @@
12521270
"$(inherited)",
12531271
"@executable_path/../Frameworks",
12541272
);
1255-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1273+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12561274
ONLY_ACTIVE_ARCH = YES;
12571275
PRODUCT_BUNDLE_IDENTIFIER = "org.openvanilla.McBopomofo.${PRODUCT_NAME:rfc1034identifier}";
12581276
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1294,7 +1312,7 @@
12941312
"$(inherited)",
12951313
"@executable_path/../Frameworks",
12961314
);
1297-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1315+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12981316
PRODUCT_BUNDLE_IDENTIFIER = "org.openvanilla.McBopomofo.${PRODUCT_NAME:rfc1034identifier}";
12991317
PRODUCT_NAME = "$(TARGET_NAME)";
13001318
SDKROOT = macosx;
@@ -1340,7 +1358,7 @@
13401358
"@executable_path/../Frameworks",
13411359
"@loader_path/../Frameworks",
13421360
);
1343-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1361+
MACOSX_DEPLOYMENT_TARGET = 11.0;
13441362
MARKETING_VERSION = 1.0;
13451363
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
13461364
MTL_FAST_MATH = YES;
@@ -1387,7 +1405,7 @@
13871405
"@executable_path/../Frameworks",
13881406
"@loader_path/../Frameworks",
13891407
);
1390-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1408+
MACOSX_DEPLOYMENT_TARGET = 11.0;
13911409
MARKETING_VERSION = 1.0;
13921410
MTL_ENABLE_DEBUG_INFO = NO;
13931411
MTL_FAST_MATH = YES;

0 commit comments

Comments
 (0)