Part 1 of new import system.

1 files changed, 46 insertions, 36 deletions

diff --git a/TableDump.h b/TableDump.h
index b45dc5a8..25c574c8 100644
--- a/TableDump.h
+++ b/TableDump.h
@@ -36,43 +36,51 @@
 	IBOutlet id tableContentInstance;
 	IBOutlet id customQueryInstance;
 
-	IBOutlet id tableWindow;
-	IBOutlet id exportDumpView;
-	IBOutlet id exportCSVView;
-	IBOutlet id exportMultipleCSVView;
-	IBOutlet id exportMultipleXMLView;
-	IBOutlet id exportDumpTableView;
-	IBOutlet id exportMultipleCSVTableView;
-	IBOutlet id exportMultipleXMLTableView;
-	IBOutlet id exportFieldNamesSwitch;
-	IBOutlet id exportFieldsTerminatedField;
-	IBOutlet id exportFieldsEnclosedField;
-	IBOutlet id exportFieldsEscapedField;
-	IBOutlet id exportLinesTerminatedField;
-	IBOutlet id exportMultipleFieldNamesSwitch;
-	IBOutlet id exportMultipleFieldsTerminatedField;
-	IBOutlet id exportMultipleFieldsEnclosedField;
-	IBOutlet id exportMultipleFieldsEscapedField;
-	IBOutlet id exportMultipleLinesTerminatedField;
+    IBOutlet id tableWindow;
+    IBOutlet id exportDumpView;
+    IBOutlet id exportCSVView;
+    IBOutlet id exportMultipleCSVView;
+    IBOutlet id exportMultipleXMLView;
+    IBOutlet id exportDumpTableView;
+    IBOutlet id exportMultipleCSVTableView;
+    IBOutlet id exportMultipleXMLTableView;
+    IBOutlet id exportFieldNamesSwitch;
+    IBOutlet id exportFieldsTerminatedField;
+    IBOutlet id exportFieldsEnclosedField;
+    IBOutlet id exportFieldsEscapedField;
+    IBOutlet id exportLinesTerminatedField;
+    IBOutlet id exportMultipleFieldNamesSwitch;
+    IBOutlet id exportMultipleFieldsTerminatedField;
+    IBOutlet id exportMultipleFieldsEnclosedField;
+    IBOutlet id exportMultipleFieldsEscapedField;
+    IBOutlet id exportMultipleLinesTerminatedField;
+	
 	IBOutlet id importCSVView;
-	IBOutlet id importFieldNamesSwitch;
-	IBOutlet id importFieldsTerminatedField;
-	IBOutlet id importFieldsEnclosedField;
-	IBOutlet id importFieldsEscapedField;
-	IBOutlet id importLinesTerminatedField;
-	IBOutlet id addDropTableSwitch;
-	IBOutlet id addCreateTableSwitch;
-	IBOutlet id addTableContentSwitch;
-	IBOutlet id addErrorsSwitch;
-	IBOutlet id errorsSheet;
-	IBOutlet id errorsView;
-	IBOutlet id singleProgressSheet;
-	IBOutlet id singleProgressBar;
-	IBOutlet id singleProgressText;
-	IBOutlet id fieldMappingSheet;
+	IBOutlet id importFormatPopup;
+	IBOutlet id importCSVBox;
+    IBOutlet id importFieldNamesSwitch;
+    IBOutlet id importFieldsTerminatedField;
+    IBOutlet id importFieldsEnclosedField;
+    IBOutlet id importFieldsEscapedField;
+    IBOutlet id importLinesTerminatedField;
+	
+    IBOutlet id addDropTableSwitch;
+    IBOutlet id addCreateTableSwitch;
+    IBOutlet id addTableContentSwitch;
+    IBOutlet id addErrorsSwitch;
+    IBOutlet id errorsSheet;
+    IBOutlet id errorsView;
+    IBOutlet id singleProgressSheet;
+    IBOutlet id singleProgressBar;
+    IBOutlet id singleProgressText;
+	
+    IBOutlet id fieldMappingSheet;
+	IBOutlet id fieldMappingPopup;
+    IBOutlet id fieldMappingTableView;
+    
 	IBOutlet id rowUpButton;
-	IBOutlet id rowDownButton;
-	IBOutlet id fieldMappingTableView;
+    IBOutlet id rowDownButton;
+	IBOutlet id recordCountLabel;
 
 	CMMCPConnection *mySQLConnection;
 
@@ -99,7 +107,9 @@
 
 //import methods
 //- (IBAction)openDump:(id)sender;
-- (void)importFile:(int)tag;
+- (void)importFile;
+- (IBAction)changeFormat:(id)sender;
+- (IBAction)changeTable:(id)sender;
 - (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(NSString *)contextInfo;
 - (void)setupFieldMappingArray;