• further improvements for CSV import into new table

- fixed some RETURN/ENTER logic while editing a table cell
- added context menu to table for:
-- 'Set all Field Types to:' which sets all types to the current selected one ⌘=
-- 'Add Column to Table Target' (not yet implemented)
- some minor code issues
- added Info button which will come up with a GUI for setting new table encoding and engine (not yet implemented)

1 files changed, 9 insertions, 1 deletions

diff --git a/Source/SPTableView.m b/Source/SPTableView.m
index 7e212884..c3f76baf 100644
--- a/Source/SPTableView.m
+++ b/Source/SPTableView.m
@@ -92,8 +92,15 @@
 	if([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76))
 	{
 
-		// ENTER or RETURN closes the SPFieldMapperController sheet by sending an object with the tag 1
 		if([[[[self delegate] class] description] isEqualToString:@"SPFieldMapperController"]) {
+
+			if([[self delegate] isGlobalValueSheetOpen]) {
+				[[self delegate] closeGlobalValuesSheet:nil];
+				return;
+			}
+
+			// ENTER or RETURN closes the SPFieldMapperController sheet
+			// by sending an object with the tag 1 if no table cell is edited
 			if([[self delegate] canBeClosed]) {
 				NSButton *b = [[[NSButton alloc] init] autorelease];
 				[b setTag:1];
@@ -117,6 +124,7 @@
 			[self editColumn:0 row:[self selectedRow] withEvent:nil select:YES];
 			return;
 		}
+
 	}
 	
 	[super keyDown:theEvent];