Added more the MenuController. All of the main menu things are added in now.

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 7c5cdc5..63e7101 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -126,7 +126,7 @@ static PreferencesController *prefs = nil;
     }
 
     if ( rebuildRequired ) {
-        [controller rebuildMenu];
+        //[controller rebuildMenu];
         // redraw song info status window, or upcoming songs here
     }
 
@@ -232,7 +232,7 @@ static PreferencesController *prefs = nil;
         @"Playlists",
         @"Song Rating",
         @"<separator>",
-        @"PreferencesÉ",
+        @"Preferences",
         @"Quit",
         @"<separator>",
         @"Current Track Info",
@@ -306,17 +306,46 @@ static PreferencesController *prefs = nil;
         if (![enumKey isEqualToString:currentHotKey]) {
             if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
                  [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
-                //Ask if we want to clear duplicate key and set this one
                 [window setLevel:NSNormalWindowLevel];
-                NSLog(@"Duplicate Combo! Ask what to do!");
+                if ( NSRunAlertPanel(@"Duplicate Key Combo", @"The specified key combo is already in use...", @"Replace", @"Cancel", nil) ) {
+                    [hotKeysDictionary setObject:[KeyCombo clearKeyCombo] forKey:currentHotKey];
+                    if ([enumKey isEqualToString:@"PlayPause"]) {
+                        [playPauseButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"NextTrack"]) {
+                        [nextTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"PrevTrack"]) {
+                        [previousTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleVisualizer"]) {
+                        [visualizerButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"TrackInfo"]) {
+                        [trackInfoButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
+                        [upcomingSongsButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
+                        [volumeIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
+                        [volumeDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementRating"]) {
+                        [ratingIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementRating"]) {
+                        [ratingDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
+                        [toggleShuffleButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
+                        [toggleLoopButton setTitle:@""];
+                    }
+                    [df setKeyCombo:[KeyCombo clearKeyCombo] forKey:enumKey];
+                } else {
+                    return;
+                }
                 [window setLevel:NSStatusWindowLevel];
-                duplicateCombo = YES;
             }
         }
     }
     
     if (!duplicateCombo) {
         [hotKeysDictionary setObject:combo forKey:currentHotKey];
+        [df setKeyCombo:combo forKey:currentHotKey];
         
         if ([currentHotKey isEqualToString:@"PlayPause"]) {
             [playPauseButton setTitle:string];
@@ -343,11 +372,7 @@ static PreferencesController *prefs = nil;
         } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
             [toggleLoopButton setTitle:string];
         }
-        
-        [df setKeyCombo:combo forKey:currentHotKey];
-        //[controller rebuildMenu];
     }
-    
     [self cancelHotKey:sender];
 }
 
@@ -599,7 +624,6 @@ static PreferencesController *prefs = nil;
 {
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
-    [controller rebuildMenu];
 }
 
 - (void)setLaunchesAtLogin:(BOOL)flag
@@ -780,7 +804,7 @@ static PreferencesController *prefs = nil;
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
-            if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"]) {
+            if ([item isEqualToString:@"Preferences"] || [item isEqualToString:@"Quit"]) {
                 return NSDragOperationNone;
             }
         }