From ab329aaaf1e6826b76d1ffbc0c18ecb9bfaec97a Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 13 Jan 2014 15:52:40 +0100 Subject: [PATCH] VerticalShapes toggle button --- img/btnArrowClose.xcf | Bin 0 -> 8717 bytes img/btnArrowOpen.xcf | Bin 0 -> 2618 bytes js/buttonbehaviors.js | 23 +++++++++++++++++------ js/main.js | 1 + less/buttons.less | 10 +++++----- www/img/buttons/btnArrowClose.png | Bin 0 -> 1148 bytes www/img/buttons/btnArrowOpen.png | Bin 16291 -> 1078 bytes www/index.html | 13 ++++++++++++- 8 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 img/btnArrowClose.xcf create mode 100644 img/btnArrowOpen.xcf create mode 100644 www/img/buttons/btnArrowClose.png diff --git a/img/btnArrowClose.xcf b/img/btnArrowClose.xcf new file mode 100644 index 0000000000000000000000000000000000000000..87ecf0506cc91e36fcd897f9dd46a6f901d4821b GIT binary patch literal 8717 zcmeHMdr(x@8UOC?vb(Sg3y2s%^oB4Apqd3!!$wU(qos72eHBOyYr>#XR2pj}vY?>+bQ_wC(FwIws{ z)HeU@nfdPbI?wN%{mys3t@YQhR@YY5s5Sn&YC_400@En~MZsqbz&(4LVdi*5`3^%b?%g|$t7u13%+RM6bgR#&YyH`e)AOiC!IsjX_PYiv>r zBB-#bwz5KCIZ9JYuYNwkP1iQBuBh@i)T+hSSP-_2CXC7o*EINB zRDVO&cdDDYePc~cb9Kwe1iAIUicHCaP1z37qP$5I_cNFZR?k>&Nr9~mV0${hUeQ+F z#7Y}~P@Dj^yac$TG}nxe(m=#Jz;(DJ04&;bAML%5PP~uyf#!a>@R%-u)!y25J1fm% zdoD^?vqoLpk_TlrKlAJ86ggxT#mR9LFViU@0%OTDLf}M>e~I0^Wtc7g7diD{v?t z8df|xPfp3Sfe9#2{CN2G^*wP!c4&erOFNGp`QbB8s6uhS+*~FLm{i`9R_+xD{AO2(tsT(f`G=pc?zi|wulIE`I<3)vy z8`@8k;3LJvlUQ)b2+BKU3MEn4k({-37@}}k%F`1tYt3QHJBov;4#o0)d)D1=j z@B-i|obA9|Q~+eo?aVw)hNSF~PXYyVmb7RL|ma92$u2B+>)S&%&~d z?HEVgjE66bsEk)x^8wfV1RA5pRM z>}+%Q+@yI|9UtU*4;-m%adKJ4LZm6gx#R zU&Jowi}pp2(_rD+%{ve5@7lP`#{t01ci>Rm#1wVYqVPK8HI(e99hNB%Q~FAkHLUX(I7M+y>%(4`K^Z z7m^85;BG{il)vq2i0{JCi3SysP%yu~ZNrAPx;#7{wjwaF!UUS|d2x?gU(vjZYyPLt zq$ITAXO03u;D-f8iuK~**G;terh`xc9K)cxZw@dQ6#$uU5i{$QpCHcd?`MOCf3b6e z%#dOI=d;qiO#J$*=pHuIZ!fZ=3lQ3Cc5E38{ILf^V>1W8hUoym>j3shE!f{5FCmoS1bY!UPTNkh*>hnMG0%-hvOidxx|ax%`C#)+g7rXuWFen#{-_=OWmp1r_nsO1(L>Xt@VeGk8` zE|k87eVgmA;hsKW^L&7r8?RcH5b-xzvz;sQ znnWPoR7KuuSYthT&^8G`Y!du=)rt;QyE^IW7) zdHXiT(FgX;FgG}!g4qk!cXYNd$>CRQ^k_s6N$kkPj!f*x#JtS^*2}D;%@oY5=Mg3%T*3XDr}dS>|vk!EOI&Fg~$%xJ^j;9!kc-NZ|IrJmfze7@&u9z1 z&S(?0FlwizK-!B`I?QduUdlQR!Z^cj`z5B z7{|0BD>)pGhT<7(1SSG+P$LhnM``(z*scZGnR_Owh?I2)es3hLuy-b#a9srsRN(pw90Znm4QAHRz6!1~=`c(4>~(bc09ea&_hKrK>|y)f^)~|O!&psf&jQ!5`tATQ4BJRs9AG^mh;cGK z!VS^|VyYtj6gRToEoh^=fUa8fB7ErMv!9z;zgFrN=2*`r7um(3Bp96dl8;@iJlYsDA6qTjb&X{_scORh|X{o+g}qMgw}&) zdO*w}YQBp}*MDoL`d@`VQs(V_% z9O=LnMri-JA3L_L%+{6Jx-wg@%>Vq#yiLbxtuv9Ip3Wz`sF`dt^;H3nlwJ7oL>D!X zvR2v8s*s>MQgxS5Zq$`})JWx@m*VnmgH);NZ%|m&tr{sym${YoRe1sra+^H+9#Wn= z0vF{?-OCU0`XN;1(*jT&o?Zg5SA8_dk8rV@QlgI1l&JUV9Z|<9Cu)XXhO%Fv{=dX` zJwV%U0_b^pwqFr64y25q_(9gDEcUuAds_CgfL*DjIzSctnOj)*%f1IRH?a=Oah|xt sLDmseW7YJrJmcqksGf??eDnwEqx!TDKZEyzL+{OgcH!*t$q+pL1}SeKApigX literal 0 HcmV?d00001 diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js index a97b9d5..80688a5 100644 --- a/js/buttonbehaviors.js +++ b/js/buttonbehaviors.js @@ -1,7 +1,7 @@ var twistIncrement = Math.PI/1800; var btnNew, btnPrevious, btnNext, btnOops, btnStop, btnInfo, btnRotate; -var btnSettings, btnWordArt, btnZoom, btnMove, btnUpDown, btnTwist, btnShape, btnEditClosed, btnEditOpen; +var btnSettings, btnWordArt, btnZoom, btnMove, btnUpDown, btnTwist, btnShape, btnEditClosed, btnEditOpen; btnToggleVerticalShapes; var btnDiv,btnConv,btnStraight,btnSine, buttonGroupAdd, popupWordArt; var state; @@ -41,7 +41,7 @@ function initButtonBehavior() { btnConv = $("#btnConv"); btnSine = $("#btnSine"); btnAdd = $("#btnAdd"); - btnToggleVertical = $("#btnToggleVertical"); + btnToggleVerticalShapes = $("#btnToggleVerticalShapes"); buttonGroupAdd = $("#buttonGroupAdd"); buttonGroupVerticalShapes = $("#buttonGroupVerticalShapes"); popupWordArt = $("#popupWordArt"); @@ -67,18 +67,29 @@ function initButtonBehavior() { btnConv.on("onButtonClick", onBtnConv); btnSine.on("onButtonClick", onBtnSine); btnAdd.on("onButtonClick", onBtnAdd); - btnToggleVertical.on("onButtonClick", onBtnToggleVertical); + btnToggleVerticalShapes.on("onButtonClick", onBtnToggleVerticalShapes); getSavedSketchStatus(); setSketchModified(false); - function onBtnToggleVertical() { - buttonGroupVerticalShapes.toggle(); + function onBtnToggleVerticalShapes() { + console.log("onBtnToggleVerticalShapes"); + + var btnImg; + if(buttonGroupVerticalShapes.is(":hidden")) { + btnImg = "img/buttons/btnArrowClose.png"; + } else { + btnImg = "img/buttons/btnArrowOpen.png"; + } + btnToggleVerticalShapes.attr("src",btnImg); + + buttonGroupVerticalShapes.fadeToggle(BUTTON_GROUP_SHOW_DURATION); + } function onBtnAdd() { - buttonGroupAdd.fadeToggle(POPUP_SHOW_DURATION); + buttonGroupAdd.fadeToggle(BUTTON_GROUP_SHOW_DURATION); } function onBtnStraight() { diff --git a/js/main.js b/js/main.js index 6f85cac..4731217 100644 --- a/js/main.js +++ b/js/main.js @@ -23,6 +23,7 @@ var showOrHide = false; var clientInfo = {}; var POPUP_SHOW_DURATION = 175; +var BUTTON_GROUP_SHOW_DURATION = 80; $(function() { console.log("ready"); diff --git a/less/buttons.less b/less/buttons.less index f8a1f34..f728552 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -165,8 +165,8 @@ } #buttonGroupVerticalShapes { - top: 10px; - left: 10px; + top: 7px; + left: 8px; padding-top: 20px; width: 65px; @@ -175,10 +175,10 @@ } } -#btnToggleVertical { +#btnToggleVerticalShapes { position: absolute; - top: 0; - left: 10px; + top: 3px; + left: 6px; } diff --git a/www/img/buttons/btnArrowClose.png b/www/img/buttons/btnArrowClose.png new file mode 100644 index 0000000000000000000000000000000000000000..8e70a61fb89a27e6b1eb4d92d5c785eec0e909c5 GIT binary patch literal 1148 zcmV-?1cUpDP){ z(nFzXE;Td(8?>kgi53Zz1;LZFMG=#VyFyz-&7uw2VzO~}onJ3AvOC$G-8FhCeK41q z@4ff?-uK@7zHg-eB~y$;=rl+=FX=@|Ws-c7ko1qF9Z7d2%}RH8(e_zP?`N<>fL>Q_*NttE;P8TwK)V z=B88Sj-(GHtsW*4UC!AxH#ajrK29taBbV&#>~Q`1b()%*oRKjlwH6D};)EC;9;O&c zrBVzG3^-x_lH@NG;sr@}ZDo(g!_3SKhn3OM(F~aC>gr{nplba#U2$@9($!Ho9AAcX#*a`5*%65Pf}pt`64M*C{J2LlXV{{jOtUu^8Li+nA=w z+S*zonM}S1Jd+FLV;iEpyqw+LU0360&z{W)`;{wK3R*7HG)W{9d%zS>k!`6KZKH#O zgRaJI-MW>vZ_Lln7n4FJa1+Q#V6UWvBn-n~d3o8jBC4vYkVIo+BXe_e`2Bt)apugK zypeQ({0h9E4sza}RZUF|$z(F8c27^w6UjU=F>&y&r>CbFkSXBhbdWD>L#?f?IW@<| z#ts}_xNsrkTSrI7!MBBlg+hAG3h;_EKZb217cXASs(A0-J$ybNlBle#WP5u%<9jq3 z<+S}W+Y6gSByfYpd895j;G&JM}5(OHvm2R(X;M}=$ zPiS4ediB6TZ*OlwW$pL-357zKrs*8A4~zjPvVpv6JF2Ltcp~#_YisQmowq8swzdca z0(iY%+S=M|kaU_j@UGoIoPFekq(?SPC=|*te);lcT3T9M%Q{^mkqG_${Y*_wVVY*r z%84Cd6Sx69Ydg-?VHa$W&dyGbQ2qwK0zLxXbT+VTowY4}*NsFXZW*6)gxe``;4bhB z@HX%~P*Uj5D@hTTq}{h>w*~Cw0N4lqu#&L_ICF87MwNv9>1 zSeGT!+7cc}`dZSDhGFa->)!ytE2+||CL8Xtq@?v1;J#rP`~QjmBmV-v8?5_AjeY0< O0000JS;o{6mC)(4f(sN(?bVFKS?c!4P5UUavyLn+QR=O9Y*R1Pcszsiaa&Bq7oW zgv<*!yixMsaPMlqWXgWs>=|c!pFNw?_wN0|1KV@Hzu);h=lOq~opS~+l`2!7adki! zPy)P~xc4s*12%x*i-fKLo&Y}sH-KcgZh#};YoPwIA>6<-gU*ehMjqqUybkz*?(_zm z%|?BFJrxxdm`oFMc7hxtt@?wquyCUCpm zlCQ?b#?oPa$`ztl4ICI4kcUbK#+ePG0Qgf2XlrYe$5KZ}hYAwP2J*g2exI7ircfv( zg@uJG%*UA^3IVTX?C$QC$5wxTzY4OQ3FIB%L^JyRei45WiO1vO^ZCT%@kl5X%BjP> zy*+U_95OvUopL`A2&f>>fLHWDoSMmOHp|J$iHL~Y+}tFCYierb^z_saA{L8DZEdXp z($LWGTw7IDl?wBg9>^2T(AwIX435X+GC4V!3~q04Hv}0P8cKS7K3}$?9nu5&LNhoV z4#O!pKRWb0P(Udlq%f<2WF#uk# z7mLNBnloPi9~dt$nAC~pJ;!1d09k6{Cbyb4FprJ=C=EUXA zbx*RZ1}-ix=DpCZtgNK3x+jUfa84=({!(Ga$Hxt4gr26Rru2&1ao>Gw7Z6vIw6wIy z!oq@t!{LmbN25_$T3Qmj-L41W%J(?Y2rP30Z>u-0Rx5V9oyNvSEEWp|1qEDOTySu3 zz|PJNM@L6`xdwo59&)&P6ZkHV!B{>uOW literal 16291 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 - + @@ -114,6 +114,17 @@ +
+ + + + +
+ + + + +