adium 4423:f48c6c37a013: More terms with which to search. We nee...

commits at adium.im commits at adium.im
Thu Dec 22 06:42:47 UTC 2011


details:	http://hg.adium.im/adium/rev/f48c6c37a013
revision:	4423:f48c6c37a013
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Dec 20 18:35:52 2011 -0500

More terms with which to search. We need to have a way to invalidate the cache when there are updates.
Subject: adium 4424:02b016e3ee40: Add missing colons to OTR's pref's labels.

details:	http://hg.adium.im/adium/rev/02b016e3ee40
revision:	4424:02b016e3ee40
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Dec 20 18:40:18 2011 -0500

Add missing colons to OTR's pref's labels.
Subject: adium 4425:3031db5ab78e: Cleanup the alignments and some organisation of every preference pane and create two separate images for Window Handling and Message Styles

details:	http://hg.adium.im/adium/rev/3031db5ab78e
revision:	4425:3031db5ab78e
branch:		PreferencesRedux
author:		Paul Wilde me at paulwilde.co.uk
date:		Wed Dec 21 18:57:04 2011 +0000

Cleanup the alignments and some organisation of every preference pane and create two separate images for Window Handling and Message Styles
Subject: adium 4426:a37c78640540: Fix the message style's controls dimming for group chats.

details:	http://hg.adium.im/adium/rev/a37c78640540
revision:	4426:a37c78640540
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Thu Dec 22 01:21:16 2011 -0500

Fix the message style's controls dimming for group chats.
Subject: adium 4427:62b43d586eb6: Reorganize message alerts pane, add a new group and spacing to better separate the mass of settings.

details:	http://hg.adium.im/adium/rev/62b43d586eb6
revision:	4427:62b43d586eb6
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Thu Dec 22 01:34:24 2011 -0500

Reorganize message alerts pane, add a new group and spacing to better separate the mass of settings.
Subject: adium 4428:105985c23a24: Make the status pane's settings tab the first item since it is more interesting than saved statuses.

details:	http://hg.adium.im/adium/rev/105985c23a24
revision:	4428:105985c23a24
branch:		PreferencesRedux
author:		Frank Dowsett <wixardy at adium.im>
date:		Thu Dec 22 01:39:49 2011 -0500

Make the status pane's settings tab the first item since it is more interesting than saved statuses.

diffs (truncated from 8917 to 1000 lines):

diff -r a633c04f60bc -r 105985c23a24 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Dec 20 14:04:59 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj	Thu Dec 22 01:39:49 2011 -0500
@@ -1089,6 +1089,10 @@
 		5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
 		5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
 		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */; };
+		5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
+		5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
+		5A27FA7F14A272330063489D /* pref-personal.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7B14A272330063489D /* pref-personal.png */; };
+		5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7C14A272330063489D /* pref-windowhandling.png */; };
 		5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
 		5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
 		5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
@@ -3900,6 +3904,10 @@
 		5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
 		5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
 		5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/en.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
+		5A27FA7914A272330063489D /* pref-messagehistory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagehistory.png"; path = "Resources/pref-messagehistory.png"; sourceTree = "<group>"; };
+		5A27FA7A14A272330063489D /* pref-messagestyle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagestyle.png"; path = "Resources/pref-messagestyle.png"; sourceTree = "<group>"; };
+		5A27FA7B14A272330063489D /* pref-personal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-personal.png"; path = "Resources/pref-personal.png"; sourceTree = "<group>"; };
+		5A27FA7C14A272330063489D /* pref-windowhandling.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-windowhandling.png"; path = "Resources/pref-windowhandling.png"; sourceTree = "<group>"; };
 		5A4BD41C13F855B000A4D3F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = Resources/en.lproj/SearchTerms.plist; sourceTree = "<group>"; };
 		5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-ContactList.xib"; path = "Resources/Preferences-ContactList.xib"; sourceTree = "<group>"; };
 		5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-WindowHandling.xib"; path = "Resources/Preferences-WindowHandling.xib"; sourceTree = "<group>"; };
@@ -8126,6 +8134,10 @@
 		9C82689903D9B23F00F1D4AF /* Icons */ = {
 			isa = PBXGroup;
 			children = (
+				5A27FA7914A272330063489D /* pref-messagehistory.png */,
+				5A27FA7A14A272330063489D /* pref-messagestyle.png */,
+				5A27FA7B14A272330063489D /* pref-personal.png */,
+				5A27FA7C14A272330063489D /* pref-windowhandling.png */,
 				D10A3A2A122C61EF003B5A7E /* source-destination.png */,
 				4BF3CBEC07D192F500A8112A /* pref-accounts.png */,
 				34D8336E07CBD807006466F2 /* pref-advanced.png */,
@@ -9664,6 +9676,10 @@
 				5A4BD56A13F86B7E00A4D3F7 /* Preferences-Appearance.xib in Resources */,
 				5A4BD57F13F86BC500A4D3F7 /* Preferences-General.xib in Resources */,
 				7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
+				5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */,
+				5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */,
+				5A27FA7F14A272330063489D /* pref-personal.png in Resources */,
+				5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -r a633c04f60bc -r 105985c23a24 Plugins/Dual Window Interface/AIWindowHandlingPreferences.m
--- a/Plugins/Dual Window Interface/AIWindowHandlingPreferences.m	Tue Dec 20 14:04:59 2011 -0500
+++ b/Plugins/Dual Window Interface/AIWindowHandlingPreferences.m	Thu Dec 22 01:39:49 2011 -0500
@@ -42,7 +42,7 @@
     return @"Preferences-WindowHandling";
 }
 - (NSImage *)paneIcon{
-	return [NSImage imageNamed:@"pref-messagealerts" forClass:[self class]];
+	return [NSImage imageNamed:@"pref-windowhandling" forClass:[self class]];
 }
 
 - (void)viewDidLoad
diff -r a633c04f60bc -r 105985c23a24 Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m
--- a/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Tue Dec 20 14:04:59 2011 -0500
+++ b/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Thu Dec 22 01:39:49 2011 -0500
@@ -87,7 +87,7 @@
 }
 - (NSImage *)paneIcon
 {
-	return [NSImage imageNamed:@"pref-messages"];
+	return [NSImage imageNamed:@"pref-messagestyle"];
 }
 
 /*!
@@ -385,6 +385,9 @@
 	[checkBox_showMessageColors setEnabled:anyControlsEnabled];
 	[button_setFont setEnabled:anyControlsEnabled];
 	[button_defaultFont setEnabled:anyControlsEnabled];
+	[checkBox_customNameFormatting setEnabled:anyControlsEnabled];
+	[popUp_timeStampFormat setEnabled:anyControlsEnabled];
+	[popUp_minimumFontSize setEnabled:anyControlsEnabled];
 	
 	//Only enable if there are multiple variant choices
 	[popUp_variants setEnabled:[popUp_variants numberOfItems] > 0 && anyControlsEnabled];
diff -r a633c04f60bc -r 105985c23a24 Plugins/WebKit Message View/en.lproj/WebKitPreferencesView.nib/designable.nib
--- a/Plugins/WebKit Message View/en.lproj/WebKitPreferencesView.nib/designable.nib	Tue Dec 20 14:04:59 2011 -0500
+++ b/Plugins/WebKit Message View/en.lproj/WebKitPreferencesView.nib/designable.nib	Thu Dec 22 01:39:49 2011 -0500
@@ -53,21 +53,56 @@
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSPopUpButton" id="291444428">
+					<object class="NSTextField" id="963021361">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{178, 112}, {135, 26}}</string>
+						<string key="NSFrame">{{33, 125}, {141, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="301425493"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="291444428"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="676997652">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">1024</int>
+						<object class="NSTextFieldCell" key="NSCell" id="113676481">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Timestamp Format:</string>
 							<object class="NSFont" key="NSSupport" id="1056328391">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
+							<reference key="NSControlView" ref="963021361"/>
+							<object class="NSColor" key="NSBackgroundColor" id="1045097648">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">controlColor</string>
+								<object class="NSColor" key="NSColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+								</object>
+							</object>
+							<object class="NSColor" key="NSTextColor" id="536414845">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">controlTextColor</string>
+								<object class="NSColor" key="NSColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MAA</bytes>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSPopUpButton" id="291444428">
+						<reference key="NSNextResponder" ref="906020110"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{177, 119}, {114, 26}}</string>
+						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1027382850"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="676997652">
+							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags2">1024</int>
+							<reference key="NSSupport" ref="1056328391"/>
 							<reference key="NSControlView" ref="291444428"/>
 							<int key="NSButtonFlags">109199615</int>
 							<int key="NSButtonFlags2">1</int>
@@ -89,11 +124,11 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSOnImage" id="814202389">
+								<object class="NSCustomResource" key="NSOnImage" id="112354272">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">NSMenuCheckmark</string>
 								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="33767493">
+								<object class="NSCustomResource" key="NSMixedImage" id="390426513">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">NSMenuMixedState</string>
 								</object>
@@ -110,18 +145,38 @@
 									<reference ref="833287476"/>
 								</object>
 							</object>
+							<int key="NSSelectedIndex">-1</int>
 							<int key="NSPreferredEdge">3</int>
 							<bool key="NSUsesItemFromMenu">YES</bool>
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">1</int>
 						</object>
 					</object>
+					<object class="NSTextField" id="1027382850">
+						<reference key="NSNextResponder" ref="906020110"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{271, 74.5}, {48, 17}}</string>
+						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="787707178"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="953945799">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Image:</string>
+							<reference key="NSSupport" ref="1056328391"/>
+							<reference key="NSControlView" ref="1027382850"/>
+							<reference key="NSBackgroundColor" ref="1045097648"/>
+							<reference key="NSTextColor" ref="536414845"/>
+						</object>
+					</object>
 					<object class="NSPopUpButton" id="1053306772">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{311, 199}, {70, 26}}</string>
+						<string key="NSFrame">{{177, 148}, {114, 26}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="222855123"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="963021361"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="377354331">
 							<int key="NSCellFlags">-2076049856</int>
@@ -144,8 +199,8 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="814202389"/>
-								<reference key="NSMixedImage" ref="33767493"/>
+								<reference key="NSOnImage" ref="112354272"/>
+								<reference key="NSMixedImage" ref="390426513"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="377354331"/>
 							</object>
@@ -169,49 +224,17 @@
 					<object class="NSTextField" id="631152297">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{178, 206}, {131, 17}}</string>
+						<string key="NSFrame">{{45, 154}, {129, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1053306772"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="575207461">
 							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">4194304</int>
+							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Minimum font size:</string>
 							<reference key="NSSupport" ref="1056328391"/>
 							<reference key="NSControlView" ref="631152297"/>
-							<object class="NSColor" key="NSBackgroundColor" id="1045097648">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="536414845">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="963021361">
-						<reference key="NSNextResponder" ref="906020110"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{32, 119}, {141, 17}}</string>
-						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="291444428"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="113676481">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Time stamp format:</string>
-							<reference key="NSSupport" ref="1056328391"/>
-							<reference key="NSControlView" ref="963021361"/>
 							<reference key="NSBackgroundColor" ref="1045097648"/>
 							<reference key="NSTextColor" ref="536414845"/>
 						</object>
@@ -219,8 +242,9 @@
 					<object class="NSPopUpButton" id="1009852459">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{366, 246}, {158, 26}}</string>
+						<string key="NSFrame">{{365, 248}, {149, 26}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="87612594"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="344766671">
@@ -244,8 +268,8 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="814202389"/>
-								<reference key="NSMixedImage" ref="33767493"/>
+								<reference key="NSOnImage" ref="112354272"/>
+								<reference key="NSMixedImage" ref="390426513"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<int key="NSTag">4</int>
 								<reference key="NSTarget" ref="344766671"/>
@@ -263,8 +287,8 @@
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="814202389"/>
-										<reference key="NSMixedImage" ref="33767493"/>
+										<reference key="NSOnImage" ref="112354272"/>
+										<reference key="NSMixedImage" ref="390426513"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<int key="NSTag">1</int>
 										<reference key="NSTarget" ref="344766671"/>
@@ -275,8 +299,8 @@
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="814202389"/>
-										<reference key="NSMixedImage" ref="33767493"/>
+										<reference key="NSOnImage" ref="112354272"/>
+										<reference key="NSMixedImage" ref="390426513"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<int key="NSTag">2</int>
 										<reference key="NSTarget" ref="344766671"/>
@@ -287,8 +311,8 @@
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="814202389"/>
-										<reference key="NSMixedImage" ref="33767493"/>
+										<reference key="NSOnImage" ref="112354272"/>
+										<reference key="NSMixedImage" ref="390426513"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<int key="NSTag">3</int>
 										<reference key="NSTarget" ref="344766671"/>
@@ -306,8 +330,9 @@
 					<object class="NSButton" id="807416410">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{178, 252}, {185, 16}}</string>
+						<string key="NSFrame">{{177, 254}, {185, 16}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1009852459"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="216750643">
@@ -334,9 +359,10 @@
 					<object class="NSPopUpButton" id="644092665">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{177, 348}, {245, 26}}</string>
+						<string key="NSFrame">{{177, 347}, {245, 26}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="619985463"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="814256464"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="814898388">
 							<int key="NSCellFlags">-2080244160</int>
@@ -359,8 +385,8 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="814202389"/>
-								<reference key="NSMixedImage" ref="33767493"/>
+								<reference key="NSOnImage" ref="112354272"/>
+								<reference key="NSMixedImage" ref="390426513"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="814898388"/>
 							</object>
@@ -381,8 +407,9 @@
 					<object class="NSTextField" id="301425493">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{43, 94}, {130, 17}}</string>
+						<string key="NSFrame">{{44, 99.5}, {130, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="874685300"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="993851649">
@@ -398,8 +425,9 @@
 					<object class="NSButton" id="222855123">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{364, 221}, {88, 28}}</string>
+						<string key="NSFrame">{{362, 219}, {88, 28}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="738814341"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="935207470">
@@ -430,9 +458,10 @@
 					<object class="NSTextField" id="5205339">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{178, 228}, {177, 17}}</string>
+						<string key="NSFrame">{{177, 227}, {177, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="631152297"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="222855123"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="923083718">
 							<int key="NSCellFlags">67239424</int>
@@ -456,6 +485,7 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{0, 433}, {600, 150}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1040236836"/>
 						<object class="NSMutableString" key="NSClassName">
 							<characters key="NS.bytes">NSView</characters>
@@ -465,8 +495,9 @@
 					<object class="NSPopUpButton" id="968651606">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{319, 62}, {159, 26}}</string>
+						<string key="NSFrame">{{322, 68.5}, {159, 26}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="857269868"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="996576271">
@@ -490,8 +521,8 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="814202389"/>
-								<reference key="NSMixedImage" ref="33767493"/>
+								<reference key="NSOnImage" ref="112354272"/>
+								<reference key="NSMixedImage" ref="390426513"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="996576271"/>
 							</object>
@@ -514,9 +545,10 @@
 					<object class="NSPopUpButton" id="428759988">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{177, 320}, {245, 26}}</string>
+						<string key="NSFrame">{{177, 318}, {245, 26}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="437785535"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="619985463"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="178573603">
 							<int key="NSCellFlags">-2080244160</int>
@@ -539,8 +571,8 @@
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="814202389"/>
-								<reference key="NSMixedImage" ref="33767493"/>
+								<reference key="NSOnImage" ref="112354272"/>
+								<reference key="NSMixedImage" ref="390426513"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="178573603"/>
 							</object>
@@ -561,8 +593,9 @@
 					<object class="NSButton" id="795561161">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{179, 182}, {208, 18}}</string>
+						<string key="NSFrame">{{177, 201}, {208, 18}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="975194271"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="984848760">
@@ -584,9 +617,10 @@
 					<object class="NSButton" id="975194271">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{179, 160}, {214, 18}}</string>
+						<string key="NSFrame">{{177, 179}, {214, 18}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="731704259"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="301425493"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="995001305">
 							<int key="NSCellFlags">67239424</int>
@@ -607,8 +641,9 @@
 					<object class="NSButton" id="437785535">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{178, 298}, {124, 18}}</string>
+						<string key="NSFrame">{{177, 297}, {124, 18}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="937091963"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="287125431">
@@ -630,8 +665,9 @@
 					<object class="NSButton" id="937091963">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{178, 276}, {103, 18}}</string>
+						<string key="NSFrame">{{177, 275}, {103, 18}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="807416410"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="848198898">
@@ -653,8 +689,9 @@
 					<object class="NSTextField" id="814256464">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{43, 327}, {129, 17}}</string>
+						<string key="NSFrame">{{45, 324}, {129, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="428759988"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="735513946">
@@ -670,8 +707,9 @@
 					<object class="NSTextField" id="787707178">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{43, 354}, {129, 17}}</string>
+						<string key="NSFrame">{{45, 353}, {129, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="644092665"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="258481254">
@@ -687,8 +725,9 @@
 					<object class="NSTextField" id="87612594">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{42, 228}, {130, 17}}</string>
+						<string key="NSFrame">{{44, 227}, {130, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="5205339"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="562162253">
@@ -704,8 +743,9 @@
 					<object class="NSButton" id="874685300">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{179, 92}, {175, 18}}</string>
+						<string key="NSFrame">{{177, 98.5}, {175, 18}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="141566371"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="823125540">
@@ -739,9 +779,10 @@
 								<string>NeXT TIFF v4.0 pasteboard type</string>
 							</object>
 						</object>
-						<string key="NSFrame">{{197, 35}, {70, 54}}</string>
+						<string key="NSFrame">{{196, 40.5}, {70, 54}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="1027382850"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="968651606"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="59422731">
 							<int key="NSCellFlags">270663168</int>
@@ -756,9 +797,10 @@
 					<object class="NSTextField" id="619985463">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{426, 367}, {129, 42}}</string>
+						<string key="NSFrame">{{432, 319}, {129, 48}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="814256464"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="437785535"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="108403894">
 							<int key="NSCellFlags">67239424</int>
@@ -773,26 +815,6 @@
 							</object>
 						</object>
 					</object>
-					<object class="NSTextField" id="731704259">
-						<reference key="NSNextResponder" ref="906020110"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{197, 144}, {319, 14}}</string>
-						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="963021361"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="481087974">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">4194304</int>
-							<string key="NSContents">Message background colors are not supported by all styles</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="731704259"/>
-							<reference key="NSBackgroundColor" ref="1045097648"/>
-							<object class="NSColor" key="NSTextColor">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MC4yNTQwMzIyNQA</bytes>
-							</object>
-						</object>
-					</object>
 					<object class="NSColorWell" id="653855684">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
@@ -805,9 +827,9 @@
 								</object>
 							</object>
 						</object>
-						<string key="NSFrame">{{322, 37}, {36, 22}}</string>
+						<string key="NSFrame">{{324, 42.5}, {36, 22}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<bool key="NSIsBordered">YES</bool>
 						<object class="NSColor" key="NSColor">
@@ -818,8 +840,9 @@
 					<object class="NSTextField" id="857269868">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{269, 40}, {48, 17}}</string>
+						<string key="NSFrame">{{271, 45.5}, {48, 17}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="653855684"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="916691600">
@@ -835,8 +858,9 @@
 					<object class="NSButton" id="738814341">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{450, 221}, {88, 28}}</string>
+						<string key="NSFrame">{{448, 219}, {88, 28}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="795561161"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="847217235">
@@ -856,29 +880,12 @@
 							<int key="NSPeriodicInterval">25</int>
 						</object>
 					</object>
-					<object class="NSTextField" id="1027382850">
-						<reference key="NSNextResponder" ref="906020110"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{269, 68}, {48, 17}}</string>
-						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="968651606"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="953945799">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Image:</string>
-							<reference key="NSSupport" ref="1056328391"/>
-							<reference key="NSControlView" ref="1027382850"/>
-							<reference key="NSBackgroundColor" ref="1045097648"/>
-							<reference key="NSTextColor" ref="536414845"/>
-						</object>
-					</object>
 					<object class="NSTabView" id="1040236836">
 						<reference key="NSNextResponder" ref="906020110"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{27, 10}, {546, 421}}</string>
+						<string key="NSFrame">{{13, 10}, {574, 418}}</string>
 						<reference key="NSSuperview" ref="906020110"/>
-						<reference key="NSNextKeyView" ref="870332625"/>
+						<reference key="NSWindow"/>
 						<object class="NSMutableArray" key="NSTabViewItems">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="NSTabViewItem" id="843060667">
@@ -886,8 +893,10 @@
 								<object class="NSView" key="NSView" id="870332625">
 									<reference key="NSNextResponder" ref="1040236836"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{10, 33}, {526, 375}}</string>
+									<string key="NSFrame">{{10, 33}, {554, 372}}</string>
 									<reference key="NSSuperview" ref="1040236836"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="631152297"/>
 								</object>
 								<string key="NSLabel">Regular Chats</string>
 								<reference key="NSColor" ref="1045097648"/>
@@ -903,8 +912,9 @@
 										<object class="NSButton" id="1032587190">
 											<reference key="NSNextResponder" ref="695714946"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{142, 356}, {213, 18}}</string>
+											<string key="NSFrame">{{154, 353}, {213, 18}}</string>
 											<reference key="NSSuperview" ref="695714946"/>
+											<reference key="NSNextKeyView" ref="787707178"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="813710248">
 												<int key="NSCellFlags">-2080244224</int>
@@ -923,7 +933,8 @@
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 33}, {526, 375}}</string>
+									<string key="NSFrame">{{10, 33}, {554, 372}}</string>
+									<reference key="NSNextKeyView" ref="1032587190"/>
 								</object>
 								<string key="NSLabel">Group Chats</string>
 								<reference key="NSColor" ref="1045097648"/>
@@ -941,8 +952,9 @@
 						</object>
 					</object>
 				</object>
-				<string key="NSFrameSize">{600, 583}</string>
+				<string key="NSFrameSize">{600, 582.5}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="659843652"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
@@ -1193,14 +1205,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">popUp_minimumFontSize</string>
-						<reference key="source" ref="731023236"/>
-						<reference key="destination" ref="1053306772"/>
-					</object>
-					<int key="connectionID">415</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">popUp_nameFormat</string>
 						<reference key="source" ref="731023236"/>
 						<reference key="destination" ref="1009852459"/>
@@ -1216,6 +1220,38 @@
 					<int key="connectionID">417</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changePreference:</string>
+						<reference key="source" ref="731023236"/>
+						<reference key="destination" ref="807416410"/>
+					</object>
+					<int key="connectionID">421</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changePreference:</string>
+						<reference key="source" ref="731023236"/>
+						<reference key="destination" ref="1009852459"/>
+					</object>
+					<int key="connectionID">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changePreference:</string>
+						<reference key="source" ref="731023236"/>
+						<reference key="destination" ref="1053306772"/>
+					</object>
+					<int key="connectionID">420</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">popUp_minimumFontSize</string>
+						<reference key="source" ref="731023236"/>
+						<reference key="destination" ref="1053306772"/>
+					</object>
+					<int key="connectionID">415</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">popUp_timeStampFormat</string>
 						<reference key="source" ref="731023236"/>
@@ -1233,30 +1269,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">changePreference:</string>
-						<reference key="source" ref="731023236"/>
-						<reference key="destination" ref="1053306772"/>
-					</object>
-					<int key="connectionID">420</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">changePreference:</string>
-						<reference key="source" ref="731023236"/>
-						<reference key="destination" ref="807416410"/>
-					</object>
-					<int key="connectionID">421</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">changePreference:</string>
-						<reference key="source" ref="731023236"/>
-						<reference key="destination" ref="1009852459"/>
-					</object>
-					<int key="connectionID">422</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">chooseFontWithFontPanel:</string>
 						<reference key="source" ref="5205339"/>
 						<reference key="destination" ref="222855123"/>
@@ -1337,21 +1349,14 @@
 							<reference ref="814256464"/>
 							<reference ref="787707178"/>
 							<reference ref="619985463"/>
-							<reference ref="1040236836"/>
 							<reference ref="807416410"/>
 							<reference ref="1009852459"/>
 							<reference ref="5205339"/>
 							<reference ref="87612594"/>
 							<reference ref="222855123"/>
 							<reference ref="738814341"/>
-							<reference ref="631152297"/>
-							<reference ref="1053306772"/>
-							<reference ref="731704259"/>
 							<reference ref="975194271"/>
 							<reference ref="795561161"/>
-							<reference ref="963021361"/>
-							<reference ref="291444428"/>
-							<reference ref="1027382850"/>
 							<reference ref="857269868"/>
 							<reference ref="653855684"/>
 							<reference ref="141566371"/>
@@ -1359,6 +1364,12 @@
 							<reference ref="968651606"/>
 							<reference ref="301425493"/>
 							<reference ref="659843652"/>
+							<reference ref="631152297"/>
+							<reference ref="1053306772"/>
+							<reference ref="291444428"/>
+							<reference ref="963021361"/>
+							<reference ref="1040236836"/>
+							<reference ref="1027382850"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">View</string>
@@ -1513,15 +1524,6 @@
 						<reference key="parent" ref="906020110"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">228</int>
-						<reference key="object" ref="731704259"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="481087974"/>
-						</object>
-						<reference key="parent" ref="906020110"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">237</int>
 						<reference key="object" ref="653855684"/>
 						<reference key="parent" ref="906020110"/>
@@ -1545,15 +1547,6 @@
 						<reference key="parent" ref="906020110"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">245</int>
-						<reference key="object" ref="1027382850"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="953945799"/>
-						</object>
-						<reference key="parent" ref="906020110"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">301</int>
 						<reference key="object" ref="1040236836"/>
 						<object class="NSMutableArray" key="children">
@@ -1700,11 +1693,6 @@
 						<reference key="parent" ref="619985463"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="481087974"/>
-						<reference key="parent" ref="731704259"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">390</int>
 						<reference key="object" ref="916691600"/>
 						<reference key="parent" ref="857269868"/>
@@ -1715,11 +1703,6 @@
 						<reference key="parent" ref="738814341"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">392</int>
-						<reference key="object" ref="953945799"/>
-						<reference key="parent" ref="1027382850"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">393</int>
 						<reference key="object" ref="813710248"/>
 						<reference key="parent" ref="1032587190"/>
@@ -1785,66 +1768,6 @@
 						<reference key="parent" ref="906020110"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="963021361"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="113676481"/>
-						</object>
-						<reference key="parent" ref="906020110"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">397</int>
-						<reference key="object" ref="631152297"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="575207461"/>
-						</object>
-						<reference key="parent" ref="906020110"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">399</int>
-						<reference key="object" ref="291444428"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="676997652"/>
-						</object>
-						<reference key="parent" ref="906020110"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">400</int>
-						<reference key="object" ref="676997652"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="873563760"/>
-						</object>
-						<reference key="parent" ref="291444428"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">401</int>
-						<reference key="object" ref="873563760"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="833287476"/>
-						</object>
-						<reference key="parent" ref="676997652"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="833287476"/>
-						<reference key="parent" ref="873563760"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">406</int>
-						<reference key="object" ref="575207461"/>
-						<reference key="parent" ref="631152297"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">407</int>
-						<reference key="object" ref="113676481"/>
-						<reference key="parent" ref="963021361"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">408</int>
 						<reference key="object" ref="344766671"/>
 						<object class="NSMutableArray" key="children">
@@ -1891,6 +1814,20 @@
 						<reference key="parent" ref="807416410"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">397</int>
+						<reference key="object" ref="631152297"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="575207461"/>
+						</object>
+						<reference key="parent" ref="906020110"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">406</int>
+						<reference key="object" ref="575207461"/>
+						<reference key="parent" ref="631152297"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">398</int>
 						<reference key="object" ref="1053306772"/>
 						<object class="NSMutableArray" key="children">
@@ -1922,6 +1859,66 @@
 						<reference key="object" ref="412350785"/>
 						<reference key="parent" ref="969715699"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">399</int>
+						<reference key="object" ref="291444428"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="676997652"/>
+						</object>
+						<reference key="parent" ref="906020110"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="676997652"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="873563760"/>
+						</object>
+						<reference key="parent" ref="291444428"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">401</int>
+						<reference key="object" ref="873563760"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="833287476"/>
+						</object>
+						<reference key="parent" ref="676997652"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="833287476"/>
+						<reference key="parent" ref="873563760"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>




More information about the commits mailing list