Add predefined ids for EnterKeyAction

A predefined action id replaces the label in the enter key with an icon.

Balanced all icons to use the same aspect ratio. Removed all custom
margins used for icon positioning and sizing.

Task-number: QTRD-2900
Change-Id: I159bcb4d53e8ceb8f51f4a8be24504e20262f37a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>

18 files changed, 60 insertions, 30 deletions

diff --git a/src/virtualkeyboard/content/styles/default/images/backspace.png b/src/virtualkeyboard/content/styles/default/images/backspace.png
index 0a33e95f..eb6d668f 100755
--- a/src/virtualkeyboard/content/styles/default/images/backspace.png
+++ b/src/virtualkeyboard/content/styles/default/images/backspace.png
diff --git a/src/virtualkeyboard/content/styles/default/images/check.png b/src/virtualkeyboard/content/styles/default/images/check.png
new file mode 100644
index 00000000..4a5a92c4
--- /dev/null
+++ b/src/virtualkeyboard/content/styles/default/images/check.png
diff --git a/src/virtualkeyboard/content/styles/default/images/enter.png b/src/virtualkeyboard/content/styles/default/images/enter.png
index 03335a0f..0b739382 100755
--- a/src/virtualkeyboard/content/styles/default/images/enter.png
+++ b/src/virtualkeyboard/content/styles/default/images/enter.png
diff --git a/src/virtualkeyboard/content/styles/default/images/globe.png b/src/virtualkeyboard/content/styles/default/images/globe.png
index 93da92f4..4dff8ccc 100755
--- a/src/virtualkeyboard/content/styles/default/images/globe.png
+++ b/src/virtualkeyboard/content/styles/default/images/globe.png
diff --git a/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png b/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png
index ca515036..a625cc4f 100755
--- a/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png
+++ b/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png
diff --git a/src/virtualkeyboard/content/styles/default/images/search.png b/src/virtualkeyboard/content/styles/default/images/search.png
new file mode 100644
index 00000000..740830d5
--- /dev/null
+++ b/src/virtualkeyboard/content/styles/default/images/search.png
diff --git a/src/virtualkeyboard/content/styles/default/images/shift.png b/src/virtualkeyboard/content/styles/default/images/shift.png
index ae5ad0b7..54e9472b 100755
--- a/src/virtualkeyboard/content/styles/default/images/shift.png
+++ b/src/virtualkeyboard/content/styles/default/images/shift.png
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index 6d144575..5e341f8c 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -17,12 +17,14 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQuick.Enterprise.VirtualKeyboard 1.0
 import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0
 
 KeyboardStyle {
     readonly property string fontFamily: dejaVuSans.name
     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"
@@ -102,8 +104,8 @@ KeyboardStyle {
                 source: "qrc:/images/backspace.png"
                 color: "#868482"
                 anchors.fill: parent
-                anchors.topMargin: keyContentMargin
-                anchors.bottomMargin: keyContentMargin
+                anchors.topMargin: keyIconMargin
+                anchors.bottomMargin: keyIconMargin
             }
         }
         states: [
@@ -146,8 +148,8 @@ KeyboardStyle {
                 source: "qrc:/images/globe.png"
                 color: "#868482"
                 anchors.fill: parent
-                anchors.topMargin: keyContentMargin
-                anchors.bottomMargin: keyContentMargin
+                anchors.topMargin: keyIconMargin
+                anchors.bottomMargin: keyIconMargin
             }
         }
         states: [
@@ -187,17 +189,29 @@ KeyboardStyle {
             anchors.margins: keyBackgroundMargin
             KeyIcon {
                 id: enterKeyIcon
-                visible: control.displayText.length === 0
-                source: "qrc:/images/enter.png"
+                visible: enterKeyText.text.length === 0
+                source: {
+                    switch (control.actionId) {
+                    case EnterKeyAction.Go:
+                    case EnterKeyAction.Send:
+                    case EnterKeyAction.Next:
+                    case EnterKeyAction.Done:
+                        return "qrc:/images/check.png"
+                    case EnterKeyAction.Search:
+                        return "qrc:/images/search.png"
+                    default:
+                        return "qrc:/images/enter.png"
+                    }
+                }
                 color: "#868482"
                 anchors.fill: parent
-                anchors.margins: keyContentMargin
-                anchors.leftMargin: enterKeyBackground.width > enterKeyBackground.height * 1.5 ? Math.round(150 * scaleHint) : keyContentMargin
+                anchors.topMargin: keyIconMargin
+                anchors.bottomMargin: keyIconMargin
             }
             Text {
                 id: enterKeyText
-                visible: control.displayText.length !== 0
-                text: control.displayText
+                visible: text.length !== 0
+                text: control.actionId !== EnterKeyAction.None ? "" : control.displayText
                 clip: true
                 fontSizeMode: Text.HorizontalFit
                 horizontalAlignment: Text.AlignHCenter
@@ -261,8 +275,8 @@ KeyboardStyle {
                 source: "qrc:/images/hidekeyboard.png"
                 color: "#868482"
                 anchors.fill: parent
-                anchors.topMargin: keyContentMargin
-                anchors.bottomMargin: keyContentMargin
+                anchors.topMargin: keyIconMargin
+                anchors.bottomMargin: keyIconMargin
             }
         }
         states: [
@@ -305,8 +319,8 @@ KeyboardStyle {
                 source: "qrc:/images/shift.png"
                 color: "#868482"
                 anchors.fill: parent
-                anchors.topMargin: keyContentMargin
-                anchors.bottomMargin: keyContentMargin
+                anchors.topMargin: keyIconMargin
+                anchors.bottomMargin: keyIconMargin
             }
             states: [
                 State {
diff --git a/src/virtualkeyboard/content/styles/default/style.qrc b/src/virtualkeyboard/content/styles/default/style.qrc
index c931cfb7..8a73e4a7 100644
--- a/src/virtualkeyboard/content/styles/default/style.qrc
+++ b/src/virtualkeyboard/content/styles/default/style.qrc
@@ -7,5 +7,7 @@
         <file>images/hidekeyboard.png</file>
         <file>images/shift.png</file>
         <file>images/globe.png</file>
+        <file>images/search.png</file>
+        <file>images/check.png</file>
     </qresource>
 </RCC>
diff --git a/src/virtualkeyboard/content/styles/retro/images/backspace.png b/src/virtualkeyboard/content/styles/retro/images/backspace.png
index 0a33e95f..eb6d668f 100755
--- a/src/virtualkeyboard/content/styles/retro/images/backspace.png
+++ b/src/virtualkeyboard/content/styles/retro/images/backspace.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/check.png b/src/virtualkeyboard/content/styles/retro/images/check.png
new file mode 100644
index 00000000..4a5a92c4
--- /dev/null
+++ b/src/virtualkeyboard/content/styles/retro/images/check.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/enter.png b/src/virtualkeyboard/content/styles/retro/images/enter.png
index 03335a0f..0b739382 100755
--- a/src/virtualkeyboard/content/styles/retro/images/enter.png
+++ b/src/virtualkeyboard/content/styles/retro/images/enter.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/globe.png b/src/virtualkeyboard/content/styles/retro/images/globe.png
index 93da92f4..4dff8ccc 100755
--- a/src/virtualkeyboard/content/styles/retro/images/globe.png
+++ b/src/virtualkeyboard/content/styles/retro/images/globe.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png b/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png
index ca515036..a625cc4f 100755
--- a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png
+++ b/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/search.png b/src/virtualkeyboard/content/styles/retro/images/search.png
new file mode 100644
index 00000000..740830d5
--- /dev/null
+++ b/src/virtualkeyboard/content/styles/retro/images/search.png
diff --git a/src/virtualkeyboard/content/styles/retro/images/shift.png b/src/virtualkeyboard/content/styles/retro/images/shift.png
index ae5ad0b7..54e9472b 100755
--- a/src/virtualkeyboard/content/styles/retro/images/shift.png
+++ b/src/virtualkeyboard/content/styles/retro/images/shift.png
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index e65ef8f7..3799964d 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -17,12 +17,14 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQuick.Enterprise.VirtualKeyboard 1.0
 import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0
 
 KeyboardStyle {
     readonly property string fontFamily: courierPrimeRegular.name
     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"
@@ -145,10 +147,8 @@ KeyboardStyle {
             source: "qrc:/images/backspace.png"
             color: "#c5a96f"
             anchors.fill: parent
-            anchors.topMargin: keyContentMargin
-            anchors.bottomMargin: keyContentMargin
-            anchors.leftMargin: Math.round(29 * scaleHint)
-            anchors.rightMargin: Math.round(29 * scaleHint)
+            anchors.topMargin: keyIconMargin
+            anchors.bottomMargin: keyIconMargin
         }
         states: [
             State {
@@ -191,8 +191,8 @@ KeyboardStyle {
             source: "qrc:/images/globe.png"
             color: "#110b05"
             anchors.fill: parent
-            anchors.topMargin: keyContentMargin
-            anchors.bottomMargin: keyContentMargin
+            anchors.topMargin: keyIconMargin
+            anchors.bottomMargin: keyIconMargin
         }
         states: [
             State {
@@ -238,17 +238,29 @@ KeyboardStyle {
         }
         KeyIcon {
             id: enterKeyIcon
-            visible: control.displayText.length === 0
-            source: "qrc:/images/enter.png"
+            visible: enterKeyText.text.length === 0
+            source: {
+                switch (control.actionId) {
+                case EnterKeyAction.Go:
+                case EnterKeyAction.Send:
+                case EnterKeyAction.Next:
+                case EnterKeyAction.Done:
+                    return "qrc:/images/check.png"
+                case EnterKeyAction.Search:
+                    return "qrc:/images/search.png"
+                default:
+                    return "qrc:/images/enter.png"
+                }
+            }
             color: "#c5a96f"
             anchors.fill: parent
-            anchors.margins: keyContentMargin
-            anchors.leftMargin: enterKeyBackground.width > enterKeyBackground.height * 1.5 ? Math.round(142 * scaleHint) : anchors.margins
+            anchors.topMargin: keyIconMargin
+            anchors.bottomMargin: keyIconMargin
         }
         Text {
             id: enterKeyText
-            visible: control.displayText.length !== 0
-            text: control.displayText
+            visible: text.length !== 0
+            text: control.actionId !== EnterKeyAction.None ? "" : control.displayText
             clip: true
             fontSizeMode: Text.HorizontalFit
             horizontalAlignment: Text.AlignHCenter
@@ -321,8 +333,8 @@ KeyboardStyle {
             source: "qrc:/images/hidekeyboard.png"
             color: "#c5a96f"
             anchors.fill: parent
-            anchors.topMargin: keyContentMargin
-            anchors.bottomMargin: keyContentMargin
+            anchors.topMargin: keyIconMargin
+            anchors.bottomMargin: keyIconMargin
         }
         states: [
             State {
@@ -397,8 +409,8 @@ KeyboardStyle {
             source: "qrc:/images/shift.png"
             color: "#c5a96f"
             anchors.fill: parent
-            anchors.topMargin: keyContentMargin
-            anchors.bottomMargin: keyContentMargin
+            anchors.topMargin: keyIconMargin
+            anchors.bottomMargin: keyIconMargin
         }
         states: [
             State {
diff --git a/src/virtualkeyboard/content/styles/retro/style.qrc b/src/virtualkeyboard/content/styles/retro/style.qrc
index 4d4c41c8..a2c861e5 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qrc
+++ b/src/virtualkeyboard/content/styles/retro/style.qrc
@@ -27,5 +27,7 @@
         <file>images/hidekeyboard.png</file>
         <file>images/shift.png</file>
         <file>images/globe.png</file>
+        <file>images/search.png</file>
+        <file>images/check.png</file>
     </qresource>
 </RCC>