Resolving nib conflict, then adding new stuf in in next checkin

[MenuTunes.git] / English.lproj / Preferences.nib / classes.nib

diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib
index 0110c5a..10e4f8f 100755 (executable)
--- a/English.lproj/Preferences.nib/classes.nib
+++ b/English.lproj/Preferences.nib/classes.nib
@@ -10,7 +10,11 @@
                 clearHotKey = id; 
                 okHotKey = id; 
                 save = id; 
-                setNewHotKey = id; 
+                setCurrentTrackInfo = id; 
+                setNextTrack = id; 
+                setPlayPause = id; 
+                setPreviousTrack = id; 
+                setUpcomingSongs = id; 
             }; 
             CLASS = PreferencesController; 
             LANGUAGE = ObjC; 
@@ -26,16 +30,10 @@
                 nextTrackButton = NSButton; 
                 playPauseButton = NSButton; 
                 previousTrackButton = NSButton; 
-                ratingDecrementButton = NSButton; 
-                ratingIncrementButton = NSButton; 
                 songsInAdvance = NSTextField; 
-                toggleLoopButton = NSButton; 
-                toggleShuffleButton = NSButton; 
                 trackInfoButton = NSButton; 
                 trackTimeCheckbox = NSButton; 
                 upcomingSongsButton = NSButton; 
-                volumeDecrementButton = NSButton; 
-                volumeIncrementButton = NSButton; 
                 window = NSWindow; 
             }; 
             SUPERCLASS = NSObject;