aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPDataImport.h
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-11-29 00:42:32 +0000
committerrowanbeentje <rowan@beent.je>2010-11-29 00:42:32 +0000
commit2510f9b62f30cb3ea61c3ce7d0d12fef72af8f7e (patch)
tree515d5236117f77ee17255cbaf14d3813a37f17e9 /Source/SPDataImport.h
parent10117475bae9659b41d41c8d408bee3a3c0d6cf2 (diff)
downloadsequelpro-2510f9b62f30cb3ea61c3ce7d0d12fef72af8f7e.tar.gz
sequelpro-2510f9b62f30cb3ea61c3ce7d0d12fef72af8f7e.tar.bz2
sequelpro-2510f9b62f30cb3ea61c3ce7d0d12fef72af8f7e.zip
- Change the CSV import accessory view to a general import accessory view, based on a tab view
- When importing SQL, use the accessory view to ask how to handle errors: Ask (the new default), which prompts the user on each error whether to continue, stop, or ignore all errors; and ignoring all errors, which matches the old behaviour. This addresses Issue #901. - When showing the reconnection dialog ensure the window isn't minimised - Update localisable strings
Diffstat (limited to 'Source/SPDataImport.h')
-rw-r--r--Source/SPDataImport.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/SPDataImport.h b/Source/SPDataImport.h
index 8ea49fa1..a8888ab8 100644
--- a/Source/SPDataImport.h
+++ b/Source/SPDataImport.h
@@ -36,8 +36,8 @@
IBOutlet id tableDataInstance;
IBOutlet id customQueryInstance;
- IBOutlet id importCSVView;
- IBOutlet id importCSVBox;
+ IBOutlet id importView;
+ IBOutlet id importTabView;
IBOutlet id importFieldNamesSwitch;
IBOutlet id importFieldsTerminatedField;
IBOutlet id importFieldsEnclosedField;
@@ -47,6 +47,8 @@
IBOutlet NSPopUpButton *importFormatPopup;
IBOutlet NSPopUpButton *importEncodingPopup;
+
+ IBOutlet NSPopUpButton *importSQLErrorHandlingPopup;
IBOutlet id importFromClipboardSheet;
IBOutlet id importFromClipboardAccessoryView;