X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/4827e4b3eb999245431d32f3fec13e7672716c98..d51c795bd64b60f1b0feccfda38c9951a211198e:/PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index 015d083..109d9e7 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -20,36 +20,23 @@
 {
     IBOutlet NSButton *albumCheckbox;
     IBOutlet NSTableView *allTableView;
+    IBOutlet NSPopUpButton *appearanceEffectPopup;
+    IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSButton *artistCheckbox;
-    IBOutlet NSTextField *keyComboField;
-    IBOutlet NSPanel *keyComboPanel;
+    IBOutlet NSTableView *hotKeysTableView;
     IBOutlet NSButton *launchAtLoginCheckbox;
     IBOutlet NSButton *launchPlayerAtLaunchCheckbox;
     IBOutlet CustomMenuTableView *menuTableView;
     IBOutlet NSButton *nameCheckbox;
-    IBOutlet NSButton *nextTrackButton;
-    IBOutlet NSButton *playPauseButton;
-    IBOutlet NSButton *previousTrackButton;
     IBOutlet NSButton *ratingCheckbox;
-    IBOutlet NSButton *ratingDecrementButton;
-    IBOutlet NSButton *ratingIncrementButton;
+    IBOutlet NSButton *showOnChangeCheckbox;
     IBOutlet NSTextField *songsInAdvance;
-    IBOutlet NSButton *toggleLoopButton;
-    IBOutlet NSButton *toggleShuffleButton;
-    IBOutlet NSButton *trackInfoButton;
     IBOutlet NSButton *trackNumberCheckbox;
     IBOutlet NSButton *trackTimeCheckbox;
-    IBOutlet NSButton *upcomingSongsButton;
-    IBOutlet NSButton *showPlayerButton;
-    IBOutlet NSButton *volumeDecrementButton;
-    IBOutlet NSButton *volumeIncrementButton;
-    IBOutlet NSWindow *window;
-    IBOutlet NSPopUpButton *appearanceEffectPopup;
+    IBOutlet NSSlider *vanishDelaySlider;
     IBOutlet NSPopUpButton *vanishEffectPopup;
-    IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSSlider *vanishSpeedSlider;
-    IBOutlet NSSlider *vanishDelaySlider;
-    IBOutlet NSButton *showOnChangeCheckbox;
+    IBOutlet NSWindow *window;
 
     MainController *controller;
     NSUserDefaults *df;
@@ -57,8 +44,7 @@
     NSMutableArray *myItems;
     NSArray        *submenuItems;
     
-    ITKeyCombo *combo;
-    NSString *currentHotKey;
+    NSArray *hotKeysArray, *hotKeyNamesArray;
     NSMutableDictionary *hotKeysDictionary;
 }
 
@@ -67,21 +53,13 @@
 - (id)controller;
 - (void)setController:(id)object;
 
-- (IBAction)showPrefsWindow:(id)sender;
-
 - (IBAction)changeGeneralSetting:(id)sender;
 - (IBAction)changeStatusWindowSetting:(id)sender;
-- (IBAction)changeHotKey:(id)sender;
-
-- (void)registerDefaults;
-
-- (IBAction)cancelHotKey:(id)sender;
 - (IBAction)clearHotKey:(id)sender;
-- (IBAction)okHotKey:(id)sender;
-
-- (void)setCurrentHotKey:(NSString *)key;
-- (void)setKeyCombo:(ITKeyCombo *)newCombo;
+- (IBAction)editHotKey:(id)sender;
+- (IBAction)showPrefsWindow:(id)sender;
 
+- (void)registerDefaults;
 - (void)deletePressedInTableView:(NSTableView *)tableView;
 
 @end