Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index c52d9ad..ba6f876 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -1,13 +1,10 @@
 /*
  *     MenuTunes
 /*
  *     MenuTunes

- *  PreferencesController
- *    Preferences window controller
+ *     PreferencesController.h

  *
  *

- *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
- *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *     Preferences window controller.

  *
  *

- *  Copyright (c) 2002 iThink Software.
- *  All Rights Reserved
+ *     Copyright (c) 2002 iThink Software

  *
  */
 
  *
  */
 


@@ -24,10 +21,16 @@
     IBOutlet NSPopUpButton *appearanceEffectPopup;
     IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSButton *artistCheckbox;
     IBOutlet NSPopUpButton *appearanceEffectPopup;
     IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSButton *artistCheckbox;

+       IBOutlet NSButton *audioscrobblerEnabledCheckbox;
+       IBOutlet NSTextField *audioscrobblerPasswordTextField;
+       IBOutlet NSTextField *audioscrobblerStatusTextField;
+       IBOutlet NSButton *audioscrobblerUseCacheCheckbox;
+       IBOutlet NSTextField *audioscrobblerUserTextField;

     IBOutlet NSPopUpButton *backgroundStylePopup;
     IBOutlet NSColorWell *backgroundColorWell;
     IBOutlet NSPopUpButton *backgroundColorPopup;
     IBOutlet NSTextField *clientPasswordTextField;
     IBOutlet NSPopUpButton *backgroundStylePopup;
     IBOutlet NSColorWell *backgroundColorWell;
     IBOutlet NSPopUpButton *backgroundColorPopup;
     IBOutlet NSTextField *clientPasswordTextField;

+    IBOutlet NSButton *composerCheckbox;

     IBOutlet NSTextField *hostTextField;
     IBOutlet NSTableView *hotKeysTableView;
     IBOutlet NSButton *launchAtLoginCheckbox;
     IBOutlet NSTextField *hostTextField;
     IBOutlet NSTableView *hotKeysTableView;
     IBOutlet NSButton *launchAtLoginCheckbox;


@@ -43,9 +46,11 @@
     IBOutlet NSTextField *passwordPanelTextField;
     IBOutlet NSTextField *passwordPanelTitle;
     IBOutlet NSTextField *passwordTextField;
     IBOutlet NSTextField *passwordPanelTextField;
     IBOutlet NSTextField *passwordPanelTitle;
     IBOutlet NSTextField *passwordTextField;

+    IBOutlet NSButton *playCountCheckbox;

     IBOutlet NSMatrix *positionMatrix;
     IBOutlet NSButton *ratingCheckbox;
     IBOutlet NSButton *runScriptsCheckbox;
     IBOutlet NSMatrix *positionMatrix;
     IBOutlet NSButton *ratingCheckbox;
     IBOutlet NSButton *runScriptsCheckbox;

+       IBOutlet NSPopUpButton *screenPopup;

     IBOutlet NSTextField *selectedPlayerTextField;
     IBOutlet NSBox *selectPlayerBox;
     IBOutlet NSPanel *selectPlayerSheet;
     IBOutlet NSTextField *selectedPlayerTextField;
     IBOutlet NSBox *selectPlayerBox;
     IBOutlet NSPanel *selectPlayerSheet;


@@ -55,7 +60,6 @@
     IBOutlet NSTableView *sharingTableView;
     IBOutlet NSButton *showOnChangeCheckbox;
     IBOutlet NSButton *showScriptsButton;
     IBOutlet NSTableView *sharingTableView;
     IBOutlet NSButton *showOnChangeCheckbox;
     IBOutlet NSButton *showScriptsButton;

-    IBOutlet NSButton *showToolTipCheckbox;

     IBOutlet NSTextField *songsInAdvance;
     IBOutlet NSButton *trackNumberCheckbox;
     IBOutlet NSButton *trackTimeCheckbox;
     IBOutlet NSTextField *songsInAdvance;
     IBOutlet NSButton *trackNumberCheckbox;
     IBOutlet NSButton *trackTimeCheckbox;


@@ -79,6 +83,7 @@
 }
 
 + (PreferencesController *)sharedPrefs;
 }
 
 + (PreferencesController *)sharedPrefs;

++ (NSString *)getKeychainItemPasswordForUser:(NSString *)user;

 
 - (id)controller;
 - (void)setController:(id)object;
 
 - (id)controller;
 - (void)setController:(id)object;


@@ -94,7 +99,6 @@
 - (IBAction)clearHotKey:(id)sender;
 - (IBAction)editHotKey:(id)sender;
 - (IBAction)showPrefsWindow:(id)sender;
 - (IBAction)clearHotKey:(id)sender;
 - (IBAction)editHotKey:(id)sender;
 - (IBAction)showPrefsWindow:(id)sender;

-- (IBAction)showTestWindow:(id)sender;

 
 - (void)registerDefaults;
 - (void)deletePressedInTableView:(NSTableView *)tableView;
 
 - (void)registerDefaults;
 - (void)deletePressedInTableView:(NSTableView *)tableView;