diff --git a/terminal/ru.yaml b/terminal/ru.yaml index 34045de..cab382a 100644 --- a/terminal/ru.yaml +++ b/terminal/ru.yaml @@ -1,107 +1,198 @@ --- outlines: - default: { width: 27, height: 46 } - default2: { width: 35.33, height: 46 } - lil: { width: 17, height: 46 } - action: { width: 59, height: 57.5 } - altline: { width: 52.67, height: 46 } - altline2: { width: 35.67, height: 46 } - wide: { width: 59, height: 46 } - wide2: { width: 59, height: 57.5 } - spaceline: { width: 140, height: 46 } - special: { width: 44, height: 46 } - small: { width: 39, height: 28 } + default: { width: 35.33, height: 46 } + ru_letters_1: { width: 29.6, height: 46 } + ru_letters_2: { width: 26.6, height: 46 } + ru_letters_3: { width: 27.6, height: 46 } + halfwidth: { width: 17.665, height: 46 } + special: { width: 44, height: 46 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + action: { width: 59, height: 57.5 } + wide: { width: 59, height: 46 } + spaceline: { width: 144.96, height: 46 } + small: { width: 44.24, height: 22 } + views: base: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "й ц у к е н г ш щ з х ё" - - "onethinglil ф ы в а п р о л д ж э twothingslil" - - "Shift_L onelongthinglil я ч с м и т ь б ю slash BackSpace" + - "й ц у к е н г ш щ з х ъ" + - "SlashSmall ф ы в а п р о л д ж э ё PeriodSmall" + - "Shift_L я ч с м и т ь б ю BackSpace" - "show_numbers preferences space show_actions Return" upper: - - "TabSmall Escape Shift Ctrl Alt PgUp PgDn Home End" + - "EscapeSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "1 2 3 4 5 6 7 8 9 0" - - "Й Ц У К Е Н Г Ш Щ З Х Ё" - - "onethinglil Ф Ы В А П Р О Л Д Ж Э twothingslil2" - - "Shift_L onelongthinglil Я Ч С М И Т ъ Б Ю backslash BackSpace" + - "Й Ц У К Е Н Г Ш Щ З Х Ъ" + - "SlashSmall Ф Ы В А П Р О Л Д Ж Э Ё PeriodSmall" + - "Shift_L Я Ч С М И Т Ь Б Ю BackSpace" - "show_numbers preferences space show_actions Return" numbers: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "* # $ / & - _ + ( )" - - "© ® £ € ¥ ^ ° @ { }" + - "* # $ \\ / - + ( ) _" + - "© ® £ € ¥ ^ ° { } &" - "show_symbols , \" ' colon ; ! ? BackSpace" - "show_letters preferences space period Return" symbols: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "~ ` | · √ π τ ÷ × ¶" - - "© ® £ € ¥ ^ ° @ { }" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "~ ` · √ π τ ÷ × ¶ @" + - "© ® £ € ¥ ^ ° { } &" + - "show_numbers_from_symbols % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - - "TabSmall Escape Shift Ctrl Alt PgUp PgDn Home End" + - "EscapeSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters2 Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: - 1: - outline: default2 - 2: - outline: default2 - 3: - outline: default2 - 4: - outline: default2 - 5: - outline: default2 - 6: - outline: default2 - 7: - outline: default2 - 8: - outline: default2 - 9: - outline: default2 - 0: - outline: default2 - "onethinglil": - outline: lil - label: "." - text: "." - "onelongthinglil": - outline: lil - label: "!" - text: "!" - "slash": - outline: lil - label: "/" - text: "/" - "backslash": - outline: lil - label: "\\" - text: "\\" - "twothingslil": - outline: lil - label: ":" - text: ":" - "twothingslil2": - outline: lil - label: ";" - text: ";" + й: + outline: ru_letters_1 + ц: + outline: ru_letters_1 + у: + outline: ru_letters_1 + к: + outline: ru_letters_1 + е: + outline: ru_letters_1 + н: + outline: ru_letters_1 + г: + outline: ru_letters_1 + ш: + outline: ru_letters_1 + щ: + outline: ru_letters_1 + з: + outline: ru_letters_1 + х: + outline: ru_letters_1 + ъ: + outline: ru_letters_1 + ф: + outline: ru_letters_2 + ы: + outline: ru_letters_2 + в: + outline: ru_letters_2 + а: + outline: ru_letters_2 + п: + outline: ru_letters_2 + р: + outline: ru_letters_2 + о: + outline: ru_letters_2 + л: + outline: ru_letters_2 + д: + outline: ru_letters_2 + ж: + outline: ru_letters_2 + э: + outline: ru_letters_2 + ё: + outline: ru_letters_2 + Й: + outline: ru_letters_1 + Ц: + outline: ru_letters_1 + У: + outline: ru_letters_1 + К: + outline: ru_letters_1 + Е: + outline: ru_letters_1 + Н: + outline: ru_letters_1 + Г: + outline: ru_letters_1 + Ш: + outline: ru_letters_1 + Щ: + outline: ru_letters_1 + З: + outline: ru_letters_1 + Х: + outline: ru_letters_1 + Ъ: + outline: ru_letters_1 + Ф: + outline: ru_letters_2 + Ы: + outline: ru_letters_2 + В: + outline: ru_letters_2 + А: + outline: ru_letters_2 + П: + outline: ru_letters_2 + Р: + outline: ru_letters_2 + О: + outline: ru_letters_2 + Л: + outline: ru_letters_2 + Д: + outline: ru_letters_2 + Ж: + outline: ru_letters_2 + Э: + outline: ru_letters_2 + Ё: + outline: ru_letters_2 + я: + outline: ru_letters_3 + ч: + outline: ru_letters_3 + с: + outline: ru_letters_3 + м: + outline: ru_letters_3 + и: + outline: ru_letters_3 + т: + outline: ru_letters_3 + ь: + outline: ru_letters_3 + б: + outline: ru_letters_3 + ю: + outline: ru_letters_3 + Я: + outline: ru_letters_3 + Ч: + outline: ru_letters_3 + С: + outline: ru_letters_3 + М: + outline: ru_letters_3 + И: + outline: ru_letters_3 + Т: + outline: ru_letters_3 + Ь: + outline: ru_letters_3 + Б: + outline: ru_letters_3 + Ю: + outline: ru_letters_3 + Shift_L: action: locking: lock_view: "upper" unlock_view: "base" - outline: "altline2" + outline: "altline" icon: "key-shift" BackSpace: - outline: "altline2" + outline: "altline" icon: "edit-clear-symbolic" action: erase preferences: @@ -111,7 +202,7 @@ buttons: show_numbers: action: set_view: "numbers" - outline: "wide" + outline: "altline" label: "123" show_numbers_from_symbols: action: @@ -121,25 +212,25 @@ buttons: show_letters: action: set_view: "base" - outline: "wide" + outline: "altline" label: "ABC" - show_letters2: + show_letters_actions: action: set_view: "base" - outline: "wide2" + outline: "wide" label: "ABC" show_symbols: action: set_view: "symbols" outline: "altline" - label: "τ=\\" + label: "*/=" show_actions: action: set_view: "actions" outline: "altline" label: ">_" period: - outline: "altline" + outline: "large" text: "." space: outline: "spaceline" @@ -189,16 +280,17 @@ buttons: Esc: outline: "action" keysym: "Escape" - Escape: - outline: "small" - keysym: "Escape" - TabSmall: - outline: "small" - keysym: "Tab" - label: Tab Tab: outline: "action" keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "Tab" + EscapeSmall: + outline: "small" + keysym: "Escape" + label: "Escape" Del: outline: "action" keysym: "Delete" @@ -258,11 +350,13 @@ buttons: modifier: "Control" outline: "small" label: "Ctrl" - Shift: - modifier: "Shift" - outline: "small" - label: "Shift" Alt: modifier: "Alt" outline: "small" label: "Alt" + SlashSmall: + outline: "halfwidth" + text: "/" + PeriodSmall: + outline: "halfwidth" + text: "."