aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-02-16 17:26:23 +0000
committerBibiko <bibiko@eva.mpg.de>2010-02-16 17:26:23 +0000
commitd400bb1391e366e123366668565080df350b18c5 (patch)
tree6ad0e6ea2f692febc139329b5555db0aab4cfd7f /Source
parentd2ee2613569ce39f1f5920cdebe78f392ff4c839 (diff)
downloadsequelpro-d400bb1391e366e123366668565080df350b18c5.tar.gz
sequelpro-d400bb1391e366e123366668565080df350b18c5.tar.bz2
sequelpro-d400bb1391e366e123366668565080df350b18c5.zip
• removed arrows
• fixed spellings
Diffstat (limited to 'Source')
-rw-r--r--Source/SPFieldMapperController.h1
-rw-r--r--Source/SPFieldMapperController.m25
2 files changed, 19 insertions, 7 deletions
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index 6fc58c60..138c765a 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -55,6 +55,7 @@
BOOL fieldMappingImportArrayIsPreview;
BOOL importFieldNamesHeader;
+ NSNumber *lastDisabledCSVFieldcolumn;
MCPConnection *mySQLConnection;
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index f7a2e068..77c4c335 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -56,11 +56,13 @@
fieldMappingOperatorArray = [[NSMutableArray alloc] init];
fieldMappingArray = nil;
+ lastDisabledCSVFieldcolumn = [NSNumber numberWithInteger:0];
+
doImport = [NSNumber numberWithInteger:0];
doNotImport = [NSNumber numberWithInteger:1];
isEqual = [NSNumber numberWithInteger:2];
- doImportString = @"→";
- doNotImportString = @"×";
+ doImportString = @"─";
+ doNotImportString = @" ";
isEqualString = @"=";
prefs = [NSUserDefaults standardUserDefaults];
@@ -348,13 +350,15 @@
- (NSString *)tableView:(NSTableView *)aTableView toolTipForCell:(NSCell *)aCell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex mouseLocation:(NSPoint)mouseLocation
{
- if([[aTableColumn identifier] isEqualToString:@"import_value"] && [importFieldNamesHeaderSwitch state] == NSOnState)
+ if([[aTableColumn identifier] isEqualToString:@"import_value"] && [importFieldNamesHeaderSwitch state] == NSOnState) {
+ if ([fieldMappingOperatorArray objectAtIndex:rowIndex] == doNotImport) return @"";
if(fieldMappingCurrentRow)
return [NSString stringWithFormat:@"%@: %@",
[NSArrayObjectAtIndex(NSArrayObjectAtIndex(fieldMappingImportArray, 0), [NSArrayObjectAtIndex(fieldMappingArray, rowIndex) integerValue]) description],
[NSArrayObjectAtIndex(NSArrayObjectAtIndex(fieldMappingImportArray, fieldMappingCurrentRow), [NSArrayObjectAtIndex(fieldMappingArray, rowIndex) integerValue]) description]];
else
return [NSArrayObjectAtIndex(NSArrayObjectAtIndex(fieldMappingImportArray, 0), [NSArrayObjectAtIndex(fieldMappingArray, rowIndex) integerValue]) description];
+ }
else if([[aTableColumn identifier] isEqualToString:@"import_value"] && [importFieldNamesHeaderSwitch state] == NSOffState)
return [NSArrayObjectAtIndex(NSArrayObjectAtIndex(fieldMappingImportArray, fieldMappingCurrentRow), [NSArrayObjectAtIndex(fieldMappingArray, rowIndex) integerValue]) description];
else if([[aTableColumn identifier] isEqualToString:@"operator"]) {
@@ -386,9 +390,9 @@
else if ([[aTableColumn identifier] isEqualToString:@"import_value"]) {
if ([[aTableColumn dataCell] isKindOfClass:[NSPopUpButtonCell class]]) {
[(NSPopUpButtonCell *)[aTableColumn dataCell] removeAllItems];
- [(NSPopUpButtonCell *)[aTableColumn dataCell] addItemsWithTitles:fieldMappingButtonOptions];
+ if([fieldMappingOperatorArray objectAtIndex:rowIndex] != doNotImport)
+ [(NSPopUpButtonCell *)[aTableColumn dataCell] addItemsWithTitles:fieldMappingButtonOptions];
}
-
return [fieldMappingArray objectAtIndex:rowIndex];
}
else if ([[aTableColumn identifier] isEqualToString:@"operator"]) {
@@ -396,7 +400,6 @@
[(NSPopUpButtonCell *)[aTableColumn dataCell] removeAllItems];
[(NSPopUpButtonCell *)[aTableColumn dataCell] addItemsWithTitles:fieldMappingOperatorOptions];
}
-
return [fieldMappingOperatorArray objectAtIndex:rowIndex];
}
return nil;
@@ -408,7 +411,15 @@
[fieldMappingArray replaceObjectAtIndex:rowIndex withObject:anObject];
}
else if ([[aTableColumn identifier] isEqualToString:@"operator"]) {
- [fieldMappingOperatorArray replaceObjectAtIndex:rowIndex withObject:anObject];
+ if([fieldMappingOperatorArray objectAtIndex:rowIndex] == anObject) return;
+ if([fieldMappingOperatorArray objectAtIndex:rowIndex] == doNotImport) {
+ [fieldMappingOperatorArray replaceObjectAtIndex:rowIndex withObject:anObject];
+ [fieldMappingArray replaceObjectAtIndex:rowIndex withObject:lastDisabledCSVFieldcolumn];
+ } else {
+ if(anObject == doNotImport) lastDisabledCSVFieldcolumn = [fieldMappingArray objectAtIndex:rowIndex];
+ [fieldMappingOperatorArray replaceObjectAtIndex:rowIndex withObject:anObject];
+ }
+ [aTableView performSelector:@selector(reloadData) withObject:nil afterDelay:0.01];
}
}