From c7cfb51853a76b548e9f3e073a63d44ce0a99258 Mon Sep 17 00:00:00 2001 From: Matthew Judy Date: Wed, 9 Apr 2003 23:04:18 +0000 Subject: [PATCH] Icon swap --- AppIcon.icns | Bin 0 -> 24163 bytes .../Preferences.nib/keyedobjects.nib | Bin 34196 -> 34196 bytes KeyCombo.m | 2 +- MenuTunes.icns | Bin 37238 -> 0 bytes PreferencesController.h | 3 --- PreferencesController.m | 21 ++++++------------ 6 files changed, 8 insertions(+), 18 deletions(-) create mode 100755 AppIcon.icns delete mode 100755 MenuTunes.icns diff --git a/AppIcon.icns b/AppIcon.icns new file mode 100755 index 0000000000000000000000000000000000000000..7b403838b144e2b8ac1b0263b8e5d5da57769515 GIT binary patch literal 24163 zcmeHP4^UId8Gr93frJDd{tQzFBm^+z56R1!Qn2Xc6cD*O((BoB+8KtP&N<3Sm2zCU zn;R_#PI5q|tu!+|&zNh#%uQ=;i<~;>S8)l34Gykiw$nAKzRi5^-( z!fT^MGjyWTRwb&W6DHdlktw32%2q9^qD$yj9y&2;n-Wb1OL}~Qdt;{`nxVpbfJ(l5 z(cV&1Tsdu~MBZSXE}!Ifvq_Wt74n%KMH#)Th~(a^vSedijxWW=od#cqcp9{Zqo5+p{wo_e~Lhd~>*qHFdvF z=-D7&bFPOSyO|;`|9Y|)4*Q|aC!nYJ9qRRIjof4g(r~a7jxab(2 z2$h_)jfhU7Rf%D*yi&fa37lkNAvH^qarUqcUd6N2R4Ngnm(JE_fP*hgWV7{(v{Y84 z5+OcEA6Z{0qaH+-gy$YmVqU$6l0Kn-S^V|9_5*yR4`0%V^aJWkFhA1~LyE{uQ?fbx zC!zu+6=xf(H`aZjY^*kBi-of6g5r6kAX_HHg<`2}9+8TL_>NZEqseTiw=4xekFjCr z1q>S)T8|BY>maxehUJ|@H5jdT46VZ);A$VL#_VBvR{xakZ`pf6Uv4kv09U8mk2%40 zz#YH_z;)0~VS{0LR?pVAyFJ*#+OH4d+1)j;J(G93Ya#w~5dS%d&*WLX!~LZ8@wT6t zFZ=I3qWkXaAG95Iz==5P72mit+`XAp<#svXq@MQ6?)~}b{)RGnkw#A{x*c$mhXazw zf3vrI+oV<$mvk6#g~b8Q{tYF4bZ^YrTv={Vt4qjEpnKZ^m*Q7}l$rlr9B8XlYjh-O z32Wwj-!Gmx-QTjI81!c)@eq>3L8&l)<0Z?;R9|>w0G>3idgkSWCntUqjtYhf82?%L z^}qLfh+WIV1_x?Zj7HQ1-3rE+uNvzQ?{mNv5L{cn`f`7`0fR0|aDDmeEB&)9o?G(^ z`(*5#g%0ifB(Zk(`6c%+3?BLA`Keb!i^-bXV4>;}J0sL(7 zTLwZ?d!5}MVD3K!bKgzjwi2LGcLvzq@m@gkVEoeP)!Uzg1p_UQsyYpVXH=W+zsGDX z=Mlg3mSg)G!&jeeXjiWq>-H0uNxhjQ3f5fu1+y<5cCT#cTdG1$Nr^^Tpr!4`&591a zK&xrJ?1UTtut(rBDs^T(p{gFUcqDght4miH%QpS?&HxMgs<5TCL<#tcfnvk^#VOrF&b3_Vr*1ko9=6+HFX-N1Hmb-0RC{gX^Fhj6E#R>e>49w?}k_p3czI8NG#~eu_j-XXxoHim&G8dpc_kzJPdE9QLjN zB@;CRI1mDeAUdI&&`o1C8(<4XNy%bKv?5MU5($9~u^E69!lXIxxgx)Z=gEnags~Yw z!%LR%An>b}NMbYqCjfjVKM0RD6BrQF1b|l*OEQ=7An>b}WiA2lF=Ds_aFH}UN68Pu zqgCdlOGUBZ6G^FA3Ox@3ze=yjN==G5^FR1(FOoxt0fkU$vH$XGkJnx<|ME06*VQ#Sg-x ztuo~QU*lJ=D9n;2MMIpkXfww7uPsyMWXPgo&Pdvf5ufMQ;8St5nHYSIHWP!-(Pm=s zIoeDNK1Z90!RKf*G58#9CI+9Q&BWkyw3!%ujy4m6&(S8rkIDbwBN-kYnt#@9L-!xL z|6=g}dG;8e3hh6%|Cq;CbpD|82c18BXJtHe==??JFFJqeZ%PsWApSx86AzBz>l5)0 z;vd96h<_0OBL4&VAISgU^A+NuL;eTyKal@{{14=RApZmTAISfRhmXP6C-Og#|AG7u z?KjpKfQOT-p`vp{_A_s2vq{;008xxM3nWf9~+ zM|*Q)9rycdCjP3Xep_?f8*eUxywTRYt-gl){W%kVX4+8SxV>rDB1qHr#`+B=?)Udh z{GHKMQ@82GEsG#8ZmO#>8M*iaCjL;VFRd`Gty%NHA44i|sI#Gj^TW#{I}^A|zndAZqH>0JB`7L31@rY=oO&sY>mPg|NQ<>HUPKQ>=z h{BcxKS6t=D_$%N8FEIW(nxM0=y0hZXXdgUr@;^&W1Ec@| literal 0 HcmV?d00001 diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib index 0c42c8f9532b71bce9888fd5d88ad8bf18592117..218af8aae199709ea0608ea126f2ef597d1995bf 100755 GIT binary patch delta 32 ocmbQz%`~N(X+w+zqs8V}i5q;(b0Z&2wos2|ik+}|s`~#}0K@+bjsO4v delta 32 ocmbQz%`~N(X+w+zqrv7_i5q;(bD|GSwos2|iZ9qaRsDY~0Kp0jNdN!< diff --git a/KeyCombo.m b/KeyCombo.m index 9017619..c2bd008 100755 --- a/KeyCombo.m +++ b/KeyCombo.m @@ -99,7 +99,7 @@ - (NSString *)userDisplayRep { if ( ! [self isValid] ) { - return @"None"; + return @""; } else { return [NSString stringWithFormat: @"%@%@", [KeyCombo _stringForModifiers: mModifiers], diff --git a/MenuTunes.icns b/MenuTunes.icns deleted file mode 100755 index 1d91c7b3a46e39005d85275a61936da4d70bd2c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37238 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 diff --git a/PreferencesController.h b/PreferencesController.h index 88380e0..9cc25cb 100755 --- a/PreferencesController.h +++ b/PreferencesController.h @@ -58,12 +58,9 @@ - (IBAction)showPrefsWindow:(id)sender; -- (IBAction)apply:(id)sender; -- (IBAction)cancel:(id)sender; - (IBAction)cancelHotKey:(id)sender; - (IBAction)clearHotKey:(id)sender; - (IBAction)okHotKey:(id)sender; -- (IBAction)save:(id)sender; - (IBAction)setCurrentTrackInfo:(id)sender; - (IBAction)setNextTrack:(id)sender; - (IBAction)setPlayPause:(id)sender; diff --git a/PreferencesController.m b/PreferencesController.m index 2206fab..113f883 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -180,12 +180,6 @@ NSLog(@"bar"); [controller clearHotKeys]; } -- (IBAction)cancel:(id)sender -{ - [window close]; - [controller closePreferences]; -} - - (IBAction)cancelHotKey:(id)sender { [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -203,7 +197,7 @@ NSLog(@"bar"); NSString *string = [combo userDisplayRep]; if (string == nil) { - string = @"None"; + string = @""; } if ([setHotKey isEqualToString:@"PlayPause"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || @@ -269,13 +263,6 @@ NSLog(@"bar"); [self cancelHotKey:sender]; } -- (IBAction)save:(id)sender -{ - [self apply:nil]; - [window close]; - [controller closePreferences]; -} - - (IBAction)setCurrentTrackInfo:(id)sender { [self setKeyCombo:trackInfoCombo]; @@ -306,6 +293,12 @@ NSLog(@"bar"); [self setHotKey:@"UpcomingSongs"]; } + +/*************************************************************************/ +#pragma mark - +#pragma mark HOTKEY SUPPORT METHODS +/*************************************************************************/ + - (void)setHotKey:(NSString *)key { setHotKey = key; -- 2.20.1