From fd598de2c48a9fcc0e13b5574c3da0b5b6edf407 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 20 Dec 2021 15:07:34 -0500
Subject: [PATCH] Add .desktop and icon file installation

Add initial .desktop file and icon copied from the launcher source
tree, and updated .pro files to install them.  Also removed potentially
confusing use of non-existent $$PREFIX variable.

Bug-AGL: SPEC-4182

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ic84c43d4871002131f982c3054a9ee6f475e649d
---
 app/app.pro              |   2 +-
 package/icon.svg         | 283 -----------------------------------------------
 package/package.pro      |  31 ++----
 package/settings.desktop |  11 ++
 package/settings.svg     | 114 +++++++++++++++++++
 settings.pro             |   2 +-
 6 files changed, 135 insertions(+), 308 deletions(-)
 delete mode 100644 package/icon.svg
 create mode 100644 package/settings.desktop
 create mode 100644 package/settings.svg

diff --git a/app/app.pro b/app/app.pro
index 3a14c80..0b2eab7 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -16,7 +16,7 @@ RESOURCES += \
     bluetooth/bluetooth.qrc \
     version/version.qrc
 
-target.path = $${PREFIX}/usr/bin
+target.path = /usr/bin
 target.files += $${OUT_PWD}/$${TARGET}
 target.CONFIG = no_check_exist executable
 
diff --git a/package/icon.svg b/package/icon.svg
deleted file mode 100644
index 6628784..0000000
--- a/package/icon.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 320 320"
-   style="enable-background:new 0 0 320 320;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="icon.svg"><metadata
-     id="metadata1292"><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="defs1290" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1464"
-     id="namedview1288"
-     showgrid="false"
-     inkscape:zoom="0.7375"
-     inkscape:cx="-697.62712"
-     inkscape:cy="160"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{opacity:0.4;fill:url(#SVGID_1_);}
-	.st3{fill:url(#SVGID_2_);}
-	.st4{fill:#FFFFFF;}
-	.st5{font-family:'Roboto-Regular';}
-	.st6{font-size:25px;}
-	.st7{letter-spacing:6;}
-	.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_);}
-	.st22{fill:url(#SVGID_17_);}
-	.st23{fill:url(#SVGID_18_);}
-	.st24{opacity:0.29;}
-	.st25{fill:url(#SVGID_19_);}
-	.st26{fill:url(#SVGID_20_);}
-	.st27{fill:url(#SVGID_21_);}
-	.st28{fill:url(#SVGID_22_);}
-	.st29{fill:url(#SVGID_23_);}
-	.st30{fill:url(#SVGID_24_);}
-	.st31{fill:url(#SVGID_25_);}
-	.st32{fill:url(#SVGID_26_);}
-	.st33{fill:url(#SVGID_27_);}
-	.st34{fill:url(#SVGID_28_);}
-	.st35{fill:url(#SVGID_29_);}
-	.st36{fill:url(#SVGID_30_);}
-	.st37{fill:url(#SVGID_31_);}
-	.st38{fill:url(#SVGID_32_);}
-	.st39{fill:url(#SVGID_33_);}
-	.st40{fill:url(#SVGID_34_);}
-	.st41{fill:url(#SVGID_35_);}
-	.st42{fill:url(#SVGID_36_);}
-	.st43{opacity:0.4;fill:url(#SVGID_37_);}
-	.st44{fill:url(#SVGID_38_);}
-	.st45{fill:url(#SVGID_39_);}
-	.st46{fill:url(#SVGID_40_);}
-	.st47{fill:url(#SVGID_41_);}
-	.st48{fill:url(#SVGID_42_);}
-	.st49{fill:url(#SVGID_43_);}
-	.st50{fill:url(#SVGID_44_);}
-	.st51{display:inline;opacity:0.29;}
-	.st52{display:inline;fill:url(#SVGID_45_);}
-	.st53{display:inline;fill:url(#SVGID_46_);}
-	.st54{display:inline;fill:#FFFFFF;}
-	.st55{display:inline;fill:url(#SVGID_47_);}
-	.st56{display:inline;fill:url(#SVGID_48_);}
-	.st57{display:inline;fill:url(#SVGID_49_);}
-	.st58{display:inline;fill:url(#SVGID_50_);}
-	.st59{display:inline;fill:url(#SVGID_51_);}
-	.st60{display:inline;fill:url(#SVGID_52_);}
-	.st61{opacity:0.4;fill:url(#SVGID_53_);}
-	.st62{fill:url(#SVGID_54_);}
-	.st63{fill:url(#SVGID_55_);}
-	.st64{fill:url(#SVGID_56_);}
-	.st65{fill:url(#SVGID_57_);}
-	.st66{fill:url(#SVGID_58_);}
-	.st67{opacity:0.4;fill:url(#SVGID_59_);}
-	.st68{fill:url(#SVGID_60_);}
-	.st69{fill:url(#SVGID_61_);}
-	.st70{fill:url(#SVGID_62_);}
-	.st71{fill:url(#SVGID_63_);}
-	.st72{fill:url(#SVGID_64_);}
-	.st73{fill:url(#SVGID_65_);}
-	.st74{fill:url(#SVGID_66_);}
-	.st75{fill:url(#SVGID_67_);}
-	.st76{fill:url(#SVGID_68_);}
-	.st77{fill:url(#SVGID_69_);}
-	.st78{fill:url(#SVGID_70_);}
-	.st79{fill:url(#SVGID_71_);}
-	.st80{fill:url(#SVGID_72_);}
-	.st81{fill:url(#SVGID_73_);}
-	.st82{fill:url(#SVGID_74_);}
-	.st83{fill:url(#SVGID_75_);}
-	.st84{fill:url(#SVGID_76_);}
-	.st85{fill:url(#SVGID_77_);}
-	.st86{fill:url(#SVGID_78_);}
-	.st87{fill:url(#SVGID_79_);}
-	.st88{fill:url(#SVGID_80_);}
-	.st89{fill:url(#SVGID_81_);}
-	.st90{fill:url(#SVGID_82_);}
-	.st91{fill:url(#SVGID_83_);}
-	.st92{fill:url(#SVGID_84_);}
-	.st93{fill:url(#SVGID_85_);}
-	.st94{fill:url(#SVGID_86_);}
-	.st95{opacity:0.4;fill:url(#SVGID_87_);}
-	.st96{fill:url(#SVGID_88_);}
-	.st97{fill:url(#SVGID_89_);}
-	.st98{fill:url(#SVGID_90_);}
-	.st99{display:inline;fill:url(#SVGID_91_);}
-	.st100{display:inline;fill:url(#SVGID_92_);}
-	.st101{fill:url(#SVGID_93_);}
-	.st102{fill:url(#SVGID_94_);}
-	.st103{opacity:0.4;fill:url(#SVGID_95_);}
-	.st104{fill:url(#SVGID_96_);}
-	.st105{fill:url(#SVGID_97_);}
-	.st106{fill:url(#SVGID_98_);}
-	.st107{fill:url(#SVGID_99_);}
-	.st108{fill:url(#SVGID_100_);}
-	.st109{fill:url(#SVGID_101_);}
-	.st110{display:inline;fill:url(#SVGID_102_);}
-	.st111{display:inline;fill:url(#SVGID_103_);}
-	.st112{fill:url(#SVGID_104_);}
-	.st113{fill:url(#SVGID_105_);}
-	.st114{fill:url(#SVGID_106_);}
-	.st115{fill:url(#SVGID_107_);}
-	.st116{fill:url(#SVGID_108_);}
-	.st117{opacity:0.4;fill:url(#SVGID_109_);}
-	.st118{fill:url(#SVGID_110_);}
-	.st119{fill:url(#SVGID_111_);}
-	.st120{fill:url(#SVGID_112_);}
-	.st121{fill:url(#SVGID_113_);}
-	.st122{fill:url(#SVGID_114_);}
-	.st123{opacity:0.4;fill:url(#SVGID_115_);}
-	.st124{fill:url(#SVGID_116_);}
-	.st125{fill:url(#SVGID_117_);}
-	.st126{fill:url(#SVGID_118_);}
-	.st127{fill:url(#SVGID_119_);}
-	.st128{fill:url(#SVGID_120_);}
-	.st129{fill:url(#SVGID_121_);}
-	.st130{fill:url(#SVGID_122_);}
-</style><switch
-     id="switch6"><g
-       i:extraneous="self"
-       id="g8"><g
-         id="Settings_Active"><circle
-           class="st24"
-           cx="159.7"
-           cy="133.4"
-           r="101.9"
-           id="circle1230" /><linearGradient
-           id="SVGID_119_"
-           gradientUnits="userSpaceOnUse"
-           x1="115.9317"
-           y1="254.1836"
-           x2="256.3852"
-           y2="-133.5267"><stop
-             offset="0"
-             style="stop-color:#8BC53F"
-             id="stop1233" /><stop
-             offset="2.015080e-02"
-             style="stop-color:#7CCB56;stop-opacity:0.9678"
-             id="stop1235" /><stop
-             offset="6.089833e-02"
-             style="stop-color:#62D67D;stop-opacity:0.9028"
-             id="stop1237" /><stop
-             offset="0.1057"
-             style="stop-color:#4BDFA0;stop-opacity:0.8312"
-             id="stop1239" /><stop
-             offset="0.1543"
-             style="stop-color:#38E7BE;stop-opacity:0.7537"
-             id="stop1241" /><stop
-             offset="0.2077"
-             style="stop-color:#28EED6;stop-opacity:0.6684"
-             id="stop1243" /><stop
-             offset="0.2681"
-             style="stop-color:#1CF3E8;stop-opacity:0.572"
-             id="stop1245" /><stop
-             offset="0.3394"
-             style="stop-color:#13F6F5;stop-opacity:0.4581"
-             id="stop1247" /><stop
-             offset="0.4323"
-             style="stop-color:#0EF8FD;stop-opacity:0.3098"
-             id="stop1249" /><stop
-             offset="0.6264"
-             style="stop-color:#0DF9FF;stop-opacity:0"
-             id="stop1251" /></linearGradient><circle
-           class="st127"
-           cx="159.7"
-           cy="133.4"
-           r="101.9"
-           id="circle1253" /><linearGradient
-           id="SVGID_120_"
-           gradientUnits="userSpaceOnUse"
-           x1="4.0481"
-           y1="287.9492"
-           x2="320.4859"
-           y2="-15.4029"
-           gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
-             offset="0"
-             style="stop-color:#59FF7F"
-             id="stop1256" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop1258" /></linearGradient><path
-           class="st128"
-           d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5     c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2     c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9     c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
-           id="path1260" /><g
-           id="g1262"><text
-             transform="matrix(1 0 0 1 75.4379 284.7129)"
-             class="st4 st5 st6 st7"
-             id="text1264">SETTINGS</text>
-<g
-             id="g1266"><g
-               id="g1268"><g
-                 id="g1270"><linearGradient
-                   id="SVGID_121_"
-                   gradientUnits="userSpaceOnUse"
-                   x1="79.1804"
-                   y1="226.0817"
-                   x2="282.752"
-                   y2="-4.8609"><stop
-                     offset="0"
-                     style="stop-color:#59FF7F"
-                     id="stop1273" /><stop
-                     offset="1"
-                     style="stop-color:#6BFBFF"
-                     id="stop1275" /></linearGradient><path
-                   class="st129"
-                   d="M159.9,163.9c-16.3,0-29.5-13.2-29.5-29.4s13.2-29.4,29.5-29.4v3.9c-14.1,0-25.5,11.4-25.5,25.5         c0,14,11.5,25.5,25.5,25.5c14.1,0,25.6-11.4,25.6-25.5h3.9C189.4,150.7,176.2,163.9,159.9,163.9z"
-                   id="path1277" /></g><g
-                 id="g1279"><linearGradient
-                   id="SVGID_122_"
-                   gradientUnits="userSpaceOnUse"
-                   x1="79.2457"
-                   y1="226.1393"
-                   x2="282.8174"
-                   y2="-4.8033"><stop
-                     offset="0"
-                     style="stop-color:#59FF7F"
-                     id="stop1282" /><stop
-                     offset="1"
-                     style="stop-color:#6BFBFF"
-                     id="stop1284" /></linearGradient><path
-                   class="st130"
-                   d="M171.7,197.4h-23.4c-2.2,0-4-1.8-4-3.9V181c-2-0.7-4-1.5-6-2.5l-8.8,8.8c-1.5,1.5-4,1.5-5.6-0.1         l-16.6-16.6c-1.6-1.6-1.6-4.1-0.1-5.6l8.7-8.7c-1-2-1.8-4-2.5-6.1h-12.3c-2.2,0-3.9-1.8-3.9-4v-23.4c0-2.2,1.8-4,3.9-4h12.3         c0.9-2.6,1.9-5.1,3.2-7.4l3.5,1.8c-1.4,2.6-2.5,5.3-3.4,8.1l-0.4,1.4h-15.2l0,23.5l15.2,0.1l0.4,1.4c0.9,2.8,2,5.5,3.4,8         l0.7,1.3L110,167.8l16.6,16.6l10.9-10.8l1.3,0.7c2.6,1.4,5.2,2.5,8,3.3l1.4,0.4v15.4l23.5,0l0.1-15.4l1.4-0.4         c2.7-0.8,5.4-1.9,7.9-3.3l1.3-0.7l10.9,10.9l16.6-16.6l-10.8-11l0.7-1.3c1.4-2.6,2.5-5.2,3.3-7.9l0.4-1.4h15.4l0-23.5         l-15.3-0.1l-0.4-1.4c-0.8-2.8-1.9-5.5-3.3-8l-0.7-1.3l10.8-10.8l-16.6-16.6l-10.8,10.7l-1.3-0.7c-2.6-1.4-5.3-2.5-8.1-3.4         l-1.4-0.4V75.6l-23.5,0l-0.1,15.1l-1.4,0.4c-2.8,0.9-5.6,2-8.1,3.4l-1.3,0.7l-10.7-10.7L107.2,104c-1.5-1.5-1.5-4,0.1-5.6         l16.5-16.5c0.8-0.8,1.8-1.3,2.9-1.2c1,0,2,0.4,2.7,1.1l8.7,8.6c2-1,4-1.8,6.2-2.5V75.6c0-2.2,1.8-3.9,4-3.9h23.4         c2.2,0,4,1.8,4,3.9v12.3c2.1,0.7,4.1,1.6,6.1,2.5l8.7-8.7c0.7-0.7,1.7-1.1,2.7-1.1h0c1.1,0,2.1,0.4,2.9,1.2l16.6,16.6         c0.8,0.8,1.2,1.8,1.2,2.9c0,1-0.4,2-1.1,2.7l-8.8,8.8c1,2,1.8,4,2.5,6h12.4c2.2,0,3.9,1.8,3.9,4v23.4c0,2.2-1.8,4-3.9,4         h-12.5c-0.7,2-1.5,4-2.5,6l8.9,8.9c1.5,1.5,1.5,4-0.1,5.6l-16.6,16.6c-0.8,0.8-1.8,1.2-2.9,1.2h0c-1,0-2-0.4-2.7-1.1         l-8.9-8.9c-1.9,1-3.9,1.8-5.9,2.5v12.5C175.7,195.6,173.9,197.4,171.7,197.4z"
-                   id="path1286" /></g></g></g></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/package/package.pro b/package/package.pro
index 495dc40..8214677 100644
--- a/package/package.pro
+++ b/package/package.pro
@@ -1,26 +1,11 @@
+TEMPLATE = aux
 
-DISTFILES = icon.svg config.xml
+icon.path = /usr/share/icons/hicolor/scalable
+icon.files += $$_PRO_FILE_PWD_/settings.svg
+icon.CONFIG = no_check_exist
 
-!equals($$_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_icon.target = $$OUT_PWD/root/icon.svg
-    copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg
-    copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_icon
-    PRE_TARGETDEPS += $$copy_icon.target
+desktop.path = /usr/share/applications
+desktop.files = $$_PRO_FILE_PWD_/settings.desktop
+desktop.CONFIG = no_check_exist
 
-    copy_config.target = $$OUT_PWD/root/config.xml
-    copy_config.depends = $$_PRO_FILE_PWD_/config.xml
-    copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_config
-    PRE_TARGETDEPS += $$copy_config.target
-}
-
-WGT_TYPE =
-CONFIG(debug, debug|release) {
-    WGT_TYPE = -debug
-}
-
-wgt.target = package
-wgt.commands = wgtpkg-pack -f -o settings$${WGT_TYPE}.wgt root
-
-QMAKE_EXTRA_TARGETS += wgt
+INSTALLS += desktop icon
diff --git a/package/settings.desktop b/package/settings.desktop
new file mode 100644
index 0000000..21516d4
--- /dev/null
+++ b/package/settings.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Settings
+Comment=Settings
+GenericName=Settings
+Exec=settings
+Icon=settings
+Terminal=false
+Type=Application
+Categories=System;
+StartupNotify=true
diff --git a/package/settings.svg b/package/settings.svg
new file mode 100644
index 0000000..882e3c4
--- /dev/null
+++ b/package/settings.svg
@@ -0,0 +1,114 @@
+<?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="Settings_Inactive_1_"
+   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="settings_inactive.svg"><metadata
+     id="metadata5617"><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="defs5615" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1421"
+     inkscape:window-height="786"
+     id="namedview5613"
+     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="Settings_Inactive_1_" /><style
+     type="text/css"
+     id="style5578">
+	.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="switch5580"
+     transform="matrix(1.3307804,0,0,1.3314313,-62.924861,-27.945794)"><g
+       i:extraneous="self"
+       id="g5582"><g
+         id="g5584"><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="stop5587" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop5589" /></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="path5591"
+           style="fill:url(#SVGID_1_)"
+           inkscape:connector-curvature="0" /><g
+           id="g5593"><g
+             id="g5595"><linearGradient
+               id="SVGID_2_"
+               gradientUnits="userSpaceOnUse"
+               x1="79.180397"
+               y1="226.0817"
+               x2="282.75201"
+               y2="-4.8608999"><stop
+                 offset="0"
+                 style="stop-color:#00ADDC"
+                 id="stop5598" /><stop
+                 offset="1"
+                 style="stop-color:#6BFBFF"
+                 id="stop5600" /></linearGradient><path
+               class="st5"
+               d="m 159.9,163.9 c -16.3,0 -29.5,-13.2 -29.5,-29.4 0,-16.2 13.2,-29.4 29.5,-29.4 l 0,3.9 c -14.1,0 -25.5,11.4 -25.5,25.5 0,14 11.5,25.5 25.5,25.5 14.1,0 25.6,-11.4 25.6,-25.5 l 3.9,0 c 0,16.2 -13.2,29.4 -29.5,29.4 z"
+               id="path5602"
+               style="fill:url(#SVGID_2_)"
+               inkscape:connector-curvature="0" /></g><g
+             id="g5604"><linearGradient
+               id="SVGID_3_"
+               gradientUnits="userSpaceOnUse"
+               x1="79.245697"
+               y1="226.1393"
+               x2="282.81741"
+               y2="-4.8032999"><stop
+                 offset="0"
+                 style="stop-color:#00ADDC"
+                 id="stop5607" /><stop
+                 offset="1"
+                 style="stop-color:#6BFBFF"
+                 id="stop5609" /></linearGradient><path
+               class="st6"
+               d="m 171.7,197.3 -23.4,0 c -2.2,0 -4,-1.8 -4,-3.9 l 0,-12.4 c -2,-0.7 -4,-1.5 -6,-2.5 l -8.8,8.8 c -1.5,1.5 -4,1.5 -5.6,-0.1 l -16.6,-16.6 c -1.6,-1.6 -1.6,-4.1 -0.1,-5.6 l 8.7,-8.7 c -1,-2 -1.8,-4 -2.5,-6.1 l -12.3,0 c -2.2,0 -3.9,-1.8 -3.9,-4 l 0,-23.4 c 0,-2.2 1.8,-4 3.9,-4 l 12.3,0 c 0.9,-2.6 1.9,-5.1 3.2,-7.4 l 3.5,1.8 c -1.4,2.6 -2.5,5.3 -3.4,8.1 l -0.4,1.4 -15.2,0 0,23.5 15.2,0.1 0.4,1.4 c 0.9,2.8 2,5.5 3.4,8 l 0.7,1.3 -10.8,10.8 16.6,16.6 10.9,-10.8 1.3,0.7 c 2.6,1.4 5.2,2.5 8,3.3 l 1.4,0.4 0,15.4 23.5,0 0.1,-15.4 1.4,-0.4 c 2.7,-0.8 5.4,-1.9 7.9,-3.3 l 1.3,-0.7 10.9,10.9 16.6,-16.6 -10.8,-11 0.7,-1.3 c 1.4,-2.6 2.5,-5.2 3.3,-7.9 l 0.4,-1.4 15.4,0 0,-23.5 -15.3,-0.1 -0.4,-1.4 c -0.8,-2.8 -1.9,-5.5 -3.3,-8 L 199.2,112 210,101.2 193.4,84.6 182.6,95.3 181.3,94.6 c -2.6,-1.4 -5.3,-2.5 -8.1,-3.4 l -1.4,-0.4 0,-15.2 -23.5,0 -0.1,15.1 -1.4,0.4 c -2.8,0.9 -5.6,2 -8.1,3.4 l -1.3,0.7 -10.7,-10.7 -19.5,19.5 c -1.5,-1.5 -1.5,-4 0.1,-5.6 l 16.5,-16.5 c 0.8,-0.8 1.8,-1.3 2.9,-1.2 1,0 2,0.4 2.7,1.1 l 8.7,8.6 c 2,-1 4,-1.8 6.2,-2.5 l 0,-12.3 c 0,-2.2 1.8,-3.9 4,-3.9 l 23.4,0 c 2.2,0 4,1.8 4,3.9 l 0,12.3 c 2.1,0.7 4.1,1.6 6.1,2.5 l 8.7,-8.7 c 0.7,-0.7 1.7,-1.1 2.7,-1.1 l 0,0 c 1.1,0 2.1,0.4 2.9,1.2 l 16.6,16.6 c 0.8,0.8 1.2,1.8 1.2,2.9 0,1 -0.4,2 -1.1,2.7 l -8.8,8.8 c 1,2 1.8,4 2.5,6 l 12.4,0 c 2.2,0 3.9,1.8 3.9,4 l 0,23.4 c 0,2.2 -1.8,4 -3.9,4 l -12.5,0 c -0.7,2 -1.5,4 -2.5,6 l 8.9,8.9 c 1.5,1.5 1.5,4 -0.1,5.6 l -16.6,16.6 c -0.8,0.8 -1.8,1.2 -2.9,1.2 l 0,0 c -1,0 -2,-0.4 -2.7,-1.1 l -8.9,-8.9 c -1.9,1 -3.9,1.8 -5.9,2.5 l 0,12.5 c 0,2.1 -1.8,3.8 -4,3.8 z"
+               id="path5611"
+               style="fill:url(#SVGID_3_)"
+               inkscape:connector-curvature="0" /></g></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/settings.pro b/settings.pro
index 5cf7e78..e6d6e34 100644
--- a/settings.pro
+++ b/settings.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = app
+SUBDIRS = app package
-- 
2.16.6