diff options
| author | Bibiko <bibiko@eva.mpg.de> | 2010-02-17 15:00:17 +0000 |
|---|---|---|
| committer | Bibiko <bibiko@eva.mpg.de> | 2010-02-17 15:00:17 +0000 |
| commit | 9e3ee6a65342adb3c30ee744c95467e469d17f96 (patch) | |
| tree | 7f171bcf2a86a8e79b78593dffe4d5441f9a8d3d /Source/SPFieldMapperController.h | |
| parent | dc01911fd5987bb4a3213b2c6637326d9dd8c94d (diff) | |
| download | sequelpro-9e3ee6a65342adb3c30ee744c95467e469d17f96.tar.gz sequelpro-9e3ee6a65342adb3c30ee744c95467e469d17f96.tar.bz2 sequelpro-9e3ee6a65342adb3c30ee744c95467e469d17f96.zip | |
• further progress for 'add global source value'
• remember last chosen field alignment in csv field mapper in the prefs
• improved 'matching names' algorithm; now it can handle this:
csv: a b c
table: c d a b
→
c - c
d
a - a
b - b
Diffstat (limited to 'Source/SPFieldMapperController.h')
| -rw-r--r-- | Source/SPFieldMapperController.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index 8a2caf15..5f55abe4 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -28,6 +28,7 @@ @interface SPFieldMapperController : NSWindowController { IBOutlet NSTableView *fieldMapperTableView; + IBOutlet NSTableView *globalValuesTableView; IBOutlet NSPopUpButton *tableTargetPopup; IBOutlet NSPathControl *fileSourcePath; IBOutlet NSPopUpButton *importMethodPopup; @@ -39,17 +40,21 @@ IBOutlet NSPopUpButton *alignByPopup; IBOutlet NSMenuItem *matchingNameMenuItem; + IBOutlet id globalValuesSheet; + IBOutlet NSButton *addGlobalValueButton; + IBOutlet NSButton *removeGlobalValueButton; + id theDelegate; id fieldMappingImportArray; NSInteger fieldMappingCurrentRow; NSMutableArray *fieldMappingArray; NSMutableArray *fieldMappingTableColumnNames; - // NSMutableArray *fieldMappingTableDefaultValues; NSMutableArray *fieldMappingTableTypes; NSMutableArray *fieldMappingButtonOptions; NSMutableArray *fieldMappingOperatorOptions; NSMutableArray *fieldMappingOperatorArray; + NSMutableArray *fieldMappingGlobalValues; NSNumber *doImport; NSNumber *doNotImport; @@ -58,6 +63,8 @@ NSString *doNotImportString; NSString *isEqualString; + NSInteger numberOfImportColumns; + BOOL fieldMappingImportArrayIsPreview; BOOL importFieldNamesHeader; NSNumber *lastDisabledCSVFieldcolumn; @@ -94,10 +101,15 @@ - (IBAction)closeSheet:(id)sender; - (IBAction)goBackToFileChooser:(id)sender; +- (IBAction)addGlobalValue:(id)sender; +- (IBAction)removeGlobalValue:(id)sender; +- (IBAction)closeGlobalValuesSheet:(id)sender; + // Others - (void)matchHeaderNames; - (void)setupFieldMappingArray; - (void)updateFieldMappingButtonCell; - (void)updateFieldMappingOperatorOptions; +- (void)updateFieldNameAlignment; @end |