Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e283b2c authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Modify current KCM files to support shift+capslock" into udc-dev am: efde968c

parents 158a7395 efde968c
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -42,9 +42,10 @@ key C {
    label:                              'C'
    base:                               'c'
    shift, capslock:                    'C'
    alt:                                '\u00e7'
    shift+alt:                          '\u00c7'
    shift+capslock:                     'c'
    alt:                                '\u00e7'
    shift+alt, capslock+alt:            '\u00c7'
    shift+capslock+alt:                 '\u00e7'
}

key D {
@@ -58,8 +59,8 @@ key E {
    label:                              'E'
    base:                               'e'
    shift, capslock:                    'E'
    alt:                                '\u0301'
    shift+capslock:                     'e'
    alt:                                '\u0301'
}

key F {
@@ -87,8 +88,8 @@ key I {
    label:                              'I'
    base:                               'i'
    shift, capslock:                    'I'
    alt:                                '\u0302'
    shift+capslock:                     'i'
    alt:                                '\u0302'
}

key J {
@@ -123,8 +124,8 @@ key N {
    label:                              'N'
    base:                               'n'
    shift, capslock:                    'N'
    alt:                                '\u0303'
    shift+capslock:                     'n'
    alt:                                '\u0303'
}

key O {
@@ -159,8 +160,8 @@ key S {
    label:                              'S'
    base:                               's'
    shift, capslock:                    'S'
    alt:                                '\u00df'
    shift+capslock:                     's'
    alt:                                '\u00df'
}

key T {
@@ -174,8 +175,8 @@ key U {
    label:                              'U'
    base:                               'u'
    shift, capslock:                    'U'
    alt:                                '\u0308'
    shift+capslock:                     'u'
    alt:                                '\u0308'
}

key V {
+8 −7
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ key C {
    label:                              'C'
    base:                               'c'
    shift, capslock:                    'C'
    alt:                                '\u00e7'
    shift+alt:                          '\u00c7'
    shift+capslock:                     'c'
    alt:                                '\u00e7'
    shift+alt, capslock+alt:            '\u00c7'
    shift+capslock+alt:                 '\u00e7'
}

key D {
@@ -55,8 +56,8 @@ key E {
    label:                              'E'
    base:                               'e'
    shift, capslock:                    'E'
    alt:                                '\u0301'
    shift+capslock:                     'e'
    alt:                                '\u0301'
}

key F {
@@ -84,8 +85,8 @@ key I {
    label:                              'I'
    base:                               'i'
    shift, capslock:                    'I'
    alt:                                '\u0302'
    shift+capslock:                     'i'
    alt:                                 '\u0302'
}

key J {
@@ -120,8 +121,8 @@ key N {
    label:                              'N'
    base:                               'n'
    shift, capslock:                    'N'
    alt:                                '\u0303'
    shift+capslock:                     'n'
    alt:                                '\u0303'
}

key O {
@@ -156,8 +157,8 @@ key S {
    label:                              'S'
    base:                               's'
    shift, capslock:                    'S'
    alt:                                '\u00df'
    shift+capslock:                     's'
    alt:                                '\u00df'
}

key T {
@@ -171,8 +172,8 @@ key U {
    label:                              'U'
    base:                               'u'
    shift, capslock:                    'U'
    alt:                                '\u0308'
    shift+capslock:                     'u'
    alt:                                '\u0308'
}

key V {
+47 −47
Original line number Diff line number Diff line
@@ -22,89 +22,89 @@ type OVERLAY

key GRAVE {
    label:                              '`'
    base, capslock:                     '\u0630'
    base:                               '\u0630'
    shift:                              '\u0651'
}

key 1 {
    label:                              '1'
    base:                               '\u0661'
    shift:                              '!'
    capslock:                           '1'
    shift:                              '!'
}

key 2 {
    label:                              '2'
    base:                               '\u0662'
    shift:                              '@'
    capslock:                           '2'
    shift:                              '@'
}

key 3 {
    label:                              '3'
    base:                               '\u0663'
    shift:                              '#'
    capslock:                           '3'
    shift:                              '#'
}

key 4 {
    label:                              '4'
    base:                               '\u0664'
    shift:                              '$'
    capslock:                           '4'
    shift:                              '$'
}

key 5 {
    label:                              '5'
    base:                               '\u0665'
    shift:                              '%'
    capslock:                           '5'
    shift:                              '%'
}

key 6 {
    label:                              '6'
    base:                               '\u0666'
    shift:                              '^'
    capslock:                           '6'
    shift:                              '^'
}

key 7 {
    label:                              '7'
    base:                               '\u0667'
    shift:                              '&'
    capslock:                           '7'
    shift:                              '&'
}

key 8 {
    label:                              '8'
    base:                               '\u0668'
    shift:                              '*'
    capslock:                           '8'
    shift:                              '*'
}

key 9 {
    label:                              '9'
    base:                               '\u0669'
    shift:                              ')'
    capslock:                           '9'
    shift:                              ')'
}

key 0 {
    label:                              '0'
    base:                               '\u0660'
    shift:                              '('
    capslock:                           '0'
    shift:                              '('
}

key MINUS {
    label:                              '-'
    base, capslock:                     '-'
    base:                               '-'
    shift:                              '_'
}

key EQUALS {
    label:                              '='
    base, capslock:                     '='
    base:                               '='
    shift:                              '+'
}

@@ -112,79 +112,79 @@ key EQUALS {

key Q {
    label:                              'Q'
    base, capslock:                     '\u0636'
    base:                               '\u0636'
    shift:                              '\u064e'
}

key W {
    label:                              'W'
    base, capslock:                     '\u0635'
    base:                               '\u0635'
    shift:                              '\u064b'
}

key E {
    label:                              'E'
    base, capslock:                     '\u062b'
    base:                               '\u062b'
    shift:                              '\u064f'
}

key R {
    label:                              'R'
    base, capslock:                     '\u0642'
    base:                               '\u0642'
    shift:                              '\u064c'
}

key T {
    label:                              'T'
    base, capslock:                     '\u0641'
    base:                               '\u0641'
    shift:                              '\ufef9'
}

key Y {
    label:                              'Y'
    base, capslock:                     '\u063a'
    base:                               '\u063a'
    shift:                              '\u0625'
}

key U {
    label:                              'U'
    base, capslock:                     '\u0639'
    base:                               '\u0639'
    shift:                              '\u2018'
}

key I {
    label:                              'I'
    base, capslock:                     '\u0647'
    base:                               '\u0647'
    shift:                              '\u00f7'
}

key O {
    label:                              'O'
    base, capslock:                     '\u062e'
    base:                               '\u062e'
    shift:                              '\u00d7'
}

key P {
    label:                              'P'
    base, capslock:                     '\u062d'
    base:                               '\u062d'
    shift:                              '\u061b'
}

key LEFT_BRACKET {
    label:                              ']'
    base, capslock:                     '\u062c'
    base:                               '\u062c'
    shift:                              '>'
}

key RIGHT_BRACKET {
    label:                              '['
    base, capslock:                     '\u062f'
    base:                               '\u062f'
    shift:                              '<'
}

key BACKSLASH {
    label:                              '\\'
    base, capslock:                     '\\'
    base:                               '\\'
    shift:                              '|'
}

@@ -192,67 +192,67 @@ key BACKSLASH {

key A {
    label:                              'A'
    base, capslock:                     '\u0634'
    base:                               '\u0634'
    shift:                              '\u0650'
}

key S {
    label:                              'S'
    base, capslock:                     '\u0633'
    base:                               '\u0633'
    shift:                              '\u064d'
}

key D {
    label:                              'D'
    base, capslock:                     '\u064a'
    base:                               '\u064a'
    shift:                              ']'
}

key F {
    label:                              'F'
    base, capslock:                     '\u0628'
    base:                               '\u0628'
    shift:                              '['
}

key G {
    label:                              'G'
    base, capslock:                     '\u0644'
    base:                               '\u0644'
    shift:                              '\ufef7'
}

key H {
    label:                              'H'
    base, capslock:                     '\u0627'
    base:                               '\u0627'
    shift:                              '\u0623'
}

key J {
    label:                              'J'
    base, capslock:                     '\u062a'
    base:                               '\u062a'
    shift:                              '\u0640'
}

key K {
    label:                              'K'
    base, capslock:                     '\u0646'
    base:                               '\u0646'
    shift:                              '\u060c'
}

key L {
    label:                              'L'
    base, capslock:                     '\u0645'
    base:                               '\u0645'
    shift:                              '/'
}

key SEMICOLON {
    label:                              ';'
    base, capslock:                     '\u0643'
    base:                               '\u0643'
    shift:                              ':'
}

key APOSTROPHE {
    label:                              '\''
    base, capslock:                     '\u0637'
    base:                               '\u0637'
    shift:                              '"'
}

@@ -260,60 +260,60 @@ key APOSTROPHE {

key Z {
    label:                              'Z'
    base, capslock:                     '\u0626'
    base:                               '\u0626'
    shift:                              '~'
}

key X {
    label:                              'X'
    base, capslock:                     '\u0621'
    base:                               '\u0621'
    shift:                              '\u0652'
}

key C {
    label:                              'C'
    base, capslock:                     '\u0624'
    base:                               '\u0624'
    shift:                              '}'
}

key V {
    label:                              'V'
    base, capslock:                     '\u0631'
    base:                               '\u0631'
    shift:                              '{'
}

key B {
    label:                              'B'
    base, capslock:                     '\ufefb'
    base:                               '\ufefb'
    shift:                              '\ufef5'
}

key N {
    label:                              'N'
    base, capslock:                     '\u0649'
    base:                               '\u0649'
    shift:                              '\u0622'
}

key M {
    label:                              'M'
    base, capslock:                     '\u0629'
    base:                               '\u0629'
    shift:                              '\u2019'
}

key COMMA {
    label:                              ','
    base, capslock:                     '\u0648'
    base:                               '\u0648'
    shift:                              ','
}

key PERIOD {
    label:                              '.'
    base, capslock:                     '\u0632'
    base:                               '\u0632'
    shift:                              '.'
}

key SLASH {
    label:                              '/'
    base, capslock:                     '\u0638'
    base:                               '\u0638'
    shift:                              '\u061f'
}
+32 −0
Original line number Diff line number Diff line
@@ -107,72 +107,84 @@ key Q {
    label:                              'Q'
    base:                               'q'
    shift, capslock:                    'Q'
    shift+capslock:                     'q'
}

key W {
    label:                              '\u00dc'
    base:                               '\u00fc'
    shift, capslock:                    '\u00dc'
    shift+capslock:                     '\u00fc'
}

key E {
    label:                              'E'
    base:                               'e'
    shift, capslock:                    'E'
    shift+capslock:                     'e'
}

key R {
    label:                              'R'
    base:                               'r'
    shift, capslock:                    'R'
    shift+capslock:                     'r'
}

key T {
    label:                              'T'
    base:                               't'
    shift, capslock:                    'T'
    shift+capslock:                     't'
}

key Y {
    label:                              'Y'
    base:                               'y'
    shift, capslock:                    'Y'
    shift+capslock:                     'y'
}

key U {
    label:                              'U'
    base:                               'u'
    shift, capslock:                    'U'
    shift+capslock:                     'u'
}

key I {
    label:                              '\u0130'
    base:                               'i'
    shift, capslock:                    '\u0130'
    shift+capslock:                     'i'
}

key O {
    label:                              'O'
    base:                               'o'
    shift, capslock:                    'O'
    shift+capslock:                     'o'
}

key P {
    label:                              'P'
    base:                               'p'
    shift, capslock:                    'P'
    shift+capslock:                     'p'
}

key LEFT_BRACKET {
    label:                              '\u00d6'
    base:                               '\u00f6'
    shift:                              '\u00d6'
    shift+capslock:                     '\u00f6'
}

key RIGHT_BRACKET {
    label:                              '\u011e'
    base:                               '\u011f'
    shift:                              '\u011e'
    shift+capslock:                     '\u011f'
}

key BACKSLASH {
@@ -187,66 +199,77 @@ key A {
    label:                              'A'
    base:                               'a'
    shift, capslock:                    'A'
    shift+capslock:                     'a'
}

key S {
    label:                              'S'
    base:                               's'
    shift, capslock:                    'S'
    shift+capslock:                     's'
}

key D {
    label:                              'D'
    base:                               'd'
    shift, capslock:                    'D'
    shift+capslock:                     'd'
}

key F {
    label:                              'F'
    base:                               'f'
    shift, capslock:                    'F'
    shift+capslock:                     'f'
}

key G {
    label:                              'G'
    base:                               'g'
    shift, capslock:                    'G'
    shift+capslock:                     'g'
}

key H {
    label:                              'H'
    base:                               'h'
    shift, capslock:                    'H'
    shift+capslock:                     'h'
}

key J {
    label:                              'J'
    base:                               'j'
    shift, capslock:                    'J'
    shift+capslock:                     'j'
}

key K {
    label:                              'K'
    base:                               'k'
    shift, capslock:                    'K'
    shift+capslock:                     'k'
}

key L {
    label:                              'L'
    base:                               'l'
    shift, capslock:                    'L'
    shift+capslock:                     'l'
}

key SEMICOLON {
    label:                              'I'
    base:                               '\u0131'
    shift:                              'I'
    shift+capslock:                     '\u0131'
}

key APOSTROPHE {
    label:                              '\u018f'
    base:                               '\u0259'
    shift:                              '\u018f'
    shift+capslock:                     '\u0259'
}

### ROW 4
@@ -255,54 +278,63 @@ key Z {
    label:                              'Z'
    base:                               'z'
    shift, capslock:                    'Z'
    shift+capslock:                     'z'
}

key X {
    label:                              'X'
    base:                               'x'
    shift, capslock:                    'X'
    shift+capslock:                     'x'
}

key C {
    label:                              'C'
    base:                               'c'
    shift, capslock:                    'C'
    shift+capslock:                     'c'
}

key V {
    label:                              'V'
    base:                               'v'
    shift, capslock:                    'V'
    shift+capslock:                     'v'
}

key B {
    label:                              'B'
    base:                               'b'
    shift, capslock:                    'B'
    shift+capslock:                     'b'
}

key N {
    label:                              'N'
    base:                               'n'
    shift, capslock:                    'N'
    shift+capslock:                     'n'
}

key M {
    label:                              'M'
    base:                               'm'
    shift, capslock:                    'M'
    shift+capslock:                     'm'
}

key COMMA {
    label:                              '\u00c7'
    base:                               '\u00e7'
    shift:                              '\u00c7'
    shift+capslock:                     '\u00e7'
}

key PERIOD {
    label:                              '\u015e'
    base:                               '\u015f'
    shift:                              '\u015e'
    shift+capslock:                     '\u015f'
}

key SLASH {
+91 −34

File changed.

Preview size limit exceeded, changes collapsed.

Loading