From 58e41da173b4ee63309ce94d20471e00fec2ea9a Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 22 Dec 2017 14:18:17 +0900 Subject: Improve management icons of homescreen - sort out filenames of icons - remove unnecessary margins of icon - fix rule of converting metadata of app to icon's filename Before: filename is made from id returns appfw After: filename is lowercase of name defined in config.xml - Add 2 new builtin icons, VIDEO and WEBBROWSER Bug-AGL: SPEC-673 Change-Id: I606841b19c884687237c92012724f5a1a3f6f603 Signed-off-by: Tadao Tanikawa (cherry picked from commit 8b2fa00276456759fffdd97e210f643b46a0cb1e) --- homescreen/src/applicationmodel.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'homescreen/src') diff --git a/homescreen/src/applicationmodel.cpp b/homescreen/src/applicationmodel.cpp index 6d32d27..5b4bb01 100644 --- a/homescreen/src/applicationmodel.cpp +++ b/homescreen/src/applicationmodel.cpp @@ -39,20 +39,12 @@ public: namespace { QString get_icon_name(QJsonObject const &i) { - QString icon = i["id"].toString().split("@").front(); - if (icon == "hvac" || icon == "poi") { - icon = icon.toUpper(); - } else if (icon == "mediaplayer") { -// icon = "Multimedia"; - icon = "MediaPlayer"; - } else { - icon[0] = icon[0].toUpper(); - } + QString icon = i["name"].toString().toLower(); - if ( !QFile::exists(QString(":/images/HMI_AppLauncher_%1_Active-01.svg").arg(icon)) || - !QFile::exists(QString(":/images/HMI_AppLauncher_%1_Inactive-01.svg").arg(icon)) ) + if ( !QFile::exists(QString(":/images/%1_active.svg").arg(icon)) || + !QFile::exists(QString(":/images/%1_inactive.svg").arg(icon)) ) { - icon = "Blank"; + icon = "blank"; } return icon; } -- cgit 1.2.3-korg