diff --git a/Packages/vChewing_Tekkon/Sources/Tekkon/Tekkon_Phonabets.swift b/Packages/vChewing_Tekkon/Sources/Tekkon/Tekkon_Phonabets.swift index 7943e912..caa6e86e 100644 --- a/Packages/vChewing_Tekkon/Sources/Tekkon/Tekkon_Phonabets.swift +++ b/Packages/vChewing_Tekkon/Sources/Tekkon/Tekkon_Phonabets.swift @@ -41,7 +41,7 @@ extension Tekkon { var name: String { switch self { case .ofDachen: - return "Dachen" + return "Dachen Trad." case .ofDachen26: return "Dachen26" case .ofETen: diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift index c4072b5a..ef87099a 100644 --- a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift +++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift @@ -94,6 +94,34 @@ struct suiPrefPaneKeyboard: View { .preferenceDescription() } } + Preferences.Section(label: { Text(LocalizedStringKey("Quick Setup:")) }) { + HStack { + Button { + PrefMgr.shared.keyboardParser = 0 + selKeyboardParser = PrefMgr.shared.keyboardParser + PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ZhuyinBopomofo" + selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout + } label: { + Text("↻ㄅ" + " " + NSLocalizedString("Dachen Trad.", comment: "")) + } + Button { + PrefMgr.shared.keyboardParser = 1 + selKeyboardParser = PrefMgr.shared.keyboardParser + PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ZhuyinEten" + selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout + } label: { + Text("↻ㄅ" + " " + NSLocalizedString("Eten Trad.", comment: "")) + } + Button { + PrefMgr.shared.keyboardParser = 10 + selKeyboardParser = PrefMgr.shared.keyboardParser + PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ABC" + selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout + } label: { + Text("↻Ａ") + } + } + } Preferences.Section(label: { Text(LocalizedStringKey("Phonetic Parser:")) }) { HStack { Picker( @@ -127,23 +155,9 @@ struct suiPrefPaneKeyboard: View { Text(LocalizedStringKey("Universal Pinyin with Numeral Intonation")).tag(14) } } + .fixedSize() .labelsHidden() - Button { - PrefMgr.shared.keyboardParser = 0 - selKeyboardParser = PrefMgr.shared.keyboardParser - PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ZhuyinBopomofo" - selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout - } label: { - Text("↻ㄅ") - } - Button { - PrefMgr.shared.keyboardParser = 10 - selKeyboardParser = PrefMgr.shared.keyboardParser - PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ABC" - selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout - } label: { - Text("↻Ａ") - } + Spacer() } .frame(width: 380.0) HStack { diff --git a/Source/Resources/Base.lproj/Localizable.strings b/Source/Resources/Base.lproj/Localizable.strings index d1ee61a5..89046071 100644 --- a/Source/Resources/Base.lproj/Localizable.strings +++ b/Source/Resources/Base.lproj/Localizable.strings @@ -82,6 +82,8 @@ "Clear Memorized Phrases" = "Clear Memorized Phrases"; "Currency Numeral Output" = "Currency Numeral Output"; "Hold ⇧ to choose associates." = "Hold ⇧ to choose associates."; +"Dachen Trad." = "Dachen Trad."; +"Eten Trad." = "Eten Trad."; // The followings are the category names used in the Symbol menu. "catCommonSymbols" = "CommonSymbols"; @@ -202,6 +204,7 @@ "Phonetic Parser:" = "Phonetic Parser:"; "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu." = "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu."; "Push the cursor in front of the phrase after selection" = "Push the cursor in front of the phrase after selection"; +"Quick Setup:" = "Quick Setup:"; "Secondary Pinyin with Numeral Intonation" = "Secondary Pinyin with Numeral Intonation"; "Seigyou" = "Seigyou (JinYei)"; "Selection Keys:" = "Selection Keys:"; diff --git a/Source/Resources/en.lproj/Localizable.strings b/Source/Resources/en.lproj/Localizable.strings index d1ee61a5..89046071 100644 --- a/Source/Resources/en.lproj/Localizable.strings +++ b/Source/Resources/en.lproj/Localizable.strings @@ -82,6 +82,8 @@ "Clear Memorized Phrases" = "Clear Memorized Phrases"; "Currency Numeral Output" = "Currency Numeral Output"; "Hold ⇧ to choose associates." = "Hold ⇧ to choose associates."; +"Dachen Trad." = "Dachen Trad."; +"Eten Trad." = "Eten Trad."; // The followings are the category names used in the Symbol menu. "catCommonSymbols" = "CommonSymbols"; @@ -202,6 +204,7 @@ "Phonetic Parser:" = "Phonetic Parser:"; "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu." = "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu."; "Push the cursor in front of the phrase after selection" = "Push the cursor in front of the phrase after selection"; +"Quick Setup:" = "Quick Setup:"; "Secondary Pinyin with Numeral Intonation" = "Secondary Pinyin with Numeral Intonation"; "Seigyou" = "Seigyou (JinYei)"; "Selection Keys:" = "Selection Keys:"; diff --git a/Source/Resources/ja.lproj/Localizable.strings b/Source/Resources/ja.lproj/Localizable.strings index 6c44486b..fc9d6df0 100644 --- a/Source/Resources/ja.lproj/Localizable.strings +++ b/Source/Resources/ja.lproj/Localizable.strings @@ -82,6 +82,8 @@ "Clear Memorized Phrases" = "臨時記憶資料を削除"; "Currency Numeral Output" = "数字大字変換"; "Hold ⇧ to choose associates." = "⇧を押しながら連想候補を選択。"; +"Dachen Trad." = "大千伝統"; +"Eten Trad." = "倚天伝統"; // The followings are the category names used in the Symbol menu. "catCommonSymbols" = "常用"; @@ -202,6 +204,7 @@ "Phonetic Parser:" = "注音配列:"; "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu." = "マウスホイールでこのページをご覧ください。キーに関する取扱説明のアクセスはメニューに。"; "Push the cursor in front of the phrase after selection" = "候補選択の直後、すぐカーソルを単語の向こうに推し進める"; +"Quick Setup:" = "直接設定:"; "Secondary Pinyin with Numeral Intonation" = "国音二式 (ローマ字+数字音調)"; "Seigyou" = "精業配列"; "Selection Keys:" = "言選り用キー:"; diff --git a/Source/Resources/zh-Hans.lproj/Localizable.strings b/Source/Resources/zh-Hans.lproj/Localizable.strings index 013c2a2b..6ae29a12 100644 --- a/Source/Resources/zh-Hans.lproj/Localizable.strings +++ b/Source/Resources/zh-Hans.lproj/Localizable.strings @@ -82,6 +82,8 @@ "Clear Memorized Phrases" = "清除临时记忆语汇资料"; "Currency Numeral Output" = "大写汉字数字输出"; "Hold ⇧ to choose associates." = "摁住⇧以选取联想词。"; +"Dachen Trad." = "大千传统"; +"Eten Trad." = "倚天传统"; // The followings are the category names used in the Symbol menu. "catCommonSymbols" = "常用"; @@ -202,6 +204,7 @@ "Phonetic Parser:" = "注音排列:"; "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu." = "请利用滑鼠滚轮检视该页面。也请洽输入法选单内的热键指南。"; "Push the cursor in front of the phrase after selection" = "在选字后将游标置于该字词的前方"; +"Quick Setup:" = "直接设定:"; "Secondary Pinyin with Numeral Intonation" = "国音二式+数字标调"; "Seigyou" = "精业排列"; "Selection Keys:" = "选字键:"; diff --git a/Source/Resources/zh-Hant.lproj/Localizable.strings b/Source/Resources/zh-Hant.lproj/Localizable.strings index 614d4074..d474399a 100644 --- a/Source/Resources/zh-Hant.lproj/Localizable.strings +++ b/Source/Resources/zh-Hant.lproj/Localizable.strings @@ -82,6 +82,8 @@ "Clear Memorized Phrases" = "清除臨時記憶語彙資料"; "Currency Numeral Output" = "大寫漢字數字輸出"; "Hold ⇧ to choose associates." = "摁住⇧以選取聯想詞。"; +"Dachen Trad." = "大千傳統"; +"Eten Trad." = "倚天傳統"; // The followings are the category names used in the Symbol menu. "catCommonSymbols" = "常用"; @@ -202,6 +204,7 @@ "Phonetic Parser:" = "注音排列:"; "Please use mouse wheel to scroll this page. The CheatSheet is available in the IME menu." = "請利用滑鼠滾輪檢視該頁面。也請洽輸入法選單內的熱鍵指南。"; "Push the cursor in front of the phrase after selection" = "在選字後將游標置於該字詞的前方"; +"Quick Setup:" = "直接設定:"; "Secondary Pinyin with Numeral Intonation" = "國音二式+數字標調"; "Seigyou" = "精業排列"; "Selection Keys:" = "選字鍵:";