From 63dc51c35d26c837295ac0ef33c1b8e41353ea35 Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Wed, 27 Jun 2018 17:30:37 +0200
Subject: Merge 'eel' into 'master'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace content from 'master' by content from 'eel' as it's the new
version based on 4a on which new development will be done.

Change-Id: I2966af7dcee59701ff3a344487c008d7e65e68ed
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 package/config.xml  |  18 ---
 package/icon.svg    | 439 ----------------------------------------------------
 package/package.pro |  19 ---
 3 files changed, 476 deletions(-)
 delete mode 100644 package/config.xml
 delete mode 100644 package/icon.svg
 delete mode 100644 package/package.pro

(limited to 'package')

diff --git a/package/config.xml b/package/config.xml
deleted file mode 100644
index bee25a0..0000000
--- a/package/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="mixer" version="0.1">
-  <name>Mixer</name>
-  <icon src="icon.svg"/>
-  <content src="bin/mixer" type="application/vnd.agl.native"/>
-  <description>Simple PulseAudio mixer app</description>
-  <author>Matt Porter &lt;mporter@konsulko.com&gt;</author>
-  <license>APL 2.0</license>
-  <feature name="urn:AGL:widget:required-api">
-    <param name="windowmanager" value="ws" />
-    <param name="homescreen" value="ws" />
-  </feature>
-  <feature name="urn:AGL:widget:required-permission">
-    <param name="urn:AGL:permission::public:no-htdocs" value="required" />
-  </feature>
-</widget>
-
-
diff --git a/package/icon.svg b/package/icon.svg
deleted file mode 100644
index 85f7384..0000000
--- a/package/icon.svg
+++ /dev/null
@@ -1,439 +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: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"
-   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="mixer.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 /></cc:Work></rdf:RDF></metadata><defs
-     id="defs1290"><linearGradient
-       y2="-133.5267"
-       x2="256.38519"
-       y1="254.18359"
-       x1="115.9317"
-       gradientUnits="userSpaceOnUse"
-       id="SVGID_91_"><stop
-         id="stop887"
-         style="stop-color:#8BC53F"
-         offset="0" /><stop
-         id="stop889"
-         style="stop-color:#7CCB56;stop-opacity:0.9678"
-         offset="2.015080e-02" /><stop
-         id="stop891"
-         style="stop-color:#62D67D;stop-opacity:0.9028"
-         offset="6.089833e-02" /><stop
-         id="stop893"
-         style="stop-color:#4BDFA0;stop-opacity:0.8312"
-         offset="0.1057" /><stop
-         id="stop895"
-         style="stop-color:#38E7BE;stop-opacity:0.7537"
-         offset="0.1543" /><stop
-         id="stop897"
-         style="stop-color:#28EED6;stop-opacity:0.6684"
-         offset="0.2077" /><stop
-         id="stop899"
-         style="stop-color:#1CF3E8;stop-opacity:0.572"
-         offset="0.2681" /><stop
-         id="stop901"
-         style="stop-color:#13F6F5;stop-opacity:0.4581"
-         offset="0.3394" /><stop
-         id="stop903"
-         style="stop-color:#0EF8FD;stop-opacity:0.3098"
-         offset="0.4323" /><stop
-         id="stop905"
-         style="stop-color:#0DF9FF;stop-opacity:0"
-         offset="0.6264" /></linearGradient><linearGradient
-       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)"
-       y2="-15.4029"
-       x2="320.4859"
-       y1="287.94919"
-       x1="4.0481"
-       gradientUnits="userSpaceOnUse"
-       id="SVGID_92_"><stop
-         id="stop910"
-         style="stop-color:#59FF7F"
-         offset="0" /><stop
-         id="stop912"
-         style="stop-color:#6BFBFF"
-         offset="1" /></linearGradient><linearGradient
-       id="SVGID_93_"
-       gradientUnits="userSpaceOnUse"
-       x1="140.54449"
-       y1="202.2363"
-       x2="186.84441"
-       y2="68.704903"><stop
-         offset="0"
-         style="stop-color:#59FF7F"
-         id="stop921" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop923" /></linearGradient><linearGradient
-       id="SVGID_94_"
-       gradientUnits="userSpaceOnUse"
-       x1="145.3286"
-       y1="203.8951"
-       x2="191.62849"
-       y2="70.363701"><stop
-         offset="0"
-         style="stop-color:#59FF7F"
-         id="stop928" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop930" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="14.498512"
-       y1="-87.290771"
-       x2="14.498512"
-       y2="27.70923" /><linearGradient
-       id="SVGID_93_-3"
-       gradientUnits="userSpaceOnUse"
-       x1="140.54449"
-       y1="202.2363"
-       x2="186.84441"
-       y2="68.704903"
-       gradientTransform="translate(-143.56916,1.357882)"><stop
-         offset="0"
-         style="stop-color:#59FF7F"
-         id="stop921-6" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop923-7" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4844"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="14.498512"
-       y1="-87.290771"
-       x2="14.498512"
-       y2="27.70923" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5677"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient5681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1581339,0,0,1,141.23137,164.38048)"
-       x1="-21.109684"
-       y1="-29.642464"
-       x2="50.744526"
-       y2="-29.642464" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4191"
-       x1="116.82286"
-       y1="115.31003"
-       x2="139.46107"
-       y2="115.31003"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4199"
-       x1="136.32275"
-       y1="171.31003"
-       x2="158.96097"
-       y2="171.31003"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4207"
-       x1="156.32275"
-       y1="89.810028"
-       x2="178.96097"
-       y2="89.810028"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#SVGID_93_-3"
-       id="linearGradient4215"
-       x1="177.32275"
-       y1="138.31003"
-       x2="199.96097"
-       y2="138.31003"
-       gradientUnits="userSpaceOnUse" /></defs><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="1440"
-     id="namedview1288"
-     showgrid="false"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-46.791657"
-     inkscape:cy="160"
-     inkscape:window-x="2560"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     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{fill:url(#SVGID_91_);}
-	.st100{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{display:inline;fill:url(#SVGID_119_);}
-	.st128{display:inline;fill:url(#SVGID_120_);}
-	.st129{fill:url(#SVGID_121_);}
-	.st130{fill:url(#SVGID_122_);}
-</style><circle
-     style="opacity:0.28999999"
-     id="circle884"
-     r="101.9"
-     cy="133.39999"
-     cx="159.7"
-     class="st24" /><circle
-     style="fill:url(#SVGID_91_)"
-     id="circle907"
-     r="101.9"
-     cy="133.39999"
-     cx="159.7"
-     class="st99" /><path
-     inkscape:connector-curvature="0"
-     style="fill:url(#SVGID_92_)"
-     id="path914"
-     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"
-     class="st100" /><text
-     class="st4 st5 st6 st7"
-     id="text918"
-     style="font-size:25px;font-family:Roboto-Regular;letter-spacing:6;fill:#ffffff"
-     x="88.23233"
-     y="284.00482">MMIXERA</text>
-<rect
-     y="77.327003"
-     x="123.12096"
-     height="115.32204"
-     width="10.851755"
-     id="rect3447-2"
-     style="fill:url(#linearGradient5671);fill-opacity:1" /><rect
-     y="107.83031"
-     x="117.33897"
-     height="14.959444"
-     width="21.606014"
-     id="rect3443"
-     style="fill:url(#linearGradient5673);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4191);stroke-width:1.03220296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><rect
-     y="77.327003"
-     x="183.62096"
-     height="115.32204"
-     width="10.851755"
-     id="rect3447-2-0"
-     style="fill:url(#linearGradient5675);fill-opacity:1" /><rect
-     y="76.827003"
-     x="142.62096"
-     height="115.32204"
-     width="10.851755"
-     id="rect3447-2-6"
-     style="fill:url(#linearGradient4842);fill-opacity:1" /><rect
-     y="77.327003"
-     x="163.12096"
-     height="115.32204"
-     width="10.851755"
-     id="rect3447-2-2"
-     style="fill:url(#linearGradient5677);fill-opacity:1" /><rect
-     y="163.83031"
-     x="136.83885"
-     height="14.959444"
-     width="21.606014"
-     id="rect3443-6"
-     style="fill:url(#linearGradient5679);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4199);stroke-width:1.03220296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><rect
-     y="82.330307"
-     x="156.83885"
-     height="14.959444"
-     width="21.606014"
-     id="rect3443-6-1"
-     style="fill:url(#linearGradient5681);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4207);stroke-width:1.03220296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><rect
-     y="130.83031"
-     x="177.83885"
-     height="14.959444"
-     width="21.606014"
-     id="rect3443-6-1-8"
-     style="fill:url(#linearGradient4844);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4215);stroke-width:1.03220296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/package/package.pro b/package/package.pro
deleted file mode 100644
index 3d37bd7..0000000
--- a/package/package.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-
-DISTFILES = icon.svg config.xml
-
-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
-
-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.target = package
-wgt.commands = wgtpkg-pack -f -o mixer.wgt root
-
-QMAKE_EXTRA_TARGETS += wgt
-- 
cgit 1.2.3-korg