update
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Thu, 30 May 2019 03:40:01 +0000 (11:40 +0800)
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Thu, 30 May 2019 03:40:01 +0000 (11:40 +0800)
Change-Id: I04732e6f7b1c6fac93d81f0c0451cca96c6ba573

133 files changed:
autobuild/agl/autobuild [deleted file]
autobuild/linux/autobuild [deleted file]
homescreen/docs/api-services-book.yml [deleted file]
homescreen/docs/homescreen-book.yml [deleted file]
homescreen/docs/homescreen_api.md [deleted file]
homescreen/docs/index.md [deleted file]
homescreen/docs/pictures/api_getAllSurfacesOfProcess.png [deleted file]
homescreen/docs/pictures/api_getSurfaceStatus_1.png [deleted file]
homescreen/docs/pictures/api_getSurfaceStatus_2.png [deleted file]
homescreen/docs/pictures/api_getSurfaceStatus_3.png [deleted file]
homescreen/docs/pictures/api_hardKeyPressed.png [deleted file]
homescreen/docs/pictures/api_renderSurfaceToArea.png [deleted file]
homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png [deleted file]
homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png [deleted file]
homescreen/docs/pictures/api_surfaceVisibilityChanged.png [deleted file]
homescreen/docs/pictures/dashboard.png [deleted file]
homescreen/docs/pictures/full/dashboard.png [deleted file]
homescreen/docs/pictures/full/homescreen_applauncher.png [deleted file]
homescreen/docs/pictures/full/hvac.png [deleted file]
homescreen/docs/pictures/full/phone.png [deleted file]
homescreen/docs/pictures/full/settings.png [deleted file]
homescreen/docs/pictures/homescreen_applauncher.png [deleted file]
homescreen/docs/pictures/hvac.png [deleted file]
homescreen/docs/pictures/phone.png [deleted file]
homescreen/docs/pictures/settings.png [deleted file]
homescreen/helpers [deleted submodule]
homescreen/homescreen.pro
homescreen/qml/MediaArea.qml [deleted file]
homescreen/qml/MediaAreaBlank.qml [deleted file]
homescreen/qml/MediaAreaMusic.qml [deleted file]
homescreen/qml/MediaAreaRadio.qml [deleted file]
homescreen/qml/ShortcutArea.qml
homescreen/qml/ShortcutIcon.qml
homescreen/qml/StatusArea.qml
homescreen/qml/TopArea.qml
homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png [deleted file]
homescreen/qml/images/AGL_HMI_Normal_Background.png [deleted file]
homescreen/qml/images/MediaMusic/AlbumArtwork.png [deleted file]
homescreen/qml/images/MediaMusic/BackArrow.png [deleted file]
homescreen/qml/images/MediaMusic/ForwardArrow.png [deleted file]
homescreen/qml/images/MediaMusic/ShuffleIcon.png [deleted file]
homescreen/qml/images/MediaMusic/Volume_Loud.png [deleted file]
homescreen/qml/images/MediaMusic/Volume_Medium.png [deleted file]
homescreen/qml/images/MediaMusic/Volume_Off.png [deleted file]
homescreen/qml/images/MediaMusic/mediamusic.qrc [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/Albums_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/Albums_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/DividingLine.png [deleted file]
homescreen/qml/images/MediaPlayer/GreenLine.png [deleted file]
homescreen/qml/images/MediaPlayer/Music_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/Music_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/Podcasts_Active.png [deleted file]
homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png [deleted file]
homescreen/qml/images/MediaPlayer/Popup_Highlight.png [deleted file]
homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png [deleted file]
homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png [deleted file]
homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png [deleted file]
homescreen/qml/images/MediaPlayer/X.png [deleted file]
homescreen/qml/images/MediaPlayer/mediaplayer.qrc [deleted file]
homescreen/qml/images/Shortcut/blank.svg [deleted file]
homescreen/qml/images/Shortcut/blank_active.svg [deleted file]
homescreen/qml/images/Shortcut/hvac.svg [deleted file]
homescreen/qml/images/Shortcut/hvac_active.svg [deleted file]
homescreen/qml/images/Shortcut/launcher.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/launcher.svg [deleted file]
homescreen/qml/images/Shortcut/launcher_active.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/launcher_active.svg [deleted file]
homescreen/qml/images/Shortcut/mediaplayer.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/mediaplayer.svg [deleted file]
homescreen/qml/images/Shortcut/mediaplayer_active.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/mediaplayer_active.svg [deleted file]
homescreen/qml/images/Shortcut/music.svg [new file with mode: 0644]
homescreen/qml/images/Shortcut/navigation.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/navigation.svg
homescreen/qml/images/Shortcut/navigation_active.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/navigation_active.svg [deleted file]
homescreen/qml/images/Shortcut/phone.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/phone_active.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/sdl_usb.svg [deleted file]
homescreen/qml/images/Shortcut/sdl_usb_active.svg [deleted file]
homescreen/qml/images/Shortcut/settings.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/settings_active.png [new file with mode: 0644]
homescreen/qml/images/Shortcut/shortcut.qrc
homescreen/qml/images/Shortcut/video.svg [deleted file]
homescreen/qml/images/Shortcut/video_active.svg [deleted file]
homescreen/qml/images/TopSection_NoText_NoIcons-01.svg [deleted file]
homescreen/qml/images/Utility_Logo_Background-01.svg [deleted file]
homescreen/qml/images/Utility_Logo_Grey-01.svg [deleted file]
homescreen/qml/images/Utility_Music_Background-01.png [deleted file]
homescreen/qml/images/Utility_Radio_Background-01.png [deleted file]
homescreen/qml/images/images.qrc
homescreen/qml/images/menubar_background.png [new file with mode: 0644]
homescreen/qml/images/menubar_full_background.png [moved from homescreen/qml/images/AGL_HMI_Full_Background.png with 51% similarity]
homescreen/qml/images/menubar_normal_background.png [new file with mode: 0644]
homescreen/qml/images/normal_disable.png [deleted file]
homescreen/qml/images/split_switch.png [new file with mode: 0644]
homescreen/qml/images/split_switch_disable.png [new file with mode: 0644]
homescreen/qml/main.qml
homescreen/qml/qml.qrc
homescreen/src/applicationlauncher.cpp
homescreen/src/homescreenhandler.cpp
homescreen/src/homescreenhandler.h
homescreen/src/main.cpp
homescreen/src/mastervolume.cpp [deleted file]
homescreen/src/mastervolume.h [deleted file]
homescreen/src/shortcutappmodel.cpp [deleted file]
homescreen/src/shortcutappmodel.h [deleted file]
homescreen/src/statusbarmodel.cpp
homescreen/src/toucharea.cpp
package/config.xml
package/etc/registeredApp.aaa.json [deleted file]
package/etc/registeredApp.json [deleted file]
package/package.pro

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
deleted file mode 100755 (executable)
index e87a1c3..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015 - 2018 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DEST      := ${BUILD_DIR}
-
-.PHONY: all clean distclean configure build package help
-
-all: help
-
-help:
-       @echo "List of targets available:"
-       @echo ""
-       @echo "- all"
-       @echo "- clean"
-       @echo "- distclean"
-       @echo "- configure"
-       @echo "- build: compilation, link and prepare files for package into a widget"
-       @echo "- package: output a widget file '*.wgt'"
-       @echo "- install: install in your INSTALL_ROOT directory"
-       @echo ""
-       @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
-       @echo "Don't use your build dir as DEST as wgt file is generated at this location"
-
-clean:
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
-
-distclean:
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean
-
-configure:
-       @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-       @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
-
-build: configure
-       @make -C ${BUILD_DIR} ${BUILD_ARGS} all
-
-package: build
-       @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
-               mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
-       fi
-
-install: build
-       @make -C ${BUILD_DIR} ${INSTALL_ARGS} install
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
deleted file mode 100755 (executable)
index 9ec2f6e..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015 - 2018 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DEST      := ${BUILD_DIR}
-
-.PHONY: all clean distclean configure build package help
-
-all: help
-
-help:
-       @echo "List of targets available:"
-       @echo ""
-       @echo "- all"
-       @echo "- clean"
-       @echo "- distclean"
-       @echo "- configure"
-       @echo "- build: compilation, link and prepare files for package into a widget" 
-       @echo "- package: output a widget file '*.wgt'"
-       @echo "- install: install in your defined DEST directory"
-       @echo ""
-       @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
-       @echo "Don't use your build dir as DEST as wgt file is generated at this location" 
-
-clean:
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
-
-distclean:
-       @[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean
-
-configure:
-       @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-       @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
-
-build: configure
-       @make -C ${BUILD_DIR} ${BUILD_ARGS} all
-
-package: build
-       @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
-               mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
-       fi
-
-install: build
-       @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-               mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \
-       fi
-
diff --git a/homescreen/docs/api-services-book.yml b/homescreen/docs/api-services-book.yml
deleted file mode 100644 (file)
index 5a0d43a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-type: books
-books:
--
-    id: homescreen
-    title: HomeScreen (old)
-    description: Homescreen documentation
-    keywords:
-    author: "TOYOTA MOTOR CORPORATION"
-    version: master
-    chapters:
-    - url: homescreen_api.md
-      name: HomeScreen API
\ No newline at end of file
diff --git a/homescreen/docs/homescreen-book.yml b/homescreen/docs/homescreen-book.yml
deleted file mode 100644 (file)
index acc740d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-type: books
-books:
--
-    id: homescreen
-    title: HomeScreen
-    description: HomeScreen documentation
-    keywords:
-    author:
-    version: master
-    chapters:
-      - url: index.md
-        name: Overview
diff --git a/homescreen/docs/homescreen_api.md b/homescreen/docs/homescreen_api.md
deleted file mode 100644 (file)
index 8f7b8f4..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-# HomeScreen API\r
-The HomeScreen app provides an own interface for some special use cases concerning the surfaces and user inputs.\r
-\r
-The interface is implemented as D-Bus interface.\r
-This is the introspection, describing the interface:\r
-\r
-```\r
-<node>\r
-       <interface name="org.agl.homescreen">\r
-               <method name="hardKeyPressed">\r
-                       <arg name="key" type="i" direction="in"/>\r
-               </method>\r
-               <method name="getSurfaceStatus">\r
-                       <arg name="surfaceId" type="i" direction="in"/>\r
-                       <arg name="status" type="i" direction="out"/>\r
-               </method>\r
-               <method name="requestSurfaceIdToFullScreen">\r
-                       <arg name="surfaceId" type="i" direction="in"/>\r
-               </method>\r
-               <method name="getAllSurfacesOfProcess">\r
-                       <arg name="pid" type="i" direction="in"/>\r
-                       <arg name="surfaceIds" type="ai" direction="out"/>\r
-                       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>\r
-               </method>\r
-               <method name="getLayoutRenderAreaForSurfaceId">\r
-                       <arg name="surfaceId" type="i" direction="in"/>\r
-                       <arg name="renderArea" type="(iiii)" direction="out"/>\r
-                       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QRect"/>\r
-               </method>\r
-               <method name="renderSurfaceToAreaAllowed">\r
-                       <arg name="surfaceId" type="i" direction="in"/>\r
-                       <arg name="layoutArea" type="i" direction="in"/>\r
-                       <arg name="allowed" type="b" direction="out"/>\r
-               </method>\r
-               <method name="renderSurfaceToArea">\r
-                       <arg name="surfaceId" type="i" direction="in"/>\r
-                       <arg name="layoutArea" type="i" direction="in"/>\r
-               </method>\r
-       </interface>\r
-</node>\r
-```\r
-\r
-These interface will change during further development, so check back frequently.\r
-\r
-## User Input Events API calls\r
-\r
-### hardKeyPressed\r
-\r
-Use hardKeyPressed to inject hard key press events into the HomeScreen app.\r
-This Interface call can be used by applications like the InputEventManager to inject hard keys into the HomeScreen application.\r
-\r
-#### Example\r
-\r
-if someone presses the Hard Key “NAV” on the target, this key may be injected using this interface to make the HomeScreen launch the navigation application.\r
-Right now, only a few keys are defined (in inputevent.hpp):\r
-\r
-```\r
-namespace InputEvent {\r
-    typedef enum HardKey\r
-    {\r
-        HARDKEY_UNDEFINED,\r
-        HARDKEY_NAV,\r
-        HARDKEY_MEDIA\r
-    } eHardKey;\r
-}\r
-```\r
-\r
-This will change in the future.\r
\r
-![hardKeyPressed](pictures/api_hardKeyPressed.png)\r
\r
-A “normal” application would not need to call this API.\r
-\r
-## Surface control API calls\r
-\r
-The normal use case when starting an application is:\r
-The user presses a hard key or uses the app launcher to start an app. The app is then started and is shown full screen.\r
-The org.agl.homescreen API provides some methods to get information about some status and some methods to show surfaces on the screen.\r
-\r
-### getSurfaceStatus\r
-\r
-A surface can be visible or invisible (please do not confuse “visible” and “visibility”). This function allows to request the current status.\r
-\r
-```\r
-<method name="getSurfaceStatus">\r
-       <arg name="surfaceId" type="i" direction="in"/>\r
-       <arg name="status" type="i" direction="out"/>\r
-</method>\r
-```\r
-\r
-Right now an application has to pull this information.\r
-This is not optimal and will change in the future. There are two options:\r
-\r
- - The homescreen API will provide a signal that is emitted every time the visible status of surfaces changes. This would be way more efficient, because it would save time and avoid a re-occurring API call. __UPDATE:__ There is a D-Bus signal implemented in this API\r
- - For Qt, there is already a patch available that provides this information as a base class property. See https://codereview.qt-project.org/#/c/176211/ This would be optimal for Qt widget applications. But not useful for other languages, e.g. Java. __UPDATE:__ This patch got reverted in AGL!\r
-\r
-#### Current implementation\r
\r
-![getSurfaceStatus](pictures/api_getSurfaceStatus_1.png)\r
\r
-#### Option 1\r
-\r
-![getSurfaceStatus](pictures/api_getSurfaceStatus_2.png)\r
-\r
-#### Option 2\r
-\r
-![getSurfaceStatus](pictures/api_getSurfaceStatus_3.png)\r
-\r
-### requestSurfaceIdToFullScreen\r
-\r
-This function will set the given surface to full screen.\r
-\r
-```\r
-<method name="requestSurfaceIdToFullScreen">\r
-       <arg name="surfaceId" type="i" direction="in"/>\r
-</method>\r
-```\r
-\r
-It will hide all other surfaces.\r
-\r
-![requestSurfaceIdToFullScreen](pictures/api_requestSurfaceIdToFullScreen.png)\r
\r
-### getAllSurfacesOfProcess\r
-\r
-This returns all surfaces that are created by the given process ID.\r
-\r
-```\r
-<method name="getAllSurfacesOfProcess">\r
-       <arg name="pid" type="i" direction="in"/>\r
-       <arg name="surfaceIds" type="ai" direction="out"/>\r
-       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>\r
-</method>\r
-```\r
-\r
-A process can create more than one surface. By default, the surface with the lowest surface ID is shown on the screen. If an application wants to know all surfaces that were created by an application, this method will provide them.\r
-\r
-![getAllSurfacesOfProcess](pictures/api_getAllSurfacesOfProcess.png)\r
-\r
-### renderSurfaceToAreaAllowed\r
-\r
-Before calling renderSurfaceToArea, an application can request, if it is allowed to render the surface to this area. This makes sense for an application that would begin to allocate resources to render. But if it is not allowed to render the surface, the application could avoid allocating the resources.\r
-\r
-```\r
-<method name="renderSurfaceToAreaAllowed">\r
-       <arg name="surfaceId" type="i" direction="in"/>\r
-       <arg name="layoutArea" type="i" direction="in"/>\r
-       <arg name="allowed" type="b" direction="out"/>\r
-</method>\r
-```\r
-\r
-The call will not affect the current setup, it will only request if it is allowed or not.\r
-\r
-![renderSurfaceToAreaAllowed](pictures/api_renderSurfaceToAreaAllowed.png)\r
-\r
-### renderSurfaceToArea\r
-\r
-By default, the HomeScreen application decides, where to render an applications surface. The concept of Layouts defines this. This API call can override the default behavior. An app can request to render a surface in a specific Layout Area.\r
-\r
-```\r
-<method name="renderSurfaceToArea">\r
-       <arg name="surfaceId" type="i" direction="in"/>\r
-       <arg name="layoutArea" type="i" direction="in"/>\r
-</method>\r
-```\r
-\r
-The surface that was previously rendered in this Layout are will be hidden.\r
-\r
-![renderSurfaceToArea](pictures/api_renderSurfaceToArea.png)\r
-\r
-The homescreen interface functionality is not fully implemented, but the API is available. For example using the libhomescreen.so.\r
-\r
-### surfaceVisibilityChanged\r
-\r
-Whenever the visibility property of a surface changes, this signal is emitted.\r
-\r
-```\r
-<signal name="surfaceVisibilityChanged">\r
-       <arg name="surfaceId" type="i"/>\r
-       <arg name="visible" type="b"/>\r
-</signal>\r
-```\r
-\r
-Visibility here means visible. The name of the signal is from the Weston surface property “visibility”.\r
-See here for reference: https://github.com/ntanibata/wayland-ivi-extension/blob/master/ivi-layermanagement-api/ilmCommon/include/ilm_types.h\r
\r
-![surfaceVisibilityChanged](pictures/api_surfaceVisibilityChanged.png)\r
diff --git a/homescreen/docs/index.md b/homescreen/docs/index.md
deleted file mode 100644 (file)
index 4322255..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# Welcome to your AGL system!
-When booting up an AGL system, the first thing that your eyes will spot is this:
-
-![AGL HomeScreen Application Launcher](pictures/homescreen_applauncher.png)
-
-**The AGL HomeScreen!**
-
-Intended to be used with touch presses, the reference HMI provides access to all pre-installed AGL demo applications as well as in the future access to user installed apps. The list of demo apps contains some automotive applications like HVAC-control, Navigation or Dashboard, as well as some infotainment apps. Radio, Multimedia, Phone...
-This applications are already available and were presented at CES 2017.
-
-## Here are some screenshots of the pre-installed demo applications:
-
-## HVAC
-
-![AGL HVAC](pictures/hvac.png)
-
-## Phone
-
-![AGL Phone](pictures/phone.png)
-
-## Dashboard
-
-![AGL Dashboard](pictures/dashboard.png)
-
-## Settings
-
-![AGL Settings](pictures/settings.png)
-
-#### Note:
-* All current demos (including HomeScreen) are optimized for landscape full HD resolution (1080x1920).
-
diff --git a/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png b/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png
deleted file mode 100644 (file)
index 5c862d7..0000000
Binary files a/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_1.png b/homescreen/docs/pictures/api_getSurfaceStatus_1.png
deleted file mode 100644 (file)
index 1e18fcf..0000000
Binary files a/homescreen/docs/pictures/api_getSurfaceStatus_1.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_2.png b/homescreen/docs/pictures/api_getSurfaceStatus_2.png
deleted file mode 100644 (file)
index e66d708..0000000
Binary files a/homescreen/docs/pictures/api_getSurfaceStatus_2.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_3.png b/homescreen/docs/pictures/api_getSurfaceStatus_3.png
deleted file mode 100644 (file)
index 50a3b10..0000000
Binary files a/homescreen/docs/pictures/api_getSurfaceStatus_3.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_hardKeyPressed.png b/homescreen/docs/pictures/api_hardKeyPressed.png
deleted file mode 100644 (file)
index a8a3660..0000000
Binary files a/homescreen/docs/pictures/api_hardKeyPressed.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_renderSurfaceToArea.png b/homescreen/docs/pictures/api_renderSurfaceToArea.png
deleted file mode 100644 (file)
index a61fc2f..0000000
Binary files a/homescreen/docs/pictures/api_renderSurfaceToArea.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png b/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png
deleted file mode 100644 (file)
index 35dbbcf..0000000
Binary files a/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png b/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png
deleted file mode 100644 (file)
index 6d2f712..0000000
Binary files a/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png and /dev/null differ
diff --git a/homescreen/docs/pictures/api_surfaceVisibilityChanged.png b/homescreen/docs/pictures/api_surfaceVisibilityChanged.png
deleted file mode 100644 (file)
index f519757..0000000
Binary files a/homescreen/docs/pictures/api_surfaceVisibilityChanged.png and /dev/null differ
diff --git a/homescreen/docs/pictures/dashboard.png b/homescreen/docs/pictures/dashboard.png
deleted file mode 100644 (file)
index 527386d..0000000
Binary files a/homescreen/docs/pictures/dashboard.png and /dev/null differ
diff --git a/homescreen/docs/pictures/full/dashboard.png b/homescreen/docs/pictures/full/dashboard.png
deleted file mode 100644 (file)
index e947734..0000000
Binary files a/homescreen/docs/pictures/full/dashboard.png and /dev/null differ
diff --git a/homescreen/docs/pictures/full/homescreen_applauncher.png b/homescreen/docs/pictures/full/homescreen_applauncher.png
deleted file mode 100644 (file)
index b61884a..0000000
Binary files a/homescreen/docs/pictures/full/homescreen_applauncher.png and /dev/null differ
diff --git a/homescreen/docs/pictures/full/hvac.png b/homescreen/docs/pictures/full/hvac.png
deleted file mode 100644 (file)
index 7e0399a..0000000
Binary files a/homescreen/docs/pictures/full/hvac.png and /dev/null differ
diff --git a/homescreen/docs/pictures/full/phone.png b/homescreen/docs/pictures/full/phone.png
deleted file mode 100644 (file)
index f4cc547..0000000
Binary files a/homescreen/docs/pictures/full/phone.png and /dev/null differ
diff --git a/homescreen/docs/pictures/full/settings.png b/homescreen/docs/pictures/full/settings.png
deleted file mode 100644 (file)
index a115ef4..0000000
Binary files a/homescreen/docs/pictures/full/settings.png and /dev/null differ
diff --git a/homescreen/docs/pictures/homescreen_applauncher.png b/homescreen/docs/pictures/homescreen_applauncher.png
deleted file mode 100644 (file)
index e168668..0000000
Binary files a/homescreen/docs/pictures/homescreen_applauncher.png and /dev/null differ
diff --git a/homescreen/docs/pictures/hvac.png b/homescreen/docs/pictures/hvac.png
deleted file mode 100644 (file)
index f9a6030..0000000
Binary files a/homescreen/docs/pictures/hvac.png and /dev/null differ
diff --git a/homescreen/docs/pictures/phone.png b/homescreen/docs/pictures/phone.png
deleted file mode 100644 (file)
index e087594..0000000
Binary files a/homescreen/docs/pictures/phone.png and /dev/null differ
diff --git a/homescreen/docs/pictures/settings.png b/homescreen/docs/pictures/settings.png
deleted file mode 100644 (file)
index c92d835..0000000
Binary files a/homescreen/docs/pictures/settings.png and /dev/null differ
diff --git a/homescreen/helpers b/homescreen/helpers
deleted file mode 160000 (submodule)
index b3a54dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3a54dd8653fa672650229dd2498308ffcc3e943
index 0de8e03..a443fdf 100644 (file)
@@ -18,7 +18,9 @@ TARGET = HomeScreen
 QT = qml quick dbus websockets
 CONFIG += c++11 link_pkgconfig
 DESTDIR = $${OUT_PWD}/../package/root/bin
-PKGCONFIG += qlibwindowmanager qlibhomescreen qtappfw afb-helpers-qt
+PKGCONFIG += libwindowmanager qtappfw
+
+LIBS += -lqthomescreen -lwindowmanager
 
 include(../interfaces/interfaces.pri)
 
@@ -27,26 +29,20 @@ SOURCES += \
     src/statusbarmodel.cpp \
     src/statusbarserver.cpp \
     src/applicationlauncher.cpp \
-    src/mastervolume.cpp \
     src/homescreenhandler.cpp \
-    src/toucharea.cpp \
-    src/shortcutappmodel.cpp
+    src/toucharea.cpp
 
 HEADERS  += \
     src/statusbarmodel.h \
     src/statusbarserver.h \
     src/applicationlauncher.h \
-    src/mastervolume.h \
     src/homescreenhandler.h \
-    src/toucharea.h \
-    src/shortcutappmodel.h
+    src/toucharea.h
 
 OTHER_FILES += \
     README.md
 
 RESOURCES += \
-    qml/images/MediaPlayer/mediaplayer.qrc \
-    qml/images/MediaMusic/mediamusic.qrc \
     qml/images/Weather/weather.qrc \
     qml/images/Shortcut/shortcut.qrc \
     qml/images/Status/status.qrc \
diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml
deleted file mode 100644 (file)
index 0447589..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-import QtQuick.Controls 2.0
-
-StackView {
-    id: root
-    width: 1080
-    height: 215
-
-    initialItem: blank
-
-    Component {
-        id: blank
-        MediaAreaBlank {
-//            MouseArea {
-//                anchors.fill: parent
-//                onClicked: root.push(mouse.x < 540 ? music : radio)
-//            }
-        }
-    }
-
-    Component {
-        id: music
-        MediaAreaMusic {
-            MouseArea {
-                anchors.fill: parent
-                onClicked: root.pop()
-            }
-        }
-    }
-
-    Component {
-        id: radio
-        MediaAreaRadio {
-            MouseArea {
-                anchors.fill: parent
-                onClicked: root.pop()
-            }
-        }
-    }
-}
diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml
deleted file mode 100644 (file)
index 347c26a..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
-import AGL.Demo.Controls 1.0
-import MasterVolume 1.0
-
-Image {
-    width: 1080
-    height: 215
-    source: './images/Utility_Logo_Background-01.svg'
-    property bool displayVolume: false;
-
-    MouseArea {
-        anchors.fill: parent
-        function enableVolumeDisplay() {
-            if (!displayVolume) {
-                displayVolume = true
-                master_volume.visible = true
-                volume_timer.restart()
-            }
-        }
-        onClicked: enableVolumeDisplay()
-    }
-
-    Image {
-    id: logo_image
-        anchors.centerIn: parent
-        source: './images/Utility_Logo_Grey-01.svg'
-    }
-
-    Timer {
-        id: volume_timer
-        interval: 5000; running: false; repeat: false
-        onTriggered: displayVolume = false
-    }
-
-    states: [
-    State { when: displayVolume;
-    PropertyChanges { target: master_volume; opacity: 1.0 }
-    PropertyChanges { target: slider; enabled: true }
-    PropertyChanges { target: logo_image; opacity: 0.0 }
-    },
-    State { when: !displayVolume;
-    PropertyChanges { target: master_volume; opacity: 0.0 }
-    PropertyChanges { target: slider; enabled: false }
-    PropertyChanges { target: logo_image; opacity: 1.0 }
-    }
-    ]
-
-    transitions: Transition {
-    NumberAnimation { property: "opacity"; duration: 500}
-    }
-
-    MasterVolume {
-        id: mv
-        objectName: "mv"
-        onVolumeChanged: slider.value = volume
-        Component.onCompleted: {
-            mv.open(bindingAddress);
-        }
-    }
-
-    Item {
-        id: master_volume
-        anchors.fill: parent
-        anchors.centerIn: parent
-        visible: false
-
-        Label {
-            font.pixelSize: 36
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: "white"
-            text: qsTr("Active Volume")
-        }
-
-        RowLayout {
-            anchors.fill: parent
-            anchors.centerIn: parent
-            anchors.margins: 20
-            spacing: 20
-            Label {
-                font.pixelSize: 36
-                color: "white"
-                text: "0 %"
-            }
-            Slider {
-                id: slider
-                Layout.fillWidth: true
-                from: 0
-                to: 100
-                stepSize: 1
-                snapMode: Slider.SnapOnRelease
-                onValueChanged: mv.volume = value
-                Component.onCompleted: value = mv.volume
-                onPressedChanged: {
-                    if (pressed) {volume_timer.stop()}
-                    else {volume_timer.restart()}
-                }
-            }
-            Label {
-                font.pixelSize: 36
-                color: "white"
-                text: "100 %"
-            }
-        }
-    }
-}
diff --git a/homescreen/qml/MediaAreaMusic.qml b/homescreen/qml/MediaAreaMusic.qml
deleted file mode 100644 (file)
index c0408e6..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
-
-Image {
-    width: 1080
-    height: 215
-    source: './images/Utility_Music_Background-01.png'
-
-    ColumnLayout {
-        anchors.fill: parent
-        spacing: 1
-        RowLayout {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.preferredHeight: 107
-            spacing: 10
-            Image {
-                source: './images/MediaMusic/AlbumArtwork.png'
-                width: 105.298
-                height: 110.179
-                fillMode: Image.PreserveAspectFit
-            }
-            Label {
-                text: 'Come Together - The Beatles'
-                font.family: 'Roboto'
-                font.pixelSize: 32
-                color: 'white'
-            }
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.preferredHeight: 107
-            Image {
-                source: './images/MediaPlayer/AGL_MediaPlayer_BackArrow.png'
-            }
-            Image {
-                source: './images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png'
-            }
-            Image {
-                source: './images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png'
-            }
-
-            ProgressBar {
-                Layout.fillWidth: true
-                Layout.preferredWidth: 2
-            }
-
-            Label {
-                text: '2:12/4:19'
-                font.family: 'Roboto'
-                font.pixelSize: 20
-            }
-            Image {
-                source: './images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png'
-            }
-            Image {
-                source: './images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png'
-            }
-            ProgressBar {
-                Layout.fillWidth: true
-                Layout.preferredWidth: 1
-            }
-        }
-    }
-}
diff --git a/homescreen/qml/MediaAreaRadio.qml b/homescreen/qml/MediaAreaRadio.qml
deleted file mode 100644 (file)
index a49f06d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-
-Image {
-    width: 1080
-    height: 215
-    source: './images/Utility_Radio_Background-01.png'
-}
index 217aa9f..072ad0a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,44 +21,108 @@ import QtQuick.Layouts 1.1
 
 Item {
     id: root
-    width: 785
-    height: 218
+    width: 700
+    height: 110
+
+    Timer {
+        id:informationTimer
+        interval: 3000
+        running: false
+        repeat: true
+        onTriggered: {
+            bottomInformation.visible = false
+        }
+    }
+
+
+    ListModel {
+        id: applicationModel
+        ListElement {
+            name: 'launcher'
+            application: 'launcher@0.1'
+        }
+        ListElement {
+            name: 'MediaPlayer'
+            application: 'mediaplayer@0.1'
+        }
+        ListElement {
+            name: 'navigation'
+            application: 'navigation@0.1'
+        }
+        ListElement {
+            name: 'Phone'
+            application: 'phone@0.1'
+        }
+        ListElement {
+            name: 'settings'
+            application: 'settings@0.1'
+        }
+    }
 
     property int pid: -1
 
     RowLayout {
         anchors.fill: parent
-        spacing: 2
+        spacing: 75
         Repeater {
-            id: repeater
-            model: shortcutAppModel
+            model: applicationModel
             delegate: ShortcutIcon {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                name: shortcutAppModel.getName(model.index)
-                icon: shortcutAppModel.getIcon(model.index)
-                isBlank: shortcutAppModel.isBlank(model.index)
-                active: shortcutAppModel.getName(model.index).toLowerCase() === launcher.current
+//                Layout.fillWidth: true
+//                Layout.fillHeight: true
+                width: 60
+                height: 60
+                name: model.name
+                active: model.name === launcher.current
                 onClicked: {
-                   console.log("launcher.current====="+homescreenHandler.getCurrentApplication())
-                    if(launcher.current === shortcutAppModel.getName(model.index)) {
-                        return
-                    }                    
-                   homescreenHandler.tapShortcut(shortcutAppModel.getId(model.index), false)
+//                    if(model.application === 'navigation@0.1') {
+//                        pid = launcher.launch('browser@5.0')
+//                    } else {
+//                        pid = launcher.launch(model.application.toLowerCase())
+//                    }
+
+//                    if (1 < pid) {
+                        applicationArea.visible = true
+//                    }
+//                    else {
+//                        console.warn(model.application)
+//                        console.warn("app cannot be launched!")
+//                    }
+                    if(model.name === 'Navigation') {
+                        homescreenHandler.tapShortcut('browser')
+                    } else {
+                        homescreenHandler.tapShortcut(model.name)
+                    }
                 }
             }
         }
     }
+    Rectangle {
+        id: bottomInformation
+        width: parent.width
+        height: parent.height-20
+        anchors.bottom: parent.bottom
+        color: "gray"
+        z: 1
+        opacity: 0.8
+        visible: false
+
+        Text {
+            id: informationText
+            anchors.centerIn: parent
+            font.pixelSize: 25
+            font.letterSpacing: 5
+            horizontalAlignment: Text.AlignHCenter
+            color: "white"
+            text: ""
+        }
+    }
 
     Connections {
-        target: shortcutAppModel
-        onUpdateShortcut: {
-            for(var i = 0; i < 4; i++) {
-                var item = repeater.itemAt(i)
-                item.name = shortcutAppModel.getName(i)
-                item.icon = shortcutAppModel.getIcon(i)
-                item.isBlank = shortcutAppModel.isBlank(i)
-            }
+        target: homescreenHandler
+        onInformation: {
+            informationText.text = text
+            bottomInformation.visible = true
+            informationTimer.restart()
         }
     }
 }
index e891c99..026db32 100644 (file)
@@ -21,13 +21,10 @@ import QtGraphicalEffects 1.0
 
 MouseArea {
     id: root
-    width: 195
-    height: 216.8
+    width: 70
+    height: 70
     property string name: 'Home'
-    property string icon:'./images/Shortcut/'
     property bool active: false
-    property bool isBlank: false
-
     Item {
         id: icon
         property real desaturation: 0
@@ -35,42 +32,14 @@ MouseArea {
         Image {
             id: inactiveIcon
             anchors.fill: parent
-            source: './images/Shortcut/blank.svg'
-//            source: isBlank ? './images/Shortcut/blank.svg' : root.icon
-            property string initial: root.name.substring(0,1).toUpperCase()
-            Label {
-                style: Text.Outline
-                styleColor: '#00FFFF'
-                color: 'transparent'
-                font.pixelSize: 75
-                anchors.centerIn: parent
-                text: inactiveIcon.initial
-                visible: root.isBlank
-            }
+            source: './images/Shortcut/%1.png'.arg(root.name.toLowerCase())
         }
         Image {
             id: activeIcon
             anchors.fill: parent
-            source: './images/Shortcut/blank_active.svg'
-//            source: isBlank ? './images/Shortcut/blank_active.svg' : root.icon
-            property string initial: root.name.substring(0,1).toUpperCase()
-            Label {
-                style: Text.Outline
-                styleColor: '#00FFFF'
-                color: 'transparent'
-                font.pixelSize: 75
-                anchors.centerIn: parent
-                text: activeIcon.initial
-                visible: root.isBlank
-            }
+            source: './images/Shortcut/%1_active.png'.arg(root.name.toLowerCase())
             opacity: 0.0
         }
-        Image {
-            id: sourceIcon
-            anchors.fill: parent
-            source: isBlank ? null : root.icon
-        }
-
         layer.enabled: true
         layer.effect: Desaturate {
             id: desaturate
@@ -79,30 +48,27 @@ MouseArea {
         }
     }
 
-    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((root.name === "launcher" ? "home" : root.name).toUpperCase())
-    }
-
-    states: [
-        State {
-            when: root.active
-            PropertyChanges {
-                target: inactiveIcon
-                opacity: 0.0
+    transitions: [
+        Transition {
+            NumberAnimation {
+                properties: 'opacity'
+                duration: 500
+                easing.type: Easing.OutExpo
             }
-            PropertyChanges {
-                target: activeIcon
-                opacity: 1.0
+            NumberAnimation {
+                properties: 'desaturation'
+                duration: 250
             }
         }
     ]
+
+    onPressed: {
+        activeIcon.opacity = 1.0
+        inactiveIcon.opacity = 0.0
+    }
+
+    onReleased: {
+        activeIcon.opacity = 0.0
+        inactiveIcon.opacity = 1.0
+    }
 }
index 961cd88..bd81767 100644 (file)
@@ -1,7 +1,6 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017, 2018 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +21,8 @@ import HomeScreen 1.0
 
 Item {
     id: root
-    width: 295
-    height: 218
+    width: 700
+    height: 80
 
     property date now: new Date
     Timer {
@@ -31,19 +30,27 @@ Item {
         onTriggered: root.now = new Date
     }
 
+    Timer {
+        id:notificationTimer
+        interval: 3000
+        running: false
+        repeat: true
+        onTriggered: notificationItem.visible = false
+    }
+
     Connections {
         target: weather
 
         onConditionChanged: {
             var icon = ''
 
-            if (condition.indexOf("clouds") != -1) {
+            if (condition.indexOf("clouds") !== -1) {
                 icon = "WeatherIcons_Cloudy-01.png"
-            } else if (condition.indexOf("thunderstorm") != -1) {
+            } else if (condition.indexOf("thunderstorm") !== -1) {
                 icon = "WeatherIcons_Thunderstorm-01.png"
-            } else if (condition.indexOf("snow") != -1) {
+            } else if (condition.indexOf("snow") !== -1) {
                 icon = "WeatherIcons_Snow-01.png"
-            } else if (condition.indexOf("rain") != -1) {
+            } else if (condition.indexOf("rain") !== -1) {
                 icon = "WeatherIcons_Rain-01.png"
             }
 
@@ -55,105 +62,153 @@ Item {
         }
     }
 
-    RowLayout {
-        anchors.fill: parent
-        spacing: 0
-        Item {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.preferredWidth: 295 - 76
-            ColumnLayout {
-                anchors.fill: parent
-                anchors.margins: 40
-                spacing: 0
-                Text {
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    text: Qt.formatDate(now, 'dddd').toUpperCase()
-                    font.family: 'Roboto'
-                    font.pixelSize: 13
-                    color: 'white'
-                    verticalAlignment:  Text.AlignVCenter
-//                    Rectangle {
-//                        anchors.fill: parent
-//                        anchors.margins: 5
-//                        color: 'red'
-//                        border.color: 'blue'
-//                        border.width: 1
-//                        z: -1
-//                    }
+        RowLayout {
+            anchors.fill: parent
+            spacing: 0
+            RowLayout {
+                id: icons
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.preferredWidth: 120
+                spacing: -10
+
+                Image {
+                    id: bt_icon
+                    Layout.preferredWidth: 50
+                    Layout.preferredHeight: 50
+                    source: connStatus ? './images/Status/HMI_Status_Bluetooth_On-01.png' : './images/Status/HMI_Status_Bluetooth_Inactive-01.png'
+                    fillMode: Image.PreserveAspectFit
+                    property string deviceName: "none"
+                    property bool connStatus: false
+                    Connections {
+                        target: bluetooth
+                        onConnectionEvent: {
+                            console.log("onConnectionEvent", data.Status)
+                            if (data.Status === "connected") {
+                                bt_icon.connStatus = true
+                            } else if (data.Status === "disconnected") {
+                                bt_icon.connStatus = false
+                            }
+                        }
+                        onDeviceUpdateEvent: {
+                            console.log("onConnectionEvent", data.Paired)
+                            if (data.Paired === "True" && data.Connected === "True") {
+                                bt_icon.deviceName = data.name
+                                bt_icon.connStatus = true
+                            } else {
+                                if(bt_icon.deviceName === data.Name)
+                                {
+                                    bt_icon.connStatus = false
+                                }
+                            }
+                        }
+                    }
                 }
-                Text {
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    text: Qt.formatTime(now, 'h:mm ap').toUpperCase()
-                    font.family: 'Roboto'
-                    font.pixelSize: 40
-                    color: 'white'
-                    horizontalAlignment:  Text.AlignHCenter
-                    verticalAlignment:  Text.AlignVCenter
+
+                Repeater {
+                    model: StatusBarModel { objectName: "statusBar" }
+                    delegate: Image {
+                        Layout.preferredWidth: 50
+                        Layout.preferredHeight: 50
+                        source: model.modelData
+                        fillMode: Image.PreserveAspectFit
+                    }
                 }
-                RowLayout {
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    Layout.preferredHeight: 20
-                    Image {
-                        id: condition_item
-                        source: './images/Weather/WeatherIcons_Rain-01.png'
+            }
+            Item {
+                anchors.left: icons.right
+                Layout.fillHeight: true
+                width: 440
+                ColumnLayout {
+                    anchors.fill: parent
+                    anchors.margins: 17
+                    spacing: 0
+                    Text {
+                        Layout.fillWidth: true
+                        Layout.fillHeight: true
+                        text: Qt.formatDate(now, 'dddd').toUpperCase()
+                        font.family: 'Roboto'
+                        font.pixelSize: 13
+                        color: 'white'
+                        horizontalAlignment:  Text.AlignHCenter
+                        verticalAlignment:  Text.AlignVCenter
                     }
                     Text {
-                        id: temperature_item
-                        text: '64°F'
+                        Layout.fillWidth: true
+                        Layout.fillHeight: true
+                        text: Qt.formatTime(now, 'h:mm ap').toUpperCase()
+                        font.family: 'Roboto'
+                        font.pixelSize: 38
                         color: 'white'
-                        font.family: 'Helvetica'
-                        font.pixelSize: 32
+                        horizontalAlignment:  Text.AlignHCenter
+                        verticalAlignment:  Text.AlignVCenter
                     }
                 }
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        homescreenHandler.killRunningApplications()
-                    }
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                Layout.preferredHeight: 20
+
+                Image {
+                    id: condition_item
+                    source: './images/Weather/WeatherIcons_Rain-01.png'
+                }
+                Text {
+                    id: temperature_item
+                    text: '64°F'
+                    color: 'white'
+                    font.family: 'Helvetica'
+                    font.pixelSize: 32
                 }
             }
         }
-        ColumnLayout {
-            id: icons
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.preferredWidth: 76
-            spacing: -10
+
+        Item {
+            id: notificationItem
+            x: 0
+            y: 0
+            z: 1
+            width: parent.width
+            height: 100
+            opacity: 0.8
+            visible: false
+
             Rectangle {
-                Layout.preferredWidth: 77
-                Layout.preferredHeight: 55
-                opacity: 0
-            }
+                width: parent.width
+                height: parent.height
+                anchors.fill: parent
+                color: "gray"
+                Image {
+                    id: notificationIcon
+                    width: 70
+                    height: 70
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.verticalCenter: parent.verticalCenter
+                    source: ""
+                }
 
-            Image {
-                id: bt_icon
-                Layout.preferredWidth: 77
-                Layout.preferredHeight: 55
-                source: connStatus ? './images/Status/HMI_Status_Bluetooth_On-01.png' : './images/Status/HMI_Status_Bluetooth_Inactive-01.png'
-                fillMode: Image.PreserveAspectFit
-                property string deviceName: "none"
-                property bool connStatus: false
-                Connections {
-                    target: bluetooth
-
-                    onPowerChanged: {
-                            bt_icon.connStatus = state
-                    }
+                Text {
+                    id: notificationtext
+                    font.pixelSize: 25
+                    anchors.left: notificationIcon.right
+                    anchors.leftMargin: 5
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: "white"
+                    text: qsTr("")
                 }
             }
-            Repeater {
-                model: StatusBarModel { objectName: "statusBar" }
-                delegate: Image {
-                    Layout.preferredWidth: 77
-                    Layout.preferredHeight: 55
-                    source: model.modelData
-                    fillMode: Image.PreserveAspectFit
-                }
+        }
+
+        Connections {
+            target: homescreenHandler
+            onNotification: {
+                notificationIcon.source = './images/Shortcut/%1.svg'.arg(id)
+                notificationtext.text = text
+                notificationItem.visible = true
+                notificationTimer.restart()
             }
         }
-    }
+
 }
index 2a75cf8..978018c 100644 (file)
@@ -19,41 +19,18 @@ import QtQuick 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
 
-Image {
-    width: 1920
-    height: 218
-    source: './images/TopSection_NoText_NoIcons-01.svg'
-    fillMode: Image.PreserveAspectCrop
+Item {
+    width: 700
+    height: 80
 
     RowLayout {
         anchors.fill: parent
         spacing: 0
-        ShortcutArea {
-            id: shortcutArea
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.preferredWidth: 785
-        }
         StatusArea {
             id: statusArea
             Layout.fillWidth: true
             Layout.fillHeight: true
-            Layout.preferredWidth: 295
+            Layout.preferredWidth: 700
         }
     }
-
-    Timer {
-        id: launching
-        interval: 500
-        running: launcher.launching
-    }
-
-    ProgressBar {
-        id: progressBar
-        anchors.verticalCenter: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        indeterminate: visible
-        visible: launcher.launching && !launching.running
-    }
 }
diff --git a/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png b/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png
deleted file mode 100644 (file)
index a4e026c..0000000
Binary files a/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png and /dev/null differ
diff --git a/homescreen/qml/images/AGL_HMI_Normal_Background.png b/homescreen/qml/images/AGL_HMI_Normal_Background.png
deleted file mode 100644 (file)
index c686067..0000000
Binary files a/homescreen/qml/images/AGL_HMI_Normal_Background.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/AlbumArtwork.png b/homescreen/qml/images/MediaMusic/AlbumArtwork.png
deleted file mode 100644 (file)
index 3716ab3..0000000
Binary files a/homescreen/qml/images/MediaMusic/AlbumArtwork.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/BackArrow.png b/homescreen/qml/images/MediaMusic/BackArrow.png
deleted file mode 100644 (file)
index 63e38d9..0000000
Binary files a/homescreen/qml/images/MediaMusic/BackArrow.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/ForwardArrow.png b/homescreen/qml/images/MediaMusic/ForwardArrow.png
deleted file mode 100644 (file)
index a513705..0000000
Binary files a/homescreen/qml/images/MediaMusic/ForwardArrow.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/ShuffleIcon.png b/homescreen/qml/images/MediaMusic/ShuffleIcon.png
deleted file mode 100644 (file)
index 30f75c5..0000000
Binary files a/homescreen/qml/images/MediaMusic/ShuffleIcon.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/Volume_Loud.png b/homescreen/qml/images/MediaMusic/Volume_Loud.png
deleted file mode 100644 (file)
index 8ea4402..0000000
Binary files a/homescreen/qml/images/MediaMusic/Volume_Loud.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/Volume_Medium.png b/homescreen/qml/images/MediaMusic/Volume_Medium.png
deleted file mode 100644 (file)
index ae5c82e..0000000
Binary files a/homescreen/qml/images/MediaMusic/Volume_Medium.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/Volume_Off.png b/homescreen/qml/images/MediaMusic/Volume_Off.png
deleted file mode 100644 (file)
index 07e3353..0000000
Binary files a/homescreen/qml/images/MediaMusic/Volume_Off.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaMusic/mediamusic.qrc b/homescreen/qml/images/MediaMusic/mediamusic.qrc
deleted file mode 100644 (file)
index b1138c0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/images/MediaMusic">
-        <file>AlbumArtwork.png</file>
-        <file>BackArrow.png</file>
-        <file>ForwardArrow.png</file>
-        <file>ShuffleIcon.png</file>
-        <file>Volume_Loud.png</file>
-        <file>Volume_Medium.png</file>
-        <file>Volume_Off.png</file>
-    </qresource>
-</RCC>
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png
deleted file mode 100644 (file)
index 14a52b2..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png
deleted file mode 100644 (file)
index 0ec1f67..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png
deleted file mode 100644 (file)
index bc2df1d..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png
deleted file mode 100644 (file)
index 8d8fc02..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png
deleted file mode 100644 (file)
index 94fe38f..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png
deleted file mode 100644 (file)
index 12609e1..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png
deleted file mode 100644 (file)
index 299903e..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png
deleted file mode 100644 (file)
index 33cc700..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png
deleted file mode 100644 (file)
index 9bdb14d..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png
deleted file mode 100644 (file)
index 76b0fc9..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png
deleted file mode 100644 (file)
index c423005..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png
deleted file mode 100644 (file)
index beece66..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png
deleted file mode 100644 (file)
index eec608f..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png
deleted file mode 100644 (file)
index d392a90..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png
deleted file mode 100644 (file)
index 22319c9..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png
deleted file mode 100644 (file)
index 9fd42e2..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png
deleted file mode 100644 (file)
index eb61b39..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png
deleted file mode 100644 (file)
index de305f0..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png
deleted file mode 100644 (file)
index d97feec..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png
deleted file mode 100644 (file)
index 7f6445d..0000000
Binary files a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Albums_Active.png b/homescreen/qml/images/MediaPlayer/Albums_Active.png
deleted file mode 100644 (file)
index 1f66e23..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Albums_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Albums_Inactive.png b/homescreen/qml/images/MediaPlayer/Albums_Inactive.png
deleted file mode 100644 (file)
index e0e7f00..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Albums_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/DividingLine.png b/homescreen/qml/images/MediaPlayer/DividingLine.png
deleted file mode 100644 (file)
index 87f2122..0000000
Binary files a/homescreen/qml/images/MediaPlayer/DividingLine.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/GreenLine.png b/homescreen/qml/images/MediaPlayer/GreenLine.png
deleted file mode 100644 (file)
index 0210b83..0000000
Binary files a/homescreen/qml/images/MediaPlayer/GreenLine.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Music_Active.png b/homescreen/qml/images/MediaPlayer/Music_Active.png
deleted file mode 100644 (file)
index 36afac7..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Music_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Music_Inactive.png b/homescreen/qml/images/MediaPlayer/Music_Inactive.png
deleted file mode 100644 (file)
index 9dae353..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Music_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Podcasts_Active.png b/homescreen/qml/images/MediaPlayer/Podcasts_Active.png
deleted file mode 100644 (file)
index fd2d2c0..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Podcasts_Active.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png b/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png
deleted file mode 100644 (file)
index b76b04c..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Popup_Highlight.png b/homescreen/qml/images/MediaPlayer/Popup_Highlight.png
deleted file mode 100644 (file)
index ac63673..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Popup_Highlight.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png b/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png
deleted file mode 100644 (file)
index 2627add..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png b/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png
deleted file mode 100644 (file)
index 0483e07..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png b/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png
deleted file mode 100644 (file)
index 6a9db00..0000000
Binary files a/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/X.png b/homescreen/qml/images/MediaPlayer/X.png
deleted file mode 100644 (file)
index ab392cb..0000000
Binary files a/homescreen/qml/images/MediaPlayer/X.png and /dev/null differ
diff --git a/homescreen/qml/images/MediaPlayer/mediaplayer.qrc b/homescreen/qml/images/MediaPlayer/mediaplayer.qrc
deleted file mode 100644 (file)
index 1cb17ab..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<RCC>
-    <qresource prefix="/images/MediaPlayer">
-        <file>AGL_MediaPlayer_AlbumArtwork.png</file>
-        <file>AGL_MediaPlayer_BackArrow.png</file>
-        <file>AGL_MediaPlayer_Bluetooth_Active.png</file>
-        <file>AGL_MediaPlayer_Bluetooth_Inactive.png</file>
-        <file>AGL_MediaPlayer_CD_Active.png</file>
-        <file>AGL_MediaPlayer_CD_Inactive.png</file>
-        <file>AGL_MediaPlayer_DividingLine.png</file>
-        <file>AGL_MediaPlayer_ForwardArrow.png</file>
-        <file>AGL_MediaPlayer_Loop_Active.png</file>
-        <file>AGL_MediaPlayer_Loop_Inactive.png</file>
-        <file>AGL_MediaPlayer_Player_Pause.png</file>
-        <file>AGL_MediaPlayer_Player_Play.png</file>
-        <file>AGL_MediaPlayer_Playlist_Active.png</file>
-        <file>AGL_MediaPlayer_Playlist_Inactive.png</file>
-        <file>AGL_MediaPlayer_PlaylistToggle_Active.png</file>
-        <file>AGL_MediaPlayer_PlaylistToggle_Inactive.png</file>
-        <file>AGL_MediaPlayer_Radio_Active.png</file>
-        <file>AGL_MediaPlayer_Radio_Inactive.png</file>
-        <file>AGL_MediaPlayer_Shuffle_Active.png</file>
-        <file>AGL_MediaPlayer_Shuffle_Inactive.png</file>
-        <file>Albums_Active.png</file>
-        <file>Albums_Inactive.png</file>
-        <file>DividingLine.png</file>
-        <file>GreenLine.png</file>
-        <file>Music_Active.png</file>
-        <file>Music_Inactive.png</file>
-        <file>Podcasts_Active.png</file>
-        <file>Podcasts_Inactive.png</file>
-        <file>Popup_Highlight.png</file>
-        <file>Popup_PauseIcon.png</file>
-        <file>Popup_PlayIcon.png</file>
-        <file>Popup_VerticalLine.png</file>
-        <file>X.png</file>
-    </qresource>
-</RCC>
diff --git a/homescreen/qml/images/Shortcut/blank.svg b/homescreen/qml/images/Shortcut/blank.svg
deleted file mode 100644 (file)
index 3bccdca..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Home"
-   x="0px"
-   y="0px"
-   viewBox="0 0 195 216.8"
-   style="enable-background:new 0 0 195 216.8;"
-   xml:space="preserve"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="sdl_usb.svg"><metadata
-     id="metadata61"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs59" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     id="namedview57"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="1.0885609"
-     inkscape:cx="18.255591"
-     inkscape:cy="102.46209"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Home"><sodipodi:guide
-       position="52.936865,144.9161"
-       orientation="0,1"
-       id="guide4189"
-       inkscape:locked="false" /><sodipodi:guide
-       position="66.027543,153.29873"
-       orientation="1,0"
-       id="guide4191"
-       inkscape:locked="false" /><sodipodi:guide
-       position="34.449153,79.00339"
-       orientation="0,1"
-       id="guide4193"
-       inkscape:locked="false" /><sodipodi:guide
-       position="132.05509,117.35678"
-       orientation="1,0"
-       id="guide4195"
-       inkscape:locked="false" /><sodipodi:guide
-       position="98.9839,162.94449"
-       orientation="1,0"
-       id="guide4266"
-       inkscape:locked="false" /><sodipodi:guide
-       position="67.290679,111.95975"
-       orientation="0,1"
-       id="guide4268"
-       inkscape:locked="false" /></sodipodi:namedview><style
-     type="text/css"
-     id="style3">
-       .st0{fill:#FFFFFF;}
-       .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
-       .st4{fill:url(#SVGID_1_);}
-       .st5{fill:url(#SVGID_2_);}
-       .st6{fill:url(#SVGID_3_);}
-       .st7{fill:url(#SVGID_4_);}
-       .st8{fill:url(#SVGID_5_);}
-</style></svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Shortcut/blank_active.svg b/homescreen/qml/images/Shortcut/blank_active.svg
deleted file mode 100644 (file)
index 0b63bc9..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:i="&amp;ns_ai;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Home"
-   x="0px"
-   y="0px"
-   viewBox="0 0 195 216.8"
-   style="enable-background:new 0 0 195 216.8;"
-   xml:space="preserve"
-   sodipodi:docname="sdl_usb_active.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata3773"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs3771" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1018"
-   id="namedview3769"
-   showgrid="false"
-   inkscape:zoom="3.8560885"
-   inkscape:cx="97.5"
-   inkscape:cy="108.4"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g3764" />
-<style
-   type="text/css"
-   id="style3750">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-       .st8{fill:url(#SVGID_3_);}
-       .st9{fill:url(#SVGID_4_);}
-       .st10{fill:url(#SVGID_5_);}
-</style>
-<switch
-   id="switch3766">
-       <g
-   i:extraneous="self"
-   id="g3764">
-               <rect
-   id="Active_1"
-   y="214.3"
-   transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)"
-   class="st0"
-   width="195.9"
-   height="2.4" />
-               <linearGradient
-   id="Active_2_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="97.9416"
-   y1="236.9585"
-   x2="97.9416"
-   y2="-68.5304">
-                       <stop
-   offset="0"
-   style="stop-color:#0DF9FF"
-   id="stop3753" />
-                       <stop
-   offset="9.208472e-02"
-   style="stop-color:#0DF9FF;stop-opacity:0.853"
-   id="stop3755" />
-                       <stop
-   offset="0.6264"
-   style="stop-color:#0DF9FF;stop-opacity:0"
-   id="stop3757" />
-               </linearGradient>
-               <rect
-   id="Active_2"
-   class="st1"
-   width="195.9"
-   height="214.3" />
-               
-       </g>
-</switch>
-</svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Shortcut/hvac.svg b/homescreen/qml/images/Shortcut/hvac.svg
deleted file mode 100644 (file)
index 5c76e85..0000000
+++ /dev/null
@@ -1,600 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="HVAC" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
-       .st4{fill:url(#SVGID_1_);}
-       .st5{fill:url(#SVGID_2_);}
-       .st6{fill:url(#SVGID_3_);}
-       .st7{fill:url(#SVGID_4_);}
-       .st8{fill:url(#SVGID_5_);}
-       .st9{fill:url(#SVGID_6_);}
-       .st10{fill:url(#SVGID_7_);}
-       .st11{fill:url(#SVGID_8_);}
-       .st12{fill:url(#SVGID_9_);}
-       .st13{fill:url(#SVGID_10_);}
-       .st14{fill:url(#SVGID_11_);}
-       .st15{fill:url(#SVGID_12_);}
-       .st16{fill:url(#SVGID_13_);}
-       .st17{fill:url(#SVGID_14_);}
-       .st18{fill:url(#SVGID_15_);}
-       .st19{fill:url(#SVGID_16_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g>
-                       <g id="HVAC_Icon_2_">
-                               <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="97.4991" y1="166.6087" x2="97.4991" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st4" d="M106.2,113.4V81.3c0-4.9-3.9-8.8-8.7-8.8c-4.8,0-8.7,4-8.7,8.8v1.2H91v-1.2c0-3.7,2.9-6.6,6.5-6.6
-                                       c3.6,0,6.5,3,6.5,6.6v33.3l0.5,0.3c3.8,2.4,6.1,6.5,6.1,11c0,7.2-5.8,13.1-13,13.1c-7.3,0-13.2-5.9-13.2-13.1
-                                       c0-4.6,2.3-8.8,6-11.1l0.5-0.3V88.3h-2.2v25c-4.1,2.8-6.5,7.5-6.5,12.6c0,8.4,6.9,15.3,15.3,15.3c8.4,0,15.2-6.9,15.2-15.3
-                                       C112.8,120.9,110.3,116.2,106.2,113.4z"/>
-                               <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="97.4991" y1="166.6087" x2="97.4991" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st5" d="M97.6,98.6c-4,0-4.4,2.4-4.4,3.5v13.7l-1.4,0.9c-3.2,2-5.2,5.5-5.2,9.3c0,6,4.9,10.9,10.9,10.9
-                                       c2,0,4-0.6,5.8-1.6l-1.2-1.9c-1.4,0.9-3,1.3-4.6,1.3c-4.8,0-8.7-3.9-8.7-8.7c0-3,1.5-5.8,4.1-7.4l2.5-1.5v-14.9
-                                       c0-0.4,0-1.3,2.2-1.3c2.1,0,2.1,0.6,2.1,1.2V117l2.5,1.6c2.5,1.6,4,4.4,4,7.3h2.2c0-3.7-1.9-7.2-5-9.2l-1.5-1V102
-                                       C101.9,100.5,101.1,98.6,97.6,98.6z"/>
-                               <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st6" points="80.1,80.1 80.1,80.1 80.2,80.1 80.2,80.1 80.2,80.1 80.2,80.1 80.3,80.1 80.3,80.1 80.3,80.1 
-                                       80.4,80.1 80.4,80.1 80.4,80.1 80.4,80.1 80.5,80.1 80.5,80.1 80.5,80.1 80.6,80.1 80.6,80.1 80.6,80.1 80.6,80.1 80.7,80.1 
-                                       80.7,80.1 80.7,80.1 80.8,80.1 80.8,80.1 80.8,80.1 80.8,80.1 80.9,80.1 80.9,80.1 80.9,80.1 81,80.1 81,80.1 81,80.1 81,80.1 
-                                       81.1,80.1 81.1,80.1 81.1,80.1 81.2,80.1 81.2,80.1 81.2,80.1 81.2,80.1 81.3,80.1 81.3,80.1 81.3,80.1 81.4,80.1 81.4,80.1 
-                                       81.4,80.1 81.4,80.1 81.5,80.1 81.5,80.1 81.5,80.1 81.6,80.1 81.6,80.1 81.6,80.1 81.6,80.1 81.7,80.1 81.7,80.1 81.7,80.1 
-                                       81.8,80.1 81.8,80.1 81.8,80.1 81.8,80.1 81.9,80.1 81.9,80.1 81.9,80.1 82,80.1 82,80.1 82,80.1 82,80.1 82.1,80.1 82.1,80.1 
-                                       82.1,80.1 82.1,80.1 82.2,80.1 82.2,80.1 82.2,80.1 82.3,80.1 82.3,80.1 82.3,80.1 82.3,80.1 82.4,80.1 82.4,80.1 82.4,80.1 
-                                       82.5,80.1 82.5,80.1 82.5,80.1 82.5,80.1 82.6,80.1 82.6,80.1 82.6,80.1 82.7,80.1 82.7,80.1 82.7,80.1 82.7,80.1 82.8,80.1 
-                                       82.8,80.1 82.8,80.1 82.9,80.1 82.9,80.1 82.9,80.1 82.9,80.1 83,80.1 83,80.1 83,80.1 83.1,80.1 83.1,80.1 83.1,80.1 
-                                       83.1,80.1 83.2,80.1 83.2,80.1 83.2,80.1 83.3,80.1 83.3,80.1 83.3,80.1 83.3,80.1 83.4,80.1 83.4,80.1 83.4,80.1 83.5,80.1 
-                                       83.5,80.1 83.5,80.1 83.5,80.1 83.6,80.1 83.6,80.1 83.6,80.1 83.7,80.1 83.7,80.1 83.7,80.1 83.7,80.1 83.8,80.1 83.8,80.1 
-                                       83.8,80.1 83.9,80.1 83.9,80.1 83.9,80.1 83.9,80.1 84,80.1 84,80.1 84,80.1 84.1,80.1 84.1,80.1 84.1,80.1 84.1,80.1 
-                                       84.2,80.1 84.2,80.1 84.2,80.1 84.3,80.1 84.3,80.1 84.3,80.1 84.3,80.1 84.4,80.1 84.4,80.1 84.4,80.1 84.5,80.1 84.5,80.1 
-                                       84.5,80.1 84.5,80.1 84.6,80.1 84.6,80.1 84.6,80.1 84.6,80.1 84.7,80.1 84.7,80.1 84.7,80.1 84.8,80.1 84.8,80.1 84.8,80.1 
-                                       84.8,80.1 84.9,80.1 84.9,80.1 84.9,80.1 85,80.1 85,80.1 85,80.1 85,80.1 85.1,80.1 85.1,80.1 85.1,80.1 85.2,80.1 85.2,80.1 
-                                       85.2,80.1 85.2,80.1 85.3,80.1 85.3,80.1 85.3,80.1 85.4,80.1 85.4,80.1 85.4,80.1 85.4,80.1 85.5,80.1 85.5,80.1 85.5,78 
-                                       85.5,78 85.4,78 85.4,78 85.4,78 85.4,78 85.3,78 85.3,78 85.3,78 85.2,78 85.2,78 85.2,78 85.2,78 85.1,78 85.1,78 85.1,78 
-                                       85,78 85,78 85,78 85,78 84.9,78 84.9,78 84.9,78 84.8,78 84.8,78 84.8,78 84.8,78 84.7,78 84.7,78 84.7,78 84.6,78 84.6,78 
-                                       84.6,78 84.6,78 84.5,78 84.5,78 84.5,78 84.5,78 84.4,78 84.4,78 84.4,78 84.3,78 84.3,78 84.3,78 84.3,78 84.2,78 84.2,78 
-                                       84.2,78 84.1,78 84.1,78 84.1,78 84.1,78 84,78 84,78 84,78 83.9,78 83.9,78 83.9,78 83.9,78 83.8,78 83.8,78 83.8,78 83.7,78 
-                                       83.7,78 83.7,78 83.7,78 83.6,78 83.6,78 83.6,78 83.5,78 83.5,78 83.5,78 83.5,78 83.4,78 83.4,78 83.4,78 83.3,78 83.3,78 
-                                       83.3,78 83.3,78 83.2,78 83.2,78 83.2,78 83.1,78 83.1,78 83.1,78 83.1,78 83,78 83,78 83,78 82.9,78 82.9,78 82.9,78 82.9,78 
-                                       82.8,78 82.8,78 82.8,78 82.7,78 82.7,78 82.7,78 82.7,78 82.6,78 82.6,78 82.6,78 82.5,78 82.5,78 82.5,78 82.5,78 82.4,78 
-                                       82.4,78 82.4,78 82.3,78 82.3,78 82.3,78 82.3,78 82.2,78 82.2,78 82.2,78 82.1,78 82.1,78 82.1,78 82.1,78 82,78 82,78 82,78 
-                                       82,78 81.9,78 81.9,78 81.9,78 81.8,78 81.8,78 81.8,78 81.8,78 81.7,78 81.7,78 81.7,78 81.6,78 81.6,78 81.6,78 81.6,78 
-                                       81.5,78 81.5,78 81.5,78 81.4,78 81.4,78 81.4,78 81.4,78 81.3,78 81.3,78 81.3,78 81.2,78 81.2,78 81.2,78 81.2,78 81.1,78 
-                                       81.1,78 81.1,78 81,78 81,78 81,78 81,78 80.9,78 80.9,78 80.9,78 80.8,78 80.8,78 80.8,78 80.8,78 80.7,78 80.7,78 80.7,78 
-                                       80.6,78 80.6,78 80.6,78 80.6,78 80.5,78 80.5,78 80.5,78 80.4,78 80.4,78 80.4,78 80.4,78 80.3,78 80.3,78 80.3,78 80.2,78 
-                                       80.2,78 80.2,78 80.2,78 80.1,78 80.1,78 80.1,78 80,78 80,80.1 80.1,80.1                                 "/>
-                               <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st7" points="85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.3,83.5 85.3,83.5 85.3,83.5 
-                                       85.3,83.5 85.3,83.5 85.3,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.1,83.5 85.1,83.5 85.1,83.5 
-                                       85.1,83.5 85.1,83.5 85.1,83.5 85,83.5 85,83.5 85,83.5 85,83.5 85,83.5 85,83.5 84.9,83.5 84.9,83.5 84.9,83.5 84.9,83.5 
-                                       84.9,83.5 84.9,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.7,83.5 84.7,83.5 84.7,83.5 84.7,83.5 
-                                       84.7,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.5,83.5 84.5,83.5 84.5,83.5 84.5,83.5 84.5,83.5 
-                                       84.5,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.3,83.5 84.3,83.5 84.3,83.5 84.3,83.5 84.3,83.5 
-                                       84.3,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.1,83.5 84.1,83.5 84.1,83.5 84.1,83.5 84.1,83.5 
-                                       84.1,83.5 84,83.5 84,83.5 84,83.5 84,83.5 84,83.5 84,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.8,83.5 
-                                       83.8,83.5 83.8,83.5 83.8,83.5 83.8,83.5 83.8,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.6,83.5 
-                                       83.6,83.5 83.6,83.5 83.6,83.5 83.6,83.5 83.6,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.4,83.5 
-                                       83.4,83.5 83.4,83.5 83.4,83.5 83.4,83.5 83.4,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.2,83.5 
-                                       83.2,83.5 83.2,83.5 83.2,83.5 83.2,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83,83.5 83,83.5 
-                                       83,83.5 83,83.5 83,83.5 83,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.8,83.5 82.8,83.5 82.8,83.5 
-                                       82.8,83.5 82.8,83.5 82.8,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.6,83.5 82.6,83.5 82.6,83.5 
-                                       82.6,83.5 82.6,83.5 82.6,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.4,83.5 82.4,83.5 82.4,83.5 
-                                       82.4,83.5 82.4,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.2,83.5 82.2,83.5 82.2,85.5 82.2,85.5 
-                                       82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.5,85.5 
-                                       82.5,85.5 82.5,85.5 82.5,85.5 82.5,85.5 82.5,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.7,85.5 
-                                       82.7,85.5 82.7,85.5 82.7,85.5 82.7,85.5 82.7,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.9,85.5 
-                                       82.9,85.5 82.9,85.5 82.9,85.5 82.9,85.5 82.9,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83.1,85.5 83.1,85.5 
-                                       83.1,85.5 83.1,85.5 83.1,85.5 83.1,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.3,85.5 83.3,85.5 83.3,85.5 
-                                       83.3,85.5 83.3,85.5 83.3,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.5,85.5 83.5,85.5 83.5,85.5 
-                                       83.5,85.5 83.5,85.5 83.5,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.7,85.5 83.7,85.5 83.7,85.5 
-                                       83.7,85.5 83.7,85.5 83.7,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.9,85.5 83.9,85.5 83.9,85.5 
-                                       83.9,85.5 83.9,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84.1,85.5 84.1,85.5 84.1,85.5 84.1,85.5 84.1,85.5 
-                                       84.1,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.3,85.5 84.3,85.5 84.3,85.5 84.3,85.5 84.3,85.5 
-                                       84.3,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.5,85.5 84.5,85.5 84.5,85.5 84.5,85.5 84.5,85.5 
-                                       84.5,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.7,85.5 84.7,85.5 84.7,85.5 84.7,85.5 84.7,85.5 
-                                       84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 
-                                       85,85.5 85,85.5 85,85.5 85,85.5 85,85.5 85,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.2,85.5 
-                                       85.2,85.5 85.2,85.5 85.2,85.5 85.2,85.5 85.2,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.4,85.5 
-                                       85.4,85.5 85.4,85.5 85.4,85.5 85.4,85.5 85.4,85.5 85.5,85.5 85.5,85.5 85.5,85.5 85.5,83.5 85.5,83.5 85.5,83.5                           "/>
-                               <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st8" points="80.1,91 80.1,91 80.2,91 80.2,91 80.2,91 80.2,91 80.3,91 80.3,91 80.3,91 80.4,91 80.4,91 
-                                       80.4,91 80.4,91 80.5,91 80.5,91 80.5,91 80.6,91 80.6,91 80.6,91 80.6,91 80.7,91 80.7,91 80.7,91 80.8,91 80.8,91 80.8,91 
-                                       80.8,91 80.9,91 80.9,91 80.9,91 81,91 81,91 81,91 81,91 81.1,91 81.1,91 81.1,91 81.2,91 81.2,91 81.2,91 81.2,91 81.3,91 
-                                       81.3,91 81.3,91 81.4,91 81.4,91 81.4,91 81.4,91 81.5,91 81.5,91 81.5,91 81.6,91 81.6,91 81.6,91 81.6,91 81.7,91 81.7,91 
-                                       81.7,91 81.8,91 81.8,91 81.8,91 81.8,91 81.9,91 81.9,91 81.9,91 82,91 82,91 82,91 82,91 82.1,91 82.1,91 82.1,91 82.1,91 
-                                       82.2,91 82.2,91 82.2,91 82.3,91 82.3,91 82.3,91 82.3,91 82.4,91 82.4,91 82.4,91 82.5,91 82.5,91 82.5,91 82.5,91 82.6,91 
-                                       82.6,91 82.6,91 82.7,91 82.7,91 82.7,91 82.7,91 82.8,91 82.8,91 82.8,91 82.9,91 82.9,91 82.9,91 82.9,91 83,91 83,91 83,91 
-                                       83.1,91 83.1,91 83.1,91 83.1,91 83.2,91 83.2,91 83.2,91 83.3,91 83.3,91 83.3,91 83.3,91 83.4,91 83.4,91 83.4,91 83.5,91 
-                                       83.5,91 83.5,91 83.5,91 83.6,91 83.6,91 83.6,91 83.7,91 83.7,91 83.7,91 83.7,91 83.8,91 83.8,91 83.8,91 83.9,91 83.9,91 
-                                       83.9,91 83.9,91 84,91 84,91 84,91 84.1,91 84.1,91 84.1,91 84.1,91 84.2,91 84.2,91 84.2,91 84.3,91 84.3,91 84.3,91 84.3,91 
-                                       84.4,91 84.4,91 84.4,91 84.5,91 84.5,91 84.5,91 84.5,91 84.6,91 84.6,91 84.6,91 84.6,91 84.7,91 84.7,91 84.7,91 84.8,91 
-                                       84.8,91 84.8,91 84.8,91 84.9,91 84.9,91 84.9,91 85,91 85,91 85,91 85,91 85.1,91 85.1,91 85.1,91 85.2,91 85.2,91 85.2,91 
-                                       85.2,91 85.3,91 85.3,91 85.3,91 85.4,91 85.4,91 85.4,91 85.4,91 85.5,91 85.5,91 85.5,88.9 85.5,88.9 85.4,88.9 85.4,88.9 
-                                       85.4,88.9 85.4,88.9 85.3,88.9 85.3,88.9 85.3,88.9 85.2,88.9 85.2,88.9 85.2,88.9 85.2,88.9 85.1,88.9 85.1,88.9 85.1,88.9 
-                                       85,88.9 85,88.9 85,88.9 85,88.9 84.9,88.9 84.9,88.9 84.9,88.9 84.8,88.9 84.8,88.9 84.8,88.9 84.8,88.9 84.7,88.9 84.7,88.9 
-                                       84.7,88.9 84.6,88.9 84.6,88.9 84.6,88.9 84.6,88.9 84.5,88.9 84.5,88.9 84.5,88.9 84.5,88.9 84.4,88.9 84.4,88.9 84.4,88.9 
-                                       84.3,88.9 84.3,88.9 84.3,88.9 84.3,88.9 84.2,88.9 84.2,88.9 84.2,88.9 84.1,88.9 84.1,88.9 84.1,88.9 84.1,88.9 84,88.9 
-                                       84,88.9 84,88.9 83.9,88.9 83.9,88.9 83.9,88.9 83.9,88.9 83.8,88.9 83.8,88.9 83.8,88.9 83.7,88.9 83.7,88.9 83.7,88.9 
-                                       83.7,88.9 83.6,88.9 83.6,88.9 83.6,88.9 83.5,88.9 83.5,88.9 83.5,88.9 83.5,88.9 83.4,88.9 83.4,88.9 83.4,88.9 83.3,88.9 
-                                       83.3,88.9 83.3,88.9 83.3,88.9 83.2,88.9 83.2,88.9 83.2,88.9 83.1,88.9 83.1,88.9 83.1,88.9 83.1,88.9 83,88.9 83,88.9 
-                                       83,88.9 82.9,88.9 82.9,88.9 82.9,88.9 82.9,88.9 82.8,88.9 82.8,88.9 82.8,88.9 82.7,88.9 82.7,88.9 82.7,88.9 82.7,88.9 
-                                       82.6,88.9 82.6,88.9 82.6,88.9 82.5,88.9 82.5,88.9 82.5,88.9 82.5,88.9 82.4,88.9 82.4,88.9 82.4,88.9 82.3,88.9 82.3,88.9 
-                                       82.3,88.9 82.3,88.9 82.2,88.9 82.2,88.9 82.2,88.9 82.1,88.9 82.1,88.9 82.1,88.9 82.1,88.9 82,88.9 82,88.9 82,88.9 82,88.9 
-                                       81.9,88.9 81.9,88.9 81.9,88.9 81.8,88.9 81.8,88.9 81.8,88.9 81.8,88.9 81.7,88.9 81.7,88.9 81.7,88.9 81.6,88.9 81.6,88.9 
-                                       81.6,88.9 81.6,88.9 81.5,88.9 81.5,88.9 81.5,88.9 81.4,88.9 81.4,88.9 81.4,88.9 81.4,88.9 81.3,88.9 81.3,88.9 81.3,88.9 
-                                       81.2,88.9 81.2,88.9 81.2,88.9 81.2,88.9 81.1,88.9 81.1,88.9 81.1,88.9 81,88.9 81,88.9 81,88.9 81,88.9 80.9,88.9 80.9,88.9 
-                                       80.9,88.9 80.8,88.9 80.8,88.9 80.8,88.9 80.8,88.9 80.7,88.9 80.7,88.9 80.7,88.9 80.6,88.9 80.6,88.9 80.6,88.9 80.6,88.9 
-                                       80.5,88.9 80.5,88.9 80.5,88.9 80.4,88.9 80.4,88.9 80.4,88.9 80.4,88.9 80.3,88.9 80.3,88.9 80.3,88.9 80.2,88.9 80.2,88.9 
-                                       80.2,88.9 80.2,88.9 80.1,88.9 80.1,88.9 80.1,88.9 80,88.9 80,91 80.1,91                                 "/>
-                               <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st9" points="85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.3,94.4 85.3,94.4 85.3,94.4 
-                                       85.3,94.4 85.3,94.4 85.3,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.1,94.4 85.1,94.4 85.1,94.4 
-                                       85.1,94.4 85.1,94.4 85.1,94.4 85,94.4 85,94.4 85,94.4 85,94.4 85,94.4 85,94.4 84.9,94.4 84.9,94.4 84.9,94.4 84.9,94.4 
-                                       84.9,94.4 84.9,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.7,94.4 84.7,94.4 84.7,94.4 84.7,94.4 
-                                       84.7,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.5,94.4 84.5,94.4 84.5,94.4 84.5,94.4 84.5,94.4 
-                                       84.5,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.3,94.4 84.3,94.4 84.3,94.4 84.3,94.4 84.3,94.4 
-                                       84.3,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.1,94.4 84.1,94.4 84.1,94.4 84.1,94.4 84.1,94.4 
-                                       84.1,94.4 84,94.4 84,94.4 84,94.4 84,94.4 84,94.4 84,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.8,94.4 
-                                       83.8,94.4 83.8,94.4 83.8,94.4 83.8,94.4 83.8,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.6,94.4 
-                                       83.6,94.4 83.6,94.4 83.6,94.4 83.6,94.4 83.6,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.4,94.4 
-                                       83.4,94.4 83.4,94.4 83.4,94.4 83.4,94.4 83.4,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.2,94.4 
-                                       83.2,94.4 83.2,94.4 83.2,94.4 83.2,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83,94.4 83,94.4 
-                                       83,94.4 83,94.4 83,94.4 83,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.8,94.4 82.8,94.4 82.8,94.4 
-                                       82.8,94.4 82.8,94.4 82.8,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.6,94.4 82.6,94.4 82.6,94.4 
-                                       82.6,94.4 82.6,94.4 82.6,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.4,94.4 82.4,94.4 82.4,94.4 
-                                       82.4,94.4 82.4,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.2,94.4 82.2,94.4 82.2,96.5 82.2,96.5 
-                                       82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.5,96.5 
-                                       82.5,96.5 82.5,96.5 82.5,96.5 82.5,96.5 82.5,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.7,96.5 
-                                       82.7,96.5 82.7,96.5 82.7,96.5 82.7,96.5 82.7,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.9,96.5 
-                                       82.9,96.5 82.9,96.5 82.9,96.5 82.9,96.5 82.9,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83.1,96.5 83.1,96.5 
-                                       83.1,96.5 83.1,96.5 83.1,96.5 83.1,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.3,96.5 83.3,96.5 83.3,96.5 
-                                       83.3,96.5 83.3,96.5 83.3,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.5,96.5 83.5,96.5 83.5,96.5 
-                                       83.5,96.5 83.5,96.5 83.5,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.7,96.5 83.7,96.5 83.7,96.5 
-                                       83.7,96.5 83.7,96.5 83.7,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.9,96.5 83.9,96.5 83.9,96.5 
-                                       83.9,96.5 83.9,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84.1,96.5 84.1,96.5 84.1,96.5 84.1,96.5 84.1,96.5 
-                                       84.1,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.3,96.5 84.3,96.5 84.3,96.5 84.3,96.5 84.3,96.5 
-                                       84.3,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.5,96.5 84.5,96.5 84.5,96.5 84.5,96.5 84.5,96.5 
-                                       84.5,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.7,96.5 84.7,96.5 84.7,96.5 84.7,96.5 84.7,96.5 
-                                       84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 
-                                       85,96.5 85,96.5 85,96.5 85,96.5 85,96.5 85,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.2,96.5 
-                                       85.2,96.5 85.2,96.5 85.2,96.5 85.2,96.5 85.2,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.4,96.5 
-                                       85.4,96.5 85.4,96.5 85.4,96.5 85.4,96.5 85.4,96.5 85.5,96.5 85.5,96.5 85.5,96.5 85.5,94.4 85.5,94.4 85.5,94.4                           "/>
-                               <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st10" points="80.1,101.9 80.1,101.9 80.2,101.9 80.2,101.9 80.2,101.9 80.2,101.9 80.3,101.9 80.3,101.9 
-                                       80.3,101.9 80.4,101.9 80.4,101.9 80.4,101.9 80.4,101.9 80.5,101.9 80.5,101.9 80.5,101.9 80.6,101.9 80.6,101.9 80.6,101.9 
-                                       80.6,101.9 80.7,101.9 80.7,101.9 80.7,101.9 80.8,101.9 80.8,101.9 80.8,101.9 80.8,101.9 80.9,101.9 80.9,101.9 80.9,101.9 
-                                       81,101.9 81,101.9 81,101.9 81,101.9 81.1,101.9 81.1,101.9 81.1,101.9 81.2,101.9 81.2,101.9 81.2,101.9 81.2,101.9 
-                                       81.3,101.9 81.3,101.9 81.3,101.9 81.4,101.9 81.4,101.9 81.4,101.9 81.4,101.9 81.5,101.9 81.5,101.9 81.5,101.9 81.6,101.9 
-                                       81.6,101.9 81.6,101.9 81.6,101.9 81.7,101.9 81.7,101.9 81.7,101.9 81.8,101.9 81.8,101.9 81.8,101.9 81.8,101.9 81.9,101.9 
-                                       81.9,101.9 81.9,101.9 82,101.9 82,101.9 82,101.9 82,101.9 82.1,101.9 82.1,101.9 82.1,101.9 82.1,101.9 82.2,101.9 
-                                       82.2,101.9 82.2,101.9 82.3,101.9 82.3,101.9 82.3,101.9 82.3,101.9 82.4,101.9 82.4,101.9 82.4,101.9 82.5,101.9 82.5,101.9 
-                                       82.5,101.9 82.5,101.9 82.6,101.9 82.6,101.9 82.6,101.9 82.7,101.9 82.7,101.9 82.7,101.9 82.7,101.9 82.8,101.9 82.8,101.9 
-                                       82.8,101.9 82.9,101.9 82.9,101.9 82.9,101.9 82.9,101.9 83,101.9 83,101.9 83,101.9 83.1,101.9 83.1,101.9 83.1,101.9 
-                                       83.1,101.9 83.2,101.9 83.2,101.9 83.2,101.9 83.3,101.9 83.3,101.9 83.3,101.9 83.3,101.9 83.4,101.9 83.4,101.9 83.4,101.9 
-                                       83.5,101.9 83.5,101.9 83.5,101.9 83.5,101.9 83.6,101.9 83.6,101.9 83.6,101.9 83.7,101.9 83.7,101.9 83.7,101.9 83.7,101.9 
-                                       83.8,101.9 83.8,101.9 83.8,101.9 83.9,101.9 83.9,101.9 83.9,101.9 83.9,101.9 84,101.9 84,101.9 84,101.9 84.1,101.9 
-                                       84.1,101.9 84.1,101.9 84.1,101.9 84.2,101.9 84.2,101.9 84.2,101.9 84.3,101.9 84.3,101.9 84.3,101.9 84.3,101.9 84.4,101.9 
-                                       84.4,101.9 84.4,101.9 84.5,101.9 84.5,101.9 84.5,101.9 84.5,101.9 84.6,101.9 84.6,101.9 84.6,101.9 84.6,101.9 84.7,101.9 
-                                       84.7,101.9 84.7,101.9 84.8,101.9 84.8,101.9 84.8,101.9 84.8,101.9 84.9,101.9 84.9,101.9 84.9,101.9 85,101.9 85,101.9 
-                                       85,101.9 85,101.9 85.1,101.9 85.1,101.9 85.1,101.9 85.2,101.9 85.2,101.9 85.2,101.9 85.2,101.9 85.3,101.9 85.3,101.9 
-                                       85.3,101.9 85.4,101.9 85.4,101.9 85.4,101.9 85.4,101.9 85.5,101.9 85.5,101.9 85.5,99.8 85.5,99.8 85.4,99.8 85.4,99.8 
-                                       85.4,99.8 85.4,99.8 85.3,99.8 85.3,99.8 85.3,99.8 85.2,99.8 85.2,99.8 85.2,99.8 85.2,99.8 85.1,99.8 85.1,99.8 85.1,99.8 
-                                       85,99.8 85,99.8 85,99.8 85,99.8 84.9,99.8 84.9,99.8 84.9,99.8 84.8,99.8 84.8,99.8 84.8,99.8 84.8,99.8 84.7,99.8 84.7,99.8 
-                                       84.7,99.8 84.6,99.8 84.6,99.8 84.6,99.8 84.6,99.8 84.5,99.8 84.5,99.8 84.5,99.8 84.5,99.8 84.4,99.8 84.4,99.8 84.4,99.8 
-                                       84.3,99.8 84.3,99.8 84.3,99.8 84.3,99.8 84.2,99.8 84.2,99.8 84.2,99.8 84.1,99.8 84.1,99.8 84.1,99.8 84.1,99.8 84,99.8 
-                                       84,99.8 84,99.8 83.9,99.8 83.9,99.8 83.9,99.8 83.9,99.8 83.8,99.8 83.8,99.8 83.8,99.8 83.7,99.8 83.7,99.8 83.7,99.8 
-                                       83.7,99.8 83.6,99.8 83.6,99.8 83.6,99.8 83.5,99.8 83.5,99.8 83.5,99.8 83.5,99.8 83.4,99.8 83.4,99.8 83.4,99.8 83.3,99.8 
-                                       83.3,99.8 83.3,99.8 83.3,99.8 83.2,99.8 83.2,99.8 83.2,99.8 83.1,99.8 83.1,99.8 83.1,99.8 83.1,99.8 83,99.8 83,99.8 
-                                       83,99.8 82.9,99.8 82.9,99.8 82.9,99.8 82.9,99.8 82.8,99.8 82.8,99.8 82.8,99.8 82.7,99.8 82.7,99.8 82.7,99.8 82.7,99.8 
-                                       82.6,99.8 82.6,99.8 82.6,99.8 82.5,99.8 82.5,99.8 82.5,99.8 82.5,99.8 82.4,99.8 82.4,99.8 82.4,99.8 82.3,99.8 82.3,99.8 
-                                       82.3,99.8 82.3,99.8 82.2,99.8 82.2,99.8 82.2,99.8 82.1,99.8 82.1,99.8 82.1,99.8 82.1,99.8 82,99.8 82,99.8 82,99.8 82,99.8 
-                                       81.9,99.8 81.9,99.8 81.9,99.8 81.8,99.8 81.8,99.8 81.8,99.8 81.8,99.8 81.7,99.8 81.7,99.8 81.7,99.8 81.6,99.8 81.6,99.8 
-                                       81.6,99.8 81.6,99.8 81.5,99.8 81.5,99.8 81.5,99.8 81.4,99.8 81.4,99.8 81.4,99.8 81.4,99.8 81.3,99.8 81.3,99.8 81.3,99.8 
-                                       81.2,99.8 81.2,99.8 81.2,99.8 81.2,99.8 81.1,99.8 81.1,99.8 81.1,99.8 81,99.8 81,99.8 81,99.8 81,99.8 80.9,99.8 80.9,99.8 
-                                       80.9,99.8 80.8,99.8 80.8,99.8 80.8,99.8 80.8,99.8 80.7,99.8 80.7,99.8 80.7,99.8 80.6,99.8 80.6,99.8 80.6,99.8 80.6,99.8 
-                                       80.5,99.8 80.5,99.8 80.5,99.8 80.4,99.8 80.4,99.8 80.4,99.8 80.4,99.8 80.3,99.8 80.3,99.8 80.3,99.8 80.2,99.8 80.2,99.8 
-                                       80.2,99.8 80.2,99.8 80.1,99.8 80.1,99.8 80.1,99.8 80,99.8 80,101.9 80.1,101.9                           "/>
-                               <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st11" points="85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.3,105.3 85.3,105.3 
-                                       85.3,105.3 85.3,105.3 85.3,105.3 85.3,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.1,105.3 
-                                       85.1,105.3 85.1,105.3 85.1,105.3 85.1,105.3 85.1,105.3 85,105.3 85,105.3 85,105.3 85,105.3 85,105.3 85,105.3 84.9,105.3 
-                                       84.9,105.3 84.9,105.3 84.9,105.3 84.9,105.3 84.9,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 
-                                       84.7,105.3 84.7,105.3 84.7,105.3 84.7,105.3 84.7,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 
-                                       84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.4,105.3 84.4,105.3 84.4,105.3 84.4,105.3 84.4,105.3 
-                                       84.4,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.2,105.3 84.2,105.3 84.2,105.3 84.2,105.3 
-                                       84.2,105.3 84.2,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84,105.3 84,105.3 84,105.3 
-                                       84,105.3 84,105.3 84,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.8,105.3 83.8,105.3 83.8,105.3 
-                                       83.8,105.3 83.8,105.3 83.8,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.6,105.3 83.6,105.3 
-                                       83.6,105.3 83.6,105.3 83.6,105.3 83.6,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.4,105.3 
-                                       83.4,105.3 83.4,105.3 83.4,105.3 83.4,105.3 83.4,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 
-                                       83.2,105.3 83.2,105.3 83.2,105.3 83.2,105.3 83.2,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 
-                                       83,105.3 83,105.3 83,105.3 83,105.3 83,105.3 83,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 
-                                       82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.7,105.3 82.7,105.3 82.7,105.3 82.7,105.3 82.7,105.3 
-                                       82.7,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.5,105.3 82.5,105.3 82.5,105.3 82.5,105.3 
-                                       82.5,105.3 82.5,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.3,105.3 82.3,105.3 82.3,105.3 82.3,105.3 
-                                       82.3,105.3 82.3,105.3 82.2,105.3 82.2,105.3 82.2,107.4 82.2,107.4 82.3,107.4 82.3,107.4 82.3,107.4 82.3,107.4 82.3,107.4 
-                                       82.3,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.5,107.4 82.5,107.4 82.5,107.4 82.5,107.4 82.5,107.4 
-                                       82.5,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.7,107.4 82.7,107.4 82.7,107.4 82.7,107.4 
-                                       82.7,107.4 82.7,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.9,107.4 82.9,107.4 82.9,107.4 
-                                       82.9,107.4 82.9,107.4 82.9,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83.1,107.4 83.1,107.4 83.1,107.4 
-                                       83.1,107.4 83.1,107.4 83.1,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.3,107.4 83.3,107.4 83.3,107.4 
-                                       83.3,107.4 83.3,107.4 83.3,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.5,107.4 83.5,107.4 
-                                       83.5,107.4 83.5,107.4 83.5,107.4 83.5,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.7,107.4 
-                                       83.7,107.4 83.7,107.4 83.7,107.4 83.7,107.4 83.7,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 
-                                       83.9,107.4 83.9,107.4 83.9,107.4 83.9,107.4 83.9,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84.1,107.4 
-                                       84.1,107.4 84.1,107.4 84.1,107.4 84.1,107.4 84.1,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 
-                                       84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.4,107.4 84.4,107.4 84.4,107.4 84.4,107.4 84.4,107.4 
-                                       84.4,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.6,107.4 84.6,107.4 84.6,107.4 84.6,107.4 
-                                       84.6,107.4 84.6,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.8,107.4 84.8,107.4 84.8,107.4 84.8,107.4 
-                                       84.8,107.4 84.8,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 85,107.4 85,107.4 85,107.4 
-                                       85,107.4 85,107.4 85,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.2,107.4 85.2,107.4 
-                                       85.2,107.4 85.2,107.4 85.2,107.4 85.2,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.4,107.4 
-                                       85.4,107.4 85.4,107.4 85.4,107.4 85.4,107.4 85.4,107.4 85.5,107.4 85.5,107.4 85.5,107.4 85.5,105.3 85.5,105.3 85.5,105.3 
-                                                                       "/>
-                               <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st12" points="82.3,112.8 82.3,112.8 82.3,112.8 82.3,112.8 82.4,112.8 82.4,112.8 82.4,112.8 82.5,112.8 
-                                       82.5,112.8 82.5,112.8 82.5,112.8 82.6,112.8 82.6,112.8 82.6,112.8 82.7,112.8 82.7,112.8 82.7,112.8 82.7,112.8 82.8,112.8 
-                                       82.8,112.8 82.8,112.8 82.9,112.8 82.9,112.8 82.9,112.8 82.9,112.8 83,112.8 83,112.8 83,112.8 83.1,112.8 83.1,112.8 
-                                       83.1,112.8 83.1,112.8 83.2,112.8 83.2,112.8 83.2,112.8 83.3,112.8 83.3,112.8 83.3,112.8 83.3,112.8 83.4,112.8 83.4,112.8 
-                                       83.4,112.8 83.5,112.8 83.5,112.8 83.5,112.8 83.5,112.8 83.6,112.8 83.6,112.8 83.6,112.8 83.7,112.8 83.7,112.8 83.7,112.8 
-                                       83.7,112.8 83.8,112.8 83.8,112.8 83.8,112.8 83.9,112.8 83.9,112.8 83.9,112.8 83.9,112.8 84,112.8 84,112.8 84,112.8 
-                                       84.1,112.8 84.1,112.8 84.1,112.8 84.1,112.8 84.2,112.8 84.2,112.8 84.2,112.8 84.3,112.8 84.3,112.8 84.3,112.8 84.3,112.8 
-                                       84.4,112.8 84.4,112.8 84.4,112.8 84.5,112.8 84.5,112.8 84.5,112.8 84.5,112.8 84.6,112.8 84.6,112.8 84.6,112.8 84.6,112.8 
-                                       84.7,112.8 84.7,112.8 84.7,112.8 84.8,112.8 84.8,112.8 84.8,112.8 84.8,112.8 84.9,112.8 84.9,112.8 84.9,112.8 85,112.8 
-                                       85,112.8 85,112.8 85,112.8 85.1,112.8 85.1,112.8 85.1,112.8 85.2,112.8 85.2,112.8 85.2,112.8 85.2,112.8 85.3,112.8 
-                                       85.3,112.8 85.3,112.8 85.4,112.8 85.4,112.8 85.4,112.8 85.4,112.8 85.5,112.8 85.5,112.8 85.5,110.7 85.5,110.7 85.4,110.7 
-                                       85.4,110.7 85.4,110.7 85.4,110.7 85.3,110.7 85.3,110.7 85.3,110.7 85.2,110.7 85.2,110.7 85.2,110.7 85.2,110.7 85.1,110.7 
-                                       85.1,110.7 85.1,110.7 85,110.7 85,110.7 85,110.7 85,110.7 84.9,110.7 84.9,110.7 84.9,110.7 84.8,110.7 84.8,110.7 
-                                       84.8,110.7 84.8,110.7 84.7,110.7 84.7,110.7 84.7,110.7 84.6,110.7 84.6,110.7 84.6,110.7 84.6,110.7 84.5,110.7 84.5,110.7 
-                                       84.5,110.7 84.5,110.7 84.4,110.7 84.4,110.7 84.4,110.7 84.3,110.7 84.3,110.7 84.3,110.7 84.3,110.7 84.2,110.7 84.2,110.7 
-                                       84.2,110.7 84.1,110.7 84.1,110.7 84.1,110.7 84.1,110.7 84,110.7 84,110.7 84,110.7 83.9,110.7 83.9,110.7 83.9,110.7 
-                                       83.9,110.7 83.8,110.7 83.8,110.7 83.8,110.7 83.7,110.7 83.7,110.7 83.7,110.7 83.7,110.7 83.6,110.7 83.6,110.7 83.6,110.7 
-                                       83.5,110.7 83.5,110.7 83.5,110.7 83.5,110.7 83.4,110.7 83.4,110.7 83.4,110.7 83.3,110.7 83.3,110.7 83.3,110.7 83.3,110.7 
-                                       83.2,110.7 83.2,110.7 83.2,110.7 83.1,110.7 83.1,110.7 83.1,110.7 83.1,110.7 83,110.7 83,110.7 83,110.7 82.9,110.7 
-                                       82.9,110.7 82.9,110.7 82.9,110.7 82.8,110.7 82.8,110.7 82.8,110.7 82.7,110.7 82.7,110.7 82.7,110.7 82.7,110.7 82.6,110.7 
-                                       82.6,110.7 82.6,110.7 82.5,110.7 82.5,110.7 82.5,110.7 82.5,110.7 82.4,110.7 82.4,110.7 82.4,110.7 82.3,110.7 82.3,110.7 
-                                       82.3,110.7 82.3,110.7 82.2,110.7 82.2,110.7 82.2,110.7 82.1,110.7 82.1,110.7 82.1,110.7 82.1,110.7 82,110.7 82,110.7 
-                                       82,110.7 82,110.7 81.9,110.7 81.9,110.7 81.9,110.7 81.8,110.7 81.8,110.7 81.8,110.7 81.8,110.7 81.7,110.7 81.7,110.7 
-                                       81.7,110.7 81.6,110.7 81.6,110.7 81.6,110.7 81.6,110.7 81.5,110.7 81.5,110.7 81.5,110.7 81.4,110.7 81.4,110.7 81.4,110.7 
-                                       81.4,110.7 81.3,110.7 81.3,110.7 81.3,110.7 81.2,110.7 81.2,110.7 81.2,110.7 81.2,110.7 81.1,110.7 81.1,110.7 81.1,110.7 
-                                       81,110.7 81,110.7 81,110.7 81,110.7 80.9,110.7 80.9,110.7 80.9,110.7 80.8,110.7 80.8,110.7 80.8,110.7 80.8,110.7 
-                                       80.7,110.7 80.7,110.7 80.7,110.7 80.6,110.7 80.6,110.7 80.6,110.7 80.6,110.7 80.5,110.7 80.5,110.7 80.5,110.7 80.4,110.7 
-                                       80.4,110.7 80.4,110.7 80.4,110.7 80.3,110.7 80.3,110.7 80.3,110.7 80.2,110.7 80.2,110.7 80.2,110.7 80.2,110.7 80.1,110.7 
-                                       80.1,110.7 80.1,110.7 80,110.7 80,112.8 80.1,112.8 80.1,112.8 80.1,112.8 80.2,112.8 80.2,112.8 80.2,112.8 80.2,112.8 
-                                       80.3,112.8 80.3,112.8 80.3,112.8 80.4,112.8 80.4,112.8 80.4,112.8 80.4,112.8 80.5,112.8 80.5,112.8 80.5,112.8 80.6,112.8 
-                                       80.6,112.8 80.6,112.8 80.6,112.8 80.7,112.8 80.7,112.8 80.7,112.8 80.8,112.8 80.8,112.8 80.8,112.8 80.8,112.8 80.9,112.8 
-                                       80.9,112.8 80.9,112.8 81,112.8 81,112.8 81,112.8 81,112.8 81.1,112.8 81.1,112.8 81.1,112.8 81.2,112.8 81.2,112.8 
-                                       81.2,112.8 81.2,112.8 81.3,112.8 81.3,112.8 81.3,112.8 81.4,112.8 81.4,112.8 81.4,112.8 81.4,112.8 81.5,112.8 81.5,112.8 
-                                       81.5,112.8 81.6,112.8 81.6,112.8 81.6,112.8 81.6,112.8 81.7,112.8 81.7,112.8 81.7,112.8 81.8,112.8 81.8,112.8 81.8,112.8 
-                                       81.8,112.8 81.9,112.8 81.9,112.8 81.9,112.8 82,112.8 82,112.8 82,112.8 82,112.8 82.1,112.8 82.1,112.8 82.1,112.8 
-                                       82.1,112.8 82.2,112.8 82.2,112.8 82.2,112.8                             "/>
-                               <linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st13" points="114.9,78 114.9,78 114.9,78 114.8,78 114.8,78 114.8,78 114.8,78 114.7,78 114.7,78 114.7,78 
-                                       114.6,78 114.6,78 114.6,78 114.6,78 114.5,78 114.5,78 114.5,78 114.4,78 114.4,78 114.4,78 114.4,78 114.3,78 114.3,78 
-                                       114.3,78 114.2,78 114.2,78 114.2,78 114.2,78 114.1,78 114.1,78 114.1,78 114,78 114,78 114,78 114,78 113.9,78 113.9,78 
-                                       113.9,78 113.8,78 113.8,78 113.8,78 113.8,78 113.7,78 113.7,78 113.7,78 113.6,78 113.6,78 113.6,78 113.6,78 113.5,78 
-                                       113.5,78 113.5,78 113.4,78 113.4,78 113.4,78 113.4,78 113.3,78 113.3,78 113.3,78 113.2,78 113.2,78 113.2,78 113.2,78 
-                                       113.1,78 113.1,78 113.1,78 113,78 113,78 113,78 113,78 112.9,78 112.9,78 112.9,78 112.8,78 112.8,78 112.8,78 112.8,78 
-                                       112.7,78 112.7,78 112.7,78 112.7,78 112.6,78 112.6,78 112.6,78 112.5,78 112.5,78 112.5,78 112.5,78 112.4,78 112.4,78 
-                                       112.4,78 112.3,78 112.3,78 112.3,78 112.3,78 112.2,78 112.2,78 112.2,78 112.1,78 112.1,78 112.1,78 112.1,78 112,78 112,78 
-                                       112,78 111.9,78 111.9,78 111.9,78 111.9,78 111.8,78 111.8,78 111.8,78 111.7,78 111.7,78 111.7,78 111.7,78 111.6,78 
-                                       111.6,78 111.6,78 111.5,78 111.5,78 111.5,78 111.5,78 111.4,78 111.4,78 111.4,78 111.3,78 111.3,78 111.3,78 111.3,78 
-                                       111.2,78 111.2,78 111.2,78 111.1,78 111.1,78 111.1,78 111.1,78 111,78 111,78 111,78 110.9,78 110.9,78 110.9,78 110.9,78 
-                                       110.8,78 110.8,78 110.8,78 110.7,78 110.7,78 110.7,78 110.7,78 110.6,78 110.6,78 110.6,78 110.5,78 110.5,78 110.5,78 
-                                       110.5,78 110.4,78 110.4,78 110.4,78 110.4,78 110.3,78 110.3,78 110.3,78 110.2,78 110.2,78 110.2,78 110.2,78 110.1,78 
-                                       110.1,78 110.1,78 110,78 110,78 110,78 110,78 109.9,78 109.9,78 109.9,78 109.8,78 109.8,78 109.8,78 109.8,78 109.7,78 
-                                       109.7,78 109.7,78 109.6,78 109.6,78 109.6,78 109.6,78 109.5,78 109.5,78 109.5,80.1 109.5,80.1 109.6,80.1 109.6,80.1 
-                                       109.6,80.1 109.6,80.1 109.7,80.1 109.7,80.1 109.7,80.1 109.8,80.1 109.8,80.1 109.8,80.1 109.8,80.1 109.9,80.1 109.9,80.1 
-                                       109.9,80.1 110,80.1 110,80.1 110,80.1 110,80.1 110.1,80.1 110.1,80.1 110.1,80.1 110.2,80.1 110.2,80.1 110.2,80.1 
-                                       110.2,80.1 110.3,80.1 110.3,80.1 110.3,80.1 110.4,80.1 110.4,80.1 110.4,80.1 110.4,80.1 110.5,80.1 110.5,80.1 110.5,80.1 
-                                       110.5,80.1 110.6,80.1 110.6,80.1 110.6,80.1 110.7,80.1 110.7,80.1 110.7,80.1 110.7,80.1 110.8,80.1 110.8,80.1 110.8,80.1 
-                                       110.9,80.1 110.9,80.1 110.9,80.1 110.9,80.1 111,80.1 111,80.1 111,80.1 111.1,80.1 111.1,80.1 111.1,80.1 111.1,80.1 
-                                       111.2,80.1 111.2,80.1 111.2,80.1 111.3,80.1 111.3,80.1 111.3,80.1 111.3,80.1 111.4,80.1 111.4,80.1 111.4,80.1 111.5,80.1 
-                                       111.5,80.1 111.5,80.1 111.5,80.1 111.6,80.1 111.6,80.1 111.6,80.1 111.7,80.1 111.7,80.1 111.7,80.1 111.7,80.1 111.8,80.1 
-                                       111.8,80.1 111.8,80.1 111.9,80.1 111.9,80.1 111.9,80.1 111.9,80.1 112,80.1 112,80.1 112,80.1 112.1,80.1 112.1,80.1 
-                                       112.1,80.1 112.1,80.1 112.2,80.1 112.2,80.1 112.2,80.1 112.3,80.1 112.3,80.1 112.3,80.1 112.3,80.1 112.4,80.1 112.4,80.1 
-                                       112.4,80.1 112.5,80.1 112.5,80.1 112.5,80.1 112.5,80.1 112.6,80.1 112.6,80.1 112.6,80.1 112.7,80.1 112.7,80.1 112.7,80.1 
-                                       112.7,80.1 112.8,80.1 112.8,80.1 112.8,80.1 112.8,80.1 112.9,80.1 112.9,80.1 112.9,80.1 113,80.1 113,80.1 113,80.1 
-                                       113,80.1 113.1,80.1 113.1,80.1 113.1,80.1 113.2,80.1 113.2,80.1 113.2,80.1 113.2,80.1 113.3,80.1 113.3,80.1 113.3,80.1 
-                                       113.4,80.1 113.4,80.1 113.4,80.1 113.4,80.1 113.5,80.1 113.5,80.1 113.5,80.1 113.6,80.1 113.6,80.1 113.6,80.1 113.6,80.1 
-                                       113.7,80.1 113.7,80.1 113.7,80.1 113.8,80.1 113.8,80.1 113.8,80.1 113.8,80.1 113.9,80.1 113.9,80.1 113.9,80.1 114,80.1 
-                                       114,80.1 114,80.1 114,80.1 114.1,80.1 114.1,80.1 114.1,80.1 114.2,80.1 114.2,80.1 114.2,80.1 114.2,80.1 114.3,80.1 
-                                       114.3,80.1 114.3,80.1 114.4,80.1 114.4,80.1 114.4,80.1 114.4,80.1 114.5,80.1 114.5,80.1 114.5,80.1 114.6,80.1 114.6,80.1 
-                                       114.6,80.1 114.6,80.1 114.7,80.1 114.7,80.1 114.7,80.1 114.8,80.1 114.8,80.1 114.8,80.1 114.8,80.1 114.9,80.1 114.9,80.1 
-                                       114.9,80.1 115,80.1 115,78                              "/>
-                               <linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st14" points="109.5,85.5 109.5,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.7,85.5 
-                                       109.7,85.5 109.7,85.5 109.7,85.5 109.7,85.5 109.7,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 
-                                       109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 110,85.5 110,85.5 110,85.5 110,85.5 110,85.5 110,85.5 
-                                       110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.2,85.5 110.2,85.5 110.2,85.5 110.2,85.5 110.2,85.5 
-                                       110.2,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.4,85.5 110.4,85.5 110.4,85.5 110.4,85.5 110.4,85.5 
-                                       110.4,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.6,85.5 110.6,85.5 110.6,85.5 110.6,85.5 
-                                       110.6,85.5 110.6,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.8,85.5 110.8,85.5 110.8,85.5 
-                                       110.8,85.5 110.8,85.5 110.8,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 111,85.5 111,85.5 
-                                       111,85.5 111,85.5 111,85.5 111,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.2,85.5 111.2,85.5 
-                                       111.2,85.5 111.2,85.5 111.2,85.5 111.2,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.4,85.5 
-                                       111.4,85.5 111.4,85.5 111.4,85.5 111.4,85.5 111.4,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 
-                                       111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.7,85.5 111.7,85.5 111.7,85.5 111.7,85.5 111.7,85.5 
-                                       111.7,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.9,85.5 111.9,85.5 111.9,85.5 111.9,85.5 
-                                       111.9,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112.1,85.5 112.1,85.5 112.1,85.5 112.1,85.5 112.1,85.5 
-                                       112.1,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.3,85.5 112.3,85.5 112.3,85.5 112.3,85.5 
-                                       112.3,85.5 112.3,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.5,85.5 112.5,85.5 112.5,85.5 
-                                       112.5,85.5 112.5,85.5 112.5,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.7,85.5 112.7,85.5 112.7,85.5 
-                                       112.7,85.5 112.7,85.5 112.7,85.5 112.8,85.5 112.8,85.5 112.8,83.5 112.8,83.5 112.7,83.5 112.7,83.5 112.7,83.5 112.7,83.5 
-                                       112.7,83.5 112.7,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.5,83.5 112.5,83.5 112.5,83.5 112.5,83.5 
-                                       112.5,83.5 112.5,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.3,83.5 112.3,83.5 112.3,83.5 
-                                       112.3,83.5 112.3,83.5 112.3,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.1,83.5 112.1,83.5 
-                                       112.1,83.5 112.1,83.5 112.1,83.5 112.1,83.5 112,83.5 112,83.5 112,83.5 112,83.5 112,83.5 112,83.5 111.9,83.5 111.9,83.5 
-                                       111.9,83.5 111.9,83.5 111.9,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.7,83.5 111.7,83.5 
-                                       111.7,83.5 111.7,83.5 111.7,83.5 111.7,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.5,83.5 
-                                       111.5,83.5 111.5,83.5 111.5,83.5 111.5,83.5 111.5,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 
-                                       111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.2,83.5 111.2,83.5 111.2,83.5 111.2,83.5 111.2,83.5 
-                                       111.2,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111,83.5 111,83.5 111,83.5 111,83.5 111,83.5 111,83.5 
-                                       110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.8,83.5 110.8,83.5 110.8,83.5 110.8,83.5 110.8,83.5 
-                                       110.8,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.6,83.5 110.6,83.5 110.6,83.5 110.6,83.5 
-                                       110.6,83.5 110.6,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.4,83.5 110.4,83.5 110.4,83.5 
-                                       110.4,83.5 110.4,83.5 110.4,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.2,83.5 110.2,83.5 110.2,83.5 
-                                       110.2,83.5 110.2,83.5 110.2,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110,83.5 110,83.5 
-                                       110,83.5 110,83.5 110,83.5 110,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.8,83.5 
-                                       109.8,83.5 109.8,83.5 109.8,83.5 109.8,83.5 109.8,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 
-                                       109.6,83.5 109.6,83.5 109.6,83.5 109.6,83.5 109.6,83.5 109.5,83.5 109.5,83.5 109.5,83.5 109.5,83.5 109.5,85.5 109.5,85.5 
-                                                                       "/>
-                               <linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st15" points="114.9,88.9 114.9,88.9 114.8,88.9 114.8,88.9 114.8,88.9 114.8,88.9 114.7,88.9 114.7,88.9 
-                                       114.7,88.9 114.6,88.9 114.6,88.9 114.6,88.9 114.6,88.9 114.5,88.9 114.5,88.9 114.5,88.9 114.4,88.9 114.4,88.9 114.4,88.9 
-                                       114.4,88.9 114.3,88.9 114.3,88.9 114.3,88.9 114.2,88.9 114.2,88.9 114.2,88.9 114.2,88.9 114.1,88.9 114.1,88.9 114.1,88.9 
-                                       114,88.9 114,88.9 114,88.9 114,88.9 113.9,88.9 113.9,88.9 113.9,88.9 113.8,88.9 113.8,88.9 113.8,88.9 113.8,88.9 
-                                       113.7,88.9 113.7,88.9 113.7,88.9 113.6,88.9 113.6,88.9 113.6,88.9 113.6,88.9 113.5,88.9 113.5,88.9 113.5,88.9 113.4,88.9 
-                                       113.4,88.9 113.4,88.9 113.4,88.9 113.3,88.9 113.3,88.9 113.3,88.9 113.2,88.9 113.2,88.9 113.2,88.9 113.2,88.9 113.1,88.9 
-                                       113.1,88.9 113.1,88.9 113,88.9 113,88.9 113,88.9 113,88.9 112.9,88.9 112.9,88.9 112.9,88.9 112.8,88.9 112.8,88.9 
-                                       112.8,88.9 112.8,88.9 112.7,88.9 112.7,88.9 112.7,88.9 112.7,88.9 112.6,88.9 112.6,88.9 112.6,88.9 112.5,88.9 112.5,88.9 
-                                       112.5,88.9 112.5,88.9 112.4,88.9 112.4,88.9 112.4,88.9 112.3,88.9 112.3,88.9 112.3,88.9 112.3,88.9 112.2,88.9 112.2,88.9 
-                                       112.2,88.9 112.1,88.9 112.1,88.9 112.1,88.9 112.1,88.9 112,88.9 112,88.9 112,88.9 111.9,88.9 111.9,88.9 111.9,88.9 
-                                       111.9,88.9 111.8,88.9 111.8,88.9 111.8,88.9 111.7,88.9 111.7,88.9 111.7,88.9 111.7,88.9 111.6,88.9 111.6,88.9 111.6,88.9 
-                                       111.5,88.9 111.5,88.9 111.5,88.9 111.5,88.9 111.4,88.9 111.4,88.9 111.4,88.9 111.3,88.9 111.3,88.9 111.3,88.9 111.3,88.9 
-                                       111.2,88.9 111.2,88.9 111.2,88.9 111.1,88.9 111.1,88.9 111.1,88.9 111.1,88.9 111,88.9 111,88.9 111,88.9 110.9,88.9 
-                                       110.9,88.9 110.9,88.9 110.9,88.9 110.8,88.9 110.8,88.9 110.8,88.9 110.7,88.9 110.7,88.9 110.7,88.9 110.7,88.9 110.6,88.9 
-                                       110.6,88.9 110.6,88.9 110.5,88.9 110.5,88.9 110.5,88.9 110.5,88.9 110.4,88.9 110.4,88.9 110.4,88.9 110.4,88.9 110.3,88.9 
-                                       110.3,88.9 110.3,88.9 110.2,88.9 110.2,88.9 110.2,88.9 110.2,88.9 110.1,88.9 110.1,88.9 110.1,88.9 110,88.9 110,88.9 
-                                       110,88.9 110,88.9 109.9,88.9 109.9,88.9 109.9,88.9 109.8,88.9 109.8,88.9 109.8,88.9 109.8,88.9 109.7,88.9 109.7,88.9 
-                                       109.7,88.9 109.6,88.9 109.6,88.9 109.6,88.9 109.6,88.9 109.5,88.9 109.5,88.9 109.5,91 109.5,91 109.6,91 109.6,91 109.6,91 
-                                       109.6,91 109.7,91 109.7,91 109.7,91 109.8,91 109.8,91 109.8,91 109.8,91 109.9,91 109.9,91 109.9,91 110,91 110,91 110,91 
-                                       110,91 110.1,91 110.1,91 110.1,91 110.2,91 110.2,91 110.2,91 110.2,91 110.3,91 110.3,91 110.3,91 110.4,91 110.4,91 
-                                       110.4,91 110.4,91 110.5,91 110.5,91 110.5,91 110.5,91 110.6,91 110.6,91 110.6,91 110.7,91 110.7,91 110.7,91 110.7,91 
-                                       110.8,91 110.8,91 110.8,91 110.9,91 110.9,91 110.9,91 110.9,91 111,91 111,91 111,91 111.1,91 111.1,91 111.1,91 111.1,91 
-                                       111.2,91 111.2,91 111.2,91 111.3,91 111.3,91 111.3,91 111.3,91 111.4,91 111.4,91 111.4,91 111.5,91 111.5,91 111.5,91 
-                                       111.5,91 111.6,91 111.6,91 111.6,91 111.7,91 111.7,91 111.7,91 111.7,91 111.8,91 111.8,91 111.8,91 111.9,91 111.9,91 
-                                       111.9,91 111.9,91 112,91 112,91 112,91 112.1,91 112.1,91 112.1,91 112.1,91 112.2,91 112.2,91 112.2,91 112.3,91 112.3,91 
-                                       112.3,91 112.3,91 112.4,91 112.4,91 112.4,91 112.5,91 112.5,91 112.5,91 112.5,91 112.6,91 112.6,91 112.6,91 112.7,91 
-                                       112.7,91 112.7,91 112.7,91 112.8,91 112.8,91 112.8,91 112.8,91 112.9,91 112.9,91 112.9,91 113,91 113,91 113,91 113,91 
-                                       113.1,91 113.1,91 113.1,91 113.2,91 113.2,91 113.2,91 113.2,91 113.3,91 113.3,91 113.3,91 113.4,91 113.4,91 113.4,91 
-                                       113.4,91 113.5,91 113.5,91 113.5,91 113.6,91 113.6,91 113.6,91 113.6,91 113.7,91 113.7,91 113.7,91 113.8,91 113.8,91 
-                                       113.8,91 113.8,91 113.9,91 113.9,91 113.9,91 114,91 114,91 114,91 114,91 114.1,91 114.1,91 114.1,91 114.2,91 114.2,91 
-                                       114.2,91 114.2,91 114.3,91 114.3,91 114.3,91 114.4,91 114.4,91 114.4,91 114.4,91 114.5,91 114.5,91 114.5,91 114.6,91 
-                                       114.6,91 114.6,91 114.6,91 114.7,91 114.7,91 114.7,91 114.8,91 114.8,91 114.8,91 114.8,91 114.9,91 114.9,91 114.9,91 
-                                       115,91 115,88.9 114.9,88.9                              "/>
-                               <linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st16" points="109.5,96.5 109.5,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.7,96.5 
-                                       109.7,96.5 109.7,96.5 109.7,96.5 109.7,96.5 109.7,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 
-                                       109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 110,96.5 110,96.5 110,96.5 110,96.5 110,96.5 110,96.5 
-                                       110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.2,96.5 110.2,96.5 110.2,96.5 110.2,96.5 110.2,96.5 
-                                       110.2,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.4,96.5 110.4,96.5 110.4,96.5 110.4,96.5 110.4,96.5 
-                                       110.4,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.6,96.5 110.6,96.5 110.6,96.5 110.6,96.5 
-                                       110.6,96.5 110.6,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.8,96.5 110.8,96.5 110.8,96.5 
-                                       110.8,96.5 110.8,96.5 110.8,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 111,96.5 111,96.5 
-                                       111,96.5 111,96.5 111,96.5 111,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.2,96.5 111.2,96.5 
-                                       111.2,96.5 111.2,96.5 111.2,96.5 111.2,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.4,96.5 
-                                       111.4,96.5 111.4,96.5 111.4,96.5 111.4,96.5 111.4,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 
-                                       111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.7,96.5 111.7,96.5 111.7,96.5 111.7,96.5 111.7,96.5 
-                                       111.7,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.9,96.5 111.9,96.5 111.9,96.5 111.9,96.5 
-                                       111.9,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112.1,96.5 112.1,96.5 112.1,96.5 112.1,96.5 112.1,96.5 
-                                       112.1,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.3,96.5 112.3,96.5 112.3,96.5 112.3,96.5 
-                                       112.3,96.5 112.3,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.5,96.5 112.5,96.5 112.5,96.5 
-                                       112.5,96.5 112.5,96.5 112.5,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.7,96.5 112.7,96.5 112.7,96.5 
-                                       112.7,96.5 112.7,96.5 112.7,96.5 112.8,96.5 112.8,96.5 112.8,94.4 112.8,94.4 112.7,94.4 112.7,94.4 112.7,94.4 112.7,94.4 
-                                       112.7,94.4 112.7,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.5,94.4 112.5,94.4 112.5,94.4 112.5,94.4 
-                                       112.5,94.4 112.5,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.3,94.4 112.3,94.4 112.3,94.4 
-                                       112.3,94.4 112.3,94.4 112.3,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.1,94.4 112.1,94.4 
-                                       112.1,94.4 112.1,94.4 112.1,94.4 112.1,94.4 112,94.4 112,94.4 112,94.4 112,94.4 112,94.4 112,94.4 111.9,94.4 111.9,94.4 
-                                       111.9,94.4 111.9,94.4 111.9,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.7,94.4 111.7,94.4 
-                                       111.7,94.4 111.7,94.4 111.7,94.4 111.7,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.5,94.4 
-                                       111.5,94.4 111.5,94.4 111.5,94.4 111.5,94.4 111.5,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 
-                                       111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.2,94.4 111.2,94.4 111.2,94.4 111.2,94.4 111.2,94.4 
-                                       111.2,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111,94.4 111,94.4 111,94.4 111,94.4 111,94.4 111,94.4 
-                                       110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.8,94.4 110.8,94.4 110.8,94.4 110.8,94.4 110.8,94.4 
-                                       110.8,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.6,94.4 110.6,94.4 110.6,94.4 110.6,94.4 
-                                       110.6,94.4 110.6,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.4,94.4 110.4,94.4 110.4,94.4 
-                                       110.4,94.4 110.4,94.4 110.4,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.2,94.4 110.2,94.4 110.2,94.4 
-                                       110.2,94.4 110.2,94.4 110.2,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110,94.4 110,94.4 
-                                       110,94.4 110,94.4 110,94.4 110,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.8,94.4 
-                                       109.8,94.4 109.8,94.4 109.8,94.4 109.8,94.4 109.8,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 
-                                       109.6,94.4 109.6,94.4 109.6,94.4 109.6,94.4 109.6,94.4 109.5,94.4 109.5,94.4 109.5,94.4 109.5,94.4 109.5,96.5 109.5,96.5 
-                                                                       "/>
-                               <linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st17" points="114.9,99.8 114.9,99.8 114.8,99.8 114.8,99.8 114.8,99.8 114.8,99.8 114.7,99.8 114.7,99.8 
-                                       114.7,99.8 114.6,99.8 114.6,99.8 114.6,99.8 114.6,99.8 114.5,99.8 114.5,99.8 114.5,99.8 114.4,99.8 114.4,99.8 114.4,99.8 
-                                       114.4,99.8 114.3,99.8 114.3,99.8 114.3,99.8 114.2,99.8 114.2,99.8 114.2,99.8 114.2,99.8 114.1,99.8 114.1,99.8 114.1,99.8 
-                                       114,99.8 114,99.8 114,99.8 114,99.8 113.9,99.8 113.9,99.8 113.9,99.8 113.8,99.8 113.8,99.8 113.8,99.8 113.8,99.8 
-                                       113.7,99.8 113.7,99.8 113.7,99.8 113.6,99.8 113.6,99.8 113.6,99.8 113.6,99.8 113.5,99.8 113.5,99.8 113.5,99.8 113.4,99.8 
-                                       113.4,99.8 113.4,99.8 113.4,99.8 113.3,99.8 113.3,99.8 113.3,99.8 113.2,99.8 113.2,99.8 113.2,99.8 113.2,99.8 113.1,99.8 
-                                       113.1,99.8 113.1,99.8 113,99.8 113,99.8 113,99.8 113,99.8 112.9,99.8 112.9,99.8 112.9,99.8 112.8,99.8 112.8,99.8 
-                                       112.8,99.8 112.8,99.8 112.7,99.8 112.7,99.8 112.7,99.8 112.7,99.8 112.6,99.8 112.6,99.8 112.6,99.8 112.5,99.8 112.5,99.8 
-                                       112.5,99.8 112.5,99.8 112.4,99.8 112.4,99.8 112.4,99.8 112.3,99.8 112.3,99.8 112.3,99.8 112.3,99.8 112.2,99.8 112.2,99.8 
-                                       112.2,99.8 112.1,99.8 112.1,99.8 112.1,99.8 112.1,99.8 112,99.8 112,99.8 112,99.8 111.9,99.8 111.9,99.8 111.9,99.8 
-                                       111.9,99.8 111.8,99.8 111.8,99.8 111.8,99.8 111.7,99.8 111.7,99.8 111.7,99.8 111.7,99.8 111.6,99.8 111.6,99.8 111.6,99.8 
-                                       111.5,99.8 111.5,99.8 111.5,99.8 111.5,99.8 111.4,99.8 111.4,99.8 111.4,99.8 111.3,99.8 111.3,99.8 111.3,99.8 111.3,99.8 
-                                       111.2,99.8 111.2,99.8 111.2,99.8 111.1,99.8 111.1,99.8 111.1,99.8 111.1,99.8 111,99.8 111,99.8 111,99.8 110.9,99.8 
-                                       110.9,99.8 110.9,99.8 110.9,99.8 110.8,99.8 110.8,99.8 110.8,99.8 110.7,99.8 110.7,99.8 110.7,99.8 110.7,99.8 110.6,99.8 
-                                       110.6,99.8 110.6,99.8 110.5,99.8 110.5,99.8 110.5,99.8 110.5,99.8 110.4,99.8 110.4,99.8 110.4,99.8 110.4,99.8 110.3,99.8 
-                                       110.3,99.8 110.3,99.8 110.2,99.8 110.2,99.8 110.2,99.8 110.2,99.8 110.1,99.8 110.1,99.8 110.1,99.8 110,99.8 110,99.8 
-                                       110,99.8 110,99.8 109.9,99.8 109.9,99.8 109.9,99.8 109.8,99.8 109.8,99.8 109.8,99.8 109.8,99.8 109.7,99.8 109.7,99.8 
-                                       109.7,99.8 109.6,99.8 109.6,99.8 109.6,99.8 109.6,99.8 109.5,99.8 109.5,99.8 109.5,101.9 109.5,101.9 109.6,101.9 
-                                       109.6,101.9 109.6,101.9 109.6,101.9 109.7,101.9 109.7,101.9 109.7,101.9 109.8,101.9 109.8,101.9 109.8,101.9 109.8,101.9 
-                                       109.9,101.9 109.9,101.9 109.9,101.9 110,101.9 110,101.9 110,101.9 110,101.9 110.1,101.9 110.1,101.9 110.1,101.9 
-                                       110.2,101.9 110.2,101.9 110.2,101.9 110.2,101.9 110.3,101.9 110.3,101.9 110.3,101.9 110.4,101.9 110.4,101.9 110.4,101.9 
-                                       110.4,101.9 110.5,101.9 110.5,101.9 110.5,101.9 110.5,101.9 110.6,101.9 110.6,101.9 110.6,101.9 110.7,101.9 110.7,101.9 
-                                       110.7,101.9 110.7,101.9 110.8,101.9 110.8,101.9 110.8,101.9 110.9,101.9 110.9,101.9 110.9,101.9 110.9,101.9 111,101.9 
-                                       111,101.9 111,101.9 111.1,101.9 111.1,101.9 111.1,101.9 111.1,101.9 111.2,101.9 111.2,101.9 111.2,101.9 111.3,101.9 
-                                       111.3,101.9 111.3,101.9 111.3,101.9 111.4,101.9 111.4,101.9 111.4,101.9 111.5,101.9 111.5,101.9 111.5,101.9 111.5,101.9 
-                                       111.6,101.9 111.6,101.9 111.6,101.9 111.7,101.9 111.7,101.9 111.7,101.9 111.7,101.9 111.8,101.9 111.8,101.9 111.8,101.9 
-                                       111.9,101.9 111.9,101.9 111.9,101.9 111.9,101.9 112,101.9 112,101.9 112,101.9 112.1,101.9 112.1,101.9 112.1,101.9 
-                                       112.1,101.9 112.2,101.9 112.2,101.9 112.2,101.9 112.3,101.9 112.3,101.9 112.3,101.9 112.3,101.9 112.4,101.9 112.4,101.9 
-                                       112.4,101.9 112.5,101.9 112.5,101.9 112.5,101.9 112.5,101.9 112.6,101.9 112.6,101.9 112.6,101.9 112.7,101.9 112.7,101.9 
-                                       112.7,101.9 112.7,101.9 112.8,101.9 112.8,101.9 112.8,101.9 112.8,101.9 112.9,101.9 112.9,101.9 112.9,101.9 113,101.9 
-                                       113,101.9 113,101.9 113,101.9 113.1,101.9 113.1,101.9 113.1,101.9 113.2,101.9 113.2,101.9 113.2,101.9 113.2,101.9 
-                                       113.3,101.9 113.3,101.9 113.3,101.9 113.4,101.9 113.4,101.9 113.4,101.9 113.4,101.9 113.5,101.9 113.5,101.9 113.5,101.9 
-                                       113.6,101.9 113.6,101.9 113.6,101.9 113.6,101.9 113.7,101.9 113.7,101.9 113.7,101.9 113.8,101.9 113.8,101.9 113.8,101.9 
-                                       113.8,101.9 113.9,101.9 113.9,101.9 113.9,101.9 114,101.9 114,101.9 114,101.9 114,101.9 114.1,101.9 114.1,101.9 
-                                       114.1,101.9 114.2,101.9 114.2,101.9 114.2,101.9 114.2,101.9 114.3,101.9 114.3,101.9 114.3,101.9 114.4,101.9 114.4,101.9 
-                                       114.4,101.9 114.4,101.9 114.5,101.9 114.5,101.9 114.5,101.9 114.6,101.9 114.6,101.9 114.6,101.9 114.6,101.9 114.7,101.9 
-                                       114.7,101.9 114.7,101.9 114.8,101.9 114.8,101.9 114.8,101.9 114.8,101.9 114.9,101.9 114.9,101.9 114.9,101.9 115,101.9 
-                                       115,99.8 114.9,99.8                             "/>
-                               <linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st18" points="109.5,107.4 109.5,107.4 109.6,107.4 109.6,107.4 109.6,107.4 109.6,107.4 109.6,107.4 
-                                       109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.8,107.4 109.8,107.4 109.8,107.4 109.8,107.4 
-                                       109.8,107.4 109.8,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 110,107.4 110,107.4 
-                                       110,107.4 110,107.4 110,107.4 110,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 
-                                       110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.3,107.4 110.3,107.4 110.3,107.4 110.3,107.4 
-                                       110.3,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.5,107.4 110.5,107.4 110.5,107.4 
-                                       110.5,107.4 110.5,107.4 110.5,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.7,107.4 
-                                       110.7,107.4 110.7,107.4 110.7,107.4 110.7,107.4 110.7,107.4 110.8,107.4 110.8,107.4 110.8,107.4 110.8,107.4 110.8,107.4 
-                                       110.8,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 111,107.4 111,107.4 111,107.4 
-                                       111,107.4 111,107.4 111,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.2,107.4 111.2,107.4 
-                                       111.2,107.4 111.2,107.4 111.2,107.4 111.2,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 
-                                       111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.5,107.4 111.5,107.4 111.5,107.4 111.5,107.4 
-                                       111.5,107.4 111.5,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.7,107.4 111.7,107.4 
-                                       111.7,107.4 111.7,107.4 111.7,107.4 111.7,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 
-                                       111.9,107.4 111.9,107.4 111.9,107.4 111.9,107.4 111.9,107.4 112,107.4 112,107.4 112,107.4 112,107.4 112,107.4 112,107.4 
-                                       112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.2,107.4 112.2,107.4 112.2,107.4 112.2,107.4 
-                                       112.2,107.4 112.2,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.4,107.4 112.4,107.4 
-                                       112.4,107.4 112.4,107.4 112.4,107.4 112.4,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 
-                                       112.6,107.4 112.6,107.4 112.6,107.4 112.6,107.4 112.6,107.4 112.7,107.4 112.7,107.4 112.7,107.4 112.7,107.4 112.7,107.4 
-                                       112.7,107.4 112.8,107.4 112.8,107.4 112.8,105.3 112.8,105.3 112.7,105.3 112.7,105.3 112.7,105.3 112.7,105.3 112.7,105.3 
-                                       112.7,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.5,105.3 112.5,105.3 112.5,105.3 112.5,105.3 
-                                       112.5,105.3 112.5,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.3,105.3 112.3,105.3 
-                                       112.3,105.3 112.3,105.3 112.3,105.3 112.3,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 
-                                       112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112,105.3 112,105.3 112,105.3 112,105.3 112,105.3 
-                                       112,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.8,105.3 111.8,105.3 111.8,105.3 111.8,105.3 
-                                       111.8,105.3 111.8,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.6,105.3 111.6,105.3 
-                                       111.6,105.3 111.6,105.3 111.6,105.3 111.6,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 
-                                       111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.3,105.3 111.3,105.3 111.3,105.3 111.3,105.3 
-                                       111.3,105.3 111.3,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.1,105.3 111.1,105.3 
-                                       111.1,105.3 111.1,105.3 111.1,105.3 111,105.3 111,105.3 111,105.3 111,105.3 111,105.3 111,105.3 110.9,105.3 110.9,105.3 
-                                       110.9,105.3 110.9,105.3 110.9,105.3 110.9,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 
-                                       110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.6,105.3 110.6,105.3 110.6,105.3 110.6,105.3 
-                                       110.6,105.3 110.6,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.4,105.3 110.4,105.3 
-                                       110.4,105.3 110.4,105.3 110.4,105.3 110.4,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.2,105.3 
-                                       110.2,105.3 110.2,105.3 110.2,105.3 110.2,105.3 110.2,105.3 110.1,105.3 110.1,105.3 110.1,105.3 110.1,105.3 110.1,105.3 
-                                       110.1,105.3 110,105.3 110,105.3 110,105.3 110,105.3 110,105.3 110,105.3 109.9,105.3 109.9,105.3 109.9,105.3 109.9,105.3 
-                                       109.9,105.3 109.9,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.7,105.3 109.7,105.3 
-                                       109.7,105.3 109.7,105.3 109.7,105.3 109.7,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.5,105.3 
-                                       109.5,105.3 109.5,105.3 109.5,105.3 109.5,107.4 109.5,107.4                             "/>
-                               <linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <polygon class="st19" points="114.9,110.7 114.9,110.7 114.8,110.7 114.8,110.7 114.8,110.7 114.8,110.7 114.7,110.7 
-                                       114.7,110.7 114.7,110.7 114.6,110.7 114.6,110.7 114.6,110.7 114.6,110.7 114.5,110.7 114.5,110.7 114.5,110.7 114.4,110.7 
-                                       114.4,110.7 114.4,110.7 114.4,110.7 114.3,110.7 114.3,110.7 114.3,110.7 114.2,110.7 114.2,110.7 114.2,110.7 114.2,110.7 
-                                       114.1,110.7 114.1,110.7 114.1,110.7 114,110.7 114,110.7 114,110.7 114,110.7 113.9,110.7 113.9,110.7 113.9,110.7 
-                                       113.8,110.7 113.8,110.7 113.8,110.7 113.8,110.7 113.7,110.7 113.7,110.7 113.7,110.7 113.6,110.7 113.6,110.7 113.6,110.7 
-                                       113.6,110.7 113.5,110.7 113.5,110.7 113.5,110.7 113.4,110.7 113.4,110.7 113.4,110.7 113.4,110.7 113.3,110.7 113.3,110.7 
-                                       113.3,110.7 113.2,110.7 113.2,110.7 113.2,110.7 113.2,110.7 113.1,110.7 113.1,110.7 113.1,110.7 113,110.7 113,110.7 
-                                       113,110.7 113,110.7 112.9,110.7 112.9,110.7 112.9,110.7 112.8,110.7 112.8,110.7 112.8,110.7 112.8,110.7 112.7,110.7 
-                                       112.7,110.7 112.7,110.7 112.7,110.7 112.6,110.7 112.6,110.7 112.6,110.7 112.5,110.7 112.5,110.7 112.5,110.7 112.5,110.7 
-                                       112.4,110.7 112.4,110.7 112.4,110.7 112.3,110.7 112.3,110.7 112.3,110.7 112.3,110.7 112.2,110.7 112.2,110.7 112.2,110.7 
-                                       112.1,110.7 112.1,110.7 112.1,110.7 112.1,110.7 112,110.7 112,110.7 112,110.7 111.9,110.7 111.9,110.7 111.9,110.7 
-                                       111.9,110.7 111.8,110.7 111.8,110.7 111.8,110.7 111.7,110.7 111.7,110.7 111.7,110.7 111.7,110.7 111.6,110.7 111.6,110.7 
-                                       111.6,110.7 111.5,110.7 111.5,110.7 111.5,110.7 111.5,110.7 111.4,110.7 111.4,110.7 111.4,110.7 111.3,110.7 111.3,110.7 
-                                       111.3,110.7 111.3,110.7 111.2,110.7 111.2,110.7 111.2,110.7 111.1,110.7 111.1,110.7 111.1,110.7 111.1,110.7 111,110.7 
-                                       111,110.7 111,110.7 110.9,110.7 110.9,110.7 110.9,110.7 110.9,110.7 110.8,110.7 110.8,110.7 110.8,110.7 110.7,110.7 
-                                       110.7,110.7 110.7,110.7 110.7,110.7 110.6,110.7 110.6,110.7 110.6,110.7 110.5,110.7 110.5,110.7 110.5,110.7 110.5,110.7 
-                                       110.4,110.7 110.4,110.7 110.4,110.7 110.4,110.7 110.3,110.7 110.3,110.7 110.3,110.7 110.2,110.7 110.2,110.7 110.2,110.7 
-                                       110.2,110.7 110.1,110.7 110.1,110.7 110.1,110.7 110,110.7 110,110.7 110,110.7 110,110.7 109.9,110.7 109.9,110.7 
-                                       109.9,110.7 109.8,110.7 109.8,110.7 109.8,110.7 109.8,110.7 109.7,110.7 109.7,110.7 109.7,110.7 109.6,110.7 109.6,110.7 
-                                       109.6,110.7 109.6,110.7 109.5,110.7 109.5,110.7 109.5,112.8 109.5,112.8 109.6,112.8 109.6,112.8 109.6,112.8 109.6,112.8 
-                                       109.7,112.8 109.7,112.8 109.7,112.8 109.8,112.8 109.8,112.8 109.8,112.8 109.8,112.8 109.9,112.8 109.9,112.8 109.9,112.8 
-                                       110,112.8 110,112.8 110,112.8 110,112.8 110.1,112.8 110.1,112.8 110.1,112.8 110.2,112.8 110.2,112.8 110.2,112.8 
-                                       110.2,112.8 110.3,112.8 110.3,112.8 110.3,112.8 110.4,112.8 110.4,112.8 110.4,112.8 110.4,112.8 110.5,112.8 110.5,112.8 
-                                       110.5,112.8 110.5,112.8 110.6,112.8 110.6,112.8 110.6,112.8 110.7,112.8 110.7,112.8 110.7,112.8 110.7,112.8 110.8,112.8 
-                                       110.8,112.8 110.8,112.8 110.9,112.8 110.9,112.8 110.9,112.8 110.9,112.8 111,112.8 111,112.8 111,112.8 111.1,112.8 
-                                       111.1,112.8 111.1,112.8 111.1,112.8 111.2,112.8 111.2,112.8 111.2,112.8 111.3,112.8 111.3,112.8 111.3,112.8 111.3,112.8 
-                                       111.4,112.8 111.4,112.8 111.4,112.8 111.5,112.8 111.5,112.8 111.5,112.8 111.5,112.8 111.6,112.8 111.6,112.8 111.6,112.8 
-                                       111.7,112.8 111.7,112.8 111.7,112.8 111.7,112.8 111.8,112.8 111.8,112.8 111.8,112.8 111.9,112.8 111.9,112.8 111.9,112.8 
-                                       111.9,112.8 112,112.8 112,112.8 112,112.8 112.1,112.8 112.1,112.8 112.1,112.8 112.1,112.8 112.2,112.8 112.2,112.8 
-                                       112.2,112.8 112.3,112.8 112.3,112.8 112.3,112.8 112.3,112.8 112.4,112.8 112.4,112.8 112.4,112.8 112.5,112.8 112.5,112.8 
-                                       112.5,112.8 112.5,112.8 112.6,112.8 112.6,112.8 112.6,112.8 112.7,112.8 112.7,112.8 112.7,112.8 112.7,112.8 112.8,112.8 
-                                       112.8,112.8 112.8,112.8 112.8,112.8 112.9,112.8 112.9,112.8 112.9,112.8 113,112.8 113,112.8 113,112.8 113,112.8 
-                                       113.1,112.8 113.1,112.8 113.1,112.8 113.2,112.8 113.2,112.8 113.2,112.8 113.2,112.8 113.3,112.8 113.3,112.8 113.3,112.8 
-                                       113.4,112.8 113.4,112.8 113.4,112.8 113.4,112.8 113.5,112.8 113.5,112.8 113.5,112.8 113.6,112.8 113.6,112.8 113.6,112.8 
-                                       113.6,112.8 113.7,112.8 113.7,112.8 113.7,112.8 113.8,112.8 113.8,112.8 113.8,112.8 113.8,112.8 113.9,112.8 113.9,112.8 
-                                       113.9,112.8 114,112.8 114,112.8 114,112.8 114,112.8 114.1,112.8 114.1,112.8 114.1,112.8 114.2,112.8 114.2,112.8 
-                                       114.2,112.8 114.2,112.8 114.3,112.8 114.3,112.8 114.3,112.8 114.4,112.8 114.4,112.8 114.4,112.8 114.4,112.8 114.5,112.8 
-                                       114.5,112.8 114.5,112.8 114.6,112.8 114.6,112.8 114.6,112.8 114.6,112.8 114.7,112.8 114.7,112.8 114.7,112.8 114.8,112.8 
-                                       114.8,112.8 114.8,112.8 114.8,112.8 114.9,112.8 114.9,112.8 114.9,112.8 115,112.8 115,110.7 114.9,110.7                                 "/>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/hvac_active.svg b/homescreen/qml/images/Shortcut/hvac_active.svg
deleted file mode 100644 (file)
index 46be46b..0000000
+++ /dev/null
@@ -1,614 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-       .st8{fill:url(#SVGID_3_);}
-       .st9{fill:url(#SVGID_4_);}
-       .st10{fill:url(#SVGID_5_);}
-       .st11{fill:url(#SVGID_6_);}
-       .st12{fill:url(#SVGID_7_);}
-       .st13{fill:url(#SVGID_8_);}
-       .st14{fill:url(#SVGID_9_);}
-       .st15{fill:url(#SVGID_10_);}
-       .st16{fill:url(#SVGID_11_);}
-       .st17{fill:url(#SVGID_12_);}
-       .st18{fill:url(#SVGID_13_);}
-       .st19{fill:url(#SVGID_14_);}
-       .st20{fill:url(#SVGID_15_);}
-       .st21{fill:url(#SVGID_16_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g id="Layer_6">
-                       
-                               <rect id="Active_1" y="214.3" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" class="st0" width="195.9" height="2.4"/>
-                       <linearGradient id="Active_2_1_" gradientUnits="userSpaceOnUse" x1="97.9416" y1="236.9585" x2="97.9416" y2="-68.5304">
-                               <stop  offset="0" style="stop-color:#0DF9FF"/>
-                               <stop  offset="9.208472e-02" style="stop-color:#0DF9FF;stop-opacity:0.853"/>
-                               <stop  offset="0.6264" style="stop-color:#0DF9FF;stop-opacity:0"/>
-                       </linearGradient>
-                       <rect id="Active_2" class="st1" width="195.9" height="214.3"/>
-               </g>
-               <g id="HVAC">
-                       <g>
-                               <g id="HVAC_Icon_2_">
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="97.4991" y1="166.6087" x2="97.4991" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st6" d="M106.2,113.4V81.3c0-4.9-3.9-8.8-8.7-8.8c-4.8,0-8.7,4-8.7,8.8v1.2H91v-1.2c0-3.7,2.9-6.6,6.5-6.6
-                                               c3.6,0,6.5,3,6.5,6.6v33.3l0.5,0.3c3.8,2.4,6.1,6.5,6.1,11c0,7.2-5.8,13.1-13,13.1c-7.3,0-13.2-5.9-13.2-13.1
-                                               c0-4.6,2.3-8.8,6-11.1l0.5-0.3V88.3h-2.2v25c-4.1,2.8-6.5,7.5-6.5,12.6c0,8.4,6.9,15.3,15.3,15.3c8.4,0,15.2-6.9,15.2-15.3
-                                               C112.8,120.9,110.3,116.2,106.2,113.4z"/>
-                                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="97.4991" y1="166.6087" x2="97.4991" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st7" d="M97.6,98.6c-4,0-4.4,2.4-4.4,3.5v13.7l-1.4,0.9c-3.2,2-5.2,5.5-5.2,9.3c0,6,4.9,10.9,10.9,10.9
-                                               c2,0,4-0.6,5.8-1.6l-1.2-1.9c-1.4,0.9-3,1.3-4.6,1.3c-4.8,0-8.7-3.9-8.7-8.7c0-3,1.5-5.8,4.1-7.4l2.5-1.5v-14.9
-                                               c0-0.4,0-1.3,2.2-1.3c2.1,0,2.1,0.6,2.1,1.2V117l2.5,1.6c2.5,1.6,4,4.4,4,7.3h2.2c0-3.7-1.9-7.2-5-9.2l-1.5-1V102
-                                               C101.9,100.5,101.1,98.6,97.6,98.6z"/>
-                                       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st8" points="80.1,80.1 80.1,80.1 80.2,80.1 80.2,80.1 80.2,80.1 80.2,80.1 80.3,80.1 80.3,80.1 80.3,80.1 
-                                               80.4,80.1 80.4,80.1 80.4,80.1 80.4,80.1 80.5,80.1 80.5,80.1 80.5,80.1 80.6,80.1 80.6,80.1 80.6,80.1 80.6,80.1 80.7,80.1 
-                                               80.7,80.1 80.7,80.1 80.8,80.1 80.8,80.1 80.8,80.1 80.8,80.1 80.9,80.1 80.9,80.1 80.9,80.1 81,80.1 81,80.1 81,80.1 81,80.1 
-                                               81.1,80.1 81.1,80.1 81.1,80.1 81.2,80.1 81.2,80.1 81.2,80.1 81.2,80.1 81.3,80.1 81.3,80.1 81.3,80.1 81.4,80.1 81.4,80.1 
-                                               81.4,80.1 81.4,80.1 81.5,80.1 81.5,80.1 81.5,80.1 81.6,80.1 81.6,80.1 81.6,80.1 81.6,80.1 81.7,80.1 81.7,80.1 81.7,80.1 
-                                               81.8,80.1 81.8,80.1 81.8,80.1 81.8,80.1 81.9,80.1 81.9,80.1 81.9,80.1 82,80.1 82,80.1 82,80.1 82,80.1 82.1,80.1 82.1,80.1 
-                                               82.1,80.1 82.1,80.1 82.2,80.1 82.2,80.1 82.2,80.1 82.3,80.1 82.3,80.1 82.3,80.1 82.3,80.1 82.4,80.1 82.4,80.1 82.4,80.1 
-                                               82.5,80.1 82.5,80.1 82.5,80.1 82.5,80.1 82.6,80.1 82.6,80.1 82.6,80.1 82.7,80.1 82.7,80.1 82.7,80.1 82.7,80.1 82.8,80.1 
-                                               82.8,80.1 82.8,80.1 82.9,80.1 82.9,80.1 82.9,80.1 82.9,80.1 83,80.1 83,80.1 83,80.1 83.1,80.1 83.1,80.1 83.1,80.1 
-                                               83.1,80.1 83.2,80.1 83.2,80.1 83.2,80.1 83.3,80.1 83.3,80.1 83.3,80.1 83.3,80.1 83.4,80.1 83.4,80.1 83.4,80.1 83.5,80.1 
-                                               83.5,80.1 83.5,80.1 83.5,80.1 83.6,80.1 83.6,80.1 83.6,80.1 83.7,80.1 83.7,80.1 83.7,80.1 83.7,80.1 83.8,80.1 83.8,80.1 
-                                               83.8,80.1 83.9,80.1 83.9,80.1 83.9,80.1 83.9,80.1 84,80.1 84,80.1 84,80.1 84.1,80.1 84.1,80.1 84.1,80.1 84.1,80.1 
-                                               84.2,80.1 84.2,80.1 84.2,80.1 84.3,80.1 84.3,80.1 84.3,80.1 84.3,80.1 84.4,80.1 84.4,80.1 84.4,80.1 84.5,80.1 84.5,80.1 
-                                               84.5,80.1 84.5,80.1 84.6,80.1 84.6,80.1 84.6,80.1 84.6,80.1 84.7,80.1 84.7,80.1 84.7,80.1 84.8,80.1 84.8,80.1 84.8,80.1 
-                                               84.8,80.1 84.9,80.1 84.9,80.1 84.9,80.1 85,80.1 85,80.1 85,80.1 85,80.1 85.1,80.1 85.1,80.1 85.1,80.1 85.2,80.1 85.2,80.1 
-                                               85.2,80.1 85.2,80.1 85.3,80.1 85.3,80.1 85.3,80.1 85.4,80.1 85.4,80.1 85.4,80.1 85.4,80.1 85.5,80.1 85.5,80.1 85.5,78 
-                                               85.5,78 85.4,78 85.4,78 85.4,78 85.4,78 85.3,78 85.3,78 85.3,78 85.2,78 85.2,78 85.2,78 85.2,78 85.1,78 85.1,78 85.1,78 
-                                               85,78 85,78 85,78 85,78 84.9,78 84.9,78 84.9,78 84.8,78 84.8,78 84.8,78 84.8,78 84.7,78 84.7,78 84.7,78 84.6,78 84.6,78 
-                                               84.6,78 84.6,78 84.5,78 84.5,78 84.5,78 84.5,78 84.4,78 84.4,78 84.4,78 84.3,78 84.3,78 84.3,78 84.3,78 84.2,78 84.2,78 
-                                               84.2,78 84.1,78 84.1,78 84.1,78 84.1,78 84,78 84,78 84,78 83.9,78 83.9,78 83.9,78 83.9,78 83.8,78 83.8,78 83.8,78 83.7,78 
-                                               83.7,78 83.7,78 83.7,78 83.6,78 83.6,78 83.6,78 83.5,78 83.5,78 83.5,78 83.5,78 83.4,78 83.4,78 83.4,78 83.3,78 83.3,78 
-                                               83.3,78 83.3,78 83.2,78 83.2,78 83.2,78 83.1,78 83.1,78 83.1,78 83.1,78 83,78 83,78 83,78 82.9,78 82.9,78 82.9,78 82.9,78 
-                                               82.8,78 82.8,78 82.8,78 82.7,78 82.7,78 82.7,78 82.7,78 82.6,78 82.6,78 82.6,78 82.5,78 82.5,78 82.5,78 82.5,78 82.4,78 
-                                               82.4,78 82.4,78 82.3,78 82.3,78 82.3,78 82.3,78 82.2,78 82.2,78 82.2,78 82.1,78 82.1,78 82.1,78 82.1,78 82,78 82,78 82,78 
-                                               82,78 81.9,78 81.9,78 81.9,78 81.8,78 81.8,78 81.8,78 81.8,78 81.7,78 81.7,78 81.7,78 81.6,78 81.6,78 81.6,78 81.6,78 
-                                               81.5,78 81.5,78 81.5,78 81.4,78 81.4,78 81.4,78 81.4,78 81.3,78 81.3,78 81.3,78 81.2,78 81.2,78 81.2,78 81.2,78 81.1,78 
-                                               81.1,78 81.1,78 81,78 81,78 81,78 81,78 80.9,78 80.9,78 80.9,78 80.8,78 80.8,78 80.8,78 80.8,78 80.7,78 80.7,78 80.7,78 
-                                               80.6,78 80.6,78 80.6,78 80.6,78 80.5,78 80.5,78 80.5,78 80.4,78 80.4,78 80.4,78 80.4,78 80.3,78 80.3,78 80.3,78 80.2,78 
-                                               80.2,78 80.2,78 80.2,78 80.1,78 80.1,78 80.1,78 80,78 80,80.1 80.1,80.1                                         "/>
-                                       <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st9" points="85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.4,83.5 85.3,83.5 85.3,83.5 85.3,83.5 
-                                               85.3,83.5 85.3,83.5 85.3,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.2,83.5 85.1,83.5 85.1,83.5 85.1,83.5 
-                                               85.1,83.5 85.1,83.5 85.1,83.5 85,83.5 85,83.5 85,83.5 85,83.5 85,83.5 85,83.5 84.9,83.5 84.9,83.5 84.9,83.5 84.9,83.5 
-                                               84.9,83.5 84.9,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.8,83.5 84.7,83.5 84.7,83.5 84.7,83.5 84.7,83.5 
-                                               84.7,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.6,83.5 84.5,83.5 84.5,83.5 84.5,83.5 84.5,83.5 84.5,83.5 
-                                               84.5,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.4,83.5 84.3,83.5 84.3,83.5 84.3,83.5 84.3,83.5 84.3,83.5 
-                                               84.3,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.2,83.5 84.1,83.5 84.1,83.5 84.1,83.5 84.1,83.5 84.1,83.5 
-                                               84.1,83.5 84,83.5 84,83.5 84,83.5 84,83.5 84,83.5 84,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.9,83.5 83.8,83.5 
-                                               83.8,83.5 83.8,83.5 83.8,83.5 83.8,83.5 83.8,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.7,83.5 83.6,83.5 
-                                               83.6,83.5 83.6,83.5 83.6,83.5 83.6,83.5 83.6,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.5,83.5 83.4,83.5 
-                                               83.4,83.5 83.4,83.5 83.4,83.5 83.4,83.5 83.4,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.3,83.5 83.2,83.5 
-                                               83.2,83.5 83.2,83.5 83.2,83.5 83.2,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83.1,83.5 83,83.5 83,83.5 
-                                               83,83.5 83,83.5 83,83.5 83,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.9,83.5 82.8,83.5 82.8,83.5 82.8,83.5 
-                                               82.8,83.5 82.8,83.5 82.8,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.7,83.5 82.6,83.5 82.6,83.5 82.6,83.5 
-                                               82.6,83.5 82.6,83.5 82.6,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.5,83.5 82.4,83.5 82.4,83.5 82.4,83.5 
-                                               82.4,83.5 82.4,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.3,83.5 82.2,83.5 82.2,83.5 82.2,85.5 82.2,85.5 
-                                               82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.3,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.4,85.5 82.5,85.5 
-                                               82.5,85.5 82.5,85.5 82.5,85.5 82.5,85.5 82.5,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.6,85.5 82.7,85.5 
-                                               82.7,85.5 82.7,85.5 82.7,85.5 82.7,85.5 82.7,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.8,85.5 82.9,85.5 
-                                               82.9,85.5 82.9,85.5 82.9,85.5 82.9,85.5 82.9,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83,85.5 83.1,85.5 83.1,85.5 
-                                               83.1,85.5 83.1,85.5 83.1,85.5 83.1,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.2,85.5 83.3,85.5 83.3,85.5 83.3,85.5 
-                                               83.3,85.5 83.3,85.5 83.3,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.4,85.5 83.5,85.5 83.5,85.5 83.5,85.5 
-                                               83.5,85.5 83.5,85.5 83.5,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.6,85.5 83.7,85.5 83.7,85.5 83.7,85.5 
-                                               83.7,85.5 83.7,85.5 83.7,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.8,85.5 83.9,85.5 83.9,85.5 83.9,85.5 
-                                               83.9,85.5 83.9,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84,85.5 84.1,85.5 84.1,85.5 84.1,85.5 84.1,85.5 84.1,85.5 
-                                               84.1,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.2,85.5 84.3,85.5 84.3,85.5 84.3,85.5 84.3,85.5 84.3,85.5 
-                                               84.3,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.4,85.5 84.5,85.5 84.5,85.5 84.5,85.5 84.5,85.5 84.5,85.5 
-                                               84.5,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.6,85.5 84.7,85.5 84.7,85.5 84.7,85.5 84.7,85.5 84.7,85.5 
-                                               84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.8,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 84.9,85.5 
-                                               85,85.5 85,85.5 85,85.5 85,85.5 85,85.5 85,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.1,85.5 85.2,85.5 
-                                               85.2,85.5 85.2,85.5 85.2,85.5 85.2,85.5 85.2,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.3,85.5 85.4,85.5 
-                                               85.4,85.5 85.4,85.5 85.4,85.5 85.4,85.5 85.4,85.5 85.5,85.5 85.5,85.5 85.5,85.5 85.5,83.5 85.5,83.5 85.5,83.5                                   "/>
-                                       <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st10" points="80.1,91 80.1,91 80.2,91 80.2,91 80.2,91 80.2,91 80.3,91 80.3,91 80.3,91 80.4,91 80.4,91 
-                                               80.4,91 80.4,91 80.5,91 80.5,91 80.5,91 80.6,91 80.6,91 80.6,91 80.6,91 80.7,91 80.7,91 80.7,91 80.8,91 80.8,91 80.8,91 
-                                               80.8,91 80.9,91 80.9,91 80.9,91 81,91 81,91 81,91 81,91 81.1,91 81.1,91 81.1,91 81.2,91 81.2,91 81.2,91 81.2,91 81.3,91 
-                                               81.3,91 81.3,91 81.4,91 81.4,91 81.4,91 81.4,91 81.5,91 81.5,91 81.5,91 81.6,91 81.6,91 81.6,91 81.6,91 81.7,91 81.7,91 
-                                               81.7,91 81.8,91 81.8,91 81.8,91 81.8,91 81.9,91 81.9,91 81.9,91 82,91 82,91 82,91 82,91 82.1,91 82.1,91 82.1,91 82.1,91 
-                                               82.2,91 82.2,91 82.2,91 82.3,91 82.3,91 82.3,91 82.3,91 82.4,91 82.4,91 82.4,91 82.5,91 82.5,91 82.5,91 82.5,91 82.6,91 
-                                               82.6,91 82.6,91 82.7,91 82.7,91 82.7,91 82.7,91 82.8,91 82.8,91 82.8,91 82.9,91 82.9,91 82.9,91 82.9,91 83,91 83,91 83,91 
-                                               83.1,91 83.1,91 83.1,91 83.1,91 83.2,91 83.2,91 83.2,91 83.3,91 83.3,91 83.3,91 83.3,91 83.4,91 83.4,91 83.4,91 83.5,91 
-                                               83.5,91 83.5,91 83.5,91 83.6,91 83.6,91 83.6,91 83.7,91 83.7,91 83.7,91 83.7,91 83.8,91 83.8,91 83.8,91 83.9,91 83.9,91 
-                                               83.9,91 83.9,91 84,91 84,91 84,91 84.1,91 84.1,91 84.1,91 84.1,91 84.2,91 84.2,91 84.2,91 84.3,91 84.3,91 84.3,91 84.3,91 
-                                               84.4,91 84.4,91 84.4,91 84.5,91 84.5,91 84.5,91 84.5,91 84.6,91 84.6,91 84.6,91 84.6,91 84.7,91 84.7,91 84.7,91 84.8,91 
-                                               84.8,91 84.8,91 84.8,91 84.9,91 84.9,91 84.9,91 85,91 85,91 85,91 85,91 85.1,91 85.1,91 85.1,91 85.2,91 85.2,91 85.2,91 
-                                               85.2,91 85.3,91 85.3,91 85.3,91 85.4,91 85.4,91 85.4,91 85.4,91 85.5,91 85.5,91 85.5,88.9 85.5,88.9 85.4,88.9 85.4,88.9 
-                                               85.4,88.9 85.4,88.9 85.3,88.9 85.3,88.9 85.3,88.9 85.2,88.9 85.2,88.9 85.2,88.9 85.2,88.9 85.1,88.9 85.1,88.9 85.1,88.9 
-                                               85,88.9 85,88.9 85,88.9 85,88.9 84.9,88.9 84.9,88.9 84.9,88.9 84.8,88.9 84.8,88.9 84.8,88.9 84.8,88.9 84.7,88.9 84.7,88.9 
-                                               84.7,88.9 84.6,88.9 84.6,88.9 84.6,88.9 84.6,88.9 84.5,88.9 84.5,88.9 84.5,88.9 84.5,88.9 84.4,88.9 84.4,88.9 84.4,88.9 
-                                               84.3,88.9 84.3,88.9 84.3,88.9 84.3,88.9 84.2,88.9 84.2,88.9 84.2,88.9 84.1,88.9 84.1,88.9 84.1,88.9 84.1,88.9 84,88.9 
-                                               84,88.9 84,88.9 83.9,88.9 83.9,88.9 83.9,88.9 83.9,88.9 83.8,88.9 83.8,88.9 83.8,88.9 83.7,88.9 83.7,88.9 83.7,88.9 
-                                               83.7,88.9 83.6,88.9 83.6,88.9 83.6,88.9 83.5,88.9 83.5,88.9 83.5,88.9 83.5,88.9 83.4,88.9 83.4,88.9 83.4,88.9 83.3,88.9 
-                                               83.3,88.9 83.3,88.9 83.3,88.9 83.2,88.9 83.2,88.9 83.2,88.9 83.1,88.9 83.1,88.9 83.1,88.9 83.1,88.9 83,88.9 83,88.9 
-                                               83,88.9 82.9,88.9 82.9,88.9 82.9,88.9 82.9,88.9 82.8,88.9 82.8,88.9 82.8,88.9 82.7,88.9 82.7,88.9 82.7,88.9 82.7,88.9 
-                                               82.6,88.9 82.6,88.9 82.6,88.9 82.5,88.9 82.5,88.9 82.5,88.9 82.5,88.9 82.4,88.9 82.4,88.9 82.4,88.9 82.3,88.9 82.3,88.9 
-                                               82.3,88.9 82.3,88.9 82.2,88.9 82.2,88.9 82.2,88.9 82.1,88.9 82.1,88.9 82.1,88.9 82.1,88.9 82,88.9 82,88.9 82,88.9 82,88.9 
-                                               81.9,88.9 81.9,88.9 81.9,88.9 81.8,88.9 81.8,88.9 81.8,88.9 81.8,88.9 81.7,88.9 81.7,88.9 81.7,88.9 81.6,88.9 81.6,88.9 
-                                               81.6,88.9 81.6,88.9 81.5,88.9 81.5,88.9 81.5,88.9 81.4,88.9 81.4,88.9 81.4,88.9 81.4,88.9 81.3,88.9 81.3,88.9 81.3,88.9 
-                                               81.2,88.9 81.2,88.9 81.2,88.9 81.2,88.9 81.1,88.9 81.1,88.9 81.1,88.9 81,88.9 81,88.9 81,88.9 81,88.9 80.9,88.9 80.9,88.9 
-                                               80.9,88.9 80.8,88.9 80.8,88.9 80.8,88.9 80.8,88.9 80.7,88.9 80.7,88.9 80.7,88.9 80.6,88.9 80.6,88.9 80.6,88.9 80.6,88.9 
-                                               80.5,88.9 80.5,88.9 80.5,88.9 80.4,88.9 80.4,88.9 80.4,88.9 80.4,88.9 80.3,88.9 80.3,88.9 80.3,88.9 80.2,88.9 80.2,88.9 
-                                               80.2,88.9 80.2,88.9 80.1,88.9 80.1,88.9 80.1,88.9 80,88.9 80,91 80.1,91                                         "/>
-                                       <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st11" points="85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.4,94.4 85.3,94.4 85.3,94.4 85.3,94.4 
-                                               85.3,94.4 85.3,94.4 85.3,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.2,94.4 85.1,94.4 85.1,94.4 85.1,94.4 
-                                               85.1,94.4 85.1,94.4 85.1,94.4 85,94.4 85,94.4 85,94.4 85,94.4 85,94.4 85,94.4 84.9,94.4 84.9,94.4 84.9,94.4 84.9,94.4 
-                                               84.9,94.4 84.9,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.8,94.4 84.7,94.4 84.7,94.4 84.7,94.4 84.7,94.4 
-                                               84.7,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.6,94.4 84.5,94.4 84.5,94.4 84.5,94.4 84.5,94.4 84.5,94.4 
-                                               84.5,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.4,94.4 84.3,94.4 84.3,94.4 84.3,94.4 84.3,94.4 84.3,94.4 
-                                               84.3,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.2,94.4 84.1,94.4 84.1,94.4 84.1,94.4 84.1,94.4 84.1,94.4 
-                                               84.1,94.4 84,94.4 84,94.4 84,94.4 84,94.4 84,94.4 84,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.9,94.4 83.8,94.4 
-                                               83.8,94.4 83.8,94.4 83.8,94.4 83.8,94.4 83.8,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.7,94.4 83.6,94.4 
-                                               83.6,94.4 83.6,94.4 83.6,94.4 83.6,94.4 83.6,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.5,94.4 83.4,94.4 
-                                               83.4,94.4 83.4,94.4 83.4,94.4 83.4,94.4 83.4,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.3,94.4 83.2,94.4 
-                                               83.2,94.4 83.2,94.4 83.2,94.4 83.2,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83.1,94.4 83,94.4 83,94.4 
-                                               83,94.4 83,94.4 83,94.4 83,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.9,94.4 82.8,94.4 82.8,94.4 82.8,94.4 
-                                               82.8,94.4 82.8,94.4 82.8,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.7,94.4 82.6,94.4 82.6,94.4 82.6,94.4 
-                                               82.6,94.4 82.6,94.4 82.6,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.5,94.4 82.4,94.4 82.4,94.4 82.4,94.4 
-                                               82.4,94.4 82.4,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.3,94.4 82.2,94.4 82.2,94.4 82.2,96.5 82.2,96.5 
-                                               82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.3,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.4,96.5 82.5,96.5 
-                                               82.5,96.5 82.5,96.5 82.5,96.5 82.5,96.5 82.5,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.6,96.5 82.7,96.5 
-                                               82.7,96.5 82.7,96.5 82.7,96.5 82.7,96.5 82.7,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.8,96.5 82.9,96.5 
-                                               82.9,96.5 82.9,96.5 82.9,96.5 82.9,96.5 82.9,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83,96.5 83.1,96.5 83.1,96.5 
-                                               83.1,96.5 83.1,96.5 83.1,96.5 83.1,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.2,96.5 83.3,96.5 83.3,96.5 83.3,96.5 
-                                               83.3,96.5 83.3,96.5 83.3,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.4,96.5 83.5,96.5 83.5,96.5 83.5,96.5 
-                                               83.5,96.5 83.5,96.5 83.5,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.6,96.5 83.7,96.5 83.7,96.5 83.7,96.5 
-                                               83.7,96.5 83.7,96.5 83.7,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.8,96.5 83.9,96.5 83.9,96.5 83.9,96.5 
-                                               83.9,96.5 83.9,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84,96.5 84.1,96.5 84.1,96.5 84.1,96.5 84.1,96.5 84.1,96.5 
-                                               84.1,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.2,96.5 84.3,96.5 84.3,96.5 84.3,96.5 84.3,96.5 84.3,96.5 
-                                               84.3,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.4,96.5 84.5,96.5 84.5,96.5 84.5,96.5 84.5,96.5 84.5,96.5 
-                                               84.5,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.6,96.5 84.7,96.5 84.7,96.5 84.7,96.5 84.7,96.5 84.7,96.5 
-                                               84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.8,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 84.9,96.5 
-                                               85,96.5 85,96.5 85,96.5 85,96.5 85,96.5 85,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.1,96.5 85.2,96.5 
-                                               85.2,96.5 85.2,96.5 85.2,96.5 85.2,96.5 85.2,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.3,96.5 85.4,96.5 
-                                               85.4,96.5 85.4,96.5 85.4,96.5 85.4,96.5 85.4,96.5 85.5,96.5 85.5,96.5 85.5,96.5 85.5,94.4 85.5,94.4 85.5,94.4                                   "/>
-                                       <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st12" points="80.1,101.9 80.1,101.9 80.2,101.9 80.2,101.9 80.2,101.9 80.2,101.9 80.3,101.9 80.3,101.9 
-                                               80.3,101.9 80.4,101.9 80.4,101.9 80.4,101.9 80.4,101.9 80.5,101.9 80.5,101.9 80.5,101.9 80.6,101.9 80.6,101.9 80.6,101.9 
-                                               80.6,101.9 80.7,101.9 80.7,101.9 80.7,101.9 80.8,101.9 80.8,101.9 80.8,101.9 80.8,101.9 80.9,101.9 80.9,101.9 80.9,101.9 
-                                               81,101.9 81,101.9 81,101.9 81,101.9 81.1,101.9 81.1,101.9 81.1,101.9 81.2,101.9 81.2,101.9 81.2,101.9 81.2,101.9 
-                                               81.3,101.9 81.3,101.9 81.3,101.9 81.4,101.9 81.4,101.9 81.4,101.9 81.4,101.9 81.5,101.9 81.5,101.9 81.5,101.9 81.6,101.9 
-                                               81.6,101.9 81.6,101.9 81.6,101.9 81.7,101.9 81.7,101.9 81.7,101.9 81.8,101.9 81.8,101.9 81.8,101.9 81.8,101.9 81.9,101.9 
-                                               81.9,101.9 81.9,101.9 82,101.9 82,101.9 82,101.9 82,101.9 82.1,101.9 82.1,101.9 82.1,101.9 82.1,101.9 82.2,101.9 
-                                               82.2,101.9 82.2,101.9 82.3,101.9 82.3,101.9 82.3,101.9 82.3,101.9 82.4,101.9 82.4,101.9 82.4,101.9 82.5,101.9 82.5,101.9 
-                                               82.5,101.9 82.5,101.9 82.6,101.9 82.6,101.9 82.6,101.9 82.7,101.9 82.7,101.9 82.7,101.9 82.7,101.9 82.8,101.9 82.8,101.9 
-                                               82.8,101.9 82.9,101.9 82.9,101.9 82.9,101.9 82.9,101.9 83,101.9 83,101.9 83,101.9 83.1,101.9 83.1,101.9 83.1,101.9 
-                                               83.1,101.9 83.2,101.9 83.2,101.9 83.2,101.9 83.3,101.9 83.3,101.9 83.3,101.9 83.3,101.9 83.4,101.9 83.4,101.9 83.4,101.9 
-                                               83.5,101.9 83.5,101.9 83.5,101.9 83.5,101.9 83.6,101.9 83.6,101.9 83.6,101.9 83.7,101.9 83.7,101.9 83.7,101.9 83.7,101.9 
-                                               83.8,101.9 83.8,101.9 83.8,101.9 83.9,101.9 83.9,101.9 83.9,101.9 83.9,101.9 84,101.9 84,101.9 84,101.9 84.1,101.9 
-                                               84.1,101.9 84.1,101.9 84.1,101.9 84.2,101.9 84.2,101.9 84.2,101.9 84.3,101.9 84.3,101.9 84.3,101.9 84.3,101.9 84.4,101.9 
-                                               84.4,101.9 84.4,101.9 84.5,101.9 84.5,101.9 84.5,101.9 84.5,101.9 84.6,101.9 84.6,101.9 84.6,101.9 84.6,101.9 84.7,101.9 
-                                               84.7,101.9 84.7,101.9 84.8,101.9 84.8,101.9 84.8,101.9 84.8,101.9 84.9,101.9 84.9,101.9 84.9,101.9 85,101.9 85,101.9 
-                                               85,101.9 85,101.9 85.1,101.9 85.1,101.9 85.1,101.9 85.2,101.9 85.2,101.9 85.2,101.9 85.2,101.9 85.3,101.9 85.3,101.9 
-                                               85.3,101.9 85.4,101.9 85.4,101.9 85.4,101.9 85.4,101.9 85.5,101.9 85.5,101.9 85.5,99.8 85.5,99.8 85.4,99.8 85.4,99.8 
-                                               85.4,99.8 85.4,99.8 85.3,99.8 85.3,99.8 85.3,99.8 85.2,99.8 85.2,99.8 85.2,99.8 85.2,99.8 85.1,99.8 85.1,99.8 85.1,99.8 
-                                               85,99.8 85,99.8 85,99.8 85,99.8 84.9,99.8 84.9,99.8 84.9,99.8 84.8,99.8 84.8,99.8 84.8,99.8 84.8,99.8 84.7,99.8 84.7,99.8 
-                                               84.7,99.8 84.6,99.8 84.6,99.8 84.6,99.8 84.6,99.8 84.5,99.8 84.5,99.8 84.5,99.8 84.5,99.8 84.4,99.8 84.4,99.8 84.4,99.8 
-                                               84.3,99.8 84.3,99.8 84.3,99.8 84.3,99.8 84.2,99.8 84.2,99.8 84.2,99.8 84.1,99.8 84.1,99.8 84.1,99.8 84.1,99.8 84,99.8 
-                                               84,99.8 84,99.8 83.9,99.8 83.9,99.8 83.9,99.8 83.9,99.8 83.8,99.8 83.8,99.8 83.8,99.8 83.7,99.8 83.7,99.8 83.7,99.8 
-                                               83.7,99.8 83.6,99.8 83.6,99.8 83.6,99.8 83.5,99.8 83.5,99.8 83.5,99.8 83.5,99.8 83.4,99.8 83.4,99.8 83.4,99.8 83.3,99.8 
-                                               83.3,99.8 83.3,99.8 83.3,99.8 83.2,99.8 83.2,99.8 83.2,99.8 83.1,99.8 83.1,99.8 83.1,99.8 83.1,99.8 83,99.8 83,99.8 
-                                               83,99.8 82.9,99.8 82.9,99.8 82.9,99.8 82.9,99.8 82.8,99.8 82.8,99.8 82.8,99.8 82.7,99.8 82.7,99.8 82.7,99.8 82.7,99.8 
-                                               82.6,99.8 82.6,99.8 82.6,99.8 82.5,99.8 82.5,99.8 82.5,99.8 82.5,99.8 82.4,99.8 82.4,99.8 82.4,99.8 82.3,99.8 82.3,99.8 
-                                               82.3,99.8 82.3,99.8 82.2,99.8 82.2,99.8 82.2,99.8 82.1,99.8 82.1,99.8 82.1,99.8 82.1,99.8 82,99.8 82,99.8 82,99.8 82,99.8 
-                                               81.9,99.8 81.9,99.8 81.9,99.8 81.8,99.8 81.8,99.8 81.8,99.8 81.8,99.8 81.7,99.8 81.7,99.8 81.7,99.8 81.6,99.8 81.6,99.8 
-                                               81.6,99.8 81.6,99.8 81.5,99.8 81.5,99.8 81.5,99.8 81.4,99.8 81.4,99.8 81.4,99.8 81.4,99.8 81.3,99.8 81.3,99.8 81.3,99.8 
-                                               81.2,99.8 81.2,99.8 81.2,99.8 81.2,99.8 81.1,99.8 81.1,99.8 81.1,99.8 81,99.8 81,99.8 81,99.8 81,99.8 80.9,99.8 80.9,99.8 
-                                               80.9,99.8 80.8,99.8 80.8,99.8 80.8,99.8 80.8,99.8 80.7,99.8 80.7,99.8 80.7,99.8 80.6,99.8 80.6,99.8 80.6,99.8 80.6,99.8 
-                                               80.5,99.8 80.5,99.8 80.5,99.8 80.4,99.8 80.4,99.8 80.4,99.8 80.4,99.8 80.3,99.8 80.3,99.8 80.3,99.8 80.2,99.8 80.2,99.8 
-                                               80.2,99.8 80.2,99.8 80.1,99.8 80.1,99.8 80.1,99.8 80,99.8 80,101.9 80.1,101.9                                   "/>
-                                       <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="83.865" y1="166.6087" x2="83.865" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st13" points="85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.4,105.3 85.3,105.3 85.3,105.3 
-                                               85.3,105.3 85.3,105.3 85.3,105.3 85.3,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.2,105.3 85.1,105.3 
-                                               85.1,105.3 85.1,105.3 85.1,105.3 85.1,105.3 85.1,105.3 85,105.3 85,105.3 85,105.3 85,105.3 85,105.3 85,105.3 84.9,105.3 
-                                               84.9,105.3 84.9,105.3 84.9,105.3 84.9,105.3 84.9,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 84.8,105.3 
-                                               84.7,105.3 84.7,105.3 84.7,105.3 84.7,105.3 84.7,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 84.6,105.3 
-                                               84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.5,105.3 84.4,105.3 84.4,105.3 84.4,105.3 84.4,105.3 84.4,105.3 
-                                               84.4,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.3,105.3 84.2,105.3 84.2,105.3 84.2,105.3 84.2,105.3 
-                                               84.2,105.3 84.2,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84.1,105.3 84,105.3 84,105.3 84,105.3 
-                                               84,105.3 84,105.3 84,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.9,105.3 83.8,105.3 83.8,105.3 83.8,105.3 
-                                               83.8,105.3 83.8,105.3 83.8,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.7,105.3 83.6,105.3 83.6,105.3 
-                                               83.6,105.3 83.6,105.3 83.6,105.3 83.6,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.5,105.3 83.4,105.3 
-                                               83.4,105.3 83.4,105.3 83.4,105.3 83.4,105.3 83.4,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 83.3,105.3 
-                                               83.2,105.3 83.2,105.3 83.2,105.3 83.2,105.3 83.2,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 83.1,105.3 
-                                               83,105.3 83,105.3 83,105.3 83,105.3 83,105.3 83,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 82.9,105.3 
-                                               82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.8,105.3 82.7,105.3 82.7,105.3 82.7,105.3 82.7,105.3 82.7,105.3 
-                                               82.7,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.6,105.3 82.5,105.3 82.5,105.3 82.5,105.3 82.5,105.3 
-                                               82.5,105.3 82.5,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.4,105.3 82.3,105.3 82.3,105.3 82.3,105.3 82.3,105.3 
-                                               82.3,105.3 82.3,105.3 82.2,105.3 82.2,105.3 82.2,107.4 82.2,107.4 82.3,107.4 82.3,107.4 82.3,107.4 82.3,107.4 82.3,107.4 
-                                               82.3,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.4,107.4 82.5,107.4 82.5,107.4 82.5,107.4 82.5,107.4 82.5,107.4 
-                                               82.5,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.6,107.4 82.7,107.4 82.7,107.4 82.7,107.4 82.7,107.4 
-                                               82.7,107.4 82.7,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.8,107.4 82.9,107.4 82.9,107.4 82.9,107.4 
-                                               82.9,107.4 82.9,107.4 82.9,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83,107.4 83.1,107.4 83.1,107.4 83.1,107.4 
-                                               83.1,107.4 83.1,107.4 83.1,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.2,107.4 83.3,107.4 83.3,107.4 83.3,107.4 
-                                               83.3,107.4 83.3,107.4 83.3,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.4,107.4 83.5,107.4 83.5,107.4 
-                                               83.5,107.4 83.5,107.4 83.5,107.4 83.5,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.6,107.4 83.7,107.4 
-                                               83.7,107.4 83.7,107.4 83.7,107.4 83.7,107.4 83.7,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 83.8,107.4 
-                                               83.9,107.4 83.9,107.4 83.9,107.4 83.9,107.4 83.9,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84,107.4 84.1,107.4 
-                                               84.1,107.4 84.1,107.4 84.1,107.4 84.1,107.4 84.1,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 84.2,107.4 
-                                               84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.3,107.4 84.4,107.4 84.4,107.4 84.4,107.4 84.4,107.4 84.4,107.4 
-                                               84.4,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.5,107.4 84.6,107.4 84.6,107.4 84.6,107.4 84.6,107.4 
-                                               84.6,107.4 84.6,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.7,107.4 84.8,107.4 84.8,107.4 84.8,107.4 84.8,107.4 
-                                               84.8,107.4 84.8,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 84.9,107.4 85,107.4 85,107.4 85,107.4 
-                                               85,107.4 85,107.4 85,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.1,107.4 85.2,107.4 85.2,107.4 
-                                               85.2,107.4 85.2,107.4 85.2,107.4 85.2,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.3,107.4 85.4,107.4 
-                                               85.4,107.4 85.4,107.4 85.4,107.4 85.4,107.4 85.4,107.4 85.5,107.4 85.5,107.4 85.5,107.4 85.5,105.3 85.5,105.3 85.5,105.3 
-                                                                                       "/>
-                                       <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="82.7742" y1="166.6087" x2="82.7742" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st14" points="82.3,112.8 82.3,112.8 82.3,112.8 82.3,112.8 82.4,112.8 82.4,112.8 82.4,112.8 82.5,112.8 
-                                               82.5,112.8 82.5,112.8 82.5,112.8 82.6,112.8 82.6,112.8 82.6,112.8 82.7,112.8 82.7,112.8 82.7,112.8 82.7,112.8 82.8,112.8 
-                                               82.8,112.8 82.8,112.8 82.9,112.8 82.9,112.8 82.9,112.8 82.9,112.8 83,112.8 83,112.8 83,112.8 83.1,112.8 83.1,112.8 
-                                               83.1,112.8 83.1,112.8 83.2,112.8 83.2,112.8 83.2,112.8 83.3,112.8 83.3,112.8 83.3,112.8 83.3,112.8 83.4,112.8 83.4,112.8 
-                                               83.4,112.8 83.5,112.8 83.5,112.8 83.5,112.8 83.5,112.8 83.6,112.8 83.6,112.8 83.6,112.8 83.7,112.8 83.7,112.8 83.7,112.8 
-                                               83.7,112.8 83.8,112.8 83.8,112.8 83.8,112.8 83.9,112.8 83.9,112.8 83.9,112.8 83.9,112.8 84,112.8 84,112.8 84,112.8 
-                                               84.1,112.8 84.1,112.8 84.1,112.8 84.1,112.8 84.2,112.8 84.2,112.8 84.2,112.8 84.3,112.8 84.3,112.8 84.3,112.8 84.3,112.8 
-                                               84.4,112.8 84.4,112.8 84.4,112.8 84.5,112.8 84.5,112.8 84.5,112.8 84.5,112.8 84.6,112.8 84.6,112.8 84.6,112.8 84.6,112.8 
-                                               84.7,112.8 84.7,112.8 84.7,112.8 84.8,112.8 84.8,112.8 84.8,112.8 84.8,112.8 84.9,112.8 84.9,112.8 84.9,112.8 85,112.8 
-                                               85,112.8 85,112.8 85,112.8 85.1,112.8 85.1,112.8 85.1,112.8 85.2,112.8 85.2,112.8 85.2,112.8 85.2,112.8 85.3,112.8 
-                                               85.3,112.8 85.3,112.8 85.4,112.8 85.4,112.8 85.4,112.8 85.4,112.8 85.5,112.8 85.5,112.8 85.5,110.7 85.5,110.7 85.4,110.7 
-                                               85.4,110.7 85.4,110.7 85.4,110.7 85.3,110.7 85.3,110.7 85.3,110.7 85.2,110.7 85.2,110.7 85.2,110.7 85.2,110.7 85.1,110.7 
-                                               85.1,110.7 85.1,110.7 85,110.7 85,110.7 85,110.7 85,110.7 84.9,110.7 84.9,110.7 84.9,110.7 84.8,110.7 84.8,110.7 
-                                               84.8,110.7 84.8,110.7 84.7,110.7 84.7,110.7 84.7,110.7 84.6,110.7 84.6,110.7 84.6,110.7 84.6,110.7 84.5,110.7 84.5,110.7 
-                                               84.5,110.7 84.5,110.7 84.4,110.7 84.4,110.7 84.4,110.7 84.3,110.7 84.3,110.7 84.3,110.7 84.3,110.7 84.2,110.7 84.2,110.7 
-                                               84.2,110.7 84.1,110.7 84.1,110.7 84.1,110.7 84.1,110.7 84,110.7 84,110.7 84,110.7 83.9,110.7 83.9,110.7 83.9,110.7 
-                                               83.9,110.7 83.8,110.7 83.8,110.7 83.8,110.7 83.7,110.7 83.7,110.7 83.7,110.7 83.7,110.7 83.6,110.7 83.6,110.7 83.6,110.7 
-                                               83.5,110.7 83.5,110.7 83.5,110.7 83.5,110.7 83.4,110.7 83.4,110.7 83.4,110.7 83.3,110.7 83.3,110.7 83.3,110.7 83.3,110.7 
-                                               83.2,110.7 83.2,110.7 83.2,110.7 83.1,110.7 83.1,110.7 83.1,110.7 83.1,110.7 83,110.7 83,110.7 83,110.7 82.9,110.7 
-                                               82.9,110.7 82.9,110.7 82.9,110.7 82.8,110.7 82.8,110.7 82.8,110.7 82.7,110.7 82.7,110.7 82.7,110.7 82.7,110.7 82.6,110.7 
-                                               82.6,110.7 82.6,110.7 82.5,110.7 82.5,110.7 82.5,110.7 82.5,110.7 82.4,110.7 82.4,110.7 82.4,110.7 82.3,110.7 82.3,110.7 
-                                               82.3,110.7 82.3,110.7 82.2,110.7 82.2,110.7 82.2,110.7 82.1,110.7 82.1,110.7 82.1,110.7 82.1,110.7 82,110.7 82,110.7 
-                                               82,110.7 82,110.7 81.9,110.7 81.9,110.7 81.9,110.7 81.8,110.7 81.8,110.7 81.8,110.7 81.8,110.7 81.7,110.7 81.7,110.7 
-                                               81.7,110.7 81.6,110.7 81.6,110.7 81.6,110.7 81.6,110.7 81.5,110.7 81.5,110.7 81.5,110.7 81.4,110.7 81.4,110.7 81.4,110.7 
-                                               81.4,110.7 81.3,110.7 81.3,110.7 81.3,110.7 81.2,110.7 81.2,110.7 81.2,110.7 81.2,110.7 81.1,110.7 81.1,110.7 81.1,110.7 
-                                               81,110.7 81,110.7 81,110.7 81,110.7 80.9,110.7 80.9,110.7 80.9,110.7 80.8,110.7 80.8,110.7 80.8,110.7 80.8,110.7 
-                                               80.7,110.7 80.7,110.7 80.7,110.7 80.6,110.7 80.6,110.7 80.6,110.7 80.6,110.7 80.5,110.7 80.5,110.7 80.5,110.7 80.4,110.7 
-                                               80.4,110.7 80.4,110.7 80.4,110.7 80.3,110.7 80.3,110.7 80.3,110.7 80.2,110.7 80.2,110.7 80.2,110.7 80.2,110.7 80.1,110.7 
-                                               80.1,110.7 80.1,110.7 80,110.7 80,112.8 80.1,112.8 80.1,112.8 80.1,112.8 80.2,112.8 80.2,112.8 80.2,112.8 80.2,112.8 
-                                               80.3,112.8 80.3,112.8 80.3,112.8 80.4,112.8 80.4,112.8 80.4,112.8 80.4,112.8 80.5,112.8 80.5,112.8 80.5,112.8 80.6,112.8 
-                                               80.6,112.8 80.6,112.8 80.6,112.8 80.7,112.8 80.7,112.8 80.7,112.8 80.8,112.8 80.8,112.8 80.8,112.8 80.8,112.8 80.9,112.8 
-                                               80.9,112.8 80.9,112.8 81,112.8 81,112.8 81,112.8 81,112.8 81.1,112.8 81.1,112.8 81.1,112.8 81.2,112.8 81.2,112.8 
-                                               81.2,112.8 81.2,112.8 81.3,112.8 81.3,112.8 81.3,112.8 81.4,112.8 81.4,112.8 81.4,112.8 81.4,112.8 81.5,112.8 81.5,112.8 
-                                               81.5,112.8 81.6,112.8 81.6,112.8 81.6,112.8 81.6,112.8 81.7,112.8 81.7,112.8 81.7,112.8 81.8,112.8 81.8,112.8 81.8,112.8 
-                                               81.8,112.8 81.9,112.8 81.9,112.8 81.9,112.8 82,112.8 82,112.8 82,112.8 82,112.8 82.1,112.8 82.1,112.8 82.1,112.8 
-                                               82.1,112.8 82.2,112.8 82.2,112.8 82.2,112.8                                     "/>
-                                       <linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st15" points="114.9,78 114.9,78 114.9,78 114.8,78 114.8,78 114.8,78 114.8,78 114.7,78 114.7,78 114.7,78 
-                                               114.6,78 114.6,78 114.6,78 114.6,78 114.5,78 114.5,78 114.5,78 114.4,78 114.4,78 114.4,78 114.4,78 114.3,78 114.3,78 
-                                               114.3,78 114.2,78 114.2,78 114.2,78 114.2,78 114.1,78 114.1,78 114.1,78 114,78 114,78 114,78 114,78 113.9,78 113.9,78 
-                                               113.9,78 113.8,78 113.8,78 113.8,78 113.8,78 113.7,78 113.7,78 113.7,78 113.6,78 113.6,78 113.6,78 113.6,78 113.5,78 
-                                               113.5,78 113.5,78 113.4,78 113.4,78 113.4,78 113.4,78 113.3,78 113.3,78 113.3,78 113.2,78 113.2,78 113.2,78 113.2,78 
-                                               113.1,78 113.1,78 113.1,78 113,78 113,78 113,78 113,78 112.9,78 112.9,78 112.9,78 112.8,78 112.8,78 112.8,78 112.8,78 
-                                               112.7,78 112.7,78 112.7,78 112.7,78 112.6,78 112.6,78 112.6,78 112.5,78 112.5,78 112.5,78 112.5,78 112.4,78 112.4,78 
-                                               112.4,78 112.3,78 112.3,78 112.3,78 112.3,78 112.2,78 112.2,78 112.2,78 112.1,78 112.1,78 112.1,78 112.1,78 112,78 112,78 
-                                               112,78 111.9,78 111.9,78 111.9,78 111.9,78 111.8,78 111.8,78 111.8,78 111.7,78 111.7,78 111.7,78 111.7,78 111.6,78 
-                                               111.6,78 111.6,78 111.5,78 111.5,78 111.5,78 111.5,78 111.4,78 111.4,78 111.4,78 111.3,78 111.3,78 111.3,78 111.3,78 
-                                               111.2,78 111.2,78 111.2,78 111.1,78 111.1,78 111.1,78 111.1,78 111,78 111,78 111,78 110.9,78 110.9,78 110.9,78 110.9,78 
-                                               110.8,78 110.8,78 110.8,78 110.7,78 110.7,78 110.7,78 110.7,78 110.6,78 110.6,78 110.6,78 110.5,78 110.5,78 110.5,78 
-                                               110.5,78 110.4,78 110.4,78 110.4,78 110.4,78 110.3,78 110.3,78 110.3,78 110.2,78 110.2,78 110.2,78 110.2,78 110.1,78 
-                                               110.1,78 110.1,78 110,78 110,78 110,78 110,78 109.9,78 109.9,78 109.9,78 109.8,78 109.8,78 109.8,78 109.8,78 109.7,78 
-                                               109.7,78 109.7,78 109.6,78 109.6,78 109.6,78 109.6,78 109.5,78 109.5,78 109.5,80.1 109.5,80.1 109.6,80.1 109.6,80.1 
-                                               109.6,80.1 109.6,80.1 109.7,80.1 109.7,80.1 109.7,80.1 109.8,80.1 109.8,80.1 109.8,80.1 109.8,80.1 109.9,80.1 109.9,80.1 
-                                               109.9,80.1 110,80.1 110,80.1 110,80.1 110,80.1 110.1,80.1 110.1,80.1 110.1,80.1 110.2,80.1 110.2,80.1 110.2,80.1 
-                                               110.2,80.1 110.3,80.1 110.3,80.1 110.3,80.1 110.4,80.1 110.4,80.1 110.4,80.1 110.4,80.1 110.5,80.1 110.5,80.1 110.5,80.1 
-                                               110.5,80.1 110.6,80.1 110.6,80.1 110.6,80.1 110.7,80.1 110.7,80.1 110.7,80.1 110.7,80.1 110.8,80.1 110.8,80.1 110.8,80.1 
-                                               110.9,80.1 110.9,80.1 110.9,80.1 110.9,80.1 111,80.1 111,80.1 111,80.1 111.1,80.1 111.1,80.1 111.1,80.1 111.1,80.1 
-                                               111.2,80.1 111.2,80.1 111.2,80.1 111.3,80.1 111.3,80.1 111.3,80.1 111.3,80.1 111.4,80.1 111.4,80.1 111.4,80.1 111.5,80.1 
-                                               111.5,80.1 111.5,80.1 111.5,80.1 111.6,80.1 111.6,80.1 111.6,80.1 111.7,80.1 111.7,80.1 111.7,80.1 111.7,80.1 111.8,80.1 
-                                               111.8,80.1 111.8,80.1 111.9,80.1 111.9,80.1 111.9,80.1 111.9,80.1 112,80.1 112,80.1 112,80.1 112.1,80.1 112.1,80.1 
-                                               112.1,80.1 112.1,80.1 112.2,80.1 112.2,80.1 112.2,80.1 112.3,80.1 112.3,80.1 112.3,80.1 112.3,80.1 112.4,80.1 112.4,80.1 
-                                               112.4,80.1 112.5,80.1 112.5,80.1 112.5,80.1 112.5,80.1 112.6,80.1 112.6,80.1 112.6,80.1 112.7,80.1 112.7,80.1 112.7,80.1 
-                                               112.7,80.1 112.8,80.1 112.8,80.1 112.8,80.1 112.8,80.1 112.9,80.1 112.9,80.1 112.9,80.1 113,80.1 113,80.1 113,80.1 
-                                               113,80.1 113.1,80.1 113.1,80.1 113.1,80.1 113.2,80.1 113.2,80.1 113.2,80.1 113.2,80.1 113.3,80.1 113.3,80.1 113.3,80.1 
-                                               113.4,80.1 113.4,80.1 113.4,80.1 113.4,80.1 113.5,80.1 113.5,80.1 113.5,80.1 113.6,80.1 113.6,80.1 113.6,80.1 113.6,80.1 
-                                               113.7,80.1 113.7,80.1 113.7,80.1 113.8,80.1 113.8,80.1 113.8,80.1 113.8,80.1 113.9,80.1 113.9,80.1 113.9,80.1 114,80.1 
-                                               114,80.1 114,80.1 114,80.1 114.1,80.1 114.1,80.1 114.1,80.1 114.2,80.1 114.2,80.1 114.2,80.1 114.2,80.1 114.3,80.1 
-                                               114.3,80.1 114.3,80.1 114.4,80.1 114.4,80.1 114.4,80.1 114.4,80.1 114.5,80.1 114.5,80.1 114.5,80.1 114.6,80.1 114.6,80.1 
-                                               114.6,80.1 114.6,80.1 114.7,80.1 114.7,80.1 114.7,80.1 114.8,80.1 114.8,80.1 114.8,80.1 114.8,80.1 114.9,80.1 114.9,80.1 
-                                               114.9,80.1 115,80.1 115,78                                      "/>
-                                       <linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st16" points="109.5,85.5 109.5,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.6,85.5 109.7,85.5 
-                                               109.7,85.5 109.7,85.5 109.7,85.5 109.7,85.5 109.7,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 109.8,85.5 
-                                               109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 109.9,85.5 110,85.5 110,85.5 110,85.5 110,85.5 110,85.5 110,85.5 
-                                               110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.1,85.5 110.2,85.5 110.2,85.5 110.2,85.5 110.2,85.5 110.2,85.5 
-                                               110.2,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.3,85.5 110.4,85.5 110.4,85.5 110.4,85.5 110.4,85.5 110.4,85.5 
-                                               110.4,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.5,85.5 110.6,85.5 110.6,85.5 110.6,85.5 110.6,85.5 
-                                               110.6,85.5 110.6,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.7,85.5 110.8,85.5 110.8,85.5 110.8,85.5 
-                                               110.8,85.5 110.8,85.5 110.8,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 110.9,85.5 111,85.5 111,85.5 
-                                               111,85.5 111,85.5 111,85.5 111,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.1,85.5 111.2,85.5 111.2,85.5 
-                                               111.2,85.5 111.2,85.5 111.2,85.5 111.2,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.3,85.5 111.4,85.5 
-                                               111.4,85.5 111.4,85.5 111.4,85.5 111.4,85.5 111.4,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 111.5,85.5 
-                                               111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.6,85.5 111.7,85.5 111.7,85.5 111.7,85.5 111.7,85.5 111.7,85.5 
-                                               111.7,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.8,85.5 111.9,85.5 111.9,85.5 111.9,85.5 111.9,85.5 
-                                               111.9,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112,85.5 112.1,85.5 112.1,85.5 112.1,85.5 112.1,85.5 112.1,85.5 
-                                               112.1,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.2,85.5 112.3,85.5 112.3,85.5 112.3,85.5 112.3,85.5 
-                                               112.3,85.5 112.3,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.4,85.5 112.5,85.5 112.5,85.5 112.5,85.5 
-                                               112.5,85.5 112.5,85.5 112.5,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.6,85.5 112.7,85.5 112.7,85.5 112.7,85.5 
-                                               112.7,85.5 112.7,85.5 112.7,85.5 112.8,85.5 112.8,85.5 112.8,83.5 112.8,83.5 112.7,83.5 112.7,83.5 112.7,83.5 112.7,83.5 
-                                               112.7,83.5 112.7,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.6,83.5 112.5,83.5 112.5,83.5 112.5,83.5 112.5,83.5 
-                                               112.5,83.5 112.5,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.4,83.5 112.3,83.5 112.3,83.5 112.3,83.5 
-                                               112.3,83.5 112.3,83.5 112.3,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.2,83.5 112.1,83.5 112.1,83.5 
-                                               112.1,83.5 112.1,83.5 112.1,83.5 112.1,83.5 112,83.5 112,83.5 112,83.5 112,83.5 112,83.5 112,83.5 111.9,83.5 111.9,83.5 
-                                               111.9,83.5 111.9,83.5 111.9,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.8,83.5 111.7,83.5 111.7,83.5 
-                                               111.7,83.5 111.7,83.5 111.7,83.5 111.7,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.6,83.5 111.5,83.5 
-                                               111.5,83.5 111.5,83.5 111.5,83.5 111.5,83.5 111.5,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 111.4,83.5 
-                                               111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.3,83.5 111.2,83.5 111.2,83.5 111.2,83.5 111.2,83.5 111.2,83.5 
-                                               111.2,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111.1,83.5 111,83.5 111,83.5 111,83.5 111,83.5 111,83.5 111,83.5 
-                                               110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.9,83.5 110.8,83.5 110.8,83.5 110.8,83.5 110.8,83.5 110.8,83.5 
-                                               110.8,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.7,83.5 110.6,83.5 110.6,83.5 110.6,83.5 110.6,83.5 
-                                               110.6,83.5 110.6,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.5,83.5 110.4,83.5 110.4,83.5 110.4,83.5 
-                                               110.4,83.5 110.4,83.5 110.4,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.3,83.5 110.2,83.5 110.2,83.5 110.2,83.5 
-                                               110.2,83.5 110.2,83.5 110.2,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110.1,83.5 110,83.5 110,83.5 
-                                               110,83.5 110,83.5 110,83.5 110,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.9,83.5 109.8,83.5 
-                                               109.8,83.5 109.8,83.5 109.8,83.5 109.8,83.5 109.8,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 109.7,83.5 
-                                               109.6,83.5 109.6,83.5 109.6,83.5 109.6,83.5 109.6,83.5 109.5,83.5 109.5,83.5 109.5,83.5 109.5,83.5 109.5,85.5 109.5,85.5 
-                                                                                       "/>
-                                       <linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st17" points="114.9,88.9 114.9,88.9 114.8,88.9 114.8,88.9 114.8,88.9 114.8,88.9 114.7,88.9 114.7,88.9 
-                                               114.7,88.9 114.6,88.9 114.6,88.9 114.6,88.9 114.6,88.9 114.5,88.9 114.5,88.9 114.5,88.9 114.4,88.9 114.4,88.9 114.4,88.9 
-                                               114.4,88.9 114.3,88.9 114.3,88.9 114.3,88.9 114.2,88.9 114.2,88.9 114.2,88.9 114.2,88.9 114.1,88.9 114.1,88.9 114.1,88.9 
-                                               114,88.9 114,88.9 114,88.9 114,88.9 113.9,88.9 113.9,88.9 113.9,88.9 113.8,88.9 113.8,88.9 113.8,88.9 113.8,88.9 
-                                               113.7,88.9 113.7,88.9 113.7,88.9 113.6,88.9 113.6,88.9 113.6,88.9 113.6,88.9 113.5,88.9 113.5,88.9 113.5,88.9 113.4,88.9 
-                                               113.4,88.9 113.4,88.9 113.4,88.9 113.3,88.9 113.3,88.9 113.3,88.9 113.2,88.9 113.2,88.9 113.2,88.9 113.2,88.9 113.1,88.9 
-                                               113.1,88.9 113.1,88.9 113,88.9 113,88.9 113,88.9 113,88.9 112.9,88.9 112.9,88.9 112.9,88.9 112.8,88.9 112.8,88.9 
-                                               112.8,88.9 112.8,88.9 112.7,88.9 112.7,88.9 112.7,88.9 112.7,88.9 112.6,88.9 112.6,88.9 112.6,88.9 112.5,88.9 112.5,88.9 
-                                               112.5,88.9 112.5,88.9 112.4,88.9 112.4,88.9 112.4,88.9 112.3,88.9 112.3,88.9 112.3,88.9 112.3,88.9 112.2,88.9 112.2,88.9 
-                                               112.2,88.9 112.1,88.9 112.1,88.9 112.1,88.9 112.1,88.9 112,88.9 112,88.9 112,88.9 111.9,88.9 111.9,88.9 111.9,88.9 
-                                               111.9,88.9 111.8,88.9 111.8,88.9 111.8,88.9 111.7,88.9 111.7,88.9 111.7,88.9 111.7,88.9 111.6,88.9 111.6,88.9 111.6,88.9 
-                                               111.5,88.9 111.5,88.9 111.5,88.9 111.5,88.9 111.4,88.9 111.4,88.9 111.4,88.9 111.3,88.9 111.3,88.9 111.3,88.9 111.3,88.9 
-                                               111.2,88.9 111.2,88.9 111.2,88.9 111.1,88.9 111.1,88.9 111.1,88.9 111.1,88.9 111,88.9 111,88.9 111,88.9 110.9,88.9 
-                                               110.9,88.9 110.9,88.9 110.9,88.9 110.8,88.9 110.8,88.9 110.8,88.9 110.7,88.9 110.7,88.9 110.7,88.9 110.7,88.9 110.6,88.9 
-                                               110.6,88.9 110.6,88.9 110.5,88.9 110.5,88.9 110.5,88.9 110.5,88.9 110.4,88.9 110.4,88.9 110.4,88.9 110.4,88.9 110.3,88.9 
-                                               110.3,88.9 110.3,88.9 110.2,88.9 110.2,88.9 110.2,88.9 110.2,88.9 110.1,88.9 110.1,88.9 110.1,88.9 110,88.9 110,88.9 
-                                               110,88.9 110,88.9 109.9,88.9 109.9,88.9 109.9,88.9 109.8,88.9 109.8,88.9 109.8,88.9 109.8,88.9 109.7,88.9 109.7,88.9 
-                                               109.7,88.9 109.6,88.9 109.6,88.9 109.6,88.9 109.6,88.9 109.5,88.9 109.5,88.9 109.5,91 109.5,91 109.6,91 109.6,91 109.6,91 
-                                               109.6,91 109.7,91 109.7,91 109.7,91 109.8,91 109.8,91 109.8,91 109.8,91 109.9,91 109.9,91 109.9,91 110,91 110,91 110,91 
-                                               110,91 110.1,91 110.1,91 110.1,91 110.2,91 110.2,91 110.2,91 110.2,91 110.3,91 110.3,91 110.3,91 110.4,91 110.4,91 
-                                               110.4,91 110.4,91 110.5,91 110.5,91 110.5,91 110.5,91 110.6,91 110.6,91 110.6,91 110.7,91 110.7,91 110.7,91 110.7,91 
-                                               110.8,91 110.8,91 110.8,91 110.9,91 110.9,91 110.9,91 110.9,91 111,91 111,91 111,91 111.1,91 111.1,91 111.1,91 111.1,91 
-                                               111.2,91 111.2,91 111.2,91 111.3,91 111.3,91 111.3,91 111.3,91 111.4,91 111.4,91 111.4,91 111.5,91 111.5,91 111.5,91 
-                                               111.5,91 111.6,91 111.6,91 111.6,91 111.7,91 111.7,91 111.7,91 111.7,91 111.8,91 111.8,91 111.8,91 111.9,91 111.9,91 
-                                               111.9,91 111.9,91 112,91 112,91 112,91 112.1,91 112.1,91 112.1,91 112.1,91 112.2,91 112.2,91 112.2,91 112.3,91 112.3,91 
-                                               112.3,91 112.3,91 112.4,91 112.4,91 112.4,91 112.5,91 112.5,91 112.5,91 112.5,91 112.6,91 112.6,91 112.6,91 112.7,91 
-                                               112.7,91 112.7,91 112.7,91 112.8,91 112.8,91 112.8,91 112.8,91 112.9,91 112.9,91 112.9,91 113,91 113,91 113,91 113,91 
-                                               113.1,91 113.1,91 113.1,91 113.2,91 113.2,91 113.2,91 113.2,91 113.3,91 113.3,91 113.3,91 113.4,91 113.4,91 113.4,91 
-                                               113.4,91 113.5,91 113.5,91 113.5,91 113.6,91 113.6,91 113.6,91 113.6,91 113.7,91 113.7,91 113.7,91 113.8,91 113.8,91 
-                                               113.8,91 113.8,91 113.9,91 113.9,91 113.9,91 114,91 114,91 114,91 114,91 114.1,91 114.1,91 114.1,91 114.2,91 114.2,91 
-                                               114.2,91 114.2,91 114.3,91 114.3,91 114.3,91 114.4,91 114.4,91 114.4,91 114.4,91 114.5,91 114.5,91 114.5,91 114.6,91 
-                                               114.6,91 114.6,91 114.6,91 114.7,91 114.7,91 114.7,91 114.8,91 114.8,91 114.8,91 114.8,91 114.9,91 114.9,91 114.9,91 
-                                               115,91 115,88.9 114.9,88.9                                      "/>
-                                       <linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st18" points="109.5,96.5 109.5,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.6,96.5 109.7,96.5 
-                                               109.7,96.5 109.7,96.5 109.7,96.5 109.7,96.5 109.7,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 109.8,96.5 
-                                               109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 109.9,96.5 110,96.5 110,96.5 110,96.5 110,96.5 110,96.5 110,96.5 
-                                               110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.1,96.5 110.2,96.5 110.2,96.5 110.2,96.5 110.2,96.5 110.2,96.5 
-                                               110.2,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.3,96.5 110.4,96.5 110.4,96.5 110.4,96.5 110.4,96.5 110.4,96.5 
-                                               110.4,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.5,96.5 110.6,96.5 110.6,96.5 110.6,96.5 110.6,96.5 
-                                               110.6,96.5 110.6,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.7,96.5 110.8,96.5 110.8,96.5 110.8,96.5 
-                                               110.8,96.5 110.8,96.5 110.8,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 110.9,96.5 111,96.5 111,96.5 
-                                               111,96.5 111,96.5 111,96.5 111,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.1,96.5 111.2,96.5 111.2,96.5 
-                                               111.2,96.5 111.2,96.5 111.2,96.5 111.2,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.3,96.5 111.4,96.5 
-                                               111.4,96.5 111.4,96.5 111.4,96.5 111.4,96.5 111.4,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 111.5,96.5 
-                                               111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.6,96.5 111.7,96.5 111.7,96.5 111.7,96.5 111.7,96.5 111.7,96.5 
-                                               111.7,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.8,96.5 111.9,96.5 111.9,96.5 111.9,96.5 111.9,96.5 
-                                               111.9,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112,96.5 112.1,96.5 112.1,96.5 112.1,96.5 112.1,96.5 112.1,96.5 
-                                               112.1,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.2,96.5 112.3,96.5 112.3,96.5 112.3,96.5 112.3,96.5 
-                                               112.3,96.5 112.3,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.4,96.5 112.5,96.5 112.5,96.5 112.5,96.5 
-                                               112.5,96.5 112.5,96.5 112.5,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.6,96.5 112.7,96.5 112.7,96.5 112.7,96.5 
-                                               112.7,96.5 112.7,96.5 112.7,96.5 112.8,96.5 112.8,96.5 112.8,94.4 112.8,94.4 112.7,94.4 112.7,94.4 112.7,94.4 112.7,94.4 
-                                               112.7,94.4 112.7,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.6,94.4 112.5,94.4 112.5,94.4 112.5,94.4 112.5,94.4 
-                                               112.5,94.4 112.5,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.4,94.4 112.3,94.4 112.3,94.4 112.3,94.4 
-                                               112.3,94.4 112.3,94.4 112.3,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.2,94.4 112.1,94.4 112.1,94.4 
-                                               112.1,94.4 112.1,94.4 112.1,94.4 112.1,94.4 112,94.4 112,94.4 112,94.4 112,94.4 112,94.4 112,94.4 111.9,94.4 111.9,94.4 
-                                               111.9,94.4 111.9,94.4 111.9,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.8,94.4 111.7,94.4 111.7,94.4 
-                                               111.7,94.4 111.7,94.4 111.7,94.4 111.7,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.6,94.4 111.5,94.4 
-                                               111.5,94.4 111.5,94.4 111.5,94.4 111.5,94.4 111.5,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 111.4,94.4 
-                                               111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.3,94.4 111.2,94.4 111.2,94.4 111.2,94.4 111.2,94.4 111.2,94.4 
-                                               111.2,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111.1,94.4 111,94.4 111,94.4 111,94.4 111,94.4 111,94.4 111,94.4 
-                                               110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.9,94.4 110.8,94.4 110.8,94.4 110.8,94.4 110.8,94.4 110.8,94.4 
-                                               110.8,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.7,94.4 110.6,94.4 110.6,94.4 110.6,94.4 110.6,94.4 
-                                               110.6,94.4 110.6,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.5,94.4 110.4,94.4 110.4,94.4 110.4,94.4 
-                                               110.4,94.4 110.4,94.4 110.4,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.3,94.4 110.2,94.4 110.2,94.4 110.2,94.4 
-                                               110.2,94.4 110.2,94.4 110.2,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110.1,94.4 110,94.4 110,94.4 
-                                               110,94.4 110,94.4 110,94.4 110,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.9,94.4 109.8,94.4 
-                                               109.8,94.4 109.8,94.4 109.8,94.4 109.8,94.4 109.8,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 109.7,94.4 
-                                               109.6,94.4 109.6,94.4 109.6,94.4 109.6,94.4 109.6,94.4 109.5,94.4 109.5,94.4 109.5,94.4 109.5,94.4 109.5,96.5 109.5,96.5 
-                                                                                       "/>
-                                       <linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st19" points="114.9,99.8 114.9,99.8 114.8,99.8 114.8,99.8 114.8,99.8 114.8,99.8 114.7,99.8 114.7,99.8 
-                                               114.7,99.8 114.6,99.8 114.6,99.8 114.6,99.8 114.6,99.8 114.5,99.8 114.5,99.8 114.5,99.8 114.4,99.8 114.4,99.8 114.4,99.8 
-                                               114.4,99.8 114.3,99.8 114.3,99.8 114.3,99.8 114.2,99.8 114.2,99.8 114.2,99.8 114.2,99.8 114.1,99.8 114.1,99.8 114.1,99.8 
-                                               114,99.8 114,99.8 114,99.8 114,99.8 113.9,99.8 113.9,99.8 113.9,99.8 113.8,99.8 113.8,99.8 113.8,99.8 113.8,99.8 
-                                               113.7,99.8 113.7,99.8 113.7,99.8 113.6,99.8 113.6,99.8 113.6,99.8 113.6,99.8 113.5,99.8 113.5,99.8 113.5,99.8 113.4,99.8 
-                                               113.4,99.8 113.4,99.8 113.4,99.8 113.3,99.8 113.3,99.8 113.3,99.8 113.2,99.8 113.2,99.8 113.2,99.8 113.2,99.8 113.1,99.8 
-                                               113.1,99.8 113.1,99.8 113,99.8 113,99.8 113,99.8 113,99.8 112.9,99.8 112.9,99.8 112.9,99.8 112.8,99.8 112.8,99.8 
-                                               112.8,99.8 112.8,99.8 112.7,99.8 112.7,99.8 112.7,99.8 112.7,99.8 112.6,99.8 112.6,99.8 112.6,99.8 112.5,99.8 112.5,99.8 
-                                               112.5,99.8 112.5,99.8 112.4,99.8 112.4,99.8 112.4,99.8 112.3,99.8 112.3,99.8 112.3,99.8 112.3,99.8 112.2,99.8 112.2,99.8 
-                                               112.2,99.8 112.1,99.8 112.1,99.8 112.1,99.8 112.1,99.8 112,99.8 112,99.8 112,99.8 111.9,99.8 111.9,99.8 111.9,99.8 
-                                               111.9,99.8 111.8,99.8 111.8,99.8 111.8,99.8 111.7,99.8 111.7,99.8 111.7,99.8 111.7,99.8 111.6,99.8 111.6,99.8 111.6,99.8 
-                                               111.5,99.8 111.5,99.8 111.5,99.8 111.5,99.8 111.4,99.8 111.4,99.8 111.4,99.8 111.3,99.8 111.3,99.8 111.3,99.8 111.3,99.8 
-                                               111.2,99.8 111.2,99.8 111.2,99.8 111.1,99.8 111.1,99.8 111.1,99.8 111.1,99.8 111,99.8 111,99.8 111,99.8 110.9,99.8 
-                                               110.9,99.8 110.9,99.8 110.9,99.8 110.8,99.8 110.8,99.8 110.8,99.8 110.7,99.8 110.7,99.8 110.7,99.8 110.7,99.8 110.6,99.8 
-                                               110.6,99.8 110.6,99.8 110.5,99.8 110.5,99.8 110.5,99.8 110.5,99.8 110.4,99.8 110.4,99.8 110.4,99.8 110.4,99.8 110.3,99.8 
-                                               110.3,99.8 110.3,99.8 110.2,99.8 110.2,99.8 110.2,99.8 110.2,99.8 110.1,99.8 110.1,99.8 110.1,99.8 110,99.8 110,99.8 
-                                               110,99.8 110,99.8 109.9,99.8 109.9,99.8 109.9,99.8 109.8,99.8 109.8,99.8 109.8,99.8 109.8,99.8 109.7,99.8 109.7,99.8 
-                                               109.7,99.8 109.6,99.8 109.6,99.8 109.6,99.8 109.6,99.8 109.5,99.8 109.5,99.8 109.5,101.9 109.5,101.9 109.6,101.9 
-                                               109.6,101.9 109.6,101.9 109.6,101.9 109.7,101.9 109.7,101.9 109.7,101.9 109.8,101.9 109.8,101.9 109.8,101.9 109.8,101.9 
-                                               109.9,101.9 109.9,101.9 109.9,101.9 110,101.9 110,101.9 110,101.9 110,101.9 110.1,101.9 110.1,101.9 110.1,101.9 
-                                               110.2,101.9 110.2,101.9 110.2,101.9 110.2,101.9 110.3,101.9 110.3,101.9 110.3,101.9 110.4,101.9 110.4,101.9 110.4,101.9 
-                                               110.4,101.9 110.5,101.9 110.5,101.9 110.5,101.9 110.5,101.9 110.6,101.9 110.6,101.9 110.6,101.9 110.7,101.9 110.7,101.9 
-                                               110.7,101.9 110.7,101.9 110.8,101.9 110.8,101.9 110.8,101.9 110.9,101.9 110.9,101.9 110.9,101.9 110.9,101.9 111,101.9 
-                                               111,101.9 111,101.9 111.1,101.9 111.1,101.9 111.1,101.9 111.1,101.9 111.2,101.9 111.2,101.9 111.2,101.9 111.3,101.9 
-                                               111.3,101.9 111.3,101.9 111.3,101.9 111.4,101.9 111.4,101.9 111.4,101.9 111.5,101.9 111.5,101.9 111.5,101.9 111.5,101.9 
-                                               111.6,101.9 111.6,101.9 111.6,101.9 111.7,101.9 111.7,101.9 111.7,101.9 111.7,101.9 111.8,101.9 111.8,101.9 111.8,101.9 
-                                               111.9,101.9 111.9,101.9 111.9,101.9 111.9,101.9 112,101.9 112,101.9 112,101.9 112.1,101.9 112.1,101.9 112.1,101.9 
-                                               112.1,101.9 112.2,101.9 112.2,101.9 112.2,101.9 112.3,101.9 112.3,101.9 112.3,101.9 112.3,101.9 112.4,101.9 112.4,101.9 
-                                               112.4,101.9 112.5,101.9 112.5,101.9 112.5,101.9 112.5,101.9 112.6,101.9 112.6,101.9 112.6,101.9 112.7,101.9 112.7,101.9 
-                                               112.7,101.9 112.7,101.9 112.8,101.9 112.8,101.9 112.8,101.9 112.8,101.9 112.9,101.9 112.9,101.9 112.9,101.9 113,101.9 
-                                               113,101.9 113,101.9 113,101.9 113.1,101.9 113.1,101.9 113.1,101.9 113.2,101.9 113.2,101.9 113.2,101.9 113.2,101.9 
-                                               113.3,101.9 113.3,101.9 113.3,101.9 113.4,101.9 113.4,101.9 113.4,101.9 113.4,101.9 113.5,101.9 113.5,101.9 113.5,101.9 
-                                               113.6,101.9 113.6,101.9 113.6,101.9 113.6,101.9 113.7,101.9 113.7,101.9 113.7,101.9 113.8,101.9 113.8,101.9 113.8,101.9 
-                                               113.8,101.9 113.9,101.9 113.9,101.9 113.9,101.9 114,101.9 114,101.9 114,101.9 114,101.9 114.1,101.9 114.1,101.9 
-                                               114.1,101.9 114.2,101.9 114.2,101.9 114.2,101.9 114.2,101.9 114.3,101.9 114.3,101.9 114.3,101.9 114.4,101.9 114.4,101.9 
-                                               114.4,101.9 114.4,101.9 114.5,101.9 114.5,101.9 114.5,101.9 114.6,101.9 114.6,101.9 114.6,101.9 114.6,101.9 114.7,101.9 
-                                               114.7,101.9 114.7,101.9 114.8,101.9 114.8,101.9 114.8,101.9 114.8,101.9 114.9,101.9 114.9,101.9 114.9,101.9 115,101.9 
-                                               115,99.8 114.9,99.8                                     "/>
-                                       <linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="111.134" y1="166.6087" x2="111.134" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st20" points="109.5,107.4 109.5,107.4 109.6,107.4 109.6,107.4 109.6,107.4 109.6,107.4 109.6,107.4 
-                                               109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.7,107.4 109.8,107.4 109.8,107.4 109.8,107.4 109.8,107.4 
-                                               109.8,107.4 109.8,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 109.9,107.4 110,107.4 110,107.4 
-                                               110,107.4 110,107.4 110,107.4 110,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 110.1,107.4 
-                                               110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.2,107.4 110.3,107.4 110.3,107.4 110.3,107.4 110.3,107.4 
-                                               110.3,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.4,107.4 110.5,107.4 110.5,107.4 110.5,107.4 
-                                               110.5,107.4 110.5,107.4 110.5,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.6,107.4 110.7,107.4 
-                                               110.7,107.4 110.7,107.4 110.7,107.4 110.7,107.4 110.7,107.4 110.8,107.4 110.8,107.4 110.8,107.4 110.8,107.4 110.8,107.4 
-                                               110.8,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 110.9,107.4 111,107.4 111,107.4 111,107.4 
-                                               111,107.4 111,107.4 111,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.1,107.4 111.2,107.4 111.2,107.4 
-                                               111.2,107.4 111.2,107.4 111.2,107.4 111.2,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 111.3,107.4 
-                                               111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.4,107.4 111.5,107.4 111.5,107.4 111.5,107.4 111.5,107.4 
-                                               111.5,107.4 111.5,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.6,107.4 111.7,107.4 111.7,107.4 
-                                               111.7,107.4 111.7,107.4 111.7,107.4 111.7,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 111.8,107.4 
-                                               111.9,107.4 111.9,107.4 111.9,107.4 111.9,107.4 111.9,107.4 112,107.4 112,107.4 112,107.4 112,107.4 112,107.4 112,107.4 
-                                               112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.1,107.4 112.2,107.4 112.2,107.4 112.2,107.4 112.2,107.4 
-                                               112.2,107.4 112.2,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.3,107.4 112.4,107.4 112.4,107.4 
-                                               112.4,107.4 112.4,107.4 112.4,107.4 112.4,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 112.5,107.4 
-                                               112.6,107.4 112.6,107.4 112.6,107.4 112.6,107.4 112.6,107.4 112.7,107.4 112.7,107.4 112.7,107.4 112.7,107.4 112.7,107.4 
-                                               112.7,107.4 112.8,107.4 112.8,107.4 112.8,105.3 112.8,105.3 112.7,105.3 112.7,105.3 112.7,105.3 112.7,105.3 112.7,105.3 
-                                               112.7,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.6,105.3 112.5,105.3 112.5,105.3 112.5,105.3 112.5,105.3 
-                                               112.5,105.3 112.5,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.4,105.3 112.3,105.3 112.3,105.3 
-                                               112.3,105.3 112.3,105.3 112.3,105.3 112.3,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 112.2,105.3 
-                                               112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112.1,105.3 112,105.3 112,105.3 112,105.3 112,105.3 112,105.3 
-                                               112,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.9,105.3 111.8,105.3 111.8,105.3 111.8,105.3 111.8,105.3 
-                                               111.8,105.3 111.8,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.7,105.3 111.6,105.3 111.6,105.3 
-                                               111.6,105.3 111.6,105.3 111.6,105.3 111.6,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 111.5,105.3 
-                                               111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.4,105.3 111.3,105.3 111.3,105.3 111.3,105.3 111.3,105.3 
-                                               111.3,105.3 111.3,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.2,105.3 111.1,105.3 111.1,105.3 
-                                               111.1,105.3 111.1,105.3 111.1,105.3 111,105.3 111,105.3 111,105.3 111,105.3 111,105.3 111,105.3 110.9,105.3 110.9,105.3 
-                                               110.9,105.3 110.9,105.3 110.9,105.3 110.9,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 110.8,105.3 
-                                               110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.7,105.3 110.6,105.3 110.6,105.3 110.6,105.3 110.6,105.3 
-                                               110.6,105.3 110.6,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.5,105.3 110.4,105.3 110.4,105.3 
-                                               110.4,105.3 110.4,105.3 110.4,105.3 110.4,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.3,105.3 110.2,105.3 
-                                               110.2,105.3 110.2,105.3 110.2,105.3 110.2,105.3 110.2,105.3 110.1,105.3 110.1,105.3 110.1,105.3 110.1,105.3 110.1,105.3 
-                                               110.1,105.3 110,105.3 110,105.3 110,105.3 110,105.3 110,105.3 110,105.3 109.9,105.3 109.9,105.3 109.9,105.3 109.9,105.3 
-                                               109.9,105.3 109.9,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.8,105.3 109.7,105.3 109.7,105.3 
-                                               109.7,105.3 109.7,105.3 109.7,105.3 109.7,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.6,105.3 109.5,105.3 
-                                               109.5,105.3 109.5,105.3 109.5,105.3 109.5,107.4 109.5,107.4                                     "/>
-                                       <linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="112.2248" y1="166.6087" x2="112.2248" y2="40.4035">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st21" points="114.9,110.7 114.9,110.7 114.8,110.7 114.8,110.7 114.8,110.7 114.8,110.7 114.7,110.7 
-                                               114.7,110.7 114.7,110.7 114.6,110.7 114.6,110.7 114.6,110.7 114.6,110.7 114.5,110.7 114.5,110.7 114.5,110.7 114.4,110.7 
-                                               114.4,110.7 114.4,110.7 114.4,110.7 114.3,110.7 114.3,110.7 114.3,110.7 114.2,110.7 114.2,110.7 114.2,110.7 114.2,110.7 
-                                               114.1,110.7 114.1,110.7 114.1,110.7 114,110.7 114,110.7 114,110.7 114,110.7 113.9,110.7 113.9,110.7 113.9,110.7 
-                                               113.8,110.7 113.8,110.7 113.8,110.7 113.8,110.7 113.7,110.7 113.7,110.7 113.7,110.7 113.6,110.7 113.6,110.7 113.6,110.7 
-                                               113.6,110.7 113.5,110.7 113.5,110.7 113.5,110.7 113.4,110.7 113.4,110.7 113.4,110.7 113.4,110.7 113.3,110.7 113.3,110.7 
-                                               113.3,110.7 113.2,110.7 113.2,110.7 113.2,110.7 113.2,110.7 113.1,110.7 113.1,110.7 113.1,110.7 113,110.7 113,110.7 
-                                               113,110.7 113,110.7 112.9,110.7 112.9,110.7 112.9,110.7 112.8,110.7 112.8,110.7 112.8,110.7 112.8,110.7 112.7,110.7 
-                                               112.7,110.7 112.7,110.7 112.7,110.7 112.6,110.7 112.6,110.7 112.6,110.7 112.5,110.7 112.5,110.7 112.5,110.7 112.5,110.7 
-                                               112.4,110.7 112.4,110.7 112.4,110.7 112.3,110.7 112.3,110.7 112.3,110.7 112.3,110.7 112.2,110.7 112.2,110.7 112.2,110.7 
-                                               112.1,110.7 112.1,110.7 112.1,110.7 112.1,110.7 112,110.7 112,110.7 112,110.7 111.9,110.7 111.9,110.7 111.9,110.7 
-                                               111.9,110.7 111.8,110.7 111.8,110.7 111.8,110.7 111.7,110.7 111.7,110.7 111.7,110.7 111.7,110.7 111.6,110.7 111.6,110.7 
-                                               111.6,110.7 111.5,110.7 111.5,110.7 111.5,110.7 111.5,110.7 111.4,110.7 111.4,110.7 111.4,110.7 111.3,110.7 111.3,110.7 
-                                               111.3,110.7 111.3,110.7 111.2,110.7 111.2,110.7 111.2,110.7 111.1,110.7 111.1,110.7 111.1,110.7 111.1,110.7 111,110.7 
-                                               111,110.7 111,110.7 110.9,110.7 110.9,110.7 110.9,110.7 110.9,110.7 110.8,110.7 110.8,110.7 110.8,110.7 110.7,110.7 
-                                               110.7,110.7 110.7,110.7 110.7,110.7 110.6,110.7 110.6,110.7 110.6,110.7 110.5,110.7 110.5,110.7 110.5,110.7 110.5,110.7 
-                                               110.4,110.7 110.4,110.7 110.4,110.7 110.4,110.7 110.3,110.7 110.3,110.7 110.3,110.7 110.2,110.7 110.2,110.7 110.2,110.7 
-                                               110.2,110.7 110.1,110.7 110.1,110.7 110.1,110.7 110,110.7 110,110.7 110,110.7 110,110.7 109.9,110.7 109.9,110.7 
-                                               109.9,110.7 109.8,110.7 109.8,110.7 109.8,110.7 109.8,110.7 109.7,110.7 109.7,110.7 109.7,110.7 109.6,110.7 109.6,110.7 
-                                               109.6,110.7 109.6,110.7 109.5,110.7 109.5,110.7 109.5,112.8 109.5,112.8 109.6,112.8 109.6,112.8 109.6,112.8 109.6,112.8 
-                                               109.7,112.8 109.7,112.8 109.7,112.8 109.8,112.8 109.8,112.8 109.8,112.8 109.8,112.8 109.9,112.8 109.9,112.8 109.9,112.8 
-                                               110,112.8 110,112.8 110,112.8 110,112.8 110.1,112.8 110.1,112.8 110.1,112.8 110.2,112.8 110.2,112.8 110.2,112.8 
-                                               110.2,112.8 110.3,112.8 110.3,112.8 110.3,112.8 110.4,112.8 110.4,112.8 110.4,112.8 110.4,112.8 110.5,112.8 110.5,112.8 
-                                               110.5,112.8 110.5,112.8 110.6,112.8 110.6,112.8 110.6,112.8 110.7,112.8 110.7,112.8 110.7,112.8 110.7,112.8 110.8,112.8 
-                                               110.8,112.8 110.8,112.8 110.9,112.8 110.9,112.8 110.9,112.8 110.9,112.8 111,112.8 111,112.8 111,112.8 111.1,112.8 
-                                               111.1,112.8 111.1,112.8 111.1,112.8 111.2,112.8 111.2,112.8 111.2,112.8 111.3,112.8 111.3,112.8 111.3,112.8 111.3,112.8 
-                                               111.4,112.8 111.4,112.8 111.4,112.8 111.5,112.8 111.5,112.8 111.5,112.8 111.5,112.8 111.6,112.8 111.6,112.8 111.6,112.8 
-                                               111.7,112.8 111.7,112.8 111.7,112.8 111.7,112.8 111.8,112.8 111.8,112.8 111.8,112.8 111.9,112.8 111.9,112.8 111.9,112.8 
-                                               111.9,112.8 112,112.8 112,112.8 112,112.8 112.1,112.8 112.1,112.8 112.1,112.8 112.1,112.8 112.2,112.8 112.2,112.8 
-                                               112.2,112.8 112.3,112.8 112.3,112.8 112.3,112.8 112.3,112.8 112.4,112.8 112.4,112.8 112.4,112.8 112.5,112.8 112.5,112.8 
-                                               112.5,112.8 112.5,112.8 112.6,112.8 112.6,112.8 112.6,112.8 112.7,112.8 112.7,112.8 112.7,112.8 112.7,112.8 112.8,112.8 
-                                               112.8,112.8 112.8,112.8 112.8,112.8 112.9,112.8 112.9,112.8 112.9,112.8 113,112.8 113,112.8 113,112.8 113,112.8 
-                                               113.1,112.8 113.1,112.8 113.1,112.8 113.2,112.8 113.2,112.8 113.2,112.8 113.2,112.8 113.3,112.8 113.3,112.8 113.3,112.8 
-                                               113.4,112.8 113.4,112.8 113.4,112.8 113.4,112.8 113.5,112.8 113.5,112.8 113.5,112.8 113.6,112.8 113.6,112.8 113.6,112.8 
-                                               113.6,112.8 113.7,112.8 113.7,112.8 113.7,112.8 113.8,112.8 113.8,112.8 113.8,112.8 113.8,112.8 113.9,112.8 113.9,112.8 
-                                               113.9,112.8 114,112.8 114,112.8 114,112.8 114,112.8 114.1,112.8 114.1,112.8 114.1,112.8 114.2,112.8 114.2,112.8 
-                                               114.2,112.8 114.2,112.8 114.3,112.8 114.3,112.8 114.3,112.8 114.4,112.8 114.4,112.8 114.4,112.8 114.4,112.8 114.5,112.8 
-                                               114.5,112.8 114.5,112.8 114.6,112.8 114.6,112.8 114.6,112.8 114.6,112.8 114.7,112.8 114.7,112.8 114.7,112.8 114.8,112.8 
-                                               114.8,112.8 114.8,112.8 114.8,112.8 114.9,112.8 114.9,112.8 114.9,112.8 115,112.8 115,110.7 114.9,110.7                                         "/>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/launcher.png b/homescreen/qml/images/Shortcut/launcher.png
new file mode 100644 (file)
index 0000000..6f91d50
Binary files /dev/null and b/homescreen/qml/images/Shortcut/launcher.png differ
diff --git a/homescreen/qml/images/Shortcut/launcher.svg b/homescreen/qml/images/Shortcut/launcher.svg
deleted file mode 100644 (file)
index b6eab24..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Home" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
-       .st4{fill:url(#SVGID_1_);}
-       .st5{fill:url(#SVGID_2_);}
-       .st6{fill:url(#SVGID_3_);}
-       .st7{fill:url(#SVGID_4_);}
-       .st8{fill:url(#SVGID_5_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g>
-                       <g id="Home_1_">
-                               <g>
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="99.287" y1="155.911" x2="99.287" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st4" d="M67.3,106.3c-1.2-1.2-1.2-3.2,0-4.4l29.8-28.7c1.1-1.1,3.2-1.2,4.3,0l29.8,28.7c1.2,1.2,1.2,3.2,0,4.4
-                                               l-1.4-1.4c0.4-0.4,0.4-1.1,0-1.5L100,74.6c-0.4-0.4-1.1-0.4-1.5,0l-29.8,28.7c-0.4,0.4-0.4,1.1,0,1.5L67.3,106.3z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="118.5558" y1="155.911" x2="118.5558" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st5" d="M124.8,90h-2V76.9l-8.4,0l0,4.2h-2v-4.2c0-1.1,0.9-2.1,2.1-2.1h8.4c1.1,0,2.1,0.9,2.1,2.1V90z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="80.0296" y1="155.911" x2="80.0296" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st6" d="M88.4,138H74.8c-1.7,0-3.1-1.4-3.1-3.1v-14.7h2v14.7c0,0.6,0.5,1.1,1.1,1.1h13.5V138z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="118.4708" y1="155.911" x2="118.4708" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st7" d="M123.7,138h-13.6v-2h13.6c0.6,0,1.1-0.5,1.1-1.1v-27.2c0-0.6-0.5-1.1-1.1-1.1v-2c1.7,0,3.1,1.4,3.1,3.1
-                                               v27.2C126.8,136.7,125.4,138,123.7,138z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="98.7235" y1="155.911" x2="98.7235" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st8" d="M105,138.2l0-21l-12.5,0l0,18.9l0,2.1c-1.1,0-2.1-0.9-2.1-2.1v-18.9c0-1.1,0.9-2.1,2.1-2.1H105
-                                               c1.1,0,2.1,0.9,2.1,2.1v18.9C107,137.2,106.1,138.2,105,138.2z"/>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/launcher_active.png b/homescreen/qml/images/Shortcut/launcher_active.png
new file mode 100644 (file)
index 0000000..2706961
Binary files /dev/null and b/homescreen/qml/images/Shortcut/launcher_active.png differ
diff --git a/homescreen/qml/images/Shortcut/launcher_active.svg b/homescreen/qml/images/Shortcut/launcher_active.svg
deleted file mode 100644 (file)
index e85c7d8..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Home" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-       .st8{fill:url(#SVGID_3_);}
-       .st9{fill:url(#SVGID_4_);}
-       .st10{fill:url(#SVGID_5_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <rect id="Active_1" y="214.3" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" class="st0" width="195.9" height="2.4"/>
-               <linearGradient id="Active_2_1_" gradientUnits="userSpaceOnUse" x1="97.9416" y1="236.9585" x2="97.9416" y2="-68.5304">
-                       <stop  offset="0" style="stop-color:#0DF9FF"/>
-                       <stop  offset="9.208472e-02" style="stop-color:#0DF9FF;stop-opacity:0.853"/>
-                       <stop  offset="0.6264" style="stop-color:#0DF9FF;stop-opacity:0"/>
-               </linearGradient>
-               <rect id="Active_2" class="st1" width="195.9" height="214.3"/>
-               <g>
-                       <g id="Home_1_">
-                               <g>
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="99.287" y1="155.911" x2="99.287" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st6" d="M67.3,106.3c-1.2-1.2-1.2-3.2,0-4.4l29.8-28.7c1.1-1.1,3.2-1.2,4.3,0l29.8,28.7c1.2,1.2,1.2,3.2,0,4.4
-                                               l-1.4-1.4c0.4-0.4,0.4-1.1,0-1.5L100,74.6c-0.4-0.4-1.1-0.4-1.5,0l-29.8,28.7c-0.4,0.4-0.4,1.1,0,1.5L67.3,106.3z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="118.5558" y1="155.911" x2="118.5558" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st7" d="M124.8,90h-2V76.9l-8.4,0l0,4.2h-2v-4.2c0-1.1,0.9-2.1,2.1-2.1h8.4c1.1,0,2.1,0.9,2.1,2.1V90z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="80.0296" y1="155.911" x2="80.0296" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st8" d="M88.4,138H74.8c-1.7,0-3.1-1.4-3.1-3.1v-14.7h2v14.7c0,0.6,0.5,1.1,1.1,1.1h13.5V138z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="118.4708" y1="155.911" x2="118.4708" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st9" d="M123.7,138h-13.6v-2h13.6c0.6,0,1.1-0.5,1.1-1.1v-27.2c0-0.6-0.5-1.1-1.1-1.1v-2c1.7,0,3.1,1.4,3.1,3.1
-                                               v27.2C126.8,136.7,125.4,138,123.7,138z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="98.7235" y1="155.911" x2="98.7235" y2="84.32">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st10" d="M105,138.2l0-21l-12.5,0l0,18.9l0,2.1c-1.1,0-2.1-0.9-2.1-2.1v-18.9c0-1.1,0.9-2.1,2.1-2.1H105
-                                               c1.1,0,2.1,0.9,2.1,2.1v18.9C107,137.2,106.1,138.2,105,138.2z"/>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/mediaplayer.png b/homescreen/qml/images/Shortcut/mediaplayer.png
new file mode 100644 (file)
index 0000000..8ea7d76
Binary files /dev/null and b/homescreen/qml/images/Shortcut/mediaplayer.png differ
diff --git a/homescreen/qml/images/Shortcut/mediaplayer.svg b/homescreen/qml/images/Shortcut/mediaplayer.svg
deleted file mode 100644 (file)
index de7448d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Multimedia" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
-       .st4{fill:url(#SVGID_1_);}
-       .st5{fill:url(#SVGID_2_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g>
-                       <g id="Multimedia_2_">
-                               <g>
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="86.8321" y1="146.5267" x2="114.4627" y2="66.8384">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st4" d="M71.3,139.8c-3.8,0-7.2-1.5-8.9-4.5c-1.7-2.9-3.2-8.7,5.7-13.8c2.9-1.7,10.2-2.3,12.4-2.4l0,2.1
-                                               c-2.7,0.1-9.2,0.8-11.4,2.1c-5.6,3.2-7.2,6.9-4.9,10.9c2.3,4,8.7,4.6,14.3,1.3c4-2.3,6.3-6.3,6.4-10.7l-0.1-0.4V82.7l42.9-8.4
-                                               l0.1,42.6c0,4-2,9.8-7.5,13c-6.6,3.8-14.4,2.9-17.2-2.1c-1.7-2.9-3.2-8.7,5.7-13.8c2.6-1.5,8.6-2.3,11.2-2.4l0.1,2.1
-                                               c-2.5,0.1-8,0.8-10.2,2.1c-3.8,2.2-7.8,5.9-4.9,10.9c2.3,4,8.7,4.6,14.3,1.3c4.7-2.7,6.4-7.6,6.4-11.1l-0.1-0.5V76.9l-38.6,7.6
-                                               v39.9l0.1,0.4c0,5.2-2.8,9.9-7.4,12.6C76.9,139,74,139.8,71.3,139.8z"/>
-                               </g>
-                               <g>
-                                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="89.6871" y1="147.5167" x2="117.3178" y2="67.8283">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <polygon class="st5" points="95.8,99.4 95.3,97.3 119.6,91.6 120.1,93.7                                  "/>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/mediaplayer_active.png b/homescreen/qml/images/Shortcut/mediaplayer_active.png
new file mode 100644 (file)
index 0000000..b130b92
Binary files /dev/null and b/homescreen/qml/images/Shortcut/mediaplayer_active.png differ
diff --git a/homescreen/qml/images/Shortcut/mediaplayer_active.svg b/homescreen/qml/images/Shortcut/mediaplayer_active.svg
deleted file mode 100644 (file)
index 16e3af5..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g id="Layer_6">
-                       <rect id="Active_1" y="214.3" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" class="st0" width="195.9" height="2.4"/>
-                       <linearGradient id="Active_2_1_" gradientUnits="userSpaceOnUse" x1="97.9416" y1="236.9585" x2="97.9416" y2="-68.5304">
-                               <stop  offset="0" style="stop-color:#0DF9FF"/>
-                               <stop  offset="9.208472e-02" style="stop-color:#0DF9FF;stop-opacity:0.853"/>
-                               <stop  offset="0.6264" style="stop-color:#0DF9FF;stop-opacity:0"/>
-                       </linearGradient>
-                       <rect id="Active_2" class="st1" width="195.9" height="214.3"/>
-               </g>
-               <g id="Multimedia">
-                       <g>
-                               <g id="Multimedia_2_">
-                                       <g>
-                                               <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="86.8321" y1="146.5267" x2="114.4627" y2="66.8384">
-                                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                               </linearGradient>
-                                               <path class="st6" d="M71.3,139.8c-3.8,0-7.2-1.5-8.9-4.5c-1.7-2.9-3.2-8.7,5.7-13.8c2.9-1.7,10.2-2.3,12.4-2.4l0,2.1
-                                                       c-2.7,0.1-9.2,0.8-11.4,2.1c-5.6,3.2-7.2,6.9-4.9,10.9c2.3,4,8.7,4.6,14.3,1.3c4-2.3,6.3-6.3,6.4-10.7l-0.1-0.4V82.7l42.9-8.4
-                                                       l0.1,42.6c0,4-2,9.8-7.5,13c-6.6,3.8-14.4,2.9-17.2-2.1c-1.7-2.9-3.2-8.7,5.7-13.8c2.6-1.5,8.6-2.3,11.2-2.4l0.1,2.1
-                                                       c-2.5,0.1-8,0.8-10.2,2.1c-3.8,2.2-7.8,5.9-4.9,10.9c2.3,4,8.7,4.6,14.3,1.3c4.7-2.7,6.4-7.6,6.4-11.1l-0.1-0.5V76.9
-                                                       l-38.6,7.6v39.9l0.1,0.4c0,5.2-2.8,9.9-7.4,12.6C76.9,139,74,139.8,71.3,139.8z"/>
-                                       </g>
-                                       <g>
-                                               <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="89.6871" y1="147.5167" x2="117.3178" y2="67.8283">
-                                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                               </linearGradient>
-                                               <polygon class="st7" points="95.8,99.4 95.3,97.3 119.6,91.6 120.1,93.7                                          "/>
-                                       </g>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/music.svg b/homescreen/qml/images/Shortcut/music.svg
new file mode 100644 (file)
index 0000000..b6ec056
--- /dev/null
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Multimedia_Inactive"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="music_inactive.svg"><metadata
+     id="metadata3511"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs3509" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1573"
+     inkscape:window-height="876"
+     id="namedview3507"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-90.254237"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Multimedia_Inactive" /><style
+     type="text/css"
+     id="style3476">
+       .st0{fill:#FFFFFF;}
+       .st1{font-family:'Roboto-Regular';}
+       .st2{font-size:25px;}
+       .st3{letter-spacing:6;}
+       .st4{fill:url(#SVGID_1_);}
+       .st5{fill:url(#SVGID_2_);}
+       .st6{fill:url(#SVGID_3_);}
+</style><switch
+     id="switch3478"
+     transform="matrix(1.3307804,0,0,1.3314313,-62.924861,-27.945794)"><g
+       i:extraneous="self"
+       id="g3480"><g
+         id="g3482"><g
+           id="g3484"><linearGradient
+             id="SVGID_1_"
+             gradientUnits="userSpaceOnUse"
+             x1="4.0481"
+             y1="287.94919"
+             x2="320.4859"
+             y2="-15.4029"
+             gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)"><stop
+               offset="0"
+               style="stop-color:#00ADDC"
+               id="stop3487" /><stop
+               offset="1"
+               style="stop-color:#6BFBFF"
+               id="stop3489" /></linearGradient><path
+             class="st4"
+             d="m 160,238.8 c -0.2,0 -0.4,0 -0.6,0 C 101.4,238.5 54.5,191.1 54.8,133.1 55.2,75.3 102.3,28.5 160,28.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 264.8,192 217.7,238.8 160,238.8 Z m 0,-206.6 c -55.7,0 -101.2,45.2 -101.5,100.9 -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
+             id="path3491"
+             style="fill:url(#SVGID_1_)"
+             inkscape:connector-curvature="0" /><linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="140.72141"
+             y1="202.2363"
+             x2="187.02119"
+             y2="68.704903"><stop
+               offset="0"
+               style="stop-color:#00ADDC"
+               id="stop3494" /><stop
+               offset="1"
+               style="stop-color:#6BFBFF"
+               id="stop3496" /></linearGradient><path
+             class="st5"
+             d="m 114.7,190.9 c -6.4,0 -12,-2.6 -14.8,-7.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.8,-2.8 17.1,-3.9 20.8,-4 l 0.1,3.6 c -4.6,0.1 -15.5,1.4 -19.1,3.5 -9.4,5.4 -12.1,11.5 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 6.6,-3.8 10.6,-10.5 10.7,-17.9 l -0.1,-0.7 0,-69.8 71.9,-14.2 0.1,71.3 c 0,6.7 -3.3,16.4 -12.5,21.8 -11.1,6.4 -24.1,4.8 -28.9,-3.5 -2.9,-4.9 -5.4,-14.5 9.6,-23.2 4.4,-2.5 14.4,-3.8 18.8,-3.9 l 0.1,3.6 c -4.2,0.1 -13.5,1.4 -17.1,3.5 -6.4,3.7 -13.1,9.9 -8.3,18.3 3.8,6.6 14.6,7.6 24,2.2 7.9,-4.5 10.7,-12.8 10.7,-18.5 l -0.1,-0.8 0,-66.4 -64.7,12.7 0,66.8 0.1,0.7 c 0,8.7 -4.7,16.6 -12.5,21.1 -4.7,2.7 -9.6,4 -14.1,4 z"
+             id="path3498"
+             style="fill:url(#SVGID_2_)"
+             inkscape:connector-curvature="0" /><linearGradient
+             id="SVGID_3_"
+             gradientUnits="userSpaceOnUse"
+             x1="145.50549"
+             y1="203.8951"
+             x2="191.8053"
+             y2="70.363701"><stop
+               offset="0"
+               style="stop-color:#00ADDC"
+               id="stop3501" /><stop
+               offset="1"
+               style="stop-color:#6BFBFF"
+               id="stop3503" /></linearGradient><polygon
+             class="st6"
+             points="196.5,113.7 155.8,123.3 155,119.8 195.6,110.2 "
+             id="polygon3505"
+             style="fill:url(#SVGID_3_)" /></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Shortcut/navigation.png b/homescreen/qml/images/Shortcut/navigation.png
new file mode 100644 (file)
index 0000000..17b347b
Binary files /dev/null and b/homescreen/qml/images/Shortcut/navigation.png differ
index 6f6f1e0..97fcf31 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Navigation" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Navigation_Inactive"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="navigation_inactive.svg"><metadata
+     id="metadata3897"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs3895" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1456"
+     inkscape:window-height="824"
+     id="namedview3893"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-90.254237"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Navigation_Inactive" /><style
+     type="text/css"
+     id="style3836">
        .st0{fill:#FFFFFF;}
        .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
+       .st2{font-size:25px;}
+       .st3{letter-spacing:6;}
        .st4{fill:url(#SVGID_1_);}
        .st5{fill:url(#SVGID_2_);}
        .st6{fill:url(#SVGID_3_);}
        .st7{fill:url(#SVGID_4_);}
        .st8{fill:url(#SVGID_5_);}
        .st9{fill:url(#SVGID_6_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g>
-                       <g>
-                               <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="113.767" y1="186.3057" x2="79.8095" y2="21.0462">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st4" d="M103.9,107.1c0-3.5-2.8-6.4-6.4-6.4c-3.5,0-6.4,2.8-6.4,6.4s2.8,6.4,6.4,6.4
-                                       C101,113.5,103.9,110.7,103.9,107.1z M97.5,111.4c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2
-                                       S99.8,111.4,97.5,111.4z"/>
-                               <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="126.332" y1="183.7239" x2="92.3746" y2="18.4644">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st5" d="M110.2,105c-1.2,0-2.1,0.9-2.1,2.1c0,4.5-2.8,8.5-7.1,10c-0.8,0.3-1.4,1.1-1.4,2v15.3
-                                       c0,0.6,0.3,1.2,0.7,1.6c0.5,0.4,1.1,0.6,1.7,0.5c14.5-2.3,25.1-14.7,25.1-29.3c0-1.2-0.9-2.1-2.1-2.1H110.2z M101.7,134.3v-15.2
-                                       c4.9-1.8,8.5-6.4,8.5-12H125C125,120.9,114.9,132.3,101.7,134.3z"/>
-                               <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="115.4429" y1="185.9613" x2="81.4855" y2="20.7018">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st6" d="M97.5,77.5c-12.9,0-24.3,8.3-28.2,20.5c-0.2,0.6-0.1,1.3,0.4,1.9c0.4,0.6,1,0.8,1.7,0.8H88
-                                       c0.6,0,1.1-0.2,1.6-0.7c2-2.3,4.9-3.5,7.9-3.5c3,0,5.9,1.3,7.9,3.5c0.4,0.5,1,0.7,1.6,0.7h16.7c0.7,0,1.3-0.3,1.7-0.8
-                                       c0.4-0.6,0.6-1.3,0.4-1.9C121.8,85.8,110.3,77.5,97.5,77.5z M107,98.7c-2.3-2.6-5.7-4.2-9.5-4.2c-3.7,0-7.1,1.6-9.5,4.2H71.3
-                                       c3.5-11.1,13.9-19.1,26.2-19.1s22.7,8,26.2,19.1H107z"/>
-                               <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="113.495" y1="186.3616" x2="79.5375" y2="21.1021">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st7" d="M129.3,107.1c0,17.6-14.2,31.8-31.8,31.8s-31.8-14.2-31.8-31.8c0-0.3,0-0.5,0-0.8h-2.1c0,0.3,0,0.5,0,0.8
-                                       c0,18.7,15.2,33.9,33.9,33.9c18.7,0,33.9-15.2,33.9-33.9c0-0.3,0-0.5,0-0.8h-2.1C129.3,106.6,129.3,106.9,129.3,107.1z"/>
-                               <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="97.0455" y1="189.7416" x2="63.0881" y2="24.4821">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st8" d="M94,117.1c-4.2-1.5-7.1-5.4-7.1-10c0-1.2-0.9-2.1-2.1-2.1H70c-1.2,0-2.1,0.9-2.1,2.1
-                                       c0,14.6,10.7,27,25.1,29.3c0.6,0.1,1.2-0.1,1.7-0.5c0.5-0.4,0.7-1,0.7-1.6v-15.2C95.4,118.2,94.8,117.4,94,117.1z M93.3,134.3
-                                       c-13.2-2-23.3-13.4-23.3-27.2h14.8c0,5.5,3.5,10.2,8.5,12V134.3z"/>
-                               <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="115.5222" y1="185.9451" x2="81.5647" y2="20.6856">
-                                       <stop  offset="0" style="stop-color:#00ADDC"/>
-                                       <stop  offset="1" style="stop-color:#6BFBFF"/>
-                               </linearGradient>
-                               <path class="st9" d="M97.5,75.4c14.5,0,26.7,9.6,30.5,22.9h2.2c-3.9-14.4-17.1-25-32.7-25c-15.6,0-28.8,10.6-32.7,25H67
-                                       C70.8,85,83,75.4,97.5,75.4z"/>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
+       .st10{fill:url(#SVGID_7_);}
+</style><switch
+     id="switch3838"
+     transform="matrix(1.3307804,0,0,1.3314313,-62.924861,-27.945794)"><g
+       i:extraneous="self"
+       id="g3840"><g
+         id="g3842"><linearGradient
+           id="SVGID_1_"
+           gradientUnits="userSpaceOnUse"
+           x1="4.0481"
+           y1="287.94919"
+           x2="320.4859"
+           y2="-15.4029"
+           gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3845" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3847" /></linearGradient><path
+           class="st4"
+           d="m 160,238.8 c -0.2,0 -0.4,0 -0.6,0 C 101.4,238.5 54.5,191.1 54.8,133.1 55.2,75.3 102.3,28.5 160,28.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 264.8,192 217.7,238.8 160,238.8 Z m 0,-206.6 c -55.7,0 -101.2,45.2 -101.5,100.9 -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
+           id="path3849"
+           style="fill:url(#SVGID_1_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_2_"
+           gradientUnits="userSpaceOnUse"
+           x1="217.7681"
+           y1="287.112"
+           x2="149.73309"
+           y2="-43.9916"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3852" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3854" /></linearGradient><path
+           class="st5"
+           d="m 185.5,129.4 c -2.4,0 -4.2,1.8 -4.2,4.2 0,9.1 -5.7,17 -14.1,19.9 -1.7,0.6 -2.8,2.1 -2.8,4 l 0,30.6 c 0,1.3 0.6,2.4 1.4,3.3 1,0.8 2.1,1.1 3.4,1 29,-4.5 50.4,-29.4 50.4,-58.7 0,-2.4 -1.8,-4.2 -4.2,-4.2 l -29.9,0 z m -17,58.7 0,-30.4 c 9.9,-3.5 17,-12.9 17,-24 l 29.7,0 c 0,27.5 -20.3,50.5 -46.7,54.4 z"
+           id="path3856"
+           style="fill:url(#SVGID_2_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_3_"
+           gradientUnits="userSpaceOnUse"
+           x1="159.0916"
+           y1="299.16891"
+           x2="91.056602"
+           y2="-31.934799"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3859" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3861" /></linearGradient><path
+           class="st6"
+           d="m 152.9,153.6 c -8.5,-3 -14.1,-10.9 -14.1,-19.9 0,-2.4 -1.8,-4.2 -4.2,-4.2 l -29.7,0 c -2.4,0 -4.2,1.8 -4.2,4.2 0,29.3 21.4,54.2 50.2,58.7 1.3,0.1 2.4,-0.1 3.4,-1 1,-0.8 1.4,-2 1.4,-3.3 l 0,-30.4 c 0.1,-1.8 -1.1,-3.4 -2.8,-4.1 z m -1.4,34.5 c -26.5,-4 -46.7,-26.9 -46.7,-54.5 l 29.7,0 c 0,11 7.1,20.5 17,24 l 0,30.5 z"
+           id="path3863"
+           style="fill:url(#SVGID_3_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_4_"
+           gradientUnits="userSpaceOnUse"
+           x1="192.5936"
+           y1="292.28491"
+           x2="124.5586"
+           y2="-38.818802"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3866" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3868" /></linearGradient><path
+           class="st7"
+           d="m 172.7,133.7 c 0,-7.1 -5.7,-12.7 -12.7,-12.7 -7,0 -12.7,5.7 -12.7,12.7 0,7.1 5.7,12.7 12.7,12.7 7,0 12.7,-5.7 12.7,-12.7 z m -12.7,8.5 c -4.7,0 -8.5,-3.8 -8.5,-8.5 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 z"
+           id="path3870"
+           style="fill:url(#SVGID_4_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_5_"
+           gradientUnits="userSpaceOnUse"
+           x1="196.1102"
+           y1="291.56229"
+           x2="128.0752"
+           y2="-39.541401"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3873" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3875" /></linearGradient><path
+           class="st8"
+           d="m 160,70 c 29,0 53.4,19.3 61.1,45.8 l 4.4,0 c -7.8,-28.8 -34.2,-50 -65.5,-50 -31.3,0 -57.7,21.2 -65.5,50 l 4.4,0 C 106.6,89.3 131,70 160,70 Z"
+           id="path3877"
+           style="fill:url(#SVGID_5_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_6_"
+           gradientUnits="userSpaceOnUse"
+           x1="195.9514"
+           y1="291.59491"
+           x2="127.9165"
+           y2="-39.508701"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3880" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3882" /></linearGradient><path
+           class="st9"
+           d="m 160,74.2 c -25.7,0 -48.7,16.7 -56.6,41.2 -0.4,1.3 -0.1,2.7 0.7,3.8 0.7,1.1 2,1.7 3.4,1.7 l 33.5,0 c 1.3,0 2.3,-0.4 3.1,-1.4 4.1,-4.5 9.8,-7.1 15.8,-7.1 6,0 11.7,2.5 15.8,7.1 0.8,1 2,1.4 3.1,1.4 l 33.5,0 c 1.4,0 2.5,-0.6 3.4,-1.7 0.8,-1.1 1.1,-2.5 0.7,-3.8 C 208.7,90.9 185.7,74.2 160,74.2 Z m 19,42.5 c -4.7,-5.2 -11.5,-8.5 -19,-8.5 -7.5,0 -14.3,3.3 -19,8.5 l -33.5,0 c 7.1,-22.2 27.9,-38.2 52.5,-38.2 24.6,0 45.4,16 52.5,38.2 l -33.5,0 z"
+           id="path3884"
+           style="fill:url(#SVGID_6_)"
+           inkscape:connector-curvature="0" /><linearGradient
+           id="SVGID_7_"
+           gradientUnits="userSpaceOnUse"
+           x1="192.0486"
+           y1="292.39691"
+           x2="124.0136"
+           y2="-38.706799"><stop
+             offset="0"
+             style="stop-color:#00ADDC"
+             id="stop3887" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop3889" /></linearGradient><path
+           class="st10"
+           d="m 223.7,133.7 c 0,35.2 -28.4,63.7 -63.7,63.7 -35.3,0 -63.7,-28.4 -63.7,-63.7 0,-0.5 0,-1.1 0,-1.6 l -4.2,0 c 0,0.5 0,1.1 0,1.6 0,37.5 30.4,67.9 67.9,67.9 37.5,0 67.9,-30.4 67.9,-67.9 0,-0.5 0,-1.1 0,-1.6 l -4.2,0 c -0.1,0.5 0,1 0,1.6 z"
+           id="path3891"
+           style="fill:url(#SVGID_7_)"
+           inkscape:connector-curvature="0" /></g></g></switch></svg>
\ No newline at end of file
diff --git a/homescreen/qml/images/Shortcut/navigation_active.png b/homescreen/qml/images/Shortcut/navigation_active.png
new file mode 100644 (file)
index 0000000..bebb23e
Binary files /dev/null and b/homescreen/qml/images/Shortcut/navigation_active.png differ
diff --git a/homescreen/qml/images/Shortcut/navigation_active.svg b/homescreen/qml/images/Shortcut/navigation_active.svg
deleted file mode 100644 (file)
index 9076934..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-       .st8{fill:url(#SVGID_3_);}
-       .st9{fill:url(#SVGID_4_);}
-       .st10{fill:url(#SVGID_5_);}
-       .st11{fill:url(#SVGID_6_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g id="Layer_6">
-                       <rect id="Active_1" y="214.3" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" class="st0" width="195.9" height="2.4"/>
-                       <linearGradient id="Active_2_1_" gradientUnits="userSpaceOnUse" x1="97.9416" y1="236.9585" x2="97.9416" y2="-68.5304">
-                               <stop  offset="0" style="stop-color:#0DF9FF"/>
-                               <stop  offset="9.208472e-02" style="stop-color:#0DF9FF;stop-opacity:0.853"/>
-                               <stop  offset="0.6264" style="stop-color:#0DF9FF;stop-opacity:0"/>
-                       </linearGradient>
-                       <rect id="Active_2" class="st1" width="195.9" height="214.3"/>
-                       <g>
-                               <g>
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="113.767" y1="186.3057" x2="79.8095" y2="21.0462">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st6" d="M103.9,107.1c0-3.5-2.8-6.4-6.4-6.4c-3.5,0-6.4,2.8-6.4,6.4s2.8,6.4,6.4,6.4
-                                               C101,113.5,103.9,110.7,103.9,107.1z M97.5,111.4c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2
-                                               S99.8,111.4,97.5,111.4z"/>
-                                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="126.332" y1="183.7239" x2="92.3746" y2="18.4644">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st7" d="M110.2,105c-1.2,0-2.1,0.9-2.1,2.1c0,4.5-2.8,8.5-7.1,10c-0.8,0.3-1.4,1.1-1.4,2v15.3
-                                               c0,0.6,0.3,1.2,0.7,1.6c0.5,0.4,1.1,0.6,1.7,0.5c14.5-2.3,25.1-14.7,25.1-29.3c0-1.2-0.9-2.1-2.1-2.1H110.2z M101.7,134.3
-                                               v-15.2c4.9-1.8,8.5-6.4,8.5-12H125C125,120.9,114.9,132.3,101.7,134.3z"/>
-                                       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="115.4429" y1="185.9613" x2="81.4855" y2="20.7018">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st8" d="M97.5,77.5c-12.9,0-24.3,8.3-28.2,20.5c-0.2,0.6-0.1,1.3,0.4,1.9c0.4,0.6,1,0.8,1.7,0.8H88
-                                               c0.6,0,1.1-0.2,1.6-0.7c2-2.3,4.9-3.5,7.9-3.5c3,0,5.9,1.3,7.9,3.5c0.4,0.5,1,0.7,1.6,0.7h16.7c0.7,0,1.3-0.3,1.7-0.8
-                                               c0.4-0.6,0.6-1.3,0.4-1.9C121.8,85.8,110.3,77.5,97.5,77.5z M107,98.7c-2.3-2.6-5.7-4.2-9.5-4.2c-3.7,0-7.1,1.6-9.5,4.2H71.3
-                                               c3.5-11.1,13.9-19.1,26.2-19.1s22.7,8,26.2,19.1H107z"/>
-                                       <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="113.495" y1="186.3616" x2="79.5375" y2="21.1021">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st9" d="M129.3,107.1c0,17.6-14.2,31.8-31.8,31.8s-31.8-14.2-31.8-31.8c0-0.3,0-0.5,0-0.8h-2.1c0,0.3,0,0.5,0,0.8
-                                               c0,18.7,15.2,33.9,33.9,33.9c18.7,0,33.9-15.2,33.9-33.9c0-0.3,0-0.5,0-0.8h-2.1C129.3,106.6,129.3,106.9,129.3,107.1z"/>
-                                       <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="97.0455" y1="189.7416" x2="63.0881" y2="24.4821">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st10" d="M94,117.1c-4.2-1.5-7.1-5.4-7.1-10c0-1.2-0.9-2.1-2.1-2.1H70c-1.2,0-2.1,0.9-2.1,2.1
-                                               c0,14.6,10.7,27,25.1,29.3c0.6,0.1,1.2-0.1,1.7-0.5c0.5-0.4,0.7-1,0.7-1.6v-15.2C95.4,118.2,94.8,117.4,94,117.1z M93.3,134.3
-                                               c-13.2-2-23.3-13.4-23.3-27.2h14.8c0,5.5,3.5,10.2,8.5,12V134.3z"/>
-                                       <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="115.5222" y1="185.9451" x2="81.5647" y2="20.6856">
-                                               <stop  offset="0" style="stop-color:#00ADDC"/>
-                                               <stop  offset="1" style="stop-color:#6BFBFF"/>
-                                       </linearGradient>
-                                       <path class="st11" d="M97.5,75.4c14.5,0,26.7,9.6,30.5,22.9h2.2c-3.9-14.4-17.1-25-32.7-25c-15.6,0-28.8,10.6-32.7,25H67
-                                               C70.8,85,83,75.4,97.5,75.4z"/>
-                               </g>
-                       </g>
-               </g>
-               <g id="Navigation">
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/phone.png b/homescreen/qml/images/Shortcut/phone.png
new file mode 100644 (file)
index 0000000..d0ca0af
Binary files /dev/null and b/homescreen/qml/images/Shortcut/phone.png differ
diff --git a/homescreen/qml/images/Shortcut/phone_active.png b/homescreen/qml/images/Shortcut/phone_active.png
new file mode 100644 (file)
index 0000000..77e45fd
Binary files /dev/null and b/homescreen/qml/images/Shortcut/phone_active.png differ
diff --git a/homescreen/qml/images/Shortcut/sdl_usb.svg b/homescreen/qml/images/Shortcut/sdl_usb.svg
deleted file mode 100644 (file)
index 3b6a7e9..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Home"
-   x="0px"
-   y="0px"
-   viewBox="0 0 195 216.8"
-   style="enable-background:new 0 0 195 216.8;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="sdl.svg"><metadata
-     id="metadata61"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs59" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     id="namedview57"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="1.0885609"
-     inkscape:cx="18.255591"
-     inkscape:cy="102.46209"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Home"><sodipodi:guide
-       position="52.936865,144.9161"
-       orientation="0,1"
-       id="guide4189" /><sodipodi:guide
-       position="66.027543,153.29873"
-       orientation="1,0"
-       id="guide4191" /><sodipodi:guide
-       position="34.449153,79.00339"
-       orientation="0,1"
-       id="guide4193" /><sodipodi:guide
-       position="132.05509,117.35678"
-       orientation="1,0"
-       id="guide4195" /><sodipodi:guide
-       position="98.9839,162.94449"
-       orientation="1,0"
-       id="guide4266" /><sodipodi:guide
-       position="67.290679,111.95975"
-       orientation="0,1"
-       id="guide4268" /></sodipodi:namedview><style
-     type="text/css"
-     id="style3">
-       .st0{fill:#FFFFFF;}
-       .st1{font-family:'Roboto-Regular';}
-       .st2{font-size:11px;}
-       .st3{letter-spacing:2;}
-       .st4{fill:url(#SVGID_1_);}
-       .st5{fill:url(#SVGID_2_);}
-       .st6{fill:url(#SVGID_3_);}
-       .st7{fill:url(#SVGID_4_);}
-       .st8{fill:url(#SVGID_5_);}
-</style><image
-     y="71.883904"
-     x="66.027542"
-     id="image4332"
-     xlink:href="data:image/png;base64,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
-"
-     preserveAspectRatio="none"
-     height="65.912712"
-     width="66.02755" /></svg>
diff --git a/homescreen/qml/images/Shortcut/sdl_usb_active.svg b/homescreen/qml/images/Shortcut/sdl_usb_active.svg
deleted file mode 100644 (file)
index 9584885..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Home" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
-        style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#0DF9FF;}
-       .st1{fill:url(#Active_2_1_);}
-       .st2{fill:#FFFFFF;}
-       .st3{font-family:'Roboto-Regular';}
-       .st4{font-size:11px;}
-       .st5{letter-spacing:2;}
-       .st6{fill:url(#SVGID_1_);}
-       .st7{fill:url(#SVGID_2_);}
-       .st8{fill:url(#SVGID_3_);}
-       .st9{fill:url(#SVGID_4_);}
-       .st10{fill:url(#SVGID_5_);}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <rect id="Active_1" y="214.3" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" class="st0" width="195.9" height="2.4"/>
-               <linearGradient id="Active_2_1_" gradientUnits="userSpaceOnUse" x1="97.9416" y1="236.9585" x2="97.9416" y2="-68.5304">
-                       <stop  offset="0" style="stop-color:#0DF9FF"/>
-                       <stop  offset="9.208472e-02" style="stop-color:#0DF9FF;stop-opacity:0.853"/>
-                       <stop  offset="0.6264" style="stop-color:#0DF9FF;stop-opacity:0"/>
-               </linearGradient>
-               <rect id="Active_2" class="st1" width="195.9" height="214.3"/>
-               <g>
-<image
-     y="71.883904"
-     x="66.027542"
-     id="image4332"
-     xlink:href="data:image/png;base64,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
-"
-     preserveAspectRatio="none"
-     height="65.912712"
-     width="66.02755" />
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Shortcut/settings.png b/homescreen/qml/images/Shortcut/settings.png
new file mode 100644 (file)
index 0000000..8c36376
Binary files /dev/null and b/homescreen/qml/images/Shortcut/settings.png differ
diff --git a/homescreen/qml/images/Shortcut/settings_active.png b/homescreen/qml/images/Shortcut/settings_active.png
new file mode 100644 (file)
index 0000000..d863457
Binary files /dev/null and b/homescreen/qml/images/Shortcut/settings_active.png differ
index 54df1ad..40462f4 100644 (file)
@@ -1,18 +1,16 @@
 <RCC>
     <qresource prefix="/images/Shortcut">
-        <file>launcher.svg</file>
-        <file>launcher_active.svg</file>
-        <file>hvac.svg</file>
-        <file>hvac_active.svg</file>
-        <file>mediaplayer.svg</file>
-        <file>mediaplayer_active.svg</file>
+        <file>launcher.png</file>
+        <file>launcher_active.png</file>
+        <file>mediaplayer.png</file>
+        <file>mediaplayer_active.png</file>
+        <file>navigation.png</file>
+        <file>navigation_active.png</file>
+        <file>phone.png</file>
+        <file>phone_active.png</file>
+        <file>settings.png</file>
+        <file>settings_active.png</file>
         <file>navigation.svg</file>
-        <file>navigation_active.svg</file>
-        <file>video.svg</file>
-        <file>video_active.svg</file>
-        <file>sdl_usb.svg</file>
-        <file>sdl_usb_active.svg</file>
-        <file>blank.svg</file>
-        <file>blank_active.svg</file>
+        <file>music.svg</file>
     </qresource>
 </RCC>
diff --git a/homescreen/qml/images/Shortcut/video.svg b/homescreen/qml/images/Shortcut/video.svg
deleted file mode 100644 (file)
index e368922..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   viewBox="0 0 195 217"
-   height="217"
-   width="195"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <image
-     y="0"
-     x="0"
-     id="image10"
-     xlink:href="data:image/png;base64,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
-saNgIER9vJAmFrMmFNr4923DxrbK3eEE48FgwnyeM+8JRbttnpoQvAnDeNY8Jobp2evzAtM+a/wq
-xLBCG0jWKrRSqR82y+Iny2do43Qri+kZhgl6Ln94jzKqA0S1uAgtlDS/s9XM2nhRRafI4rmhQBO6
-PmNb5hjf8m+/V3lWAABFZ95IFM8JXudnis58A3X3BtsH9fmCEornD0woRWZEjKDcKOmhiPhVUfHL
-4dbQb74/b96W6VoL0z4M23WhbhmpN5/ZXJ9ZqlZu3VpPVZ1bBWfS20f3Ntq91Hs7hZc5doPtpJ5Q
-JGQNsug82bMEamPjJEQk9d6xp34GSR9kRW8CfUnVHa8XyMzu66LqgR51psgE6lCVnXnXMqmy8/ml
-ekJGkvXOMkTQSy9V937HmRA9tayyUdVa0ajtXI4uZ20D7eGzaWZmZmZmZmZmZmZmZmZmZmZmZmZm
-ZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZm
-ZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmYv6v8BHUYYj+AaytYAAAAA
-SUVORK5CYII=
-"
-     style="image-rendering:optimizeQuality"
-     preserveAspectRatio="none"
-     height="217"
-     width="195" />
-</svg>
diff --git a/homescreen/qml/images/Shortcut/video_active.svg b/homescreen/qml/images/Shortcut/video_active.svg
deleted file mode 100644 (file)
index 344385f..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   viewBox="0 0 195 217"
-   height="217"
-   width="195"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <image
-     y="0"
-     x="0"
-     id="image10"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMMAAADZCAYAAACdMoRXAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4gUOCS0TFCLI1AAAE5JJREFUeNrtneuTFNd5xp/3Pd1z
-3VmWZVlu5iKEJDDYMsa2ZCPFVtmO/SEfUmVXpSr5R5LKX5T4g5PYqbLjlCNFNuhGLAsjCTACCZbL
-wsLeZ6Yv582H7t6ZgUUISzBLz/OrkrZ3trunz+F9+n3O6XNOA4QQQgghhBBCCCGEEEIIIYQQQggh
-hBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQ
-QgghhBBCCCGEkM+HwExYDYQAAQCKgZBcDMpqIISZgRCKgRDaJEKYGQh5gBh2UgyEZGKIb9ImEQIA
-gW1lZiAEAAJPm0RILoZ52iRCMps0wcxASCYG2iRCcjEs0SYRkomhxcxACMAn0IT0ZYYV2iRCMjE0
-mRkIoU0iZCAztGmTCGFmIKRfDLU6xUBIZpM6tEmEZGKgTSIkbzPUKAZCsszQpU0CAN8xh5WoLkvt
-hpjWfOrDwEys2MFlPxQB4LKeBwAwA9QBIgBgsHxXMWQ5V4vjsl/EDE4Ac8XdKDug+B5DkH2VAk6y
-8xgs+8x6fzABVAGV/Bryr4Nk53PFdedf5PJNUZj38KnTdhtpZyEM2quGLiNgxHuTfDsJk0sL+3Wp
-e1gTO6ip3yOGCVGpOJgTZEGuIlmwiUA0/yl9f5MiEPPPke+n2bZDb/9iHy32yz8XkTy447Xfi+8X
-ZN+hmeLyz7PvUO3fRyD5PpofrJL2rjsBVMUEgHqNzPyqj/21xOn5ZciZq4JzV0N3Z3QzQ3X0xJAu
-JFV/fv55Wex8V6P0mAK7RaQpIlWFqfi+AC2CD/m2ydrvxY1/LagtzwDFti/Egb7z9J1PeucRAGrF
-OQeFUIiu/zjI4DGFeBQ2INY14Vm+nf8Ub8UxMVLfHhOdnRL78Gkvr31c0RMfO9watbiQVtcOjlKB
-47N39trsyo81Sr+vZk+LSANZUCyKw3UVzEF1RVVjEYWIzwJZ8yBWXbt7FBlBtBe8WtzVtRfEKAJV
-+8Wgg0GtgKqu3fm1sFcq+Tny82Mwo6AQ7UC2KrKH9j4DIM5BzAAx51SrYrY5VJl2wFYRcRBLoDob
-wd6ad8Ev31W8tQrEIyOGsa4dGoWCWmIa/3H2KBajn2rsXxaxSRFLxOkHCN07Ug3OSMNdt0q4IBVE
-qi4170XE1gLd8jtwz6pkPr64gyNvN4g4iOiApcHanX6t6nseH727+MC50bNkA+eynoiK//WfW/pt
-W26GxXIhqxoEUhGE1dSaDfgtTfMHqimOhSrPB8AkRGJTOb3o9N9Oe/uvG04WR0UMXy69EKJUo/du
-vYD5zj9oasdFUBGHC6i438rm2uuyuXrJNtcXtRGOzF2wr19AJ5OkOWU6vc3b0ZbgB1XgBVVUvODi
-kujPTsN+cVX19ig0oEvfmxR9cPuozXf+XhP/XQjMQvd7jFf/XXY039SdY7f7btAj17OWArgZBCs3
-gYszcXLtgOj5Hd4u14EfOcNT42J/9xWBQewXV00Wyt2ALnlvUnxhcbe/1f5bjf1xy4TwmkzW/8U9
-N/mO1FzMh449FsKgewr407Metw94v9QS/MTB9jYgx7YZ3p4BSm2XSt216pfiajKz8H2JkpcNqCLQ
-N3Si8rPgyNRb4sSDQliXc4prKeTnB82HVcP+ZZGTt1LMwZW7voK8x7CcWeHi/GG04+8JsBVOLsl4
-9T/doclTEshIWqKH4YKTGy7Bz2uq9RnI1bkAK2WvsyAs6d3Rr0ahv91+Eak9YyKJVNzvK3s3vxk2
-KgkzwmfjYuBmiu1wBOqstG2G7uXl3dZNnxdDy1Q+1PHayWB7bY5tBPJpbYZSpr70TucZePsSIJCq
-OxNsa1ykNSIjlxmsG6tvJwfgbQIiS1ILzrup+jyzAnlQZihdgPgOapbYdgANU3wiNXdDa45tBTJ6
-Nsm3kzrMJgAonMxLPVyiRSIPtklSQpvkk6p5C/PxOW2puKiM5SRfdGaIS3jHjCwUyea3CNTgDcMq
-pyWp+uWkYd20po1wWcaCrkhvzhDZSGIoY2YQCMyyxGC++GQo5UznOpuji/M/0Cg96JrhGbdz/E2Z
-rl1F4DzDb6OJISifGET7Qr+YWTOkcqYrybStJC8h9Ucl8cc1unMMi7Vf+X2bTmlNOxTFRmozJOWz
-SWZQy/tRDRAYdFjltG7cMPNjEINAGhL54zrXOVBpp6+m02P/nUxXLiIMKYgNkRnK2d14ty2SoZXT
-vMLMwQADIi+WhN52uE7yk8r1xUPWrv2qPd08kY4Fy1BlW4I26Qvm7tGVChlaOVWLWfpt1NzvpBn+
-2TrJ98RwyKX2vC529laT9HA0Vf/14vbmB9JbKIPQJn0RRv2urGAiQ7NJtjYrNPJVdz49vPU/cHnx
-nFuIfmRJ8m0xbA666Y+rs+1naivpb5an6q+vNsMNN6usDoR1QS1JkXYVURdIypcZytj/LsWMYruf
-bXrM17KWoSAVl6Z7xt9vryYzdn3ljHbivxZvR9Tbc812vKsxmx5ZbVV/fXNL7Y+muiECrmoIvq74
-zjbDKz7E8jXg1Tc9TpVODEEJJ2x4tzaHHiLZPPhhlTMWiBdI1pJ3CBwEzhlqbj5pVf6nM7t8wS10
-X3GR/ysx2xYm9nJtqftUK/Gvzm+uvbbQDGY2QMNSxgw7G8A3vWF+THCmjHETWFpCm+T7ymR579Kw
-ymkQ+Oz5t4ih/zpMJelubV5Kxhv/On5r+bx20x+EZkcDw75qlP60fmf12YlO9bczzeBUHLr2sKoz
-Xw5KxRAiG9zpzJcvbsrbm3TvqixDsklr32sm/YvDFI19tbSB5YUdrTejpc7Hspwc1zj5bmDYW03w
-rVo72juWpM/daYSvzTTCC0OuT8PaQjUlzAylFIPcuzzREMspfRnrvtfhQ41XJhuX40byy80LnY82
-xf6Vhtk3AsiuWmp/02zH+zd5/9qVRvXtRcXC0Mrw6Z898WIo42hOuUsbOrRyDghT5EHXEdWC1Zuu
-/m67k1yd6iTnN6X2Ugg7WIN8vZb4XZva3Wdvhu71jwJ31qs8rga29tdpvs5x+WxSKSf3ZEvJrWUE
-y/8bki6z5wxiAjF8lutIQ5cuhO5apxb8Jmqnl6ai+OUm8M0asL3i/Q8bseydFPn9Jx5vXwvc7GNo
-M9xTf0ab9GRmhqG2Gfq/Nxs8+Jmvoxu69hWnp5divb4zSj/a4u2lBvDlmuArNe+3b3Ly1Bb4V89D
-zz7Kfv/7CKGEYijjUjHaX6Y8S8jQbZLlC6Q+1HWYE8y74FYnkNe6Ca7sTNMftoBvVoGtVcgr+wwt
-7+DfN5x9lDVaLDCOwUXJmRmeuN4kbJDMoH95w7MTuO6FAO+32raj6f1zgDQVqFQEe5vA5CMu34hk
-hlGwSRhy16oMNKD/ousIU1/dGdn+ZuqPqGATAMTA3DLk1CzwyWMQgzygjkvRgC53b1JukYZVTltb
-PF6KASIPfR0TnWR6V+yf35L67zQcDomotWEfLkLfuGR4a8Yw+yh7dyx/x0l//ZYxbkbEJslwM4MV
-QSUPdUetRUlzquMPbI2TF1uGoxUnW7zJ7SWRP9x0evKi0w/biu5jKBtt0hMshQ3zkEiKN4YYLHvr
-4YOvQ1MftFbTbVOd+NimxL/YUDkgTqIu8P5S4E5erbj/mw305mMs10Zqgz1SMZTQJq078VOHJk0r
-gufBD/9qK9H4ptXk4OZ2+p0a7KuhSj11Mrsa6B/mKu6NK43wXJq9VuFxlqffJhXPHGiTnsgG9NDH
-JhXDeXob90Rb7Kv15Wj75FL8Qj2OX6iq7hQnnY6T0ysVd+JaI3x3peIWhpTlRmM4hpawUHcVSKT3
-fsJhXEsuRIPA33sd3iTopq3m3OqRsdXk5ZrhcOBEE5EbUcW9s9CsnLjVqlxEdiseShn0Lls0zPp8
-tJmhhENxYdDeKwLzlqsf4hDuYsCnH7wOidJquBDtaMy3v12L028FIlsRyGrX6bnVZvj63ETtvcRp
-e9j/RpY9xuzrCMgWWSifGLSENknXsUk67CHcYnAKKMSSVHU1aVVudr5aW45eCtL0kAYuTSs6E9fd
-O4ub6yeXW5WZDWRH5K4rkTLOkCzptM97/tmGOO0zH7jgoTCrWBRX5VZnT+VW53jYTY45kQk4W40r
-7k/RZO1/F6cbZ0yQbjBPLnlHQJYZpKS9SSWe6SZFTofJ0Ga6mS88ktX9UnzQPrgzFqxGXxOP/eI0
-SWv6STxeO9mZarwVjVXm8jkPG+rfxAC1PpsEg1gpbZIruU0q7szDKmeg2ZJJhop2km9IlBwVlRCh
-W44b4R9tW/13ne1jZz+tp2kD9Ulk3apS0t4kjMY7C4aW1kXEJB9eLd4rRFNfdReSidqJdM+mU74Z
-LG6gtsFnqr/yPoEuo00y6ZuZJVkPzpDKKYF0JHQLSBOYk9toVd5Nd7VOJNvGPhaBPSH1f49NAm3S
-E2ST+kvlIMMqp5uq37GV+IQtxZdtsnrJ7xr7s1a1LZ9jOPfQM6twbNKTZYqK9rMITIY3UE9qrhs+
-O3EaiX8fThMJ1D8BtujeGvWQbGyVwBtQyq5VK+VDN82arABgFiCVIa7zky+YFGar4z2J9S3eB6Lq
-sgfpZibiuW7Sk0IoCRxiGADvaxbFVfDlhn8xVacVB6tBRD0kjgVRMR69XGIo4RNobVQiCdyySeIt
-QcsiP1bKJ+2PiYa3RgC/ySBIRDptyGoZ67OUY5MkkFRqbs5WpCNpusmvxFPWTqpSDWKG9sPTMkzW
-RKYAQQxZXDAslLI3SUtqH9x49Zq/01lGimm0kz22nJxx1WCOof2QWdagW4CdFWDKDGlHcHPBsFTO
-UasltQ/BVP1aem1l1pJo2rfjfentlS8FW2u3Gd4Px1bD1GZvT4fAeAzcvG12pa0SgUO4n6DMMFGb
-l1blI+sm+yTy2/yt9pF0S/uam6wzO3zWrADol8yebYrsA4AVwcwNyJWyxkxph2OICsIdzXPRUvSM
-tJNDthwfTGaWr0kjfFNrQZeh/mD2GZ6aNnu+AmzpiszNQs5eN8yVNWaCMveyBNub19PbndPp9ZVp
-SdItfm71WFJ1y+HTE+9JqCnD/f7sALbtS/wLTeCAAekC5NxlxXlvG3pA4eeLFytpysvSgyDYPf6h
-byfTuNN+Ed10j7+2cjwWkWBP6wOpMkOsxy6znc+YfXsC+IoCwRJw/rLhvRsp5oHyxkvpR6268cpS
-uGf8VJL4pix2viadZL9dWw7TKBmXna33dVP1tqjwDZsAGmb1XYa9e7z/+oTgy05QXYVcvgx5+yPY
-pYGptKUUgyv/w6hgR+MGzJ9MP4ZgsXtEusluzK6OWyfdbltqZzFRuYqx6pJUXTRqAnBmrpn65mZg
-y7YUT08aDo4BuwHICuTjK4G+cVbsg1hko82+ewRiKLNNGmg/jF2F6u/8J4ttLEaHkdqkzne/JavJ
-ftwKLkszvGr14LZUtC2BxlDJBtR5y16vAMCkN/dRinn+RYRo/qn0fESxepj0reAkAwf1TSYWQe+v
-vWOK75FB9zfwy8CrifJ9VeTe/UUh5gEVcQJXSa1WB8Zb5reNm+yuw3Y6kTARdFeAC1ecO/Vnw7kY
-EpfxIds9rrrVtX8cpTuhX+y0/JWVgzbfOezayS4BxrI35SKFkxUX6IqodMXBi2gemLI2j7R4qa5A
-19ZLUS2CTtaEk+0nUOkFYyYUydeuKfaTwXPmYsqHeOfvVO8TWP855a7vBPK/ydp5Ifk50BuHLZkY
-gsBQD0RaoaAqAEwligVz8yrnL6ucvqIyUywDOApIq2v/NGrWwMzEbra3YXb1AJajfRL7reKtKd6q
-TuB6AdoLPIH0BVrv59pnRbAXQaj5NvqPHTx+8Hy9Y7VfIP2f4a5zoH/fu67nPsf275+9Lh6RV2nH
-wPyy6swtlfOXnX7SEXRGLS5krGv/PMqNRj/fnZCF7rQsR9s0SjdLamNqFsCsTxQ6eLfuC7TMIfVt
-FytsqazZHMW9QiiCuRAF7hKe9NbuBlx2Xu1bkqyXBXqWaEAA+dJf6wgmX+xSklTRiUQWVpzenBe5
-flNsLlYd2fFbozIH+r7oRHUBE9UFAOfT1Jyl5tSbQ+IdYOv4dFkTxcBdxfqMe74exnoVqwrY2mkz
-G6b5puHu47SvrdH/Zehbqs9g/ZOSJWvbFJeug6/ERqYGMw+kiZMkhqWydvUPt0o4xVDmNOnEixMP
-IAbcoLW6z/YTWtK+rdEWwN1iUFYDISUewk0IbRIhtEmEMDMQ8sWIwSgGQvLM4GmTCMnEwCVUCGGb
-gZBBMRhtEiG0SYTQJhGyjhiMvUmE0CYRQptEyLpioE0iJBMDh3ATwjYDIbRJhKwrBo5aJYQ2iRDa
-JELWFwNtEiG0SYQMioFDuAmhTSJkUAxCMRBCm0RIvxj40I0QthkIuUcMtEmEgEO4CaFNImS9BjRt
-EiHMDIRQDISsKwbaJEKYGQihGAhZRwwcm0RILgaOWiWENokQ2iRC1hOD0SYRQptEyIAYlDaJkDwz
-cKkYQvI2A20SIXlm4PKShNAmETIoBtokQmiTCGFmIIRtBkI+TQx86EYIbRIhg2LgQD1CaJMIoU0i
-ZD0xcD4DIbkYOISbkCIz0CYRwjYDIXeLgTaJEGYGQigGQmiTCGFmIIRiIIQ2iRBmBkIoBkI+lxg4
-NomQXAwctUrImk16n9VACCCtrhmrgZAsM5xjNRAC/D8DlbvEcx9iPAAAAABJRU5ErkJggg==
-"
-     style="image-rendering:optimizeQuality"
-     preserveAspectRatio="none"
-     height="217"
-     width="195" />
-</svg>
diff --git a/homescreen/qml/images/TopSection_NoText_NoIcons-01.svg b/homescreen/qml/images/TopSection_NoText_NoIcons-01.svg
deleted file mode 100644 (file)
index 6841001..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1080 217.9"
-        style="enable-background:new 0 0 1080 217.9;" xml:space="preserve">
-<style type="text/css">
-       .st0{opacity:0.9;fill:#1B1A1D;}
-       .st1{opacity:0.9;fill:#27232B;}
-       .st2{fill:none;stroke:url(#SVGID_1_);stroke-miterlimit:10;}
-       .st3{fill:none;stroke:url(#SVGID_2_);stroke-miterlimit:10;}
-       .st4{fill:none;stroke:url(#SVGID_3_);stroke-miterlimit:10;}
-       .st5{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
-       .st6{opacity:0.9;fill:none;stroke:#545157;stroke-miterlimit:10;}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <rect class="st0" width="784.8" height="214.3"/>
-               <rect x="784.8" y="0" class="st1" width="295.2" height="214.3"/>
-               <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="391.5756" y1="107.1501" x2="392.5756" y2="107.1501">
-                       <stop  offset="0.4644" style="stop-color:#000000"/>
-                       <stop  offset="0.4741" style="stop-color:#4D4B51"/>
-               </linearGradient>
-               <line class="st2" x1="392.1" y1="214.3" x2="392.1" y2="0"/>
-               <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="195.6923" y1="107.1501" x2="196.6923" y2="107.1501">
-                       <stop  offset="0.4644" style="stop-color:#000000"/>
-                       <stop  offset="0.4741" style="stop-color:#4D4B51"/>
-               </linearGradient>
-               <line class="st3" x1="196.2" y1="214.3" x2="196.2" y2="0"/>
-               <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="587.4589" y1="107.1501" x2="588.4589" y2="107.1501">
-                       <stop  offset="0.4644" style="stop-color:#000000"/>
-                       <stop  offset="0.4741" style="stop-color:#4D4B51"/>
-               </linearGradient>
-               <line class="st4" x1="588" y1="214.3" x2="588" y2="0"/>
-               <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="783.3421" y1="107.1501" x2="784.3421" y2="107.1501">
-                       <stop  offset="0.4644" style="stop-color:#000000"/>
-                       <stop  offset="0.4741" style="stop-color:#4D4B51"/>
-               </linearGradient>
-               <line class="st5" x1="783.8" y1="214.3" x2="783.8" y2="0"/>
-               <g>
-                       <line class="st6" x1="815.1" y1="132" x2="983.5" y2="132"/>
-               </g>
-               <line class="st6" x1="1004.4" y1="-1.1" x2="1004.4" y2="213.2"/>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Utility_Logo_Background-01.svg b/homescreen/qml/images/Utility_Logo_Background-01.svg
deleted file mode 100644 (file)
index c289805..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1080 215"
-        style="enable-background:new 0 0 1080 215;" xml:space="preserve">
-<style type="text/css">
-       .st0{opacity:0.82;}
-       .st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-       .st2{opacity:0.9;}
-       .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#1B1A1D;}
-</style>
-<switch>
-       <foreignObject requiredExtensions="&ns_ai;" x="0" y="0" width="1" height="1">
-               <i:pgfRef  xlink:href="#adobe_illustrator_pgf">
-               </i:pgfRef>
-       </foreignObject>
-       <g i:extraneous="self">
-               <g>
-                       <g id="box_14_" class="st0">
-                               <g>
-                                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="540" y1="247.5651" x2="540" y2="-6.7541">
-                                               <stop  offset="0.2978" style="stop-color:#FFFFFF;stop-opacity:0"/>
-                                               <stop  offset="0.3685" style="stop-color:#FAFAFA;stop-opacity:0.1007"/>
-                                               <stop  offset="0.4554" style="stop-color:#EBEBEB;stop-opacity:0.2245"/>
-                                               <stop  offset="0.5508" style="stop-color:#D2D2D2;stop-opacity:0.3603"/>
-                                               <stop  offset="0.6523" style="stop-color:#AFAFAF;stop-opacity:0.5048"/>
-                                               <stop  offset="0.7585" style="stop-color:#828282;stop-opacity:0.6562"/>
-                                               <stop  offset="0.8689" style="stop-color:#4B4B4B;stop-opacity:0.8133"/>
-                                               <stop  offset="0.9806" style="stop-color:#0C0C0C;stop-opacity:0.9724"/>
-                                               <stop  offset="1" style="stop-color:#000000"/>
-                                       </linearGradient>
-                                       <rect class="st1" width="1080" height="215"/>
-                               </g>
-                       </g>
-                       <g id="box_17_" class="st2">
-                               <g>
-                                       <rect class="st3" width="1080" height="215"/>
-                               </g>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Utility_Logo_Grey-01.svg b/homescreen/qml/images/Utility_Logo_Grey-01.svg
deleted file mode 100644 (file)
index 16ac88c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 215 215"
-        style="enable-background:new 0 0 215 215;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#525252;}
-</style>
-<switch>
-       <g i:extraneous="self">
-               <g>
-                       <path class="st0" d="M113.8,150.3h4.2v15.3h9.5v3.8h-13.7V150.3z"/>
-                       <path class="st0" d="M130.9,150.3h4.2v19.1h-4.2V150.3z"/>
-                       <path class="st0" d="M139.9,150.3h3.9l9,11.8v-11.8h4.2v19.1h-3.6l-9.3-12.2v12.2h-4.2V150.3z"/>
-                       <path class="st0" d="M169.4,169.7c-2.6,0-4.6-0.7-6.1-2.1c-1.5-1.4-2.2-3.5-2.2-6.4v-10.9h4.2v10.8c0,1.6,0.4,2.7,1.1,3.5
-                               c0.7,0.8,1.7,1.2,3,1.2c1.3,0,2.3-0.4,3-1.1c0.7-0.8,1.1-1.9,1.1-3.4v-11h4.2v10.8c0,1.5-0.2,2.7-0.6,3.8c-0.4,1.1-1,2-1.7,2.7
-                               c-0.7,0.7-1.6,1.3-2.7,1.6C171.9,169.5,170.7,169.7,169.4,169.7z"/>
-                       <path class="st0" d="M187.3,159.7l-6.4-9.4h4.9l4,6.2l4-6.2h4.8l-6.4,9.3l6.7,9.8H194l-4.3-6.6l-4.3,6.6h-4.8L187.3,159.7z"/>
-                       <path class="st0" d="M24.6,126.9h2l8.4,18.6h-2.2l-2.2-4.9H20.5l-2.2,4.9h-2.1L24.6,126.9z M29.7,138.7l-4.2-9.4l-4.2,9.4H29.7z"
-                               />
-                       <path class="st0" d="M37.7,137.7V127h2.1v10.6c0,4,2.1,6.2,5.6,6.2c3.4,0,5.6-2.1,5.6-6.1V127H53v10.6c0,5.4-3.1,8.2-7.7,8.2
-                               C40.8,145.7,37.7,142.9,37.7,137.7z"/>
-                       <path class="st0" d="M62.9,128.9h-6.2V127h14.5v1.9H65v16.5h-2.1V128.9z"/>
-                       <path class="st0" d="M73,136.3L73,136.3c0-5.1,3.8-9.6,9.4-9.6c5.6,0,9.4,4.4,9.4,9.5c0,0,0,0,0,0.1c0,5.1-3.8,9.5-9.4,9.5
-                               C76.8,145.8,73,141.4,73,136.3z M89.7,136.3L89.7,136.3c0-4.2-3.1-7.7-7.3-7.7c-4.2,0-7.2,3.4-7.2,7.6v0.1c0,4.2,3.1,7.6,7.3,7.6
-                               C86.6,143.8,89.7,140.5,89.7,136.3z"/>
-                       <path class="st0" d="M96.2,127h2.1l6.7,10.1l6.7-10.1h2.1v18.5h-2.1v-15l-6.7,9.9H105l-6.7-9.9v14.9h-2V127z"/>
-                       <path class="st0" d="M145.2,128.9H139V127h14.5v1.9h-6.2v16.5h-2.1V128.9z"/>
-                       <path class="st0" d="M157.6,127h2.1v18.5h-2.1V127z"/>
-                       <path class="st0" d="M163.5,127h2.3l6.6,15.9L179,127h2.2l-7.9,18.6h-1.8L163.5,127z"/>
-                       <path class="st0" d="M184.8,127h13.3v1.9h-11.3v6.3H197v1.9h-10.1v6.5h11.4v1.9h-13.5V127z"/>
-                       <rect x="105.6" y="55.1" class="st0" width="3.8" height="16.8"/>
-                       
-                               <rect x="69.3" y="69.6" transform="matrix(0.707 -0.7072 0.7072 0.707 -34.2747 73.1702)" class="st0" width="3.8" height="16.8"/>
-                       <rect x="155.1" y="104.5" class="st0" width="16.8" height="3.8"/>
-                       <rect x="47.4" y="104.5" class="st0" width="16.8" height="3.8"/>
-                       <path class="st0" d="M43.7,113.9c2.1-34.7,31-62.4,66.2-62.4c35.2,0,64.2,27.6,66.2,62.4h6.4c-2.1-38.3-33.8-68.8-72.6-68.8
-                               s-70.5,30.5-72.6,68.8H43.7z"/>
-                       <circle class="st0" cx="107.5" cy="114.9" r="6.7"/>
-                       
-                               <rect x="107.1" y="88.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -24.9453 120.6025)" class="st0" width="52" height="3.8"/>
-                       <rect x="86.9" y="78" class="st0" width="9.2" height="9.2"/>
-                       <rect x="97.6" y="78" class="st0" width="9.2" height="9.2"/>
-                       <rect x="108.3" y="78" class="st0" width="9.2" height="9.2"/>
-                       <rect x="118.9" y="78" class="st0" width="9.2" height="9.2"/>
-                       <g>
-                               <g>
-                                       <path class="st0" d="M35.1,153.7l-1.5,1.4c-1.1-1-2.2-1.8-3.5-2.4c-1.3-0.5-2.5-0.8-3.7-0.8c-1.5,0-2.9,0.4-4.2,1.1
-                                               c-1.3,0.7-2.4,1.7-3.1,3c-0.7,1.2-1.1,2.6-1.1,4c0,1.4,0.4,2.8,1.1,4.1c0.8,1.3,1.8,2.3,3.2,3c1.3,0.7,2.8,1.1,4.4,1.1
-                                               c1.9,0,3.6-0.5,4.9-1.6c1.3-1.1,2.1-2.5,2.4-4.3h-6v-1.8h8.2c0,2.9-0.9,5.2-2.6,7c-1.7,1.7-4,2.6-6.9,2.6
-                                               c-3.5,0-6.3-1.2-8.3-3.6c-1.6-1.8-2.4-4-2.4-6.4c0-1.8,0.5-3.5,1.4-5c0.9-1.5,2.1-2.8,3.7-3.6c1.6-0.9,3.3-1.3,5.3-1.3
-                                               c1.6,0,3.1,0.3,4.5,0.9C32.4,151.5,33.8,152.4,35.1,153.7z"/>
-                                       <path class="st0" d="M39.9,150.5h3.8c2.1,0,3.5,0.1,4.3,0.3c1.1,0.3,2,0.8,2.7,1.7c0.7,0.8,1.1,1.9,1.1,3.1
-                                               c0,1-0.2,1.9-0.7,2.7c-0.5,0.8-1.2,1.4-2.1,1.8c-0.9,0.4-2.1,0.6-3.7,0.6l6.8,8.8h-2.3l-6.8-8.8h-1.1v8.8h-1.9V150.5z
-                                                M41.8,152.3v6.4l3.3,0c1.3,0,2.2-0.1,2.8-0.4c0.6-0.2,1.1-0.6,1.4-1.2c0.3-0.5,0.5-1.1,0.5-1.8c0-0.6-0.2-1.2-0.5-1.7
-                                               s-0.8-0.9-1.4-1.1c-0.6-0.2-1.5-0.3-2.8-0.3H41.8z"/>
-                                       <path class="st0" d="M63.6,150.5l8.8,18.9h-2l-3-6.2h-8.2l-2.9,6.2h-2.1l8.9-18.9H63.6z M63.3,154.5l-3.2,6.9h6.5L63.3,154.5z"
-                                               />
-                                       <path class="st0" d="M75.3,169.4v-18.9h3.9c2.8,0,4.9,0.2,6.2,0.7c1.8,0.6,3.3,1.8,4.3,3.3c1,1.6,1.6,3.5,1.6,5.7
-                                               c0,1.9-0.4,3.6-1.2,5c-0.8,1.4-1.9,2.5-3.2,3.2c-1.3,0.7-3.1,1-5.5,1H75.3z M77.1,167.6h2.2c2.6,0,4.4-0.2,5.4-0.5
-                                               c1.4-0.5,2.5-1.3,3.4-2.5c0.8-1.2,1.2-2.7,1.2-4.4c0-1.8-0.4-3.4-1.3-4.7c-0.9-1.3-2.1-2.2-3.7-2.7c-1.2-0.4-3.1-0.5-5.9-0.5
-                                               h-1.3V167.6z"/>
-                                       <path class="st0" d="M95,150.5h10.9v1.9h-9v5.9h8.9v1.9h-8.9v7.4h8.9v1.9H95V150.5z"/>
-                               </g>
-                       </g>
-                       <g>
-                               <polygon class="st0" points="121.4,141.8 121.4,134.4 117.7,134.4 117.7,145.4 128.7,145.4 128.7,141.8                            "/>
-                               <polygon class="st0" points="136.1,127 117.7,127 117.7,132.6 121.4,132.6 121.4,130.7 132.4,130.7 132.4,141.8 130.6,141.8 
-                                       130.6,145.4 136.1,145.4                                 "/>
-                       </g>
-               </g>
-       </g>
-</switch>
-</svg>
diff --git a/homescreen/qml/images/Utility_Music_Background-01.png b/homescreen/qml/images/Utility_Music_Background-01.png
deleted file mode 100644 (file)
index c3e9f91..0000000
Binary files a/homescreen/qml/images/Utility_Music_Background-01.png and /dev/null differ
diff --git a/homescreen/qml/images/Utility_Radio_Background-01.png b/homescreen/qml/images/Utility_Radio_Background-01.png
deleted file mode 100644 (file)
index b755843..0000000
Binary files a/homescreen/qml/images/Utility_Radio_Background-01.png and /dev/null differ
index 39f7eb6..0715215 100644 (file)
@@ -1,15 +1,11 @@
 <RCC>
     <qresource prefix="/images">
-        <file>TopSection_NoText_NoIcons-01.svg</file>
-        <file>Utility_Logo_Background-01.svg</file>
-        <file>Utility_Logo_Grey-01.svg</file>
-        <file>Utility_Music_Background-01.png</file>
-        <file>Utility_Radio_Background-01.png</file>
-        <file>AGL_HMI_Blue_Background_NoCar-01.png</file>
-        <file>AGL_HMI_Full_Background.png</file>
-        <file>AGL_HMI_Normal_Background.png</file>
+        <file>menubar_background.png</file>
+        <file>menubar_normal_background.png</file>
+        <file>menubar_full_background.png</file>
         <file>fullscreen.png</file>
         <file>normal.png</file>
-        <file>normal_disable.png</file>
+        <file>split_switch.png</file>
+        <file>split_switch_disable.png</file>
     </qresource>
 </RCC>
diff --git a/homescreen/qml/images/menubar_background.png b/homescreen/qml/images/menubar_background.png
new file mode 100644 (file)
index 0000000..bb95916
Binary files /dev/null and b/homescreen/qml/images/menubar_background.png differ
similarity index 51%
rename from homescreen/qml/images/AGL_HMI_Full_Background.png
rename to homescreen/qml/images/menubar_full_background.png
index 9631ca0..31cbfdb 100644 (file)
Binary files a/homescreen/qml/images/AGL_HMI_Full_Background.png and b/homescreen/qml/images/menubar_full_background.png differ
diff --git a/homescreen/qml/images/menubar_normal_background.png b/homescreen/qml/images/menubar_normal_background.png
new file mode 100644 (file)
index 0000000..25c9bcf
Binary files /dev/null and b/homescreen/qml/images/menubar_normal_background.png differ
diff --git a/homescreen/qml/images/normal_disable.png b/homescreen/qml/images/normal_disable.png
deleted file mode 100644 (file)
index f191241..0000000
Binary files a/homescreen/qml/images/normal_disable.png and /dev/null differ
diff --git a/homescreen/qml/images/split_switch.png b/homescreen/qml/images/split_switch.png
new file mode 100644 (file)
index 0000000..751b2fa
Binary files /dev/null and b/homescreen/qml/images/split_switch.png differ
diff --git a/homescreen/qml/images/split_switch_disable.png b/homescreen/qml/images/split_switch_disable.png
new file mode 100644 (file)
index 0000000..c4bfa67
Binary files /dev/null and b/homescreen/qml/images/split_switch_disable.png differ
index a8d095b..b22ba06 100644 (file)
@@ -31,69 +31,78 @@ Window {
     Image {
         id: container
         anchors.centerIn: parent
-        width: 1080
-        height: 1920
-        scale: screenInfo.scale_factor()
-        source: './images/AGL_HMI_Blue_Background_NoCar-01.png'
+        width: 1920
+        height: 720
+        scale: 1.0
+        source: './images/menubar_background.png'
 
         ColumnLayout {
+            id: menuBar
             anchors.fill: parent
             spacing: 0
             TopArea {
                 id: topArea
-                Layout.fillWidth: true
-                Layout.preferredHeight: 218
+                anchors.horizontalCenter: parent.horizontalCenter
+                Layout.preferredHeight: 80
+                x: 640
             }
 
             Item {
                 id: applicationArea
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                Layout.preferredHeight: 1920 - 218 - 215
+                Layout.preferredHeight: 510
 
                 visible: true
+                MouseArea {
+                    enabled: true
+                }
             }
 
-            MediaArea {
-                id: mediaArea
-                Layout.fillWidth: true
+            ShortcutArea {
+                id: shortcutArea
+                anchors.horizontalCenter: parent.horizontalCenter
                 Layout.fillHeight: true
-                Layout.preferredHeight: 215
+                Layout.preferredHeight: 130
             }
         }
-
-
-        state: "normal"
-
         states: [
             State {
                 name: "normal"
+                PropertyChanges {
+                    target: container
+                    y: 0
+                }
                 PropertyChanges {
                     target: topArea
                     y: 0
                 }
                 PropertyChanges {
                     target: applicationArea
-                    y: 218
+                    y: 80
                 }
                 PropertyChanges {
-                    target: mediaArea
-                    y: 1705
+                    target: shortcutArea
+                    y: 590
                 }
             },
             State {
                 name: "fullscreen"
+                PropertyChanges {
+                    target: container
+                    y: -720
+                }
                 PropertyChanges {
                     target: topArea
-                    y: -220
+                    y: -80
                 }
                 PropertyChanges {
                     target: applicationArea
-                    y: -1490
+                    y: -510
                 }
                 PropertyChanges {
-                    target: mediaArea
-                    y: 2135
+                    target: shortcutArea
+                    y: 720
                 }
             }
         ]
@@ -105,50 +114,79 @@ Window {
                 duration: 250
             }
             NumberAnimation {
-                target: mediaArea
+                target: applicationArea
+                property: "y"
+                easing.type: "OutQuad"
+                duration: 250
+            }
+            NumberAnimation {
+                target: shortcutArea
                 property: "y"
                 easing.type: "OutQuad"
                 duration: 250
             }
         }
-
     }
+
     Item {
         id: switchBtn
-        width: 70
-        height: 70
+        width: 61
+        height: 61
         anchors.right: parent.right
+        anchors.rightMargin: 17
         anchors.top: parent.top
+        anchors.topMargin: 2
         z: 1
-        property bool enableSwitchBtn: true
         Image {
-            anchors.right: parent.right
-            anchors.rightMargin: 20
-            anchors.top: parent.top
-            anchors.topMargin: 25
-            width: 35
-            height: 35
             id: image
+            width: 55
+            height: 55
+            anchors.centerIn: parent
             source: './images/normal.png'
         }
 
         MouseArea {
+            anchors.fill: parent
+            property string btnState: 'normal'
+            onClicked: {
+                if (container.state === 'normal') {
+                    turnToFullscreen()
+                } else {
+                    turnToNormal()
+                }
+            }
+        }
+    }
+
+    Item {
+        id: splitSwitchBtn
+        width: 61
+        height: 61
+        anchors.right: switchBtn.left
+        anchors.top: parent.top
+        anchors.topMargin: 2
+        z: 1
+        property bool enableSplitSwitchBtn: false
+        Image {
+            id: splitSwitchImage
+            width: 55
+            height: 55
+            anchors.centerIn: parent
+            source: './images/split_switch_disable.png'
+        }
+
+        MouseArea {
+            property bool changed : false
             anchors.fill: parent
             onClicked: {
-                if(switchBtn.enableSwitchBtn) {
-                    var appName = homescreenHandler.getCurrentApplication()
-                    if (container.state === 'normal') {
-                        image.source = './images/fullscreen.png'
-                        container.state = 'fullscreen'
-                        touchArea.switchArea(1)
-                        homescreenHandler.tapShortcut(appName, true)
-                        container.opacity = 0.0
-                    } else {
-                        image.source = './images/normal.png'
-                        container.state = 'normal'
-                        touchArea.switchArea(0)
-                        homescreenHandler.tapShortcut(appName, false)
-                        container.opacity = 1.0
+                if (splitSwitchBtn.enableSplitSwitchBtn) {
+                    if(changed) {
+                        switchSplitArea(0)
+                        changed = false
+                    }
+                    else {
+                        switchSplitArea(1)
+                        changed = true
                     }
                 }
             }
@@ -170,127 +208,32 @@ Window {
         }
     }
 
-    function changeSwitchState(is_navigation) {
-        if(container.state === 'normal') {
-            if(is_navigation) {
-                switchBtn.enableSwitchBtn = true
-                image.source = './images/normal.png'
-            } else {
-                switchBtn.enableSwitchBtn = false
-                image.source = './images/normal_disable.png'
-            }
-        }
-    }
 
-    Connections {
-        target: homescreenHandler
-        onShowWindow: {
-            container.state = 'normal'
-            image.visible = true
-            touchArea.switchArea(0)
-            container.opacity = 1.0
-        }
+    function turnToFullscreen() {
+        image.source = './images/fullscreen.png'
+        container.state = 'fullscreen'
+        container.opacity = 0.0
+        touchArea.switchArea(1)
     }
 
-    Connections {
-        target: homescreenHandler
-        onHideWindow: {
-            container.state = 'fullscreen'
-            image.visible = false
-            touchArea.switchArea(1)
-            container.opacity = 0.0
-        }
+    function turnToNormal() {
+        image.source = './images/normal.png'
+        container.state = 'normal'
+        container.opacity = 1.0
+        touchArea.switchArea(0)
     }
 
-    Timer {
-        id:informationTimer
-        interval: 3000
-        running: false
-        repeat: true
-        onTriggered: {
-            bottomInformation.visible = false
-        }
+    function enableSplitSwitchBtn() {
+        splitSwitchImage.source = './images/split_switch.png'
+        splitSwitchBtn.enableSplitSwitchBtn = true
     }
 
-    Item {
-        id: bottomInformation
-        width: parent.width
-        height: 215
-        anchors.bottom: parent.bottom
-        visible: false
-        Text {
-            id: bottomText
-            anchors.centerIn: parent
-            font.pixelSize: 25
-            font.letterSpacing: 5
-            horizontalAlignment: Text.AlignHCenter
-            color: "white"
-            text: ""
-            z:1
-        }
+    function disableSplitSwitchBtn() {
+        splitSwitchImage.source = './images/split_switch_disable.png'
+        splitSwitchBtn.enableSplitSwitchBtn = false;
     }
 
-    Connections {
-        target: homescreenHandler
-        onShowInformation: {
-            bottomText.text = info
-            bottomInformation.visible = true
-            informationTimer.restart()
-        }
-    }
-
-       Timer {
-        id:notificationTimer
-        interval: 3000
-        running: false
-        repeat: true
-        onTriggered: notificationItem.visible = false
-    }
-
-    Item {
-        id: notificationItem
-        x: 0
-        y: 0
-        z: 1
-        width: 1280
-        height: 100
-        opacity: 0.8
-        visible: false
-
-        Rectangle {
-            width: parent.width
-            height: parent.height
-            anchors.fill: parent
-            color: "gray"
-            Image {
-                id: notificationIcon
-                width: 70
-                height: 70
-                anchors.left: parent.left
-                anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
-                source: ""
-            }
-
-            Text {
-                id: notificationtext
-                font.pixelSize: 25
-                anchors.left: notificationIcon.right
-                anchors.leftMargin: 5
-                anchors.verticalCenter: parent.verticalCenter
-                color: "white"
-                text: qsTr("")
-            }
-        }
-    }
-
-    Connections {
-        target: homescreenHandler
-        onShowNotification: {
-            notificationIcon.source = icon_path
-            notificationtext.text = text
-            notificationItem.visible = true
-            notificationTimer.restart()
-        }
+    function switchSplitArea(val) {
+        homescreenHandler.changeLayout(val);
     }
 }
index e60ea63..933a8a5 100644 (file)
@@ -1,10 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-        <file>MediaArea.qml</file>
-        <file>MediaAreaBlank.qml</file>
-        <file>MediaAreaMusic.qml</file>
-        <file>MediaAreaRadio.qml</file>
         <file>ShortcutArea.qml</file>
         <file>ShortcutIcon.qml</file>
         <file>StatusArea.qml</file>
index a72ea9f..5a1e2d6 100644 (file)
@@ -81,6 +81,5 @@ void ApplicationLauncher::setCurrent(const QString &current)
 {
     if (m_current == current) return;
     m_current = current;
-    qDebug() << "setCurrent" << m_current;
     emit currentChanged(current);
 }
index cbf816a..251dbe9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-#include <QFileInfo>
 #include "homescreenhandler.h"
 #include <functional>
+#include <QQmlApplicationEngine>
+#include <QtQuick/QQuickWindow>
 #include <QProcess>
-#include <dirent.h>
-#include <stdio.h>
 #include "hmi-debug.h"
 
-#define BUF_SIZE 1024
 void* HomescreenHandler::myThis = 0;
 
 HomescreenHandler::HomescreenHandler(QObject *parent) :
     QObject(parent),
-    mp_qhs(NULL),
-    current_application("launcher")
+    mp_qhs(NULL), mp_wm(NULL), m_role()
 {
+
 }
 
 HomescreenHandler::~HomescreenHandler()
@@ -37,164 +35,88 @@ HomescreenHandler::~HomescreenHandler()
     if (mp_qhs != NULL) {
         delete mp_qhs;
     }
+    if (mp_wm != NULL) {
+        delete mp_wm;
+    }
 }
 
-void HomescreenHandler::init(int port, const char *token, QLibWindowmanager *qwm, QString myname)
+void HomescreenHandler::init(const char* role, int port, const char *token)
 {
+    this->m_role = role;
+
+    // LibWindowManager initialize
+    mp_wm = new LibWindowmanager();
+    if(mp_wm->init(port,token) != 0){
+        exit(EXIT_FAILURE);
+    }
+
+    int surface = mp_wm->requestSurface(m_role.c_str());
+    if (surface < 0) {
+        exit(EXIT_FAILURE);
+    }
+    std::string ivi_id = std::to_string(surface);
+    setenv("QT_IVI_SURFACE_ID", ivi_id.c_str(), true);
+
+    // LibHomeScreen initialize
     mp_qhs = new QLibHomeScreen();
     mp_qhs->init(port, token);
 
     myThis = this;
-    mp_qwm = qwm;
-    m_myname = myname;
 
     mp_qhs->registerCallback(nullptr, HomescreenHandler::onRep_static);
 
-    mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow,[this](json_object *object){
-        HMI_DEBUG("Launcher","Surface launcher got Event_ShowWindow\n");
-        static bool first_start = true;
-        if (first_start) {
-            first_start = false;
-            mp_qwm->activateWindow(m_myname);
-        }
-        else {
-            emit showWindow();
-        }
-    });
-
     mp_qhs->set_event_handler(QLibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
         const char *display_message = json_object_get_string(
             json_object_object_get(object, "display_message"));
         HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message);
     });
-
-    mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowNotification,[this](json_object *object){
-       json_object *p_obj = json_object_object_get(object, "parameter");
-       const char *icon = json_object_get_string(
-                   json_object_object_get(p_obj, "icon"));
-       const char *text = json_object_get_string(
-                   json_object_object_get(p_obj, "text"));
-       const char *app_id = json_object_get_string(
-                   json_object_object_get(p_obj, "caller"));
-       HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id);
-       QFileInfo icon_file(icon);
-       QString icon_path;
-       if (icon_file.isFile() && icon_file.exists()) {
-           icon_path = QString(QLatin1String(icon));
-       } else {
-           icon_path = "./images/Utility_Logo_Grey-01.svg";
-       }
-
-       emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text)));
-    });
-
-    mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowInformation,[this](json_object *object){
-       json_object *p_obj = json_object_object_get(object, "parameter");
-       const char *info = json_object_get_string(
-                   json_object_object_get(p_obj, "info"));
-
-       emit showInformation(QString(QLatin1String(info)));
-    });
-
-    mp_qhs->set_event_handler(QLibHomeScreen::Event_HideWindow, [this](json_object *object) {
-        emit hideWindow();
-        HMI_DEBUG("HomeScreen","set_event_handler Event_HideWindow");
-    });
-
-    mp_qhs->set_event_handler(QLibHomeScreen::Event_RegisterShortcut,[this](json_object *object){
-        HMI_DEBUG("HomeScreen","set_event_handler Event_RegisterShortcut");
-        json_object *p_obj = json_object_object_get(object, "parameter");
-        const char *shortcut_id = json_object_get_string(
-                    json_object_object_get(p_obj, "shortcut_id"));
-        const char *shortcut_name = json_object_get_string(
-                    json_object_object_get(p_obj, "shortcut_name"));
-        const char *position = json_object_get_string(
-                    json_object_object_get(p_obj, "position"));
-        HMI_DEBUG("HomeScreen", "Event_RegisterShortcut id==%s, name==%s, position ==%s", shortcut_id, shortcut_name, position);
-        emit shortcutChanged(QString(QLatin1String(shortcut_id)), QString(QLatin1String(shortcut_name)), QString(QLatin1String(position)));
-    });
 }
 
-void HomescreenHandler::tapShortcut(QString application_id, bool is_full)
-{
-    HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
-    struct json_object* j_json = json_object_new_object();
-    struct json_object* value;
-    if(is_full) {
-        value = json_object_new_string("fullscreen");
-        HMI_DEBUG("HomeScreen","fullscreen");
-    } else {
-        value = json_object_new_string("normal.full");
-        HMI_DEBUG("HomeScreen","normal");
-    }
-    json_object_object_add(j_json, "area", value);
-    mp_qhs->showWindow(application_id.section('@', 0, 0).toStdString().c_str(), j_json);
+void HomescreenHandler::setWMHandler(WMHandler& h) {
+    h.on_sync_draw = [&](const char* role, const char* area, Rect r) {
+        this->mp_wm->endDraw(this->m_role.c_str());
+    };
+    mp_wm->setEventHandler(h);
 }
 
-void HomescreenHandler::updateShortcut(QString id, struct json_object* object)
+void HomescreenHandler::disconnect_frame_swapped(void)
 {
-    mp_qhs->updateShortcut(id.toStdString().c_str(), object);
+    qDebug("Let's start homescreen");
+    QObject::disconnect(this->loading);
+    mp_wm->activateWindow(m_role.c_str(), "fullscreen");
 }
 
-
-void HomescreenHandler::setCurrentApplication(QString application_name)
+void HomescreenHandler::attach(QQmlApplicationEngine* engine)
 {
-    HMI_DEBUG("HomeScreen","setCurrentApplication %s", application_name.toStdString().c_str());
-    current_application = application_name;
+    QQuickWindow *window = qobject_cast<QQuickWindow *>(engine->rootObjects().first());
+//    this->loading = QObject::connect(window, SIGNAL(frameSwapped()), this, SLOT(disconnect_frame_swapped()));
+    mp_qhs->setQuickWindow(window);
 }
 
-QString HomescreenHandler::getCurrentApplication()
+void HomescreenHandler::changeLayout(int pattern)
 {
-    HMI_DEBUG("HomeScreen","getCurrentApplication %s", current_application.toStdString().c_str());
-    return current_application;
-}
-
-int HomescreenHandler::getPidOfApplication(QString application_name) {
-    DIR *dir = NULL;
-    struct dirent *dir_ent_ptr = NULL;
-    FILE *fp = NULL;
-    char file_path[50] = {0};
-    char cur_task_ame[50] = {0};
-    char buf[BUF_SIZE] = {0};
-    int pid = -1;
-
-    dir = opendir("/proc");
-    if (dir) {
-        while((dir_ent_ptr = readdir(dir)) != NULL) {
-            if ((strcmp(dir_ent_ptr->d_name, ".") == 0) || (strcmp(dir_ent_ptr->d_name, "..") == 0)
-                || (DT_DIR != dir_ent_ptr->d_type))
-                continue;
-            sprintf(file_path, "/proc/%s/status", dir_ent_ptr->d_name);
-            fp = fopen(file_path, "r");
-            if (fp) {
-                if (fgets(buf, BUF_SIZE - 1, fp) == NULL) {
-                    fclose(fp);
-                    continue;
-                }
-                sscanf(buf, "%*s %s", cur_task_ame);
-                if (0 == strcmp(application_name.toStdString().c_str(), cur_task_ame)) {
-                    pid = atoi(dir_ent_ptr->d_name);
-                    break;
-                }
-            }
-        }
+    HMI_NOTICE("HomeScreen", "Pressed %d, %s", pattern,
+        (pattern == P_LEFT_METER_RIGHT_MAP) ? "left:meter, right:map": "left:map, right:meter");
+    ChangeAreaReq req;
+    std::unordered_map<std::string, Rect> map_list;
+    switch(pattern) {
+        case P_LEFT_METER_RIGHT_MAP:
+            map_list["split.main"] = Rect(0, 0, 1280, 720);
+            map_list["split.sub"] = Rect(1280, 0, 640, 720);
+            break;
+        case P_LEFT_MAP_RIGHT_METER:
+            map_list["split.main"] = Rect(640, 0, 1280, 720);
+            map_list["split.sub"] = Rect(0, 0, 640, 720);
+            break;
+        default:
+            break;
+    }
+    if(map_list.size() != 0)
+    {
+        req.setAreaReq(map_list);
+        HMI_NOTICE("Homescreen", "Change layout");
+        mp_wm->changeAreaSize(req);
     }
-
-    return pid;
-}
-
-void HomescreenHandler::killRunningApplications()
-{
-    QProcess *proc = new QProcess;
-    QProcess *proc2 = new QProcess;
-//    int num = getPidOfApplication("afbd-video@0.1");
-//    QString procNum = QString::number(num);
-    QString command = "/usr/bin/pkill videoplayer";
-    QString command2 = "/usr/bin/pkill navigation";
-    proc->start(command);
-    proc2->start(command2);
-    HMI_DEBUG("homescreen", command.toStdString().c_str());
-    HMI_DEBUG("homescreen", command2.toStdString().c_str());
 }
 
 void HomescreenHandler::reboot()
@@ -203,6 +125,12 @@ void HomescreenHandler::reboot()
     QProcess::execute("reboot -f");
 }
 
+void HomescreenHandler::tapShortcut(QString application_name)
+{
+    HMI_DEBUG("HomeScreen","tapShortcut %s", application_name.toStdString().c_str());
+    mp_qhs->tapShortcut(application_name.toStdString().c_str());
+}
+
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)
 {
     static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onRep(reply_contents);
@@ -232,8 +160,3 @@ void HomescreenHandler::onEv(const string& event, struct json_object* event_cont
         HMI_DEBUG("HomeScreen","display_message = %s", display_message);
     }
 }
-
-void HomescreenHandler::setQuickWindow(QQuickWindow *qw)
-{
-    mp_qhs->setQuickWindow(qw);
-}
index 4afbac4..69599de 100644 (file)
 #define HOMESCREENHANDLER_H
 
 #include <QObject>
-#include <QQuickWindow>
 #include <qlibhomescreen.h>
-#include <qlibwindowmanager.h>
+#include <libwindowmanager.h>
 #include <string>
 
 using namespace std;
 
+class QQmlApplicationEngine;
+
 class HomescreenHandler : public QObject
 {
     Q_OBJECT
 public:
+    enum CHANGE_LAYOUT_PATTERN {
+        P_LEFT_METER_RIGHT_MAP = 0,
+        P_LEFT_MAP_RIGHT_METER
+    };
+    Q_ENUMS(CHANGE_LAYOUT_PATTERN)
     explicit HomescreenHandler(QObject *parent = 0);
     ~HomescreenHandler();
 
-    void init(int port, const char* token, QLibWindowmanager *qwm, QString myname);
+    void init(const char* role, int port, const char* token);
+    void attach(QQmlApplicationEngine* engine);
+    void setWMHandler(WMHandler &handler);
 
-    Q_INVOKABLE void tapShortcut(QString application_name, bool is_full);
-    Q_INVOKABLE QString getCurrentApplication();
-    Q_INVOKABLE void killRunningApplications();
+    Q_INVOKABLE void tapShortcut(QString application_name);
+    Q_INVOKABLE void changeLayout(int pattern);
     Q_INVOKABLE void reboot();
-    void setCurrentApplication(QString application_name);
-    int getPidOfApplication(QString application_name);
 
     void onRep(struct json_object* reply_contents);
     void onEv(const string& event, struct json_object* event_contents);
@@ -47,23 +52,19 @@ public:
     static void* myThis;
     static void onRep_static(struct json_object* reply_contents);
     static void onEv_static(const string& event, struct json_object* event_contents);
-    void setQuickWindow(QQuickWindow *qw);
 
 signals:
-    void showNotification(QString application_id, QString icon_path, QString text);
-    void showInformation(QString info);
-    void shortcutChanged(QString shortcut_id, QString shortcut_name, QString position);
-    void showWindow();
-    void hideWindow();
+    void notification(QString id, QString icon, QString text);
+    void information(QString text);
 
-public slots:
-    void updateShortcut(QString id, struct json_object* object);
+private Q_SLOTS:
+    void disconnect_frame_swapped(void);
 
 private:
     QLibHomeScreen *mp_qhs;
-    QLibWindowmanager *mp_qwm;
-    QString m_myname;
-    QString current_application;
+    LibWindowmanager *mp_wm;
+    std::string m_role;
+    QMetaObject::Connection loading;
 };
 
 #endif // HOMESCREENHANDLER_H
index 0c477fd..ba5d36a 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017, 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 #include <QQuickWindow>
 #include <QThread>
 
-#include <qlibwindowmanager.h>
 #include <weather.h>
 #include <bluetooth.h>
 #include "applicationlauncher.h"
 #include "statusbarmodel.h"
 #include "afm_user_daemon_proxy.h"
-#include "mastervolume.h"
 #include "homescreenhandler.h"
 #include "toucharea.h"
-#include "shortcutappmodel.h"
 #include "hmi-debug.h"
+#include <QBitmap>
 
 // XXX: We want this DBus connection to be shared across the different
 // QML objects, is there another way to do this, a nice way, perhaps?
@@ -58,6 +56,7 @@ void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
 int main(int argc, char *argv[])
 {
     QGuiApplication a(argc, argv);
+    const char* graphic_role = "homescreen";
 
     // use launch process
     QScopedPointer<org::AGL::afm::user, Cleanup> afm_user_daemon_proxy(new org::AGL::afm::user("org.AGL.afm.user",
@@ -81,7 +80,6 @@ int main(int argc, char *argv[])
 
     int port = 1700;
     QString token = "wm";
-    QString graphic_role = "homescreen"; // defined in layers.json in Window Manager
 
     if (positionalArguments.length() == 2) {
         port = positionalArguments.takeFirst().toInt();
@@ -93,22 +91,10 @@ int main(int argc, char *argv[])
     // import C++ class to QML
     // qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
     qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
-    qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume");
-    qmlRegisterType<ShortcutAppModel>("ShortcutAppModel", 1, 0, "ShortcutAppModel");
 
     ApplicationLauncher *launcher = new ApplicationLauncher();
-    QLibWindowmanager* layoutHandler = new QLibWindowmanager();
     HomescreenHandler* homescreenHandler = new HomescreenHandler();
-    ShortcutAppModel* shortcutAppModel = new ShortcutAppModel();
-    if(layoutHandler->init(port,token) != 0){
-        exit(EXIT_FAILURE);
-    }
-
-    AGLScreenInfo screenInfo(layoutHandler->get_scale_factor());
-
-    if (layoutHandler->requestSurface(graphic_role) != 0) {
-        exit(EXIT_FAILURE);
-    }
+    homescreenHandler->init(graphic_role, port, token.toStdString().c_str());
 
     QUrl bindingAddress;
     bindingAddress.setScheme(QStringLiteral("ws"));
@@ -121,47 +107,46 @@ int main(int argc, char *argv[])
     bindingAddress.setQuery(query);
 
     TouchArea* touchArea = new TouchArea();
-    homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, graphic_role);
 
     // mail.qml loading
     QQmlApplicationEngine engine;
-    engine.rootContext()->setContextProperty("bindingAddress", bindingAddress);
-    engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
     engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler);
     engine.rootContext()->setContextProperty("touchArea", touchArea);
-    engine.rootContext()->setContextProperty("shortcutAppModel", shortcutAppModel);
     engine.rootContext()->setContextProperty("launcher", launcher);
     engine.rootContext()->setContextProperty("weather", new Weather(bindingAddress));
-    engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddress, engine.rootContext()));
-    engine.rootContext()->setContextProperty("screenInfo", &screenInfo);
+//    engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddress));
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-    homescreenHandler->setQuickWindow(window);
-
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler, &graphic_role](json_object *object) {
-        layoutHandler->endDraw(graphic_role);
-    });
 
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, homescreenHandler, root](json_object *object) {
-        json_object *jarray = json_object_object_get(object, "ids");
-        HMI_DEBUG("HomeScreen","ids=%s", json_object_to_json_string(object));
-        int arrLen = json_object_array_length(jarray);
+    WMHandler wmh;
+    wmh.on_screen_updated = [launcher, root](std::vector<std::string> list) {
+        for(const auto& i : list) {
+            HMI_DEBUG("HomeScreen", "ids=%s", i.c_str());
+        }
+        int arrLen = list.size();
         QString label = QString("");
         for( int idx = 0; idx < arrLen; idx++)
         {
-            label = QString(json_object_get_string(    json_object_array_get_idx(jarray, idx) ));
-            HMI_DEBUG("HomeScreen","Event_ScreenUpdated application11: %s.", label.toStdString().c_str());
-            homescreenHandler->setCurrentApplication(label);
+            label = list[idx].c_str();
+            HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str());
             QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label));
+            if(label == "launcher") {
+                QMetaObject::invokeMethod(root, "turnToNormal");
+            } else {
+                QMetaObject::invokeMethod(root, "turnToFullscreen");
+            }
+            if((arrLen == 1) && (QString("restriction") != label)) {
+                QMetaObject::invokeMethod(root, "disableSplitSwitchBtn");
+            } else {
+                QMetaObject::invokeMethod(root, "enableSplitSwitchBtn");
+            }
         }
-        if((arrLen == 1) && (QString("navigation") == label)){
-            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true));
-        }else{
-            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false));
-        }
-    });
+    };
+    homescreenHandler->setWMHandler(wmh);
+    homescreenHandler->attach(&engine);
+
+    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
 
     touchArea->setWindow(window);
     QThread* thread = new QThread;
@@ -174,10 +159,5 @@ int main(int argc, char *argv[])
     StatusBarModel *statusBar = sobjs.first()->findChild<StatusBarModel *>("statusBar");
     statusBar->init(bindingAddress, engine.rootContext());
 
-    QObject::connect(homescreenHandler, SIGNAL(shortcutChanged(QString, QString, QString)), shortcutAppModel, SLOT(changeShortcut(QString, QString, QString)));
-    QObject::connect(shortcutAppModel, SIGNAL(shortcutUpdated(QString, struct json_object*)), homescreenHandler, SLOT(updateShortcut(QString, struct json_object*)));
-
-    shortcutAppModel->screenUpdated();
-
     return a.exec();
 }
diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp
deleted file mode 100644 (file)
index 35b47fc..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 Konsulko Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "mastervolume.h"
-#include <QJsonObject>
-#include <QTimer>
-#include <QtDebug>
-
-MasterVolume::MasterVolume(QObject* parent)
-       : QObject(parent)
-       , m_volume{50}
-{
-       connect(&m_client, SIGNAL(connected()), this, SLOT(onClientConnected()));
-       connect(&m_client, SIGNAL(disconnected()), this, SLOT(onClientDisconnected()));
-       connect(&m_client, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(onClientError(QAbstractSocket::SocketError)));
-       connect(&m_client, SIGNAL(eventReceived(QString, const QJsonValue&)), this, SLOT(onClientEventReceived(QString, const QJsonValue&)));
-}
-
-void MasterVolume::open(const QUrl& url)
-{
-       m_url = url;
-       TryOpen();
-}
-
-qint32 MasterVolume::getVolume() const
-{
-       return m_volume;
-}
-
-void MasterVolume::setVolume(qint32 volume)
-{
-       if (m_volume != volume)
-       {
-               m_volume = volume;
-               QJsonObject arg;
-               arg.insert("action", "volume");
-               arg.insert("value", volume);
-               m_client.call("ahl-4a", "activerole", arg, [](bool, const QJsonValue&) {
-                       // Nothing to do, events will update sliders
-               });
-       }
-}
-
-void MasterVolume::onClientConnected()
-{
-       // Subscribe to 4a events
-       m_client.call("ahl-4a", "subscribe", QJsonValue(), [this](bool r, const QJsonValue&) {
-               if (r) qDebug() << "MasterVolume::onClientConnected - subscribed to 4a events!";
-               else qCritical () << "MasterVolume::onClientConnected - Failed to subscribe to 4a events!";
-       });
-}
-
-void MasterVolume::onClientDisconnected()
-{
-       qDebug() << "MasterVolume::onClientDisconnected!";
-       QTimer::singleShot(1000, this, SLOT(TryOpen()));
-}
-
-void MasterVolume::onClientError(QAbstractSocket::SocketError se)
-{
-       qDebug() << "MasterVolume::onClientError: " << se;
-}
-
-void MasterVolume::onClientEventReceived(QString name, const QJsonValue& data)
-{
-       qDebug() << "MasterVolume::onClientEventReceived[" << name << "]: " << data;
-       if (name == "ahl-4a/volume_changed")
-       {
-               QJsonObject arg = data.toObject();
-               bool active = arg["active"].toBool();
-               if (active)
-               {
-                       // QString role = arg["role"].toString();
-                       int volume = arg["volume"].toInt();
-                       if (m_volume != volume)
-                       {
-                               m_volume = volume;
-                               emit VolumeChanged();
-                       }
-               }
-       }
-}
-
-void MasterVolume::TryOpen()
-{
-       m_client.open(m_url);
-}
diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h
deleted file mode 100644 (file)
index 6ae0aad..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 Konsulko Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtCore/QObject>
-#include <QQmlEngine>
-#include "../qafbwebsocketclient.h"
-
-class MasterVolume
-       : public QObject
-{
-       Q_OBJECT
-       Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged)
-
-private:
-       QAfbWebsocketClient m_client;
-       QUrl m_url;
-       qint32 m_volume;
-
-public:
-       MasterVolume(QObject* parent = nullptr);
-       ~MasterVolume() = default;
-
-       Q_INVOKABLE void open(const QUrl& url);
-       Q_INVOKABLE qint32 getVolume() const;
-       Q_INVOKABLE void setVolume(qint32 val);
-
-private slots:
-       void onClientConnected();
-       void onClientDisconnected();
-       void onClientError(QAbstractSocket::SocketError se);
-       void onClientEventReceived(QString name, const QJsonValue& data);
-       void TryOpen();
-
-signals:
-       void VolumeChanged();
-};
diff --git a/homescreen/src/shortcutappmodel.cpp b/homescreen/src/shortcutappmodel.cpp
deleted file mode 100644 (file)
index 76078da..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "shortcutappmodel.h"
-#include "hmi-debug.h"
-#include <unistd.h>
-#define SHORTCUTKEY_PATH "/var/local/lib/afm/applications/homescreen/0.1/etc/registeredApp.json"
-
-class ShortcutAppModel::Private
-{
-public:
-    Private();
-
-    QList<RegisterApp> data;
-};
-
-ShortcutAppModel::Private::Private()
-{
-}
-
-
-ShortcutAppModel::ShortcutAppModel(QObject *parent)
-    : QAbstractListModel(parent)
-    , d(new Private())
-{
-    getAppQueue();
-}
-
-ShortcutAppModel::~ShortcutAppModel()
-{
-    delete this->d;
-}
-
-int ShortcutAppModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid())
-        return 0;
-
-    return this->d->data.count();
-}
-
-QVariant ShortcutAppModel::data(const QModelIndex &index, int role) const
-{
-    QVariant ret;
-    if (!index.isValid())
-        return ret;
-
-    switch (role) {
-    case Qt::DecorationRole:
-        ret = this->d->data[index.row()].icon;
-        break;
-    case Qt::DisplayRole:
-        ret = this->d->data[index.row()].name;
-        break;
-    case Qt::UserRole:
-        ret = this->d->data[index.row()].id;
-        break;
-    default:
-        break;
-    }
-
-    return ret;
-}
-
-QHash<int, QByteArray> ShortcutAppModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[Qt::DecorationRole] = "icon";
-    roles[Qt::DisplayRole] = "name";
-    roles[Qt::UserRole] = "id";
-    return roles;
-}
-
-void ShortcutAppModel::changeShortcut(QString id, QString name, QString position)
-{
-    for(int i = 1; i < d->data.size(); i++) {
-        if(id == d->data.at(i).id) {
-            return;
-        }
-    }
-    d->data.removeAt(position.toInt() + 1);
-
-    RegisterApp temp;
-    temp.id = id;
-    temp.name = name;
-    temp.icon = temp.icon = getIconPath(temp.id);
-    if (temp.icon == "") {
-        temp.isBlank = true;
-    } else {
-        temp.isBlank = false;
-    }
-
-    d->data.insert(position.toInt() + 1, temp);
-    setAppQueue();
-    emit updateShortcut();
-    struct json_object* obj = makeAppListJson();
-    emit shortcutUpdated(QString("launcher"), obj);
-}
-
-struct json_object* ShortcutAppModel::makeAppListJson()
-{
-    struct json_object* obj = json_object_new_object();
-    struct json_object* obj_array = json_object_new_array();
-    for(int i = 1; i < d->data.size(); i++)
-    {
-        struct json_object* obj_shortcut = json_object_new_object();
-        json_object_object_add(obj_shortcut, "shortcut_id", json_object_new_string(d->data.at(i).id.toStdString().c_str()));
-        json_object_object_add(obj_shortcut, "shortcut_name", json_object_new_string(d->data.at(i).name.toStdString().c_str()));
-        json_object_array_add(obj_array, obj_shortcut);
-    }
-    json_object_object_add(obj, "shortcut", obj_array);
-    HMI_DEBUG("Homescreen", "makeAppListJson id1=%s",json_object_new_string(d->data.at(1).name.toStdString().c_str()));
-    return obj;
-}
-
-QString ShortcutAppModel::getId(int index) const
-{
-    return d->data.at(index).id;
-}
-
-QString ShortcutAppModel::getName(int index) const
-{
-    return d->data.at(index).name;
-}
-
-QString ShortcutAppModel::getIcon(int index) const
-{
-    return d->data.at(index).icon;
-}
-
-bool ShortcutAppModel::isBlank(int index) const
-{
-    return d->data.at(index).isBlank;
-}
-
-QString ShortcutAppModel::getIconPath(QString id)
-{
-    QString name = id.section('@', 0, 0);
-    QString version = id.section('@', 1, 1);
-    QString boardIconPath = "/var/local/lib/afm/applications/" + name + "/" + version + "/icon.svg";
-    QString appIconPath = ":/images/Shortcut/" + name + ".svg";
-    if (QFile::exists(boardIconPath)) {
-        return "file://" + boardIconPath;
-    } else if (QFile::exists(appIconPath)) {
-        return appIconPath.section('/', 1, -1);
-    }
-    return "";
-}
-
-void ShortcutAppModel::getAppQueue()
-{
-    QProcess *process = new QProcess(this);
-    if(checkAppFile()) {
-        process->start("cp /var/local/lib/afm/applications/homescreen/0.1/etc/registeredApp.aaa.json /var/local/lib/afm/applications/homescreen/0.1/etc/registeredApp.json");
-    } else {
-        process->start("cp /var/local/lib/afm/applications/homescreen/0.1/etc/registeredApp.json /var/local/lib/afm/applications/homescreen/0.1/etc/registeredApp.aaa.json");
-    }
-    QThread::msleep(300);
-
-    QFile file(SHORTCUTKEY_PATH);
-    if(file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        QByteArray allData = file.readAll();
-        QString str(allData);
-        if(str == "") {
-            file.close();
-
-        }
-        QJsonParseError json_error;
-        QJsonDocument jsonDoc(QJsonDocument::fromJson(allData, &json_error));
-
-        if(json_error.error != QJsonParseError::NoError)
-        {
-             HMI_ERROR("HomeScreen", "registeredApp.json error");
-             return;
-        }
-
-        QJsonObject rootObj = jsonDoc.object();
-
-        QJsonObject subObj = rootObj.value("1st shortcut key").toObject();
-        setAppQueuePoint(subObj["id"].toString(), subObj["name"].toString());
-        subObj = rootObj.value("2nd shortcut key").toObject();
-        setAppQueuePoint(subObj["id"].toString(), subObj["name"].toString());
-        subObj = rootObj.value("3rd shortcut key").toObject();
-        setAppQueuePoint(subObj["id"].toString(), subObj["name"].toString());
-        subObj = rootObj.value("4th shortcut key").toObject();
-        setAppQueuePoint(subObj["id"].toString(), subObj["name"].toString());
-    }
-    file.close();
-}
-
-void ShortcutAppModel::setAppQueuePoint(QString id, QString name)
-{
-    app.id = id;
-    app.icon = getIconPath(app.id);
-    if (app.icon == "") {
-        app.isBlank = true;
-    } else {
-        app.isBlank = false;
-    }
-    app.name = name;
-    d->data.append(app);
-}
-
-void ShortcutAppModel::screenUpdated()
-{
-    struct json_object* obj = makeAppListJson();
-    emit shortcutUpdated(QString("launcher"), obj);
-}
-
-void ShortcutAppModel::setAppQueue()
-{
-    QFile file(SHORTCUTKEY_PATH);
-    if(file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        QJsonObject rootObj, subObj1, subObj2, subObj3, subObj4;
-        subObj1.insert("id", d->data.at(0).id);
-        subObj1.insert("name", d->data.at(0).name);
-        subObj2.insert("id", d->data.at(1).id);
-        subObj2.insert("name", d->data.at(1).name);
-        subObj3.insert("id", d->data.at(2).id);
-        subObj3.insert("name", d->data.at(2).name);
-        subObj4.insert("id", d->data.at(3).id);
-        subObj4.insert("name", d->data.at(3).name);
-        rootObj.insert("1st shortcut key", subObj1);
-        rootObj.insert("2nd shortcut key", subObj2);
-        rootObj.insert("3rd shortcut key", subObj3);
-        rootObj.insert("4th shortcut key", subObj4);
-
-        QJsonDocument jsonDoc;
-        jsonDoc.setObject(rootObj);
-
-        file.write(jsonDoc.toJson());
-    } else {
-        HMI_ERROR("HomeScreen", "write to registeredApp.json file failed");
-    }
-    file.flush();
-    fsync(file.handle());
-    file.close();
-}
-
-bool ShortcutAppModel::checkAppFile()
-{
-    bool fileError = false;
-    QFile file(SHORTCUTKEY_PATH);
-    if(file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        QByteArray line = file.readLine();
-        if(line == "\n" || line.isEmpty()) {
-            fileError = true;
-        }
-    } else {
-        fileError = true;
-        HMI_ERROR("HomeScreen", "registeredApp.json file open failed");
-    }
-    file.close();
-    return fileError;
-}
diff --git a/homescreen/src/shortcutappmodel.h b/homescreen/src/shortcutappmodel.h
deleted file mode 100644 (file)
index f177a95..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef SHORTCUTAPPMODEL_H
-#define SHORTCUTAPPMODEL_H
-
-#include <QtCore/QAbstractListModel>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QFile>
-#include <QProcess>
-#include <QThread>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonObject>
-#include <json_object.h>
-
-struct RegisterApp {
-    QString id;
-    QString name;
-    QString icon;
-    bool isBlank;
-};
-
-class ShortcutAppModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    explicit ShortcutAppModel(QObject *parent = nullptr);
-    ~ShortcutAppModel();
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-    Q_INVOKABLE QString getId(int index) const;
-    Q_INVOKABLE QString getName(int index) const;
-    Q_INVOKABLE QString getIcon(int index) const;
-    Q_INVOKABLE bool isBlank(int index) const;
-
-    void screenUpdated();
-
-public slots:
-    void changeShortcut(QString id, QString name, QString position);
-
-signals:
-    void updateShortcut();
-    void shortcutUpdated(QString id, struct json_object* object);
-
-private:
-    void getAppQueue();
-    void setAppQueue();
-    bool checkAppFile();
-    void setAppQueuePoint(QString id, QString name);
-    QString getIconPath(QString id);
-    struct json_object* makeAppListJson();
-
-    class Private;
-    Private *d;
-    RegisterApp app;
-
-};
-
-#endif // SHORTCUTAPPMODEL_H
index 5e63b7d..c093ceb 100644 (file)
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2017, 2018 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 
 #include "statusbarmodel.h"
 #include "statusbarserver.h"
+#include <QDebug>
+#include "hmi-debug.h"
 
 #include <QtDBus/QDBusConnection>
 
 #include "network.h"
 
+
 class StatusBarModel::Private
 {
 public:
@@ -65,6 +67,7 @@ StatusBarModel::~StatusBarModel()
 
 void StatusBarModel::init(QUrl &url, QQmlContext *context)
 {
+    HMI_DEBUG("HomeScreen", "StatusBarModel::init");
     d->network = new Network(url, context);
     context->setContextProperty("network", d->network);
 
@@ -77,6 +80,7 @@ void StatusBarModel::init(QUrl &url, QQmlContext *context)
 
 void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
 {
+    HMI_DEBUG("HomeScreen", "StatusBarModel::setWifiStatus");
     if (enabled && connected)
         if (strength < 30)
             d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_1Bar-01.png"));
@@ -111,7 +115,6 @@ int StatusBarModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid())
         return 0;
 
-    // Delete bluetooth because use agl-service-bluetooth.
     return StatusBarServer::SupportedCount - 1;
 }
 
@@ -123,9 +126,9 @@ QVariant StatusBarModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Qt::DisplayRole:
-        if (index.row() == 0){
+        if (index.row() == 0) {
             ret = d->iconList[StatusBarServer::StatusWifi];
-        }else if (index.row() == 1){
+        } else if (index.row() == 1) {
             ret = d->iconList[StatusBarServer::StatusCellular];
         }
         break;
index 1cf4384..aad4b1b 100644 (file)
@@ -1,5 +1,4 @@
 #include "toucharea.h"
-#include "hmi-debug.h"
 
 TouchArea::TouchArea()
 {
@@ -17,8 +16,8 @@ void TouchArea::setWindow(QQuickWindow *window)
 
 void TouchArea::init()
 {
-    bitmapNormal = QPixmap(":/images/AGL_HMI_Normal_Background.png").createHeuristicMask();
-    bitmapFullscreen = QPixmap(":/images/AGL_HMI_Full_Background.png").createHeuristicMask();
+    bitmapNormal = QPixmap(":/images/menubar_normal_background.png").createHeuristicMask();
+    bitmapFullscreen = QPixmap(":/images/menubar_full_background.png").createHeuristicMask();
     myWindow->setMask(QRegion(bitmapNormal));
 }
 
@@ -26,9 +25,7 @@ void TouchArea::switchArea(int areaType)
 {
     if(areaType == NORMAL) {
         myWindow->setMask(QRegion(bitmapNormal));
-        HMI_DEBUG("HomeScreen","TouchArea switchArea: %d.", areaType);
     } else if (areaType == FULLSCREEN) {
-        HMI_DEBUG("HomeScreen","TouchArea switchArea: %d.", areaType);
         myWindow->setMask(QRegion(bitmapFullscreen));
     }
 }
index d1e83eb..32d19fd 100644 (file)
     <param name="weather" value="ws" />
     <param name="Bluetooth-Manager" value="ws" />
     <param name="windowmanager" value="ws" />
-    <param name="ahl-4a" value="ws" />
   </feature>
   <feature name="urn:AGL:widget:required-permission">
     <param name="urn:AGL:permission::public:no-htdocs" value="required" />
+    <param name="urn:AGL:permission::system:run-by-default" value="required" />
     <param name="http://tizen.org/privilege/internal/dbus" value="required" />
-    <param name="urn:AGL:permission::public:4a-audio-mixer" value="required" />
   </feature>
 </widget>
diff --git a/package/etc/registeredApp.aaa.json b/package/etc/registeredApp.aaa.json
deleted file mode 100644 (file)
index 490b33c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-       "1st shortcut key": {
-               "id": "launcher@0.1",
-               "name": "launcher"
-       },
-       "2nd shortcut key": {
-               "id": "sdl_usb@5.0",
-               "name": "sdl_usb"
-       },
-       "3rd shortcut key": {
-               "id": "video@0.1",
-               "name": "video"
-       },
-       "4th shortcut key": {
-               "id": "navigation@0.1",
-               "name": "navigation"
-       }
-}
diff --git a/package/etc/registeredApp.json b/package/etc/registeredApp.json
deleted file mode 100644 (file)
index 490b33c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-       "1st shortcut key": {
-               "id": "launcher@0.1",
-               "name": "launcher"
-       },
-       "2nd shortcut key": {
-               "id": "sdl_usb@5.0",
-               "name": "sdl_usb"
-       },
-       "3rd shortcut key": {
-               "id": "video@0.1",
-               "name": "video"
-       },
-       "4th shortcut key": {
-               "id": "navigation@0.1",
-               "name": "navigation"
-       }
-}
index 1f175d3..09c7a01 100644 (file)
@@ -12,12 +12,6 @@ copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_
 QMAKE_EXTRA_TARGETS += copy_config
 PRE_TARGETDEPS += $$copy_config.target
 
-copy_json.target = $$OUT_PWD/root/etc
-copy_json.depends = $$_PRO_FILE_PWD_/etc
-copy_json.commands = $(COPY_DIR) \"$$replace(copy_json.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_json.target, /, $$QMAKE_DIR_SEP)\"
-QMAKE_EXTRA_TARGETS += copy_json
-PRE_TARGETDEPS += $$copy_json.target
-
 wgt.target = package
 wgt.commands = wgtpkg-pack -f -o homescreen.wgt root