From c43634c2eb0a25391f2975c61beb390589997782 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Sat, 16 Dec 2017 12:39:08 +0000 Subject: Revert "Revert "Display blank icon with first letter in new color scheme"" This reverts commit b11094e01c1fe8000475691591bb8f93376acec4. b110 reverts commit 96c3e6d3562556d9877e0ced5bd1ab9197502708. [Update commit message by Tadao Tanikawa] Display default icon in new color scheme When HomeScreen don't have any built-in icon for an application, it displays icon which has initial letter of upper case of application name (returned by AGL appfw) with blue circle (looks like blank icon). In the future, displaying initial letter would be replaced by own icon for each application which is stored in .wgt package. Bug-AGL: SPEC-673 Change-Id: I538530cace02f63fe6d6fcfa682bb7c1935791ee Signed-off-by: Tadao Tanikawa --- 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 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 182b168..2b888c8 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