Some quick renaming snafoo...

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 16738a3..d7dfa6f 100755 (executable)
--- 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"
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"


@@ -7,7 +7,6 @@
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;

-- (void)setupHotKeys;

 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;


@@ -251,7 +250,7 @@ static MainController *sharedController;
         [currentRemote showPrimaryInterface];
     } else {
         if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
         [currentRemote showPrimaryInterface];
     } else {
         if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {

-            NSLog(@"Error Launching Player");
+            NSLog(@"MenuTunes: Error Launching Player");

         }
     }
 }
         }
     }
 }


@@ -420,7 +419,7 @@ static MainController *sharedController;
                                              trackTotal:trackTotal
                                                  rating:rating];
     } else {
                                              trackTotal:trackTotal
                                                  rating:rating];
     } else {

-        title = @"No song is playing.";
+        title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");

         [statusWindowController showSongWindowWithTitle:title
                                                   album:nil
                                                  artist:nil
         [statusWindowController showSongWindowWithTitle:title
                                                   album:nil
                                                  artist:nil


@@ -451,7 +450,7 @@ static MainController *sharedController;
         [statusWindowController showUpcomingSongsWithTitles:songList];
         
     } else {
         [statusWindowController showUpcomingSongsWithTitles:songList];
         
     } else {

-        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]];
+        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];

     }
 }
 
     }
 }