X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/72d97dfa58a2945c5d794d4f765db733a36360c1..ca5ccb3472e33cd85f4ba7aee7e3ebe4e348b04e:/MainController.m

diff --git a/MainController.m b/MainController.m
index 2a1e7dc..c2502c5 100755
--- a/MainController.m
+++ b/MainController.m
@@ -189,13 +189,6 @@ static MainController *sharedController;
 	_open = YES;
 }
 
-- (void)applicationDidBecomeActive:(NSNotification *)note
-{
-	if (_open && !blinged && ![NSApp mainWindow] && ![[StatusWindow sharedWindow] isVisible]) {
-		[[MainController sharedController] showPreferences];
-	}
-}
-
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
@@ -388,14 +381,12 @@ static MainController *sharedController;
 	if (refreshTimer && identifier == nil) {
 		if ([statusItem isEnabled]) {
 			[statusItem setToolTip:@"iTunes not responding."];
-			[[ITHotKeyCenter sharedCenter] setEnabled:NO];
 		}
 		[statusItem setEnabled:NO];
 		return;
 	} else if (![statusItem isEnabled]) {
 		[statusItem setEnabled:YES];
 		[statusItem setToolTip:_toolTip];
-		[[ITHotKeyCenter sharedCenter] setEnabled:YES];
 		return;
 	}
 	
@@ -438,7 +429,7 @@ static MainController *sharedController;
 					} else if (title) {
 						_toolTip = title;
 					} else {
-						_toolTip = @"No Song Playing";
+						_toolTip = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
 					}
 					[statusItem setToolTip:_toolTip];
 				} else {
@@ -464,20 +455,18 @@ static MainController *sharedController;
 	if (([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning) {
 		if (refreshTimer) {
 			if ([statusItem isEnabled]) {
-				[statusItem setToolTip:@"iTunes not responding."];
-				[[ITHotKeyCenter sharedCenter] setEnabled:NO];
+				[statusItem setToolTip:NSLocalizedString(@"iTunesNotResponding", @"iTunes is not responding.")];
 			}
 			[statusItem setEnabled:NO];
 		} else {
 			NSMenu *menu = [[NSMenu alloc] init];
-			[menu addItemWithTitle:@"iTunes Not Responding" action:nil keyEquivalent:@""];
+			[menu addItemWithTitle:NSLocalizedString(@"iTunesNotResponding", @"iTunes is not responding.") action:nil keyEquivalent:@""];
 			[statusItem setMenu:[menu autorelease]];
 		}
 		return;
 	} else if (![statusItem isEnabled]) {
 		[statusItem setEnabled:YES];
 		[statusItem setToolTip:_toolTip];
-		[[ITHotKeyCenter sharedCenter] setEnabled:YES];
 		return;
 	}
 	
@@ -554,7 +543,7 @@ static MainController *sharedController;
 				} else if (title) {
 					_toolTip = title;
 				} else {
-					_toolTip = @"No Song Playing";
+					_toolTip = NSLocalizedString(@"noSongPlaying", @"No song is playing.");;
 				}
 				[statusItem setToolTip:_toolTip];
 			} else {
@@ -1524,7 +1513,7 @@ static MainController *sharedController;
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
-			[[NSNotificationCenter defaultCenter] removeObserver:self];
+			[[NSNotificationCenter defaultCenter] removeObserver:self name:@"ITMTTrackChanged" object:nil];
 			[statusItem setEnabled:YES];
 			[statusItem setToolTip:@"iTunes not running."];
             [self clearHotKeys];
@@ -1560,6 +1549,12 @@ static MainController *sharedController;
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 
+- (void)applicationDidBecomeActive:(NSNotification *)note
+{
+	if (_open && !blinged && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
+		[[MainController sharedController] showPreferences];
+	}
+}
 
 /*************************************************************************/
 #pragma mark -