From b11094e01c1fe8000475691591bb8f93376acec4 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 14 Dec 2017 05:31:34 +0000 Subject: Revert "Display blank icon with first letter in new color scheme" JSM: Reverting as comments were not addressed in c12525 . This reverts commit 96c3e6d3562556d9877e0ced5bd1ab9197502708. Change-Id: Ib254e2c219e033a6b1ec755c32ddeca66dbb02bf Signed-off-by: Jan-Simon Moeller --- homescreen/qml/IconItem.qml | 4 +- homescreen/qml/MediaAreaBlank.qml | 2 +- homescreen/qml/ShortcutIcon.qml | 13 ---- .../Home/HMI_AppLauncher_Blank_Active-01.png | Bin 0 -> 52032 bytes .../Home/HMI_AppLauncher_Blank_Active-01.svg | 74 --------------------- .../Home/HMI_AppLauncher_Blank_Inactive-01.png | Bin 0 -> 44813 bytes .../Home/HMI_AppLauncher_Blank_Inactive-01.svg | 40 ----------- homescreen/qml/images/Home/home.qrc | 4 +- 8 files changed, 5 insertions(+), 132 deletions(-) create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png delete 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 b0373d2..c616722 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: "#00ADDC" + color: "#5CFE96" 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: qsTr(model.name.toUpperCase()) + text: model.icon == 'Blank' ? 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 f5aa91b..5733392 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: qsTr("Master Volume") + text: "Master Volume" } RowLayout { diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml index 39931d1..c6f5a4e 100644 --- a/homescreen/qml/ShortcutIcon.qml +++ b/homescreen/qml/ShortcutIcon.qml @@ -16,7 +16,6 @@ */ import QtQuick 2.2 -import QtQuick.Controls 2.0 MouseArea { id: root @@ -34,18 +33,6 @@ 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 new file mode 100644 index 0000000..32558b3 Binary files /dev/null and b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.png 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 deleted file mode 100644 index 8d082d6..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png new file mode 100644 index 0000000..bd374c6 Binary files /dev/null and b/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.png 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 deleted file mode 100644 index 1821339..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc index a523a96..a9db5c2 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.svg - HMI_AppLauncher_Blank_Inactive-01.svg + HMI_AppLauncher_Blank_Active-01.png + HMI_AppLauncher_Blank_Inactive-01.png -- cgit 1.2.3-korg