[11289] | 1 | diff -u -r fcitx-skk-0.1.3-orig/po/fcitx-skk.pot fcitx-skk-0.1.3/po/fcitx-skk.pot |
---|
| 2 | --- fcitx-skk-0.1.3-orig/po/fcitx-skk.pot 2017-12-23 17:51:32.934353018 +0900 |
---|
| 3 | +++ fcitx-skk-0.1.3/po/fcitx-skk.pot 2017-12-23 17:55:26.463522962 +0900 |
---|
| 4 | @@ -166,3 +166,6 @@ |
---|
| 5 | #: src/fcitx-skk.desc:61 |
---|
| 6 | msgid "Qwerty Center Row (a,s,d,...)" |
---|
| 7 | msgstr "" |
---|
| 8 | + |
---|
| 9 | +msgid "Qwerty Center Row2 (asdfjkl)" |
---|
| 10 | +msgstr "" |
---|
| 11 | diff -u -r fcitx-skk-0.1.3-orig/po/ja.po fcitx-skk-0.1.3/po/ja.po |
---|
| 12 | --- fcitx-skk-0.1.3-orig/po/ja.po 2017-12-23 17:51:32.935353023 +0900 |
---|
| 13 | +++ fcitx-skk-0.1.3/po/ja.po 2017-12-23 17:56:22.452225837 +0900 |
---|
| 14 | @@ -126,6 +126,9 @@ |
---|
| 15 | msgid "Qwerty Center Row (a,s,d,...)" |
---|
| 16 | msgstr "Qwertyキーボード中央行 (a,s,d,...)" |
---|
| 17 | |
---|
| 18 | +msgid "Qwerty Center Row2 (asdfjkl)" |
---|
| 19 | +msgstr "Qwertyキーボード中央行2 (asdfjkl)" |
---|
| 20 | + |
---|
| 21 | #: src/fcitx-skk.desc:31 |
---|
| 22 | msgid "Return-key does not insert new line on commit" |
---|
| 23 | msgstr "確定時にリターンキーを押しても改行を挿入しない" |
---|
| 24 | diff -u -r fcitx-skk-0.1.3-orig/src/fcitx-skk.desc fcitx-skk-0.1.3/src/fcitx-skk.desc |
---|
| 25 | --- fcitx-skk-0.1.3-orig/src/fcitx-skk.desc 2017-12-23 17:51:32.936353029 +0900 |
---|
| 26 | +++ fcitx-skk-0.1.3/src/fcitx-skk.desc 2017-12-23 17:52:57.678785333 +0900 |
---|
| 27 | @@ -55,10 +55,11 @@ |
---|
| 28 | [General/CandidateChooseKey] |
---|
| 29 | Type=Enum |
---|
| 30 | Description=Keys to Select from Candidate Window |
---|
| 31 | -EnumCount=3 |
---|
| 32 | +EnumCount=4 |
---|
| 33 | Enum0=Digit (0,1,2,...) |
---|
| 34 | Enum1=ABC (a,b,c,...) |
---|
| 35 | Enum2=Qwerty Center Row (a,s,d,...) |
---|
| 36 | +Enum3=Qwerty Center Row2 (asdfjkl) |
---|
| 37 | DefaultValue=Digit (0,1,2,...) |
---|
| 38 | |
---|
| 39 | |
---|
| 40 | diff -u -r fcitx-skk-0.1.3-orig/src/skk.c fcitx-skk-0.1.3/src/skk.c |
---|
| 41 | --- fcitx-skk-0.1.3-orig/src/skk.c 2017-12-23 17:51:32.936353029 +0900 |
---|
| 42 | +++ fcitx-skk-0.1.3/src/skk.c 2017-12-23 18:00:27.942195779 +0900 |
---|
| 43 | @@ -637,6 +637,9 @@ |
---|
| 44 | case ChooseASDF: |
---|
| 45 | FcitxCandidateWordSetChoose(candList, ASDF_STR_CHOOSE); |
---|
| 46 | break; |
---|
| 47 | + case ChooseASDFJ: |
---|
| 48 | + FcitxCandidateWordSetChoose(candList, ASDFJ_STR_CHOOSE); |
---|
| 49 | + break; |
---|
| 50 | case ChooseDigit: |
---|
| 51 | // FALL THRU |
---|
| 52 | default: |
---|
| 53 | @@ -644,7 +647,14 @@ |
---|
| 54 | break; |
---|
| 55 | } |
---|
| 56 | |
---|
| 57 | - FcitxCandidateWordSetPageSize(candList, skk->config.pageSize); |
---|
| 58 | + switch (skk->config.candidateChooseKey){ |
---|
| 59 | + case ChooseASDFJ: |
---|
| 60 | + FcitxCandidateWordSetPageSize(candList, 7); |
---|
| 61 | + break; |
---|
| 62 | + default: |
---|
| 63 | + FcitxCandidateWordSetPageSize(candList, skk->config.pageSize); |
---|
| 64 | + break; |
---|
| 65 | + } |
---|
| 66 | FcitxCandidateWordSetLayoutHint(candList, skk->config.candidateLayout); |
---|
| 67 | |
---|
| 68 | if (skk_candidate_list_get_page_visible(skkCandList)) { |
---|
| 69 | diff -u -r fcitx-skk-0.1.3-orig/src/skk.h fcitx-skk-0.1.3/src/skk.h |
---|
| 70 | --- fcitx-skk-0.1.3-orig/src/skk.h 2017-12-23 17:51:32.937353034 +0900 |
---|
| 71 | +++ fcitx-skk-0.1.3/src/skk.h 2017-12-23 17:54:10.771150443 +0900 |
---|
| 72 | @@ -35,11 +35,13 @@ |
---|
| 73 | |
---|
| 74 | #define ABCD_STR_CHOOSE "abcdefghij" |
---|
| 75 | #define ASDF_STR_CHOOSE "asdfghjkl;" |
---|
| 76 | +#define ASDFJ_STR_CHOOSE "asdfjkl;" |
---|
| 77 | |
---|
| 78 | typedef enum _FcitxSkkChooseKeyType { |
---|
| 79 | ChooseDigit, |
---|
| 80 | ChooseABCD, |
---|
| 81 | - ChooseASDF |
---|
| 82 | + ChooseASDF, |
---|
| 83 | + ChooseASDFJ |
---|
| 84 | } FcitxSkkChooseKeyType; |
---|
| 85 | |
---|
| 86 | typedef struct _FcitxSkkConfig { |
---|