X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ApplicationController.h;h=88c9d29c72fc7b5c3d5607ba92740ee2713b5b36;hp=9d1607fd8cf3f7c797fb703db9fa460aba10305a;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=530009447c5bbd360ac5023979cffc6d32a28df3 diff --git a/ApplicationController.h b/ApplicationController.h index 9d1607f..88c9d29 100644 --- a/ApplicationController.h +++ b/ApplicationController.h @@ -6,29 +6,23 @@ // Copyright 2009 University of Otago. All rights reserved. // -#import -@class JoystickController; +@class NJInputController; @class TargetController; -@class ConfigsController; +@class NJMappingsController; -@interface ApplicationController : NSObject { - IBOutlet JoystickController *jsController; - IBOutlet TargetController *targetController; - IBOutlet ConfigsController *configsController; - - IBOutlet NSDrawer *drawer; - IBOutlet NSWindow *mainWindow; - IBOutlet NSToolbarItem* activeButton; - IBOutlet NSMenuItem* activeMenuItem; - IBOutlet NSMenu* dockMenuBase; +@interface ApplicationController : NSObject { + IBOutlet NSDrawer *drawer; + IBOutlet NSWindow *mainWindow; + IBOutlet NSToolbarItem *activeButton; + IBOutlet NSMenuItem *activeMenuItem; + IBOutlet NSMenu *dockMenuBase; } -@property(readwrite) BOOL active; -@property(readonly) JoystickController * jsController; -@property(readonly) TargetController * targetController; -@property(readonly) ConfigsController * configsController; --(IBAction) toggleActivity: (id)sender; --(void) configsChanged; --(void) configChanged; +@property (nonatomic, strong) IBOutlet NJInputController *inputController; +@property (nonatomic, strong) IBOutlet TargetController *targetController; +@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController; + +- (IBAction)toggleActivity:(id)sender; +- (void)mappingsChanged; @end