Fixed the F13 key equivalent. Was showing up as F3

[MenuTunes.git] / PreferencesController.h

diff --git a/PreferencesController.h b/PreferencesController.h
index a593abb..015d083 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -14,7 +14,7 @@
 
 #import <Cocoa/Cocoa.h>
 
 
 #import <Cocoa/Cocoa.h>
 

-@class MainController, KeyCombo;
+@class CustomMenuTableView, MainController, ITKeyCombo;

 
 @interface PreferencesController : NSObject
 {
 
 @interface PreferencesController : NSObject
 {


@@ -24,45 +24,42 @@
     IBOutlet NSTextField *keyComboField;
     IBOutlet NSPanel *keyComboPanel;
     IBOutlet NSButton *launchAtLoginCheckbox;
     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 *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 *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 *trackTimeCheckbox;
     IBOutlet NSButton *upcomingSongsButton;

-    IBOutlet NSButton *visualizerButton;
+    IBOutlet NSButton *showPlayerButton;

     IBOutlet NSButton *volumeDecrementButton;
     IBOutlet NSButton *volumeIncrementButton;
     IBOutlet NSWindow *window;
     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 *controller;
     NSUserDefaults *df;
     NSMutableArray *availableItems;
     NSMutableArray *myItems;
     NSArray        *submenuItems;

-
-    KeyCombo *combo;
-    KeyCombo *playPauseCombo;
-    KeyCombo *nextTrackCombo;
-    KeyCombo *prevTrackCombo;
-    KeyCombo *visualizerCombo;
-    KeyCombo *trackInfoCombo;
-    KeyCombo *upcomingSongsCombo;
-    KeyCombo *volumeIncrementCombo;
-    KeyCombo *volumeDecrementCombo;
-    KeyCombo *ratingIncrementCombo;
-    KeyCombo *ratingDecrementCombo;
-    KeyCombo *toggleLoopCombo;
-    KeyCombo *toggleShuffleCombo;

     
     

-    NSString *setHotKey;
+    ITKeyCombo *combo;
+    NSString *currentHotKey;
+    NSMutableDictionary *hotKeysDictionary;

 }
 
 + (PreferencesController *)sharedPrefs;
 }
 
 + (PreferencesController *)sharedPrefs;


@@ -82,6 +79,9 @@
 - (IBAction)clearHotKey:(id)sender;
 - (IBAction)okHotKey:(id)sender;
 
 - (IBAction)clearHotKey:(id)sender;
 - (IBAction)okHotKey:(id)sender;
 

-- (void)setHotKey:(NSString *)key;
-- (void)setKeyCombo:(KeyCombo *)newCombo;
+- (void)setCurrentHotKey:(NSString *)key;
+- (void)setKeyCombo:(ITKeyCombo *)newCombo;
+
+- (void)deletePressedInTableView:(NSTableView *)tableView;
+

 @end
 @end