Generalize and share mapping menu (main, status, dock) behavior.

[enjoyable.git] / Classes / EnjoyableApplicationDelegate.h

diff --git a/Classes/EnjoyableApplicationDelegate.h b/Classes/EnjoyableApplicationDelegate.h
index dfb82fc..f61578b 100644 (file)
--- a/Classes/EnjoyableApplicationDelegate.h
+++ b/Classes/EnjoyableApplicationDelegate.h
@@ -6,15 +6,19 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-@class NJDeviceController;
 @class NJMappingsController;
 
-@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate> {
-    IBOutlet NSMenu *dockMenuBase;
+#import "NJMappingMenuController.h"
+
+@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
+                                                    NJMappingMenuDelegate> {
+    IBOutlet NSMenu *dockMenu;
+    IBOutlet NSMenu *statusItemMenu;
     IBOutlet NSWindow *window;
 }
 
-@property (nonatomic, strong) IBOutlet NJDeviceController *inputController;
 @property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
 
+- (IBAction)restoreToForeground:(id)sender;
+
 @end