X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/ce07e58f56b64ce6eea89ecbd66fa7bb8af57519..86cf83625b2bd9c7abe182ce1f2da11d33cb1482:/MainController.m diff --git a/MainController.m b/MainController.m index 16738a3..6d7fe08 100755 --- a/MainController.m +++ b/MainController.m @@ -1,4 +1,4 @@ -#import "NewMainController.h" +#import "MainController.h" #import "MenuController.h" #import "PreferencesController.h" #import "HotKeyCenter.h" @@ -7,7 +7,6 @@ @interface MainController(Private) - (ITMTRemote *)loadRemote; -- (void)setupHotKeys; - (void)timerUpdate; - (void)setLatestSongIdentifier:(NSString *)newIdentifier; - (void)showCurrentTrackInfo; @@ -72,7 +71,14 @@ static MainController *sharedController; if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { [self applicationLaunched:nil]; } else { - [self applicationTerminated:nil]; + if ([df boolForKey:@"LaunchPlayerWithMT"]) + { + [self showPlayer]; + } + else + { + [self applicationTerminated:nil]; + } } [statusItem setImage:[NSImage imageNamed:@"menu"]]; @@ -251,7 +257,7 @@ static MainController *sharedController; [currentRemote showPrimaryInterface]; } else { if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { - NSLog(@"Error Launching Player"); + NSLog(@"MenuTunes: Error Launching Player"); } } } @@ -420,7 +426,7 @@ static MainController *sharedController; trackTotal:trackTotal rating:rating]; } else { - title = @"No song is playing."; + title = NSLocalizedString(@"noSongPlaying", @"No song is playing."); [statusWindowController showSongWindowWithTitle:title album:nil artist:nil @@ -451,7 +457,7 @@ static MainController *sharedController; [statusWindowController showUpcomingSongsWithTitles:songList]; } else { - [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]]; + [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]]; } }