Icon swap

diff --git a/AppIcon.icns b/AppIcon.icns
new file mode 100755 (executable)
index 0000000..7b40383
Binary files /dev/null and b/AppIcon.icns differ

diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index 0c42c8f..218af8a 100755 (executable)
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/KeyCombo.m b/KeyCombo.m
index 9017619..c2bd008 100755 (executable)
--- a/KeyCombo.m
+++ b/KeyCombo.m
@@ -99,7 +99,7 @@
 - (NSString *)userDisplayRep
 {
     if ( ! [self isValid] ) {
-        return @"None";
+        return @"";
     } else {
         return [NSString stringWithFormat: @"%@%@",
             [KeyCombo _stringForModifiers: mModifiers],

diff --git a/MenuTunes.icns b/MenuTunes.icns
deleted file mode 100755 (executable)
index 1d91c7b..0000000
Binary files a/MenuTunes.icns and /dev/null differ

diff --git a/PreferencesController.h b/PreferencesController.h
index 88380e0..9cc25cb 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -58,12 +58,9 @@
 
 - (IBAction)showPrefsWindow:(id)sender;
 
-- (IBAction)apply:(id)sender;
-- (IBAction)cancel:(id)sender;
 - (IBAction)cancelHotKey:(id)sender;
 - (IBAction)clearHotKey:(id)sender;
 - (IBAction)okHotKey:(id)sender;
-- (IBAction)save:(id)sender;
 - (IBAction)setCurrentTrackInfo:(id)sender;
 - (IBAction)setNextTrack:(id)sender;
 - (IBAction)setPlayPause:(id)sender;

diff --git a/PreferencesController.m b/PreferencesController.m
index 2206fab..113f883 100755 (executable)
--- 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;