Rename utf8 and utf8mb4

* To reduce confusion (and create some, for those people not yet aware of the difference) I have renamed the utf8s to "UTF-8 Unicode BMP" resp. "UTF-8 Full Unicode" according to their supported character range.
* Also *both* utf8 variants will now be at the top of the list when creating new tables/databases

Author: dmoagx

Interfaces/English.lproj/MainMenu.xib

@@ -1412,7 +1412,7 @@
 											</object>
 											<object class="NSMenuItem" id="85590918">
 												<reference key="NSMenu" ref="315159986"/>
-												<string key="NSTitle">UTF-8 Unicode (utf8)</string>
+												<string key="NSTitle">UTF-8 Unicode BMP (utf8)</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>
@@ -1422,7 +1422,7 @@
 											</object>
 											<object class="NSMenuItem" id="383065474">
 												<reference key="NSMenu" ref="315159986"/>
-												<string key="NSTitle">4-Byte UTF-8 Unicode (utf8mb4)</string>
+												<string key="NSTitle">UTF-8 Full Unicode (utf8mb4)</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>

Interfaces/English.lproj/Preferences.xib

@@ -640,7 +640,7 @@
 									</object>
 									<object class="NSMenuItem" id="658105746">
 										<reference key="NSMenu" ref="1035849972"/>
-										<string key="NSTitle">UTF-8 Unicode (utf8)</string>
+										<string key="NSTitle">UTF-8 Unicode BMP (utf8)</string>
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
@@ -652,7 +652,7 @@
 									</object>
 									<object class="NSMenuItem" id="89605484">
 										<reference key="NSMenu" ref="1035849972"/>
-										<string key="NSTitle">4-Byte UTF-8 Unicode (utf8mb4)</string>
+										<string key="NSTitle">UTF-8 Full Unicode (utf8mb4)</string>
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>

Source/SPCharsetCollationHelper.m

@@ -133,6 +133,8 @@ - (void)refreshCharsets {
 
 	if (([encodings count] > 0) && [serverSupport supportsPost41CharacterSetHandling]) {
 
+		NSUInteger utf8encounters = 0;
+		
 		for (NSDictionary *encoding in encodings) 
 		{
 			NSString *charsetId     = [encoding objectForKey:@"CHARACTER_SET_NAME"];
@@ -146,19 +148,20 @@ - (void)refreshCharsets {
 			if(selectedCharset && [charsetId isEqualToString:selectedCharset])
 				selectedRef = menuItem;
 
-			// If the UTF8 entry has been encountered, promote it to the top of the list
-			if (promoteUTF8 && [charsetId isEqualToString:@"utf8"]) {
-				[[charsetButton menu] insertItem:[menuItem autorelease] atIndex:0];
-				//only add a separator if there actually are more items other than utf8 (might not be true for mysql forks)
-				if([encodings count] > 1)
-					[[charsetButton menu] insertItem:[NSMenuItem separatorItem] atIndex:1];
+			// If an UTF8 entry has been encountered, promote it to the top of the list
+			if (promoteUTF8 && [charsetId hasPrefix:@"utf8"]) {
+				[[charsetButton menu] insertItem:[menuItem autorelease] atIndex:(utf8encounters++)];
 			}
 			else {
 				[[charsetButton menu] addItem:[menuItem autorelease]];
 			}
 
 		}
 
+		//only add a separator if there actually are more items other than utf8 (might not be true for mysql forks)
+		if(utf8encounters && [encodings count] > utf8encounters)
+			[[charsetButton menu] insertItem:[NSMenuItem separatorItem] atIndex:utf8encounters];
+		
 		[charsetButton setEnabled:YES];
 	}