X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=17cf8fd6a3a9547a11733b514fb48ec8344ba6ae;hp=769fabde56158060e5951f2108e324a6d3660b40;hb=9584becb2e5469e8f482d73e6f0c9c3bf879e0db;hpb=15a3aec049658f4a1c3c6e8c9f8a549fb8de0782

diff --git a/ConfigsController.m b/ConfigsController.m
index 769fabd..17cf8fd 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -48,9 +48,8 @@
         return;
     manualConfig = config;
     _currentConfig = config;
-    [targetController reset];
     [removeButton setEnabled:_configs[0] != config];
-    [targetController load];
+    [targetController loadCurrent];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
     [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO];
 }
@@ -61,7 +60,7 @@
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
     [tableView reloadData];
     [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:_configs.count - 1] byExtendingSelection:NO];
-    [tableView editColumn:0 row:[_configs count] - 1 withEvent:nil select:YES];
+    [tableView editColumn:0 row:_configs.count - 1 withEvent:nil select:YES];
 }
 
 - (IBAction)removePressed:(id)sender {
@@ -85,22 +84,21 @@
         [self activateConfig:_configs[tableView.selectedRow]];
 }
 
-- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index {
+- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)index {
     return [_configs[index] name];
 }
 
-- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index {
+- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(NSInteger)index {
     [(Config *)_configs[index] setName:obj];
-    [targetController refreshConfigsPreservingSelection:YES];
     [tableView reloadData];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
 }
 
-- (int)numberOfRowsInTableView:(NSTableView*)table {
-    return [_configs count];
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
+    return _configs.count;
 }
 
-- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index {
+- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(NSInteger)index {
     return index > 0;
 }
 
@@ -115,21 +113,14 @@
 
 - (NSDictionary *)dumpAll {
     NSMutableArray *ary = [[NSMutableArray alloc] initWithCapacity:_configs.count];
-    for (Config *config in _configs) {
-        NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] initWithCapacity:config.entries.count];
-        for (id key in config.entries)
-            cfgEntries[key] = [config.entries[key] serialize];
-        [ary addObject:@{ @"name": config.name,
-                          @"entries": cfgEntries,
-                        }];
-    }
+    for (Config *config in _configs)
+        [ary addObject:[config serialize]];
     NSUInteger current = _currentConfig ? [_configs indexOfObject:_currentConfig] : 0;
-    return @{ @"configurationList": ary,
-              @"selectedConfiguration": @(current) };
+    return @{ @"configurations": ary, @"selected": @(current) };
 }
 
 - (void)loadAllFrom:(NSDictionary*) envelope{
-    NSArray *storedConfigs = envelope[@"configurationList"];
+    NSArray *storedConfigs = envelope[@"configurations"];
     NSMutableArray* newConfigs = [[NSMutableArray alloc] initWithCapacity:storedConfigs.count];
 
     // have to do two passes in case config1 refers to config2 via a TargetConfig
@@ -138,7 +129,7 @@
         [newConfigs addObject:cfg];
     }
 
-    for (int i = 0; i < storedConfigs.count; ++i) {
+    for (unsigned i = 0; i < storedConfigs.count; ++i) {
         NSDictionary *entries = storedConfigs[i][@"entries"];
         Config *config = newConfigs[i];
         for (id key in entries)
@@ -147,7 +138,7 @@
     }
     
     if (newConfigs.count) {
-        int current = [envelope[@"selectedConfiguration"] unsignedIntValue];
+        unsigned current = [envelope[@"selected"] unsignedIntValue];
         if (current >= newConfigs.count)
             current = 0;
         _configs = newConfigs;
@@ -157,4 +148,21 @@
     }
 }
 
+- (void)exportPressed:(id)sender {
+    NSSavePanel *panel = [NSSavePanel savePanel];
+    panel.allowedFileTypes = @[ @"enjoyable" ];
+    if ([panel runModal] == NSFileHandlingPanelOKButton) {
+        NSError *error;
+        NSDictionary *serialization = [_currentConfig serialize];
+        NSData *json = [NSJSONSerialization dataWithJSONObject:serialization
+                                                       options:NSJSONWritingPrettyPrinted
+                                                         error:&error];
+        if (!error)
+            [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error];
+        
+        if (error)
+            [[NSAlert alertWithError:error] runModal];
+    }
+}
+
 @end