From d400bb1391e366e123366668565080df350b18c5 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Tue, 16 Feb 2010 17:26:23 +0000 Subject: =?UTF-8?q?=E2=80=A2=20removed=20arrows=20=E2=80=A2=20fixed=20spel?= =?UTF-8?q?lings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/DataMigrationDialog.xib | 46 ++++++------------------ Source/SPFieldMapperController.h | 1 + Source/SPFieldMapperController.m | 25 +++++++++---- 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index 141c1ca0..34ffec6c 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -12,7 +12,7 @@ YES - + YES @@ -772,38 +772,15 @@ 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {253, 71} + {253, 66} - CeKGkglEbyBpbXBvcnQgZmllbGQKCcOXCURvIG5vdCBpbXBvcnQgZmllbGQKCUlOU0VSVAlBZGQgYXMg -bmV3IHJvd3MgSU5TRVJUIElOVE8g4oCmCVJFTFBBQ0UJVXBkYXRlIGV4aXN0aW5nIHJvd3Mgb3IgYWRk -IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY + CeKAkwlEbyBpbXBvcnQgZmllbGQKCQlEbyBub3QgaW1wb3J0IGZpZWxkCglJTlNFUlQJQWRkIGFzIG5l +dyByb3dzIElOU0VSVCBJTlRPIOKApglSRVBMQUNFCVVwZGF0ZSBleGlzdGluZyByb3dzIG9yIGFkZCBh +cyAKCQluZXcgcm93cyBSRVBMQUNFIElOVE8g4oCmA YES @@ -903,7 +880,7 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY - AQABAQEADwICAAEDAQATAgIABgMBABsCAwAHAwEANwICAA + AQABAQEADwIDABMCAgAGAwEAGwIDAAcDAQA3AgIAA @@ -919,7 +896,7 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY 1 - 2311 + 2309 0 @@ -974,7 +951,7 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY 6 - {463, 1e+07} + {506, 1e+07} {133, 0} @@ -998,7 +975,6 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY -2147483392 {{-100, -100}, {15, 55}} - YES _doScroller: 1 @@ -1012,14 +988,14 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY 1 _doScroller: - 1 + 0.99604743719100952 0.94565218687057495 {{198, 52}, {253, 70}} - 576 + 512 @@ -1134,7 +1110,7 @@ IGFzIAoJCW5ldyByb3dzIFJFUExBQ0UgSU5UTyDigKY 68288064 138413056 - ➔ + ZapfDingbatsITC 13 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]; } } -- cgit v1.2.3