From 4ecb698720d94a2a2bc2ae80224f448f544c1686 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 21 Aug 2006 22:23:09 +0000 Subject: [PATCH] MessageWindowController in its proper place --- Transmission.xcodeproj/project.pbxproj | 14 ++++++++------ .../MainMenu.nib/keyedobjects.nib | Bin 45141 -> 45148 bytes .../MessageWindowController.h | 2 +- .../MessageWindowController.m | 8 ++++---- 4 files changed, 13 insertions(+), 11 deletions(-) rename MessageWindowController.h => macosx/MessageWindowController.h (95%) rename MessageWindowController.m => macosx/MessageWindowController.m (96%) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 60a12afe1..3e23a9699 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -108,6 +108,8 @@ A253F72A0A699373008EE24F /* FilterButtonSelectedLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7270A699373008EE24F /* FilterButtonSelectedLeft.png */; }; A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */; }; A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */; }; + A256588C0A9A695400E8A03B /* MessageWindowController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A256588A0A9A695400E8A03B /* MessageWindowController.h */; }; + A256588D0A9A695400E8A03B /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A256588B0A9A695400E8A03B /* MessageWindowController.m */; }; A259317E0A73B2CC002F4FE7 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* Transmission Help */; }; A25FCDDF0A37695F002BCBBE /* PauseSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; }; A25FCDE00A37695F002BCBBE /* ResumeSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; }; @@ -130,7 +132,6 @@ A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D0E0480A54A97C003C72CF /* Bandwidth.png */; }; A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0820A915F6600890C32 /* RedDot.tiff */; }; A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0840A915F7200890C32 /* GreenDot.tiff */; }; - A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */; }; A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; }; A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; }; A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; }; @@ -162,6 +163,7 @@ files = ( A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */, A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */, + A256588C0A9A695400E8A03B /* MessageWindowController.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -314,6 +316,8 @@ A253F7270A699373008EE24F /* FilterButtonSelectedLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedLeft.png; path = macosx/Images/FilterButtonSelectedLeft.png; sourceTree = ""; }; A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedMain.png; path = macosx/Images/FilterButtonSelectedMain.png; sourceTree = ""; }; A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedRight.png; path = macosx/Images/FilterButtonSelectedRight.png; sourceTree = ""; }; + A256588A0A9A695400E8A03B /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MessageWindowController.h; path = macosx/MessageWindowController.h; sourceTree = ""; }; + A256588B0A9A695400E8A03B /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MessageWindowController.m; path = macosx/MessageWindowController.m; sourceTree = ""; }; A259316A0A73B2CC002F4FE7 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = ""; }; A25FCDDD0A37695F002BCBBE /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = ""; }; A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = ""; }; @@ -337,8 +341,6 @@ A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = ""; }; A2D4F0820A915F6600890C32 /* RedDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = RedDot.tiff; path = macosx/Images/RedDot.tiff; sourceTree = ""; }; A2D4F0840A915F7200890C32 /* GreenDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GreenDot.tiff; path = macosx/Images/GreenDot.tiff; sourceTree = ""; }; - A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageWindowController.h; sourceTree = ""; }; - A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageWindowController.m; sourceTree = ""; }; A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = ""; }; A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = ""; }; /* End PBXFileReference section */ @@ -379,8 +381,8 @@ 080E96DDFE201D6D7F000001 /* Sources */ = { isa = PBXGroup; children = ( - A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */, - A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */, + A256588A0A9A695400E8A03B /* MessageWindowController.h */, + A256588B0A9A695400E8A03B /* MessageWindowController.m */, A200B8390A2263BA007BBB1E /* InfoWindowController.h */, A200B83A0A2263BA007BBB1E /* InfoWindowController.m */, 4DF0C5A90899190500DD8943 /* Controller.m */, @@ -829,7 +831,7 @@ A27431DB0A68538400FA780A /* BarButton.m in Sources */, A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */, A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */, - A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */, + A256588D0A9A695400E8A03B /* MessageWindowController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index c200ffa99c1a0d3cedf95fb6a8617c4a462bda94..0582f4b5d57f9d2ca2061e6404c092e8bcaa6c5e 100644 GIT binary patch delta 10483 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℞0uJ-5%W;eLwm^bbs_v z^uy?}=!xj5=-KG`=!NK|=#|(@u>rBcv7xaMv4YsB*qGS(SYgZ?3&g^)NwH|GBo>b; zF*T;ejM&uJjM(hh+}QlsqS(^d^4O}_>e$-YJF$()*p^s%Y|pFj>{#q% z>`d%j?338V*ypjYVwYprV&BK^$NnxRifzS?;u^(`idz-8EAC$0ulVKS{Nlpm$;H!) z7Zxuo-dw!1_(<{5;tR!Bi*FU*DZX3$pd`1XQc3NSIweg?T9vdZX;;#O*x#rWs(FXLawuf)HNUyt96-yR&l8^0I7AOAi6pZJ3W=KKjZVM{m? zu7oF1IZ-W9BT+l?WTIZ8VdAMo(?nk4nMCVEyTr4Jj)~5RZiya=7ZQCE{Sy5X0~4<# zh9zE2yq3MPu5NN_Vn$+iVs2u7Vo_pgVtHa^;;qD*#QMa$iA{+uiSoqu#ID4i#J;Jn)oj9L*i!QcH(a0UgCb@_r!k^4`f27WJb=F z9kNS?auvC{TvL8Rt}8c?8_P}P=5hTp);p3f%LC-W@=$rWoG*`*N6X{n zi83$yJ}IA(&&eOlpURiyFXXS}%knk(d-;ZZTfQsblYf?xD<3HzD;JbY%IC^g%4Ox6^1bqda!dJ9 z`ANB_+*f{A{#5=hB}%DMwlufYQR*s%rIkyomewe(UD^o$f_4@UkuRv1)GySp)hp_^ z>UH%d9v%Or{(^tq{6qZ<|Cml92IV3LawQQ&RZw+Q3)MmOP($<-YKERhEm0fP9(6#S zQ8&~By@2|nm(Tz-7!5@uPyrf+#-Q=25P4Amh0!DwMI|VX6r>^z8E7h+fo7w*Xg*qm zmZIfo6VZaRl*Vc{jnmv(C9SGfL#wSlsnypSX-%}|S_`d} z)>eB~>!@|np4WP6y|ov$$DBpCT**>P1~WpuYI8H*A8hPYR9!x+F9+qc0s$O zeW87=UD3YPu4^~7JK9g$FWPU~AKG8qL!HzaJvXU4be9hGDtdLjmR?7%r#IA}(wpf| z>n-&*dV9Tt-dXRa_t0O^`|2<01N6cAP<@16ppVkW=;QT5-Kz)mus%tT>Lq$yS9Dd^ zbVHx2&(LS-tUoj{cMWi~gJbhyIuTFiobJbZ**_cBb9wO6jWU8tK~UC)4%Q zjnYlh&C^e(Tc+Ej+owCEJEyy*pHKHp_fEf39}%_LkZ7g7o6_vh<4do9VaH>(U$2o6=j;+tNGI@25XV?@u2}f0#a= zKAAp~K9~L^eKFg2Q=KGbutu)oFkA*SsuwEM!MJ36 zVSH^|F}^jf8#j$R#$Dr{ao_me_|y2?1SW0fn0C`?y3I;vRkONT%dBJ8GaH&una#|n z&6Z{xv%T5D>|}N|yPLhtK4w3&zd6VpVh%T7H4Ds9<`{FlS!fDo(r<>$B2zSD=43Nr zmYT@aP1Bra&NR!+thvBkY%Vibm~Wb^&9&w`=0(et^M70KlG|MJXi}tuoD}6K(nUc*k$MzCq;tFJ3A@R~OLob=&1N@BI|#ia zaDX%g=|~ZzgNPzxqgiNzh}e<;+vERJKc6d`&Agd;^XAQWzVqcp^6W+OZ7wJ2U>y05 z%Jh9lWk(f9Ek`3q6Gv-DXUFr79*%yF{*JK@pCjT>9EM}6qaT)<<5)s&pzo6#9IGAM z9sBW{_Z^2FM;#{|Cmm-UpE}MtE;_E^x7Qsv9X~qmIR40|===FpK25%p&*j(6FUT)+ ze2U+6bTr0)yXPmL%kN9RgCAecAL@k8o=(N7I+0Uz>drKA0NimJr0O)C8RzTxZN~YA zbCPqabDFcvIo&yfsD=N}bj~7bksI*y9Oqmtr90<25pmDCz_}2wUgTWtT!L3FbuP!> zuE6qhohzLioZBE*X-uWDmBwZ5xpFp>do?TC29cycd&qW%Brb2BYxl7>8Br6}>xfb| zb1*^J{D>;CJ_a_IReF(PW7hL)n=e$o581T!Y-BGt(b&P(lSBWI+siheXi68+DdH%X*x{XYX)CGIwa+ z5*Ft4w0EW_GPAhL^gV{NwPhx=X`&0^MZ{=C^+n`|>H|deQ}Yl}hN%9C8i0sL)#mCM zL^Vf56cPQ^j}XxU5v>t991&gB0z_mGF&0tJB4Vjp1CcBu2=x%6MyNj^GN=wlWHUrI zP&+3PQI3eVh$uqDGwL!#Jc+3Bh`>LS5wQ{xB%+EDxfW3`BMNI?sHWAPh{R605z$R; zg^0@PFNpFWsu>~*5y2yB3?i}HYt^3+K_e=NhW)GrZHs-8gPN<{8ayCLE^RYYV@ zL?vHQpHmG5!nP0LlFtpQbdS| zYLrCeDnw-v^*SQ#h#IF}MMMY@c&oh-IUA90AfgGPqKK@C2!x0{MB%u!M^q7_u!cH_ z7=b8LJ&C9e>Uu=9qhR8K)LzP41P4z28%tTZdL^eWHJw%K`#M_8G ztJc1ch`xxz4%R>fK9V7b=z@rtT1Rbx$P?K@e<<6l12YRY_)7HPyHTeKo?NW(HL|c@~{%9?8B7>;M$tJ z%Xw$HblzQ#;M#Nf9G{2JqKy@8>J=OfYpYa0EB~nB*=eCJ*`@xRY{*}jJrQzZ^;NU= z-3^8g8zhbiN_?>>JybgYT-)e!+U9dhY?o}e@J(-P>u&3BXSmt60&aWG<2fDkmf*y| zr)?c6J{~LChFB?&GZIH0rw7geYFzdQ&yD|vtw}}La+*1&{}VR67H51pqWFK~CS>>d zT3KQCSI84h9dG_4kCUWGt%)e_zv8}!POkyi))NIeJ-Gs|Q%+6J$CYyXh(7r84(CSF zeth@vLF2^6x0YCHT^oEQs3^{gI{1=OPjN7M z9^3&xfxF;mkUi!rX#Xny`q^;UUu=ChsE5a2{BVPxfotWsNUrA&6YIDEHivcTa1xiQ z_-seuOKfc*TPI-abmbr4ud3Z})>H9+T~7?}7cLIgD=HpW9E?2l@Y=r~{*WCTXn@n= z>FfosGx;$3UdR3a>C4Aes0d#O3jM248}$5m57vaCDW3t?RuXPvAt4i!^U82t?5wuJ zMTM%R`X357ti*EJPGS@~#@=DCru-{Bb!eY4o}hIE4_$vATwBG3xvks^?lL!yJIHmeD7UX$RSuU8 zT%B=6q6XkYs9wFo0(CHdz&{p-Sl%4YD&fbHEI}Q#H?xo${6-xlnsSHedxRIXinlTE|lsd=~c?XE5))RFd%Wj~HsB^^8+ANdk+V!?0gOUB_sAk2;6}u!K4XTH2d& zTNwq5Zoo!25MFyTmart~i@E)BnsH&!60f+=m14I_EC=%rkY$X5Ww5N}GIk^%>pqA# zbdkEwmT;Hz4&-1RbUuAAw;z2gcPN(lF-dH&SFwbs>)45W`XWm(inYwzMQ%T9r&z&F z%MI);-WAsw8(MA2U`SSQ3v$t3AMfTcbr3srFz-NanPr4%YQ@w-eEP=2_^~BeY6V6a zj6JygpTP&La_Zrvb)9j^siC$|$qEz^F_7S|t-_CgFbcQFhPZZO7_&(04isa|wIB$KV-&1`)mE4y$}LkxmPw2T&GEt*wu9f|@7rUWN%ElsINdCB zL#?k)T7Pa~D_EumUV$-6#I{JR1X+OC9$V~YDeGpT(HhH;C22W8Ld#{!gC)+WX>kGj2dYA8+X{axwr8!vP|)1cV@ac=^%_561=#ylRxnEO zLedg!j$5JsccP{hKy0i6;xT|%_+GJ4w3etClq>F~vy#;gx3+SVu1jsEzNaq|yK(aG zB&+6?(K?MQhn>L*caF}-{b&E&vLwzB&gQ@ffg3%tj9Y=*T8-FXYfJYh*3n6PySCFs zgqPY&`*THn)dz4}aSQAwCetZf_lhWAQukY3US+i>_PZ3fa8~Psn;cT@Y=Iw+)JYs6 zt98O)*Z>CvH(j{JvQTG$dcPw+5=vED;jYXI>k#z^+;}}uab7jSDbPYag!?$$$QgD{aEeaJ8F5CPy|d3mdDm7% zEkM*ZL~TdZ4n*zD?ugdzf!`cN)CY*dr4`5eNJRuOLOCabuCH1s(?qJ*FBU8oRd!_e zP%u*bTBOJ#Ai?PHz5}g)FGh+3g)>U3CtrDXT*MQqsExz=4(t|{U4ERaY_H=GHkn@%3{w4juS(E z{}4}c?7yBDwtSdk<@R^V?Vaph$es4inBE-4GypfsxN{|OySB$Vy8q9`jh5hX`yKMA z{cHP7;szp5Bl1f%j>u0DxmWG;kKlHkv@l5&ff!i8OrcZYt-Sr9FIa-Rz!l&$*aP0c zZC4m<0>e2U_yimTQ|KSS1h5Xg##RO&fT8wIU^KBC9Ov5ON+~hZ2^p*hrC?DW$C{u& z&f5XpY_O4;3C3WyGZmZx2{1Xw0rnAH=zJ~>u5iWnE+AP3Hsr0xWppuD3gUJK44`%J zHkb%*gJs-S@G+3-+gt%#1-uGArEh`#Aey^_o`|XBJal!HnFY_<|LHZ-JXmg98`|85V5D#IY)u zWz)8k;5%DeE&`I=Velq#6r2O&I37#~hrl=N@!ai98JK1747LFkEC*iJN$n-8a@+ID z^3H-3Gn;YH2KbDd$>gv)Hxi8Jj*)x77ho{0f-Q6rrl6O>3hEptxeU46UIk=xdeX`M z810H}-9ZR!1*3pw@5s!s%?CTdSYQzM!RM?C%*3Gl8TcB^u|3M<(tZ$T@8tFZehl3a z8ZmR|y7UbOV;(b!eFPMNAz(YuG1$IL?!<(A3AhA~f-k}B+%j+(d=CbK`9K6aK-%U2 z0bEcvB!LHf2zJx0xz6Au$bhd{NM8hp>3g>Rzy~hkCT|O414qEsyt|m;?*l===PjW% zaEz@EMlen=61)QD=G3G|+b%JaapQV|Itx~@C1e@c1x$Mft0aQGU=p|h=Fx2!8mwk3 zfrZrf;1uY`jmzoCCbxl)I83LBg{%SAFj>Y9-UF}awgAJ3J{D3lE^4#AKKKm`0&5Ym z5fQ&*Mq5#dUcxj}wIh1V)QNh?s*&%mp`F zWSCr`_P}>2sh+bq>~9u7v6$}y%q4MMBwsYADi{w23{0Q!+bf71g&SlGo-k*}EN~mH&ML;2Tts5*-m50_ z5Xo5hO5x(Y%OZ*v?;Wq=5}98Ce)AEr0`qhAzD1uf2`2?aV(_|9L2q#tFT&ItkqfQz z{2n4Hi{{?L%ncE5SzMC9dfFh;iQ80*QBoWtFfo=e+rS7;RY64ZdkbG5U}i!+qyB*~ z?IjmiplUrt1}vh^TfBpaS>%^`-Xd6-W)ZmQ$A!m+s}AK-FIEf#zD48>M0K`C4Hm6_ z4iR{^fJ>8thy#ekvx-WXNMm5ZNHxv^E6fdX5hIeA3E`#yQ|U?-w7$MI!N5%D8;eP= zM^tt7DMa8SF0tr8=1Z9AIWV*>!*pBCS`!4~8s=1Zj)D7=n-%kpX^4DHJ&Oq3aP6@M z1SIw}rQ);r&}vOEh>t+HC|b-Nx5^FiB;k(L&l3$XU8BMNs#w<|EWHKKZ|cogz0BIY3y zA>w2O1e+L4yCEVUQ2;A3@hAc}C*)s<_!v=jD~18MC;73W{~3)46;Vwsa)tRuV?_Rh zs243lZB2fnh?u0_sTd&8h{WFe)#HdLR8On;!0uY3o}Vg)9bIs*LjGaRTd;P~8nvVm z@e!WmSd9cu=rTl{M^phGPg?ViM-f@y8Z;4q;{JmCTdiKvWa7Jr5JgwaEFf+%2prTN z)>s4&L`d8m;)7<@moSmV9aacWo-i%MZ55{$BC`MH>J!~0X)n!cY9q2zpUtb)H55ti z$oAJeW~b;KlFT&7Y=d+GWL=OYAv?#Fgv>6;)^II{YzbtWL*`A$$gcK~tqzIiu4$0f zAlnKuDHpsvjeh& zARBPafXr!EKgcA1fovs6H-^L|NY{k)}hN%m)TA(vUSF+YZur*Iw5wNWKIa ze8vqR`-W>XB#W{A+K}u6nFf$(0hz-tFJ!)lG~Vd9knIkcwUGJ{l0zWf2$CZpa~(1` zKJ_4R0W$L;I}y??AX^8rjUo9WWEQ(_LKX+MF=W<3HVeu6ki{py5wZZ%bzL|vG-Lo| zPD1(;WM@J~f^2>g(k&s`6Vi`B<~2y;BW>=Q=h^~UoH+|!Yh3#wz0ZYnt1e`*#qp4x z0+|hvIRe=QkX`NC2$`*rVIkWHGK(N{AJSJ`OI-sX6@zRPvN)TXxCF?GkXZ^@oav82 z8fVEUNLPhyE~JmZBse{5M-W!1U?45 z`LA5RK;~^1g5)^JBp}_~)d8{-Ac3#Rr;rs~SaktpmOyqSB(R@2uJ|V5e8-!@<{Lof z9Auh8W;-N~L$;gbnhKd1WDH0)ge-P@F=Vc}7D3hznFo-564JFG+YB-|7xuV*bQzH4 zAzk0~0%ZHT6xZ93&Do4H<<*lD$IlqQfVcAw-o;nutMb+PntW}(9^a6Ej4$Au@-6t5 zd~3cf-=6QpKg~bOcjtTXFY>+le*6G_5dShijDM9M$&ca3@jUP0eSDCgz(@EPU&_mT zlGpe&pW!F*Q~BxqOnweOpI^u?=9lp+_*MKGejUFd$-l$D%Wva%^6&Bc_yhb0{1N^* ze~SNz|Cs-j|BU~F|C+zZU*W&yuktteANbq+Py9XpH~vrlZ-EeKffaIvJi#HjgvvrS zp@#6NP*WBu5Hk zgmD5dcm%%?5=0>?ye7m2MNoy5U@!g^t&ut|7V z*e2{0-V^o-2ZTeyQQ^37QaCM~5zY#q310|b3zvj%gztrG!cF0}@RM*)_)Yjz_}dNK zq?>U+;cn?}y*J_wVjM-G6&159g`ssqU%espF~VY2bOu)5p`# zGr&{i8RQw_8R{A48SC+Qe4dEM^t|Dj;wkfFJ+nQ@d7g!yC7w4uD?BGXr#)vppLouC z&UwyzzVLkMWxTmwyO;AiyiPClR`yo$HuU!P_VxDn7I_DH2YX-k4)ea^9q$czr+TM* zXL{#&=X)1%1Gio4i}R+r7KI?|HxTUi04Y{@}gk{n7iA_h;`tUmah4 zU&ExYvF|Zofv>5rxvzz9h;Nv0xNn4Sq;IrutZ%%p*f-TT-Iw*v^3C?m_09J!^eyte z?>p!_pZ)W6(c?oY1quk&y8Z}M;PZ}ac)@AB{Q@AJR!zv2JE|D*q| z|DOL>|L^`k{eK5?0@VYx0(AoQ0u2Mr15X6n1=3{?tM4OI`-3e^eK4>bxk2|XSv3JnSk2@MSm3k?sA z2#pGj4!s_l6q*v67D|?dW`t&jW{2j4_Jt0FJ_sEN9SfZZoeG@}eH{8L^dL-znQ%_n z7S0Ph!me>zd)pBA4HyNf-<7sOs-Z?Uh~ zUn~*_i9^Jp;&5?COxI7yr$mWeaOS>haV zp1436d&T|Y0r8M{R6HS`5>JcCkHxd%Iq`Gx zEAfJOS^QSKD&7!pi9d=zi9d_Kioc70i4P=FVx%0&E;%Hp1f?p{BT@~imQ+WoCpDBF zlM19}(i2jl)JAG2b&xtsU8Qc)^HNW#m(*M8Ck>DWNkgPz(r{^{G)5XP36e+hOF?OZ zBuP=}wWO4g6e%fbQd%;lH>4@jG--x3OPVV!kQPhJq!m)Rv_@Jht(P`Ro1`t$c4?RN zp0rPTU;02gA|01bNgqj{Nav*U(wEW&>1t#^WME`)$mqz}$oL2!@kIQQ zP-H?R5{X4hBZ=NvLW(z zWK-nb$kxb?$nMDA$or9lkwcLqk>in5k&hyuN4rORL|=^dj`oWdMF&TRMu$g7M#n_Q zM}??28i;PbX{~~bW?Oo zbbEAHbWe1D^kDRG^jP#{^mO#&=%>;1(J!MHqF1B$qQ91~C6!8QmDDb2TGFFxwZV1+(GV~l)K8^pO?RsFUXhWZ{_dhYjX0Y zd|SRF-<9vlzsY~fe=CGSD>;f?aVRdOl2TQvuGCWMDD{;_%414_(oA_mDO6f3PbnRg z&PrFMoASK!g7T8mR~euTQidqQlvkBe%2=gXaVtJ0sDu?sDN#xlS(&IHC8ea5j50}? zqLe9FWtK8mnV(b^DNB_%m6ghBWv#Ma*{Ez%wkX?`UCMjPKIMRNNI9w;S57IXm5-HA zmGjD%$_3@J@{RJna$WgB`BAy6{G$A>{Hfem9!w-BG81zq+9z@o^C!ZIRVLO}KTwaT z$JJBnN9red4Dz}9m3mRVqJF1dQ*Wxb)t}URYVtSrPxWt1{%Dkg?8t#!s4}XCYM@6^ zUDNP8D1gF9LM5ma z$ta05ltvje2~9=Q(M&W4%}0ySQnVbEqcvz9+K4uxElIQ;?LvFdesmBWM#s=ebQ*n( zK1Juzm*@hzjJ`!z(G7G9-9bO2U(p}vz6LZ(V>O$`X-=(@R#mI6)za!{^|eM?6RoM% zLTjnD)}GQjXq~mLS~u-^?FH>6t*GFgy`qiKMr-3VUh`;vEu@JWt~ak~32mZ= zG+i^bH?%2QnU>XNYxA^)+7j(eZKbwaTdQr*-qGIGwrM-H_q2W50qu}>R6C)4sGZTy zYM*IeXkTlWv~RTUwd>js+K<{@?HBEL?Jw;?icB%7+*DpFKLt}&Qjer+rfR3^r5dIl zOFf=yo_aFXDw%4VYM<(qdOG!N>bX?URIgN@RR7e#)R5G$)T^mcsj;czlsn~11yd7J zkyI=dPbn!il}Z_@*He>I(^4~1vr=J)~DW1ZBA`X?MUrT?M=O( z`XF^Abv$({^-=1R)Vb8>sjpHOQ&&>orLLuJrf#Q_Kc()aeoOtC`dcS-TF=q#xZ@2GdtpV7PPJ@gm#-g-a1NFS^Z)radN^)dQ* zUC_OHKo9GZUZR)kvYym6J*{W-N%~ZMx;|5%qtDkD=}YzHdbz$vU#D+O>YMZ}`gVPn zzDM7$AJh-)$Mlo>Y5k0TR{u=@T>nbHs9({))353`^jrFm`d$4O{dfH@{Xv>cGwIxP zUfPj%r7NearmLrGrR${YryHdoOFy1&o_;djD&02SF5NNRIo&ngE&Y7@h4f45zUcw! zLFt#%ucSw$N2SN6bBfdMv@ac;v7tucjP$JZob>$kqV&@A@^pE6O?q8=V|r71OL}{H zS9(u+fBInhaQayKWcqaaO!{p4v+N5SYA0zU$FLck;WR24RgLOKO{2C^&uC~oW;|{* zH=Zk=wZBQykzt>`Wpj{A;vJ{Rb!Mf)+jdIhR+BZ6O4!vGvbC~ zs7A_28yRDgG1ZuE%rxd0^NmHuQe(MMZmc%e8XJsvjCYN##*U=1+t_QoZ+u`JF^(B0 zjnl@*#;3-4<4fa$aoPCRxN6)mZW(uspN(IQKaBe(Fe#HYbIm+6--Kor^AWSAS=+2< zHZ&WX1!gnz3A4~_W41FpnqACi%bGcb=t})k{8_iAT7IV9~%Y4t= zXC5#QnMchN=7;7-<|pPk^KSr1a$~4I|&9un0%(TutmFbY_lzBSyZ05O4&rGjOpG?0@QD$&v zXl8h3WM)iee1^}sGrmkP6V6DPXeO44XHpqGV`Qdf$}-u^!px$~(#)F7hHU4z>k{w% EABgMqMgRZ+ diff --git a/MessageWindowController.h b/macosx/MessageWindowController.h similarity index 95% rename from MessageWindowController.h rename to macosx/MessageWindowController.h index 7a4830a10..b2ebd3b7e 100644 --- a/MessageWindowController.h +++ b/macosx/MessageWindowController.h @@ -33,7 +33,7 @@ } void addMessage(int level, const char * message); -- (void) addMessageLevel: (int) level message: (const char *) message; +- (void) addMessage: (const char *) message level: (int) level; - (void) changeLevel: (id) sender; - (void) clearLog: (id) sender; diff --git a/MessageWindowController.m b/macosx/MessageWindowController.m similarity index 96% rename from MessageWindowController.m rename to macosx/MessageWindowController.m index 0f310570d..e9cfea837 100644 --- a/MessageWindowController.m +++ b/macosx/MessageWindowController.m @@ -43,9 +43,9 @@ MessageWindowController * selfReference; //I'm not sure why I can't use self dir { selfReference = self; - [[self window] update]; //make sure nib is loaded right away - fLock = [[NSLock alloc] init]; + + [[self window] update]; //make sure nib is loaded right away } return self; } @@ -78,10 +78,10 @@ MessageWindowController * selfReference; //I'm not sure why I can't use self dir void addMessage(int level, const char * message) { - [selfReference addMessageLevel: level message: message]; + [selfReference addMessage: message level: level]; } -- (void) addMessageLevel: (int) level message: (const char *) message +- (void) addMessage: (const char *) message level: (int) level { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];