diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm index 6cbba9de..80a2a5ad 100644 --- a/Source/InputMethodController.mm +++ b/Source/InputMethodController.mm @@ -268,10 +268,10 @@ public: _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::ETen26Layout()); break; case 4: - _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::IBMLayout()); + _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::HanyuPinyinLayout()); break; case 5: - _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::HanyuPinyinLayout()); + _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::IBMLayout()); break; default: _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::StandardLayout()); @@ -1051,10 +1051,10 @@ public: layout = string("Hsu_"); break; case 4: - layout = string("IBM_"); + layout = string("HanyuPinyin_"); break; case 5: - layout = string("HanyuPinyin_"); + layout = string("IBM_"); break; default: break; diff --git a/Source/en.lproj/preferences.xib b/Source/en.lproj/preferences.xib index c6bbf233..a7d9c393 100644 --- a/Source/en.lproj/preferences.xib +++ b/Source/en.lproj/preferences.xib @@ -1,14 +1,14 @@ - 1070 - 11E53 - 2549 - 1138.47 - 569.00 + 1080 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 2844 YES @@ -48,7 +48,7 @@ 7 2 - {{809, 539}, {460, 266}} + {{557, 383}, {460, 266}} 544735232 Bopomofo Preferences NSWindow @@ -68,7 +68,7 @@ YES - -2076049856 + -2076180416 2048 LucidaGrande @@ -76,28 +76,29 @@ 1044 - 109199615 + 109199360 129 400 75 - + - Standard + Hanyu Pinyin 1048576 2147483647 1 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState _popUpItemAction: + 4 YES @@ -105,15 +106,25 @@ OtherViews YES - + + + Standard + + 1048576 + 2147483647 + + + _popUpItemAction: + + ETen 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -124,8 +135,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 2 @@ -136,32 +147,35 @@ 1048576 2147483647 - - + + _popUpItemAction: 3 - + - Hanyu Pinyin + IBM 1048576 2147483647 - - + + _popUpItemAction: - 4 + 5 + + 5 1 YES YES 2 + NO @@ -172,7 +186,7 @@ YES - 68288064 + 68157504 71304192 Bopomofo Keyboard Layout: @@ -196,6 +210,7 @@ + NO @@ -206,11 +221,11 @@ YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -231,6 +246,7 @@ YES 2 + NO @@ -241,7 +257,7 @@ YES - 68288064 + 68157504 71304192 Alphanumeric Keyboard Layout: @@ -249,6 +265,7 @@ + NO @@ -259,7 +276,7 @@ YES - 68288064 + 68157504 71304192 Show Candidate Phrase: @@ -267,6 +284,7 @@ + NO @@ -277,7 +295,7 @@ YES - 68288064 + 68157504 71304192 Candidate List Style: @@ -285,6 +303,7 @@ + NO @@ -295,7 +314,7 @@ YES - 68288064 + 68157504 71304192 Candidate Text Size: @@ -303,6 +322,7 @@ + NO @@ -313,17 +333,18 @@ 1 YES + NO 2 1 YES - -2080244224 + -2080374784 0 Before the cursor (like Hanin) - 1211912703 + 1211912448 0 NSRadioButton @@ -334,13 +355,13 @@ 25 - 67239424 + 67108864 0 After the cursor (like MS IME) 1 - 1211912703 + 1211912448 0 549453824 @@ -448,11 +469,11 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 1151868928 NSActionCell - 67239424 + 67108864 0 Radio - 1211912703 + 1211912448 0 549453824 @@ -506,6 +527,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA MQA + YES @@ -515,17 +537,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + NO 2 1 YES - -2080244224 + -2080374784 0 Vertical - 1211912703 + 1211912448 0 @@ -534,13 +557,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - 67239424 + 67108864 0 Horizontal 1 - 1211912703 + 1211912448 0 549453824 @@ -645,11 +668,11 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 1151868928 NSActionCell - 67239424 + 67108864 0 Radio - 1211912703 + 1211912448 0 549453824 @@ -700,6 +723,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + YES @@ -710,11 +734,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -727,8 +751,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 1 - - + + _popUpItemAction: 18 @@ -744,8 +768,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 12 @@ -756,8 +780,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 14 @@ -768,8 +792,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 16 @@ -781,8 +805,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 24 @@ -793,8 +817,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 32 @@ -805,8 +829,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 64 @@ -817,8 +841,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1048576 2147483647 - - + + _popUpItemAction: 96 @@ -832,6 +856,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 + NO @@ -839,16 +864,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{225, 18}, {217, 18}} + _NS:239 YES - -2080244224 + -2080374784 0 Space key chooses candidate _NS:239 - 1211912703 + 1211912448 2 NSImage @@ -862,6 +888,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 + NO {460, 266} @@ -869,9 +896,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{0, 0}, {1440, 878}} + {{0, 0}, {1366, 746}} {10000000000000, 10000000000000} - YES + NO YES @@ -1079,6 +1106,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + @@ -1348,6 +1376,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 137 + + + @@ -1375,6 +1408,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 127.IBPluginDependency 128.IBPluginDependency 13.IBPluginDependency + 137.IBPluginDependency 14.IBPluginDependency 15.IBPluginDependency 16.IBPluginDependency @@ -1461,6 +1495,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1475,7 +1510,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 136 + 137 diff --git a/Source/zh-Hant.lproj/preferences.xib b/Source/zh-Hant.lproj/preferences.xib index b4b7e202..f3945f4a 100644 --- a/Source/zh-Hant.lproj/preferences.xib +++ b/Source/zh-Hant.lproj/preferences.xib @@ -1,14 +1,14 @@ - 1070 - 11E53 - 2549 - 1138.47 - 569.00 + 1080 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 2844 YES @@ -68,7 +68,7 @@ YES - -2076049856 + -2076180416 2048 LucidaGrande @@ -76,35 +76,34 @@ 1044 - 109199615 + 109199360 129 400 75 - - - 標準 - - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - + YES OtherViews YES - + + + 標準 + + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + 倚天 @@ -141,6 +140,18 @@ 3 + + + IBM + + 1048576 + 2147483647 + + + _popUpItemAction: + 5 + + 漢語拼音 @@ -156,11 +167,13 @@ + -1 1 YES YES 2 + NO @@ -171,7 +184,7 @@ YES - 68288064 + 68157504 71304192 注音鍵盤配置: @@ -195,6 +208,7 @@ + NO @@ -205,11 +219,11 @@ YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -230,6 +244,7 @@ YES 2 + NO @@ -240,7 +255,7 @@ YES - 68288064 + 68157504 71304192 英數字鍵盤配置: @@ -248,6 +263,7 @@ + NO @@ -258,7 +274,7 @@ YES - 68288064 + 68157504 71304192 選字時,候選詞起算點在: @@ -266,6 +282,7 @@ + NO @@ -276,7 +293,7 @@ YES - 68288064 + 68157504 71304192 候選詞呈現方式: @@ -284,6 +301,7 @@ + NO @@ -294,7 +312,7 @@ YES - 68288064 + 68157504 71304192 選字窗文字大小: @@ -302,6 +320,7 @@ + NO @@ -312,17 +331,18 @@ 1 YES + NO 2 1 YES - -2080244224 + -2080374784 0 游標前面(像漢音輸入法) - 1211912703 + 1211912448 0 NSRadioButton @@ -333,13 +353,13 @@ 25 - 67239424 + 67108864 0 游標後面(像微軟新注音) 1 - 1211912703 + 1211912448 0 549453824 @@ -447,11 +467,11 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 1151868928 NSActionCell - 67239424 + 67108864 0 Radio - 1211912703 + 1211912448 0 549453824 @@ -514,17 +534,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + NO 2 1 YES - -2080244224 + -2080374784 0 垂直列表 - 1211912703 + 1211912448 0 @@ -533,13 +554,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - 67239424 + 67108864 0 水平列表 1 - 1211912703 + 1211912448 0 549453824 @@ -644,11 +665,11 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 1151868928 NSActionCell - 67239424 + 67108864 0 Radio - 1211912703 + 1211912448 0 549453824 @@ -709,11 +730,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -831,6 +852,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 + NO @@ -838,17 +860,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{180, 18}, {113, 18}} - _NS:239 YES - -2080244224 + -2080374784 0 使用空白鍵選字 _NS:239 - 1211912703 + 1211912448 2 NSImage @@ -862,6 +883,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 + NO {386, 265} @@ -869,7 +891,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{0, 0}, {1440, 878}} + {{0, 0}, {1366, 746}} {10000000000000, 10000000000000} YES @@ -1079,6 +1101,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + @@ -1348,6 +1371,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 125 + + + @@ -1374,6 +1402,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 115.IBPluginDependency 116.IBPluginDependency 12.IBPluginDependency + 125.IBPluginDependency 13.IBPluginDependency 14.IBPluginDependency 15.IBPluginDependency @@ -1461,6 +1490,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1475,7 +1505,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 124 + 125