X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/1527a78c2e1b1cc525a5c4621077844989aab6fd..f259f879db5bb904afca6f0fa31effa5511c476e:/MainController.m

diff --git a/MainController.m b/MainController.m
index 2517c39..40f50ce 100755
--- a/MainController.m
+++ b/MainController.m
@@ -359,7 +359,6 @@ static MainController *sharedController;
 {
     if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
         ITDebugLog(@"The song changed.");
-        
         if ([df boolForKey:@"runScripts"]) {
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
             NSEnumerator *scriptsEnum = [scripts objectEnumerator];
@@ -557,6 +556,17 @@ static MainController *sharedController;
     [self timerUpdate];
 }
 
+- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type
+{
+    ITDebugLog(@"Making playlist with term %@, type %i", term, type);
+    NS_DURING
+        [[self currentRemote] makePlaylistWithTerm:term ofType:type];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+    ITDebugLog(@"Done making playlist");
+}
+
 - (void)showPlayer
 {
     ITDebugLog(@"Beginning show player.");
@@ -891,7 +901,7 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",
-                @"Time",
+                NSLocalizedString(@"time", @"Time"),
                 [[self currentRemote] currentSongElapsed],
                 [[self currentRemote] currentSongLength]];
             NS_HANDLER
@@ -930,7 +940,7 @@ static MainController *sharedController;
             }
         }
         
-        if ( [df boolForKey:@"showPlayCount"] ) {
+        if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] && [[self currentRemote] currentSource] == ITMTRemoteLibrarySource ) {
             NS_DURING
                 playCount = [[self currentRemote] currentSongPlayCount];
             NS_HANDLER
@@ -991,8 +1001,13 @@ static MainController *sharedController;
 
 - (void)popupMenu
 {
-    NSMenu *menu = [menuController menu];
-    [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+    if (!_popped) {
+        _popped = YES;
+        [self menuClicked];
+        NSMenu *menu = [statusItem menu];
+        [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+        _popped = NO;
+    }
 }
 
 - (void)incrementVolume
@@ -1095,9 +1110,9 @@ static MainController *sharedController;
 
 - (void)setRating:(ITHotKey *)sender
 {
-    float rating = ([[sender name] characterAtIndex:9] - 48) / 5.0;
-    [self selectSongRating:rating];
-    [statusWindowController showRatingWindowWithRating:rating];
+    int stars = [[sender name] characterAtIndex:9] - 48;
+    [self selectSongRating:stars * 20];
+    [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
 }
 
 - (void)toggleLoop