Made MenuController communicate with MainController

[MenuTunes.git] / PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index f1f45c1..7be6a5e 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -14,7 +14,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class MenuTunes, KeyCombo;
+@class MainController, KeyCombo;
 
 @interface PreferencesController : NSObject
 {
@@ -29,34 +29,47 @@
     IBOutlet NSButton *nextTrackButton;
     IBOutlet NSButton *playPauseButton;
     IBOutlet NSButton *previousTrackButton;
+    IBOutlet NSButton *ratingDecrementButton;
+    IBOutlet NSButton *ratingIncrementButton;
     IBOutlet NSTextField *songsInAdvance;
+    IBOutlet NSButton *toggleLoopButton;
+    IBOutlet NSButton *toggleShuffleButton;
     IBOutlet NSButton *trackInfoButton;
     IBOutlet NSButton *trackTimeCheckbox;
     IBOutlet NSButton *upcomingSongsButton;
+    IBOutlet NSButton *visualizerButton;
+    IBOutlet NSButton *volumeDecrementButton;
+    IBOutlet NSButton *volumeIncrementButton;
     IBOutlet NSWindow *window;
     
-    MainController *mt;
-    NSMutableArray *availableItems, *myItems;
-    NSArray *submenuItems;
+    MainController *controller;
+    NSUserDefaults *df;
+    NSMutableArray *availableItems;
+    NSMutableArray *myItems;
+    NSArray        *submenuItems;
     
-    KeyCombo *combo, *playPauseCombo, *nextTrackCombo,
-             *prevTrackCombo, *trackInfoCombo, *upcomingSongsCombo;
-    NSString *setHotKey;
+    KeyCombo *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)setCurrentHotKey:(NSString *)key;
 - (void)setKeyCombo:(KeyCombo *)newCombo;
 @end