_currentConfig = config;
[removeButton setEnabled:_configs[0] != config];
[targetController loadCurrent];
- [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
+ [(ApplicationController *)NSApplication.sharedApplication.delegate configChanged];
[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO];
}
- (IBAction)addPressed:(id)sender {
Config *newConfig = [[Config alloc] initWithName:@"Untitled"];
[_configs addObject:newConfig];
- [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+ [(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];
if (tableView.selectedRow == 0)
return;
- Config *toRemove = _configs[tableView.selectedRow];
[_configs removeObjectAtIndex:tableView.selectedRow];
-
- if (toRemove == _currentConfig)
- _currentConfig = _configs[0];
- if (toRemove == manualConfig)
- manualConfig = _configs[0];
-
- [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
[tableView reloadData];
+ [(ApplicationController *)NSApplication.sharedApplication.delegate configsChanged];
+ [self activateConfig:_configs[0]];
+ [self save];
}
-(void)tableViewSelectionDidChange:(NSNotification *)notify {
- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(NSInteger)index {
[(Config *)_configs[index] setName:obj];
[tableView reloadData];
- [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)NSApplication.sharedApplication.delegate configsChanged];
}
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
- (void)save {
NSLog(@"Saving defaults.");
- [[NSUserDefaults standardUserDefaults] setObject:[self dumpAll] forKey:@"configurations"];
+ [NSUserDefaults.standardUserDefaults setObject:[self dumpAll] forKey:@"configurations"];
}
- (void)load {
- [self loadAllFrom:[[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]];
+ [self loadAllFrom:[NSUserDefaults.standardUserDefaults objectForKey:@"configurations"]];
}
- (NSDictionary *)dumpAll {
for (unsigned i = 0; i < storedConfigs.count; ++i) {
NSDictionary *entries = storedConfigs[i][@"entries"];
Config *config = newConfigs[i];
- for (id key in entries)
- config.entries[key] = [Target targetDeserialize:entries[key]
- withConfigs:newConfigs];
+ for (id key in entries) {
+ Target *target = [Target targetDeserialize:entries[key]
+ withConfigs:newConfigs];
+ if (target)
+ config.entries[key] = target;
+ }
}
if (newConfigs.count) {
current = 0;
_configs = newConfigs;
[tableView reloadData];
- [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)NSApplication.sharedApplication.delegate configsChanged];
[self activateConfig:_configs[current]];
}
}
+- (Config *)configWithURL:(NSURL *)url error:(NSError **)error {
+ NSInputStream *stream = [NSInputStream inputStreamWithURL:url];
+ [stream open];
+ NSDictionary *serialization = !*error
+ ? [NSJSONSerialization JSONObjectWithStream:stream options:0 error:error]
+ : nil;
+ [stream close];
+
+ if (!([serialization isKindOfClass:NSDictionary.class]
+ && [serialization[@"name"] isKindOfClass:NSString.class]
+ && [serialization[@"entries"] isKindOfClass:NSDictionary.class])) {
+ *error = [NSError errorWithDomain:@"Enjoyable"
+ code:0
+ description:@"This isn't a valid mapping file."];
+ return nil;
+ }
+
+ NSDictionary *entries = serialization[@"entries"];
+ Config *cfg = [[Config alloc] initWithName:serialization[@"name"]];
+ for (id key in entries) {
+ NSDictionary *value = entries[key];
+ if ([key isKindOfClass:NSString.class]) {
+ Target *target = [Target targetDeserialize:value
+ withConfigs:_configs];
+ if (target)
+ cfg.entries[key] = target;
+ }
+ }
+ return cfg;
+}
+
- (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];
- }
+ NSWindow *window = NSApplication.sharedApplication.keyWindow;
+ [panel beginSheetModalForWindow:window
+ completionHandler:^(NSInteger result) {
+ if (result != NSFileHandlingPanelOKButton)
+ return;
+
+ [panel close];
+ NSError *error;
+ Config *cfg = [self configWithURL:panel.URL error:&error];
+
+ if (!error) {
+ BOOL conflict;
+ Config *mergeInto = self[cfg.name];
+ for (id key in cfg.entries) {
+ if (mergeInto.entries[key]) {
+ conflict = YES;
+ break;
+ }
+ }
+
+ 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) {
+ [window presentError:error
+ modalForWindow:window
+ delegate:nil
+ didPresentSelector:nil
+ contextInfo:nil];
+ }
+ }];
+
}
- (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];
- }
+ Config *cfg = _currentConfig;
+ panel.nameFieldStringValue = cfg.name;
+ NSWindow *window = NSApplication.sharedApplication.keyWindow;
+ [panel beginSheetModalForWindow:window
+ completionHandler:^(NSInteger result) {
+ if (result != NSFileHandlingPanelOKButton)
+ return;
+ [panel close];
+ NSError *error;
+ NSDictionary *serialization = [cfg serialize];
+ NSData *json = [NSJSONSerialization dataWithJSONObject:serialization
+ options:NSJSONWritingPrettyPrinted
+ error:&error];
+ if (!error)
+ [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error];
+
+ if (error) {
+ [window presentError:error
+ modalForWindow:window
+ delegate:nil
+ didPresentSelector:nil
+ contextInfo:nil];
+ }
+ }];
}
@end
projects / enjoyable.git / blobdiff