diff --git a/Packages/vChewing_Shared/Sources/Shared/Shared.swift b/Packages/vChewing_Shared/Sources/Shared/Shared.swift index 598aa040..7c479489 100644 --- a/Packages/vChewing_Shared/Sources/Shared/Shared.swift +++ b/Packages/vChewing_Shared/Sources/Shared/Shared.swift @@ -178,12 +178,12 @@ public enum KeyboardParser: Int, CaseIterable { case ofETen26 = 3 case ofHsu = 2 case ofStarlight = 9 - case ofHanyuPinyin = 10 - case ofSecondaryPinyin = 11 - case ofYalePinyin = 12 - case ofHualuoPinyin = 13 - case ofUniversalPinyin = 14 - case ofWadeGilesPinyin = 15 + case ofHanyuPinyin = 100 + case ofSecondaryPinyin = 101 + case ofYalePinyin = 102 + case ofHualuoPinyin = 103 + case ofUniversalPinyin = 104 + case ofWadeGilesPinyin = 105 public var localizedMenuName: String { let rawString: String = { diff --git a/Source/Modules/PrefMgr_Extension.swift b/Source/Modules/PrefMgr_Extension.swift index de887bdf..eb0b6bb7 100644 --- a/Source/Modules/PrefMgr_Extension.swift +++ b/Source/Modules/PrefMgr_Extension.swift @@ -39,11 +39,7 @@ public extension PrefMgr { } } // 注拼槽注音排列選項糾錯。 - var isKeyboardParserOptionValid = false - KeyboardParser.allCases.forEach { - if $0.rawValue == keyboardParser { isKeyboardParserOptionValid = true } - } - if !isKeyboardParserOptionValid { + if KeyboardParser(rawValue: keyboardParser) == nil { keyboardParser = 0 } // 基礎鍵盤排列選項糾錯。 diff --git a/Source/Modules/UIModules/PrefUI/VwrPrefPaneKeyboard.swift b/Source/Modules/UIModules/PrefUI/VwrPrefPaneKeyboard.swift index 6f94b006..c5a7922e 100644 --- a/Source/Modules/UIModules/PrefUI/VwrPrefPaneKeyboard.swift +++ b/Source/Modules/UIModules/PrefUI/VwrPrefPaneKeyboard.swift @@ -52,7 +52,7 @@ struct VwrPrefPaneKeyboard: View { Text("↻ㄅ" + " " + NSLocalizedString("Eten Trad.", comment: "")) } Button { - keyboardParser = 10 + keyboardParser = 100 basicKeyboardLayout = "com.apple.keylayout.ABC" } label: { Text("↻A") @@ -66,7 +66,7 @@ struct VwrPrefPaneKeyboard: View { selection: $keyboardParser ) { ForEach(KeyboardParser.allCases, id: \.self) { item in - if [7, 10].contains(item.rawValue) { Divider() } + if [7, 100].contains(item.rawValue) { Divider() } Text(item.localizedMenuName).tag(item.rawValue) }.id(UUID()) } diff --git a/Source/Modules/WindowControllers/CtlPrefWindow.swift b/Source/Modules/WindowControllers/CtlPrefWindow.swift index 4e1d9a10..e10272ef 100644 --- a/Source/Modules/WindowControllers/CtlPrefWindow.swift +++ b/Source/Modules/WindowControllers/CtlPrefWindow.swift @@ -194,7 +194,7 @@ class CtlPrefWindow: NSWindowController, NSWindowDelegate { parserButton.menu?.removeAllItems() let basicParserID = PrefMgr.shared.keyboardParser KeyboardParser.allCases.forEach { item in - if [7, 10].contains(item.rawValue) { + if [7, 100].contains(item.rawValue) { parserButton.menu?.addItem(NSMenuItem.separator()) } let menuItem = NSMenuItem()