From fa3b674f1196f8ffd3018c6921eea7f36eed1e8f Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 5 Feb 2022 10:26:03 +0800 Subject: [PATCH] IME // Rebrand LMManager to mgrLM. --- Source/Headers/vChewing-Bridging-Header.h | 2 +- Source/Modules/AppDelegate.swift | 14 +++++----- .../Modules/ControllerModules/KeyHandler.mm | 14 +++++----- Source/Modules/IMEModules/ctlInputMethod.mm | 26 +++++++++---------- ...{LanguageModelManager.h => mgrLangModel.h} | 4 +-- ...anguageModelManager.mm => mgrLangModel.mm} | 6 ++--- vChewing.xcodeproj/project.pbxproj | 12 ++++----- 7 files changed, 39 insertions(+), 39 deletions(-) rename Source/Modules/LangModelRelated/{LanguageModelManager.h => mgrLangModel.h} (95%) rename Source/Modules/LangModelRelated/{LanguageModelManager.mm => mgrLangModel.mm} (98%) diff --git a/Source/Headers/vChewing-Bridging-Header.h b/Source/Headers/vChewing-Bridging-Header.h index 19b78ffd..b3646929 100644 --- a/Source/Headers/vChewing-Bridging-Header.h +++ b/Source/Headers/vChewing-Bridging-Header.h @@ -12,7 +12,7 @@ #import // @import Foundation; #import "SSZipArchive.h" // Zip Archive Support; -@interface LanguageModelManager : NSObject +@interface mgrLangModel : NSObject + (void)loadDataModels; + (void)loadCNSData; + (void)loadUserPhrases; diff --git a/Source/Modules/AppDelegate.swift b/Source/Modules/AppDelegate.swift index ebf78180..21222298 100644 --- a/Source/Modules/AppDelegate.swift +++ b/Source/Modules/AppDelegate.swift @@ -132,8 +132,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, ctlNonModalAlertWindowDelega func helper(_ helper: FSEventStreamHelper, didReceive events: [FSEventStreamHelper.Event]) { DispatchQueue.main.async { if Preferences.shouldAutoReloadUserDataFiles { - LanguageModelManager.loadUserPhrases() - LanguageModelManager.loadUserPhraseReplacement() + mgrLangModel.loadUserPhrases() + mgrLangModel.loadUserPhraseReplacement() } } } @@ -143,7 +143,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, ctlNonModalAlertWindowDelega private var ctlAboutWindowInstance: ctlAboutWindow? // New About Window private var checkTask: URLSessionTask? private var updateNextStepURL: URL? - private var fsStreamHelper = FSEventStreamHelper(path: LanguageModelManager.dataFolderPath, queue: DispatchQueue(label: "User Phrases")) + private var fsStreamHelper = FSEventStreamHelper(path: mgrLangModel.dataFolderPath, queue: DispatchQueue(label: "User Phrases")) // 補上 dealloc deinit { @@ -156,10 +156,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, ctlNonModalAlertWindowDelega } func applicationDidFinishLaunching(_ notification: Notification) { - LanguageModelManager.loadDataModels() - LanguageModelManager.loadCNSData() - LanguageModelManager.loadUserPhrases() - LanguageModelManager.loadUserPhraseReplacement() + mgrLangModel.loadDataModels() + mgrLangModel.loadCNSData() + mgrLangModel.loadUserPhrases() + mgrLangModel.loadUserPhraseReplacement() fsStreamHelper.delegate = self _ = fsStreamHelper.start() diff --git a/Source/Modules/ControllerModules/KeyHandler.mm b/Source/Modules/ControllerModules/KeyHandler.mm index 4602bfde..ba459544 100644 --- a/Source/Modules/ControllerModules/KeyHandler.mm +++ b/Source/Modules/ControllerModules/KeyHandler.mm @@ -10,7 +10,7 @@ #import "Gramambular.h" #import "vChewingLM.h" #import "UserOverrideModel.h" -#import "LanguageModelManager.h" +#import "mgrLangModel.h" #import "KeyHandler.h" #import "vChewing-Swift.h" @@ -87,12 +87,12 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot"; if ([value isKindOfClass:[NSString class]] && [value isEqual:kBopomofoModeIdentifierCHS]) { newInputMode = kBopomofoModeIdentifierCHS; - newLanguageModel = [LanguageModelManager languageModelCoreCHS]; - newUserOverrideModel = [LanguageModelManager userOverrideModelCHS]; + newLanguageModel = [mgrLangModel languageModelCoreCHS]; + newUserOverrideModel = [mgrLangModel userOverrideModelCHS]; } else { newInputMode = kBopomofoModeIdentifierCHT; - newLanguageModel = [LanguageModelManager languageModelCoreCHT]; - newUserOverrideModel = [LanguageModelManager userOverrideModelCHT]; + newLanguageModel = [mgrLangModel languageModelCoreCHT]; + newUserOverrideModel = [mgrLangModel userOverrideModelCHT]; } // 自 Preferences 模組讀入自訂語彙置換功能開關狀態。 @@ -140,10 +140,10 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot"; _bpmfReadingBuffer = new BopomofoReadingBuffer(BopomofoKeyboardLayout::StandardLayout()); // create the lattice builder - _languageModel = [LanguageModelManager languageModelCoreCHT]; + _languageModel = [mgrLangModel languageModelCoreCHT]; _languageModel->setPhraseReplacementEnabled(Preferences.phraseReplacementEnabled); _languageModel->setCNSEnabled(Preferences.cns11643Enabled); - _userOverrideModel = [LanguageModelManager userOverrideModelCHT]; + _userOverrideModel = [mgrLangModel userOverrideModelCHT]; _builder = new BlockReadingBuilder(_languageModel); diff --git a/Source/Modules/IMEModules/ctlInputMethod.mm b/Source/Modules/IMEModules/ctlInputMethod.mm index d6e14344..2d927b27 100644 --- a/Source/Modules/IMEModules/ctlInputMethod.mm +++ b/Source/Modules/IMEModules/ctlInputMethod.mm @@ -9,7 +9,7 @@ #import "vChewingLM.h" #import "ctlInputMethod.h" #import "KeyHandler.h" -#import "LanguageModelManager.h" +#import "mgrLangModel.h" using namespace std; using namespace vChewing; @@ -495,19 +495,19 @@ static inline NSString *LocalizationNotNeeded(NSString *s) { - (void)togglePhraseReplacementEnabled:(id)sender { if (_keyHandler.inputMode == kBopomofoModeIdentifierCHT){ - [LanguageModelManager languageModelCoreCHT]->setPhraseReplacementEnabled([Preferences togglePhraseReplacementEnabled]); + [mgrLangModel languageModelCoreCHT]->setPhraseReplacementEnabled([Preferences togglePhraseReplacementEnabled]); } else { - [LanguageModelManager languageModelCoreCHS]->setPhraseReplacementEnabled([Preferences togglePhraseReplacementEnabled]); + [mgrLangModel languageModelCoreCHS]->setPhraseReplacementEnabled([Preferences togglePhraseReplacementEnabled]); } } - (void)toggleCNS11643Enabled:(id)sender { if (_keyHandler.inputMode == kBopomofoModeIdentifierCHT){ - [LanguageModelManager languageModelCoreCHT]->setCNSEnabled([Preferences toggleCNS11643Enabled]); + [mgrLangModel languageModelCoreCHT]->setCNSEnabled([Preferences toggleCNS11643Enabled]); } else { - [LanguageModelManager languageModelCoreCHS]->setCNSEnabled([Preferences toggleCNS11643Enabled]); + [mgrLangModel languageModelCoreCHS]->setCNSEnabled([Preferences toggleCNS11643Enabled]); } // 注意上面這一行已經動過開關了，所以接下來就不要 toggle。 [NotifierController notifyWithMessage:[NSString stringWithFormat:@"%@%@%@", NSLocalizedString(@"CNS11643 Mode", @""), @"\n", [Preferences cns11643Enabled] ? NSLocalizedString(@"NotificationSwitchON", @"") : NSLocalizedString(@"NotificationSwitchOFF", @"")] stay:NO]; @@ -526,8 +526,8 @@ static inline NSString *LocalizationNotNeeded(NSString *s) { - (BOOL)_checkUserFiles { - if (![LanguageModelManager checkIfUserLanguageModelFilesExist]) { - NSString *content = [NSString stringWithFormat:NSLocalizedString(@"Please check the permission of at \"%@\".", @""), [LanguageModelManager dataFolderPath]]; + if (![mgrLangModel checkIfUserLanguageModelFilesExist]) { + NSString *content = [NSString stringWithFormat:NSLocalizedString(@"Please check the permission of at \"%@\".", @""), [mgrLangModel dataFolderPath]]; [[ctlNonModalAlertWindow sharedInstance] showWithTitle:NSLocalizedString(@"Unable to create the user phrase file.", @"") content:content confirmButtonTitle:NSLocalizedString(@"OK", @"") cancelButtonTitle:nil cancelAsDefault:NO delegate:nil]; return NO; } @@ -545,23 +545,23 @@ static inline NSString *LocalizationNotNeeded(NSString *s) { - (void)openUserPhrases:(id)sender { - [self _openUserFile:[LanguageModelManager userPhrasesDataPath:_keyHandler.inputMode]]; + [self _openUserFile:[mgrLangModel userPhrasesDataPath:_keyHandler.inputMode]]; } - (void)openExcludedPhrases:(id)sender { - [self _openUserFile:[LanguageModelManager excludedPhrasesDataPath:_keyHandler.inputMode]]; + [self _openUserFile:[mgrLangModel excludedPhrasesDataPath:_keyHandler.inputMode]]; } - (void)openPhraseReplacement:(id)sender { - [self _openUserFile:[LanguageModelManager phraseReplacementDataPath:_keyHandler.inputMode]]; + [self _openUserFile:[mgrLangModel phraseReplacementDataPath:_keyHandler.inputMode]]; } - (void)reloadUserPhrases:(id)sender { - [LanguageModelManager loadUserPhrases]; - [LanguageModelManager loadUserPhraseReplacement]; + [mgrLangModel loadUserPhrases]; + [mgrLangModel loadUserPhraseReplacement]; } - (void)showAbout:(id)sender @@ -636,7 +636,7 @@ static inline NSString *LocalizationNotNeeded(NSString *s) { return NO; } NSString *userPhrase = state.userPhrase; - return [LanguageModelManager writeUserPhrase:userPhrase inputMode:_keyHandler.inputMode]; + return [mgrLangModel writeUserPhrase:userPhrase inputMode:_keyHandler.inputMode]; return YES; } diff --git a/Source/Modules/LangModelRelated/LanguageModelManager.h b/Source/Modules/LangModelRelated/mgrLangModel.h similarity index 95% rename from Source/Modules/LangModelRelated/LanguageModelManager.h rename to Source/Modules/LangModelRelated/mgrLangModel.h index 97e1ba9e..28136324 100644 --- a/Source/Modules/LangModelRelated/LanguageModelManager.h +++ b/Source/Modules/LangModelRelated/mgrLangModel.h @@ -1,5 +1,5 @@ /* - * LanguageModelManager.h + * mgrLangModel.h * * Copyright 2021-2022 vChewing Project (3-Clause BSD License). * Derived from 2011-2022 OpenVanilla Project (MIT License). @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LanguageModelManager : NSObject +@interface mgrLangModel : NSObject + (void)loadDataModels; + (void)deployZipDataFile:(NSString *)filenameWithoutExtension; diff --git a/Source/Modules/LangModelRelated/LanguageModelManager.mm b/Source/Modules/LangModelRelated/mgrLangModel.mm similarity index 98% rename from Source/Modules/LangModelRelated/LanguageModelManager.mm rename to Source/Modules/LangModelRelated/mgrLangModel.mm index 383ccd0e..9380fb79 100644 --- a/Source/Modules/LangModelRelated/LanguageModelManager.mm +++ b/Source/Modules/LangModelRelated/mgrLangModel.mm @@ -1,12 +1,12 @@ /* - * LanguageModelManager.mm + * mgrLangModel.mm * * Copyright 2021-2022 vChewing Project (3-Clause BSD License). * Derived from 2011-2022 OpenVanilla Project (MIT License). * Some rights reserved. See "LICENSE.TXT" for details. */ -#import "LanguageModelManager.h" +#import "mgrLangModel.h" using namespace std; using namespace vChewing; @@ -24,7 +24,7 @@ UserOverrideModel gUserOverrideModelCHT(kUserOverrideModelCapacity, kObservedOve static NSString *const kBopomofoModeIdentifierCHT = @"org.atelierInmu.inputmethod.vChewing.TradBopomofo"; static NSString *const kBopomofoModeIdentifierCHS = @"org.atelierInmu.inputmethod.vChewing.SimpBopomofo"; -@implementation LanguageModelManager +@implementation mgrLangModel + (void)deployZipDataFile:(NSString *)filenameWithoutExtension { diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index d5de65c5..cbea0f35 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 5B36562327AA9A2D0003DFDD /* StringUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B36562227AA9A2D0003DFDD /* StringUtils.swift */; }; 5B42B64027876FDC00BB9B9F /* UserOverrideModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B42B63E27876FDC00BB9B9F /* UserOverrideModel.mm */; }; 5B5F4F8E27928F9300922DC2 /* vChewingLM.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B5F4F8D27928F9300922DC2 /* vChewingLM.mm */; }; - 5B5F4F93279294A300922DC2 /* LanguageModelManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B5F4F92279294A300922DC2 /* LanguageModelManager.mm */; }; + 5B5F4F93279294A300922DC2 /* mgrLangModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B5F4F92279294A300922DC2 /* mgrLangModel.mm */; }; 5B5F4F972792A4EA00922DC2 /* UserPhrasesLM.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B5F4F962792A4EA00922DC2 /* UserPhrasesLM.mm */; }; 5B6797B52794822C004AC7CE /* PhraseReplacementMap.h in Sources */ = {isa = PBXBuildFile; fileRef = 5B6797B32794822C004AC7CE /* PhraseReplacementMap.h */; }; 5B810D9F27A3A5E50032C1A9 /* LMConsolidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B810D9D27A3A5E50032C1A9 /* LMConsolidator.mm */; }; @@ -124,8 +124,8 @@ 5B42B63F27876FDC00BB9B9F /* UserOverrideModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserOverrideModel.h; sourceTree = ""; }; 5B5F4F8C27928F9300922DC2 /* vChewingLM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vChewingLM.h; sourceTree = ""; }; 5B5F4F8D27928F9300922DC2 /* vChewingLM.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = vChewingLM.mm; sourceTree = ""; }; - 5B5F4F91279294A300922DC2 /* LanguageModelManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LanguageModelManager.h; sourceTree = ""; }; - 5B5F4F92279294A300922DC2 /* LanguageModelManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LanguageModelManager.mm; sourceTree = ""; }; + 5B5F4F91279294A300922DC2 /* mgrLangModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mgrLangModel.h; sourceTree = ""; }; + 5B5F4F92279294A300922DC2 /* mgrLangModel.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = mgrLangModel.mm; sourceTree = ""; }; 5B5F4F952792A4EA00922DC2 /* UserPhrasesLM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserPhrasesLM.h; sourceTree = ""; }; 5B5F4F962792A4EA00922DC2 /* UserPhrasesLM.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = UserPhrasesLM.mm; sourceTree = ""; }; 5B6797B32794822C004AC7CE /* PhraseReplacementMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhraseReplacementMap.h; sourceTree = ""; }; @@ -308,8 +308,8 @@ 5B0CF3B927AD558100784B08 /* LangModelRelated */ = { isa = PBXGroup; children = ( - 5B5F4F91279294A300922DC2 /* LanguageModelManager.h */, - 5B5F4F92279294A300922DC2 /* LanguageModelManager.mm */, + 5B5F4F91279294A300922DC2 /* mgrLangModel.h */, + 5B5F4F92279294A300922DC2 /* mgrLangModel.mm */, 5BA8DAFE27928120009C9FFF /* SubLanguageModels */, 5B5F4F8D27928F9300922DC2 /* vChewingLM.mm */, 5B5F4F8C27928F9300922DC2 /* vChewingLM.h */, @@ -789,7 +789,7 @@ 5BDD25F9279D6D1200AA18F8 /* ioapi.m in Sources */, 5BE798A72793280C00337FF9 /* NotifierController.swift in Sources */, 5B9DD0A927A7950D00ED335A /* FSEventStreamHelper.swift in Sources */, - 5B5F4F93279294A300922DC2 /* LanguageModelManager.mm in Sources */, + 5B5F4F93279294A300922DC2 /* mgrLangModel.mm in Sources */, 6A0D4ED215FC0D6400ABF4B3 /* ctlInputMethod.mm in Sources */, 6A0D4ED315FC0D6400ABF4B3 /* main.swift in Sources */, 5B5F4F972792A4EA00922DC2 /* UserPhrasesLM.mm in Sources */,