diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift index b07ecb74..2cc6f5ba 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift @@ -136,7 +136,7 @@ extension InputHandler { /// - Returns: 回呼一個新的選詞狀態,來就給定的候選字詞陣列資料內容顯示選字窗。 public func generateStateOfCandidates() -> IMEStateProtocol { var result = IMEState.ofCandidates( - candidates: generateArrayOfCandidates(fixOrder: prefs.useFixecCandidateOrderOnSelection), + candidates: generateArrayOfCandidates(fixOrder: prefs.useFixedCandidateOrderOnSelection), displayTextSegments: compositor.walkedNodes.values, cursor: delegate?.state.cursor ?? generateStateOfInputting().cursor ) @@ -831,7 +831,7 @@ extension InputHandler { return true } - let candidates = generateArrayOfCandidates(fixOrder: prefs.useFixecCandidateOrderOnSelection) + let candidates = generateArrayOfCandidates(fixOrder: prefs.useFixedCandidateOrderOnSelection) guard !candidates.isEmpty else { delegate.callError("3378A6DF") return true diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Core.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Core.swift index e9c705eb..9f9d9ea2 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Core.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Core.swift @@ -106,8 +106,8 @@ public class PrefMgr: PrefMgrProtocol { @AppProperty(key: UserDef.kFetchSuggestionsFromUserOverrideModel.rawValue, defaultValue: true) public var fetchSuggestionsFromUserOverrideModel: Bool - @AppProperty(key: UserDef.kUseFixecCandidateOrderOnSelection.rawValue, defaultValue: false) - public var useFixecCandidateOrderOnSelection: Bool + @AppProperty(key: UserDef.kUseFixedCandidateOrderOnSelection.rawValue, defaultValue: false) + public var useFixedCandidateOrderOnSelection: Bool @AppProperty(key: UserDef.kAutoCorrectReadingCombination.rawValue, defaultValue: true) public var autoCorrectReadingCombination: Bool diff --git a/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift b/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift index 4abd833a..9ace1598 100644 --- a/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift +++ b/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift @@ -31,7 +31,7 @@ public protocol PrefMgrProtocol { var chooseCandidateUsingSpace: Bool { get set } var allowBoostingSingleKanjiAsUserPhrase: Bool { get set } var fetchSuggestionsFromUserOverrideModel: Bool { get set } - var useFixecCandidateOrderOnSelection: Bool { get set } + var useFixedCandidateOrderOnSelection: Bool { get set } var autoCorrectReadingCombination: Bool { get set } var alsoConfirmAssociatedCandidatesByEnter: Bool { get set } var keepReadingUponCompositionError: Bool { get set } diff --git a/Packages/vChewing_Shared/Sources/Shared/Shared.swift b/Packages/vChewing_Shared/Sources/Shared/Shared.swift index 8a4e90de..ae745fd7 100644 --- a/Packages/vChewing_Shared/Sources/Shared/Shared.swift +++ b/Packages/vChewing_Shared/Sources/Shared/Shared.swift @@ -52,7 +52,7 @@ public enum UserDef: String, CaseIterable { case kShowHanyuPinyinInCompositionBuffer = "ShowHanyuPinyinInCompositionBuffer" case kInlineDumpPinyinInLieuOfZhuyin = "InlineDumpPinyinInLieuOfZhuyin" case kFetchSuggestionsFromUserOverrideModel = "FetchSuggestionsFromUserOverrideModel" - case kUseFixecCandidateOrderOnSelection = "UseFixecCandidateOrderOnSelection" + case kUseFixedCandidateOrderOnSelection = "UseFixedCandidateOrderOnSelection" case kAutoCorrectReadingCombination = "AutoCorrectReadingCombination" case kAlsoConfirmAssociatedCandidatesByEnter = "AlsoConfirmAssociatedCandidatesByEnter" case kKeepReadingUponCompositionError = "KeepReadingUponCompositionError" diff --git a/Source/Modules/UIModules/PrefUI/VwrPrefPaneCandidates.swift b/Source/Modules/UIModules/PrefUI/VwrPrefPaneCandidates.swift index 386a9904..24a2d6a8 100644 --- a/Source/Modules/UIModules/PrefUI/VwrPrefPaneCandidates.swift +++ b/Source/Modules/UIModules/PrefUI/VwrPrefPaneCandidates.swift @@ -35,8 +35,8 @@ struct VwrPrefPaneCandidates: View { @Backport.AppStorage(wrappedValue: true, UserDef.kMoveCursorAfterSelectingCandidate.rawValue) private var moveCursorAfterSelectingCandidate: Bool - @Backport.AppStorage(wrappedValue: false, UserDef.kUseFixecCandidateOrderOnSelection.rawValue) - private var useFixecCandidateOrderOnSelection: Bool + @Backport.AppStorage(wrappedValue: false, UserDef.kUseFixedCandidateOrderOnSelection.rawValue) + private var useFixedCandidateOrderOnSelection: Bool @Backport.AppStorage(wrappedValue: true, UserDef.kConsolidateContextOnCandidateSelection.rawValue) private var consolidateContextOnCandidateSelection: Bool @@ -142,7 +142,7 @@ struct VwrPrefPaneCandidates: View { .preferenceDescription(maxWidth: CtlPrefUIShared.maxDescriptionWidth) Toggle( LocalizedStringKey("Always use fixed listing order in candidate window"), - isOn: $useFixecCandidateOrderOnSelection + isOn: $useFixedCandidateOrderOnSelection ) Text( LocalizedStringKey( diff --git a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib index edbbe8be..b2ba2f91 100644 --- a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib +++ b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib @@ -1,7 +1,6 @@ - @@ -150,7 +149,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -