From bfdee8b9025f996659ede9f74762b440b4b9eacf Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 6 Jul 2020 21:38:30 +0000 Subject: [PATCH] 49_SSCam: new Zoom icons git-svn-id: https://svn.fhem.de/fhem/trunk@22363 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 19 +++++++++++-------- fhem/www/images/sscam/Zoom_in_w.png | Bin 0 -> 767 bytes fhem/www/images/sscam/Zoom_in_wide.png | Bin 923 -> 0 bytes fhem/www/images/sscam/Zoom_in_wide_w.png | Bin 0 -> 811 bytes fhem/www/images/sscam/Zoom_out_w.png | Bin 0 -> 775 bytes fhem/www/images/sscam/Zoom_out_wide.png | Bin 929 -> 0 bytes fhem/www/images/sscam/Zoom_out_wide_w.png | Bin 0 -> 771 bytes 8 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 fhem/www/images/sscam/Zoom_in_w.png delete mode 100644 fhem/www/images/sscam/Zoom_in_wide.png create mode 100644 fhem/www/images/sscam/Zoom_in_wide_w.png create mode 100644 fhem/www/images/sscam/Zoom_out_w.png delete mode 100644 fhem/www/images/sscam/Zoom_out_wide.png create mode 100644 fhem/www/images/sscam/Zoom_out_wide_w.png diff --git a/fhem/CHANGED b/fhem/CHANGED index e41afb5bf..4af3107e5 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 49_SSCam: new Zoom icons - bugfix: 72_XiaomiDevice: Vacuum segment names fix - feature: 51_MOBILEALERTS: Added Sensor MA 10238 - bugfix 73_AutoShuttersControl: fix bug in diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index da7ed0601..a04484235 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -156,6 +156,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "9.4.1" => "05.07.2020 new Zoom icons ", "9.4.0" => "01.07.2020 switch to packages, much more changes according PBP ", "9.3.0" => "21.06.2020 SVS device 'inctive' if disabled, add zoom capability, much more internal code changes ", "9.2.3" => "30.05.2020 change SSChatBot_formText to SSChatBot_formString ", @@ -464,11 +465,11 @@ my %imc = ( # di ); my %zd = ( # Hash der Zoomsteuerung - ".++" => {dir => "in", sttime => 6, moveType => "Start", panimg => "Zoom_in_wide.png", }, - "+" => {dir => "in", sttime => 0.5, moveType => "Start", panimg => "Zoom-in.png", }, - "stop" => {dir => undef, sttime => undef, moveType => "Stop" , panimg => undef, }, - "-" => {dir => "out", sttime => 0.5, moveType => "Start", panimg => "Zoom-out.png", }, - "--." => {dir => "out", sttime => 6, moveType => "Start", panimg => "Zoom_out_wide.png", } + ".++" => {dir => "in", sttime => 6, moveType => "Start", panimg => "Zoom_in_wide_w.png", }, + "+" => {dir => "in", sttime => 0.5, moveType => "Start", panimg => "Zoom_in_w.png", }, + "stop" => {dir => undef, sttime => undef, moveType => "Stop" , panimg => "black_btn_CAMBLANK.png", }, + "-" => {dir => "out", sttime => 0.5, moveType => "Start", panimg => "Zoom_out_w.png", }, + "--." => {dir => "out", sttime => 6, moveType => "Start", panimg => "Zoom_out_wide_w.png", } ); # Standardvariablen und Forward-Deklaration @@ -7653,8 +7654,11 @@ sub ptzPanel { $ptz_ret .= ''; $ptz_ret .= ""; + $ptz_ret .= ""; + $ptz_ret .= ""; + $ptz_ret .= ""; - my @za = qw(.++ +   Zoom   - --.); + my @za = qw(.++ + stop - --.); for my $cmd (@za) { $ptz_ret .= "
Zoom
"; @@ -7673,8 +7677,7 @@ sub ptzPanel { my $iPath = FW_iconPath($img); if($ftui) { - my $zbs = $pbsf*1.55; - $img = ""; + $img = ""; } else { $img = ""; } diff --git a/fhem/www/images/sscam/Zoom_in_w.png b/fhem/www/images/sscam/Zoom_in_w.png new file mode 100644 index 0000000000000000000000000000000000000000..ffac437108548c7d63e86d2394461d8dff9a82a8 GIT binary patch literal 767 zcmVN2bZe?^J zG%hhNHDpIvQUCw~eMv+?R7gwJl|4wRVHC$RBpYZIDFcDwz<_eP^}I2;n6OeV#&3soqtFM5sN@5i1> zr9`iBxm@q>@ALWm{QO)@T4*Ugrcl~@#p7{YrBX@s7R_c8S0oYh*d`27|%Pog5AauE)nmC3Rq;h@eT8q)^CR1OfpS zc6D`ye0zISQU}JAh)rHjl*wecJ8)85!P)=P>5hmMQ^buZ?Ra!6^q40Yhg>VPzYj7#k7V(Vdwgy*Vt^f#bU8s zF82?oG!3)Qn2KoyZ%v^#Z>r!NjYfm`ySqCv?Sk*wQiL-5jHy`lASqQPk~#YD|MX!$ zv8DKc*=J0}`Y&8xofJl+(Z$7uIQBzowiMqm`-~}%L-W&5K=mmUZ;F?bK0G||2g~o+ z)I11ViiPs`NE#><Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D129QMK~zXfrBuIb z)LJ|LOp>{{xWHgH+LqIha7Ab>KfRJRPj?_PtdRS}CndrwVjLGaT z6q$V{%0FcGV_AD>%j$hQRf!O!u(K+G>$; zzVFH6+y&1h1)*}3Lj8lZgth*DppJUprKC{TFxPM9cOodn~$zOgCQ<*InDCqWR%#*2+} zzOmR4o!#wIRtkyEz&y|ik1(oW9^uhjJXn!tqbZG74aGS|?0$4j9M>Zx zXcjyDqV5b;38)1SAS~Z1x0k-M-`nj}*EiQ&xb!EONUCo(HbLGhj1%wmCdv!;N!tA* zwzpb$nyvO*gr>l7I7=XJHj}D21Jqvr8&YEF?(#dwaUS(OZ^*p(0}rEdevF}7Lnuzl x*X$qZ&~JfoT(WOfzC-zqcDvn;5U#4@$WLrJtk^^aoAUqw002ovPDHLkV1oRisd4}S diff --git a/fhem/www/images/sscam/Zoom_in_wide_w.png b/fhem/www/images/sscam/Zoom_in_wide_w.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb392f60facd497f5b064e7c417fc445123f54f GIT binary patch literal 811 zcmV+`1JwM9P)N2bZe?^J zG%hhNHDpIvQUCw~sYygZR7gwJl`TxFVHAKr{6poLN6N$ve#)iRQP{$u27z|dc)n9sayWMa&ytK5WTo=S@wVs}y zN{GQ=aCCIEv$OMK%HiQ*tyYtx>+9>awKa9;O$b^lmAEz>4x`biZc>3jpw(*O({8sH z4K0~A8jaP}Rb|q{Zns}tT;O?od;9i-@TQXK>p=yR$yBe`@sG#j$}|rt6rV3Db=S?s zXf%r8^Z6!|$!IjP*=%CbftDgDg?f&aPN&b$&qaQQ0(3f^?d@$*^Z7itB9VxwI?$(h zP<^FqTBTAUgi@YZSy{o2#t@Z;L(S!KqUu2N<3UT2@3$$`q}S_-Y&M&z6@uUI$1Rh| zAg`~lyWMV7GEh-wVWRM$Nl#8r5dMKap`J>4!S3!Zzjt?cD#|R3DIUaixm-V|^!xq$ z`+JcwZf$KLB$G+pNDz5{f8XQrpx)fvs3@~A`*=J*94zv_p->3*^72wt9at!MFs4e^ zGzO2(Q_2&|%gf{Om}EuGX0zOi#bToBK)13`aAHiw;&3>ePN&E(Ap?uWf`G%r!^7j_ z;~R4%O~dR{dS#jqd0bsx;ZL2FX&!VKTMAcZpD|TdJqUVmaDXRs#LFn_E3lu~Qe0s6 z8B=Bb8$Mq$g=Vu!CDp;}5SoeL4ztgg@;EgA_bF7LLh+`Yl4-eIMqv3Z8kz@TOR-S? zq%;GCV%+(Bs#h!)vAiQRu%%ci%s!3GMA7{8DJ}J~`X3Cv2wxO>k^h8uKxp}6{69mV pot-JuXF+JT{^sVU(mx+f`wc-u1Feys37!A|002ovPDHLkV1fcUf13aR literal 0 HcmV?d00001 diff --git a/fhem/www/images/sscam/Zoom_out_w.png b/fhem/www/images/sscam/Zoom_out_w.png new file mode 100644 index 0000000000000000000000000000000000000000..329a3ceaece7240ccd8f4e4a0af6634ea880d785 GIT binary patch literal 775 zcmV+i1Ni)jP)N2bZe?^J zG%hhNHDpIvQUCw~g-Jv~R7gwBl}$)uQ547XBazSoKS~5aW)Tv$bK$0yh`7$dg(htq zX;mB1wLu69R_0>Rt)N&a=tf$lAW=e?h@eEfTnKGM7drpx9whSlF*6P`zuh_SfB)~? z^Ul3*=^w-A^NmKM$Kwfy!&g^Vfk5E!@NjEuiyr?50)b#}Z?Dm447n(kN*0TSr1PUv zsq*`WvQ(VCfTY;4qOH7t94d^DL%l>Gpjv%kOp z`uYk@Hk+Nx8r#Pnu^^F1NF)-F?MGF)R&15`b! zA=}&AtgY2*b$xxEvXg)*yP^t(0;?LmzP!A|Ab)uWhZUz0KaQWT9S(1AZ-2p*U8!hD zC=}}Tdd%VzolfWI=xFx#N0;fRdm4GS+l@XJi^Z3h7aVllAt+fa7L#HMA5HN!DEo)N zv{I?SG?U5v_oi(7i!=qXSZwj8U}tCN;^Jb#rhkQ{r5_qz##ekPSV{l@002ovPDHLk FV1k{lT%G^` literal 0 HcmV?d00001 diff --git a/fhem/www/images/sscam/Zoom_out_wide.png b/fhem/www/images/sscam/Zoom_out_wide.png deleted file mode 100644 index dca4c853e577734745c6f8268be82fe5dbc10bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmV;S177@zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D12#!SK~zXfrBpvi z8(|cGIU}4PCA1DF#Prhb!3jKqdXXmrI(vWDxrcx$pn){l53T_Y%|wTc0+n%JaxS z_9+N_qBA1BJ4LCU6q$xW6L%-uo@+*AgI(SlaCY5F5Cmj^AeCY=L)LuXharzV7}Ry0 ztPyK4JC^+_i*3*#W|gHSuNI?%;+XEdUV>`+oQwE4sJs<_hPQC zdW}DJ*&Zl=Dbw)naVWe&n>!xuAAuAH1xXzw0l6@?x$9GJZ$FKWj+36Ooeg(IAjHnD zQ|Y^Yle)SL`ds-*e@=<2vK-EgrJ`sV& zA;mAxk0l3zhC(p{a``bge?wsH@Ov$KIAY>Ra-157&%pI)?#X00{SOQ8ZE2rB$V%Ic z`Q;6Sq(Q++E3sBr`Cov~<47#NTC7@@MJ0u+p5Usy3E{<|BtXCB;IOT`3lE+`Hd<*! zl~bbGr?ZiG);LW)&nFXsU$-15g&Co(eM4Z)G<2L*lIn42ocrFfqD&f#OeACgT7EWN z<}l{z@HX7CakGac#hD`xjSC7Nc3p?=48<%rk<=l5xWmF;_drRiw<}7LdDci~P$?IF z^Mt&aNFeIDl~GN=iAM@z_-t)9ic1wC*L6u9I8ubTZ<+?pzg&o@jtnAYGi{3RxO6f+ z7~zNF(g~bHslSw4xi)=&njG69r4;2}=Nf!1zF};9T&r@VFi{=+4s3)|7*X(;-Lt;F zo?}85GV^eT3i$%%-{yt0h1lM<`;o4{@IY5_(?0amNbxJY#sm#tC+P^D?_640T1L_D z;)i7Qh5QQ0R}-zo<*m-_*aQma#jy5a^-*E9_y(>?u==TcATJbRKHj!FvbVD5;qb!9 zzso->t`!%cyn`bOHM+fzF9Rs=EEbEu{UAtAPfgKZxq*p!RzhJf00000NkvXXu0mjf DNlv7{ diff --git a/fhem/www/images/sscam/Zoom_out_wide_w.png b/fhem/www/images/sscam/Zoom_out_wide_w.png new file mode 100644 index 0000000000000000000000000000000000000000..c8cf6e466b066af71bc097742fa1736a4f800d72 GIT binary patch literal 771 zcmV+e1N{7nP)N2bZe?^J zG%hhNHDpIvQUCw~fk{L`R7gwBmAh*qQ542~L=lM=zOmdQ7>Qj98!Hk2fMlygu@y;W z8qr!CgF<}7N?SqEkU(sLRTM;gASMJMA*2YzLP#T8=zg0yStR3QcGqR|>&}_)d~@!d zbMNr}GXjCYY&QFRzSGmwVzC$whmVeqj7B3p{sV+Up~KO=ybYL zsl-^+YPDc6`2C%OgM&yU^7#13Jc`9)VzHQNR-)Bv@9yqU*6DPtRx4#^z~;DIuGiOB zXf7`=Iay=*SR)Fu+3e=#CS~WLR4SXzCX~r!l2S`JK0b!DUa#W?lv<2htwz_A$;4)} zQEDzysr2pb4Z5A39ZIdj>2#tGERo{5U;rR06bck`U}IzB>FEir7z_qVvB_jI@I5>{ zq?j9+5L98VDP~hHm!a6&+M<{n7(P_t$WY9t-|s`Qy}kYN@`9z!f_C_Pe!JbK_=A&^ z6U;TL&d<-ug$*-d=(kd-zu;{e6nL5ekJ+g*${| zHg2~Yic~5^F$b`SMx%kM-Q8VEu~Dg1iYVc=^A@|c6PS6xA*NG99Eo0{5XETb~?Sex%mxK=1RqeM5EEs zXvA22VlWtZz24Q!|8<#ux~Gx%cs$rgoRsJ1XB>3gA!u15k&t2uv!?hOl>JL!+G@36 zdU0{_&5`cL5TegNr}*L+;vpQ8W(002ovPDHLkV1hX} BX{7)F literal 0 HcmV?d00001