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) --- .gitignore | 1 + homescreen/qml/IconItem.qml | 75 ++- homescreen/qml/ShortcutArea.qml | 5 +- homescreen/qml/ShortcutIcon.qml | 4 +- .../Home/HMI_AppLauncher_Blank_Active-01.svg | 74 --- .../Home/HMI_AppLauncher_Blank_Inactive-01.svg | 40 -- .../HMI_AppLauncher_Connectivity_Active-01.svg | 100 --- .../HMI_AppLauncher_Connectivity_Inactive-01.svg | 80 --- .../Home/HMI_AppLauncher_Dashboard_Active-01.svg | 112 ---- .../Home/HMI_AppLauncher_Dashboard_Inactive-01.svg | 66 -- .../images/Home/HMI_AppLauncher_HVAC_Active-01.svg | 678 --------------------- .../Home/HMI_AppLauncher_HVAC_Inactive-01.svg | 658 -------------------- .../Home/HMI_AppLauncher_MediaPlayer_Active-01.svg | 75 --- .../HMI_AppLauncher_MediaPlayer_Inactive-01.svg | 57 -- .../Home/HMI_AppLauncher_Mixer_Active-01.svg | 138 ----- .../Home/HMI_AppLauncher_Mixer_Inactive-01.svg | 118 ---- .../Home/HMI_AppLauncher_Navigation_Active-01.svg | 104 ---- .../HMI_AppLauncher_Navigation_Inactive-01.svg | 84 --- .../images/Home/HMI_AppLauncher_POI_Active-01.svg | 262 -------- .../Home/HMI_AppLauncher_POI_Inactive-01.svg | 253 -------- .../Home/HMI_AppLauncher_Phone_Active-01.svg | 72 --- .../Home/HMI_AppLauncher_Phone_Inactive-01.svg | 52 -- .../Home/HMI_AppLauncher_Radio_Active-01.svg | 158 ----- .../Home/HMI_AppLauncher_Radio_Inactive-01.svg | 138 ----- .../Home/HMI_AppLauncher_Settings_Active-01.svg | 88 --- .../Home/HMI_AppLauncher_Settings_Inactive-01.svg | 68 --- homescreen/qml/images/Home/blank_active.svg | 133 ++++ homescreen/qml/images/Home/blank_inactive.svg | 76 +++ homescreen/qml/images/Home/connectivity_active.svg | 231 +++++++ .../qml/images/Home/connectivity_inactive.svg | 169 +++++ homescreen/qml/images/Home/dashboard_active.svg | 174 ++++++ homescreen/qml/images/Home/dashboard_inactive.svg | 94 +++ homescreen/qml/images/Home/home.qrc | 48 +- homescreen/qml/images/Home/hvac_active.svg | 411 +++++++++++++ homescreen/qml/images/Home/hvac_inactive.svg | 349 +++++++++++ homescreen/qml/images/Home/mediaplayer_active.svg | 172 ++++++ .../qml/images/Home/mediaplayer_inactive.svg | 111 ++++ homescreen/qml/images/Home/mixer_active.svg | 370 +++++++++++ homescreen/qml/images/Home/mixer_inactive.svg | 308 ++++++++++ homescreen/qml/images/Home/music_active.svg | 172 ++++++ homescreen/qml/images/Home/music_inactive.svg | 111 ++++ homescreen/qml/images/Home/navigation_active.svg | 245 ++++++++ homescreen/qml/images/Home/navigation_inactive.svg | 183 ++++++ homescreen/qml/images/Home/phone_active.svg | 155 +++++ homescreen/qml/images/Home/phone_inactive.svg | 93 +++ homescreen/qml/images/Home/poi_active.svg | 352 +++++++++++ homescreen/qml/images/Home/poi_inactive.svg | 314 ++++++++++ homescreen/qml/images/Home/radio_active.svg | 383 ++++++++++++ homescreen/qml/images/Home/radio_inactive.svg | 321 ++++++++++ homescreen/qml/images/Home/settings_active.svg | 176 ++++++ homescreen/qml/images/Home/settings_inactive.svg | 114 ++++ homescreen/qml/images/Home/video_active.svg | 177 ++++++ homescreen/qml/images/Home/video_inactive.svg | 111 ++++ homescreen/qml/images/Home/webbrowser_active.svg | 231 +++++++ homescreen/qml/images/Home/webbrowser_inactive.svg | 165 +++++ .../qml/images/Shortcut/HMI_Shortcut_HVAC-01.png | Bin 4108 -> 0 bytes .../qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg | 600 ------------------ .../Shortcut/HMI_Shortcut_HVAC_Active-01.png | Bin 5908 -> 0 bytes .../Shortcut/HMI_Shortcut_HVAC_Active-01.svg | 614 ------------------- .../qml/images/Shortcut/HMI_Shortcut_Home-01.png | Bin 3435 -> 0 bytes .../qml/images/Shortcut/HMI_Shortcut_Home-01.svg | 73 --- .../Shortcut/HMI_Shortcut_Home_Active-01.png | Bin 4924 -> 0 bytes .../Shortcut/HMI_Shortcut_Home_Active-01.svg | 82 --- .../Shortcut/HMI_Shortcut_MediaPlayer-01.png | Bin 4114 -> 0 bytes .../Shortcut/HMI_Shortcut_MediaPlayer-01.svg | 50 -- .../HMI_Shortcut_MediaPlayer_Active-01.png | Bin 5973 -> 0 bytes .../HMI_Shortcut_MediaPlayer_Active-01.svg | 63 -- .../images/Shortcut/HMI_Shortcut_Navigation-01.png | Bin 7122 -> 0 bytes .../images/Shortcut/HMI_Shortcut_Navigation-01.svg | 77 --- .../Shortcut/HMI_Shortcut_Navigation_Active-01.png | Bin 9799 -> 0 bytes .../Shortcut/HMI_Shortcut_Navigation_Active-01.svg | 90 --- .../qml/images/Shortcut/HMI_Shortcut_Radio-01.png | Bin 4608 -> 0 bytes .../qml/images/Shortcut/HMI_Shortcut_Radio-01.svg | 600 ------------------ .../Shortcut/HMI_Shortcut_Radio_Active-01.png | Bin 6029 -> 0 bytes .../Shortcut/HMI_Shortcut_Radio_Active-01.svg | 614 ------------------- homescreen/qml/images/Shortcut/home.svg | 73 +++ homescreen/qml/images/Shortcut/home_active.svg | 82 +++ homescreen/qml/images/Shortcut/hvac.svg | 600 ++++++++++++++++++ homescreen/qml/images/Shortcut/hvac_active.svg | 614 +++++++++++++++++++ homescreen/qml/images/Shortcut/music.svg | 50 ++ homescreen/qml/images/Shortcut/music_active.svg | 63 ++ homescreen/qml/images/Shortcut/navigation.svg | 77 +++ .../qml/images/Shortcut/navigation_active.svg | 90 +++ homescreen/qml/images/Shortcut/shortcut.qrc | 18 +- homescreen/src/applicationmodel.cpp | 16 +- 85 files changed, 7641 insertions(+), 6414 deletions(-) create mode 100644 .gitignore delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Blank_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg create mode 100644 homescreen/qml/images/Home/blank_active.svg create mode 100644 homescreen/qml/images/Home/blank_inactive.svg create mode 100644 homescreen/qml/images/Home/connectivity_active.svg create mode 100644 homescreen/qml/images/Home/connectivity_inactive.svg create mode 100644 homescreen/qml/images/Home/dashboard_active.svg create mode 100644 homescreen/qml/images/Home/dashboard_inactive.svg create mode 100644 homescreen/qml/images/Home/hvac_active.svg create mode 100644 homescreen/qml/images/Home/hvac_inactive.svg create mode 100644 homescreen/qml/images/Home/mediaplayer_active.svg create mode 100644 homescreen/qml/images/Home/mediaplayer_inactive.svg create mode 100644 homescreen/qml/images/Home/mixer_active.svg create mode 100644 homescreen/qml/images/Home/mixer_inactive.svg create mode 100644 homescreen/qml/images/Home/music_active.svg create mode 100644 homescreen/qml/images/Home/music_inactive.svg create mode 100644 homescreen/qml/images/Home/navigation_active.svg create mode 100644 homescreen/qml/images/Home/navigation_inactive.svg create mode 100644 homescreen/qml/images/Home/phone_active.svg create mode 100644 homescreen/qml/images/Home/phone_inactive.svg create mode 100644 homescreen/qml/images/Home/poi_active.svg create mode 100644 homescreen/qml/images/Home/poi_inactive.svg create mode 100644 homescreen/qml/images/Home/radio_active.svg create mode 100644 homescreen/qml/images/Home/radio_inactive.svg create mode 100644 homescreen/qml/images/Home/settings_active.svg create mode 100644 homescreen/qml/images/Home/settings_inactive.svg create mode 100644 homescreen/qml/images/Home/video_active.svg create mode 100644 homescreen/qml/images/Home/video_inactive.svg create mode 100644 homescreen/qml/images/Home/webbrowser_active.svg create mode 100644 homescreen/qml/images/Home/webbrowser_inactive.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png delete mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg create mode 100644 homescreen/qml/images/Shortcut/home.svg create mode 100644 homescreen/qml/images/Shortcut/home_active.svg create mode 100644 homescreen/qml/images/Shortcut/hvac.svg create mode 100644 homescreen/qml/images/Shortcut/hvac_active.svg create mode 100644 homescreen/qml/images/Shortcut/music.svg create mode 100644 homescreen/qml/images/Shortcut/music_active.svg create mode 100644 homescreen/qml/images/Shortcut/navigation.svg create mode 100644 homescreen/qml/images/Shortcut/navigation_active.svg diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/homescreen/qml/IconItem.qml b/homescreen/qml/IconItem.qml index 1c189e6..3a34864 100644 --- a/homescreen/qml/IconItem.qml +++ b/homescreen/qml/IconItem.qml @@ -4,45 +4,60 @@ import QtGraphicalEffects 1.0 Item { id: main - Image { - id: item; parent: loc - x: main.x + 5; y: main.y + 5 - width: main.width - 10; height: main.height - 10; + width: 320 + height: 320 - Label { - id: title - y: 60 - font.pixelSize: 125 + Item { + id: container + parent: loc + x: main.x + y: main.y + width: main.width + height: main.height + + Image { + id: item + anchors.top: parent.top + anchors.topMargin: 20 anchors.horizontalCenter: parent.horizontalCenter - text: model.name.substring(0,1).toUpperCase() - visible: false - } - LinearGradient { - anchors.fill: title - source: title - gradient: Gradient { - GradientStop { position: -0.5; color: "#6BFBFF" } - GradientStop { position: +1.5; color: "#00ADDC" } - } - visible: model.icon === 'Blank' - } + width: 220 + height: width + source: './images/%1_%2.svg'.arg(model.icon).arg(loc.pressed && (loc.index === model.index || loc.currentId === model.id) ? 'active' : 'inactive') + antialiasing: item.state !== '' + Label { + id: title + style: Text.Outline + styleColor: 'red' + color: 'transparent' + font.pixelSize: 125 + anchors.centerIn: parent + text: model.name.substring(0,1).toUpperCase() + visible: model.icon === 'blank' + layer.enabled: true + layer.effect: LinearGradient { + gradient: Gradient { + GradientStop { position: -0.5; color: "#6BFBFF" } + GradientStop { position: +1.5; color: "#00ADDC" } + } + } + } + } Label { id: name - y: 245 - width: main.width - 10 + anchors.top: item.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: 20 font.pixelSize: 25 font.letterSpacing: 5 wrapMode: Text.WordWrap - anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter color: "white" 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') - antialiasing: item.state !== '' Behavior on x { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } Behavior on y { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } SequentialAnimation on rotation { @@ -56,12 +71,18 @@ Item { State { name: 'active' when: loc.currentId == model.id - PropertyChanges { target: item; x: loc.mouseX - width/2; y: loc.mouseY - height/2; scale: 1.15; z: 10 } + PropertyChanges { + target: container + x: loc.mouseX - width/2 + y: loc.mouseY - height/2 + scale: 1.15 + z: 10 + } }, State { when: loc.currentId !== '' PropertyChanges { - target: item + target: container scale: 0.85 opacity: 0.75 } diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml index 0c00f8c..63f8e7b 100644 --- a/homescreen/qml/ShortcutArea.qml +++ b/homescreen/qml/ShortcutArea.qml @@ -32,14 +32,12 @@ Item { application: '' } ListElement { - name: 'MediaPlayer' + name: 'Music' application: 'mediaplayer@0.1' } ListElement { name: 'HVAC' application: 'hvac@0.1' -// name: 'Radio' -// application: 'radio@0.1' } ListElement { name: 'Navigation' @@ -75,6 +73,7 @@ Item { // layoutHandler.showAppLayer(model.application, pid) } else { + console.warn(model.application) console.warn("app cannot be launched!") } } diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml index 39931d1..2fb653f 100644 --- a/homescreen/qml/ShortcutIcon.qml +++ b/homescreen/qml/ShortcutIcon.qml @@ -27,11 +27,11 @@ MouseArea { Image { id: icon anchors.fill: parent - source: './images/Shortcut/HMI_Shortcut_%1-01.svg'.arg(root.name) + source: './images/Shortcut/%1.svg'.arg(root.name.toLowerCase()) } Image { anchors.fill: parent - source: './images/Shortcut/HMI_Shortcut_%1_Active-01.svg'.arg(root.name) + source: './images/Shortcut/%1_active.svg'.arg(root.name.toLowerCase()) opacity: 1.0 - icon.opacity } Label { 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.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/HMI_AppLauncher_Connectivity_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg deleted file mode 100644 index a5be521..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg deleted file mode 100644 index 84509f6..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg deleted file mode 100644 index 0fb66d3..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg deleted file mode 100644 index 8b545a7..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg deleted file mode 100644 index eef3b6d..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg deleted file mode 100644 index 09b376c..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg +++ /dev/null @@ -1,658 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg deleted file mode 100644 index 94509ad..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg deleted file mode 100644 index ac988ca..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg deleted file mode 100644 index e534fbd..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg deleted file mode 100644 index 1517890..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg deleted file mode 100644 index 0235569..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg deleted file mode 100644 index 3b13170..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg deleted file mode 100644 index 4bd0842..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg deleted file mode 100644 index 8983c2f..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg deleted file mode 100644 index 996933c..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg deleted file mode 100644 index 1f073ff..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg deleted file mode 100644 index 7133b40..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg deleted file mode 100644 index 4441736..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg deleted file mode 100644 index 65d7566..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg deleted file mode 100644 index 59f27f9..0000000 --- a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Home/blank_active.svg b/homescreen/qml/images/Home/blank_active.svg new file mode 100644 index 0000000..10c0a89 --- /dev/null +++ b/homescreen/qml/images/Home/blank_active.svg @@ -0,0 +1,133 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/blank_inactive.svg b/homescreen/qml/images/Home/blank_inactive.svg new file mode 100644 index 0000000..2e467a6 --- /dev/null +++ b/homescreen/qml/images/Home/blank_inactive.svg @@ -0,0 +1,76 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/connectivity_active.svg b/homescreen/qml/images/Home/connectivity_active.svg new file mode 100644 index 0000000..39d8e50 --- /dev/null +++ b/homescreen/qml/images/Home/connectivity_active.svg @@ -0,0 +1,231 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/connectivity_inactive.svg b/homescreen/qml/images/Home/connectivity_inactive.svg new file mode 100644 index 0000000..4cb1c45 --- /dev/null +++ b/homescreen/qml/images/Home/connectivity_inactive.svg @@ -0,0 +1,169 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/dashboard_active.svg b/homescreen/qml/images/Home/dashboard_active.svg new file mode 100644 index 0000000..a826c0c --- /dev/null +++ b/homescreen/qml/images/Home/dashboard_active.svg @@ -0,0 +1,174 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/dashboard_inactive.svg b/homescreen/qml/images/Home/dashboard_inactive.svg new file mode 100644 index 0000000..9c26fe3 --- /dev/null +++ b/homescreen/qml/images/Home/dashboard_inactive.svg @@ -0,0 +1,94 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc index a523a96..92f8501 100644 --- a/homescreen/qml/images/Home/home.qrc +++ b/homescreen/qml/images/Home/home.qrc @@ -1,27 +1,31 @@ AGL_HMI_Blue_Background_Car-01.png - HMI_AppLauncher_Connectivity_Active-01.svg - HMI_AppLauncher_Connectivity_Inactive-01.svg - HMI_AppLauncher_Dashboard_Active-01.svg - HMI_AppLauncher_Dashboard_Inactive-01.svg - HMI_AppLauncher_HVAC_Active-01.svg - HMI_AppLauncher_HVAC_Inactive-01.svg - HMI_AppLauncher_Mixer_Active-01.svg - HMI_AppLauncher_Mixer_Inactive-01.svg - HMI_AppLauncher_MediaPlayer_Active-01.svg - HMI_AppLauncher_MediaPlayer_Inactive-01.svg - HMI_AppLauncher_Navigation_Active-01.svg - HMI_AppLauncher_Navigation_Inactive-01.svg - HMI_AppLauncher_Phone_Active-01.svg - HMI_AppLauncher_Phone_Inactive-01.svg - HMI_AppLauncher_POI_Active-01.svg - HMI_AppLauncher_POI_Inactive-01.svg - HMI_AppLauncher_Radio_Active-01.svg - 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 + connectivity_active.svg + connectivity_inactive.svg + dashboard_active.svg + dashboard_inactive.svg + hvac_active.svg + hvac_inactive.svg + mixer_active.svg + mixer_inactive.svg + music_active.svg + music_inactive.svg + navigation_active.svg + navigation_inactive.svg + phone_active.svg + phone_inactive.svg + poi_active.svg + poi_inactive.svg + radio_active.svg + radio_inactive.svg + settings_active.svg + settings_inactive.svg + video_active.svg + video_inactive.svg + webbrowser_active.svg + webbrowser_inactive.svg + blank_active.svg + blank_inactive.svg diff --git a/homescreen/qml/images/Home/hvac_active.svg b/homescreen/qml/images/Home/hvac_active.svg new file mode 100644 index 0000000..44d3bd5 --- /dev/null +++ b/homescreen/qml/images/Home/hvac_active.svg @@ -0,0 +1,411 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/hvac_inactive.svg b/homescreen/qml/images/Home/hvac_inactive.svg new file mode 100644 index 0000000..67918e6 --- /dev/null +++ b/homescreen/qml/images/Home/hvac_inactive.svg @@ -0,0 +1,349 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/mediaplayer_active.svg b/homescreen/qml/images/Home/mediaplayer_active.svg new file mode 100644 index 0000000..d560c3a --- /dev/null +++ b/homescreen/qml/images/Home/mediaplayer_active.svg @@ -0,0 +1,172 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/mediaplayer_inactive.svg b/homescreen/qml/images/Home/mediaplayer_inactive.svg new file mode 100644 index 0000000..b6ec056 --- /dev/null +++ b/homescreen/qml/images/Home/mediaplayer_inactive.svg @@ -0,0 +1,111 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/mixer_active.svg b/homescreen/qml/images/Home/mixer_active.svg new file mode 100644 index 0000000..2cb3c07 --- /dev/null +++ b/homescreen/qml/images/Home/mixer_active.svg @@ -0,0 +1,370 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/mixer_inactive.svg b/homescreen/qml/images/Home/mixer_inactive.svg new file mode 100644 index 0000000..32e69f0 --- /dev/null +++ b/homescreen/qml/images/Home/mixer_inactive.svg @@ -0,0 +1,308 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/music_active.svg b/homescreen/qml/images/Home/music_active.svg new file mode 100644 index 0000000..d560c3a --- /dev/null +++ b/homescreen/qml/images/Home/music_active.svg @@ -0,0 +1,172 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/music_inactive.svg b/homescreen/qml/images/Home/music_inactive.svg new file mode 100644 index 0000000..b6ec056 --- /dev/null +++ b/homescreen/qml/images/Home/music_inactive.svg @@ -0,0 +1,111 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/navigation_active.svg b/homescreen/qml/images/Home/navigation_active.svg new file mode 100644 index 0000000..dc1fcd3 --- /dev/null +++ b/homescreen/qml/images/Home/navigation_active.svg @@ -0,0 +1,245 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/navigation_inactive.svg b/homescreen/qml/images/Home/navigation_inactive.svg new file mode 100644 index 0000000..97fcf31 --- /dev/null +++ b/homescreen/qml/images/Home/navigation_inactive.svg @@ -0,0 +1,183 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/phone_active.svg b/homescreen/qml/images/Home/phone_active.svg new file mode 100644 index 0000000..e184f26 --- /dev/null +++ b/homescreen/qml/images/Home/phone_active.svg @@ -0,0 +1,155 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/phone_inactive.svg b/homescreen/qml/images/Home/phone_inactive.svg new file mode 100644 index 0000000..7f26834 --- /dev/null +++ b/homescreen/qml/images/Home/phone_inactive.svg @@ -0,0 +1,93 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/poi_active.svg b/homescreen/qml/images/Home/poi_active.svg new file mode 100644 index 0000000..cb4bc0e --- /dev/null +++ b/homescreen/qml/images/Home/poi_active.svg @@ -0,0 +1,352 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/poi_inactive.svg b/homescreen/qml/images/Home/poi_inactive.svg new file mode 100644 index 0000000..09c8890 --- /dev/null +++ b/homescreen/qml/images/Home/poi_inactive.svg @@ -0,0 +1,314 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/radio_active.svg b/homescreen/qml/images/Home/radio_active.svg new file mode 100644 index 0000000..2d04d72 --- /dev/null +++ b/homescreen/qml/images/Home/radio_active.svg @@ -0,0 +1,383 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/radio_inactive.svg b/homescreen/qml/images/Home/radio_inactive.svg new file mode 100644 index 0000000..dcac8ee --- /dev/null +++ b/homescreen/qml/images/Home/radio_inactive.svg @@ -0,0 +1,321 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/settings_active.svg b/homescreen/qml/images/Home/settings_active.svg new file mode 100644 index 0000000..5391a08 --- /dev/null +++ b/homescreen/qml/images/Home/settings_active.svg @@ -0,0 +1,176 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/settings_inactive.svg b/homescreen/qml/images/Home/settings_inactive.svg new file mode 100644 index 0000000..882e3c4 --- /dev/null +++ b/homescreen/qml/images/Home/settings_inactive.svg @@ -0,0 +1,114 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/video_active.svg b/homescreen/qml/images/Home/video_active.svg new file mode 100644 index 0000000..794a441 --- /dev/null +++ b/homescreen/qml/images/Home/video_active.svg @@ -0,0 +1,177 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/video_inactive.svg b/homescreen/qml/images/Home/video_inactive.svg new file mode 100644 index 0000000..905d46f --- /dev/null +++ b/homescreen/qml/images/Home/video_inactive.svg @@ -0,0 +1,111 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/webbrowser_active.svg b/homescreen/qml/images/Home/webbrowser_active.svg new file mode 100644 index 0000000..70b4617 --- /dev/null +++ b/homescreen/qml/images/Home/webbrowser_active.svg @@ -0,0 +1,231 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Home/webbrowser_inactive.svg b/homescreen/qml/images/Home/webbrowser_inactive.svg new file mode 100644 index 0000000..09f34c9 --- /dev/null +++ b/homescreen/qml/images/Home/webbrowser_inactive.svg @@ -0,0 +1,165 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png deleted file mode 100644 index f5188f5..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg deleted file mode 100644 index 5c76e85..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png deleted file mode 100644 index abe92d2..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg deleted file mode 100644 index 46be46b..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png deleted file mode 100644 index 9aca151..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg deleted file mode 100644 index b6eab24..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png deleted file mode 100644 index 696168f..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg deleted file mode 100644 index e85c7d8..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png deleted file mode 100644 index 229860c..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg deleted file mode 100644 index de7448d..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png deleted file mode 100644 index b0a023c..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg deleted file mode 100644 index 16e3af5..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png deleted file mode 100644 index 34b0671..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg deleted file mode 100644 index 6f6f1e0..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png deleted file mode 100644 index 98e6146..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg deleted file mode 100644 index 9076934..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png deleted file mode 100644 index 278bc2a..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg deleted file mode 100644 index 5c76e85..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png deleted file mode 100644 index 037e1b5..0000000 Binary files a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg deleted file mode 100644 index 46be46b..0000000 --- a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/homescreen/qml/images/Shortcut/home.svg b/homescreen/qml/images/Shortcut/home.svg new file mode 100644 index 0000000..b6eab24 --- /dev/null +++ b/homescreen/qml/images/Shortcut/home.svg @@ -0,0 +1,73 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/home_active.svg b/homescreen/qml/images/Shortcut/home_active.svg new file mode 100644 index 0000000..e85c7d8 --- /dev/null +++ b/homescreen/qml/images/Shortcut/home_active.svg @@ -0,0 +1,82 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/hvac.svg b/homescreen/qml/images/Shortcut/hvac.svg new file mode 100644 index 0000000..5c76e85 --- /dev/null +++ b/homescreen/qml/images/Shortcut/hvac.svg @@ -0,0 +1,600 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/hvac_active.svg b/homescreen/qml/images/Shortcut/hvac_active.svg new file mode 100644 index 0000000..46be46b --- /dev/null +++ b/homescreen/qml/images/Shortcut/hvac_active.svg @@ -0,0 +1,614 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/music.svg b/homescreen/qml/images/Shortcut/music.svg new file mode 100644 index 0000000..de7448d --- /dev/null +++ b/homescreen/qml/images/Shortcut/music.svg @@ -0,0 +1,50 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/music_active.svg b/homescreen/qml/images/Shortcut/music_active.svg new file mode 100644 index 0000000..16e3af5 --- /dev/null +++ b/homescreen/qml/images/Shortcut/music_active.svg @@ -0,0 +1,63 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/navigation.svg b/homescreen/qml/images/Shortcut/navigation.svg new file mode 100644 index 0000000..6f6f1e0 --- /dev/null +++ b/homescreen/qml/images/Shortcut/navigation.svg @@ -0,0 +1,77 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/navigation_active.svg b/homescreen/qml/images/Shortcut/navigation_active.svg new file mode 100644 index 0000000..9076934 --- /dev/null +++ b/homescreen/qml/images/Shortcut/navigation_active.svg @@ -0,0 +1,90 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/shortcut.qrc b/homescreen/qml/images/Shortcut/shortcut.qrc index 0710973..99d282e 100644 --- a/homescreen/qml/images/Shortcut/shortcut.qrc +++ b/homescreen/qml/images/Shortcut/shortcut.qrc @@ -1,14 +1,12 @@ - HMI_Shortcut_Home_Active-01.svg - HMI_Shortcut_Home-01.svg - HMI_Shortcut_HVAC_Active-01.svg - HMI_Shortcut_HVAC-01.svg - HMI_Shortcut_MediaPlayer_Active-01.svg - HMI_Shortcut_MediaPlayer-01.svg - HMI_Shortcut_Navigation_Active-01.svg - HMI_Shortcut_Navigation-01.svg - HMI_Shortcut_Radio_Active-01.svg - HMI_Shortcut_Radio-01.svg + home.svg + home_active.svg + hvac.svg + hvac_active.svg + music.svg + music_active.svg + navigation.svg + navigation_active.svg 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