aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPFieldMapperController.h
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
committerAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
commit57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch)
treedd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPFieldMapperController.h
parentb5e972f4504043dfb9c358e272e93fb59ae2127f (diff)
parent0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff)
downloadsequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPFieldMapperController.h')
-rw-r--r--Source/SPFieldMapperController.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index a12adcb8..76b65c49 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -33,7 +33,7 @@
@class SPTablesList;
@class SPMySQLConnection;
-@interface SPFieldMapperController : NSWindowController <NSTokenFieldCellDelegate>
+@interface SPFieldMapperController : NSWindowController <NSTokenFieldCellDelegate, NSMenuDelegate>
{
IBOutlet SPTableView *fieldMapperTableView;
IBOutlet NSScrollView *fieldMapperTableScrollView;
@@ -110,9 +110,9 @@
NSMutableArray *fieldMappingTableDefaultValues;
NSMutableArray *defaultFieldTypesForComboBox;
- NSNumber *doImport;
- NSNumber *doNotImport;
- NSNumber *isEqual;
+ NSNumber *doImportKey;
+ NSNumber *doNotImportKey;
+ NSNumber *isEqualKey;
NSString *doImportString;
NSString *doNotImportString;
NSString *isEqualString;
@@ -135,6 +135,7 @@
NSUInteger windowMinHeigth;
NSInteger numberOfImportColumns;
NSInteger fieldMappingCurrentRow;
+ NSInteger firstDefaultItemOffset;
BOOL fieldMappingImportArrayIsPreview;
BOOL importFieldNamesHeader;