From 08919902b51f4b70c6c23a2fa07b8e9362a55663 Mon Sep 17 00:00:00 2001 From: Deniz Gurkaynak Date: Mon, 21 May 2018 11:03:16 +0300 Subject: [PATCH] feat(*): Remove gesture info stuff --- Penc/AppDelegate.swift | 1 - .../drag.imageset/Contents.json | 21 ----- .../Assets.xcassets/drag.imageset/drag@2x.png | Bin 6404 -> 0 bytes .../pinch.imageset/Contents.json | 21 ----- .../pinch.imageset/pinch@2x.png | Bin 6228 -> 0 bytes Penc/Base.lproj/Main.storyboard | 82 +++--------------- Penc/PlaceholderWindowViewController.swift | 61 +------------ Penc/Preferences.swift | 17 ---- Penc/PreferencesViewController.swift | 12 --- 9 files changed, 11 insertions(+), 204 deletions(-) delete mode 100644 Penc/Assets.xcassets/drag.imageset/Contents.json delete mode 100644 Penc/Assets.xcassets/drag.imageset/drag@2x.png delete mode 100644 Penc/Assets.xcassets/pinch.imageset/Contents.json delete mode 100644 Penc/Assets.xcassets/pinch.imageset/pinch@2x.png diff --git a/Penc/AppDelegate.swift b/Penc/AppDelegate.swift index 56d3492..79712e9 100644 --- a/Penc/AppDelegate.swift +++ b/Penc/AppDelegate.swift @@ -188,7 +188,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, GestureOverlayWindowDelegate self.activationHandler.activationModifierKey = preferences.activationModifierKey self.activationHandler.activationTimeout = Double(preferences.activationSensitivity) self.gestureOverlayWindow.swipeThreshold = preferences.swipeThreshold - self.placeholderWindowViewController.changeMode(preferences.showGestureInfo ? .MOVE : .NONE) } func onActivated(activationHandler: ActivationHandler) { diff --git a/Penc/Assets.xcassets/drag.imageset/Contents.json b/Penc/Assets.xcassets/drag.imageset/Contents.json deleted file mode 100644 index 564d917..0000000 --- a/Penc/Assets.xcassets/drag.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "drag@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Penc/Assets.xcassets/drag.imageset/drag@2x.png b/Penc/Assets.xcassets/drag.imageset/drag@2x.png deleted file mode 100644 index 8887c5a6a5cfa3432797303c155f1e2efa4266a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6404 zcmaJ`cQjmWwffiO=Ab4cBcs*U(l92C z)1<5C$|cg>u|4%MX<$cdTB1!*E@)pzFDRLsGYSF)Xd@h5p~g^0XMfL6P$e?5i$FJ1 zOSGk)u7VQ^A?EnUM$8Z4K|+&}DXIE-I6ApQ(Ete4)eWi4yWN841-LmY^IFL0N$7c~ zLm#(exe#*Rm@hXtyKWcGaz+Wb4 zcV*sx1!bvc2vA3PK>;#icSM~eBqaeLkeH;j3RwPsG|I~q zg@XT`MZ-rZG|KxC$^)Qo0s;u?IXbx^|0sn1Lg?u!Xd}JRjz}k{wuUkc3T_{`n*R zr*TOS|7m?FlGN{Bq{jXx{c4?zjM+z9L(SB0Y9pJfiD@jYo1R?5iei#CUqsBmNpCc| zlfkI11lZ26xHzKGt?OYL1}tD-qL9hdjW3D0l)!eX;gQG@%{UYv%L@jNmav)5d=&hA zr6fA+$J{IY<9S1@y&1l0E3h1CaT+@BtCF=9(paWHhTrztddr=K!9*~n*o}QGPcWTU zN8G|8SL)JW;-#WyEfa(&v=svVnh^UKKh|0TGDD!l@PQVH^eIgkb|`^~Q)s{gCp@-a zo)=FG8yOQbJdPH7L(rO@+7RJO(og@av9~J>!w$b^;-p$D0hw$n(tUpTW}hF&kG|6d zzL0nN;=}IECiT&rg7WEA6SNvK)B5S4#1GGisT#(3F!If~Izkq=G`ga7Xw(w|qZvIK zoUNFQ{hR|cD0%$+kn1A%d7e+{RN!VRrJA0}F)~wSeiLT@W?HC$*DG;qK{B_}P!YVD z`3#!>)~}qwo+-mP!(hS$u6ZGxB{cr7)&Zm6gk=HK|V$bBcDLF6b1^{iD< zW0M@$&Hz=dYEYdus9~nk2;^efIpe?$l)i_bB?<@#lo|++_}&lQytNW2O8>bEY&i`M z3Qe6-e@8jw@dRjp)sXZ0-sEV~U~}1Qr4LwfpbZ3LEt>_jONV7xZ`WsR8!U^GlG@Rf z5qOk3^*Ha`p3~&GYey82@xTQaGMQ<}8X z!~@yWcPxXs!rYG2$&F7T!WWGAo;^^<-nWwbcmVBfZiK@2bX2y#Oy8|xe)@}H`#o2{ ztiu9Z@R1I4)spMpgVY|}3c%?k@Q=aQ8IgXe&F#ZE%0(T3qE_%VA zQ4sJj%&&9oqv6GykQ)nnt0mkH>lwnlb2K#5=CE+P(dSoA&(jCL6W{$}vaxoM-h$!I zCC~Mf0I?zE(JO>xn5x-v-1<2{2cJ%vW8~f&5b+R?*ipbU2Pn$|SMWOwB|J5oM!Qc& zO|CQ4JR8X1sC>|YpPxNBt%F6G`_s|z&T%r1gqAbwIy7F51O(AYrk;1H*qlbwKKLE# z9=`}^LfKy`JjeXU>Ld;Xp;loBV2Kd?4JrAG|Y zF)Nos29(-wM&EjXPITOHm{a%qE7pGTe5rouqi9)7&jQn(G)ac4}-KMTa{hx7)N zb_1`d!gdLvPG7_WSfje1eC2qvx$Ma`n^1BTd1Pd#p6i6J#k}zjwBFuVn2fJ9r(M;xL8327{QQ3(p%VRwH)%X-|0yk}qdnz>M{Z^)7pDbcWM2GwHsgNB&;V9o6H$o~`VP7%6rHHQHLuj_F(2SQS+yjz!*5 z!XM`0Rpow8&bYL^+E_T<84fC$tk#Etbw%Tfh~i2o30a0NogQ@*3_HPE!?`Q?^8@)G5>Zu$5OFxq;8T6~k}N(4-KRN$n|H`>2B)N z|B_LK-q5=8O^s@$V@pc!y~nc?YpSBFfD~E=C=cLM5ru@?bE33XAqU+^ZMF}xepKZ` zuZuJFz8g-4S=ube`1`W9w*x$LPYJ)=Qt;(%_fVlv)YM=Kp0lz+Z1LFF%(GRo)b85R zxmw@;B&M%(U-bL+jI^(jIqNYa$Y^=|>Zn3gtE>^iBw}K}b!vydo4ueRZ#fXtM{g>+ zI{zVhM&N~z0R9-RmEaQ;wq39e8Vo-pHf0P*Fw8S5*I?H}AL~lkCfY$dXcQR|JdHK# z&U-kp3&EH75CxOqpN#{NF;nwE`1b>e;5?Cb0N7M;vSnByVDaTJh^2P8_3K-HZ#Z7$ zaBfx9w%fQjg#A+p1`omTs*TST2AOQquphY}WE>=`APf8xUN6I#T-9hC~dU=IbI#xZ6(*wTnn9~En?(=_AVcg(GXR? zwaH#K(LamXWE{C)%0lt&OoA`8D?(nGCjha;dP8rJQ$6G!PdR^V=f{qbH{i~OF4q$+U6Al}@5Z?c3xw`K!ll=?yyGHty% zk^Z>@dkkg&?QZtvSnqjIEWcubdY|?Nux{9RlHO*&Z@*|vP3hY7B;#^SBPA$FP5~NP z8SRgEUHhfTk~q=+bKd%>qzA6lWjq;2K=l?A0JU{osc~7g?y+Yb7luj_rlU*&JutVV zaijA@6F8HNe1EFLWBcFzmv77nM6-24zL-#PE z)MbGa2527`^42Qs%Be*3-2CLbv%8D3d=-=x)T;ennPU6KPMhEwtBW62Snt2%nOh)o z-0ucAO*Jrac9{c<9!%?+%_ocQJk=69s109&_?-sD5%UgPrgr7MlAb~8sHHfZy6(wQ zU-Z_E%9_aV#Vo85&UyD2uX*M)tWHZt*O3{kDi5BK~>K$Aqyr_AGhW>sAByLG?^X{QZf@nHSMW)xiZxiG`D;!Sn9k^qAuV zU{4wGg7lbx-)+$TG*=8QJxj_IK)yIpsBd4g4>&3n%*}mK==U`+uKoAkt3lT*LN?#4 z=N~y$Q@mK_sh(fK5+tIe^}>MJQ4{SlIS|-G&h_?!3^&-|Ej|0HH$LHmAzN$BaN2aZ zlpX|g_2ovo8c_#sZ+cu#@!)r3Re}4ayT;S3tvb5Tp&d%jY;75A0X#RMScT@I5#3EY zVH(j~)||LgA?&xVNX^_v?W9P=ghHzedaj1B$5^B2I%fR9*35VbkiHAQKQTNs?C|LW zU4Me!r`w&8L*gRiov*%Fczew@32e|Nyr*nke|<8{Ca00Dw6bPRC*8MX-FD`|DX+Dd zz7OHMpK0H(vljtqdTbW9bSqQrZm8g=Z;*}KBiN4ZIoGVv0mYxc)EMJW-mcwgbvm)^ z-Oah*xz!_jRNkXEtdW_q{_PR~9rOo;-B7cNEg zr!P}k^gi`(#49SS2J6n(ahPMQvt=;qH8-P{N;_UJ3sztIsWjq?qfB2rDgWU8vHk;{ z*;(bL&=YQcjL4(8SVS3x@RM_}Z~a1uiOosB*V`Vdw}c^ir>!6Px6ji(Q-pp_RxjV+ zyRRiumxDY6+SwKyG6eLi9kN|eQJxX1w1*@DhyOl;Nk&9fc7(jwcprPIxc=SaC!cdEA-0~-5fZa5cl;{ z;sICMtV8n^s|jQe_4rF;chxY8p;Jq#u){nZ@Unz$j`K+5O~wkv@@H--@aNyyO5uTT zWEeM??wHiZ_+(hC^OP$O@)Lv|5fRLc7FH^WPJMMo@Y^#oHENr!)IP6YrFzJIOs4W_ z+{monVBbuQnw7P=M!=0{MZyj)aV)7~SZVj^!o1*V!WZ3-j*JE2`c zsWX^Yd!Q_SfU+g+tj+OoN$=%d#u@i%l?6ZyFxRGKsJ=avzuhY(z$x3m`rx{3uTB|J z%&Dp^s~MRF^65M~L*%|dk94lygF_U4TIPgBq{Mw+vqs4j#E&SS=Cwt#b8@FCTW-!@ z51MZvT)XE3=rUI}$XX%aMV(-~Cw}KoF)#v+f@hcZg4AY^;WC=H4W6z-T!)jHY!K3! zMoOb>7ID-5rG*ZeU!4B;k3G~XQ7~-#L;~i3Am*$te zTPKc5?z}Z9tvc)Y;$0$xEz4;`xDaTO({B*vF=L9r(&I891%%iOKAd)|WmvIx2klj< zd9_`>=|JZARLGmDN1DZ{&%+toO9-EVoSqxk_kP@b6FbUOZ*MotEhKq;!SN z=rw!X*zuCcjqBu}dPetk8M@NPL3lrheos>n=vR|y@xkTHh~%vHF_^1vqC;aYtCLE% z#&7@h#F%>8JF$Wd^;yYU^s5l>HdUhKqpy6W$V}Zg4rbkH&@3OZBScj7zzU1VFS!rx z;eKH9ts!p4LRSw;b964--lXy6Zcfdbx0f-^)3)SiG*tIq#gc`X+Uj3&QnovfK1g;v zWbWg0@synG=gSglC2?af3+|_!JO$LZ8()Ga{I1 zTPpf8G?0sxFU*3A>$^v+D0dP=Q+mCBV|kzW*Y{zA{oX-WD-_lkJ#DAsCHu5v`y>f; zjZ+oxGh8veT|{b6#rqMhrt2#lVi4VyO!qv3F`55uRK?=9SdxQHS$?fh1P`aQ#fO-b zOY#bIj8ef^Em`qO?M=Z;87t0jT0-*+o(rZVMmRVhJfQ3CHWs+*;#kj$iT~+?ew7$s zotsaX3Fi!Oqn!Vs{oFh-N#U46WW1}@HQUQWv^U}Fc$UisEAYzqfCpi3z|{h=l|Bj_ zt__V;inZ5ejh!l+-bJ=zQSWZ5iLCvI9{8cs(Q<9QHVaZt3k?_w? zv;385yx#lKg$Sq>RX5wRZG2$l?3_=tDLQwe7ELi*SrDeyDt%H}oD6n~3V27x0|O0q z*Uvt9`JE3$e|R8kVw3Ekf3;^V{DIU&pA|5;H=xec1nBXq3twzu|+dMn}6!umc~?sB@(K-^rjwm#pE z6(uW3Vax6;8IdU68!Bc}d-2VuInVCed-MwmtD0P~W=xY<5-2 z6{Vk+e(|(?s}FSc{8VCTJ-xqoVK+YiBD;~pw-(vyPz`;)exQ)xyd&8%ewoSIOr(IO z>_Yf$RjEp$_-H=L6ERH&&eG>*Xtll|aM)cq1pQ!X8rG9W6)h@StnV2$H0&whUNz55K+~it!+$nV#HIH*& zI{kkBpfUME_`K_#T7qsNjqydH$;*cDE{bFFAPiEAws5D3v~m}=E#d4O)g7-SFEhH_0dMO=F|x3&6nQU6y`zv{d zX&+YK>PkmdE1hG};j9~Al1cX;tS(95N0WDfho2r#9JT{uMb90QmV=vbdPkD7SsbIM zExu+@Q!@`9CimA4Foth5CZpHX|8f{$0zX`ROyx5OoUG;UGQY|)Oqn?n0TI4LPZH`x zNtzq4X-*;`z4YQ`r`bq{KJc)kid~Wrw_wAf#7nWBR3wv)XOjWjtxW!GlIn@s^xj(J z7eXXNm_>GkGP8!c%Unc4t3&tGZ-{e9zZO|tPr^ zJ3qo*6BOR31>wB<+QIYN-R68|OuWIIOCK2SSxhlPF)_$o*|u+Voe&RfXzv((p*P}2 zJG*l(UCXX*E2Tx+s=A5py7hY8{$o}`(^nZ>4NR4_3P{#n=fdaqC2ZT*Zwp7ohgV!U09C%>l}NH9kx-P)`9PK*has>f9L#9n)Jiwt zA5KwvR^3c)qp4>cr~v_6TGcVw6Rg6rjTA@Q--?0yIx)Hl<_t`nJ26o}LgCOv2-_t^ zmrS0BPW0j_e~t`)FeB$~=?tvjJ$Y1)d>|{~H-%5ARp~hY2k*9T&sy~Ec;>9Xw0a8R zYkiuv?9R@0V1$#0$(FreS|lTJ(iU#&yXS6O=w4^wwb?py_@mlDMQ)ZIDct6f7eh(* zbw&ZZ?mp_TW0-I2&z4nOi^@BX0M<^I2U{TW3g0b0k>T7)W+E4#0^?=#M- zS;JtjW?mI}`)o^QgdT(V{Nqw=!f%~|(zM%~QL`?sxiHmu2%rCgG42!e$dM+#ZII`9 z@F0%#zHD<<`V_$@t^G>Z!)KS(|Cn{EpBX$MCnMmLGs5`J<^KGa(ALz~sJiD6_CJ4% B?=S!W diff --git a/Penc/Assets.xcassets/pinch.imageset/Contents.json b/Penc/Assets.xcassets/pinch.imageset/Contents.json deleted file mode 100644 index 2fdd80c..0000000 --- a/Penc/Assets.xcassets/pinch.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "pinch@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Penc/Assets.xcassets/pinch.imageset/pinch@2x.png b/Penc/Assets.xcassets/pinch.imageset/pinch@2x.png deleted file mode 100644 index 1a3cc9927fe536aa2529bb4660929d2e4d3d149b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6228 zcmaJ_c|4Ts+aGIW%bqP`#ug#V7-Tod7P9Z#AjS;F*d-;|mq8_4*3QJ(CWDf!F_aL- zgpyLKv1OO-r}I1Kyzd|Hd7sboJokNH_xJm~uKT*KKc3H%YIVh!?X=)&006*dav65@ zWUM`TNKA|;@B1m7%O`^X#?TRC6YPhH^g{ar^x(nXzCaVCm%r~-UoUuc=%BAA06-@m zVC#r+v@qB32}a6${l>^gAwy2s0Dz`WREU=k!WRSd_Vo`yX@OSTJ3+tzxE9C(VsX(T z#K8Ajz~vaUuT9JqTb~$&k2)NrqYc!I(l`-7`eM9*QOF=vm`0Qq=ucgZllgD60tomg z1cT55{WmB_3oD>OFxnRgkyn=Uxu~cJR8^H%RDr0fDqa98T~t(3xOj4_$|=TakMPdHt!vEnKUHn(> z?`A-ToOp)$q5~p);YR3SB=FBeYXtmzEUd&p!YFJpCpxJ=>`1B{yb@$hg1}*WDaRv3n^sOon(l zIig)kHPPV$(N+e=OKi<* zgS-c^iytoee=Uxk+lhX$`1E-8>64P3!Absx&|f0%xCnI!EFGhp89WWy+TZkS&D-Pzy|8D*0!7k`YQ7jm5^Q;l*psFc5SB zRyku6x$c;kA?&{pz^*V@2(^bO^^+XXnqNCJivt&?guQbi3PGL=BS!WSm;*#c+zcsM zI53we5ab1~z-niW(78kePqxqxIzt%+qbVdMf$i(#r1wUpZ%0JWI=M@ECfZ$!d>opA z$Yh1+>xc|G^WWp6qNmIH<6CjV(H?BMb-oK{OUmTjd^;O8Z@S9ius}#e5G1TiB2>dV~0+8QY%{-%!Y8(kFSDY^$J~%dyG( zy;veCDt<(AWJ|V5FZr9|T>A18#S?7{gUtvngRcM$RzxzgK<^h|_E}o)Y8}`kF zta9NY;c$%PziWMe_RPP2k*^GgG_Yv3;#A4hVWzbG*7wIW>^;zg| zR$M;ey8A-dhj$JntzDyq-~z_Gq_Z}RCS=>!Lm@}mBE>sW*s#~x6hgzFaLtE=4$HKA z!z@%2|KpY5zOTfiL<390Bbrnx<-nXRr17G*_WE9U(>&Q&ZBrZpnayiNPLli`9>>m@ z`gi_#`BvTAs9D`9be6mNiR_O%`BNB%%joF2u`OZVy@N9BfcoZqw;`Fg!k8%(1tRN- zO01a~*{5@={DQ7Kol0Y(jWefXjHu*VaeeiTjq{$0A`cql? zZvtYi2_Ul{KE^x0B$~wBD%b|ou3l3y6cQU0unWlAX|E1*{`m1EyUwB&5fbYl+2-$q zH5SkYf(KE0EIY$|bOfiCx!w9~eEzTp<(Av~;T+t}Qc4d8bgSuq(crMRqT@}il>7!+ z65LzyOWsMpkyfIxk<&v09*+vBOpMLRuIY?&d-K z{y?BPz<$`7M$$&w;Hg^6_2<2@clbQ826N8vWv;PD9;lC$Ex4*h+M(8)c`fk$EnW8O z2rTbPb*xaF1lVJZ{i~>1D7vi$Au_iwCVWKRWVDqu=T~oZ7+-5Hq^l1pYvil-9Xu^;2Xwlr z$i6Caj^>xEOFsVFey7I}>_V24x|^u^O+yuil$gPo%R`8;X2-cN>FP6hUN)_F^M|XT zmUgi*efaWKLl(Edg@`5r3mtB1%g~dUO~K@yY|Wd&SVk`(q8jja_mOzeL&@}0tYjYQ z*TRx<$o5r>_q}7vyX}sar^Y~q;n#+?vCK2>BrFc_gMbR%WwpA~TYpPV-~PEwvUtz{ zH9kmhN`3n0PYwxQ=S2LB8QKRzdA!PlDT(}oulr1K7-j>75LQYEhrehWxUHM1!skS_ zymr7MJ*A%AED37I{@yc9qx8i;M0uj>aOH(7YrE2ayt|dpwX9%t z!ZPkU4D#6wa+ZD`rS(ef#9zFw~FVyVTU!62lK4Pa& zRv=4t$}VZbD8JM-Pq~j!ANz~5Q}&`2Qt6@mF{vGwYa+H+56L7Cr6W|~E0T~|pM2)jqRW+GAx2Jbcv6~{t<;tB2LN84F$q6W6VyUWUFAmk-EVdp(O@TV!TAVI zqSatpy^O+B)sjuQ39W76R*dG;eVV~%YV{Kj;sxCm*W3Qs8Mp3&u~5253g8n-hPu$&KJ#P935&)6+!NGBxe+qaznF96w#%^H%yVKgQ&67eB4Rr5>e@C}k%@|O zj$V(>yO#@rQZ5lyg>r~gBnR&@o1z2K6+Tz~d3d8dm)J1fC?+SGiYS#>!oQXFJaT*V z`3Q9x&JbgE{Z-pO;96=4sr^x-t`vUJbg+7NOO-o|ZusJv7+B}=WOxLth3Wul#+&=% zqncrrhTHoFi@nwhE+{|x*NGc__p})F?8VhYD{?3Ar;2ln4+0hUj1JqGfHk*o7gdvp zu0L;2ci!L;DpzIaPXn! zwDdq2_~S*_+15DGis|AI7L`{9(VV$)D;Lu7y%`7Yx%Y#E`3mY*YZ`bRbR#B&KDB74 ze`9Uy%5tbH5(;EsxMGz#Jv?SnPL%x7=_-G38~dUnw=0hYy5h7;sERDe*UD2^EI>iEP&TUA9`3 zXJS%E)zCIyoO>Y-kd?>l9Ab2LYP(3|yP)iz9ZL{Sc_7iYsCRiD1bbHXg880UuqoYF zHjh{7cq#j6ULOHdxchLbsDa1cCE1^3JN>RcTysQUUqIoTGvj25v%r=MKDcuOFHci^ zCgEa35N6b?M7$-gCd;Sh4X#pIL%apZ#_`Iy-hM#+r=aejimSJRR9yBW_Ct|(1p(C> zu+V~fpV={1Cq+F|8J{~Y%+c9ne9NQpo#a#-<-BvZU9Dv|;d&f34KcEm=TP0{X^1L~ zNsokL#Vyy$LU9>DB$xO0H-<~@!>6VS>K4I6FPkzCq)o{R_Dvfyy2;N)7vtvLCioar zN6$}(*A}NPn10tizZWx{0||IZ&8`mXSuSS}29ze)V7!SPy&JP8_4(}5IIola@5C%- zyNT>)Xc{P?@R`~hPAHYW?B%HIdNpRrV|7;S*~VMuIiLPH*{^cav~BgP>B~w4=QjiW zeJk?lY7AZ`LhtS!QXyYncEs!bjzUI5ny0kmHReZx40+B6U8v05@GC>w)-$x)Z#P(8 zl=I$ojg~J}P15{H+pcO#ZeAHmnKwq%HEvprDMs*!Rb1Fz%(WZ>t!&AiXnV>Lk1}(@ zV}`WXlHJ9QM|yg0v(&Cw$j^U`2dVy=yp-%SHuvKcBShamM?sFhENHr&vJoT0{c75rt7a^ z#;AG*O?g!jm<287hDe86??a>4fH9NtP1a7sC_Y~~pQV@`w){KBtp(f4G<~@EcfvcEc z{~JoY=L2W%4|q3vY=M?(?$iYfI#NjMrWEa-{jRW|HuLTc@Pbmv3yz50v`p zGU+~Lqh-zxi~7#SL?ayno1W)g0CdoZ0Uo$GCIhIi2pgs>K*U_a=*>y@Bk5s z@av;lg^<%29vFJZX2GEC+|3AQk(fK!x{QO=VxW@&z}dAzZ$M&!VNj4Zr#n2Ok#*L1 z6XcXfvz*4B>WZO=Zb~|h-(*O(UVUjwuhXbG=p6frNNoJ@>J%PEARASGU|Fd%-cvK} z9TG=Gc#35YzclJ7V71Zwg~e|n-kD|MB~)8IIYpTvwW|eS)mA_>A$u*9=hn^17eV)D z6a2>PQq$uJ9lL79pl~tPKypyR`GhO)9e;$K7EQLnn<)cDftGyLAEnOj@rx#N2k8>N z*7_=(amnoZ8oK9$$c5a{{3EYn)$FdYIY@_qzIB&_F(o{5xyKmGqK$y_L289wpP32q znX5`RpU8B(#@IHXRx<1^ZLSl<82gr0n(rGIUF1}M98dUXFjzLt;@%&Aa)33SxCh*g zcShfn&Z*F)F|4yTs)@uU;}2^%PK~ij^Y^|~HC!1sw&p&zZs-!4z<>F8dXkX0Cml%Z z#=ub~U?uOaNT|e)e^bPzmaEVmbOW18yzM_#US`lJ)-f1%)?VRtY1{>h8X}iXhku;< zSfdA=zZA!l>NgGmr{kOs0mUC3Z+;E&8t7HCw+l=4OYmmchaLQYDK}we!g;-em@T%?<2Bx7Edx3gJSVVbQVynDoWk(!(NwS&pi&6 z%uCp8yGdMkV>ZNt&A66j* z6&>bPoDI`}ARKiq-V%}MhRe^iU4o8QrG{ZRr(Qb2bFG062F>tiCdXo&-PHV5Gr}Ea zOrih}tAzV=>{5}9!!RvsweWf+i z)qg<{%rUj^lM8VL(qEEJpu*}`>P$yxs#D|MTZX<)d`Uc)$18ZITEihd^Z6IT#d8ou zTS5cxO3BJOxAF8EJ!9&ks~+J_rclO`%{t_H<&@$O$#$~liZ0;}+h*dk>f0Ogw)@A0Okqbw%T>x=(jQV;o)b;m&eiOqhuzG#ZTmJzVz*~s` diff --git a/Penc/Base.lproj/Main.storyboard b/Penc/Base.lproj/Main.storyboard index 9cc0379..1e2a45d 100644 --- a/Penc/Base.lproj/Main.storyboard +++ b/Penc/Base.lproj/Main.storyboard @@ -688,11 +688,11 @@ - + - + @@ -701,12 +701,12 @@ - + - + @@ -715,12 +715,12 @@ - + - + @@ -729,7 +729,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -747,7 +747,7 @@ - + @@ -778,14 +778,6 @@ - @@ -803,14 +795,13 @@ - - + @@ -893,52 +884,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -953,11 +898,6 @@ - - - - - @@ -966,8 +906,6 @@ - - diff --git a/Penc/PlaceholderWindowViewController.swift b/Penc/PlaceholderWindowViewController.swift index 5289c05..3303588 100644 --- a/Penc/PlaceholderWindowViewController.swift +++ b/Penc/PlaceholderWindowViewController.swift @@ -8,73 +8,14 @@ import Cocoa -enum PlaceholderWindowInfoMode { - case NONE - case MOVE -} - class PlaceholderWindowViewController: NSViewController, NSWindowDelegate { @IBOutlet var box: NSBox! - @IBOutlet var dragImage: NSImageView! - @IBOutlet var dragLabel1: NSTextField! - @IBOutlet var dragLabel2: NSTextField! - @IBOutlet var pinchImage: NSImageView! - @IBOutlet var pinchLabel: NSTextField! - var mode = PlaceholderWindowInfoMode.MOVE override func viewDidLoad() { super.viewDidLoad() // Do view setup here. - - } - - func changeMode(_ mode: PlaceholderWindowInfoMode) { - if mode == .MOVE { - self.mode = .MOVE - self.box.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5) - self.dragLabel1.stringValue = "Two finger drag to move" - self.dragLabel2.stringValue = "Two finger swipe to snap" - self.dragLabel2.alphaValue = 1 - self.showInfoIfApplicable() - } else { - self.mode = PlaceholderWindowInfoMode.NONE - self.box.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.25) - self.hideInfo() - } - } - - func hideInfo() { - self.dragImage.alphaValue = 0 - self.dragLabel1.alphaValue = 0 - self.dragLabel2.alphaValue = 0 - self.pinchImage.alphaValue = 0 - self.pinchLabel.alphaValue = 0 - } - - func showInfo() { - self.box.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5) - self.dragImage.alphaValue = 1 - self.dragLabel1.alphaValue = 1 - self.dragLabel2.alphaValue = 1 - self.pinchImage.alphaValue = 1 - self.pinchLabel.alphaValue = 1 - } - - func showInfoIfApplicable() { - if let window = self.view.window { - let show = window.frame.height > 300 && window.frame.width > 500 - if show { - self.showInfo() - } else { - self.hideInfo() - } - } - } - - func windowDidResize(_ notification: Notification) { - guard self.mode != .NONE else { return } - self.showInfoIfApplicable() +// self.box.fillColor = NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5) } } diff --git a/Penc/Preferences.swift b/Penc/Preferences.swift index dc0c827..a31187d 100644 --- a/Penc/Preferences.swift +++ b/Penc/Preferences.swift @@ -20,7 +20,6 @@ final class Preferences { private static let key_activationModifierKey = "activationModifierKey" private static let key_activationSensitivity = "activationSensitivity" private static let key_swipeThreshold = "swipeThreshold" - private static let key_showGestureInfo = "showGestureInfo" private static let key_disabledApps = "disabledApps" weak var delegate: PreferencesDelegate? @@ -46,13 +45,6 @@ final class Preferences { } } - var showGestureInfo: Bool { - didSet { - UserDefaults.standard.set(self.showGestureInfo, forKey: Preferences.key_showGestureInfo) - self.delegate?.onPreferencesChanged(preferences: self) - } - } - var disabledApps: [String] { didSet { UserDefaults.standard.set(self.disabledApps, forKey: Preferences.key_disabledApps) @@ -95,14 +87,6 @@ final class Preferences { self.swipeThreshold = swipeThreshold! } - let showGestureInfo = defaults.object(forKey: Preferences.key_showGestureInfo) as? Bool - if showGestureInfo == nil { - self.showGestureInfo = true - UserDefaults.standard.set(self.showGestureInfo, forKey: Preferences.key_showGestureInfo) - } else { - self.showGestureInfo = showGestureInfo! - } - let disabledApps = defaults.object(forKey: Preferences.key_disabledApps) as? [String] if disabledApps == nil { self.disabledApps = [] @@ -121,7 +105,6 @@ final class Preferences { self.activationModifierKey = .command self.activationSensitivity = 0.3 self.swipeThreshold = 25.0 - self.showGestureInfo = true self.disabledApps = [] } diff --git a/Penc/PreferencesViewController.swift b/Penc/PreferencesViewController.swift index 77667a1..4f9026f 100644 --- a/Penc/PreferencesViewController.swift +++ b/Penc/PreferencesViewController.swift @@ -17,7 +17,6 @@ class PreferencesViewController: NSViewController { @IBOutlet var launchAtLoginCheckbox: NSButton! @IBOutlet var resetDefaultsButton: NSButton! @IBOutlet var modifierKeyPopUpButton: NSPopUpButton! - @IBOutlet var showGestureInfoCheckbox: NSButton! override func viewDidLoad() { super.viewDidLoad() @@ -38,9 +37,6 @@ class PreferencesViewController: NSViewController { self.swipeSensitivitySlider.target = self self.swipeSensitivitySlider.action = #selector(onSwipeSensitivitySliderChange) - self.showGestureInfoCheckbox.target = self - self.showGestureInfoCheckbox.action = #selector(onShowGestureInfoCheckboxChange) - self.launchAtLoginCheckbox.target = self self.launchAtLoginCheckbox.action = #selector(onLaunchAtLoginCheckboxChange) @@ -74,9 +70,6 @@ class PreferencesViewController: NSViewController { self.swipeSensitivitySlider.floatValue = sliderValue self.swipeSensitivityLabel.stringValue = String(format: "%.2f", sliderValue) - self.showGestureInfoCheckbox.state = Preferences.shared.showGestureInfo ? .on : .off - self.showGestureInfoCheckbox.state = Preferences.shared.showGestureInfo ? .on : .off - self.launchAtLoginCheckbox.state = Preferences.shared.launchAtLogin ? .on : .off } @@ -112,11 +105,6 @@ class PreferencesViewController: NSViewController { log.info("Set swipe threshold \(Preferences.shared.swipeThreshold)") } - @objc private func onShowGestureInfoCheckboxChange() { - Preferences.shared.showGestureInfo = self.showGestureInfoCheckbox.state == .on - log.info("Set showing display gesture info to \(Preferences.shared.showGestureInfo)") - } - @objc private func onLaunchAtLoginCheckboxChange() { log.info("Setting launch at login to \(self.launchAtLoginCheckbox.state == .on)") if !Preferences.shared.setLaunchAtLogin(self.launchAtLoginCheckbox.state == .on) {