From e8f895a642134208e98d1fd4f4344f52d39a44a0 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Wed, 19 Jan 2022 19:49:14 +0800
Subject: [PATCH] Shiki: NT351 Emu // Add Keyboard Shortcut + l10n tweaks.

---
 Source/Base.lproj/preferences.xib        |  2 +-
 Source/InputMethodController.mm          | 16 ++++++++++++----
 Source/PreferencesModule.swift           |  6 ++++++
 Source/en.lproj/Localizable.strings      |  1 +
 Source/en.lproj/preferences.strings      |  4 ++--
 Source/ja.lproj/Localizable.strings      |  1 +
 Source/ja.lproj/preferences.strings      |  4 ++--
 Source/zh-Hans.lproj/Localizable.strings |  1 +
 Source/zh-Hans.lproj/preferences.strings |  2 +-
 Source/zh-Hant.lproj/Localizable.strings |  1 +
 Source/zh-Hant.lproj/preferences.strings |  2 +-
 11 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Source/Base.lproj/preferences.xib b/Source/Base.lproj/preferences.xib
index 2075d5a5..fdc2facc 100644
--- a/Source/Base.lproj/preferences.xib
+++ b/Source/Base.lproj/preferences.xib
@@ -240,7 +240,7 @@
                                                     </button>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mzw-F2-aAQ">
                                                         <rect key="frame" x="19" y="61.5" width="423" height="16"/>
-                                                        <buttonCell key="cell" type="check" title="Emulating Windows NT 3.51 legacy phonetic typing experience" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="ArK-Vk-OoT">
+                                                        <buttonCell key="cell" type="check" title="Emulating Windows NT 3.51 select-candidate-per-character mode" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="ArK-Vk-OoT">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="cellTitle"/>
                                                         </buttonCell>
diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm
index 102230d4..10251a0a 100644
--- a/Source/InputMethodController.mm
+++ b/Source/InputMethodController.mm
@@ -136,11 +136,13 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
     // a menu instance (autoreleased) is requested every time the user click on the input menu
     NSMenu *menu = [[NSMenu alloc] initWithTitle:LocalizationNotNeeded(@"Input Method Menu")];
 
-    [menu addItemWithTitle:NSLocalizedString(@"vChewing Preferences", @"") action:@selector(showPreferences:) keyEquivalent:@""];
-
+    NSMenuItem *useWinNT351BPMFMenuItem = [menu addItemWithTitle:NSLocalizedString(@"NT351 BPMF EMU", @"") action:@selector(toggleWinNT351BPMFMode:) keyEquivalent:@"P"];
+    useWinNT351BPMFMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagControl;
+    useWinNT351BPMFMenuItem.state = Preferences.useWinNT351BPMF ? NSControlStateValueOn : NSControlStateValueOff;
+    
     NSMenuItem *chineseConversionMenuItem = [menu addItemWithTitle:NSLocalizedString(@"Force KangXi Writing", @"") action:@selector(toggleChineseConverter:) keyEquivalent:@"K"];
-        chineseConversionMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagControl;
-        chineseConversionMenuItem.state = Preferences.chineseConversionEnabled ? NSControlStateValueOn : NSControlStateValueOff;
+    chineseConversionMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagControl;
+    chineseConversionMenuItem.state = Preferences.chineseConversionEnabled ? NSControlStateValueOn : NSControlStateValueOff;
 
     NSMenuItem *halfWidthPunctuationMenuItem = [menu addItemWithTitle:NSLocalizedString(@"Use Half-Width Punctuations", @"") action:@selector(toggleHalfWidthPunctuation:) keyEquivalent:@""];
     halfWidthPunctuationMenuItem.state = Preferences.halfWidthPunctuationEnabled ? NSControlStateValueOn : NSControlStateValueOff;
@@ -162,6 +164,7 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
 
     [menu addItem:[NSMenuItem separatorItem]]; // ------------------------------
 
+    [menu addItemWithTitle:NSLocalizedString(@"vChewing Preferences", @"") action:@selector(showPreferences:) keyEquivalent:@""];
     [menu addItemWithTitle:NSLocalizedString(@"Check for Updates…", @"") action:@selector(checkForUpdate:) keyEquivalent:@""];
     [menu addItemWithTitle:NSLocalizedString(@"About vChewing…", @"") action:@selector(showAbout:) keyEquivalent:@""];
     return menu;
@@ -1487,6 +1490,11 @@ NS_INLINE size_t max(size_t a, size_t b) { return a > b ? a : b; }
     [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
 }
 
+- (void)toggleWinNT351BPMFMode:(id)sender
+{
+    [NotifierController notifyWithMessage:[NSString stringWithFormat:@"%@%@%@", NSLocalizedString(@"NT351 BPMF EMU", @""), @"\n", [Preferences toggleWinNT351BPMFEnabled] ? NSLocalizedString(@"NotificationSwitchON", @"") : NSLocalizedString(@"NotificationSwitchOFF", @"")] stay:NO];
+}
+
 - (void)toggleChineseConverter:(id)sender
 {
     [NotifierController notifyWithMessage:[NSString stringWithFormat:@"%@%@%@", NSLocalizedString(@"Force KangXi Writing", @""), @"\n", [Preferences toggleChineseConversionEnabled] ? NSLocalizedString(@"NotificationSwitchON", @"") : NSLocalizedString(@"NotificationSwitchOFF", @"")] stay:NO];
diff --git a/Source/PreferencesModule.swift b/Source/PreferencesModule.swift
index 15388c71..f3068d85 100644
--- a/Source/PreferencesModule.swift
+++ b/Source/PreferencesModule.swift
@@ -220,6 +220,12 @@ struct ComposingBufferSize {
     @UserDefault(key: kUseWinNT351BPMF, defaultValue: false)
     @objc static var useWinNT351BPMF: Bool
     
+    @objc static func toggleWinNT351BPMFEnabled() -> Bool {
+        useWinNT351BPMF = !useWinNT351BPMF
+        UserDefaults.standard.set(useWinNT351BPMF, forKey: kUseWinNT351BPMF)
+        return useWinNT351BPMF
+    }
+    
     @UserDefault(key: kShouldNotFartInLieuOfBeep, defaultValue: true)
     @objc static var shouldNotFartInLieuOfBeep: Bool
     
diff --git a/Source/en.lproj/Localizable.strings b/Source/en.lproj/Localizable.strings
index 15c2a383..90086cbf 100644
--- a/Source/en.lproj/Localizable.strings
+++ b/Source/en.lproj/Localizable.strings
@@ -33,3 +33,4 @@
 "Please specify at least 4 candidate keys." = "Please specify at least 4 candidate keys.";
 "Maximum 15 candidate keys allowed." = "Maximum 15 candidate keys allowed.";
 "⚠︎ Phrase replacement mode enabled, interfering user phrase entry." = "⚠︎ Phrase replacement mode enabled, interfering user phrase entry.";
+"NT351 BPMF EMU" = "NT351 Per-Char Select Mode";
diff --git a/Source/en.lproj/preferences.strings b/Source/en.lproj/preferences.strings
index 720c9c68..f5952af7 100644
--- a/Source/en.lproj/preferences.strings
+++ b/Source/en.lproj/preferences.strings
@@ -104,8 +104,8 @@
 /* Class = "NSTextFieldCell"; title = "UI language setting:"; ObjectID = "9DS-Rc-TXq"; */
 "9DS-Rc-TXq.title" = "UI language setting:";
 
-/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 legacy phonetic typing experience"; ObjectID = "ArK-Vk-OoT"; */
-"ArK-Vk-OoT.title" = "Emulating Windows NT 3.51 legacy phonetic typing experience";
+/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 select-candidate-per-character mode"; ObjectID = "ArK-Vk-OoT"; */
+"ArK-Vk-OoT.title" = "Emulating Windows NT 3.51 select-candidate-per-character mode";
 
 /* Class = "NSButtonCell"; title = "Auto-convert traditional Chinese glyphs to KangXi characters"; ObjectID = "BSK-bH-Gct"; */
 "BSK-bH-Gct.title" = "Auto-convert traditional Chinese glyphs to KangXi characters";
diff --git a/Source/ja.lproj/Localizable.strings b/Source/ja.lproj/Localizable.strings
index f25d1d80..24610a0d 100644
--- a/Source/ja.lproj/Localizable.strings
+++ b/Source/ja.lproj/Localizable.strings
@@ -33,3 +33,4 @@
 "Please specify at least 4 candidate keys." = "言選り用キー陣列に少なくとも４つのキーをご登録ください。";
 "Maximum 15 candidate keys allowed." = "言選り用キー陣列には最多１５つキー登録できます。";
 "⚠︎ Phrase replacement mode enabled, interfering user phrase entry." = "⚠︎ 言葉置換機能稼働中、新添付言葉にも影響。";
+"NT351 BPMF EMU" = "全候補入力モード";
diff --git a/Source/ja.lproj/preferences.strings b/Source/ja.lproj/preferences.strings
index 911d4576..522b7de2 100644
--- a/Source/ja.lproj/preferences.strings
+++ b/Source/ja.lproj/preferences.strings
@@ -104,8 +104,8 @@
 /* Class = "NSTextFieldCell"; title = "UI language setting:"; ObjectID = "9DS-Rc-TXq"; */
 "9DS-Rc-TXq.title" = "アプリ表示用言語:";
 
-/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 legacy phonetic typing experience"; ObjectID = "ArK-Vk-OoT"; */
-"ArK-Vk-OoT.title" = "Windows NT 3.51 内蔵注音入力スタイルを真似する";
+/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 select-candidate-per-character mode"; ObjectID = "ArK-Vk-OoT"; */
+"ArK-Vk-OoT.title" = "Windows NT 3.51 内蔵注音らしく漢字１つづつ全候補選択入力";
 
 /* Class = "NSButtonCell"; title = "Auto-convert traditional Chinese glyphs to KangXi characters"; ObjectID = "BSK-bH-Gct"; */
 "BSK-bH-Gct.title" = "自動的に繁体漢字を康熙文字と変換する";
diff --git a/Source/zh-Hans.lproj/Localizable.strings b/Source/zh-Hans.lproj/Localizable.strings
index b96478e5..fe669f53 100644
--- a/Source/zh-Hans.lproj/Localizable.strings
+++ b/Source/zh-Hans.lproj/Localizable.strings
@@ -33,3 +33,4 @@
 "Please specify at least 4 candidate keys." = "请至少指定四个选字键。";
 "Maximum 15 candidate keys allowed." = "选字键最多只能指定十五个。";
 "⚠︎ Phrase replacement mode enabled, interfering user phrase entry." = "⚠︎ 语汇置换功能已启用，会波及语汇自订。";
+"NT351 BPMF EMU" = "模拟逐字选字输入";
diff --git a/Source/zh-Hans.lproj/preferences.strings b/Source/zh-Hans.lproj/preferences.strings
index 6d98efec..01962b0e 100644
--- a/Source/zh-Hans.lproj/preferences.strings
+++ b/Source/zh-Hans.lproj/preferences.strings
@@ -104,7 +104,7 @@
 /* Class = "NSTextFieldCell"; title = "UI language setting:"; ObjectID = "9DS-Rc-TXq"; */
 "9DS-Rc-TXq.title" = "介面语言设定:";
 
-/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 legacy phonetic typing experience"; ObjectID = "ArK-Vk-OoT"; */
+/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 select-candidate-per-character mode"; ObjectID = "ArK-Vk-OoT"; */
 "ArK-Vk-OoT.title" = "模拟 Windows NT 3.51 注音逐字选字输入风格";
 
 /* Class = "NSButtonCell"; title = "Auto-convert traditional Chinese glyphs to KangXi characters"; ObjectID = "BSK-bH-Gct"; */
diff --git a/Source/zh-Hant.lproj/Localizable.strings b/Source/zh-Hant.lproj/Localizable.strings
index a37dfe0c..1c4c95dc 100644
--- a/Source/zh-Hant.lproj/Localizable.strings
+++ b/Source/zh-Hant.lproj/Localizable.strings
@@ -33,3 +33,4 @@
 "Please specify at least 4 candidate keys." = "請至少指定四個選字鍵。";
 "Maximum 15 candidate keys allowed." = "選字鍵最多只能指定十五個。";
 "⚠︎ Phrase replacement mode enabled, interfering user phrase entry." = "⚠︎ 語彙置換功能已啟用，會波及語彙自訂。";
+"NT351 BPMF EMU" = "模擬逐字選字輸入";
diff --git a/Source/zh-Hant.lproj/preferences.strings b/Source/zh-Hant.lproj/preferences.strings
index 2b16943d..f891f044 100644
--- a/Source/zh-Hant.lproj/preferences.strings
+++ b/Source/zh-Hant.lproj/preferences.strings
@@ -104,7 +104,7 @@
 /* Class = "NSTextFieldCell"; title = "UI language setting:"; ObjectID = "9DS-Rc-TXq"; */
 "9DS-Rc-TXq.title" = "介面語言設定:";
 
-/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 legacy phonetic typing experience"; ObjectID = "ArK-Vk-OoT"; */
+/* Class = "NSButtonCell"; title = "Emulating Windows NT 3.51 select-candidate-per-character mode"; ObjectID = "ArK-Vk-OoT"; */
 "ArK-Vk-OoT.title" = "模擬 Windows NT 3.51 注音逐字選字輸入風格";
 
 /* Class = "NSButtonCell"; title = "Auto-convert traditional Chinese glyphs to KangXi characters"; ObjectID = "BSK-bH-Gct"; */