Remove built-in fonts

Using custom fonts works only if multilingual text rendering is not
required. In addition, loading extra fonts into application may
cause unwanted side effects to application.

Change-Id: I861620da23e56f32c466dd750cb70627f9d1e12d
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

7 files changed, 9 insertions, 26 deletions

diff --git a/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf b/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf
deleted file mode 100644
index 2db9bdee..00000000
--- a/src/virtualkeyboard/content/styles/default/fonts/DejaVuSans.ttf
+++ /dev/null
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index 5e341f8c..51d2c1df 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -21,15 +21,11 @@ import QtQuick.Enterprise.VirtualKeyboard 1.0
 import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0
 
 KeyboardStyle {
-    readonly property string fontFamily: dejaVuSans.name
+    readonly property string fontFamily: "Sans"
     readonly property real keyBackgroundMargin: Math.round(13 * scaleHint)
     readonly property real keyContentMargin: Math.round(45 * scaleHint)
     readonly property real keyIconMargin: Math.round(35 * scaleHint)
 
-    property var dejaVuSans: FontLoader {
-        source: "qrc:/fonts/DejaVuSans.ttf"
-    }
-
     keyboardDesignWidth: 2560
     keyboardDesignHeight: 800
     keyboardRelativeLeftMargin: 114 / keyboardDesignWidth
@@ -58,7 +54,7 @@ KeyboardStyle {
                 anchors.margins: keyContentMargin
                 font {
                     family: fontFamily
-                    weight: Font.DemiBold
+                    weight: Font.Normal
                     pixelSize: 52 * scaleHint
                     capitalization: control.uppercased ? Font.AllUppercase : Font.MixedCase
                 }
@@ -219,7 +215,7 @@ KeyboardStyle {
                 color: "#80c342"
                 font {
                     family: fontFamily
-                    weight: Font.DemiBold
+                    weight: Font.Normal
                     pixelSize: 44 * scaleHint
                     capitalization: Font.AllUppercase
                 }
@@ -418,7 +414,7 @@ KeyboardStyle {
                 anchors.margins: keyContentMargin
                 font {
                     family: fontFamily
-                    weight: Font.DemiBold
+                    weight: Font.Normal
                     pixelSize: 44 * scaleHint
                     capitalization: Font.AllUppercase
                 }
@@ -472,7 +468,7 @@ KeyboardStyle {
                 anchors.margins: Math.round(48 * scaleHint)
                 font {
                     family: fontFamily
-                    weight: Font.DemiBold
+                    weight: Font.Normal
                     pixelSize: 82 * scaleHint
                 }
             }
@@ -491,7 +487,7 @@ KeyboardStyle {
             color: "#868482"
             font {
                 family: fontFamily
-                weight: Font.DemiBold
+                weight: Font.Normal
                 pixelSize: 52 * scaleHint
             }
             anchors.centerIn: parent
diff --git a/src/virtualkeyboard/content/styles/default/style.qrc b/src/virtualkeyboard/content/styles/default/style.qrc
index 8a73e4a7..6e469a75 100644
--- a/src/virtualkeyboard/content/styles/default/style.qrc
+++ b/src/virtualkeyboard/content/styles/default/style.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>style.qml</file>
-        <file>fonts/DejaVuSans.ttf</file>
         <file>images/backspace.png</file>
         <file>images/enter.png</file>
         <file>images/hidekeyboard.png</file>
diff --git a/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime Bold.ttf b/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime Bold.ttf
deleted file mode 100644
index 1b0888c2..00000000
--- a/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime Bold.ttf
+++ /dev/null
diff --git a/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime.ttf b/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime.ttf
deleted file mode 100644
index db4e6c14..00000000
--- a/src/virtualkeyboard/content/styles/retro/fonts/Courier Prime.ttf
+++ /dev/null
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 3799964d..9b06d2d3 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -21,18 +21,11 @@ import QtQuick.Enterprise.VirtualKeyboard 1.0
 import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0
 
 KeyboardStyle {
-    readonly property string fontFamily: courierPrimeRegular.name
+    readonly property string fontFamily: "Courier"
     readonly property real keyBackgroundMargin: Math.round(9 * scaleHint)
     readonly property real keyContentMargin: Math.round(50 * scaleHint)
     readonly property real keyIconMargin: Math.round(40 * scaleHint)
 
-    property var courierPrimeRegular: FontLoader {
-        source: "qrc:/fonts/Courier Prime.ttf"
-    }
-    property var courierPrimeBold: FontLoader {
-        source: "qrc:/fonts/Courier Prime Bold.ttf"
-    }
-
     keyboardDesignWidth: 2560
     keyboardDesignHeight: 800
     keyboardRelativeLeftMargin: 114 / keyboardDesignWidth
@@ -80,7 +73,6 @@ KeyboardStyle {
             text: control.displayText
             color: "#110b05"
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: 8 * scaleHint
             font {
                 family: fontFamily
                 weight: Font.Bold
@@ -95,7 +87,7 @@ KeyboardStyle {
                         target: keyText
                         color: "#c5a96f"
                         font.pixelSize: 74 * scaleHint
-                        font.letterSpacing: -10 * scaleHint
+                        font.letterSpacing: -5 * scaleHint
                     }
                 }
             ]
@@ -493,7 +485,6 @@ KeyboardStyle {
             text: control.displayText
             color: "#c5a96f"
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: 12 * scaleHint
             font {
                 family: fontFamily
                 weight: Font.DemiBold
@@ -545,7 +536,6 @@ KeyboardStyle {
             color: "#c5a96f"
             text: characterPreview.text
             anchors.centerIn: characterPreviewBackground
-            anchors.verticalCenterOffset: 8 * scaleHint
             font {
                 family: fontFamily
                 weight: Font.Bold
@@ -557,7 +547,7 @@ KeyboardStyle {
                     when: text.length > 1
                     PropertyChanges {
                         target: characterPreviewText
-                        font.letterSpacing: -10 * scaleHint
+                        font.letterSpacing: -5 * scaleHint
                     }
                 }
             ]
diff --git a/src/virtualkeyboard/content/styles/retro/style.qrc b/src/virtualkeyboard/content/styles/retro/style.qrc
index a2c861e5..8cdb9b0f 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qrc
+++ b/src/virtualkeyboard/content/styles/retro/style.qrc
@@ -1,8 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>style.qml</file>
-        <file>fonts/Courier Prime.ttf</file>
-        <file>fonts/Courier Prime Bold.ttf</file>
         <file>images/key154px_black.png</file>
         <file>images/key154px_black_long.png</file>
         <file>images/key154px_capslock_long.png</file>