From c72f2e3ba09cfa9c8e659bf87f3a7d785387cca8 Mon Sep 17 00:00:00 2001
From: Christophe De Wagter <dewagter@gmail.com>
Date: Tue, 15 Sep 2015 14:38:20 +0200
Subject: [PATCH] [icons] Digital Camera: deconflict Power on/off and Autoshoot
 on/off

---
 conf/modules/digital_cam.xml        |   4 ++--
 conf/modules/digital_cam_uart.xml   |   4 ++--
 conf/modules/digital_cam_video.xml  |   6 +++---
 data/pictures/gcs_icons/dcstart.png | Bin 0 -> 1028 bytes
 data/pictures/gcs_icons/dcstop.png  | Bin 0 -> 1032 bytes
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100755 data/pictures/gcs_icons/dcstart.png
 create mode 100755 data/pictures/gcs_icons/dcstop.png

diff --git a/conf/modules/digital_cam.xml b/conf/modules/digital_cam.xml
index 19b5a5e880..b832116d4d 100644
--- a/conf/modules/digital_cam.xml
+++ b/conf/modules/digital_cam.xml
@@ -36,8 +36,8 @@
         </dl_setting>
 
         <dl_setting max="3" min="0" step="1" var="dc_autoshoot" values="STOP|PERIODIC|DISTANCE|EXT_TRIG">
-          <strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
-          <strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
+          <strip_button name="Start Autoshoot" icon="dcstart.png" value="1" group="dcauto"/>
+          <strip_button name="Stop Autoshoot" icon="dcstart.png" value="0" group="dcauto"/>
         </dl_setting>
 
         <dl_setting max="60" min="0.1" step="0.5" var="dc_autoshoot_period" shortname="Periodic" param="DC_AUTOSHOOT_PERIOD" unit="sec"/>
diff --git a/conf/modules/digital_cam_uart.xml b/conf/modules/digital_cam_uart.xml
index c6bcf26f77..718c3223bc 100644
--- a/conf/modules/digital_cam_uart.xml
+++ b/conf/modules/digital_cam_uart.xml
@@ -32,8 +32,8 @@
         </dl_setting>
 
         <dl_setting max="3" min="0" step="1" var="dc_autoshoot" values="STOP|PERIODIC|DISTANCE|EXT_TRIG">
-          <strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
-          <strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
+          <strip_button name="Start Autoshoot" icon="dcstart.png" value="1" group="dcauto"/>
+          <strip_button name="Stop Autoshoot" icon="dcstop.png" value="0" group="dcauto"/>
         </dl_setting>
 
         <dl_setting max="60" min="0.1" step="0.5" var="dc_autoshoot_period" shortname="Periodic" param="DC_AUTOSHOOT_PERIOD" unit="sec"/>
diff --git a/conf/modules/digital_cam_video.xml b/conf/modules/digital_cam_video.xml
index 0d20ec88e6..6464a89f5b 100644
--- a/conf/modules/digital_cam_video.xml
+++ b/conf/modules/digital_cam_video.xml
@@ -16,12 +16,12 @@
       <dl_settings name="dc">
 
         <dl_setting max="255" min="0" step="1" module="digital_cam/dc" var="0" handler="send_command" shortname="Shutter">
-          <strip_button name="Photo" icon="digital-camera.png" value="32" group="maindc"/>
+          <strip_button name="Photo" icon="digital-camera.png" value="32" group="dc"/>
         </dl_setting>
 
         <dl_setting max="3" min="0" step="1" var="dc_autoshoot" values="STOP|PERIODIC|DISTANCE|EXT_TRIG">
-          <strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
-          <strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
+          <strip_button name="Start Autoshoot" icon="dcstart.png" value="1" group="dc"/>
+          <strip_button name="Stop Autoshoot" icon="dcstop.png" value="0" group="dc"/>
         </dl_setting>
 
         <dl_setting max="60" min="0.1" step="0.5" var="dc_autoshoot_period" shortname="Periodic" param="DC_AUTOSHOOT_PERIOD" unit="sec"/>
diff --git a/data/pictures/gcs_icons/dcstart.png b/data/pictures/gcs_icons/dcstart.png
new file mode 100755
index 0000000000000000000000000000000000000000..20860ff76f337d190227a728797e7f259c2a922d
GIT binary patch
literal 1028
zcmV+f1pE7mP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60
zpuMM)00007bV*G`2iFV=4*&@pB6Q0D00VSML_t(IPpy=1Y!hW1$3NHJ?$&l}ux?$;
z=J+%56|!j-m!JzKMqr36MuLd}c_BtZ420l<@r5tYEQACk#;9nJz#BxOn5dZ};2$8k
zp-=<9u?tF96847#*xKIp+O_`fS*M|cEGB+0&)q%uyWi*e{dw-Rf{6c7T3>%(;m4m&
z7pMPCE0%ZA()>tqHYweOy|C^@s^?Vm;eq$r^zy5ihN+BKe!tAf=m^W&pTscANF=Uf
zS(dV8b6I*%_Dl!5Cy&RYV5?Vkl1wJ~?pzN}Hp8zMFA*E~i`v>+8s^rMN~LIOYEq7)
zve3PxfPMYvd91aK{tG`daCLwRe+3UT&ZG6wR>I+WDl03wJ$8#gAi&_@Aa2<M6@CRM
zm8W=RFcDYjO{x9yb~;wB;JMCcFm#iQmEq5L44>biE?i44n=8I~xBdZ^%8lUKwK%z4
zffL{MaOl{V0?`;BOLIMukTPk-H}BScfsW&-Yfo=4-R~aZeE%Qpdb?YtTR=nec$K|W
z(}0Ei<hHakHW_Km(2ZfTc8YMrLdtY6`FtL)*Q>zy(sZC4u58=FG|Op!Vkyho9^$~!
z-L#$COLc2Cr&>1i#e*AI+qItU{6d_J@^Phr?ut|L`}~CJ>L?dj<*WeBEf2Hh>w|p4
z)3POY;IM!pW-&sA+&3`Jn{?C3H;gKO1)SfwKuv0bHN3Q8Bh5>iRqCeUlMWkv#HZru
zBa5WU1bM09gbW=^p6R40XFrD(L$3=(IQ9KWo?X3$WGcz$$3IhsDJ|{V$~=BxSfU!E
z3tMnraw?K>%DBl^nIEKvGn{2JS~MChT#8;~^yaVv_{szF83qXkgJ_z@;gv{o?@2^&
zv5z*cN>tm}CGiy`@^_dk5q1g8Vvjs|1<khYf(+8>v;w;IG)+@|6|Pq4hiK#ki}`@p
zat++kCnTbO_uy;{SuVzLb_)6_Jg#$9RTYs)M2%1=q~^M=tDzB)B=ge8TWTJ}RFJ9R
z%8`bQ%h`})+O{cGn0l$3MpTX=aVpgfu|~Ndpse&f!i+!I-vqLrbyEH$eiljL_lxu7
z@6D2^JEU%wq?{M)$DE!S=xQxr$>!asqHst{5#~tDS?P6L7BZz79%;@_j<IRxlwG~S
ya!JgsS4Lot6h9`Qn8f4=*pem6c%A3P4u1m$EjG@xp*LOt0000<MNUMnLSTY!Q|itD

literal 0
HcmV?d00001

diff --git a/data/pictures/gcs_icons/dcstop.png b/data/pictures/gcs_icons/dcstop.png
new file mode 100755
index 0000000000000000000000000000000000000000..e3b21b5fa847990a5d718c0e333d62ee0e1a8271
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60
zpuMM)00007bV*G`2iFV=4*&@pB6Q0D00VeQL_t(IPpy=HY*SSf$3L&_`nq;>Ze6<;
z#y}S|B<R2_EC>t6sDS)fH2z3XSoon3Lik6MCjMazzhX!f0tBLoAu-V)CSsyc28^g7
zV*|$$Feb9_qbumf#*aX|zOJ>;b1&VH4I(Cfo7?y9x#xV}Ip2HkHEaR@BaF88Hv7k)
zS_;$uhB+_JV`}ZR!t4%QitLTo7gJtV&hAflvU0^LOt+~Q&;ELbt9@6Q-S8}KcM*xi
zWzy-iUd!gPG#`$QCRBe8heMMsc&U+OGRdLiF$S|4e(5;Pxvq-@gF&jsjw6*yQBzZ+
z1N-Dd_k$*EYj0(GT|Mn5PtbL~ixO`M<Etl7_jDcM@HqT_KR0jPz~}SP-QA6n-B;q(
z1S8=nJn2rvb$LT*nAyO*xpR2AaXxOBNhY1)Li`-XUN@EDAh~R=;CU~G2}eR@aOqN<
zT+U|yff#$f{#Hl~Zr>W<av~uz83oUK@j$}C!9o3uH8-<)>ld`P|IYdin{~N128P3_
z*GFO$p`E|emR80hBOBB6XD?YRMY!rQid;_e`8-aiQxo40qY34wU|DHQ(?i3oXP908
zIES`;MC<b(Qx_;_+Hb3wbYcn7SKopUPeCH1V-z%@`r;70#a=>{m3V~AKgLJx)F+9p
z{TvRy0Ks>Ww4r|tTrZKYN>7^a!<UWF+^6F;;l%1k^`s(D!O|s7)IL?KOE=xcOd9_L
zoLUYk55yzN8~&0F$w{cQ3VH(aF5TC%Mue9>tPDjsdh9R@7c3%~O0w^py_$Ro(V6SO
zt+MjNAMZ$3Lgp#7OsWWOG)b0Hfk(>jNMdw$cG{;qJLv20)jq`@pB%#gfj|JmFqr$j
z7^}8J?+2n+JzSJBx2+eWXdT@MV<o!{KSTKz@p&7=vMgH$0|Nt^Q0Zx!ral!4u4TJm
zN(`z$Blnsr`7YFvRfB!!;mCWCo`FLJmzI_iiA3}Wg+hAna=G-tQ6YDdWOJ>5*fumY
znZmUmDO&_IA9-+N4`cc)DO1kv$!+jeN5S|H>^%-=Hi?Ew?fdT+tn3F(iy<r;yF`{L
zZ^Co)#VBDv?3e6zLtZ-IN(i>MJOrV_s_&rm6A@V0Z6USGL<)KL$HgXhXI=`u5``Tr
zACgcZdQ5t54@{O4y_RGvgod=r*%?r_8aBNmPVhImt2Ljk3|o}|0000<MNUMnLSTX>
Ciqakc

literal 0
HcmV?d00001