move µTP pref to the Network tab
authorMitchell Livingston <livings124@transmissionbt.com>
Fri, 18 Feb 2011 03:50:19 +0000 (03:50 +0000)
committerMitchell Livingston <livings124@transmissionbt.com>
Fri, 18 Feb 2011 03:50:19 +0000 (03:50 +0000)
macosx/PrefsController.h
macosx/PrefsController.m
macosx/en.lproj/PrefsWindow.xib

index 9dd944ae772dc5be94cf9e08fd1dfe9731191f46..71858b864ae68799671ee6eeb94e8e2af8de3e2b 100644 (file)
 - (NSArray *) sounds;
 - (void) setSound: (id) sender;
 
+- (void) setUTP: (id) sender;
+
 - (void) setPeersGlobal: (id) sender;
 - (void) setPeersTorrent: (id) sender;
 
 - (void) setPEX: (id) sender;
 - (void) setDHT: (id) sender;
-- (void) setUTP: (id) sender;
 - (void) setLPD: (id) sender;
 
 - (void) setEncryptionMode: (id) sender;
index a0c91b6f37d28939a1b5fade097a1d51cf8cffe7..a94db8bfe6d4a8fb2afec3178db1fdefdfa1d404 100644 (file)
@@ -452,6 +452,11 @@ tr_session * fHandle;
         [sound play];
 }
 
+- (void) setUTP: (id) sender
+{
+    tr_sessionSetUTPEnabled(fHandle, [fDefaults boolForKey: @"UTPGlobal"]);
+}
+
 - (void) setPeersGlobal: (id) sender
 {
     const int count = [sender intValue];
@@ -476,11 +481,6 @@ tr_session * fHandle;
     tr_sessionSetDHTEnabled(fHandle, [fDefaults boolForKey: @"DHTGlobal"]);
 }
 
-- (void) setUTP: (id) sender
-{
-    tr_sessionSetUTPEnabled(fHandle, [fDefaults boolForKey: @"UTPGlobal"]);
-}
-
 - (void) setLPD: (id) sender
 {
     tr_sessionSetLPDEnabled(fHandle, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]);
@@ -1099,6 +1099,10 @@ tr_session * fHandle;
     const BOOL usePartialFileRanaming = tr_sessionIsIncompleteFileNamingEnabled(fHandle);
     [fDefaults setBool: usePartialFileRanaming forKey: @"RenamePartialFiles"];
     
+    //utp
+    const BOOL utp = tr_sessionIsUTPEnabled(fHandle);
+    [fDefaults setBool: utp forKey: @"UTPGlobal"];
+    
     //peers
     const uint16_t peersTotal = tr_sessionGetPeerLimit(fHandle);
     [fDefaults setInteger: peersTotal forKey: @"PeersTotal"];
@@ -1114,10 +1118,6 @@ tr_session * fHandle;
     const BOOL dht = tr_sessionIsDHTEnabled(fHandle);
     [fDefaults setBool: dht forKey: @"DHTGlobal"];
     
-    //utp
-    const BOOL utp = tr_sessionIsUTPEnabled(fHandle);
-    [fDefaults setBool: utp forKey: @"UTPGlobal"];
-    
     //lpd
     const BOOL lpd = tr_sessionIsLPDEnabled(fHandle);
     [fDefaults setBool: lpd forKey: @"LocalPeerDiscoveryGlobal"];
@@ -1214,6 +1214,8 @@ tr_session * fHandle;
         
         //download directory handled by bindings
         
+        //utp handled by bindings
+        
         [fPeersGlobalField setIntValue: peersTotal];
         [fPeersTorrentField setIntValue: peersTorrent];
         
@@ -1221,8 +1223,6 @@ tr_session * fHandle;
         
         //dht handled by bindings
         
-        //utp handled by bindings
-        
         //lpd handled by bindings
         
         [fPortField setIntValue: port];
index b3e7773d0346415099750c9df82dd111c828a3b2..4e5ee1cb83282db922985dc3d4c49c266660dc33 100644 (file)
@@ -12,7 +12,9 @@
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
+                       <integer value="1481"/>
                        <integer value="1361"/>
+                       <integer value="66"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2443,7 +2445,7 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                <string key="NSClassName">NSView</string>
                        </object>
                        <object class="NSCustomView" id="352903881">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2452,7 +2454,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{302, 185}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="671472167">
                                                        <int key="NSCellFlags">-1804468671</int>
@@ -2515,7 +2516,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{178, 160}, {100, 18}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="157187468">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2538,7 +2538,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{302, 159}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="213372896">
                                                        <int key="NSCellFlags">-1804468671</int>
@@ -2601,7 +2600,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{178, 186}, {118, 18}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="651662374">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2624,7 +2622,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{357, 186}, {34, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="598167921">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2641,7 +2638,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{357, 160}, {34, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="366797017">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2658,7 +2654,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{17, 187}, {158, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="916691300">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2675,7 +2670,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{302, 117}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="521814699">
                                                        <int key="NSCellFlags">-1804468671</int>
@@ -2738,7 +2732,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{302, 91}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="783238913">
                                                        <int key="NSCellFlags">-1804468671</int>
@@ -2801,7 +2794,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{357, 118}, {34, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="826580374">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2818,7 +2810,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{357, 92}, {34, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="389698940">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2835,7 +2826,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{53, 119}, {122, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="162938096">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2852,7 +2842,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{177, 93}, {82, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="646507129">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2869,7 +2858,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{177, 119}, {100, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="1023099604">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2886,7 +2874,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{177, 73}, {348, 14}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="229954658">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2915,7 +2902,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                </object>
                                                <string key="NSFrame">{{30, 117}, {18, 18}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSImageCell" key="NSCell" id="916608870">
                                                        <int key="NSCellFlags">130560</int>
@@ -2936,7 +2922,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{178, 49}, {160, 18}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="881251804">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2959,7 +2944,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{402, 23}, {17, 17}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="314009658">
                                                        <int key="NSCellFlags">67239424</int>
@@ -2976,7 +2960,6 @@ xCXGCsf5ye7L6s3lz+vR8dP51grYGdoV28bda98d4MvieuQi5cfnaOj76n3r9u1b7rPwAfE18l3zfPSC
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{314, 20}, {86, 27}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSDatePickerCell" key="NSCell" id="1041237499">
                                                        <int key="NSCellFlags">71433728</int>
@@ -3025,7 +3008,6 @@ AAABAAAAAQ</bytes>
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{424, 20}, {86, 27}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSDatePickerCell" key="NSCell" id="283024896">
                                                        <int key="NSCellFlags">71433728</int>
@@ -3048,7 +3030,6 @@ AAABAAAAAQ</bytes>
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{196, 17}, {113, 26}}</string>
                                                <reference key="NSSuperview" ref="352903881"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSPopUpButtonCell" key="NSCell" id="159778332">
                                                        <int key="NSCellFlags">-2076049856</int>
@@ -3211,8 +3192,6 @@ AAABAAAAAQ</bytes>
                                        </object>
                                </object>
                                <string key="NSFrameSize">{542, 227}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
@@ -3305,7 +3284,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="1068385234">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{45, 346}, {87, 17}}</string>
+                                               <string key="NSFrame">{{45, 326}, {87, 17}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="759095525">
@@ -3321,7 +3300,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="276894958">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{134, 346}, {196, 17}}</string>
+                                               <string key="NSFrame">{{134, 326}, {196, 17}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="195557530">
@@ -3337,7 +3316,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="391991918">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{335, 344}, {50, 22}}</string>
+                                               <string key="NSFrame">{{335, 324}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="425686317">
@@ -3401,7 +3380,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="171936512">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{390, 346}, {39, 17}}</string>
+                                               <string key="NSFrame">{{390, 326}, {39, 17}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="120526424">
@@ -3417,7 +3396,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="695790301">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{457, 324}, {39, 17}}</string>
+                                               <string key="NSFrame">{{457, 300}, {39, 17}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="454043587">
@@ -3433,7 +3412,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="439211863">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{402, 318}, {50, 22}}</string>
+                                               <string key="NSFrame">{{402, 298}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="963807331">
@@ -3513,7 +3492,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="210126275">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{134, 320}, {263, 17}}</string>
+                                               <string key="NSFrame">{{134, 300}, {263, 17}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="250566813">
@@ -3570,28 +3549,6 @@ AAABAAAAAQ</bytes>
                                                        <int key="NSPeriodicInterval">25</int>
                                                </object>
                                        </object>
-                                       <object class="NSButton" id="790229468">
-                                               <reference key="NSNextResponder" ref="538122014"/>
-                                               <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{135, 278}, {241, 18}}</string>
-                                               <reference key="NSSuperview" ref="538122014"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSButtonCell" key="NSCell" id="442474637">
-                                                       <int key="NSCellFlags">67239424</int>
-                                                       <int key="NSCellFlags2">0</int>
-                                                       <string key="NSContents">Use micro transport protocol (µTP)</string>
-                                                       <reference key="NSSupport" ref="86725571"/>
-                                                       <reference key="NSControlView" ref="790229468"/>
-                                                       <int key="NSButtonFlags">1211912703</int>
-                                                       <int key="NSButtonFlags2">2</int>
-                                                       <reference key="NSNormalImage" ref="1001726176"/>
-                                                       <reference key="NSAlternateImage" ref="764913887"/>
-                                                       <string key="NSAlternateContents"/>
-                                                       <string key="NSKeyEquivalent"/>
-                                                       <int key="NSPeriodicDelay">200</int>
-                                                       <int key="NSPeriodicInterval">25</int>
-                                               </object>
-                                       </object>
                                        <object class="NSButton" id="72739699">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
@@ -3617,7 +3574,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="593278680">
                                                <reference key="NSNextResponder" ref="538122014"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{134, 300}, {379, 14}}</string>
+                                               <string key="NSFrame">{{134, 280}, {379, 14}}</string>
                                                <reference key="NSSuperview" ref="538122014"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="32643885">
@@ -3769,16 +3726,38 @@ AAABAAAAAQ</bytes>
                                                </object>
                                        </object>
                                </object>
-                               <string key="NSFrameSize">{542, 386}</string>
+                               <string key="NSFrameSize">{542, 366}</string>
                                <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="204700639">
-                               <nil key="NSNextResponder"/>
+                               <reference key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <object class="NSButton" id="575079483">
+                                               <reference key="NSNextResponder" ref="204700639"/>
+                                               <int key="NSvFlags">256</int>
+                                               <string key="NSFrame">{{163, 182}, {261, 18}}</string>
+                                               <reference key="NSSuperview" ref="204700639"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSButtonCell" key="NSCell" id="661204911">
+                                                       <int key="NSCellFlags">67239424</int>
+                                                       <int key="NSCellFlags2">0</int>
+                                                       <string key="NSContents">Enable Micro Transport Protocol (µTP)</string>
+                                                       <reference key="NSSupport" ref="86725571"/>
+                                                       <reference key="NSControlView" ref="575079483"/>
+                                                       <int key="NSButtonFlags">1211912703</int>
+                                                       <int key="NSButtonFlags2">2</int>
+                                                       <reference key="NSNormalImage" ref="1001726176"/>
+                                                       <reference key="NSAlternateImage" ref="764913887"/>
+                                                       <string key="NSAlternateContents"/>
+                                                       <string key="NSKeyEquivalent"/>
+                                                       <int key="NSPeriodicDelay">200</int>
+                                                       <int key="NSPeriodicInterval">25</int>
+                                               </object>
+                                       </object>
                                        <object class="NSButton" id="683940794">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">289</int>
@@ -3805,7 +3784,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="631967205">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{45, 34}, {90, 17}}</string>
+                                               <string key="NSFrame">{{70, 40}, {90, 17}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="514153614">
@@ -3821,7 +3800,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="109684042">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{138, 33}, {357, 18}}</string>
+                                               <string key="NSFrame">{{163, 39}, {357, 18}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="127446013">
@@ -3844,7 +3823,7 @@ AAABAAAAAQ</bytes>
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">1280</int>
                                                <object class="NSPSMatrix" key="NSDrawMatrix"/>
-                                               <string key="NSFrame">{{322, 137}, {16, 16}}</string>
+                                               <string key="NSFrame">{{221, 143}, {16, 16}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <int key="NSpiFlags">28938</int>
                                                <double key="NSMaxValue">100</double>
@@ -3864,7 +3843,7 @@ AAABAAAAAQ</bytes>
                                                                <string>NeXT TIFF v4.0 pasteboard type</string>
                                                        </object>
                                                </object>
-                                               <string key="NSFrame">{{323, 138}, {14, 14}}</string>
+                                               <string key="NSFrame">{{222, 144}, {14, 14}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSImageCell" key="NSCell" id="270102740">
@@ -3881,26 +3860,10 @@ AAABAAAAAQ</bytes>
                                                </object>
                                                <bool key="NSEditable">YES</bool>
                                        </object>
-                                       <object class="NSTextField" id="585772012">
-                                               <reference key="NSNextResponder" ref="204700639"/>
-                                               <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{137, 137}, {124, 17}}</string>
-                                               <reference key="NSSuperview" ref="204700639"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSTextFieldCell" key="NSCell" id="941628063">
-                                                       <int key="NSCellFlags">67239424</int>
-                                                       <int key="NSCellFlags2">4194304</int>
-                                                       <string key="NSContents">Peer listening port:</string>
-                                                       <reference key="NSSupport" ref="86725571"/>
-                                                       <reference key="NSControlView" ref="585772012"/>
-                                                       <reference key="NSBackgroundColor" ref="977951849"/>
-                                                       <reference key="NSTextColor" ref="400627124"/>
-                                               </object>
-                                       </object>
                                        <object class="NSButton" id="316696878">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{138, 87}, {171, 18}}</string>
+                                               <string key="NSFrame">{{163, 93}, {171, 18}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="633401664">
@@ -3922,7 +3885,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="200017199">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{138, 111}, {189, 18}}</string>
+                                               <string key="NSFrame">{{163, 117}, {189, 18}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="847795095">
@@ -3944,7 +3907,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="911608268">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{266, 135}, {50, 22}}</string>
+                                               <string key="NSFrame">{{165, 141}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="453443006">
@@ -4008,7 +3971,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="646636981">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{156, 71}, {238, 14}}</string>
+                                               <string key="NSFrame">{{181, 77}, {238, 14}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="67017561">
@@ -4023,8 +3986,8 @@ AAABAAAAAQ</bytes>
                                        </object>
                                        <object class="NSTextField" id="992746122">
                                                <reference key="NSNextResponder" ref="204700639"/>
-                                               <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{342, 137}, {183, 17}}</string>
+                                               <int key="NSvFlags">258</int>
+                                               <string key="NSFrame">{{235, 143}, {290, 17}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="931894024">
@@ -4037,16 +4000,32 @@ AAABAAAAAQ</bytes>
                                                        <reference key="NSTextColor" ref="540507142"/>
                                                </object>
                                        </object>
+                                       <object class="NSTextField" id="1049422773">
+                                               <reference key="NSNextResponder" ref="204700639"/>
+                                               <int key="NSvFlags">256</int>
+                                               <string key="NSFrame">{{36, 143}, {124, 17}}</string>
+                                               <reference key="NSSuperview" ref="204700639"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="814921359">
+                                                       <int key="NSCellFlags">67239424</int>
+                                                       <int key="NSCellFlags2">71303168</int>
+                                                       <string key="NSContents">Peer listening port:</string>
+                                                       <reference key="NSSupport" ref="86725571"/>
+                                                       <reference key="NSControlView" ref="1049422773"/>
+                                                       <reference key="NSBackgroundColor" ref="977951849"/>
+                                                       <reference key="NSTextColor" ref="400627124"/>
+                                               </object>
+                                       </object>
                                        <object class="NSTextField" id="25993221">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{74, 137}, {61, 17}}</string>
+                                               <string key="NSFrame">{{21, 183}, {139, 17}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="475516915">
                                                        <int key="NSCellFlags">67239424</int>
                                                        <int key="NSCellFlags2">71303168</int>
-                                                       <string key="NSContents">Network:</string>
+                                                       <string key="NSContents">Peer Communication:</string>
                                                        <reference key="NSSupport" ref="86725571"/>
                                                        <reference key="NSControlView" ref="25993221"/>
                                                        <reference key="NSBackgroundColor" ref="977951849"/>
@@ -4056,7 +4035,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="994561291">
                                                <reference key="NSNextResponder" ref="204700639"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{327, 101}, {111, 32}}</string>
+                                               <string key="NSFrame">{{352, 107}, {111, 32}}</string>
                                                <reference key="NSSuperview" ref="204700639"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="681368311">
@@ -4077,19 +4056,20 @@ AAABAAAAAQ</bytes>
                                                </object>
                                        </object>
                                </object>
-                               <string key="NSFrameSize">{542, 177}</string>
+                               <string key="NSFrameSize">{542, 220}</string>
+                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="810116101">
-                               <nil key="NSNextResponder"/>
+                               <reference key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <object class="NSTextField" id="712370553">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{80, 218}, {96, 17}}</string>
+                                               <string key="NSFrame">{{80, 216}, {96, 17}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="957501329">
@@ -4105,7 +4085,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="966253460">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{103, 260}, {68, 17}}</string>
+                                               <string key="NSFrame">{{103, 258}, {68, 17}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="404750455">
@@ -4121,7 +4101,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="1807399">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{100, 286}, {71, 17}}</string>
+                                               <string key="NSFrame">{{100, 284}, {71, 17}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="705209842">
@@ -4137,7 +4117,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="485614707">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{182, 216}, {50, 22}}</string>
+                                               <string key="NSFrame">{{182, 214}, {50, 22}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="754049708">
@@ -4201,7 +4181,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="898169443">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{62, 405}, {158, 18}}</string>
+                                               <string key="NSFrame">{{62, 403}, {158, 18}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="844429646">
@@ -4223,7 +4203,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="3575">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{81, 34}, {398, 18}}</string>
+                                               <string key="NSFrame">{{81, 32}, {430, 18}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="105041185">
@@ -4245,7 +4225,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="151618662">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{81, 310}, {165, 18}}</string>
+                                               <string key="NSFrame">{{81, 308}, {165, 18}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="658673085">
@@ -4267,7 +4247,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="264419599">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{81, 180}, {332, 18}}</string>
+                                               <string key="NSFrame">{{81, 178}, {332, 18}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="958039142">
@@ -4289,7 +4269,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="535988411">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{80, 389}, {318, 14}}</string>
+                                               <string key="NSFrame">{{80, 387}, {318, 14}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="644224844">
@@ -4305,7 +4285,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSSecureTextField" id="894846458">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{176, 258}, {184, 22}}</string>
+                                               <string key="NSFrame">{{176, 256}, {184, 22}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSSecureTextFieldCell" key="NSCell" id="38151087">
@@ -4419,7 +4399,7 @@ AAABAAAAAQ</bytes>
                                                                <double key="NSPercent">0.99712650000000003</double>
                                                        </object>
                                                </object>
-                                               <string key="NSFrame">{{103, 96}, {308, 78}}</string>
+                                               <string key="NSFrame">{{103, 94}, {308, 78}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <reference key="NSNextKeyView" ref="206862330"/>
                                                <int key="NSsFlags">18</int>
@@ -4431,7 +4411,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSSegmentedControl" id="432022023">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{103, 69}, {67, 23}}</string>
+                                               <string key="NSFrame">{{103, 67}, {67, 23}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSSegmentedCell" key="NSCell" id="1040339170">
@@ -4463,7 +4443,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="189299072">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{175, 73}, {196, 14}}</string>
+                                               <string key="NSFrame">{{175, 71}, {196, 14}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="159713069">
@@ -4479,7 +4459,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSTextField" id="717982135">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{176, 284}, {184, 22}}</string>
+                                               <string key="NSFrame">{{176, 282}, {184, 22}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="80231199">
@@ -4516,7 +4496,7 @@ AAABAAAAAQ</bytes>
                                        <object class="NSButton" id="52925771">
                                                <reference key="NSNextResponder" ref="810116101"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{83, 345}, {149, 25}}</string>
+                                               <string key="NSFrame">{{83, 343}, {149, 25}}</string>
                                                <reference key="NSSuperview" ref="810116101"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="853520292">
@@ -4535,15 +4515,12 @@ AAABAAAAAQ</bytes>
                                                </object>
                                        </object>
                                </object>
-                               <string key="NSFrameSize">{542, 441}</string>
+                               <string key="NSFrameSize">{542, 439}</string>
+                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSUserDefaultsController" id="356871564">
-                               <object class="NSMutableArray" key="NSDeclaredKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>UTPGlobal</string>
-                               </object>
                                <bool key="NSSharedInstance">YES</bool>
                        </object>
                        <object class="NSCustomObject" id="981493640">
@@ -7689,21 +7666,13 @@ AAABAAAAAQ</bytes>
                                        </object>
                                        <int key="connectionID">2070</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">setUTP:</string>
-                                               <reference key="source" ref="511492310"/>
-                                               <reference key="destination" ref="790229468"/>
-                                       </object>
-                                       <int key="connectionID">2075</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBBindingConnection" key="connection">
                                                <string key="label">value: values.UTPGlobal</string>
-                                               <reference key="source" ref="790229468"/>
+                                               <reference key="source" ref="575079483"/>
                                                <reference key="destination" ref="356871564"/>
                                                <object class="NSNibBindingConnector" key="connector">
-                                                       <reference key="NSSource" ref="790229468"/>
+                                                       <reference key="NSSource" ref="575079483"/>
                                                        <reference key="NSDestination" ref="356871564"/>
                                                        <string key="NSLabel">value: values.UTPGlobal</string>
                                                        <string key="NSBinding">value</string>
@@ -7711,7 +7680,15 @@ AAABAAAAAQ</bytes>
                                                        <int key="NSNibBindingConnectorVersion">2</int>
                                                </object>
                                        </object>
-                                       <int key="connectionID">2076</int>
+                                       <int key="connectionID">2079</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">setUTP:</string>
+                                               <reference key="source" ref="511492310"/>
+                                               <reference key="destination" ref="575079483"/>
+                                       </object>
+                                       <int key="connectionID">2080</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -8195,13 +8172,14 @@ AAABAAAAAQ</bytes>
                                                        <reference ref="646636981"/>
                                                        <reference ref="911608268"/>
                                                        <reference ref="316696878"/>
-                                                       <reference ref="585772012"/>
                                                        <reference ref="455956280"/>
                                                        <reference ref="651482039"/>
                                                        <reference ref="631967205"/>
                                                        <reference ref="109684042"/>
                                                        <reference ref="200017199"/>
                                                        <reference ref="994561291"/>
+                                                       <reference ref="575079483"/>
+                                                       <reference ref="1049422773"/>
                                                </object>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">Network</string>
@@ -9070,7 +9048,6 @@ AAABAAAAAQ</bytes>
                                                        <reference ref="1042006550"/>
                                                        <reference ref="552496111"/>
                                                        <reference ref="255099550"/>
-                                                       <reference ref="790229468"/>
                                                </object>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">Peers</string>
@@ -9624,20 +9601,6 @@ AAABAAAAAQ</bytes>
                                                <reference key="object" ref="270102740"/>
                                                <reference key="parent" ref="455956280"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">67</int>
-                                               <reference key="object" ref="585772012"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="941628063"/>
-                                               </object>
-                                               <reference key="parent" ref="204700639"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1244</int>
-                                               <reference key="object" ref="941628063"/>
-                                               <reference key="parent" ref="585772012"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">332</int>
                                                <reference key="object" ref="316696878"/>
@@ -10472,18 +10435,32 @@ AAABAAAAAQ</bytes>
                                                <reference key="parent" ref="58756917"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2071</int>
-                                               <reference key="object" ref="790229468"/>
+                                               <int key="objectID">2077</int>
+                                               <reference key="object" ref="575079483"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="442474637"/>
+                                                       <reference ref="661204911"/>
                                                </object>
-                                               <reference key="parent" ref="538122014"/>
+                                               <reference key="parent" ref="204700639"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2072</int>
-                                               <reference key="object" ref="442474637"/>
-                                               <reference key="parent" ref="790229468"/>
+                                               <int key="objectID">2078</int>
+                                               <reference key="object" ref="661204911"/>
+                                               <reference key="parent" ref="575079483"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">2081</int>
+                                               <reference key="object" ref="1049422773"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="814921359"/>
+                                               </object>
+                                               <reference key="parent" ref="204700639"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">2082</int>
+                                               <reference key="object" ref="814921359"/>
+                                               <reference key="parent" ref="1049422773"/>
                                        </object>
                                </object>
                        </object>
@@ -10532,7 +10509,6 @@ AAABAAAAAQ</bytes>
                                        <string>1241.IBPluginDependency</string>
                                        <string>1242.IBPluginDependency</string>
                                        <string>1243.IBPluginDependency</string>
-                                       <string>1244.IBPluginDependency</string>
                                        <string>1245.IBPluginDependency</string>
                                        <string>1246.IBPluginDependency</string>
                                        <string>1247.IBPluginDependency</string>
@@ -10897,10 +10873,13 @@ AAABAAAAAQ</bytes>
                                        <string>2053.ImportedFromIB2</string>
                                        <string>2068.IBPluginDependency</string>
                                        <string>2069.IBPluginDependency</string>
-                                       <string>2071.IBPluginDependency</string>
-                                       <string>2071.IBViewBoundsToFrameTransform</string>
-                                       <string>2071.ImportedFromIB2</string>
-                                       <string>2072.IBPluginDependency</string>
+                                       <string>2077.IBPluginDependency</string>
+                                       <string>2077.IBViewBoundsToFrameTransform</string>
+                                       <string>2077.ImportedFromIB2</string>
+                                       <string>2078.IBPluginDependency</string>
+                                       <string>2081.IBPluginDependency</string>
+                                       <string>2081.ImportedFromIB2</string>
+                                       <string>2082.IBPluginDependency</string>
                                        <string>209.IBPluginDependency</string>
                                        <string>209.ImportedFromIB2</string>
                                        <string>216.IBPluginDependency</string>
@@ -10994,6 +10973,7 @@ AAABAAAAAQ</bytes>
                                        <string>354.IBPluginDependency</string>
                                        <string>354.ImportedFromIB2</string>
                                        <string>357.IBPluginDependency</string>
+                                       <string>357.IBViewBoundsToFrameTransform</string>
                                        <string>357.ImportedFromIB2</string>
                                        <string>365.IBPluginDependency</string>
                                        <string>365.ImportedFromIB2</string>
@@ -11062,13 +11042,12 @@ AAABAAAAAQ</bytes>
                                        <string>66.ImportedFromIB2</string>
                                        <string>66.editorWindowContentRectSynchronizationRect</string>
                                        <string>660.IBPluginDependency</string>
+                                       <string>660.IBViewBoundsToFrameTransform</string>
                                        <string>660.ImportedFromIB2</string>
                                        <string>664.IBPluginDependency</string>
                                        <string>664.ImportedFromIB2</string>
                                        <string>665.IBPluginDependency</string>
                                        <string>665.ImportedFromIB2</string>
-                                       <string>67.IBPluginDependency</string>
-                                       <string>67.ImportedFromIB2</string>
                                        <string>68.IBPluginDependency</string>
                                        <string>68.ImportedFromIB2</string>
                                        <string>840.IBNumberFormatterLocalizesFormatMetadataKey</string>
@@ -11173,7 +11152,6 @@ AAABAAAAAQ</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11217,7 +11195,7 @@ AAABAAAAAQ</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{371, 450}, {542, 386}}</string>
+                                       <string>{{371, 470}, {542, 366}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>{{281, 577}, {539, 315}}</string>
@@ -11284,7 +11262,7 @@ AAABAAAAAQ</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{179, 379}, {542, 441}}</string>
+                                       <string>{{179, 381}, {542, 439}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>{{281, 577}, {539, 315}}</string>
@@ -11522,13 +11500,16 @@ AAABAAAAAQ</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABDDAAAw3kAAA</bytes>
+                                               <bytes key="NSTransformStruct">P4AAAL+AAABC1AAAw0gAAA</bytes>
                                        </object>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>{{593, 449}, {182, 53}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11628,6 +11609,9 @@ AAABAAAAAQ</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <object class="NSAffineTransform">
+                                               <bytes key="NSTransformStruct">P4AAAL+AAABDtIAAwxgAAA</bytes>
+                                       </object>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
@@ -11693,13 +11677,14 @@ AAABAAAAAQ</bytes>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
-                                       <string>{{24, 511}, {542, 177}}</string>
+                                       <string>{{24, 468}, {542, 220}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
                                        <string>{{281, 577}, {539, 315}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <real value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <object class="NSAffineTransform">
+                                               <bytes key="NSTransformStruct">P4AAAL+AAABCKAAAw1AAAA</bytes>
+                                       </object>
                                        <real value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <real value="1"/>
@@ -11753,7 +11738,7 @@ AAABAAAAAQ</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">2076</int>
+                       <int key="maxID">2082</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">