diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2014-03-25 12:18:56 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2014-03-26 11:59:38 +0200 |
| commit | aa8509f6d208e7c4771e46a5b894e7bb341bff14 (patch) | |
| tree | ba887e0699ffed7a82d9972fc554e75974f0ddd1 /src/virtualkeyboard/content/styles | |
| parent | bcca1c4057914c10f362677a3691153ebc9cb9e9 (diff) | |
Fix arabic numbers in default layout
OpenSans fonts don't support for arabic numbers, so change
default font to DejaVuSans.
http://jira.sc.local/browse/QTEE-354
Change-Id: Ie6789b332b4cc7a83a2dfeb247a2c7078071463e
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/virtualkeyboard/content/styles')
| -rw-r--r-- | src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf | bin | 0 -> 493564 bytes | |||
| -rwxr-xr-x | src/virtualkeyboard/content/styles/default/fonts/OpenSans-Regular.ttf | bin | 217360 -> 0 bytes | |||
| -rwxr-xr-x | src/virtualkeyboard/content/styles/default/fonts/OpenSans-Semibold.ttf | bin | 221328 -> 0 bytes | |||
| -rw-r--r-- | src/virtualkeyboard/content/styles/default/style.qml | 9 | ||||
| -rw-r--r-- | src/virtualkeyboard/content/styles/default/style.qrc | 3 |
5 files changed, 4 insertions, 8 deletions
diff --git a/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf b/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf Binary files differnew file mode 100644 index 00000000..7e411a71 --- /dev/null +++ b/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf diff --git a/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Regular.ttf b/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Regular.ttf Binary files differdeleted file mode 100755 index db433349..00000000 --- a/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Regular.ttf +++ /dev/null diff --git a/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Semibold.ttf b/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Semibold.ttf Binary files differdeleted file mode 100755 index 1a7679e3..00000000 --- a/src/virtualkeyboard/content/styles/default/fonts/OpenSans-Semibold.ttf +++ /dev/null diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 92376ad1..834178b0 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -20,15 +20,12 @@ import QtQuick 2.0 import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0 KeyboardStyle { - readonly property string fontFamily: openSansRegular.name + readonly property string fontFamily: dejaVuSans.name readonly property real keyBackgroundMargin: Math.round(13 * scaleHint) readonly property real keyContentMargin: Math.round(45 * scaleHint) - property var openSansRegular: FontLoader { - source: "qrc:/fonts/OpenSans-Regular.ttf" - } - property var openSansSemibold: FontLoader { - source: "qrc:/fonts/OpenSans-Semibold.ttf" + property var dejaVuSans: FontLoader { + source: "qrc:/fonts/DejaVuSans.ttf" } keyboardDesignWidth: 2560 diff --git a/src/virtualkeyboard/content/styles/default/style.qrc b/src/virtualkeyboard/content/styles/default/style.qrc index c7051c42..c931cfb7 100644 --- a/src/virtualkeyboard/content/styles/default/style.qrc +++ b/src/virtualkeyboard/content/styles/default/style.qrc @@ -1,8 +1,7 @@ <RCC> <qresource prefix="/"> <file>style.qml</file> - <file>fonts/OpenSans-Regular.ttf</file> - <file>fonts/OpenSans-Semibold.ttf</file> + <file>fonts/DejaVuSans.ttf</file> <file>images/backspace.png</file> <file>images/enter.png</file> <file>images/hidekeyboard.png</file> |