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];
}
[(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 {
[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;
}
- (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
[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)
}
if (newConfigs.count) {
- int current = [envelope[@"selectedConfiguration"] unsignedIntValue];
+ unsigned current = [envelope[@"selected"] unsignedIntValue];
if (current >= newConfigs.count)
current = 0;
_configs = newConfigs;
}
}
+- (void)importPressed:(id)sender {
+ NSOpenPanel *panel = [NSOpenPanel openPanel];
+ panel.allowedFileTypes = @[ @"enjoyable", @"json", @"txt" ];
+ if ([panel runModal] == NSFileHandlingPanelOKButton) {
+ NSError *error;
+ NSInputStream *stream = [NSInputStream inputStreamWithURL:panel.URL];
+ [stream open];
+ NSDictionary *serialization = !error
+ ? [NSJSONSerialization JSONObjectWithStream:stream options:0 error:&error]
+ : nil;
+ [stream close];
+
+ if (!([serialization isKindOfClass:[NSDictionary class]]
+ && serialization[@"entries"])) {
+ error = [NSError errorWithDomain:@"Enjoyable"
+ code:0
+ description:@"This isn't a valid mapping file."];
+ }
+
+
+ if (!error) {
+ NSDictionary *entries = serialization[@"entries"];
+ Config *cfg = [[Config alloc] initWithName:serialization[@"name"]];
+ Config *mergeInto = self[cfg.name];
+ BOOL conflict = NO;
+ for (id key in entries) {
+ cfg.entries[key] = [Target targetDeserialize:entries[key]
+ withConfigs:_configs];
+ if (mergeInto.entries[key])
+ conflict = YES;
+ }
+
+ if (conflict) {
+ NSAlert *conflictAlert = [[NSAlert alloc] init];
+ conflictAlert.messageText = @"Replace existing mappings?";
+ conflictAlert.informativeText =
+ [NSString stringWithFormat:
+ @"This file contains inputs you've already mapped in \"%@\". Do you "
+ @"want to merge them and replace your existing mappings, or import this "
+ @"as a separate mapping?", cfg.name];
+ [conflictAlert addButtonWithTitle:@"Merge"];
+ [conflictAlert addButtonWithTitle:@"Cancel"];
+ [conflictAlert addButtonWithTitle:@"New Mapping"];
+ NSInteger res = [conflictAlert runModal];
+ if (res == NSAlertSecondButtonReturn)
+ return;
+ else if (res == NSAlertThirdButtonReturn)
+ mergeInto = nil;
+ }
+
+ if (mergeInto) {
+ [mergeInto.entries addEntriesFromDictionary:cfg.entries];
+ cfg = mergeInto;
+ } else {
+ [_configs addObject:cfg];
+ [tableView reloadData];
+ }
+
+ [self save];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+ [self activateConfig:cfg];
+ [targetController loadCurrent];
+
+ if (conflict && !mergeInto) {
+ [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:_configs.count - 1] byExtendingSelection:NO];
+ [tableView editColumn:0 row:_configs.count - 1 withEvent:nil select:YES];
+ }
+ }
+
+ if (error)
+ [[NSAlert alertWithError:error] runModal];
+ }
+}
+
+- (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
projects / enjoyable.git / blobdiff