|
@@ -0,0 +1,86 @@
|
|
|
+diff -u -r fcitx-skk-0.1.3-orig/po/fcitx-skk.pot fcitx-skk-0.1.3/po/fcitx-skk.pot
|
|
|
+--- fcitx-skk-0.1.3-orig/po/fcitx-skk.pot 2017-12-23 17:51:32.934353018 +0900
|
|
|
++++ fcitx-skk-0.1.3/po/fcitx-skk.pot 2017-12-23 17:55:26.463522962 +0900
|
|
|
+@@ -166,3 +166,6 @@
|
|
|
+ #: src/fcitx-skk.desc:61
|
|
|
+ msgid "Qwerty Center Row (a,s,d,...)"
|
|
|
+ msgstr ""
|
|
|
++
|
|
|
++msgid "Qwerty Center Row2 (asdfjkl)"
|
|
|
++msgstr ""
|
|
|
+diff -u -r fcitx-skk-0.1.3-orig/po/ja.po fcitx-skk-0.1.3/po/ja.po
|
|
|
+--- fcitx-skk-0.1.3-orig/po/ja.po 2017-12-23 17:51:32.935353023 +0900
|
|
|
++++ fcitx-skk-0.1.3/po/ja.po 2017-12-23 17:56:22.452225837 +0900
|
|
|
+@@ -126,6 +126,9 @@
|
|
|
+ msgid "Qwerty Center Row (a,s,d,...)"
|
|
|
+ msgstr "Qwertyキーボード中央行 (a,s,d,...)"
|
|
|
+
|
|
|
++msgid "Qwerty Center Row2 (asdfjkl)"
|
|
|
++msgstr "Qwertyキーボード中央行2 (asdfjkl)"
|
|
|
++
|
|
|
+ #: src/fcitx-skk.desc:31
|
|
|
+ msgid "Return-key does not insert new line on commit"
|
|
|
+ msgstr "確定時にリターンキーを押しても改行を挿入しない"
|
|
|
+diff -u -r fcitx-skk-0.1.3-orig/src/fcitx-skk.desc fcitx-skk-0.1.3/src/fcitx-skk.desc
|
|
|
+--- fcitx-skk-0.1.3-orig/src/fcitx-skk.desc 2017-12-23 17:51:32.936353029 +0900
|
|
|
++++ fcitx-skk-0.1.3/src/fcitx-skk.desc 2017-12-23 17:52:57.678785333 +0900
|
|
|
+@@ -55,10 +55,11 @@
|
|
|
+ [General/CandidateChooseKey]
|
|
|
+ Type=Enum
|
|
|
+ Description=Keys to Select from Candidate Window
|
|
|
+-EnumCount=3
|
|
|
++EnumCount=4
|
|
|
+ Enum0=Digit (0,1,2,...)
|
|
|
+ Enum1=ABC (a,b,c,...)
|
|
|
+ Enum2=Qwerty Center Row (a,s,d,...)
|
|
|
++Enum3=Qwerty Center Row2 (asdfjkl)
|
|
|
+ DefaultValue=Digit (0,1,2,...)
|
|
|
+
|
|
|
+
|
|
|
+diff -u -r fcitx-skk-0.1.3-orig/src/skk.c fcitx-skk-0.1.3/src/skk.c
|
|
|
+--- fcitx-skk-0.1.3-orig/src/skk.c 2017-12-23 17:51:32.936353029 +0900
|
|
|
++++ fcitx-skk-0.1.3/src/skk.c 2017-12-23 18:00:27.942195779 +0900
|
|
|
+@@ -637,6 +637,9 @@
|
|
|
+ case ChooseASDF:
|
|
|
+ FcitxCandidateWordSetChoose(candList, ASDF_STR_CHOOSE);
|
|
|
+ break;
|
|
|
++ case ChooseASDFJ:
|
|
|
++ FcitxCandidateWordSetChoose(candList, ASDFJ_STR_CHOOSE);
|
|
|
++ break;
|
|
|
+ case ChooseDigit:
|
|
|
+ // FALL THRU
|
|
|
+ default:
|
|
|
+@@ -644,7 +647,14 @@
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+- FcitxCandidateWordSetPageSize(candList, skk->config.pageSize);
|
|
|
++ switch (skk->config.candidateChooseKey){
|
|
|
++ case ChooseASDFJ:
|
|
|
++ FcitxCandidateWordSetPageSize(candList, 7);
|
|
|
++ break;
|
|
|
++ default:
|
|
|
++ FcitxCandidateWordSetPageSize(candList, skk->config.pageSize);
|
|
|
++ break;
|
|
|
++ }
|
|
|
+ FcitxCandidateWordSetLayoutHint(candList, skk->config.candidateLayout);
|
|
|
+
|
|
|
+ if (skk_candidate_list_get_page_visible(skkCandList)) {
|
|
|
+diff -u -r fcitx-skk-0.1.3-orig/src/skk.h fcitx-skk-0.1.3/src/skk.h
|
|
|
+--- fcitx-skk-0.1.3-orig/src/skk.h 2017-12-23 17:51:32.937353034 +0900
|
|
|
++++ fcitx-skk-0.1.3/src/skk.h 2017-12-23 17:54:10.771150443 +0900
|
|
|
+@@ -35,11 +35,13 @@
|
|
|
+
|
|
|
+ #define ABCD_STR_CHOOSE "abcdefghij"
|
|
|
+ #define ASDF_STR_CHOOSE "asdfghjkl;"
|
|
|
++#define ASDFJ_STR_CHOOSE "asdfjkl;"
|
|
|
+
|
|
|
+ typedef enum _FcitxSkkChooseKeyType {
|
|
|
+ ChooseDigit,
|
|
|
+ ChooseABCD,
|
|
|
+- ChooseASDF
|
|
|
++ ChooseASDF,
|
|
|
++ ChooseASDFJ
|
|
|
+ } FcitxSkkChooseKeyType;
|
|
|
+
|
|
|
+ typedef struct _FcitxSkkConfig {
|