X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/eac079d182b49312e11c96af64981f1851a1bcac..c7cfb51853a76b548e9f3e073a63d44ce0a99258:/PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 2206fab..113f883 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -180,12 +180,6 @@ NSLog(@"bar");
     [controller clearHotKeys];
 }
 
-- (IBAction)cancel:(id)sender
-{
-    [window close];
-    [controller closePreferences];
-}
-
 - (IBAction)cancelHotKey:(id)sender
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -203,7 +197,7 @@ NSLog(@"bar");
     NSString *string = [combo userDisplayRep];
     
     if (string == nil) {
-        string = @"None";
+        string = @"";
     }
     if ([setHotKey isEqualToString:@"PlayPause"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
@@ -269,13 +263,6 @@ NSLog(@"bar");
     [self cancelHotKey:sender];
 }
 
-- (IBAction)save:(id)sender
-{
-    [self apply:nil];
-    [window close];
-    [controller closePreferences];
-}
-
 - (IBAction)setCurrentTrackInfo:(id)sender
 {
     [self setKeyCombo:trackInfoCombo];
@@ -306,6 +293,12 @@ NSLog(@"bar");
     [self setHotKey:@"UpcomingSongs"];
 }
 
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark HOTKEY SUPPORT METHODS
+/*************************************************************************/
+
 - (void)setHotKey:(NSString *)key
 {
     setHotKey = key;