projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak some animations, clean up for preparation to move to app delegate.
[enjoyable.git]
/
Classes
/
NJDeviceController.h
diff --git
a/Classes/NJDeviceController.h
b/Classes/NJDeviceController.h
index
c0002e8
..
29b8b38
100644
(file)
--- a/
Classes/NJDeviceController.h
+++ b/
Classes/NJDeviceController.h
@@
-6,23
+6,25
@@
// Copyright 2009 University of Otago. All rights reserved.
//
// Copyright 2009 University of Otago. All rights reserved.
//
-@class NJDevice;
+#import "NJHIDManager.h"
+#import "NJDeviceViewController.h"
+
@class NJInput;
@class NJMappingsController;
@class NJOutputController;
@class NJInput;
@class NJMappingsController;
@class NJOutputController;
-@interface NJDeviceController : NSObject <N
SOutlineViewDataSource, NSOutlineViewDelegate> {
- IBOutlet NSOutlineView *outlineView;
+@interface NJDeviceController : NSObject <N
JDeviceViewControllerDelegate,
+ NJHIDManagerDelegate> {
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
- IBOutlet NSButton *
trans
latingEventsButton;
- IBOutlet N
SView *connectDevicePrompt
;
+ IBOutlet NSButton *
simu
latingEventsButton;
+ IBOutlet N
JDeviceViewController *devicesViewController
;
}
@property (nonatomic, readonly) NJInput *selectedInput;
@property (nonatomic, assign) NSPoint mouseLoc;
}
@property (nonatomic, readonly) NJInput *selectedInput;
@property (nonatomic, assign) NSPoint mouseLoc;
-@property (nonatomic, assign) BOOL
trans
latingEvents;
+@property (nonatomic, assign) BOOL
simu
latingEvents;
-- (IBAction)
trans
latingEventsChanged:(NSButton *)sender;
+- (IBAction)
simu
latingEventsChanged:(NSButton *)sender;
@end
@end