Commit 93d0dcdc authored by Dorota Czaplejewicz's avatar Dorota Czaplejewicz
Browse files

Merge branch 'text' into 'master'

Text property

Closes #153

See merge request Librem5/squeekboard!257
parents 3aec821f b252f765
Pipeline #47653 passed with stages
in 9 minutes and 31 seconds
......@@ -25,22 +25,22 @@ views:
- "Q W E R T Z U I O P"
- "A S D F G H J K L"
- "Shift_L Y X C V B N M BackSpace"
- "show_numbers show_eschars preferences space ! ? Return"
- "show_numbers show_dechars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # % & - _ + ( )"
- "show_symbols , \" ' : = < > BackSpace"
- "show_letters show_eschars preferences space , . Return"
- "show_letters show_dechars preferences space , . Return"
symbols:
- "~ ` ´ | · µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "show_letters show_dechars preferences space , . Return"
dechars:
- "ä è é ö ü Ä È É Ö Ü"
- "à â ê î ô À Â È Î Ô"
- "show_numbers « » ç Ç æ œ ß BackSpace"
- "show_letters show_eschars preferences space Return"
- "show_letters show_dechars preferences space Return"
buttons:
Shift_L:
......@@ -73,17 +73,16 @@ buttons:
set_view: "symbols"
outline: "altline"
label: "*/="
show_eschars:
show_dechars:
action:
locking:
lock_view: "eschars"
lock_view: "dechars"
unlock_view: "base"
outline: "altline"
label: "äÄ"
space:
outline: "spaceline"
label: " "
keysym: "space"
text: " "
Return:
outline: "altline"
icon: "key-enter"
......
......@@ -53,6 +53,7 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
preferences:
action: "show_prefs"
outline: "altline"
......@@ -86,111 +87,112 @@ buttons:
label: "αι"
period:
outline: "altline"
label: "."
text: "."
space:
outline: spaceline
label: " "
text: " "
Return:
outline: "wide"
icon: "key-enter"
keysym: "Return"
aring:
label: "å"
text: "å"
Aring:
label: "Å"
text: "Å"
oslash:
label: "ø"
text: "ø"
Oslash:
label: "Ø"
text: "Ø"
ae:
label: "æ"
text: "æ"
AE:
label: "Æ"
text: "Æ"
asterisk:
label: "*"
text: "*"
asciitilde:
label: "~"
text: "~"
quoteleft:
label: "`"
text: "`"
bar:
label: "|"
text: "|"
U00B7:
label: "·"
text: "·"
squareroot:
label: "√"
text: "√"
Greek_pi:
label: "π"
text: "π"
division:
label: "÷"
text: "÷"
multiply:
label: "×"
text: "×"
paragraph:
label: "¶"
text: "¶"
Greek_tau:
label: "τ"
text: "τ"
copyright:
label: "©"
text: "©"
numbersign:
label: "#"
text: "#"
U00AE:
label: "®"
text: "®"
at:
label: "@"
text: "@"
dollar:
label: "$"
text: "$"
U00A3:
label: "£"
text: "£"
percent:
label: "%"
text: "%"
EuroSign:
label: "€"
text: "€"
ampersand:
label: "&"
text: "&"
U00A5:
label: "¥"
text: "¥"
minus:
label: "-"
text: "-"
asciicircum:
label: "^"
text: "^"
underscore:
label: "_"
text: "_"
degree:
label: "°"
text: "°"
plus:
label: "+"
text: "+"
equal:
label: "="
text: "="
parenleft:
label: "("
text: "("
parenright:
label: ")"
text: ")"
braceleft:
label: "{"
text: "{"
braceright:
label: "}"
text: "}"
comma:
label: ","
text: ","
backslash:
label: "\\"
text: "\\"
slash:
label: "/"
text: "/"
quotedbl:
label: "\""
text: "\""
quoteright:
label: "'"
text: "'"
less:
label: "<"
text: "<"
greater:
label: ">"
text: ">"
colon:
label: ":"
text: ":"
semicolon:
label: ";"
text: ";"
exclam:
label: "!"
text: "!"
question:
label: "?"
text: "?"
bracketleft:
label: "["
text: "["
bracketright:
label: "]"
text: "]"
......@@ -51,6 +51,7 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
preferences:
action: "show_prefs"
outline: "default"
......@@ -80,14 +81,14 @@ buttons:
period:
outline: "default"
label: "."
text: "."
space:
outline: "spaceline"
label: " "
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
colon:
label: ":"
"\"":
keysym: "quotedbl"
text: ":"
......@@ -46,6 +46,7 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
preferences:
action: "show_prefs"
outline: "altline"
......@@ -69,108 +70,109 @@ buttons:
outline: altline
space:
outline: spaceline
label: " "
text: " "
Return:
outline: "wide"
icon: "key-enter"
keysym: "Return"
aring:
label: "å"
text: "å"
Aring:
label: "Å"
text: "Å"
ouml:
label: "ö"
text: "ö"
Ouml:
label: "Ö"
text: "Ö"
auml:
label: "ä"
text: "ä"
Auml:
label: "Ä"
text: "Ä"
asterisk:
label: "*"
text: "*"
asciitilde:
label: "~"
text: "~"
quoteleft:
label: "`"
text: "`"
bar:
label: "|"
text: "|"
U00B7:
label: "·"
text: "·"
squareroot:
label: "√"
text: "√"
Greek_pi:
label: "π"
text: "π"
division:
label: "÷"
text: "÷"
multiply:
label: "×"
text: "×"
paragraph:
label: "¶"
text: "¶"
Greek_tau:
label: "τ"
text: "τ"
copyright:
label: "©"
text: "©"
numbersign:
label: "#"
text: "#"
U00AE:
label: "®"
text: "®"
at:
label: "@"
text: "@"
dollar:
label: "$"
text: "$"
U00A3:
label: "£"
text: "£"
percent:
label: "%"
text: "%"
EuroSign:
label: "€"
text: "€"
ampersand:
label: "&"
text: "&"
U00A5:
label: "¥"
text: "¥"
minus:
label: "-"
text: "-"
asciicircum:
label: "^"
text: "^"
underscore:
label: "_"
text: "_"
degree:
label: "°"
text: "°"
plus:
label: "+"
text: "+"
equal:
label: "="
text: "="
parenleft:
label: "("
text: "("
parenright:
label: ")"
text: ")"
braceleft:
label: "{"
text: "{"
braceright:
label: "}"
text: "}"
comma:
label: ","
text: ","
backslash:
label: "\\"
text: "\\"
slash:
label: "/"
text: "/"
quotedbl:
label: "\""
text: "\""
quoteright:
label: "'"
text: "'"
less:
label: "<"
text: "<"
greater:
label: ">"
text: ">"
colon:
label: ":"
text: ":"
semicolon:
label: ";"
text: ";"
exclam:
label: "!"
text: "!"
question:
label: "?"
text: "?"
bracketleft:
label: "["
text: "["
bracketright:
label: "]"
text: "]"
......@@ -53,6 +53,7 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
preferences:
action: "show_prefs"
outline: "default"
......@@ -91,6 +92,7 @@ buttons:
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
colon:
label: ":"
"\"":
......
......@@ -225,7 +225,7 @@ buttons:
space:
outline: "default-wide"
label: "␣"
keysym: "U3000"
text: " "
# switch to number view
numbers:
action:
......
......@@ -26,13 +26,13 @@ views:
- "show_numbers preferences space . Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
- "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
- "@ # $ % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters preferences space . Return"
symbols:
- "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
- "show_numbers backslash slash less greater equal bracketleft bracketright BackSpace"
- "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
- "show_numbers \\ / < > = [ ] BackSpace"
- "show_letters preferences space . Return"
buttons:
......@@ -46,6 +46,7 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
preferences:
action: "show_prefs"
outline: "altline"
......@@ -69,108 +70,37 @@ buttons:
outline: altline
space:
outline: spaceline
label: " "
text: " "
Return:
outline: "wide"
icon: "key-enter"
aring:
label: "å"
Aring:
label: "Å"
oslash:
label: "ø"
Oslash:
label: "Ø"
ae:
label: "æ"
AE:
label: "Æ"
asterisk:
label: "*"
asciitilde:
label: "~"
quoteleft:
label: "`"
bar:
label: "|"
keysym: "Return"
U00B7:
label: "·"
text: "·"
squareroot:
label: "√"
text: "√"
Greek_pi:
label: "π"
text: "π"
division:
label: "÷"
text: "÷"
multiply:
label: "×"
text: "×"
paragraph:
label: "¶"
text: "¶"
Greek_tau:
label: "τ"
text: "τ"
copyright:
label: "©"
numbersign:
label: "#"
text: "©"
U00AE:
label: "®"
at:
label: "@"
dollar:
label: "$"
text: "®"
U00A3:
label: "£"
percent:
label: "%"
text: "£"
EuroSign:
label: "€"
ampersand:
label: "&"
text: "€"
U00A5:
label: "¥"
minus:
label: "-"
text: "¥"
asciicircum:
label: "^"
underscore:
label: "_"
text: "^"
degree:
label: "°"
plus:
label: "+"
equal:
label: "="
parenleft:
label: "("
parenright:
label: ")"
braceleft:
label: "{"
braceright:
label: "}"
comma:
label: ","
backslash:
label: "\\"
slash:
label: "/"
quotedbl:
label: "\""
quoteright:
label: "'"
less:
label: "<"
greater:
label: ">"
colon:
label: ":"
semicolon:
label: ";"
exclam:
label: "!"
question:
label: "?"
bracketleft:
label: "["
bracketright:
label: "]"
text: "°"
......@@ -22,22 +22,24 @@ buttons:
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
keysym: "BackSpace"
space:
outline: spaceline
label: " "
text: " "
Return:
outline: outline7
icon: "key-enter"
keysym: "BackSpace"
asterisk:
label: "*"
text: "*"
numbersign: