From 2510f9b62f30cb3ea61c3ce7d0d12fef72af8f7e Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 29 Nov 2010 00:42:32 +0000 Subject: - 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 --- Source/SPDataImport.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Source/SPDataImport.h') 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; -- cgit v1.2.3