diff options
| author | Bibiko <bibiko@eva.mpg.de> | 2010-03-05 15:42:28 +0000 |
|---|---|---|
| committer | Bibiko <bibiko@eva.mpg.de> | 2010-03-05 15:42:28 +0000 |
| commit | 666b48284293e8555b4604745a7abdcf5e01b22a (patch) | |
| tree | 1e243e13e45025adb7f6b3a6a06f381a778b9893 /Source/SPFieldMapperController.h | |
| parent | d63dff9e7b9f88799b5fa753c8a3510404aa17b8 (diff) | |
| download | sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.tar.gz sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.tar.bz2 sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.zip | |
• CSV Import Field Mapper
- removed Advanced sheet, instead resize the main sheet and display these settings in it
- added advanced options LOW/HIGH_PRIORITY
- improved logic for adv. settings, disabling UPDATE if target table has less than 2 fields, etc.
- fixed URL for displaying the source file name
- removed Help text since it's too large - should be go to the general help
• CMTextView
- fixed bug if ESC Completion is invoked if caret position is 0
• fixed document URL handling to come up with the correct icons etc.
Diffstat (limited to 'Source/SPFieldMapperController.h')
| -rw-r--r-- | Source/SPFieldMapperController.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index 6dc7ffe8..7db0f5c9 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -29,6 +29,7 @@ @interface SPFieldMapperController : NSWindowController { IBOutlet NSTableView *fieldMapperTableView; + IBOutlet id fieldMapperTableScrollView; IBOutlet NSTableView *globalValuesTableView; IBOutlet NSPopUpButton *tableTargetPopup; IBOutlet NSPathControl *fileSourcePath; @@ -39,7 +40,11 @@ IBOutlet id importFieldNamesHeaderSwitch; IBOutlet id addRemainingDataSwitch; IBOutlet id importButton; + IBOutlet id advancedBox; IBOutlet NSPopUpButton *alignByPopup; + IBOutlet id alignByPopupLabel; + IBOutlet id importMethodLabel; + IBOutlet id advancedLabel; IBOutlet NSMenuItem *matchingNameMenuItem; IBOutlet id globalValuesSheet; @@ -48,14 +53,25 @@ IBOutlet NSButton *insertNULLValueButton; IBOutlet id replaceAfterSavingCheckBox; - IBOutlet id advancedSheet; IBOutlet id ignoreCheckBox; + IBOutlet id ignoreUpdateCheckBox; IBOutlet id delayedCheckBox; + IBOutlet id delayedReplaceCheckBox; IBOutlet id onupdateCheckBox; + IBOutlet id lowPriorityCheckBox; + IBOutlet id lowPriorityReplaceCheckBox; + IBOutlet id lowPriorityUpdateCheckBox; + IBOutlet id highPriorityCheckBox; IBOutlet CMTextView *onupdateTextView; + IBOutlet id advancedButton; + IBOutlet id advancedInsertView; + IBOutlet id advancedReplaceView; + IBOutlet id advancedUpdateView; + id theDelegate; + id customQueryInstance; id fieldMappingImportArray; NSInteger fieldMappingCurrentRow; @@ -79,6 +95,7 @@ BOOL fieldMappingImportArrayIsPreview; BOOL importFieldNamesHeader; + BOOL showAdvancedView; NSNumber *lastDisabledCSVFieldcolumn; MCPConnection *mySQLConnection; @@ -86,6 +103,11 @@ NSString *sourcePath; NSUserDefaults *prefs; + + NSInteger heightOffset; + NSUInteger windowMinWidth; + NSUInteger windowMinHeigth; + } @property(retain) NSString* sourcePath; @@ -122,11 +144,11 @@ - (IBAction)removeGlobalValue:(id)sender; - (IBAction)insertNULLValue:(id)sender; - (IBAction)closeGlobalValuesSheet:(id)sender; -- (IBAction)closeAdvancedSheet:(id)sender; - (IBAction)advancedCheckboxValidation:(id)sender; // Others +- (void)resizeWindowByHeightDelta:(NSInteger)delta; - (void)matchHeaderNames; - (void)setupFieldMappingArray; - (void)updateFieldMappingButtonCell; |