From bb84d84505744320f081b3826b959c787f659287 Mon Sep 17 00:00:00 2001 From: Matthew Judy Date: Sat, 22 Feb 2003 00:18:18 +0000 Subject: [PATCH] This is a progressive checkin. It has the following effects: - I have begun to swap in the ITTransientStatusWindow. The StatusWindow, StatusWindowController, and StatusWindow nib have been removed from the target. ITTSW references have been swapped in incompletely, which results in build warnings and no window during runtime. I am going to use an ITTSW subclass for MT. Everything still builds and runs. - I rebuilt the Preferences nib. This should be the final UI for prefs. The biggest change is that the Cancel/Apply/Save buttons are gone. NOTE: I have not made changes take effect immediately yet. I have enabled the close button on the prefs window. - The Prefs and Registration nibs are now saved in the 10.2 keyed format. I have no idea how the registration nib got modified, since its days are numbered, but I went with it. :/ --- English.lproj/Preferences.nib/info.nib | 13 +++++++++++-- English.lproj/Preferences.nib/keyedobjects.nib | Bin 0 -> 30574 bytes English.lproj/Preferences.nib/objects.nib | Bin 8725 -> 0 bytes English.lproj/Registration.nib/info.nib | 13 ++++++++++++- .../Registration.nib/keyedobjects.nib | Bin 0 -> 6169 bytes English.lproj/Registration.nib/objects.nib | Bin 2643 -> 0 bytes MenuTunes.h | 4 ++-- MenuTunes.m | 17 +++++++---------- 8 files changed, 32 insertions(+), 15 deletions(-) create mode 100755 English.lproj/Preferences.nib/keyedobjects.nib delete mode 100755 English.lproj/Preferences.nib/objects.nib create mode 100755 English.lproj/Registration.nib/keyedobjects.nib delete mode 100755 English.lproj/Registration.nib/objects.nib diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib index 15c28fe..f884d1b 100755 --- a/English.lproj/Preferences.nib/info.nib +++ b/English.lproj/Preferences.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 71 12 356 240 0 0 1280 938 + 4 276 356 240 0 0 1056 770 IBFramework Version 291.0 IBGroupedObjects @@ -16,7 +16,16 @@ IBLastGroupID 1 + IBLockedObjects + + 281 + + IBOpenObjects + + 115 + 6 + IBSystem Version - 6G20 + 6I32 diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib new file mode 100755 index 0000000000000000000000000000000000000000..9ccd686f6a7f1b4733b928e68d0eb081bdddb82e GIT binary patch literal 30574 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 Axc~qF diff --git a/English.lproj/Registration.nib/info.nib b/English.lproj/Registration.nib/info.nib index 4b48012..f813748 100755 --- a/English.lproj/Registration.nib/info.nib +++ b/English.lproj/Registration.nib/info.nib @@ -2,9 +2,20 @@ + IBDocumentLocation + 30 27 356 240 0 0 1056 770 + IBEditorPositions + + 31 + 177 408 305 135 0 0 1056 770 + IBFramework Version 291.0 + IBOpenObjects + + 31 + IBSystem Version - 6G20 + 6I32 diff --git a/English.lproj/Registration.nib/keyedobjects.nib b/English.lproj/Registration.nib/keyedobjects.nib new file mode 100755 index 0000000000000000000000000000000000000000..028559998e081f5e0fe84d714d307cb3da587eea GIT binary patch literal 6169 zcmb7I33wCL_CF{4+DtNtfTBT*h{W2BwxFP05us&C>4JqC(xHT=NlDU;QaFe#qT&KB zhzPWRR76BX1Vmh(f*XjSBBJ8HDCXhSJR7}UK@fw!S#4H?v z*WoD4#{wLO#DN0@aDod&=mFIlI zvuECLZNx9pg>(Vg$kGvmF=U-IUaI8O#3JEfP>Q_G3de&N3Sj~iK{1p-DNKaxp+t$Y zjDqn}v?d&?U~q6Cq+pPDRGemzlup!x6TK?WhSyVk-J%7mIj54!vx6UeH$= zO=e>Y*(*grQIZq!)knKD$sp-i%qGi`l0va4oliZ;>Ehe~^%no&-?ACMXOb{h_A>^x zPzUwU0F5w{!{iOjl=vd!j59G+*_gzOGRLy8OXyKHy4D}4@QsN0IIJo_nqf8z$d%Xv z&ER>9l@iQ_8(|*Y1oL45EQCcIc*SbjIbX~d3|Gn<$o9(4%VXJ5dF-w6aq4@~xpWTo z6bwb)#%N5cE*HcYd*0=$vi1;fb*r+?ZLoy5D4rIGNm)rCXjRJy?r33K{$$c!Y|>I# zMCVbTQd#MrRNVthvJyd6a33sJup~!4FCYagc<@2{p$dBXW_2QtS_PBe>kqP0{mVr7}CbuFwb7kY3~0#nA+#)1-? ztk6?9(h6%~J$Sgz`B~@e*_E~d+903eso!6#Wg|QyR|{QC7j@z}DdT^{b6XdlORA(s z#oDfYx4`3&4_hgT66uoeJ8$DUeG;}SJ6}PU(g0=e)Fdt@t{^U^j8u<1g=^`3&hAdG zrCmxjJq^3z8Lp>2@GRHVbMQRZ)C|}PFTlUJ`Md;sVIRBsUI8U73% z&QmZZMVMctj+#)`jg=ySa7DnMBL#hp9K)>ISS%b;YmJe5)@`}qD)4qJAIW7EVdYAL z>C`;3n!6AskjG`p01);GsFd1*8?X7prNiGr=uMZ=z@j4Fb82Jv%6lF5(;z`8y;cg= zNwI+6CsW=*#-L0K3DH<25UQlhRV*Baw-nnu2w8d93Wwos@W|Au+^b8Ez`G1l)e9M- z>);3+RiQhHvDo!MU49JSX9eo)Iylw=TaF(etJr4dUOs_E6p|jQiX4ZJIC~x7lR2vs zgRO8}MrIczu7gkDQ-)Kfnn%38&ykI1N9+8Tc7~ zfq%oV@E`b%-B3HYTqzur;zA`!oFjF*Fu+y8^Z9|0%wO`z*C3BN1;=wYS13~z@WvX0 zQob)*rNmO5lgWhx%_3fZM3O?XNaqep^W_?q4N%6EL1SDs4a|yzDW3``RfrQbG@8;V zyCMf>-dew3ibgrm>Za|PMl6&y%hBp=Jg7w-4WaAW zdn_7S(1<1)O4;2Dsu)h91+83AC+RA>QYojTbdNhNT`A?XAzWCA&CN$xcUNmt8WYAr zH5ws=4%mwV4W~>RRxS+84o4#Fdp~z+xYk`C2)Vf(ySY&{a&+9jit2!hfqs^5RF5Jo zz#h!2*U;5vezi$=r&c@{mW)hHNRxl*&`lVal(9DpXK_)r3wO4=JP{(I%jEOQ*u%YJCi)5 zxm@Vel#-B|n4FO;4NA#iQtY~ER`g*KCMzVQVyRH7t_d>7wO|r>##NqGdN>%c8>C7d}iC6((mt^J6hz+BvB!H~aYiILP2U z=AxUh?oV7apJq`L&Gcs0*SE(7BAtV7c~$vB4&=B{SMIjpt(@07ny17Km*DNRc(dSQ zwja&$^K%*UQ@n#Y@KY|!5@_S{OoOeQ&XY7>rsnZ55bwgJxD0yZ-FOe)%gryhf!`I)>Uzz4Xes_&t4lUs``R1Q=*Y#=_^ zA`@tbq5NUS#pi$$Hl;5c)>pZnl*epfi9Ew2KYZG;zGbr@@Z4x_j}|={{Oc z_tOe`pe!#ClmN*Le;u1(}H@0(t zdo~N_v46SzYMsmRFmep8Vc_{WN^OvXIsDq4jV77lAxrk2Q<}%AtcBqnem}<=@OgXz z|AjB&OSl*J;mi06zKXBm>$o2e;2U@l-^4?B7~jIT@f|#Z@8VH>50B9rYN1wIOY3Mo zJwzL*jUJ|r^ayRDM`<%XMqB7{+DcE*HhPk_(^IsAcG51vDwu_y!Ucj+a0-0{QLqbr z1(VQAI7iS6=L+Ww7YZ)HCY&cYR1Exxr@5<+%u+v7!M>RV&FKLcw zj%to+KF}Q3e60CY^SS0r&DWZ5HQ#GaXijNPYtCr?&|0;2twY;O+fVD!4%X&qM{3Ko zlD0-0(MGkiv^Q(-(B7k6rCpFIfN$peGo!Y0h&uE|3KCeBbeNX$9_LTOt_Kfxy z?XNnmPOlSn9^G(Vt}b6!tn=$6U8OFdtI`E^&ALUp#kyN{OLXgXuj)S3eWm+ZuhR?q zczvS&O8qeX)%r|*p8i_>IK5Y2sF(CXeN;b7KU+UfKVQF4zf8YUzgFL-e@6e3{;>YI z{yY5-`jh$}^*`x<*8gtkVd!TVXz&;k4C#ie4C4%5!vsUQA!rC28VrjKOAV_HZH8@z z=M4u8?;4I9zBQaN{9){A>}&KGhZ(OnW*R3N%Z!tab;cFOwZ?76?ZzF(UB<)4w~a@P zM~$aU1586qV@y6%jcK-NscF4wgXv+@X44kaR@2j_=S(k{UNr4B?KgdB`pEQ&={wUI zGnh4ItGTZ^-h8<^&75s6FqfGnbI9CizTJGE`7!f$^FH${=GV;swOA}YEEickmNZMY zrPva%)LCw_++n%PvdpsFvcj^`vdXf?(rQ^}dC1ac*=TvmvfuKK<+$ZD%NffrmS3$} ztI2Ay+N}Mp1FQqBnbs-R3hPwsH0v^Jn{}gglXa(cul1nybL*GZ|JZuidfIx~uCP_u zrrM_2rrW}{2HRZQV%u`tYTE|e9@{?K0oxb0Q+9{Fmwk{u(VlG2w&&VM*c<8_K?BCkIx1WeJ#SM%b6xSGcSKP9=d*U|5?T>pS z?wz<3ai`)=JFE_mBf*jC80E-!Om^Jh2smasW;td%HaoUBwmP;swmWt>b~$!C_Bf6@ zK6ZTL_|5UV09-+Fg1~h$NVr_MLKq=T6Q&Cbh1EifuvXY5oDfb4r-d`ZuTHJg=DgV1 z-X$<^$d*DDQ8PPPch$wAKB)!*?8{&?Dk#TZPACpNYwTIGhA{kc|T~jlI zmu%NXmrZ!0V+Q^&iVz=d*Eac&24zW#Aq*yIx6ekLWHRqk+6mi8x~wXE9<6%K-$o!# zS)LB!Ei{c{2+<&Sm|nbi?0rQinxKC{1VzjeK~z$LMkZuHR^(=cNm3NZIZ@IxMM2C7 z6Y^Q2ydkKXps0eRs*^Gi(l9Hk`Gb~+(ip_CyX3w~TR(gI9qIEBLTCW~TifVElt&Vh zQ3{FZ1Ej&Iz&inVa5_SOP zH-`ZKp$7U_Iq=_n*97u=uo+4Ka>LJAKbYqAs?+l~(6u=*ck5AOM-CXcub-#0ufLwo zy1~+yTO-xXaD%96YT*WM_};67)1#s^Iiaa}CFOG;`$G(KHSgms9@GvmqJ7U0QtL5N z^hdP#got)MOGLLDz_1(m&M$SBszo=N*L77vR~v{M_;UZafY7+`2t-w8d&->8hrg}m zp#2a+)f}88nw%~+fm@>CTuzob&0_|-w+ByK)3NQ_Ue(lUvsUpOaFhP%?ghpU9r764 z=P~vOurq_s!l(mpB_v*p07E%TVF^$MiWG+pyfw+Qx;5#Qs0~en(w;=}V_8Y5g>jOd z%7{8K@V_M*k!9W`Jinx_fPrlTf6CWRPo0B803x68l^6HpLSS=sCU`+V75Z)UgR ztS&qEA#@M&Ka9Z31~}D#JeijylFK~-^2)P7KI1%`aaNX{dDp3IIvW*d)^!$Kx7%6d zS@4~ELqnFsKn4e2<2-%Ka+W{@h2wP$%bDM~3RGtJsxdi3Udsu`3ksyuS$%ZXeVB%7 zwdZWYq|KYa;)l%{IIsdUzXKpz0FnQUx10@-_*`0le9i3RqP4&HWdUs0TNcsbFl>d} z3cSEoWbUWwfYjtgnasVUe6Hd|B3<$Ry70tS-lv+mxe4_np@-kh531E;P+3H^R6&KmCQ_s=SxGJgQ Nm<9+GRBh6-{s$KKJHY?| diff --git a/MenuTunes.h b/MenuTunes.h index 304b34d..6e66299 100755 --- a/MenuTunes.h +++ b/MenuTunes.h @@ -20,7 +20,7 @@ //@class MenuTunesView; -@class PreferencesController, StatusWindowController; +@class PreferencesController, ITTransientStatusWindow; @interface MenuTunes : NSObject { @@ -52,7 +52,7 @@ NSMenuItem *playPauseMenuItem; //Toggle between 'Play' and 'Pause' PreferencesController *prefsController; - StatusWindowController *statusController; //Shows track info and upcoming songs. + ITTransientStatusWindow *statusWindow; //Shows track info and upcoming songs. } - (void)registerDefaultsIfNeeded; diff --git a/MenuTunes.m b/MenuTunes.m index 1dd7df6..5dc69be 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -10,7 +10,6 @@ Things to do: #import "MenuTunes.h" #import "PreferencesController.h" #import "HotKeyCenter.h" -#import "StatusWindowController.h" @interface MenuTunes(Private) - (ITMTRemote *)loadRemote; @@ -36,6 +35,7 @@ Things to do: { if ( ( self = [super init] ) ) { remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; + statusWindow = [ITTransientStatusWindow sharedWindow]; } return self; } @@ -774,7 +774,7 @@ Things to do: - (void)showCurrentTrackInfo { NSString *trackName = [currentRemote currentSongTitle]; - if (!statusController && [trackName length]) { + if (!statusWindow && [trackName length]) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *stringToShow = @""; @@ -814,8 +814,7 @@ Things to do: } } - statusController = [[StatusWindowController alloc] init]; - [statusController setTrackInfo:stringToShow]; + [statusWindow setTrackInfo:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) @@ -827,7 +826,7 @@ Things to do: - (void)showUpcomingSongs { int curPlaylist = [currentRemote currentPlaylistIndex]; - if (!statusController) { + if (!statusWindow) { int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist]; if (numSongs > 0) { @@ -836,7 +835,7 @@ Things to do: int i; NSString *songs = @""; - statusController = [[StatusWindowController alloc] init]; + statusWindow = [ITTransientStatusWindow sharedWindow]; for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong = [currentRemote songTitleAtIndex:i]; @@ -844,7 +843,7 @@ Things to do: songs = [songs stringByAppendingString:@"\n"]; } } - [statusController setUpcomingSongs:songs]; + [statusWindow setUpcomingSongs:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) @@ -856,9 +855,7 @@ Things to do: - (void)fadeAndCloseStatusWindow { - [statusController fadeWindowOut]; - [statusController release]; - statusController = nil; + [statusWindow orderOut:self]; } - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers -- 2.20.1