From 4b6c6077533cf3ad20d0f3ccf855e1a81845b2de Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 3 Dec 2014 14:40:38 +0100 Subject: Replace internal usage of KeyIcon with colored PNGs. The shader-based colorization of icons that KeyIcon does is not supported when using the 2D renderer. Task-number: QTEE-835 Change-Id: I1b21be52a7fcbf195c329ad30a074946c65d18e9 Reviewed-by: Andy Nichols --- .qmake.cache | 0 .../content/styles/default/default_style.qrc | 16 ++-- .../styles/default/images/backspace-868482.png | Bin 0 -> 1282 bytes .../content/styles/default/images/backspace.png | Bin 1810 -> 0 bytes .../content/styles/default/images/check-868482.png | Bin 0 -> 1373 bytes .../content/styles/default/images/check.png | Bin 1473 -> 0 bytes .../content/styles/default/images/enter-868482.png | Bin 0 -> 1421 bytes .../content/styles/default/images/enter.png | Bin 1360 -> 0 bytes .../content/styles/default/images/globe-868482.png | Bin 0 -> 7233 bytes .../content/styles/default/images/globe.png | Bin 6117 -> 0 bytes .../styles/default/images/hidekeyboard-868482.png | Bin 0 -> 1838 bytes .../content/styles/default/images/hidekeyboard.png | Bin 2051 -> 0 bytes .../styles/default/images/search-868482.png | Bin 0 -> 3672 bytes .../content/styles/default/images/search.png | Bin 3784 -> 0 bytes .../content/styles/default/images/shift-80c342.png | Bin 0 -> 2823 bytes .../content/styles/default/images/shift-868482.png | Bin 0 -> 2825 bytes .../content/styles/default/images/shift-c5d6b6.png | Bin 0 -> 2822 bytes .../content/styles/default/images/shift.png | Bin 2667 -> 0 bytes .../content/styles/default/style.qml | 82 +++++++++++-------- .../styles/retro/images/backspace-c5a96f.png | Bin 0 -> 1241 bytes .../content/styles/retro/images/backspace.png | Bin 1810 -> 0 bytes .../content/styles/retro/images/check-c5a96f.png | Bin 0 -> 1352 bytes .../content/styles/retro/images/check.png | Bin 1473 -> 0 bytes .../content/styles/retro/images/enter-c5a96f.png | Bin 0 -> 1428 bytes .../content/styles/retro/images/enter.png | Bin 1360 -> 0 bytes .../content/styles/retro/images/globe-110b05.png | Bin 0 -> 7220 bytes .../content/styles/retro/images/globe.png | Bin 6117 -> 0 bytes .../styles/retro/images/hidekeyboard-c5a96f.png | Bin 0 -> 1842 bytes .../content/styles/retro/images/hidekeyboard.png | Bin 2051 -> 0 bytes .../content/styles/retro/images/search-c5a96f.png | Bin 0 -> 3680 bytes .../content/styles/retro/images/search.png | Bin 3784 -> 0 bytes .../content/styles/retro/images/shift-c5a96f.png | Bin 0 -> 2822 bytes .../content/styles/retro/images/shift-dc4f28.png | Bin 0 -> 2821 bytes .../content/styles/retro/images/shift.png | Bin 2667 -> 0 bytes .../content/styles/retro/retro_style.qrc | 15 ++-- src/virtualkeyboard/content/styles/retro/style.qml | 87 +++++++++++++-------- 36 files changed, 124 insertions(+), 76 deletions(-) create mode 100644 .qmake.cache create mode 100644 src/virtualkeyboard/content/styles/default/images/backspace-868482.png delete mode 100755 src/virtualkeyboard/content/styles/default/images/backspace.png create mode 100644 src/virtualkeyboard/content/styles/default/images/check-868482.png delete mode 100644 src/virtualkeyboard/content/styles/default/images/check.png create mode 100644 src/virtualkeyboard/content/styles/default/images/enter-868482.png delete mode 100755 src/virtualkeyboard/content/styles/default/images/enter.png create mode 100644 src/virtualkeyboard/content/styles/default/images/globe-868482.png delete mode 100755 src/virtualkeyboard/content/styles/default/images/globe.png create mode 100644 src/virtualkeyboard/content/styles/default/images/hidekeyboard-868482.png delete mode 100755 src/virtualkeyboard/content/styles/default/images/hidekeyboard.png create mode 100644 src/virtualkeyboard/content/styles/default/images/search-868482.png delete mode 100644 src/virtualkeyboard/content/styles/default/images/search.png create mode 100644 src/virtualkeyboard/content/styles/default/images/shift-80c342.png create mode 100644 src/virtualkeyboard/content/styles/default/images/shift-868482.png create mode 100644 src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.png delete mode 100755 src/virtualkeyboard/content/styles/default/images/shift.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.png delete mode 100755 src/virtualkeyboard/content/styles/retro/images/backspace.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/check-c5a96f.png delete mode 100644 src/virtualkeyboard/content/styles/retro/images/check.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.png delete mode 100755 src/virtualkeyboard/content/styles/retro/images/enter.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/globe-110b05.png delete mode 100755 src/virtualkeyboard/content/styles/retro/images/globe.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.png delete mode 100755 src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/search-c5a96f.png delete mode 100644 src/virtualkeyboard/content/styles/retro/images/search.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.png create mode 100644 src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.png delete mode 100755 src/virtualkeyboard/content/styles/retro/images/shift.png diff --git a/.qmake.cache b/.qmake.cache new file mode 100644 index 00000000..e69de29b diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/default_style.qrc index 100f3fcb..de821723 100644 --- a/src/virtualkeyboard/content/styles/default/default_style.qrc +++ b/src/virtualkeyboard/content/styles/default/default_style.qrc @@ -1,12 +1,14 @@ style.qml - images/backspace.png - images/enter.png - images/hidekeyboard.png - images/shift.png - images/globe.png - images/search.png - images/check.png + images/backspace-868482.png + images/check-868482.png + images/enter-868482.png + images/globe-868482.png + images/hidekeyboard-868482.png + images/search-868482.png + images/shift-80c342.png + images/shift-868482.png + images/shift-c5d6b6.png diff --git a/src/virtualkeyboard/content/styles/default/images/backspace-868482.png b/src/virtualkeyboard/content/styles/default/images/backspace-868482.png new file mode 100644 index 00000000..ac1c6b10 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/backspace-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/backspace.png b/src/virtualkeyboard/content/styles/default/images/backspace.png deleted file mode 100755 index eb6d668f..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/backspace.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/check-868482.png b/src/virtualkeyboard/content/styles/default/images/check-868482.png new file mode 100644 index 00000000..1336c2b3 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/check-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/check.png b/src/virtualkeyboard/content/styles/default/images/check.png deleted file mode 100644 index 4a5a92c4..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/check.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/enter-868482.png b/src/virtualkeyboard/content/styles/default/images/enter-868482.png new file mode 100644 index 00000000..32808241 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/enter-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/enter.png b/src/virtualkeyboard/content/styles/default/images/enter.png deleted file mode 100755 index 0b739382..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/enter.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/globe-868482.png b/src/virtualkeyboard/content/styles/default/images/globe-868482.png new file mode 100644 index 00000000..7cf6dcc9 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/globe-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/globe.png b/src/virtualkeyboard/content/styles/default/images/globe.png deleted file mode 100755 index 4dff8ccc..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/globe.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/hidekeyboard-868482.png b/src/virtualkeyboard/content/styles/default/images/hidekeyboard-868482.png new file mode 100644 index 00000000..af89960f Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/hidekeyboard-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png b/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png deleted file mode 100755 index a625cc4f..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/hidekeyboard.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/search-868482.png b/src/virtualkeyboard/content/styles/default/images/search-868482.png new file mode 100644 index 00000000..b9516f27 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/search-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/search.png b/src/virtualkeyboard/content/styles/default/images/search.png deleted file mode 100644 index 740830d5..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/search.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/images/shift-80c342.png b/src/virtualkeyboard/content/styles/default/images/shift-80c342.png new file mode 100644 index 00000000..686e6737 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/shift-80c342.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/shift-868482.png b/src/virtualkeyboard/content/styles/default/images/shift-868482.png new file mode 100644 index 00000000..3328079c Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/shift-868482.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.png b/src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.png new file mode 100644 index 00000000..97cbea87 Binary files /dev/null and b/src/virtualkeyboard/content/styles/default/images/shift-c5d6b6.png differ diff --git a/src/virtualkeyboard/content/styles/default/images/shift.png b/src/virtualkeyboard/content/styles/default/images/shift.png deleted file mode 100755 index 54e9472b..00000000 Binary files a/src/virtualkeyboard/content/styles/default/images/shift.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 3c18c25d..36c7e8e2 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -97,13 +97,17 @@ KeyboardStyle { color: "#1e1b18" anchors.fill: parent anchors.margins: keyBackgroundMargin - KeyIcon { + Item { id: backspaceKeyIcon - source: resourcePrefix + "images/backspace.png" - color: "#868482" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + Image { + source: resourcePrefix + "images/backspace-868482.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + anchors.margins: parent.width * 0.05 + } } } states: [ @@ -141,13 +145,16 @@ KeyboardStyle { color: "#35322f" anchors.fill: parent anchors.margins: keyBackgroundMargin - KeyIcon { + Item { id: languageKeyIcon - source: resourcePrefix + "images/globe.png" - color: "#868482" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + Image { + source: resourcePrefix + "images/globe-868482.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + } } } states: [ @@ -185,26 +192,30 @@ KeyboardStyle { color: "#1e1b18" anchors.fill: parent anchors.margins: keyBackgroundMargin - KeyIcon { + Item { id: enterKeyIcon visible: enterKeyText.text.length === 0 - source: { - switch (control.actionId) { - case EnterKeyAction.Go: - case EnterKeyAction.Send: - case EnterKeyAction.Next: - case EnterKeyAction.Done: - return resourcePrefix + "images/check.png" - case EnterKeyAction.Search: - return resourcePrefix + "images/search.png" - default: - return resourcePrefix + "images/enter.png" - } - } - color: "#868482" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + anchors.fill: parent + fillMode: Image.PreserveAspectFit + source: { + switch (control.actionId) { + case EnterKeyAction.Go: + case EnterKeyAction.Send: + case EnterKeyAction.Next: + case EnterKeyAction.Done: + return resourcePrefix + "images/check-868482.png" + case EnterKeyAction.Search: + return resourcePrefix + "images/search-868482.png" + default: + return resourcePrefix + "images/enter-868482.png" + } + } + } } Text { id: enterKeyText @@ -268,13 +279,17 @@ KeyboardStyle { color: "#1e1b18" anchors.fill: parent anchors.margins: keyBackgroundMargin - KeyIcon { + Item { id: hideKeyIcon - source: resourcePrefix + "images/hidekeyboard.png" - color: "#868482" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + source: resourcePrefix + "images/hidekeyboard-868482.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + } } } states: [ @@ -312,13 +327,18 @@ KeyboardStyle { color: "#1e1b18" anchors.fill: parent anchors.margins: keyBackgroundMargin - KeyIcon { + Item { id: shiftKeyIcon - source: resourcePrefix + "images/shift.png" - color: "#868482" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + id: shiftKeyIconImage + source: resourcePrefix + "images/shift-868482.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + } } states: [ State { @@ -329,16 +349,16 @@ KeyboardStyle { color: "#5a892e" } PropertyChanges { - target: shiftKeyIcon - color: "#c5d6b6" + target: shiftKeyIconImage + source: resourcePrefix + "images/shift-c5d6b6.png" } }, State { name: "shift" when: InputContext.shift PropertyChanges { - target: shiftKeyIcon - color: "#80c342" + target: shiftKeyIconImage + source: resourcePrefix + "images/shift-80c342.png" } } ] diff --git a/src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.png new file mode 100644 index 00000000..f666ea5e Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/backspace-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/backspace.png b/src/virtualkeyboard/content/styles/retro/images/backspace.png deleted file mode 100755 index eb6d668f..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/backspace.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/check-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/check-c5a96f.png new file mode 100644 index 00000000..baf6cf30 Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/check-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/check.png b/src/virtualkeyboard/content/styles/retro/images/check.png deleted file mode 100644 index 4a5a92c4..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/check.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.png new file mode 100644 index 00000000..935f0dc2 Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/enter-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/enter.png b/src/virtualkeyboard/content/styles/retro/images/enter.png deleted file mode 100755 index 0b739382..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/enter.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/globe-110b05.png b/src/virtualkeyboard/content/styles/retro/images/globe-110b05.png new file mode 100644 index 00000000..92b412ab Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/globe-110b05.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/globe.png b/src/virtualkeyboard/content/styles/retro/images/globe.png deleted file mode 100755 index 4dff8ccc..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/globe.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.png new file mode 100644 index 00000000..d5cbeb9d Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/hidekeyboard-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png b/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png deleted file mode 100755 index a625cc4f..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/hidekeyboard.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/search-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/search-c5a96f.png new file mode 100644 index 00000000..060e6f42 Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/search-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/search.png b/src/virtualkeyboard/content/styles/retro/images/search.png deleted file mode 100644 index 740830d5..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/search.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.png b/src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.png new file mode 100644 index 00000000..5dab2f91 Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/shift-c5a96f.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.png b/src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.png new file mode 100644 index 00000000..91e3c6cb Binary files /dev/null and b/src/virtualkeyboard/content/styles/retro/images/shift-dc4f28.png differ diff --git a/src/virtualkeyboard/content/styles/retro/images/shift.png b/src/virtualkeyboard/content/styles/retro/images/shift.png deleted file mode 100755 index 54e9472b..00000000 Binary files a/src/virtualkeyboard/content/styles/retro/images/shift.png and /dev/null differ diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/retro_style.qrc index 53214704..21f625a4 100644 --- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc +++ b/src/virtualkeyboard/content/styles/retro/retro_style.qrc @@ -20,12 +20,13 @@ images/key_preview.png images/triangle_black.png images/triangle_highlight.png - images/backspace.png - images/enter.png - images/hidekeyboard.png - images/shift.png - images/globe.png - images/search.png - images/check.png + images/backspace-c5a96f.png + images/check-c5a96f.png + images/enter-c5a96f.png + images/globe-110b05.png + images/hidekeyboard-c5a96f.png + images/search-c5a96f.png + images/shift-c5a96f.png + images/shift-dc4f28.png diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index d72aef3d..71b64afb 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -136,13 +136,18 @@ KeyboardStyle { horizontalTileMode: BorderImage.Stretch scale: (parent.height - 2 * keyBackgroundMargin) / sourceSize.height } - KeyIcon { + Item { id: backspaceKeyIcon - source: resourcePrefix + "images/backspace.png" - color: "#c5a96f" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + anchors.fill: parent + anchors.margins: parent.width * 0.1 + fillMode: Image.PreserveAspectFit + source: resourcePrefix + "images/backspace-c5a96f.png" + } } states: [ State { @@ -180,13 +185,17 @@ KeyboardStyle { anchors.fill: parent anchors.margins: keyBackgroundMargin } - KeyIcon { + Item { id: languageKeyIcon - source: resourcePrefix + "images/globe.png" - color: "#110b05" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + source: resourcePrefix + "images/globe-110b05.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + } } states: [ State { @@ -230,26 +239,31 @@ KeyboardStyle { horizontalTileMode: BorderImage.Stretch scale: (parent.height - 2 * keyBackgroundMargin) / sourceSize.height } - KeyIcon { + Item { id: enterKeyIcon visible: enterKeyText.text.length === 0 - source: { - switch (control.actionId) { - case EnterKeyAction.Go: - case EnterKeyAction.Send: - case EnterKeyAction.Next: - case EnterKeyAction.Done: - return resourcePrefix + "images/check.png" - case EnterKeyAction.Search: - return resourcePrefix + "images/search.png" - default: - return resourcePrefix + "images/enter.png" - } - } - color: "#c5a96f" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + anchors.fill: parent + anchors.margins: parent.width * 0.025 + fillMode: Image.PreserveAspectFit + source: { + switch (control.actionId) { + case EnterKeyAction.Go: + case EnterKeyAction.Send: + case EnterKeyAction.Next: + case EnterKeyAction.Done: + return resourcePrefix + "images/check-c5a96f.png" + case EnterKeyAction.Search: + return resourcePrefix + "images/search-c5a96f.png" + default: + return resourcePrefix + "images/enter-c5a96f.png" + } + } + } } Text { id: enterKeyText @@ -322,13 +336,18 @@ KeyboardStyle { horizontalTileMode: BorderImage.Stretch scale: (parent.height - 2 * keyBackgroundMargin) / sourceSize.height } - KeyIcon { + Item { id: hideKeyIcon - source: resourcePrefix + "images/hidekeyboard.png" - color: "#c5a96f" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + source: resourcePrefix + "images/hidekeyboard-c5a96f.png" + fillMode: Image.PreserveAspectFit + anchors.fill: parent + anchors.margins: parent.width * 0.025 + } } states: [ State { @@ -380,8 +399,8 @@ KeyboardStyle { source: resourcePrefix + "images/key154px_capslock.png" } PropertyChanges { - target: shiftKeyIcon - color: "#cd8865" + target: shiftKeyIconImage + source: resourcePrefix + "images/shift-cd8865.png" } }, State { @@ -392,19 +411,25 @@ KeyboardStyle { source: resourcePrefix + "images/key154px_shiftcase.png" } PropertyChanges { - target: shiftKeyIcon - color: "#dc4f28" + target: shiftKeyIconImage + source: resourcePrefix + "images/shift-dc4f28.png" } } ] } - KeyIcon { + Item { id: shiftKeyIcon - source: resourcePrefix + "images/shift.png" - color: "#c5a96f" anchors.fill: parent anchors.topMargin: keyIconMargin anchors.bottomMargin: keyIconMargin + + Image { + id: shiftKeyIconImage + anchors.fill: parent + anchors.margins: parent.width * 0.025 + fillMode: Image.PreserveAspectFit + source: resourcePrefix + "images/shift-c5a96f.png" + } } states: [ State { -- cgit v1.2.3