projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
App delegate now controls communication between device / mapping controllers and...
[enjoyable.git]
/
Classes
/
EnjoyableApplicationDelegate.h
diff --git
a/Classes/EnjoyableApplicationDelegate.h
b/Classes/EnjoyableApplicationDelegate.h
index
dbc17ee
..
52869f2
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.h
+++ b/
Classes/EnjoyableApplicationDelegate.h
@@
-10,8
+10,13
@@
#import "NJMappingMenuController.h"
#import "NJMappingsViewController.h"
#import "NJMappingMenuController.h"
#import "NJMappingsViewController.h"
+#import "NJDeviceViewController.h"
+#import "NJOutputController.h"
+#import "NJDeviceController.h"
@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
+ NJDeviceControllerDelegate,
+ NJDeviceViewControllerDelegate,
NJMappingsViewControllerDelegate,
NJMappingMenuDelegate,
NSWindowDelegate> {
NJMappingsViewControllerDelegate,
NJMappingMenuDelegate,
NSWindowDelegate> {
@@
-21,7
+26,10
@@
}
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
}
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
+@property (nonatomic, strong) IBOutlet NJDeviceController *deviceController;
+@property (nonatomic, strong) IBOutlet NJOutputController *outputController;
@property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc;
@property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc;
+@property (nonatomic, strong) IBOutlet NJDeviceViewController *dvc;
- (IBAction)restoreToForeground:(id)sender;
- (IBAction)importMappingClicked:(id)sender;
- (IBAction)restoreToForeground:(id)sender;
- (IBAction)importMappingClicked:(id)sender;