From a7673e0ac3f4a0e6cbe15f9fd4432620073b70ce Mon Sep 17 00:00:00 2001 From: Riccardo Mottola Date: Sun, 3 Aug 2014 22:03:38 +0000 Subject: [PATCH] Move GoToLine to the View akin to the NSTextView find panel and declare it in the editor view protocol. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@38031 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 +++++ English.lproj/ProjectCenter.gorm/data.classes | 3 +- English.lproj/ProjectCenter.gorm/objects.gorm | Bin 28908 -> 28817 bytes Headers/Protocols/CodeEditorView.h | 5 ++- Modules/Editors/ProjectCenter/PCEditor.m | 26 +----------- Modules/Editors/ProjectCenter/PCEditorView.h | 8 +++- Modules/Editors/ProjectCenter/PCEditorView.m | 38 ++++++++++++++++++ 7 files changed, 62 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c503b1..54d178c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-08-04 Riccardo Mottola + + * English.lproj/ProjectCenter.gorm + * Headers/Protocols/CodeEditorView.h + * Modules/Editors/ProjectCenter/PCEditor.m + * Modules/Editors/ProjectCenter/PCEditorView.h + * Modules/Editors/ProjectCenter/PCEditorView.m + Move GoToLine to the View akin to the NSTextView find panel and + declare it in the editor view protocol. + 2014-08-03 German Arias * Modules/Editors/ProjectCenter/PCEditor.m: Don't use diff --git a/English.lproj/ProjectCenter.gorm/data.classes b/English.lproj/ProjectCenter.gorm/data.classes index 8dcac7c..da02fb2 100644 --- a/English.lproj/ProjectCenter.gorm/data.classes +++ b/English.lproj/ProjectCenter.gorm/data.classes @@ -7,8 +7,7 @@ "findNext:", "findPrevious:", "findShowPanel:", - "openGoToLinePanel:", - "newAction:" + "performGoToLinePanelAction:" ); Super = NSObject; }; diff --git a/English.lproj/ProjectCenter.gorm/objects.gorm b/English.lproj/ProjectCenter.gorm/objects.gorm index 7484996055bc6f3cb096112b728b400badca9183..a3871a39ec983f11154a4214ed5c1272eb55387e 100644 GIT binary patch literal 28817 zcmb7Nd7K3)8F@fuU@^X zdUb5il8!ZlrC^{bTkP79+Zed6+mrHB?mQIm&-1vD40iG(XXCo!p`bHz|8yS^{z48pIyQHjwVos|!X1A!am zI^O8S_>ggFDd@*nBH@nm#t>g;shG?6hF=kO>H+v~^eie#wQ&Bx0GUuM^z{YB*|R6& z>qPjURwSu}JK7tY7z0y+{185Ze$4O~dLnCl5`6AhZ(L$Z&EomRVs;COd*c&hJ36Z$ zMQHVSGGe?t&YO^!z{C~XMrw>nXXRx)CYx0xBS~RI_KIl92&_mrlEY(SD zEl=E9o?O$gb*n^$wz@MxI*Vm=>s2x635r3!D;Ol!*}KU)2dsOt%%qyBljQP3Z{5

yf-pBP46g$FghVm8` zm{2o*f?U`aWQ$G9bAzSw{yW!WXMa^92JJAH+uC~!CokQyfxRX%>AI2bK z;IuXB;UNB?NleZkNqofa5!VNXBcb6a7S_Xtn%13fA>BF3-31sGj&c`r?-@tEXPmnT z#78rMKH^kIg~j|x5A{N$?p^}wV_04vf63jsd{cEyTWV^^H>zP7G<=BVb+3e-X}QTe z*eLG`@OH4gKBR=fK0ll_R`Sz^BSeAmSPSFo0>#{_-DKj$AlYa&so_=0?pu1+=G{<}NG@Y;pTc-mXS@`@x%Mc|8VI7V8MNU=nX^ zlz0Hdr?LEqJ|1SZP4oNu+@i^zZIpcw>?M}hLve8~-|Y_Z_eOlzLa~}DZ$!A2+)W&A zV<_ClxSK(|g$eX|n2787=jo>9Jv&=IQk&RX&6>}Ef-_lud@Vl4%TPf_u({-(Ws>*C zlgk?U*&sj1W_>Z(m@5nox*szYbjK@jY6{MUf{(MjJ}MraF9pRWUa_EKyXToIf_N2U zYbwr%iche-o<%Gh>K|xYjbS$oAX4&4Q^_guN)k0C7eL9USYB`D z+EmcjpaKk<>%vsGK6+jVl@~Fi-qThW3Vnm_XZXRcWA_zTpIcCF^^Jw=HFmE+0 zb4;!~fX51bO$)L`_j48vwsGuIkba(J^n`b5esBOwr9$YS%XX9Va&TT@8d^zJnidS@ z`nugOSV%{9D9jdD!WCDzSFtNbQTH9?UJVV`m>N1a6gJhn?-wl^Y_7N#q+engz2(^4 z>-d2_2QAn+NNmK{gZRrVKVpn56$UEK_=?GXVx#Ogfc>kc*|c!WyInjF+lhF@<#n~ zD-?X2<@czKzHMxQWft_W9#?)Uhi?u&yP^~LQVzk}s(TDE+!gR z^ZGcsJUf){+7J}oAMi6HAdQ&08!>a2dk@DklYkwt^8G4BKEk6A{~ z#k-TQZwYCEWY!ZP{@vM5+T)ayR5dt^12)~A*SLH`i5=!?wbkhByw4Z06o6x3XM zTNpbSQXheDA98;>!ncot{AbKCt=4eUByFGOdxNH>`KHB1?Ap3Nw`j4scL#VMW0@H> z-WhU5E}zSmhKjk^P~4cqR;c?dKihSDKZiDW#{C7i0rrindza5c!7rIaPkCvUcYkHpU_*m7a9;rL zize@}Ls-@Q+T=a0L0;@wzcf7B{S7ndgG)!}V#LdeY#w{#@!R~r1;NWqpogAXNE`nR z9u@qq;z;-R)xs;@o|1ea)m;QYiNG zp@vtU>%PtaJxWPOvzKfsPj%mjQIN{CxNjm{{=yi2I;yW<-r|RPZ#C90wlU$aEE^7D z6TAMvROn931uKy0WyV;QpNfx{vGCPbSNEyZT0uK^Yx1RBsSl~gfBCsF zUf5jsHsf{2)N18!+8kgTxVhm{+YtvFmVw4zXYB5&47A;DQCmofezL+(y z5)(}=#-i7%WfEzb%nY&1UL~fOdW?0iRnJt?GmRPaU1M7LHr1BCN=!GE7;9gP5-F6J z!QzoUB$X*Ys6^$oF%sdo5@M#E!%wy;F^j5FIbPJ`k#ct>=CHKUe~hF@i9LtM?hvz; z*o#A$b4n#}Sg6E4OrvLQofvFNO1z7o=%MR3I5#RWm$=`}3?q75c5|*DsgDx-n)F`7 z^i4$n9+Q4Go!PDI=}}@olYVuB^f=!Rmx4;Xmr0`9(D(fE(@N~mh^Ub?)vCk+Waoh< z%hG%|4mHC8U5WSc^F~^-nOgEdC0e*8d4EI+95*U)Fw^K8;;crA_wysYDRT`vLkXNX zDsdaQLW1iW&4J z@xns?Krt8`Y&vd3t`rOoWV;ZUt)`|k8rFnUNF~~tVXs=&zn46E^FTJ=-LwMAkQFxJ zBk9F_u0-0@cUFV?>XDjZ65V~(sn7G1<-?Vz99&xFPoxC{N*u;4dMj61e6QT8#NiCk zlaDH(Ig@EA->bw28KSS#2-1w)?QSKG;HM*o1bXVXwv-Q0;z)iRRgI*VDZijZ|CtGQhsVW+ixj9qQo-Og1RgH@&YA3 z6k|bax}`iviRCenl-ol7USUG&dXgzJrGp{*giV*Ocxg$ME21tcg+4iheLoiM4hW zNx!Z9s1nE75x$o!Kd;1x?Fi3LQH&nXh$wgYetE4Dl{408XP|MfSK@>iEv`$Aav~!l zNm>z!$gNLeNK}vY$sH%#mH2Ku3bFI_%FiL9LhD^pZ;eGEmq zl@MKwh^(rI;Sr(H9Rq2@7>SWOFdioS7iS8}Q@|{X-up_+oO!*Qe za*T-bYI{2YPO($?zFXc`iBs(qtw|;NXuj+>Svm)TzCPTf#4(i;d46srNS6FuiGoR3 z9XUO$UlG{@jEHV2jIGO*I4uU!h5;7V7fndLrTh#v!=T-iW{jY2c~sd^qGU%U{r2(> zC5B=UZnAu%5*zIZ-%HUzyvdI6up~h**&Ks#JqnsFjEHs|#zzb*mDA(sOv6PtXjbBk z7@GD>%MJmjoEd{@!%%vV5@*@%ZN^B7_&eK<@ZB_xq~|aqYVb*xrz`O>J3|r)#}i7N z%ZR9Mf^1=l5+Aoyct~qpCC;-`AQ`wpiSuJ9(rtwJ1S29_#z&}OeEMVz#KU;rro;sd zu{0ifMn;KG#n7|^l2zi<4ADoQde2BvmUf{@Qb#1)%2SoN$Rw$D<7P}8GnM#E90^uv zS1NI_38|4J;gLWY3&W`YqtfBv3A7hA*NWM^sFEb?CX&&PA3?;r2qsa9s$Zm*ZanZvO?O%;C zCJjYbEAh1$NIO`TDRCo1%+|roh#dDOejGKZrl{k7ou5ZFp6_O8!n--fh9rD;s}kR^ zlO$7~5;$pB;+qW84ORFXjZ&Cde2X9IePy8GzH%!IM-2+dDB+`T+W~284wcEgVG|Rc zdQjWLlOJ`D(xyziP2ZKQ6e=Kh`usrJR@R6F+8 zaSp#jVBho(1{$ecZP&7LcMUzfx(WAv7KsX#WU`ea`c6hfHAFk6tGme0KVXc05?i^_ zQMsK%*K(D(+hU(J)x0OhIwaz-?p`~>$1>{>C4R_=DEnIxCqE+l?_-RLdi<%klG5dTk^ zMvq3~uU%VG;!#HEy|L7Au>Xv7{M@X=f-3Dv)A_xW97#@Ox7A3UlfGay9NoDe(t>V1z|&EUowZKT^MZ zMTtLgzpNf&{+ak+HLEheFV~x|Z0)~h(P9n0*NOBEmePC6LY#O6n9|AVlIUo4z?y~-kSpUvadNYQ1s#Xo*FEo|-$L^B;lSuz%l7_KYA^kT$)`PF{gD;${ zEAby@(0#$dSJCiaQ$wRCcY5@_O}hTaT>64zMfTL7X;rRkLlej0JEpo-4Fuo-ZRzG>lxY%z90QE4V=>LVqIH~Uz1Z&Y#u zKh^`I#_nf!h+CAL$dJf~BYcwz}n; zm7HoP@v&<=UCC*7gok~xWlBzuL116(J|$oWYLk?Mm*!5X0%nf3H+>CO&W@^L62 z_qJ1{+mzgg`pdf*qj&k*eOX?X$hi#B$FRd2>@P~bn}s7oFoO_8@a)TwsET;lb3;FA zVuaCT=w|TLd-$o@WLUf+@b-(bpcP#Sk@sE`Qg4oAnw0Dx2f>aj6dk~jsCp!^$F*I_ z17i@_zyjiZc7%_kU02EG7(~X!QKD>NL{#M99hnggH$G3VoM3x`0lla(hovEa2M|jv9LRazZ2p>DH7b@x7 z5gxXN&@xFzM7pF61NM~oJRkas0D7nDY;x?>hA!%8}4En{~P|KpA2Uoc1E+*#lqfIrL zhSe-4HA|R5Z~jnCm|MwXO#XDk{7Z>{nWY-5g5IG%+?K*s6eT}os%dXn&2mz+f*JG} z4EM3HL(#QC$qrM&yoMF5Bn65YB4?$Fl4BWSgs>$&tY>bkSTJgs_OYkEM9EG&!b^EH zg05ynImE>SXPM5M^`r}wyufY=wlHX6 z^r<)&7kv`}|7pfVTAPL2RQEQTx<`*+0DvFZ0 z{DE%uSv$hVni}c%C8nBc<25JYc}!(nV@Pl}<5DF*XGbKlrrDw7rHqJ*5iD4aSMu|A z3NO=+3qbO+7zEZ<2yQ*%3b0 z)`;Wl8DViMLg)-7zs#7Z=Eq64{0e2jH!wy&2%xvbDEU=>VC20KOSiAl(hcLujl6WL z{3(dMiTJ;6ARBOBI;Y2L2pCy z3f>#nOV{h=xB0o@91ClGQBY>V$T&}<)zB4&8DeZgVTi-%bDK#}k74Xn0P-D%=*CxL zG?}Dp5OSMIQbjbUFc2bkz8gb=oF63Lvm<=mP{}BHyB*9=bjjnH1wRWrW2z1JtK`pP5Lhk%vBQq=v93k@KE{Y> zU!mbKFFkH2@vs~~S9*dGhBpzqNaLT3QPGM3#oFj86H<2R`HUUm z<9Oz9C7+E!;CKf8;5kM_MIRDQ8-wbblNZ^bOFR9{DSNrcYl- zHaN$WUoQVv$rqR)vc=jk)?*jp#TZB{Vi;TBzh+2ObouEtZdS^d>h8H`qcl~l^_!U z;6DtAZW#>67{va|km#($MYIkm`F0FVJ0RyO`M(%Q8wT!um3)UGQ32hIaeHs&ButWe z2w=T&vvP!;#7}3i59CNYB8j}>dF42ah-w?m_`}K>WvB45A%47aMl&MPu|7iaTIGyk zh{dt!7R|~T8$;6$2sDjjh><+dp2n5R8PAU+or{pwv+g{$+}iKQy3BDcFg-qIa6b_Q0jT9a;Dj}c*s#Q%9+jxi`xAd7W}*+U-ap!FXCZvto24QJHPZnQbTWv9G;IIdftV*pt3bIeRi< zR_)KRXUUFEey#YTLf23~?xhXVnhJTlvlnBd8UXu&hbw1qyE+d^(Z0&rhnLn{>GdvK zmGdrdD!rqhe|{hzzFH6u5{Vshy>jLwa^A;M`jOqp_v0$3nIxZr04mo)y2s-q$_LT+k8t^5D!;?* z?5<@xmeWG*kDGPZq)b0J~=!B#FJE2*rUqjzoPVq)0?0$^D}Ec@ak%Eu53 z%7~Js%%X2lbq$peAIk{e$@mWu9%bN{GhPqFE?m-uzzPyLi3K`H0A&cQWC8skZh&6o z3kgLM|7D3|Ndjd^tYQg0a0kN|tm0}Rq&i7z%?@WSDzci&9=m1@F;H1KYndS~h>s)5 zt04fE4^#Pkd_?(plpT76@<-_Ve{=Z+VyCilPTV#7NyIV^0$@3r$^suzUPtB8T>dDr zpUmYfmCxhydMZE0TDwRqm6g-IYpnsXV~~0bntF)k0enQcm&z}3c>`e_F6XE`i_51F z<_<2OO66zSf8`IS|IjG_=xfVmFIBzG%8Qza*^<-aQh9CCMqkZ zv};X6BzXn|z`l{nm*FGIn~3GIFpf4ei@qSr@(Ti&=EK(m&Qs1765Y$~kw} z75_M?ybS`V?0Lge%cHm_oR8wmT>OMLJux$!a8?fCwOys1=bO3ZQOc-~2LZ-K#2&ti3iL%py*Hsh z!_<26HNZc|K+9G@FDBw^2>Mxu>e*lgir13?c?lukBIH&pDZLsW(9aR{O@dy^Q2nk@ zg%rQx5dMA!;GZY>;{?Bq;re^9DsW=1;x8xs>x938@gqWrtH(cYQI+@tB%Em^aV1Oa zG-{2g=v4&Xi@;aMfl&e2ehqWw>C$`(uEtDHgk zeNsP(kasdt?`SkE@LP7PF1U-}6AAtUhU?=(H@%a#=7hV+hVuz}4@32aC>45p`vQ8y z`1))SX535Q2MGK_2J1_T(2VdU(TfohgH>C8L^3atOl8A=c5N9lTlUrQ^a|w#Tj<@) zQ1oM}fI~v}v!Ylbdh0TTwv*5-68Z@X&8%sfscWKZd1N9)9w6iHAdv@IWY3z&p1Mf& z`gcX_A(}Ss=j8lhqPU+ZDtq*LWUxV0ub8 zgws6Ox`RLv0O&CjRK#f_K#zk}T*(Rf6DT`-;v*)vC#gIJA5ne^L?K2wPjjvHHs5)H z@(j=<3AN8MT5t3&`jM!emXa{zIjY=!T)AIR`6_&b>gTD9bmc0Pe@XS37!p@DsOQw2 zKSx%kc)AH1dav?>BFcGzD7G=hi$t+4r1&-4))2)@M3G{O-w;JAq^N8iH$?F=QM}C* zzaxsbLyF(;h83?6#XU^%2cozqq^Rur&aL@kuB6}p3W}Z8-$huOUz;1u;TQVm7lSOE z{U;J8XDg?&+Z)%Ouaep_t9^|m%c0uJ4(>iRwfj_?U`b(hfnFXtvKihOo=iVKm-v4= CDFGM& literal 28908 zcmb7Nd7Kf8NsYw6bvM@#qKq^wSnuptJ8kkor?ngc^(&1tNqF+ESNK9VT*^yf{zmP9w zbNQf{NF<~u6XQBMm#;cC=q};!M8cJxlbF=exooJEUDX$K2I0rvsKn@w&dMK&{eTgf)Dd@*XBH@nm#t>g;shG?6h941jhkfzi=$TZK9i0oIe_1x4?G1{vW=+J0 ziSR$INHPg`^zdkR%ie*85s6meL z-q^$#*aH%%3EDV;31y8?g3z7ljY~|fnQdONnB73F@Wv;`c63(%6rt(HlO@Kxle`Iu z2~1ou;HZSV1Cx)ck&lu~@~aE(Wd0oTQxhS{2ZTsSvC*C4O(Y#l`e9LgB=Dg-)ti)< zQmaj^J6LpbjeN3P6gI3g=tKVpJsaI=!xJGseRvX?ePRtbu>xF{TOahu#1*0PjqZ%$ zvE?1y9f!ve+M#AS?#$r{?kujY-tW|kq{`-lzBzN|xI0;zlh|0Evavj^reWhoi3V+S zXM=QSmeFgkioxoj805QyL1NuyJ6U%H>uxMFsn*mwaSthq@Guh_~0?q0C*p6=dk~=D)1mkfmGcsP*2E|gcR7g^7d)$vRMDM_%M$K?MRGh%_ zqigXp8Y63AFmO*aiB~pCd=iL1!Sed>x+2JD`vdo6e$uFI>p^k~XtOM=yTcJZxstoe zLRt$FAE|C){NT{4ek5)4x=Xo2e(qY&Kg^w*J}g76M@G?&0Lr>O96)0!fX2E3l&&_F z9+U4WxV`+jZu~PEwb2^z=1krd0eDX}d5_;OF?~dmXB(?d18*P8JGD-AVIr>Q zpXZo0U%hqBM`{xrt6B58P;eg0kFWX1co{0_2-cU}PnzVt@#L~bem=-QWvhKLSeq*h z4Z5E;74*a_aB2!JfPxEIULO^Y$d`g*l2BD4JyE(*&U|3_0jWE zsJx6B^+@X~6#53;jr?HSK6^QQ_A>Vh_StaxKH9w!%wI4YvpCliz+#2Irfq+engJ>gxF9~{6^sSq0I%iGC$6*#XpD_Tial7|oF`g+`JETkg?3bVzvFvZpG zb!>`J6uzU}>!IN*riRWng?07t{i;QS%@j9)^hTD^dycF7HGZJaL5FYcBsSukK>T%< zA2CLj3Ii2m+-$O+*eLrgVE=|$ZCbeH-EZ;(!{IDdg&SYaOSfCWdK(MtezCNW?FlMt zA@_C*xzUAppbKwvzcs>}?}UOf6X>BivI~b9pj&-uqjtFq3hrk48MP63hU_dLuUoYt z*_G=LlE>zPb;$0%ZE1+bO71ba&ih$LpD<{y2v>&gcln`i zi~Sq5#RDM!9?R>-#vV>MSFnQbn+i^DP(j^q9)zZcm}p$h>f_|n>`=aYO;B`yz|Rba zG<@b^_{>A@57}ob`&*BI{86(RBYoya77ez}+ziskSVqs}Rt)9c$G4N}2~a)BGWrOz zAXqij>;8EA$Z967Pc2V@{%K~>7nv)Ov=r72y3be?)J%I<=sOrvpM`CocDIbM?Q-K_j&NXz%tWo4l!LW%jI*~(oivXMv&wNxIbf* z?%@3m`k(tEw7kUfdPIh6tSbM{P5yNa^4I&|Whi=uiFE(&42o-W*a~%j!Oyns->;$% zUU7fPeSm%A>fYsRQ1B}z(NkWU<=tPKEm+fF3*6Vi`x}$@=pn4?erxic-XJe_tly}# z!Tnve@Oy8E#EjY&_<~%x49pgJSAH@bag6*7)=G%A?jN`s`W#7H|FlD&@yge`Z}M}! zgR9S*e6P8DlKV$S=)0#?gqKNy;!iOYnYQNgRqmfnibaKDKOYu&<-Od$FhK8p($VCl zn#(iXzs4v?w>P_Qp&Q<2j6TfQ*9GtJLp=(Nb%8C`-euWvaF`ITt4Ad|5}k?ViFJv5 zB1jb7_ZXp10yrWW80gD&XKAhO{*3{;jqA-%rOFSx@0*CKjhj;Fg*)B9Ga{-V+uO_c zx&PqjQN5H(dF9vLf7$_l+IRmCHvE@a3)&GoCSS^x`Y@&co1YtTXfxe^7_S?q)+*0S zHi&-rrfay(?gztTl}Io^4{YjrB?N~KuTGVa!xNNn%qopopDHnm z5xTD!3sg&k%Wo+$nzU4o`SgafmP&4*#8^{{v5>TAQDPkF7|#qbOGzarm|Bdrq*cpA z(lUt|Vpo$&>|p9KmXlUJlS$7MX3#fdX+fE+ttge4YAP|7lolmYC^3!2BLgJeUVci6 z>5S0BwC0QH*5)l@q7pM=So{`Z+0l;hQ>{wiJW+{R4AOm;(q<)W2Z=_$p~URrv0KC} zC3a>v=X6eqU5I~I=GPOZPK-w-C3fQ{x_kQ#PD@JcPTYGi!-#;)uFv%&>ri4(liq8X zK1uX@ne<(BT(*4mY9;nI>AM=F$I)`Q3R7YqCW-O{-}B2aEAb&lL=Cp-7A5wjdhTbk zEXnuaJTV;emH03}HwMdyo@}C?+)s&S?n&O7P~sz`W`Cy9_o7*i5(n@jy(@DK8bgVX z68Riv(A(L$CbznjTpFx~uYAl@a6-chTvFgMgKlb8up-yH1{!=*!$}QmNRfs#Gw7?) z`Gx+0VlX(ET)8G!3I+$V-EhnnQ`4CZYicD;ZOpK9E#cl-9a*kHwP{xcHHi*G*X)ZS_aTq_2YHG@B zFTbwDyci{EyxRYfsG&kgAA z7B3E|(dAc_IGRCGy^>1#BC07~Yk9E} zl@r(~=kdHu*;At1PJuNrn%ZNpg_mg|M8JqhdwCdT;To%BAgvf`G2r)_5G`I>C=}Mj zK|GIwKgW=$2B)wfeNc&0?Fg@}y?mt-r!gYRs%>oq=(AJ!zFXc$iGDjpOG*hG+$vEp zSvm)TzCK*Y#6go11N_{`vn)#iB~CX9t0Sj}l`=fL$cX5k!r0oO#9$1h6$5OW5+xH- z?GGH|X3n*CRLXBFKd;2P7=)WD->SrVJHq$UG!SpFBRs5Z5G7~C zAY6}}=1fLJ8xG?mhLy7z5}mNP2!jKZI6H=>tsUuvRN|Z%Oe=;`c*eO5iE{ELjHK|t z^Xv%U&Cp2tNk&8sKB@9dCC;}qq>ymDsKloj5fvuL7LHQl({>6EnNM1Y3+xm~25wQ} z!WfE7DKJ-=p9p!j5K9w zpEF77h*WENh7zAQNvdJogo$Ie5|_r2V4-)d5|^2f8c7Of*{sAyyPg#ClSh=eoDoqy zjI?2s5?91fcrH;~X-D|T(c#Qruq$bSi+quW%1w;X6Q%iUg6`9j)d5q9FEK=4GalIB zvP6k5vv9N%A)>BQ;wpPJk^P*a#MKP2xDdt&tb?zK(bEP9X3A?BVq~u#X2}nfxQ-v| z9#-wwl%Junygo)p3T;7d@|748H%-ajSM3NNnLd(}8|(-Vxf;U%#+ZuuaO6vs_*x8! z>y!W7#0ZO35xj8Zug56Lz}K%=;^r7g8(1*$-NF#l@R;g>P|`!ldC_{7?^rfri82P8N=ecO;9j zQP~d2VEbs8s&|)(36G_NVzE$E;%>8ohcsNlZ?kZ;H+XRFi2X};oM${M;W8<4lcyOTDGLbkNA<@q}7vaB{tLkqO8ms6Uez%5Pl@_@X3#reNhynyKP6r;$s6CE{TY$J$PD^mio3f(5o;f0Q7`dR zql2wZ`E%lYnWgl&=^Ppeii6$7+yJ`umF;Ey1+l(r))e0^sB->tdpU7luf(rdN*{iX z$yX_Vy}gt;s#oGSW;N*+aFRXxxBOIhv{b|1@CNb!jv4fj4Q~Ti6#U*)kZw?c6kEjR z%K60~NY$InrN?C#t~Dv~M}AOmyW30n9ufYHrF3uRT2{^%-rru%M7|L*!e0N{%2}v^yE+Xz7L>F zCYVcKX)Md079>~Xy4NH_Ka|2$x1vF3SCY=^rNa#R(N5S6xB#D=zb0GE;wzrTK_y2q z&hU7fFG@P2mt)K(C_2Phn%z(s3bRBx)@*`munDy@9663j^a-w(19=`2+I32fXN>M} zRSb5dPE&FM1ERAvA3GxBl$^*IV_zAm{j*9=;-~s(8YXi-mgHwBxdT7eou^guc-W9bEbYSxqstJAu+)e6 zso7;%{=)J0jj2HkLJ6L?p9!gVM=C=~J{$+Zb}SS%F(j%TDQti}p=5Im0=rv4e8i6M zaeSOsa{m}ayNh#1c>p7#JO{^Wc_lw;r|_`3^|F$47!loTSWDibBuK{nkl% z&rTl90Av0&GfsI3GERArl817}$=_2{5?@kQavsy@lgEfl=t>^W2z~5W*znkauPH0J zfEn~lbK%9j6}9&+D0zgb#cf#2LejE`8T2dPp_T=~YTVGKE1}3*7Mp6?8&pT=pE|AjVxSuQL@8S)7G$><)lV2gYJXjP8fDEy4NUq zw5ecj!wOcAf=*_LoRum{x)@@(uqB18XLrZ2VAL?}W5fF>C6BcuytGFn=t@RJ4hFQJ zjWOpqhUg2Yj_}1ZWk<=6$H=!L5t*yx@%BnIA<;mnpJ0;I2T$x}WAHrDPLfK|LAyLD z27!AAKzzcE@Nw?|6*)Nufja{j=TBjT?l9G14`E18Xhq=)T8z|bt-T(pbea|*>tYbd{ef6-NBCG>b||?arXsXHyk5yO z7^25qy}3A!m1i=*(l-d01C%@~Mo$|c$18a@L$-F-CJ#x`NWde6Wh4=Q5f(wlHYX^I1k%x*u@|XTBt+CK>oU zRvQuL{?+z2wSnbmB|pzBriWmr!_w+fQ%T)JT2i#^zKkJJ9+JYX4}{D{JHp3$8L9Q< zrkYwsQ?M$gsVibga4BPxl2_UhDXdqXSMm#ti0XeVMov=li*^dHy$v^iNom zV}!-5oG zdg%(kyo;Y3#<8&07X^2-U}P+0&}#^nZ!^T$gu*b05$Yb3pzi0`rvT(T4ACoJ_2X2E zE>g&QO_D02DUHDrzH?s;337gr+;2ztxW96+lHau>Jgf>ZMm=Ch__)4;@%DR+i1J}% z<5(1Y-%jCSVS#;{2N_`r6$EXUk`FN^vR~SfU?3)c5ThvL(h&7<3`quhE>`k~3^6(v zV;pw&9^t3P80RAcYF6@5dks>!A%i;pD5eH!43z7X+-ySX4uo|n_NE_;(SwD` zMHNjEWXGDAqqdlrsOLz2prEmSRPj%tK={2D15_M$yaHh|0RR;CNB>92Iy*!e2t&!Gt{9CPb0r# z;VAz{T8s?;*9?g4u~v-r*hP3f2GRl_#@6?57!u`OekOx!m-4rEgol(C27iMQQB_5r zh=Y^g#ZcfI=0N=3j_}j2l5{UYzR4hchm~H~n8Z5~x=-ud5Ze5YjL~hrpkbT;iG?Fg zN~=V~$)95&tr&zcYyE{GQ6^0xk=(50UtLbtqQM|j8* z;X>~+BD%d8AhE^xUJRraqa@0!@m|CRJm`9W| zC58l>;vku7NBFqydc1O`*%2P{i-VOjJ*Fa*du~$B42DGYE|P~Xh7&5c=h3=Vn zn?Ju3d_kdms2?}e25H5FtlZf(Mj`gEH!Ej1JHkWGgAm=F5mDB~jv+>ZJ$Pxok=`=1 zQ8{~hQ|J}^{1XTH@XdjEkVtHifpU^e7UndOucZOOUc*ziIAZ`ud2erOVrG?$ero_f z7oc-GW0bRxg>zvdmnbF%6D8$*h#~rmCD!0AN^_O7FDcuRmF+h?mC6np{b94wxV6=v z%V$d@)dVSdE=x5-Dl9AKBP^vK*^PYtt#bA!$(JC2#vMSqC*e<&KT4lJ!{s^jxn%Z_ zQJtu)9CzF79~B(zt80sD!<3&Rw}>1wOmBCq_T1rZ@ZRDh-DT8z<4CF?2SKBK8jdS zhL*&h9&f99Sq-}itC4vI+mo4+u|hAkd;(UvuTba1}ZD(gZQ~5{x*xBN8)dX;-6%3eX_2Ihp+I1;Q0`AcH)MA3W8x-IiKEk z!!IC}_do!Ry>NI+c??IwMJU3tC@3!WrX_X^C!FO&czalB>-i>G#*9-rSke=L9t2r0 zCI{twmTEMqJWe^6L{tc`rKR6s34ekGP5B(P`xydP4v2Jv4+4yfh^zT3D$th_^=^c| zjH&fpbAW$sftIa+ZY1LC2zog~^|Yh{#aq&Vyn>ML6Y@$cDZTj~&@T}5J%WCbq555+ z3Mqb~A^dp^z&8>61%iKx;rjcyDsW=1;=fGzcL;wK<43ph;v0i zzi`l1AZ}{=twcSQ1a4yieKsM1Y9QWDzzGDrBf1X!`vai-79pn-@=ivMuzeU5mA6a- zTqf`+0uM8I>!1kV!(0uay9m82q3m@1xO>bhAZylsiAp)& zA<}UKzL&xJa1^W$FwF;HEx>ypurf>7`^^drmI?z^;CBglApsv?px(KIrEIYjzNs0M z-y`*t30XNp&;yNz1%8Qc)dUX`97C9L9%5pBTfhtK;bn$%k*C zS1&`+W@^A_5_*gk#R}0&l_B&v3GGZmPq5IAHBCF}n&?^{RS_ajQso{Xksq_j?3&1I zU8H*byCU`!O&gDKa{e??JVq3iJ$l_U*e1PITRcm0uXB#Jg~~5-`8ndi=g8N7!oTsQ zr-VZ|%|l&(N+1XT^t=fw;xrMU7r-j6=7jubC_B60PfTMkQh7Z7MENBUg&5`hoLjB; z`PK`Rmw_fpsC|XedZ%~OZ$NFe*hDpcL5=$nH||v`UxPoP`j=Ej8gmWGuTgs@hs2c) z=$&fD-$_=cc)AH1TCehZA7yQH7@3W~L#Jy?=IHaD2V zuK>;~23Z*UFC *)editor; +- (void)performGoToLinePanelAction:(id)sender; +- (void)goToLineNumber:(NSUInteger)lineNumber; + @end diff --git a/Modules/Editors/ProjectCenter/PCEditor.m b/Modules/Editors/ProjectCenter/PCEditor.m index 0e3ceea..3de8e02 100644 --- a/Modules/Editors/ProjectCenter/PCEditor.m +++ b/Modules/Editors/ProjectCenter/PCEditor.m @@ -990,30 +990,8 @@ - (void)scrollToLineNumber:(NSUInteger)lineNumber { - NSUInteger offset; - NSUInteger i; - NSString *line; - NSEnumerator *e; - NSArray *lines; - NSRange range; - - lines = [[_intEditorView string] componentsSeparatedByString: @"\n"]; - e = [lines objectEnumerator]; - - for (offset = 0, i = 1; - (line = [e nextObject]) != nil && i < lineNumber; - i++, offset += [line length] + 1); - - if (line != nil) - { - range = NSMakeRange(offset, [line length]); - } - else - { - range = NSMakeRange([[_intEditorView string] length], 0); - } - [_intEditorView setSelectedRange:range]; - [_intEditorView scrollRangeToVisible:range]; + [_intEditorView goToLineNumber:lineNumber]; + [_extEditorView goToLineNumber:lineNumber]; } @end diff --git a/Modules/Editors/ProjectCenter/PCEditorView.h b/Modules/Editors/ProjectCenter/PCEditorView.h index d58efd4..931d6c6 100644 --- a/Modules/Editors/ProjectCenter/PCEditorView.h +++ b/Modules/Editors/ProjectCenter/PCEditorView.h @@ -4,7 +4,7 @@ Interface declaration of the EditorTextView class for the ProjectManager application. - Copyright (C) 2005-2010 Free Software Foundation + Copyright (C) 2005-2014 Free Software Foundation Saso Kiselkov Riccardo Mottola @@ -50,4 +50,10 @@ - (NSRect)selectionRect; +// ===== +// CodeEditorView protocol +// ===== +- (void)performGoToLinePanelAction:(id)sender; +- (void)goToLineNumber:(NSUInteger)lineNumber; + @end diff --git a/Modules/Editors/ProjectCenter/PCEditorView.m b/Modules/Editors/ProjectCenter/PCEditorView.m index 9489e52..715d9ea 100644 --- a/Modules/Editors/ProjectCenter/PCEditorView.m +++ b/Modules/Editors/ProjectCenter/PCEditorView.m @@ -616,4 +616,42 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start) return _insertionPointRect; } +- (void)usesFindPanel +{ + return YES; +} + +- (void)performGoToLinePanelAction:(id)sender +{ + NSLog(@"perform go to line!"); +} + +- (void)goToLineNumber:(NSUInteger)lineNumber +{ + NSUInteger offset; + NSUInteger i; + NSString *line; + NSEnumerator *e; + NSArray *lines; + NSRange range; + + lines = [[self string] componentsSeparatedByString: @"\n"]; + e = [lines objectEnumerator]; + + for (offset = 0, i = 1; + (line = [e nextObject]) != nil && i < lineNumber; + i++, offset += [line length] + 1); + + if (line != nil) + { + range = NSMakeRange(offset, [line length]); + } + else + { + range = NSMakeRange([[self string] length], 0); + } + [self setSelectedRange:range]; + [self scrollRangeToVisible:range]; +} + @end