X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/24a440dccb5f6edb1e324e1cba03f373f89d0c30..f16e2f1f2b4778b4bc890162fa9cd31d7dd79b54:/PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index 35252ae..761a518 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -14,7 +14,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class MainController, KeyCombo;
+@class MainController, ITKeyCombo;
 
 @interface PreferencesController : NSObject
 {
@@ -24,6 +24,7 @@
     IBOutlet NSTextField *keyComboField;
     IBOutlet NSPanel *keyComboPanel;
     IBOutlet NSButton *launchAtLoginCheckbox;
+    IBOutlet NSButton *launchPlayerAtLaunchCheckbox;
     IBOutlet NSTableView *menuTableView;
     IBOutlet NSButton *nameCheckbox;
     IBOutlet NSButton *nextTrackButton;
@@ -35,8 +36,10 @@
     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;
@@ -46,21 +49,10 @@
     NSMutableArray *availableItems;
     NSMutableArray *myItems;
     NSArray        *submenuItems;
-
-    KeyCombo *combo;
-    KeyCombo *playPauseCombo;
-    KeyCombo *nextTrackCombo;
-    KeyCombo *prevTrackCombo;
-    KeyCombo *trackInfoCombo;
-    KeyCombo *upcomingSongsCombo;
-    KeyCombo *volumeIncrementCombo;
-    KeyCombo *volumeDecrementCombo;
-    KeyCombo *ratingIncrementCombo;
-    KeyCombo *ratingDecrementCombo;
-    KeyCombo *toggleLoopCombo;
-    KeyCombo *toggleShuffleCombo;
     
-    NSString *setHotKey;
+    ITKeyCombo *combo;
+    NSString *currentHotKey;
+    NSMutableDictionary *hotKeysDictionary;
 }
 
 + (PreferencesController *)sharedPrefs;
@@ -69,13 +61,17 @@
 - (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;
-- (IBAction)setNewHotKey:(id)sender;
 
-- (void)setHotKey:(NSString *)key;
-- (void)setKeyCombo:(KeyCombo *)newCombo;
+- (void)setCurrentHotKey:(NSString *)key;
+- (void)setKeyCombo:(ITKeyCombo *)newCombo;
 @end