From 78fb6c1c788a78b5d753d835e1620649a0b0f34b Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Mon, 20 Nov 2017 21:42:41 +0900 Subject: Change to new color scheme - Color scheme has been changed - Icon and text has been splitted Incoming patch is necessary to show text with icons. Bug-AGL: SPEC-1085 Change-Id: I267a4fef9901b56e355efac7357c101fd9162421 Signed-off-by: Tadao Tanikawa (cherry picked from commit f756a01c3e78ebdb1ebe74efa52b8905a6a2c6b5) --- homescreen/qml/Home.qml | 2 +- homescreen/qml/IconItem.qml | 2 +- homescreen/qml/MediaAreaBlank.qml | 2 +- homescreen/qml/ShortcutIcon.qml | 4 +- .../qml/images/AGL_HMI_Background_NoCar-01.png | Bin 944767 -> 0 bytes .../images/AGL_HMI_Blue_Background_NoCar-01.png | Bin 0 -> 949053 bytes .../qml/images/Home/AGL_HMI_Background_Car-01.png | Bin 216666 -> 0 bytes .../images/Home/AGL_HMI_Blue_Background_Car-01.png | Bin 0 -> 1052322 bytes .../HMI_AppLauncher_Connectivity_Active-01.png | Bin 34136 -> 0 bytes .../HMI_AppLauncher_Connectivity_Active-01.svg | 100 +++ .../HMI_AppLauncher_Connectivity_Inactive-01.png | Bin 26878 -> 0 bytes .../HMI_AppLauncher_Connectivity_Inactive-01.svg | 80 +++ .../Home/HMI_AppLauncher_Dashboard_Active-01.png | Bin 32014 -> 0 bytes .../Home/HMI_AppLauncher_Dashboard_Active-01.svg | 112 ++++ .../Home/HMI_AppLauncher_Dashboard_Inactive-01.png | Bin 25298 -> 0 bytes .../Home/HMI_AppLauncher_Dashboard_Inactive-01.svg | 66 ++ .../images/Home/HMI_AppLauncher_HVAC_Active-01.png | Bin 31650 -> 0 bytes .../images/Home/HMI_AppLauncher_HVAC_Active-01.svg | 678 +++++++++++++++++++++ .../Home/HMI_AppLauncher_HVAC_Inactive-01.png | Bin 24398 -> 0 bytes .../Home/HMI_AppLauncher_HVAC_Inactive-01.svg | 658 ++++++++++++++++++++ .../Home/HMI_AppLauncher_MediaPlayer_Active-01.png | Bin 29605 -> 0 bytes .../Home/HMI_AppLauncher_MediaPlayer_Active-01.svg | 75 +++ .../HMI_AppLauncher_MediaPlayer_Inactive-01.png | Bin 23307 -> 0 bytes .../HMI_AppLauncher_MediaPlayer_Inactive-01.svg | 57 ++ .../Home/HMI_AppLauncher_Mixer_Active-01.png | Bin 29104 -> 0 bytes .../Home/HMI_AppLauncher_Mixer_Active-01.svg | 138 +++++ .../Home/HMI_AppLauncher_Mixer_Inactive-01.png | Bin 21878 -> 0 bytes .../Home/HMI_AppLauncher_Mixer_Inactive-01.svg | 118 ++++ .../Home/HMI_AppLauncher_Navigation_Active-01.png | Bin 38244 -> 0 bytes .../Home/HMI_AppLauncher_Navigation_Active-01.svg | 104 ++++ .../HMI_AppLauncher_Navigation_Inactive-01.png | Bin 33027 -> 0 bytes .../HMI_AppLauncher_Navigation_Inactive-01.svg | 84 +++ .../images/Home/HMI_AppLauncher_POI_Active-01.png | Bin 33356 -> 0 bytes .../images/Home/HMI_AppLauncher_POI_Active-01.svg | 262 ++++++++ .../Home/HMI_AppLauncher_POI_Inactive-01.png | Bin 26924 -> 0 bytes .../Home/HMI_AppLauncher_POI_Inactive-01.svg | 253 ++++++++ .../Home/HMI_AppLauncher_Phone_Active-01.png | Bin 30830 -> 0 bytes .../Home/HMI_AppLauncher_Phone_Active-01.svg | 72 +++ .../Home/HMI_AppLauncher_Phone_Inactive-01.png | Bin 23978 -> 0 bytes .../Home/HMI_AppLauncher_Phone_Inactive-01.svg | 52 ++ .../Home/HMI_AppLauncher_Radio_Active-01.png | Bin 29028 -> 0 bytes .../Home/HMI_AppLauncher_Radio_Active-01.svg | 158 +++++ .../Home/HMI_AppLauncher_Radio_Inactive-01.png | Bin 21186 -> 0 bytes .../Home/HMI_AppLauncher_Radio_Inactive-01.svg | 138 +++++ .../Home/HMI_AppLauncher_Settings_Active-01.png | Bin 33558 -> 0 bytes .../Home/HMI_AppLauncher_Settings_Active-01.svg | 88 +++ .../Home/HMI_AppLauncher_Settings_Inactive-01.png | Bin 26571 -> 0 bytes .../Home/HMI_AppLauncher_Settings_Inactive-01.svg | 68 +++ homescreen/qml/images/Home/home.qrc | 42 +- .../qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg | 600 ++++++++++++++++++ .../Shortcut/HMI_Shortcut_HVAC_Active-01.svg | 614 +++++++++++++++++++ .../qml/images/Shortcut/HMI_Shortcut_Home-01.svg | 73 +++ .../Shortcut/HMI_Shortcut_Home_Active-01.svg | 82 +++ .../Shortcut/HMI_Shortcut_MediaPlayer-01.svg | 50 ++ .../HMI_Shortcut_MediaPlayer_Active-01.svg | 63 ++ .../images/Shortcut/HMI_Shortcut_Navigation-01.svg | 77 +++ .../Shortcut/HMI_Shortcut_Navigation_Active-01.svg | 90 +++ .../qml/images/Shortcut/HMI_Shortcut_Radio-01.svg | 600 ++++++++++++++++++ .../Shortcut/HMI_Shortcut_Radio_Active-01.svg | 614 +++++++++++++++++++ homescreen/qml/images/Shortcut/shortcut.qrc | 20 +- homescreen/qml/images/Utility_Logo_Colour-01.png | Bin 8638 -> 0 bytes homescreen/qml/images/Utility_Logo_Grey-01.svg | 84 +++ homescreen/qml/images/images.qrc | 4 +- homescreen/qml/main.qml | 3 +- homescreen/src/applicationmodel.cpp | 4 +- 65 files changed, 6350 insertions(+), 41 deletions(-) delete mode 100644 homescreen/qml/images/AGL_HMI_Background_NoCar-01.png create mode 100644 homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png delete mode 100644 homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png create mode 100644 homescreen/qml/images/Home/AGL_HMI_Blue_Background_Car-01.png delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg delete mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png create mode 100644 homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg create mode 100644 homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg delete mode 100644 homescreen/qml/images/Utility_Logo_Colour-01.png create mode 100644 homescreen/qml/images/Utility_Logo_Grey-01.svg diff --git a/homescreen/qml/Home.qml b/homescreen/qml/Home.qml index 729ef36..287b250 100644 --- a/homescreen/qml/Home.qml +++ b/homescreen/qml/Home.qml @@ -26,7 +26,7 @@ Item { anchors.fill: parent anchors.topMargin: -218 anchors.bottomMargin: -215 - source: './images/AGL_HMI_Background_Car-01.png' + source: './images/AGL_HMI_Blue_Background_Car-01.png' } property int pid: -1 diff --git a/homescreen/qml/IconItem.qml b/homescreen/qml/IconItem.qml index 32d37b4..c616722 100644 --- a/homescreen/qml/IconItem.qml +++ b/homescreen/qml/IconItem.qml @@ -30,7 +30,7 @@ Item { text: model.icon == 'Blank' ? model.name.toUpperCase() : '' } - source: './images/HMI_AppLauncher_%1_%2-01.png'.arg(model.icon).arg(loc.pressed && (loc.index === model.index || loc.currentId === model.id) ? 'Active' : 'Inactive') + 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 } } diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 97f98ae..182b168 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -42,7 +42,7 @@ Image { Image { id: logo_image anchors.centerIn: parent - source: './images/Utility_Logo_Colour-01.png' + source: './images/Utility_Logo_Grey-01.svg' } Timer { diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml index 6f8e05e..c6f5a4e 100644 --- a/homescreen/qml/ShortcutIcon.qml +++ b/homescreen/qml/ShortcutIcon.qml @@ -26,11 +26,11 @@ MouseArea { Image { id: icon anchors.fill: parent - source: './images/Shortcut/HMI_Shortcut_%1-01.png'.arg(root.name) + source: './images/Shortcut/HMI_Shortcut_%1-01.svg'.arg(root.name) } Image { anchors.fill: parent - source: './images/Shortcut/HMI_Shortcut_%1_Active-01.png'.arg(root.name) + source: './images/Shortcut/HMI_Shortcut_%1_Active-01.svg'.arg(root.name) opacity: 1.0 - icon.opacity } states: [ diff --git a/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png b/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png deleted file mode 100644 index 595f742..0000000 Binary files a/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png and /dev/null differ diff --git a/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png b/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png new file mode 100644 index 0000000..357c204 Binary files /dev/null and b/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png differ diff --git a/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png b/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png deleted file mode 100644 index b0072d8..0000000 Binary files a/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/AGL_HMI_Blue_Background_Car-01.png b/homescreen/qml/images/Home/AGL_HMI_Blue_Background_Car-01.png new file mode 100644 index 0000000..ef0690b Binary files /dev/null and b/homescreen/qml/images/Home/AGL_HMI_Blue_Background_Car-01.png differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png deleted file mode 100644 index 888d0bd..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg new file mode 100644 index 0000000..a5be521 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.svg @@ -0,0 +1,100 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png deleted file mode 100644 index ab83b0e..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg new file mode 100644 index 0000000..84509f6 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.svg @@ -0,0 +1,80 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png deleted file mode 100644 index 11d39e5..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg new file mode 100644 index 0000000..0fb66d3 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.svg @@ -0,0 +1,112 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png deleted file mode 100644 index 6c0b914..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg new file mode 100644 index 0000000..8b545a7 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.svg @@ -0,0 +1,66 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png deleted file mode 100644 index efc11e9..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg new file mode 100644 index 0000000..eef3b6d --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.svg @@ -0,0 +1,678 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png deleted file mode 100644 index b528376..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg new file mode 100644 index 0000000..09b376c --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.svg @@ -0,0 +1,658 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png deleted file mode 100644 index 1c99ac4..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg new file mode 100644 index 0000000..94509ad --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.svg @@ -0,0 +1,75 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png deleted file mode 100644 index 0bed61d..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg new file mode 100644 index 0000000..ac988ca --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.svg @@ -0,0 +1,57 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png deleted file mode 100644 index 41c499d..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg new file mode 100644 index 0000000..e534fbd --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.svg @@ -0,0 +1,138 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png deleted file mode 100644 index 93f81af..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg new file mode 100644 index 0000000..1517890 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.svg @@ -0,0 +1,118 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png deleted file mode 100644 index e7ad085..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg new file mode 100644 index 0000000..0235569 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.svg @@ -0,0 +1,104 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png deleted file mode 100644 index dd40750..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg new file mode 100644 index 0000000..3b13170 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.svg @@ -0,0 +1,84 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png deleted file mode 100644 index 2df01d3..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg new file mode 100644 index 0000000..4bd0842 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.svg @@ -0,0 +1,262 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png deleted file mode 100644 index ec62b87..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg new file mode 100644 index 0000000..8983c2f --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.svg @@ -0,0 +1,253 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png deleted file mode 100644 index 2150581..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg new file mode 100644 index 0000000..996933c --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.svg @@ -0,0 +1,72 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png deleted file mode 100644 index 61dcedc..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg new file mode 100644 index 0000000..1f073ff --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.svg @@ -0,0 +1,52 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png deleted file mode 100644 index 1aa5a01..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg new file mode 100644 index 0000000..7133b40 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.svg @@ -0,0 +1,158 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png deleted file mode 100644 index 616983e..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg new file mode 100644 index 0000000..4441736 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.svg @@ -0,0 +1,138 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png deleted file mode 100644 index 1d13fd6..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg new file mode 100644 index 0000000..65d7566 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.svg @@ -0,0 +1,88 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png deleted file mode 100644 index 027f1fe..0000000 Binary files a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png and /dev/null differ diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg new file mode 100644 index 0000000..59f27f9 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.svg @@ -0,0 +1,68 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc index ecf9b77..a9db5c2 100644 --- a/homescreen/qml/images/Home/home.qrc +++ b/homescreen/qml/images/Home/home.qrc @@ -1,26 +1,26 @@ - AGL_HMI_Background_Car-01.png - HMI_AppLauncher_Connectivity_Active-01.png - HMI_AppLauncher_Connectivity_Inactive-01.png - HMI_AppLauncher_Dashboard_Active-01.png - HMI_AppLauncher_Dashboard_Inactive-01.png - HMI_AppLauncher_HVAC_Active-01.png - HMI_AppLauncher_HVAC_Inactive-01.png - HMI_AppLauncher_Mixer_Active-01.png - HMI_AppLauncher_Mixer_Inactive-01.png - HMI_AppLauncher_MediaPlayer_Active-01.png - HMI_AppLauncher_MediaPlayer_Inactive-01.png - HMI_AppLauncher_Navigation_Active-01.png - HMI_AppLauncher_Navigation_Inactive-01.png - HMI_AppLauncher_Phone_Active-01.png - HMI_AppLauncher_Phone_Inactive-01.png - HMI_AppLauncher_POI_Active-01.png - HMI_AppLauncher_POI_Inactive-01.png - HMI_AppLauncher_Radio_Active-01.png - HMI_AppLauncher_Radio_Inactive-01.png - HMI_AppLauncher_Settings_Active-01.png - HMI_AppLauncher_Settings_Inactive-01.png + 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.png HMI_AppLauncher_Blank_Inactive-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg new file mode 100644 index 0000000..5c76e85 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.svg @@ -0,0 +1,600 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg new file mode 100644 index 0000000..46be46b --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.svg @@ -0,0 +1,614 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg new file mode 100644 index 0000000..b6eab24 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.svg @@ -0,0 +1,73 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg new file mode 100644 index 0000000..e85c7d8 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.svg @@ -0,0 +1,82 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg new file mode 100644 index 0000000..de7448d --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.svg @@ -0,0 +1,50 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg new file mode 100644 index 0000000..16e3af5 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.svg @@ -0,0 +1,63 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg new file mode 100644 index 0000000..6f6f1e0 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.svg @@ -0,0 +1,77 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg new file mode 100644 index 0000000..9076934 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.svg @@ -0,0 +1,90 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg new file mode 100644 index 0000000..5c76e85 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.svg @@ -0,0 +1,600 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg new file mode 100644 index 0000000..46be46b --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.svg @@ -0,0 +1,614 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/Shortcut/shortcut.qrc b/homescreen/qml/images/Shortcut/shortcut.qrc index 1b4d424..0710973 100644 --- a/homescreen/qml/images/Shortcut/shortcut.qrc +++ b/homescreen/qml/images/Shortcut/shortcut.qrc @@ -1,14 +1,14 @@ - HMI_Shortcut_Home_Active-01.png - HMI_Shortcut_Home-01.png - HMI_Shortcut_HVAC_Active-01.png - HMI_Shortcut_HVAC-01.png - HMI_Shortcut_MediaPlayer_Active-01.png - HMI_Shortcut_MediaPlayer-01.png - HMI_Shortcut_Navigation_Active-01.png - HMI_Shortcut_Navigation-01.png - HMI_Shortcut_Radio_Active-01.png - HMI_Shortcut_Radio-01.png + 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 diff --git a/homescreen/qml/images/Utility_Logo_Colour-01.png b/homescreen/qml/images/Utility_Logo_Colour-01.png deleted file mode 100644 index 6519a2d..0000000 Binary files a/homescreen/qml/images/Utility_Logo_Colour-01.png and /dev/null differ diff --git a/homescreen/qml/images/Utility_Logo_Grey-01.svg b/homescreen/qml/images/Utility_Logo_Grey-01.svg new file mode 100644 index 0000000..16ac88c --- /dev/null +++ b/homescreen/qml/images/Utility_Logo_Grey-01.svg @@ -0,0 +1,84 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homescreen/qml/images/images.qrc b/homescreen/qml/images/images.qrc index 2d8e902..fb991aa 100644 --- a/homescreen/qml/images/images.qrc +++ b/homescreen/qml/images/images.qrc @@ -2,9 +2,9 @@ TopSection_NoText_NoIcons-01.png Utility_Logo_Background-01.png - Utility_Logo_Colour-01.png + Utility_Logo_Grey-01.svg Utility_Music_Background-01.png Utility_Radio_Background-01.png - AGL_HMI_Background_NoCar-01.png + AGL_HMI_Blue_Background_NoCar-01.png diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml index 11bd9d5..899cb6d 100644 --- a/homescreen/qml/main.qml +++ b/homescreen/qml/main.qml @@ -37,7 +37,7 @@ Window { width: 1080 height: 1920 scale: 1.0 - source: './images/AGL_HMI_Background_NoCar-01.png' + source: './images/AGL_HMI_Blue_Background_NoCar-01.png' ColumnLayout { anchors.fill: parent @@ -63,6 +63,7 @@ Window { Layout.fillHeight: true Layout.preferredHeight: 1920 - 218 - 215 visible: true + z: -1 } MediaArea { diff --git a/homescreen/src/applicationmodel.cpp b/homescreen/src/applicationmodel.cpp index 8837ba9..6d32d27 100644 --- a/homescreen/src/applicationmodel.cpp +++ b/homescreen/src/applicationmodel.cpp @@ -49,8 +49,8 @@ namespace { icon[0] = icon[0].toUpper(); } - if ( !QFile::exists(QString(":/images/HMI_AppLauncher_%1_Active-01.png").arg(icon)) || - !QFile::exists(QString(":/images/HMI_AppLauncher_%1_Inactive-01.png").arg(icon)) ) + 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)) ) { icon = "Blank"; } -- cgit 1.2.3-korg