X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/d8f647f12a59ea6ffa270b17cdebf980dad7a01a..24a440dccb5f6edb1e324e1cba03f373f89d0c30:/OldMainController.m diff --git a/OldMainController.m b/OldMainController.m index cf1b1e7..27ca9d1 100755 --- a/OldMainController.m +++ b/OldMainController.m @@ -133,9 +133,7 @@ { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil]; - [self rebuildMenu]; - [statusItem setMenu:menu]; [self setupHotKeys]; isAppRunning = ITMTRemotePlayerRunning; return; @@ -197,10 +195,6 @@ [menu autorelease]; menu = [[NSMenu alloc] initWithTitle:@""]; - /*while ([menu numberOfItems] > 0) { - [menu removeItemAtIndex:0]; - }*/ - playPauseItem = nil; lastSongIdentifier = @"0-0"; @@ -263,6 +257,10 @@ [menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""]; + } else if ([item isEqualToString:@"Show Player"]) { + [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]] + action:@selector(showPlayer:) + keyEquivalent:@""]; } else if ([item isEqualToString:@"Upcoming Songs"]) { upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:nil @@ -746,12 +744,16 @@ } } - [statusWindow setText:stringToShow]; + // + //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow + // + + /*[statusWindow setText:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } @@ -767,7 +769,6 @@ int i; NSString *songs = @""; - statusWindow = [ITTransientStatusWindow sharedWindow]; for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong = [currentRemote songTitleAtIndex:i]; @@ -775,12 +776,17 @@ songs = [songs stringByAppendingString:@"\n"]; } } - [statusWindow setText:songs]; + + // + //SHOW STATUS WINDOW HERE WITH STRING songs + // + + /*[statusWindow setText:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } }