X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6b8a2b55809e875bb0aadc3ab9cbab181014d1a9..7eff668a73d0965a793c7956d9553f539ca30f65:/PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index 60fc875..53c843d 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -18,37 +18,40 @@
 
 @interface PreferencesController : NSObject
 {
-    IBOutlet NSButton    *albumCheckbox;
+    IBOutlet NSButton *albumCheckbox;
     IBOutlet NSTableView *allTableView;
-    IBOutlet NSButton    *artistCheckbox;
+    IBOutlet NSButton *artistCheckbox;
     IBOutlet NSTextField *keyComboField;
-    IBOutlet NSPanel     *keyComboPanel;
-    IBOutlet NSButton    *launchAtLoginCheckbox;
+    IBOutlet NSPanel *keyComboPanel;
+    IBOutlet NSButton *launchAtLoginCheckbox;
     IBOutlet NSTableView *menuTableView;
-    IBOutlet NSButton    *nameCheckbox;
-    IBOutlet NSButton    *nextTrackButton;
-    IBOutlet NSButton    *playPauseButton;
-    IBOutlet NSButton    *previousTrackButton;
+    IBOutlet NSButton *nameCheckbox;
+    IBOutlet NSButton *nextTrackButton;
+    IBOutlet NSButton *playPauseButton;
+    IBOutlet NSButton *previousTrackButton;
+    IBOutlet NSButton *ratingDecrementButton;
+    IBOutlet NSButton *ratingIncrementButton;
     IBOutlet NSTextField *songsInAdvance;
-    IBOutlet NSButton    *trackInfoButton;
-    IBOutlet NSButton    *trackTimeCheckbox;
-    IBOutlet NSButton    *upcomingSongsButton;
-    IBOutlet NSWindow    *window;
+    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;
     
     MainController *controller;
     NSUserDefaults *df;
     NSMutableArray *availableItems;
     NSMutableArray *myItems;
     NSArray        *submenuItems;
-
-    KeyCombo *combo;
-    KeyCombo *playPauseCombo;
-    KeyCombo *nextTrackCombo;
-    KeyCombo *prevTrackCombo;
-    KeyCombo *trackInfoCombo;
-    KeyCombo *upcomingSongsCombo;
     
-    NSString *setHotKey;
+    KeyCombo *combo;
+    NSString *currentHotKey;
+    NSMutableDictionary *hotKeysDictionary;
 }
 
 + (PreferencesController *)sharedPrefs;
@@ -57,17 +60,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)setCurrentTrackInfo:(id)sender;
-- (IBAction)setNextTrack:(id)sender;
-- (IBAction)setPlayPause:(id)sender;
-- (IBAction)setPreviousTrack:(id)sender;
-- (IBAction)setUpcomingSongs:(id)sender;
 
-- (void)setHotKey:(NSString *)key;
+- (void)setCurrentHotKey:(NSString *)key;
 - (void)setKeyCombo:(KeyCombo *)newCombo;
 @end