From 96c3e6d3562556d9877e0ced5bd1ab9197502708 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Thu, 14 Dec 2017 10:43:15 +0900 Subject: Display blank icon with first letter in new color scheme For new color scheme, when icon file is not exist, Display a blank icon with first letter. Change-Id: Ifdb8254435d9ebbd93eca0005e088b99964e9187 Signed-off-by: zheng_wenlong --- homescreen/qml/IconItem.qml | 4 +- homescreen/qml/MediaAreaBlank.qml | 2 +- homescreen/qml/ShortcutIcon.qml | 13 ++++ .../Home/HMI_AppLauncher_Blank_Active-01.png | Bin 52032 -> 0 bytes .../Home/HMI_AppLauncher_Blank_Active-01.svg | 74 +++++++++++++++++++++ .../Home/HMI_AppLauncher_Blank_Inactive-01.png | Bin 44813 -> 0 bytes .../Home/HMI_AppLauncher_Blank_Inactive-01.svg | 40 +++++++++++ homescreen/qml/images/Home/home.qrc | 4 +- 8 files changed, 132 insertions(+), 5 deletions(-) delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg (limited to 'homescreen') diff --git a/homescreen/qml/IconItem.qml b/homescreen/qml/IconItem.qml index c616722..b0373d2 100644 --- a/homescreen/qml/IconItem.qml +++ b/homescreen/qml/IconItem.qml @@ -13,7 +13,7 @@ Item { y: 60 font.pixelSize: 125 anchors.horizontalCenter: parent.horizontalCenter - color: "#5CFE96" + color: "#00ADDC" text: model.icon == 'Blank' ? model.name.substring(0,1).toUpperCase() : '' } @@ -27,7 +27,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter color: "white" - text: model.icon == 'Blank' ? model.name.toUpperCase() : '' + text: qsTr(model.name.toUpperCase()) } source: './images/HMI_AppLauncher_%1_%2-01.svg'.arg(model.icon).arg(loc.pressed && (loc.index === model.index || loc.currentId === model.id) ? 'Active' : 'Inactive') diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 5733392..f5aa91b 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -84,7 +84,7 @@ Image { font.pixelSize: 36 anchors.horizontalCenter: parent.horizontalCenter color: "white" - text: "Master Volume" + text: qsTr("Master Volume") } RowLayout { diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml index c6f5a4e..39931d1 100644 --- a/homescreen/qml/ShortcutIcon.qml +++ b/homescreen/qml/ShortcutIcon.qml @@ -16,6 +16,7 @@ */ import QtQuick 2.2 +import QtQuick.Controls 2.0 MouseArea { id: root @@ -33,6 +34,18 @@ MouseArea { source: './images/Shortcut/HMI_Shortcut_%1_Active-01.svg'.arg(root.name) opacity: 1.0 - icon.opacity } + Label { + id: name + y: 160 + width: root.width - 10 + font.pixelSize: 15 + font.letterSpacing: 5 + // wrapMode: Text.WordWrap + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + color: "white" + text: qsTr(model.name.toUpperCase()) + } states: [ State { when: root.active diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png deleted file mode 100644 index 32558b3..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg new file mode 100644 index 0000000..8d082d6 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg @@ -0,0 +1,74 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png deleted file mode 100644 index bd374c6..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg new file mode 100644 index 0000000..1821339 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg @@ -0,0 +1,40 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc index a9db5c2..a523a96 100644 --- a/homescreen/qml/images/Home/home.qrc +++ b/homescreen/qml/images/Home/home.qrc @@ -21,7 +21,7 @@ HMI_AppLauncher_Radio_Inactive-01.svg HMI_AppLauncher_Settings_Active-01.svg HMI_AppLauncher_Settings_Inactive-01.svg - HMI_AppLauncher_Blank_Active-01.png - HMI_AppLauncher_Blank_Inactive-01.png + HMI_AppLauncher_Blank_Active-01.svg + HMI_AppLauncher_Blank_Inactive-01.svg -- cgit 1.2.3-korg