X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMappingsController.h;h=39aaf79ba802c0b6d35e8014f90039b231383568;hp=a4d9c1854d2e18d99bf6c828c97b544b34232ad3;hb=b14d8429658dd6f3f7b4904301031addb502b22c;hpb=58ce8f7f50f382f18e7b416eca737803af284868

diff --git a/Classes/NJMappingsController.h b/Classes/NJMappingsController.h
index a4d9c18..39aaf79 100644
--- a/Classes/NJMappingsController.h
+++ b/Classes/NJMappingsController.h
@@ -9,36 +9,20 @@
 @class NJMapping;
 @class NJOutputController;
 
-@interface NJMappingsController : NSObject <NSTableViewDataSource,
-                                            NSTableViewDelegate,
-                                            NSOpenSavePanelDelegate,
-                                            NSPopoverDelegate,
-                                            NSFastEnumeration>
-{
-    IBOutlet NSButton *removeButton;
-    IBOutlet NSTableView *tableView;
-    IBOutlet NSButton *popoverActivate;
-    IBOutlet NSPopover *popover;
-    IBOutlet NSButton *moveUp;
-    IBOutlet NSButton *moveDown;
-}
+#import "NJMappingsViewController.h"
+
+@interface NJMappingsController : NSObject <NSFastEnumeration,
+                                            NJMappingsViewControllerDelegate>
 
 @property (nonatomic, readonly) NJMapping *currentMapping;
+@property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc;
 
 - (NJMapping *)objectForKeyedSubscript:(NSString *)name;
 - (NJMapping *)objectAtIndexedSubscript:(NSUInteger)idx;
-- (void)addMappingWithContentsOfURL:(NSURL *)url;
 - (void)activateMapping:(NJMapping *)mapping;
 - (void)activateMappingForProcess:(NSRunningApplication *)app;
+- (void)addOrMergeMapping:(NJMapping *)mapping;
 - (void)save;
 - (void)load;
 
-- (IBAction)mappingPressed:(id)sender;
-- (IBAction)addPressed:(id)sender;
-- (IBAction)removePressed:(id)sender;
-- (IBAction)moveUpPressed:(id)sender;
-- (IBAction)moveDownPressed:(id)sender;
-- (IBAction)importPressed:(id)sender;
-- (IBAction)exportPressed:(id)sender;
-
 @end