git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is a progressive checkin. It has the following effects:
[MenuTunes.git]
/
MenuTunes.m
diff --git
a/MenuTunes.m
b/MenuTunes.m
index
1dd7df6
..
5dc69be
100755
(executable)
--- a/
MenuTunes.m
+++ b/
MenuTunes.m
@@
-10,7
+10,6
@@
Things to do:
#import "MenuTunes.h"
#import "PreferencesController.h"
#import "HotKeyCenter.h"
#import "MenuTunes.h"
#import "PreferencesController.h"
#import "HotKeyCenter.h"
-#import "StatusWindowController.h"
@interface MenuTunes(Private)
- (ITMTRemote *)loadRemote;
@interface MenuTunes(Private)
- (ITMTRemote *)loadRemote;
@@
-36,6
+35,7
@@
Things to do:
{
if ( ( self = [super init] ) ) {
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
{
if ( ( self = [super init] ) ) {
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+ statusWindow = [ITTransientStatusWindow sharedWindow];
}
return self;
}
}
return self;
}
@@
-774,7
+774,7
@@
Things to do:
- (void)showCurrentTrackInfo
{
NSString *trackName = [currentRemote currentSongTitle];
- (void)showCurrentTrackInfo
{
NSString *trackName = [currentRemote currentSongTitle];
- if (!status
Controller
&& [trackName length]) {
+ if (!status
Window
&& [trackName length]) {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *stringToShow = @"";
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)
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
@@
-827,7
+826,7
@@
Things to do:
- (void)showUpcomingSongs
{
int curPlaylist = [currentRemote currentPlaylistIndex];
- (void)showUpcomingSongs
{
int curPlaylist = [currentRemote currentPlaylistIndex];
- if (!status
Controller
) {
+ if (!status
Window
) {
int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
if (numSongs > 0) {
int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
if (numSongs > 0) {
@@
-836,7
+835,7
@@
Things to do:
int i;
NSString *songs = @"";
int i;
NSString *songs = @"";
- status
Controller = [[StatusWindowController alloc] init
];
+ status
Window = [ITTransientStatusWindow sharedWindow
];
for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
if (i <= numSongs) {
NSString *curSong = [currentRemote songTitleAtIndex:i];
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"];
}
}
songs = [songs stringByAppendingString:@"\n"];
}
}
- [status
Controller
setUpcomingSongs:songs];
+ [status
Window
setUpcomingSongs:songs];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
@@
-856,9
+855,7
@@
Things to do:
- (void)fadeAndCloseStatusWindow
{
- (void)fadeAndCloseStatusWindow
{
- [statusController fadeWindowOut];
- [statusController release];
- statusController = nil;
+ [statusWindow orderOut:self];
}
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
}
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers