X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9c8f6e1b9b0b947d898a3d9bae3acb3999879791..6d2e5d5b377e0aa56ae05c495a4b2d1a31637c59:/PreferencesController.h?ds=inline

diff --git a/PreferencesController.h b/PreferencesController.h
index 015d083..004e929 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -20,45 +20,57 @@
 {
     IBOutlet NSButton *albumCheckbox;
     IBOutlet NSTableView *allTableView;
+    IBOutlet NSPopUpButton *appearanceEffectPopup;
+    IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSButton *artistCheckbox;
-    IBOutlet NSTextField *keyComboField;
-    IBOutlet NSPanel *keyComboPanel;
+    IBOutlet NSPopUpButton *backgroundStylePopup;
+    IBOutlet NSColorWell *backgroundColorWell;
+    IBOutlet NSPopUpButton *backgroundColorPopup;
+    IBOutlet NSTextField *clientPasswordTextField;
+    IBOutlet NSTextField *hostTextField;
+    IBOutlet NSTableView *hotKeysTableView;
     IBOutlet NSButton *launchAtLoginCheckbox;
     IBOutlet NSButton *launchPlayerAtLaunchCheckbox;
+    IBOutlet NSTextField *locationTextField;
+    IBOutlet NSView *manualView;
     IBOutlet CustomMenuTableView *menuTableView;
     IBOutlet NSButton *nameCheckbox;
-    IBOutlet NSButton *nextTrackButton;
-    IBOutlet NSButton *playPauseButton;
-    IBOutlet NSButton *previousTrackButton;
+    IBOutlet NSTextField *nameTextField;
+    IBOutlet NSPanel *passwordPanel;
+    IBOutlet NSTextField *passwordPanelMessage;
+    IBOutlet NSButton *passwordPanelOKButton;
+    IBOutlet NSTextField *passwordPanelTextField;
+    IBOutlet NSTextField *passwordPanelTitle;
+    IBOutlet NSTextField *passwordTextField;
+    IBOutlet NSMatrix *positionMatrix;
     IBOutlet NSButton *ratingCheckbox;
-    IBOutlet NSButton *ratingDecrementButton;
-    IBOutlet NSButton *ratingIncrementButton;
+    IBOutlet NSTextField *selectedPlayerTextField;
+    IBOutlet NSBox *selectPlayerBox;
+    IBOutlet NSPanel *selectPlayerSheet;
+    IBOutlet NSButton *selectSharedPlayerButton;
+    IBOutlet NSButton *shareMenuTunesCheckbox;
+    IBOutlet NSButton *sharingPanelOKButton;
+    IBOutlet NSTableView *sharingTableView;
+    IBOutlet NSButton *showOnChangeCheckbox;
     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 NSButton *useSharedMenuTunesCheckbox;
+    IBOutlet NSSlider *vanishDelaySlider;
     IBOutlet NSPopUpButton *vanishEffectPopup;
-    IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSSlider *vanishSpeedSlider;
-    IBOutlet NSSlider *vanishDelaySlider;
-    IBOutlet NSButton *showOnChangeCheckbox;
+    IBOutlet NSWindow *window;
+    IBOutlet NSPopUpButton *windowSizingPopup;
+    IBOutlet NSView *zeroConfView;
 
     MainController *controller;
     NSUserDefaults *df;
     NSMutableArray *availableItems;
     NSMutableArray *myItems;
     NSArray        *submenuItems;
+    NSArray        *effectClasses;
     
-    ITKeyCombo *combo;
-    NSString *currentHotKey;
+    NSArray *hotKeysArray, *hotKeyNamesArray;
     NSMutableDictionary *hotKeysDictionary;
 }
 
@@ -67,21 +79,20 @@
 - (id)controller;
 - (void)setController:(id)object;
 
-- (IBAction)showPrefsWindow:(id)sender;
+- (BOOL)showPasswordPanel;
+- (BOOL)showInvalidPasswordPanel;
 
 - (IBAction)changeGeneralSetting:(id)sender;
+- (IBAction)changeSharingSetting:(id)sender;
 - (IBAction)changeStatusWindowSetting:(id)sender;
-- (IBAction)changeHotKey:(id)sender;
-
-- (void)registerDefaults;
+- (void)resetRemotePlayerTextFields;
 
-- (IBAction)cancelHotKey:(id)sender;
 - (IBAction)clearHotKey:(id)sender;
-- (IBAction)okHotKey:(id)sender;
-
-- (void)setCurrentHotKey:(NSString *)key;
-- (void)setKeyCombo:(ITKeyCombo *)newCombo;
+- (IBAction)editHotKey:(id)sender;
+- (IBAction)showPrefsWindow:(id)sender;
+- (IBAction)showTestWindow:(id)sender;
 
+- (void)registerDefaults;
 - (void)deletePressedInTableView:(NSTableView *)tableView;
 
 @end