X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/1527a78c2e1b1cc525a5c4621077844989aab6fd..74389742830709c876afb314ae07034bd675c9ac:/MainController.m?ds=sidebyside

diff --git a/MainController.m b/MainController.m
index 2517c39..eb1aa3f 100755
--- a/MainController.m
+++ b/MainController.m
@@ -891,7 +891,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 +930,7 @@ static MainController *sharedController;
             }
         }
         
-        if ( [df boolForKey:@"showPlayCount"] ) {
+        if ( [df boolForKey:@"showPlayCount"] && ![self radioIsPlaying] ) {
             NS_DURING
                 playCount = [[self currentRemote] currentSongPlayCount];
             NS_HANDLER
@@ -991,8 +991,12 @@ 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) {
+        NSMenu *menu = [menuController menu];
+        _popped = YES;
+        [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+        _popped = NO;
+    }
 }
 
 - (void)incrementVolume
@@ -1095,9 +1099,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