From 05784f95e081fc167bbab2c7be0aca0f87defd26 Mon Sep 17 00:00:00 2001 From: cxcn Date: Wed, 31 Mar 2021 14:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++- "\345\215\225\351\235\231+.trime.yaml" | 7 ++-- "\345\215\225\351\235\231.cherry.trime.yaml" | 32 ++++--------------- "\345\215\225\351\235\231.trime.yaml" | 7 ++-- ...\346\227\240\351\232\234\347\242\215.yaml" | 0 5 files changed, 14 insertions(+), 36 deletions(-) rename "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231\346\227\240\351\232\234\347\242\215\350\241\245\344\270\201.yaml" => "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.patch.\346\227\240\351\232\234\347\242\215.yaml" (100%) diff --git a/README.md b/README.md index f7ba892..4ab35c5 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,10 @@ conf: keys/+: - width: 100 #底部留白开关，0为关，1~100开 height: 6 #底部留白 + __patch: 单静.patch.无障碍:/main? key_height_last: # 第4行 按键高度 height: 50 - __patch: 单静无障碍补丁:/key_height_last? + __patch: 单静.patch.无障碍:/key_height_last? # 数字、编辑、功能键盘配置 num: height: 60 #按键高度 @@ -101,6 +102,7 @@ conf: # 添加数字行 num_line: height: 39 # 数字行按键高度 + __patch: 单静.patch.无障碍:/num_line? # line: 33 diff --git "a/\345\215\225\351\235\231+.trime.yaml" "b/\345\215\225\351\235\231+.trime.yaml" index 94e791a..95a5184 100644 --- "a/\345\215\225\351\235\231+.trime.yaml" +++ "b/\345\215\225\351\235\231+.trime.yaml" @@ -12,14 +12,11 @@ conf: # 添加数字行 num_line: height: 39 # 数字行按键高度 + __patch: 单静.patch.无障碍:/num_line? plus: 'keys/@4/hint': ' ' 'keys/@7/hint': ' ' - 'keys/@0/': - click: num1 - __patch: - - conf/num_line - - 单静无障碍补丁:/num_line? + 'keys/@0/': {click: num1, __include: conf/num_line} 'keys/@after 0/': { click: num2 } 'keys/@after 1/': { click: num3 } 'keys/@after 2/': { click: num4 } diff --git "a/\345\215\225\351\235\231.cherry.trime.yaml" "b/\345\215\225\351\235\231.cherry.trime.yaml" index 5095713..616b47f 100644 --- "a/\345\215\225\351\235\231.cherry.trime.yaml" +++ "b/\345\215\225\351\235\231.cherry.trime.yaml" @@ -89,32 +89,12 @@ conf: key_press_offset_y: 21 preset_keyboards: - __include: danjing:/kbs - - default: - __include: 单静.trime:/preset_keyboards/default - __patch: conf/main - - letter: - __include: 单静.trime:/preset_keyboards/letter - __patch: conf/main - - qwertys: - __include: 单静.trime:/preset_keyboards/qwertys - __patch: conf/main - - qwerty_: - __include: 单静.trime:/preset_keyboards/qwerty_ - __patch: conf/main - - number: - __include: 单静.trime:/preset_keyboards/number - - edit: - __include: 单静.trime:/preset_keyboards/edit - - func: - __include: 单静.trime:/preset_keyboards/func + __include: 单静.trime:/preset_keyboards + __patch: + default/+: { __include: conf/main } + letter/+: { __include: conf/main } + qwertys/+: { __include: conf/main } + qwerty_/+: { __include: conf/main } android_keys: __include: trime:/android_keys diff --git "a/\345\215\225\351\235\231.trime.yaml" "b/\345\215\225\351\235\231.trime.yaml" index 5eee77c..24664f8 100644 --- "a/\345\215\225\351\235\231.trime.yaml" +++ "b/\345\215\225\351\235\231.trime.yaml" @@ -391,9 +391,10 @@ conf: keys/+: - width: 100 #底部留白开关，0为关，1~100开 height: 6 #底部留白 + __patch: 单静.patch.无障碍:/main? key_height_last: # 第4行 按键高度 height: 50 - __patch: 单静无障碍补丁:/key_height_last? + __patch: 单静.patch.无障碍:/key_height_last? # 数字、编辑、功能键盘配置 num: height: 60 #按键高度 @@ -433,9 +434,7 @@ preset_keyboards: label_transform: uppercase lock: true width: 10 - __patch: - - conf/main - - 单静无障碍补丁:/main? + __patch: conf/main keys: # 第 1 行 - { width: 0 } #备用 diff --git "a/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231\346\227\240\351\232\234\347\242\215\350\241\245\344\270\201.yaml" "b/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.patch.\346\227\240\351\232\234\347\242\215.yaml" similarity index 100% rename from "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231\346\227\240\351\232\234\347\242\215\350\241\245\344\270\201.yaml" rename to "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.patch.\346\227\240\351\232\234\347\242\215.yaml"