X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=dbb2c6f063c4b9e1df5a6fcd5db0b63016a1f89d;hp=10adcee4215190686ba70176ea791a76a9cff023;hb=c262a3d0972ba16257fd24a948ab04f528f80d33;hpb=3dfe18e6224331f1161ddcc057f755d41ff55266 diff --git a/ConfigsController.m b/ConfigsController.m index 10adcee..dbb2c6f 100644 --- a/ConfigsController.m +++ b/ConfigsController.m @@ -5,183 +5,162 @@ // Created by Sam McCall on 4/05/09. // +#import "ConfigsController.h" + +#import "ApplicationController.h" +#import "Config.h" +#import "ConfigsController.h" +#import "Target.h" +#import "TargetController.h" + @implementation ConfigsController { NSMutableArray *configs; - Config *neutralConfig; + Config *manualConfig; } @synthesize currentConfig; @synthesize configs; - (id)init { - if ((self = [super init])) { - configs = [[NSMutableArray alloc] init]; - currentConfig = [[Config alloc] init]; - [currentConfig setName: @"(default)"]; - [configs addObject:currentConfig]; - } - return self; -} - -// TODO: Neutral config stuff is a mess. - --(void) restoreNeutralConfig { - if(!neutralConfig) - return; - [self activateConfig: neutralConfig forApplication: NULL]; -} - --(void) activateConfig: (Config*)config forApplication: (ProcessSerialNumber*) psn { - if(currentConfig == config) - return; - - if(psn) { - if(!neutralConfig) - neutralConfig = currentConfig; - } else { - neutralConfig = NULL; - } - - if(currentConfig != NULL) { - [targetController reset]; - } - currentConfig = config; - [removeButton setEnabled:configs[0] != config]; - [targetController load]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; + if ((self = [super init])) { + configs = [[NSMutableArray alloc] init]; + currentConfig = [[Config alloc] init]; + currentConfig.name = @"(default)"; + manualConfig = currentConfig; + [configs addObject:currentConfig]; + } + return self; +} + +- (Config *)objectForKeyedSubscript:(NSString *)name { + for (Config *config in configs) + if ([name isEqualToString:config.name]) + return config; + return nil; +} + +- (void)activateConfigForProcess:(NSString *)processName { + Config *oldConfig = manualConfig; + [self activateConfig:self[processName]]; + manualConfig = oldConfig; +} + +- (void)activateConfig:(Config *)config { + if (!config) + config = manualConfig; + if (currentConfig == config) + return; + manualConfig = config; + currentConfig = config; + [targetController reset]; + [removeButton setEnabled:configs[0] != config]; + [targetController load]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[configs indexOfObject:config]] byExtendingSelection:NO]; } - (IBAction)addPressed:(id)sender { - Config *newConfig = [[Config alloc] init]; + Config *newConfig = [[Config alloc] init]; newConfig.name = @"untitled"; - [configs addObject:newConfig]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - [tableView reloadData]; + [configs addObject:newConfig]; + [(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 { if (tableView.selectedRow == 0) return; - - Config *current_config = configs[tableView.selectedRow]; - [configs removeObjectAtIndex:tableView.selectedRow]; - - // remove all "switch to configuration" actions - for (Config *config in configs) { - NSMutableDictionary *entries = config.entries; - for (id key in entries) { - Target *target = entries[key]; - if ([target isKindOfClass:[TargetConfig class]] - && [(TargetConfig *)target config] == current_config) - [entries removeObjectForKey: key]; - } - } - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - [tableView reloadData]; + + 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]; } -(void)tableViewSelectionDidChange:(NSNotification *)notify { if (tableView.selectedRow >= 0) - [self activateConfig:configs[tableView.selectedRow] forApplication: NULL]; + [self activateConfig:configs[tableView.selectedRow]]; } - + - (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index { - return [configs[index] name]; + return [configs[index] name]; } -- (void)tableView:(NSTableView *)view setObjectValue:obj forTableColumn:(NSTableColumn *)col row:(int)index { - /* ugly hack so stringification doesn't fail */ - NSString* newName = [(NSString*)obj stringByReplacingOccurrencesOfString: @"~" withString: @""]; - [(Config *)configs[index] setName:newName]; - [targetController refreshConfigsPreservingSelection:YES]; - [tableView reloadData]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; +- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index { + [(Config *)configs[index] setName:obj]; + [targetController refreshConfigsPreservingSelection:YES]; + [tableView reloadData]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; } - (int)numberOfRowsInTableView:(NSTableView*)table { - return [configs count]; + return [configs count]; } - (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index { - return index > 0; -} + return index > 0; +} -- (Config *)currentConfig { - return currentConfig; +- (void)save { + NSLog(@"Saving defaults."); + [[NSUserDefaults standardUserDefaults] setObject:[self dumpAll] forKey:@"configurations"]; } -- (Config *)currentNeutralConfig { - if (neutralConfig) - return neutralConfig; - return currentConfig; +- (void)load { + [self loadAllFrom:[[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]]; } --(void) save { - [[NSUserDefaults standardUserDefaults] setObject:[self dumpAll] forKey:@"configurations"]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} --(void) load { - [self loadAllFrom: [[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]]; -} - --(NSDictionary*) dumpAll { - NSMutableDictionary *envelope = [[NSMutableDictionary alloc] init]; - NSMutableArray* ary = [[NSMutableArray alloc] init]; - for(Config* config in configs) { - NSMutableDictionary* cfgInfo = [[NSMutableDictionary alloc] init]; - cfgInfo[@"name"] = [config name]; - NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] init]; - for(id key in [config entries]) { - cfgEntries[key] = [[config entries][key]stringify]; - } - cfgInfo[@"entries"] = cfgEntries; - [ary addObject: cfgInfo]; - } - envelope[@"configurationList"] = ary; - envelope[@"selectedIndex"] = @([configs indexOfObject: [self currentNeutralConfig] ]); - return envelope; -} --(void) loadAllFrom: (NSDictionary*) envelope{ - if(envelope == NULL) - return; - NSArray* ary = envelope[@"configurationList"]; - - NSMutableArray* newConfigs = [[NSMutableArray alloc] init]; - // have to do two passes in case config1 refers to config2 via a TargetConfig - for(int i=0; i<[ary count]; i++) { - Config* cfg = [[Config alloc] init]; - [cfg setName: ary[i][@"name"]]; - [newConfigs addObject: cfg]; - } - for(int i=0; i<[ary count]; i++) { - NSDictionary* dict = ary[i][@"entries"]; - for(id key in dict) { - [newConfigs[i] entries][key] = [Target unstringify: dict[key] withConfigList: newConfigs]; - } - } - - configs = newConfigs; - [tableView reloadData]; - currentConfig = NULL; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - - int index = [envelope[@"selectedIndex"] intValue]; - if (index < configs.count) - [self activateConfig: configs[index] forApplication: NULL]; -} - --(void) applicationSwitchedTo: (NSString*) name withPsn: (ProcessSerialNumber) psn { - for(int i=0; i<[configs count]; i++) { - Config* cfg = configs[i]; - if([[cfg name] isEqualToString: name]) { - [self activateConfig: cfg forApplication: &psn]; - return; - } - } - [self restoreNeutralConfig]; +- (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, + }]; + } + NSUInteger current = currentConfig ? [configs indexOfObject:currentConfig] : 0; + return @{ @"configurationList": ary, + @"selectedConfiguration": @(current) }; +} + +- (void)loadAllFrom:(NSDictionary*) envelope{ + NSArray *storedConfigs = envelope[@"configurationList"]; + NSMutableArray* newConfigs = [[NSMutableArray alloc] initWithCapacity:storedConfigs.count]; + + // have to do two passes in case config1 refers to config2 via a TargetConfig + for (NSDictionary *storedConfig in storedConfigs) { + Config *cfg = [[Config alloc] init]; + cfg.name = storedConfig[@"name"]; + [newConfigs addObject:cfg]; + } + + for (int 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]; + } + + if (newConfigs.count) { + int current = [envelope[@"selectedConfiguration"] unsignedIntValue]; + if (current >= newConfigs.count) + current = 0; + configs = newConfigs; + [tableView reloadData]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [self activateConfig:configs[current]]; + } } @end