X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=67033d3bc4a22470e267c55164279ba5cea4c2c7;hp=58614b2f56610c37b43923c2dd343d6f6c40a6c4;hb=3090f311c3406d9c157630bc9744b9b14aa42311;hpb=25dd74a4a34f4ba7ec797360bd8f92cbd7bc758e

diff --git a/ConfigsController.m b/ConfigsController.m
index 58614b2..67033d3 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -5,118 +5,108 @@
 //  Created by Sam McCall on 4/05/09.
 //
 
-@implementation ConfigsController
+#import "ConfigsController.h"
 
+#import "ApplicationController.h"
+#import "Config.h"
+#import "ConfigsController.h"
+#import "Target.h"
+#import "TargetController.h"
+
+@implementation ConfigsController {
+    NSMutableArray *configs;
+	Config *manualConfig;
+}
+
+@synthesize currentConfig;
 @synthesize configs;
 
--(id) init {
-	if(self = [super init]) {
+- (id)init {
+	if ((self = [super init])) {
 		configs = [[NSMutableArray alloc] init];
-		currentConfig = [[Config alloc] init];
-		[currentConfig setName: @"(default)"];
-		[currentConfig setProtect: YES];
-		[configs addObject: currentConfig];		
+        currentConfig = [[Config alloc] init];
+        currentConfig.name = @"(default)";
+        manualConfig = currentConfig;
+		[configs addObject:currentConfig];
 	}
 	return self;
 }
 
--(void) restoreNeutralConfig {
-	if(!neutralConfig)
-		return;
-	[self activateConfig: neutralConfig forApplication: NULL];
+- (Config *)objectForKeyedSubscript:(NSString *)name {
+    for (Config *config in configs)
+        if ([name isEqualToString:config.name])
+            return config;
+    return nil;
 }
 
-// TODO: Not an appropriate way to track 'neutral configs', it should just
-// always be the first config and be unremovable.
+- (void)activateConfigForProcess:(NSString *)processName {
+    Config *oldConfig = manualConfig;
+    [self activateConfig:self[processName]];
+    manualConfig = oldConfig;
+}
 
--(void) activateConfig: (Config*)config forApplication: (ProcessSerialNumber*) psn {
-	if(currentConfig == config)
+- (void)activateConfig:(Config *)config {
+    if (!config)
+        config = manualConfig;
+	if (currentConfig == config)
 		return;
-
-	if(psn) {
-		if(!neutralConfig)
-			neutralConfig = currentConfig;
-	} else {
-		neutralConfig = NULL;
-	}
-	
-	if(currentConfig != NULL) {
-		[targetController reset];
-	}
+    manualConfig = config;
 	currentConfig = config;
-	[removeButton setEnabled: ![config protect]];
+    [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];
-	[newConfig setName: @"untitled"];
-	[configs addObject: newConfig];
+- (IBAction)addPressed:(id)sender {
+	Config *newConfig = [[Config alloc] init];
+    newConfig.name = @"untitled";
+	[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 {
-	// save changes first
-	[tableView reloadData];
-	Config* current_config = configs[[tableView selectedRow]];
-	if([current_config protect])
-		return;
-	[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];
+
+- (IBAction)removePressed:(id)sender {
+    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];
 }
 
--(void)tableViewSelectionDidChange:(NSNotification*) notify {
-    if (tableView.selectedRow < configs.count)
-        [self activateConfig: (Config*)configs[[tableView selectedRow]] forApplication: NULL];
+-(void)tableViewSelectionDidChange:(NSNotification *)notify {
+    if (tableView.selectedRow >= 0)
+        [self activateConfig:configs[tableView.selectedRow]];
 }
 	
--(id) tableView: (NSTableView*)view objectValueForTableColumn: (NSTableColumn*) column row: (int) index {
-    NSParameterAssert(index >= 0 && index < [configs count]);
+- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index {
 	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[index] setName: newName];
+- (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 {
+- (int)numberOfRowsInTableView:(NSTableView*)table {
 	return [configs count];
 }
 
--(BOOL)tableView: (NSTableView*)view shouldEditTableColumn: (NSTableColumn*) column row: (int) index {
-	return ![configs[index] protect];
-}	
-
--(Config*) currentConfig {
-	return currentConfig;
-}
-
--(Config*) currentNeutralConfig {
-	if(neutralConfig)
-		return neutralConfig;
-	return currentConfig;
+- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index {
+	return index > 0;
 }
 
 -(void) save {
@@ -135,15 +125,15 @@
 		cfgInfo[@"name"] = [config name];
 		NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] init];
 		for(id key in [config entries]) {
-			cfgEntries[key] = [[config entries][key]stringify];
+			cfgEntries[key] = [[config entries][key] serialize];
 		}
 		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;
@@ -156,33 +146,20 @@
 		[cfg setName: ary[i][@"name"]];		
 		[newConfigs addObject: cfg];
 	}
-	[configs[0] setProtect: YES];
 	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];
+			[newConfigs[i] entries][key] = [Target targetDeserialize:dict[key] withConfigs: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];
+    if (newConfigs.count) {
+        configs = newConfigs;
+        [tableView reloadData];
+        currentConfig = configs[0];
+        manualConfig = configs[0];
+        [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
+    }
 }
 
 @end