X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/ef4f5a3e753596396e93ba33b7e2ab5e8b53c5d8..6f276052ff907885a6674cd5fbec7aa2d8082cf8:/PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index 88380e0..bd77dbb 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -14,41 +14,46 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class MainController, KeyCombo;
+@class CustomMenuTableView, MainController, ITKeyCombo;
 
 @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 NSTableView *menuTableView;
-    IBOutlet NSButton    *nameCheckbox;
-    IBOutlet NSButton    *nextTrackButton;
-    IBOutlet NSButton    *playPauseButton;
-    IBOutlet NSButton    *previousTrackButton;
+    IBOutlet NSPanel *keyComboPanel;
+    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 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;
+    ITKeyCombo *combo;
+    NSString *currentHotKey;
+    NSMutableDictionary *hotKeysDictionary;
 }
 
 + (PreferencesController *)sharedPrefs;
@@ -58,18 +63,19 @@
 
 - (IBAction)showPrefsWindow:(id)sender;
 
-- (IBAction)apply:(id)sender;
-- (IBAction)cancel:(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)save:(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)setKeyCombo:(KeyCombo *)newCombo;
+- (void)setCurrentHotKey:(NSString *)key;
+- (void)setKeyCombo:(ITKeyCombo *)newCombo;
+
+- (void)deletePressedInTableView:(NSTableView *)tableView;
+
 @end