diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
| commit | 524e8c356b4074f5be5933b0551374a130a8f6d1 (patch) | |
| tree | 0dab40735f2d9484930050cd08376cbf15e4ea55 /Source/SPFieldMapperController.h | |
| parent | be3263f8158cb6f3dfa1005f49beefa7e494b852 (diff) | |
| download | sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.gz sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.bz2 sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.zip | |
Bring outline view branch up to date with trunk (r3471:r3517).
Diffstat (limited to 'Source/SPFieldMapperController.h')
| -rw-r--r-- | Source/SPFieldMapperController.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index 860eef81..6fb31b8e 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -22,14 +22,11 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> +@class SPTextView, SPTableView, SPTablesList, SPMySQLConnection; -@class SPTextView, SPTableView, SPTablesList; - -#ifndef SP_REFACTOR @interface SPFieldMapperController : NSWindowController -#else -@interface SPFieldMapperController : NSWindowController <NSTokenFieldCellDelegate> +#ifdef SP_REFACTOR +<NSTokenFieldCellDelegate> #endif { IBOutlet SPTableView *fieldMapperTableView; @@ -41,8 +38,8 @@ IBOutlet id rowUpButton; IBOutlet id rowDownButton; IBOutlet id recordCountLabel; - IBOutlet id importFieldNamesHeaderSwitch; - IBOutlet id addRemainingDataSwitch; + IBOutlet NSButton *importFieldNamesHeaderSwitch; + IBOutlet NSButton *addRemainingDataSwitch; IBOutlet id importButton; IBOutlet id advancedBox; IBOutlet NSPopUpButton *alignByPopup; @@ -65,20 +62,20 @@ IBOutlet NSButton *addGlobalValueButton; IBOutlet NSButton *removeGlobalValueButton; IBOutlet NSButton *insertNULLValueButton; - IBOutlet id replaceAfterSavingCheckBox; + IBOutlet NSButton *replaceAfterSavingCheckBox; IBOutlet NSPopUpButton *insertPullDownButton; IBOutlet NSMenu *recentGlobalValueMenu; - 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 id skipexistingRowsCheckBox; + IBOutlet NSButton *ignoreCheckBox; + IBOutlet NSButton *ignoreUpdateCheckBox; + IBOutlet NSButton *delayedCheckBox; + IBOutlet NSButton *delayedReplaceCheckBox; + IBOutlet NSButton *onupdateCheckBox; + IBOutlet NSButton *lowPriorityCheckBox; + IBOutlet NSButton *lowPriorityReplaceCheckBox; + IBOutlet NSButton *lowPriorityUpdateCheckBox; + IBOutlet NSButton *highPriorityCheckBox; + IBOutlet NSButton *skipexistingRowsCheckBox; IBOutlet SPTextView *onupdateTextView; IBOutlet id gobackButton; @@ -131,7 +128,7 @@ NSString *primaryKeyField; NSNumber *lastDisabledCSVFieldcolumn; - MCPConnection *mySQLConnection; + SPMySQLConnection *mySQLConnection; NSString *sourcePath; @@ -146,7 +143,7 @@ - (id)initWithDelegate:(id)managerDelegate; -- (void)setConnection:(MCPConnection *)theConnection; +- (void)setConnection:(SPMySQLConnection *)theConnection; - (void)setImportDataArray:(id)theFieldMappingImportArray hasHeader:(BOOL)hasHeader isPreview:(BOOL)isPreview; // Getter methods |