From 1142fa0e45c90d987b2d37fcccff9936f07781c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cai=E2=9A=A1=EF=B8=8F?= Date: Sun, 26 Apr 2015 02:51:54 +0800 Subject: [PATCH] Build 566 * Fix the Save menu. (#4) --- README.md | 6 +++++- src/English.lproj/MainMenu.nib/designable.nib | 3 ++- .../MainMenu.nib/keyedobjects.nib | Bin 36506 -> 36492 bytes src/Info.plist | 2 +- src/otx.xcodeproj/project.pbxproj | 4 +--- src/source/AppController.m | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index da7c366..45a4c78 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ otx === -[![Author](https://img.shields.io/badge/Author-Zhi--Wei_Cai-red.svg?style=flat-square)](http://vox.vg/) ![Build](https://img.shields.io/badge/Build-565-green.svg?style=flat-square) ![SDK](https://img.shields.io/badge/SDK-10.9-yellow.svg?style=flat-square) ![License](https://img.shields.io/badge/License-Public-blue.svg?style=flat-square) +[![Author](https://img.shields.io/badge/Author-Zhi--Wei_Cai-red.svg?style=flat-square)](http://vox.vg/) ![Build](https://img.shields.io/badge/Build-566-green.svg?style=flat-square) ![SDK](https://img.shields.io/badge/SDK-10.9-yellow.svg?style=flat-square) ![License](https://img.shields.io/badge/License-Public-blue.svg?style=flat-square) The Mach-O disassembler. @@ -24,6 +24,10 @@ Following changes has been made: Changelog --------- +Build 566: + +* Fix the Save menu. (#4) + Build 565: * Fix the Open menu. (#3) diff --git a/src/English.lproj/MainMenu.nib/designable.nib b/src/English.lproj/MainMenu.nib/designable.nib index 22df832..d81c8e3 100644 --- a/src/English.lproj/MainMenu.nib/designable.nib +++ b/src/English.lproj/MainMenu.nib/designable.nib @@ -691,7 +691,7 @@ - + @@ -866,6 +866,7 @@ DQ + diff --git a/src/English.lproj/MainMenu.nib/keyedobjects.nib b/src/English.lproj/MainMenu.nib/keyedobjects.nib index c10d6e2e42050104468e1ab9a68878942336dee5..3015e9b2a4ab8a00fb417703a20a49a493a85cd0 100644 GIT binary patch delta 17274 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 UjK``16m9(!v#p=)?>)Nw7j?XtasU7T delta 17135 zcmc(FcYG7a_OEueUA8QDTkgHe-Im-W_ujjWWm%SOumOXOO$Y4&rbB?G6MF9*LJuWC z2)*~vLQ6=45JG*kvdx8?d*90+zt8)5tv0*od}mIbIWrUIqjTq@Q>=tT#lxoB`XDnl zCw52loN%UafpDR4rErySlW?Lf8R2>1P2nBkL*Y~5E8$<5 z0HZJ(GsVm>DQ1VcV;-0%=7j}e;aCJF$6_%hmVhN;IamQ!hE-yXSWm1kHV_+x0c->| z5*vk0#3o^ru`jS0*i39LHcyXzi7m!fVH>es*gotqb^^PO-N5c(kFh7%Gwf&VH|%%p zHTDL3i@n3%;{;CP65JG*;%>M*?vIDz;dm^r#1ru(JQ>f#v+z8;3@^uPa2?(g?}fMF zdVC~44xfb2!@tBA{vCc2KZoDJ@8b9H`}hO= zG5!R9ivNiJgg?W7$DiY`@W1f)_y+ceTY_K2%#rf0uUpJ(ZnQTvYz;Ym_p1Tz9i-o z3y3AeYGOUHf!IiFBDNEIiG9R=;s9}k_>MS9oFYyW7l`Y`4dNzoi?~NTC4MA+B7P%Y z5q}Y{iT5N<(j-HQNF!20T9Y=UEh!}(Ne|MK^dh}Ue=?K|Bg4r^GLDQV6Uam|mCPY? zNnIY9PZpDvq?)WEHKdMgBzuy*$YydNIfxui>d8@LJ2{@5Ku#g2k~7I!K@LIn-Qg3AL13Ms1=tQ(LI5)HZ4_wU63QouIy>PEx0+)6`|^ z3U!rwpr?MI9#W5}$JDRXZ`AM9d+Gx%pb;9S8Cpae(N?rIZA07AF0?D{M!VAibRZo> z2h)*s6dg^c(;0LookeHUIdm>vN|({)ba%Q3-9R_eJ?UO_Z@P`{PY<96(!*&zJ%%1j zkE1zyIz5A)NiU!m(u-*QI(j|5f!;`OqQ9bd(Yxud>4WsQ^a=Vq`VxJazCvGRDj6+P z!!$B&On+t+^93`TS;8!3mNBcDbM8^PG7rB1EK! z5}AsmA~%t{C_oe_3KE5h!bQ=dcu~42LzFKn6_v$^YD9ISdQo>#Z&8z|kEow$fM}p- zu;{(fMf8c_qVXEzwa5vi(s-TmdgBeo8;v&^Z#Ldyyw!M{@pdGR`vGsljGqZ^aHT{5 zCdSdZ+&JQhv$zK?#$Ch>;zn^#aW8Riag(@@xUaZb+#>EL?k^t1^(23{IRMao038X0 z9E-y@Ae;t-(*e4FYa3OK=$`{50w4(hNdia;K+*t`0gx&0caUOYXI5jq!0?6tL9++hwG_LG-49>u z*ss|ncpc^zyN1x)*d6Rw>~3~1chhyDa*A+jx17TC-rDYUIojTJ>=t%wSx#Z$fQD9G zkMjZ#fv0e~aE3-=o>Q36*4o;q$?#-hpSBiV-4fw+Zj)Pp`8+g0@IY`yIEJ-lrR-*Q zBfFjZ%`Mq{+27iCa_R2r=Ij5~zKdJ#o@Bn`Z|!@yx9%C{2maQ+k1O}+7V}+KyRh~n z@*!5uTB;L!Y5Vna?p@c~qfc$Wj!~Qyo`d7c*0#1Z3|uZe%l+!%-Tk8QlJK%H6@7wA zgsFmy!fV3o2uHD3*`w@DD7IDXHTD~}dxzj}3ECG6FTp!umj$Z@I|OS4D+OkPwNMlH z;Ol{4k6O_&EHN zTsN;IbMfEWPjg$mQp~OY)_#@~c`H5b1$PDagg`h#I1+Q|dIo)BmZmr-_{jP^*T*{} zz_;rmERffDhvX#!gVxVO*8`<9M zbuQ1x3Q=(`{^n)|?I1I-#AV0~qz&mW@ZnB}IQ76%u+&d=gJoh_yl$Sc-*@WfXZCid zZm?V^Xe<@p`8VAZVMW3sti+(3TkIY77W-4DZm@Emq=LN*brTRhOjs+}hH0>B!9&4D zEESbtIxH2d!|FfR&{Osv1wkIe*M0U$r-p|5IvVv7v@gMWV@>P>_F;!++Pb9pQG7pe zk9@;jK9%(Fu4e=fKR)${i}fqB9M^T{6T|+ITjN*kI@KV{=>}Q;YLMkGg^7NC{}TEv zC{$&|0&JmR5-Va~03@6h8w?h06FBn*i}uHsV#|;@$SiCnD`5WsNEjboIwJ@oFqkg3 z8rmGT23w1*!`8De0U`y6BS2i(FkU%&Y%{h+co|!OJ`swr1%iv%4s0h>4nVBfS5P}I zcwB4t&o1@s=4HJF-uhfUkpBVrI%rVOOZG1w$FfU5NB9nWgB`_=VaM6m0AT=P3=jz$ z_PxZMo8jV_fqjRaG^p(~c7}H>YzuZCy8z!WVV7b1!w$y+2w@f{5C~|1Q0yCuePxQk zZsM>nZvjGfs_>Z1(fB5>!duvF_8mZkP=`LY*nR8)_CtpzFkfCn072Lf?0YUOz}x*N z){%7vh(MiFSfH(K=+hA#&kMhRhX0FjDnL+nE2j@o*zsKc?Bdd)X#*dCVBGnDZce^D z4lYCkc!&A~2Ou=>PFz-?y)%W=f{n-~IJhmiSSW&4x(y&k01;7aHXO<;ZfszPlNojt z*$d{w58QB2(Cre3D)5zevC^l6IvXwJ9_kK^#*a-US*?(q!X?g3)U z8$Lj6%2FD7)iuGS^{?l%`Iy4Z4K}mS#|s1-QD2eQz3O<#04}2gx51)TFMM#;qhM#a!naa7yr9r6S=Wu|ev*K^+! zGCT#Rs+n9*xjiE`{DjllY;LODiLo&JgwxqvZns>@NDV(V0LkZW%cbr|1rr1l1(Tq^ z!{~3!ia&D3j&cRXaQ2qjfj+$sRb5^5uHyhDAL@yThZyY-Tpwl@rN@dnpFo9^{ znK$r)fDy$o@W8f?ffECXL421Q`GEtZ7eIQlE*B6CF%_5*Ly2LC1wdy4bT&6H%0WDm z7{xQ{1CW-kk#(^dPfYlPO*26HaxbD>&89+dj;Cqm!TWboS$9#*K@WUF)y5S@dx{ql zi+BPUDTa3Sb!lf`R}d@t#|L%vbqGKP|EsTSh_!rQR|0f3cOu%wY%@gO$}<|yBZIE~ z>N;8NB6jnv>N;4l02X-sVnWQmhMG9UQ;p;`G5X)BjuYR0Le&nCQQZ6(2eUJf>Ksos zmZzHV?^IWatDjJf2go??b&RXoZAf*8r<%l5ebGtfq$3_6&?1TB#A5@MnZQOM=;$T{ zoXlxsgUy~n(qDMesXQsyNow0UIB3i-KLYZ`JdHaS>o0yoyyZ!tXV2**2>j3?4H6}V zJi*KknArfC^--`SL6W>+=K*v+m!q^68RCzJTDZp4zxk4ylv79eX_m*PBa zzt+0^{w00+&yQS^$Yh?&27qk-_u*%fS)Xv(1dxr~&nj1O0a?gXYz4@UP6|~QZaG=; z3B`7RY-3%D3hHY6klp)ufi^@fARJck;0P7`ezEJdcl&YZtd5&e5#5U;^2P zC)vxJ|GrKl$wwmej)92#JJx7d&2s`dg6AOQn-6w1!`MrX z<(pyb1<2v9W*B(M$$Yah-~3HSvz-~T8n#b|yfu9DF~0duyfkDkY$@YgzJ)F2tvwo= z_(=|&5p`vmC6Ek;0oIg%=sTXwKS5fs0=5|3`4nu?NG!Fjt#!Towifk)SxQ&euU{vV zvE&+Zt-uUlNUkS0kQ)sP;+CFuEiiubPr&pJkh1_e1CVpv>;$EBE4fW0F@@!UgtWR| zeG~gMHPz`_`?M?}w{yQHNNo(vkk#Z@JTn%C^$VS}u89F1H?dpfe#6ao0J+q8vqxgE zZAUj2kVp8NhKa?M&bwO@6FNu*OUM%jQd59j>%3`{6xs>8iacw$3De|_&YPu4s*ane zp1f?hIS3%PI&W@B^6LP_Zj(1VK!pJLzVq(yNl|up$$NYvC-0LFgzw0Q!ZG9{@-g{@ zd`kYvr6wz#&j1w81YQB;E_2QEKvxVvF}O$AdSl{tk;4LW}Iq-`0rgbEh;bleJ~!nuQKQapl^!?pLpG#lD}V=o}a1#s z8lXl1H3q2opTG<VUgv)2Fvmn#rP0#ImeFS(4&P({aRnyLPj-!iI&>PNLw zZ2&a~C=B_Q0JZwRNPX02;~HoH90>v2snHN{w*gRU0JH%pjLa{&9$BfKfD@=GJm5rX z5;d9n0-$yPwFjsJKpp=v-~a>QdVG61?70G$Eq!UN9D_UQy%POaeqS5Pad zRn%&Lx&hQ3pdJAA{KtU(4S+i#;4W%61l(Z&gs}vQ)El5aJm7|$cj<3b8MosRaPeRv#C+KYyI z%>-x`K(qe=4tC6d69#c2XgT>KU(DfSNWK9l7od6kcoK>d6AWHQ$IuCs-*P&ZR?;du zj*bUt0YD1@S_IHyfR-$$6FcGw1z6&r~wPm=Ec2SRXjk3Xe}? z3igd*Od}xAQFJ@)%)T}Zsi%Qu13(*jwaqN;GLP}}WL|9(=!x_sfc64tZ-6%a6Sb`~ zz|4U#^XM;m(K#A$;2HB*EU?4w>BaO4X!rCIdMUk(UJlTH0Br>*jGFzI zeU#b1@{>VXi_`tMfby!(1lEDN6{2pZcklx1KpkvA9SG1tyukLBM|TQr5512U7>wgX zJ`>nyJl7gVas=``N+07#A~lReZ{Rr$pu_o*)K^4yI@C$}EHANB^l2LAeHNeqpdWGjN-TtPzQ_1!9F|;RJ!k@~ z>A-Rfwhphw*5dhC`Wjd$Jl!kBO-f{}BtyCv$&nFZP?(aY!9^fko53{}K;a5&EI{GPsSz%t0XoO928K$X3)f7BrO;M@E-`Q3*aM=${3C=D zV$Z?7vxDq^*Ng@E?Yt$y}Vq)ee@Am=*A$ zRlG!}7;a4M5ab$en8xLwp#Q^8zS8(ae(dBY(r$y!IFvaKJNYjWLqmq)6IOO+!4)UJ zD&kzKEK^Rw{fI8V{nXO`yBrOboX@4z$V=-#cH{$$1O)TovyMRjfxUp$g)d=8l4~1U z`HoaP5wx%R_n`6L9PPh%&alk>ymK@8&PD$xDaF8$lp?}D>l}373PYuDF{~<-HZ;}t z8Ni*ZvCN|d?JGWwUw`-V|K2IX68!T{Rs07t{Ev_IuJQYq8GfSSr7(Q15&3`CcNk${ z3W4>oRosahdpa1F(Fqul26DgDIM&KV3Vw6UQ1?aG0rabnd+(wcxc3gjWHzLP75wWYd!ma9?k2pI*BYa3!me zNMPjYp@mhJ^rn8T+9q8c4UiWX1*_o}qG1D3)Ye%SNB6LGWkZ5P!u_3thjnb^)`uM z7W{>u7Fcwq#R>QX_-!40t%WZ>EArPGxQQ6O2JR!S!Hx?oI@4kWRsp~9X|d}{g=z7V zOJKq40bUW@vAQh%$85+4;Ld-T4L^SW_=V4#9of(jNBB?zTjmp;SW+4Q4J^Q{vxR1~9X#%Lh&}>WFUR4LzmsrXa+W?%UxWw$uEOYe8!j{+ z(2wY+dioihd_JdN(tpu!=?@Ib;0(ox7%^kYSTNR%lyP9388^n0@nQU#KqdrcGX)dP zD4BRBiAiNLm~1AGDP&5Ra(J3h15XpyF+G@`OcT@0v@!#j!OSp*WkxcinQ_cSc*1ZR zGXtJ7oX0F+7Q=IfD;fQ2W;b(~ImcXMZZNl)@0q*IQ|2e;XL!gEhldPlk+sNKCkRE&$oVr#Lj*iLLOb`U#?-NYVZFR_obL@g`rGOf^|xvc_bc$p({6Ci_gjHMweX-Q=dp zZIg#4uOx`XLSifNlz2;gCH@kXq)<{Rsgrb0lO#(dYb84*dn89CXCzl8 z*CjV4wX#D>KAQVrFgTWae!a zXclG`YnE?TW!Bqlu-O>1$!4?6mYZ!c+hg{P*-5jjX7|lrn7uT6W%k7bErb@h1!+NBh%AgPOe}0H>?|BCoGiR8%isd!S89YlU@`b&R#rI?g)5I>|cS zy2-k)b&GXB>o)5F)`P5vS`V|<&#>NM{gw4@>%G?dt-rQDWc|qcjrBY04>kfD)CRL5 zY$zMr#>K|pMr%`V)5E6GrjJdtO+TA9n*lb1Y=+y6v6*5s-)4o)W}C}4S8cA_+_1T2 z^S#YooBK8oY~I?EwlTI!+c?_<+a%i*+cet@+kD&ZwtZ~}*nVL<({`)vcH5nL+g-MM zZ1>q7vb|t?)AoDYySDdjU)jF4eQWz(Dv(-9-K3sUZ)vPlC5@LRN|U8|(sF5yv{~9; zs+UfYPLocT&XmrUu9xnT?vd`39*`cC9+94sUY1^!UYFjK-j?36!|g~r+K#a^vJ=}$ z>`d*v?9%Kq?6T}~?DFgi?DR!;m3HlRW9-J+jklXbTPWCSLZuT74+k%YMu!0ov-A$j9X2}b zbvWv9%i*P?(9zy8z)|6t;#lBV@7Tk!(Xp3flVe}U7RP>$ZH@yR2RROL9OgK}ag^g| z$8nA;9M?E*b=>dxt>byeD~{J3Z#dp^eC_zw@x7D433bAp2qzOK3nwcl8z-rg$|>F{ z(J9F(#VO4x!ztS-$En_FjMF$L{RF2;PG2}pb>f_6J8gG5;B><2q|+Ivb57TtZaUp| zdg=7R+0xn3Im}t4A)t% zb6n@S&Uanty4ZE8>t5GyT+h2+biM3))%CjTP1oD5cib%9+}!-#g55&h!rh|WV%(H& zac&82Np2}_-Q0S(HM;e3YjPXl#=7Yzx=nVQ;x@-^iQ89h``mtad*Sxd?UmbWx3_NZ z-39KJ?iub`?m6yx?gj2e?j`PJ?#=Ei+*i4;abM@Y!F`ka7WZxL$KBt#fABy&gdVsD z=|OvlJUl!qJSsh^JgPlvJZe4aJ$iWb^BCqa%44d>36GN=r#;SkocFlsaoOXl$3wlx zFCMQvg`Nt}NY7}`SWlH_yl0|kvS+Gix@UoBv1h4gxo3-Kt7m`Dfu4gshkCYqj`bYx zInncm=Pl3Mo_9R&dEWQ@!Sj*l6VD$#pLzb``J3l+FOippmxGs+my4I1mxq^^SEW~# zSG8A-SFKmQR}Zg7ui;)>y|#Pp^xEaM$4kG@>wwomuPfe0-ePZwx0$zvx0Sbzx70ht zyQg_^&als?)`=Lm)@7WuXtbczTth#`+M)Z-uJzK@P6t2!3Xuh zd?%pF*EvpHiQ4pKdX zxuy4c=<~$qN1tcDgfHdG_!{|&eI>rOzV^P3zRtdVe4Bk+d|Q3{`ws9OS~#_Z{QA(07&Zdf$z{n|-(XKK6a;`;+g_zQ6kZ?)$>`r62C6^o#RL@JsSb@k{f| z@XPY+=2z#};E+bi2AJ0LqG`$l$5_O0xs?6mBx?7Zx$?78ff?6vHj>_b3UKtzBdAUYs6Kot-l zkQmS{phrMsK(By40mA}D2aF4t5HKg;e89zk%K_H{ZUo#8xD#+M;E#Y0fkdErU|L{C zU{+vmV18gxU`b$EU{&Cl!0~~T0w)Jf3Di#uoE|tca8}@^z-xi`0)Gg66!;|YY2Z(R zKL`FAWE*53Y%kj>w=C1{Sfpx=xNZipkIQ13wjasS1=ZA8SEJB66_Z25gZd-65KDiEqGw?;NYRb z`rxtp;5ordf|mua2tF2kBKTDB>EN@$=YuZ>UkZK};u+!{;v3>05*QL35*88>q6jGo z84@x)1cZzT85J@*WNgT|kR>6X=p`gWoTV!k5GNj(B7eYLl1<09eOzQXy~!f6QQR< z&xT$Iy&QTq^m^#c&=;Za!q6~0j0$7IRAKR9iD4;WX2IKN3MkFcC%(CJ|;4mJv1)wh{IbP7y8Ww1|p` zx`@6JAYx?1=!mfqT*TUl9T5j3PDgwnaW~?A#KVZk5x>b%IVLCMv|J>&lzYm(<-T&6 zJWw7f&yZ)ybL9E*Lb*oXSKcCTl@E{)lIz>$Gv%}8bLI2p3*{T+2jmCkhvi4*$K~hc z_vJsxAIYD}f0Dmeh!kRlL}8||PNtAh%cT`$bc~oUoRg^ZWHmW^pY}ELuiBVrfO^ccywK!^7)XJ#U zQJbT-M(vIIHtJ;5nW*zo&!b*Oy^7Mmj(Qg@h(@ESXeQbw+9%pSIv_eYIxM<4x-7aP zx-wc5t&P@2*F_JD9v?j^dP+1Gy)AlY^seYV(fgwhMjwto8+{@Aa`e^cyV3WfpGCiq zL1Kik1VqR9#>ipp*mGZUnol2lWRfLLC8LOl!2bHtRO_iidRi&#kRoSXMRe`Ep zrByYlnpLf;0jk-md8+xUg{md0<*Jpc^{S1k9je2sqpELJCsoh%s$W&Vt6r%7RJ~Tc zjU(geIEy%!IQKZOIN!L;xSY7WxPrLixU#s4I8B^3u6tZ-+<>^jal_&k#4V0n8n--d zW!##$b#a^H_Q#!xJ0Ev3?n>PCxHoa{;|1|(JQh#HQ}NPxzj#@EV0=h?czkMnS$wy6 zb$oTaF1{^(bo{t@{e<|*@l)fM#&3(?8NVxjZ~TGybMg1$AH+Y5e-i&w{Hp{yL6l&e zAW1M!a7YM92ucV^2v1NXBqbCllqQrXR3>N=1|*D4n3^y+@APV;-19)Wr=T-jFU`~%#tjV zY?4xw%91LQ)JfGzx}*h38)c0v*8k1(6 zCP_0-vrltMb4~L|^G@?iOG?wGv1zN*wxk_MJCb%P?T56V(y?^&^sw}Z^vLv>bX9sn zdUASNdc8hG64`yD^{4>icOO>Us&Z^0(%j%KUGpi}9Ijc2m zZq}}>qgiLN&Szc9x|($(>p|9|tfyJevVP5ao^6!vlbx2`oINdjdiJdBx!Lox7iBNa zUXi^&`&9Pz?EBddv!7)Dl>JNgtL!(~?{knGEQic-&WX*b%xTYAk+UjiZO(?A%{kk0 zcINEP`99}eE|Y7n&$Y_6&9%>U%Jt6m%MHj4&JD|z=jP@1&YhUMJ@<0%)!ZAow{!32 zKFEEP`!tWqbIS|Li_DA3Q{^S(CFkYj<>wXUmF89Csq^~had}(vZsfhqd!LWwWBFu0 zlW&|a$q&xY%rDE==GW$T&u`4{o!>uyQ2x+-eg262_WT9;`aSvAVY%47z_Y-oz`r1{ zAfzC?Kv7U$(64|k7*jC5U{b-9f>{M~3+5LrDp*=@vfxP}Rp?XbUl>>zQW##SD2y&t z7HSK77mh5PQaGz{ZsGjGMTIL1*A%WV+*G)=@Mhs(MK(o|MKMLHqJ*O4qO_vSqMV|Z zqA!ZRELvH#rf9vsXj9SFq8&vCi;ff>D>_khs_1Odg`!8rlH!2k?Bd4ars6M(rxnjA zo?SezctP>v;$_8$i*FP^E`DD8viPs!x5Xby&=TVkNr`!hRf%nheTh>^Xh~(s;F38d zJ4*JI+%CCW@}T5V$7bp%Kj`Dlncv=a=P58+@xGlUQ*sxKCOIf`Hu2k<$KEylpiYp zru=yMlM19lTwz*aQDLp9kXATU#8jv&sw;FA^%V^jy(;=tv{X#3SY5HBVqeAA6^AR1 zR-CFhTXCV{a>cc7Xg8;B%5JHZS)6x!uKsZ4(aLWtPgb6;JXd+K@=E2k%A1wnSKh1q zq4II%kCi`H{#N;-@@3_#$~Tqo)B?3o4L4cUMrsqanc6~arM6K^)%I#fwX@n)?XLDz zd#iob{^|gAkUB&irjAf6)KTgfwMw0!PFAO>Gu7GZTy?&>P+hDpRhO%~sny);b`SkX zb-Q|udYpQKdXjpInp4kIuT-yAuTyVSZ&B}2A5ouCpI2W}Usc~w-&WtLGOn_&l2+MQ zIaWDWxm9^qc~|*W$*N+ilB+7KG*vZKbyYp8dR8@6HCMG(4X7GiHLOZswW?}I)#0k6 zRmZEot@^I&RMqLKvsLG--c-HU2sDUZBh=s;LPKd7ja(C@iP0!EahgO;iY8r?rODBh zYU(uuG=nrlHG0hm%>>Ov&1B6Y&9|D9n$wyynsb^9nv0stnyb}FHC9bj!vhP|qH3dR zakZq{p*o{FyE?Zzzq+uxq`JJivRYHEt*)Z>!A(Ms$&P(U3^VbFFT2t1ht!U)U0S=mc4h7A+O@SCYPZzxt^KC`@^|5g2-`hE2W>JQc*uK%X~SpA9mll5on&v7rux|zPLe^vjw{%!sH?t<>Z z?nHN*^Bos!p4L61dsg?H?s?q{x)*n^Y9JeEuK&1PIomL@VRXZ|h6xRm8>Ti)Z{d*2s*U-o^~_jR+d8EYn* mO`0Xm=FRrae$7G63C)?!J(~M>?5(0`$EO%{e0IGz5BxttFGS1$ diff --git a/src/Info.plist b/src/Info.plist index 28673be..35eebc2 100755 --- a/src/Info.plist +++ b/src/Info.plist @@ -46,7 +46,7 @@ CFBundleSignature ot++ CFBundleVersion - 565 + 566 LSApplicationCategoryType public.app-category.developer-tools NSHumanReadableCopyright diff --git a/src/otx.xcodeproj/project.pbxproj b/src/otx.xcodeproj/project.pbxproj index 796ff99..047893b 100755 --- a/src/otx.xcodeproj/project.pbxproj +++ b/src/otx.xcodeproj/project.pbxproj @@ -34,7 +34,6 @@ 55E1267E14DE58BB003B4A16 /* ObjcTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E1267C14DE46F3003B4A16 /* ObjcTypes.m */; }; 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - B72DD5AF1912B1DD00D009C5 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = B72DD5AE1912B1DD00D009C5 /* README.md */; }; B738E51D1912A5E8002AB41B /* ObjcTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E1267C14DE46F3003B4A16 /* ObjcTypes.m */; }; E145F6D30B437F5900615A16 /* SmoothViewAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = E145F6D20B437F5900615A16 /* SmoothViewAnimation.m */; }; E182007209AE4CD800584B07 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = E182007009AE4CD800584B07 /* AppController.m */; }; @@ -120,7 +119,7 @@ E13539900A68185500CBDDE5 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = source/AppController.h; sourceTree = ""; }; E145F6D10B437F5900615A16 /* SmoothViewAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmoothViewAnimation.h; path = source/SmoothViewAnimation.h; sourceTree = ""; }; E145F6D20B437F5900615A16 /* SmoothViewAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SmoothViewAnimation.m; path = source/SmoothViewAnimation.m; sourceTree = ""; }; - E182007009AE4CD800584B07 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AppController.m; path = source/AppController.m; sourceTree = ""; wrapsLines = 0; }; + E182007009AE4CD800584B07 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppController.m; path = source/AppController.m; sourceTree = ""; wrapsLines = 0; }; E1978C6B0AC603A40096EE62 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = English.lproj/Help; sourceTree = ""; }; E1AD98A40B57311B00E56D96 /* DropBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DropBox.h; path = source/DropBox.h; sourceTree = ""; }; E1AD98A50B57311B00E56D96 /* DropBox.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DropBox.m; path = source/DropBox.m; sourceTree = ""; }; @@ -436,7 +435,6 @@ 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */, 25A62F060C38A86C00B08D38 /* App Icon.icns in Resources */, 25A62EFF0C38A7C500B08D38 /* Main Window Background.tif in Resources */, - B72DD5AF1912B1DD00D009C5 /* README.md in Resources */, 25A62EFE0C38A7C500B08D38 /* Prefs General Icon.tif in Resources */, 25A62EFD0C38A7C500B08D38 /* Prefs Output Icon.tif in Resources */, E1978C9E0AC603A40096EE62 /* Help in Resources */, diff --git a/src/source/AppController.m b/src/source/AppController.m index bd626c8..ca1504d 100755 --- a/src/source/AppController.m +++ b/src/source/AppController.m @@ -403,7 +403,7 @@ - (IBAction)attemptToProcessFile: (id)sender if (iOutputFilePath) [iOutputFilePath release]; - iOutputFilePath = [[thePanel URL] absoluteString]; + iOutputFilePath = [[thePanel URL] path]; } else {