Whoops! I really ought to build my code to test before committing, eh? :)

[MenuTunes.git] / PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index 6fc8456..015d083 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -14,7 +14,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class MainController, KeyCombo;
+@class CustomMenuTableView, MainController, ITKeyCombo;
 
 @interface PreferencesController : NSObject
 {
@@ -24,39 +24,64 @@
     IBOutlet NSTextField *keyComboField;
     IBOutlet NSPanel *keyComboPanel;
     IBOutlet NSButton *launchAtLoginCheckbox;
-    IBOutlet NSTableView *menuTableView;
+    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 *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 NSPopUpButton *vanishEffectPopup;
+    IBOutlet NSSlider *appearanceSpeedSlider;
+    IBOutlet NSSlider *vanishSpeedSlider;
+    IBOutlet NSSlider *vanishDelaySlider;
+    IBOutlet NSButton *showOnChangeCheckbox;
+
+    MainController *controller;
+    NSUserDefaults *df;
+    NSMutableArray *availableItems;
+    NSMutableArray *myItems;
+    NSArray        *submenuItems;
     
-    MainController *mt;
-    NSMutableArray *availableItems, *myItems;
-    NSArray *submenuItems;
-    
-    KeyCombo *combo, *playPauseCombo, *nextTrackCombo,
-             *prevTrackCombo, *trackInfoCombo, *upcomingSongsCombo;
-    NSString *setHotKey;
+    ITKeyCombo *combo;
+    NSString *currentHotKey;
+    NSMutableDictionary *hotKeysDictionary;
 }
-- (id)initWithMenuTunes:(MainController *)menutunes;
 
-- (IBAction)apply:(id)sender;
-- (IBAction)cancel:(id)sender;
++ (PreferencesController *)sharedPrefs;
+
+- (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;
-- (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