s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update-numeric-keypad' into 'master'

Browse Source 
Rename keypad-related files

See merge request Librem5/squeekboard!101
This commit is contained in:
Dorota Czaplejewicz
2019-07-31 06:37:09 +00:00
parent 1846a67e83 35ac14806c
commit df249646bc
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/keyboards/geometry/numbers-keypad.xml → data/keyboards/geometry/number-keypad.xml
View File

7
data/keyboards/keyboards.xml
View File

@ -90,8 +90,11 @@
longname="Telugu (Inscript)" language="te"/>
<!-- Common keyboards -->
<keyboard id="numbers" name="numbers"
geometry="numbers-keypad" symbols="special/numbers"
<keyboard id="number" name="number"
geometry="number-keypad" symbols="special/number"
longname="Numeric keypad" language="all"/>
<keyboard id="phone" name="phone"
geometry="number-keypad" symbols="special/number"
longname="Phone keypad" language="all"/>
</keyboards>

0
data/keyboards/symbols/special/numbers.xml → data/keyboards/symbols/special/number.xml
View File

4
data/squeekboard.gresources.xml
View File

@ -4,7 +4,7 @@
<file compressed="true">style.css</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/numbers-keypad.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/number-keypad.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
@ -35,7 +35,7 @@
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/numbers.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/number.xml</file>
<file>icons/key-enter.svg</file>
<file>icons/key-shift.svg</file>
<file>icons/keyboard-mode-symbolic.svg</file>

10
eekboard/eekboard-context-service.c
View File

@ -302,8 +302,14 @@ settings_update_layout(EekboardContextService *context)
EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
if (priv->purpose == ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE)
keyboard_layout = g_strdup("numbers");
switch (priv->purpose) {
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
keyboard_layout = g_strdup("number");
break;
default:
;
}
// generic part follows
static guint keyboard_id = 0;