From 666b48284293e8555b4604745a7abdcf5e01b22a Mon Sep 17 00:00:00 2001 From: Bibiko Date: Fri, 5 Mar 2010 15:42:28 +0000 Subject: =?UTF-8?q?=E2=80=A2=20CSV=20Import=20Field=20Mapper=20-=20removed?= =?UTF-8?q?=20Advanced=20sheet,=20instead=20resize=20the=20main=20sheet=20?= =?UTF-8?q?and=20display=20these=20settings=20in=20it=20-=20added=20advanc?= =?UTF-8?q?ed=20options=20LOW/HIGH=5FPRIORITY=20-=20improved=20logic=20for?= =?UTF-8?q?=20adv.=20settings,=20disabling=20UPDATE=20if=20target=20table?= =?UTF-8?q?=20has=20less=20than=202=20fields,=20etc.=20-=20fixed=20URL=20f?= =?UTF-8?q?or=20displaying=20the=20source=20file=20name=20-=20removed=20He?= =?UTF-8?q?lp=20text=20since=20it's=20too=20large=20-=20should=20be=20go?= =?UTF-8?q?=20to=20the=20general=20help=20=E2=80=A2=20CMTextView=20-=20fix?= =?UTF-8?q?ed=20bug=20if=20ESC=20Completion=20is=20invoked=20if=20caret=20?= =?UTF-8?q?position=20is=200=20=E2=80=A2=20fixed=20document=20URL=20handli?= =?UTF-8?q?ng=20to=20come=20up=20with=20the=20correct=20icons=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPFieldMapperController.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'Source/SPFieldMapperController.h') 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; -- cgit v1.2.3