projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split view management out of NJDeviceController. Right now this probably just makes...
[enjoyable.git]
/
Classes
/
EnjoyableApplicationDelegate.h
diff --git
a/Classes/EnjoyableApplicationDelegate.h
b/Classes/EnjoyableApplicationDelegate.h
index
b795a92
..
acea8a9
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.h
+++ b/
Classes/EnjoyableApplicationDelegate.h
@@
-6,18
+6,20
@@
// Copyright 2009 University of Otago. All rights reserved.
//
// Copyright 2009 University of Otago. All rights reserved.
//
-@class NJDeviceController;
-@class NJOutputController;
@class NJMappingsController;
@class NJMappingsController;
+#import "NJMappingMenuController.h"
+
@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
- NSSplitViewDelegate>
-{
- IBOutlet NSMenu *dockMenuBase;
+ NJMappingMenuDelegate,
+ NSWindowDelegate> {
+ IBOutlet NSMenu *dockMenu;
+ IBOutlet NSMenu *statusItemMenu;
IBOutlet NSWindow *window;
}
IBOutlet NSWindow *window;
}
-@property (nonatomic, strong) IBOutlet NJDeviceController *inputController;
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
+- (IBAction)restoreToForeground:(id)sender;
+
@end
@end