-(void) restoreNeutralConfig {
if(!neutralConfig)
return;
- if([configs indexOfObject:neutralConfig] < 0) {// deleted, keep what we have
- neutralConfig = NULL;
- return;
- }
[self activateConfig: neutralConfig forApplication: NULL];
}
+// TODO: Not an appropriate way to track 'neutral configs', it should just
+// always be the first config and be unremovable.
+
-(void) activateConfig: (Config*)config forApplication: (ProcessSerialNumber*) psn {
if(currentConfig == config)
return;
if(psn) {
if(!neutralConfig)
neutralConfig = currentConfig;
- attachedApplication = *psn;
} else {
neutralConfig = NULL;
}
currentConfig = config;
[removeButton setEnabled: ![config protect]];
[targetController load];
- [[[NSApplication sharedApplication] delegate] configChanged];
- [tableView selectRow: [configs indexOfObject: config] byExtendingSelection: NO];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
+ [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[configs indexOfObject:config]] byExtendingSelection:NO];
}
-(IBAction) addPressed: (id)sender {
Config* newConfig = [[Config alloc] init];
[newConfig setName: @"untitled"];
[configs addObject: newConfig];
- [[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
[tableView reloadData];
- [tableView selectRow: ([configs count]-1) byExtendingSelection: NO];
+ [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:configs.count - 1] byExtendingSelection:NO];
[tableView editColumn: 0 row:([configs count]-1) withEvent:nil select:YES];
}
-(IBAction) removePressed: (id)sender {
// save changes first
[tableView reloadData];
- Config* current_config = [configs objectAtIndex: [tableView selectedRow]];
+ Config* current_config = configs[[tableView selectedRow]];
if([current_config protect])
return;
[configs removeObjectAtIndex: [tableView selectedRow]];
// remove all "switch to configuration" actions
- for(int i=0; i<[configs count]; i++) {
- NSMutableDictionary* entries = [(Config*)[configs objectAtIndex:i] entries];
- for(id key in entries) {
- Target* target = (Target*) [entries objectForKey: key];
- if([target isKindOfClass: [TargetConfig class]] && [(TargetConfig*)target config] == current_config)
+ 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];
}
}
- [[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
[tableView reloadData];
}
-(void)tableViewSelectionDidChange:(NSNotification*) notify {
- [self activateConfig: (Config*)[configs objectAtIndex:[tableView selectedRow]] forApplication: NULL];
+ if (tableView.selectedRow < configs.count)
+ [self activateConfig: (Config*)configs[[tableView selectedRow]] forApplication: NULL];
}
-(id) tableView: (NSTableView*)view objectValueForTableColumn: (NSTableColumn*) column row: (int) index {
NSParameterAssert(index >= 0 && index < [configs count]);
- return [[configs objectAtIndex: index] name];
+ return [configs[index] name];
}
-(void) tableView: (NSTableView*) view setObjectValue:obj forTableColumn:(NSTableColumn*) col row: (int)index {
NSParameterAssert(index >= 0 && index < [configs count]);
/* ugly hack so stringification doesn't fail */
NSString* newName = [(NSString*)obj stringByReplacingOccurrencesOfString: @"~" withString: @""];
- [(Config*)[configs objectAtIndex: index] setName: newName];
+ [(Config*)configs[index] setName: newName];
[targetController refreshConfigsPreservingSelection:YES];
[tableView reloadData];
- [[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
}
-(int)numberOfRowsInTableView: (NSTableView*)table {
}
-(BOOL)tableView: (NSTableView*)view shouldEditTableColumn: (NSTableColumn*) column row: (int) index {
- return ![[configs objectAtIndex: index] protect];
+ return ![configs[index] protect];
}
-(Config*) currentConfig {
NSMutableArray* ary = [[NSMutableArray alloc] init];
for(Config* config in configs) {
NSMutableDictionary* cfgInfo = [[NSMutableDictionary alloc] init];
- [cfgInfo setObject:[config name] forKey:@"name"];
+ cfgInfo[@"name"] = [config name];
NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] init];
for(id key in [config entries]) {
- [cfgEntries setObject:[[[config entries]objectForKey:key]stringify] forKey: key];
+ cfgEntries[key] = [[config entries][key]stringify];
}
- [cfgInfo setObject: cfgEntries forKey: @"entries"];
+ cfgInfo[@"entries"] = cfgEntries;
[ary addObject: cfgInfo];
}
- [envelope setObject: ary forKey: @"configurationList"];
- [envelope setObject: [NSNumber numberWithInt: [configs indexOfObject: [self currentNeutralConfig] ] ] forKey: @"selectedIndex"];
+ envelope[@"configurationList"] = ary;
+ envelope[@"selectedIndex"] = @([configs indexOfObject: [self currentNeutralConfig] ]);
return envelope;
}
-(void) loadAllFrom: (NSDictionary*) envelope{
if(envelope == NULL)
return;
- NSArray* ary = [envelope objectForKey: @"configurationList"];
+ 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 objectAtIndex:i] objectForKey:@"name"]];
+ [cfg setName: ary[i][@"name"]];
[newConfigs addObject: cfg];
}
- [[configs objectAtIndex:0] setProtect: YES];
+ [configs[0] setProtect: YES];
for(int i=0; i<[ary count]; i++) {
- NSDictionary* dict = [[ary objectAtIndex:i] objectForKey:@"entries"];
+ NSDictionary* dict = ary[i][@"entries"];
for(id key in dict) {
- [[[newConfigs objectAtIndex:i] entries]
- setObject: [Target unstringify: [dict objectForKey: key] withConfigList: newConfigs]
- forKey: key];
+ [newConfigs[i] entries][key] = [Target unstringify: dict[key] withConfigList: newConfigs];
}
}
configs = newConfigs;
[tableView reloadData];
currentConfig = NULL;
- [[[NSApplication sharedApplication] delegate] configsChanged];
+ [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
- int index = [[envelope objectForKey: @"selectedIndex"] intValue];
- [self activateConfig: [configs objectAtIndex:index] forApplication: NULL];
+ 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 objectAtIndex:i];
+ Config* cfg = configs[i];
if([[cfg name] isEqualToString: name]) {
[self activateConfig: cfg forApplication: &psn];
return;
[self restoreNeutralConfig];
}
--(ProcessSerialNumber*) targetApplication {
- if(neutralConfig)
- return &attachedApplication;
- return NULL;
-}
-
@end
projects / enjoyable.git / blobdiff