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