- Fix positioning bug when using Import From Clipboard

 - Add controllable encoding support when importing CSV and SQL files, including a new default "Autodetect" option.  Add UniversalDetector framework to support encoding autodetection.  This should address Issue #720.

8 files changed, 52 insertions, 0 deletions

diff --git a/Frameworks/UniversalDetector.framework/Headers b/Frameworks/UniversalDetector.framework/Headers
new file mode 120000
index 00000000..a177d2a6
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Headers
@@ -0,0 +1 @@
+Versions/Current/Headers
\ No newline at end of file
diff --git a/Frameworks/UniversalDetector.framework/Resources b/Frameworks/UniversalDetector.framework/Resources
new file mode 120000
index 00000000..953ee36f
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
\ No newline at end of file
diff --git a/Frameworks/UniversalDetector.framework/UniversalDetector b/Frameworks/UniversalDetector.framework/UniversalDetector
new file mode 120000
index 00000000..8a32fbcc
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/UniversalDetector
@@ -0,0 +1 @@
+Versions/Current/UniversalDetector
\ No newline at end of file
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h b/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h
new file mode 100755
index 00000000..5d8d023b
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h
@@ -0,0 +1,26 @@
+#import <Foundation/Foundation.h>
+
+@interface UniversalDetector:NSObject
+{
+	void *detectorPtr;
+	NSString *charsetName;
+	float confidence;
+}
+
+-(id)init;
+-(void)dealloc;
+
+-(void)analyzeData:(NSData *)data;
+-(void)analyzeBytes:(const char *)data length:(int)len;
+-(void)reset;
+
+-(BOOL)done;
+-(NSString *)MIMECharset;
+-(NSStringEncoding)encoding;
+-(float)confidence;
+
+//-(void)debugDump;
+
++(UniversalDetector *)detector;
+
+@end
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
new file mode 100644
index 00000000..7080cf94
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist b/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist
new file mode 100644
index 00000000..2e89cad2
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>UniversalDetector</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.mozilla.universalchardet</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>UniversalDetector</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector b/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector
new file mode 100755
index 00000000..7a63ef2a
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector
diff --git a/Frameworks/UniversalDetector.framework/Versions/Current b/Frameworks/UniversalDetector.framework/Versions/Current
new file mode 120000
index 00000000..8c7e5a66
--- /dev/null
+++ b/Frameworks/UniversalDetector.framework/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file