#8021 per-torrent vs. global speed limit confusion for mac ui

diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index 6daf59d9682dfa95a5c20c3be19c09f07de76ee4..2c82e661ef1df91420bd8f8db1fe0940b381f4d7 100644 (file)
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -70,9 +70,11 @@
     IBOutlet FileOutlineController * fFileController;
     IBOutlet NSSearchField * fFileFilterField;
     
-    IBOutlet NSPopUpButton * fRatioPopUp, * fUploadLimitPopUp, * fDownloadLimitPopUp;
-    IBOutlet NSTextField * fUploadLimitField, * fDownloadLimitField, * fRatioLimitField, * fPeersConnectField,
-                        * fUploadLimitLabel, * fDownloadLimitLabel, * fPeersConnectLabel;
+    IBOutlet NSPopUpButton * fRatioPopUp;
+    IBOutlet NSButton * fUploadLimitCheck, * fDownloadLimitCheck, * fGlobalLimitCheck;
+    IBOutlet NSTextField * fUploadLimitField, * fDownloadLimitField, * fRatioLimitField,
+                        * fUploadLimitLabel, * fDownloadLimitLabel, * fPeersConnectLabel,
+                        * fPeersConnectField;
     
     NSString * fInitialString;
 }
@@ -101,8 +103,9 @@
 
 - (void) setFileFilterText: (id) sender;
 
-- (void) setSpeedMode: (id) sender;
+- (void) setUseSpeedLimit: (id) sender;
 - (void) setSpeedLimit: (id) sender;
+- (void) setUseGlobalSpeedLimit: (id) sender;
 
 - (void) setRatioSetting: (id) sender;
 - (void) setRatioLimit: (id) sender;

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 4fc5b3b89e838706b1da71be3bd11cdbb6febc49..83a760822a35be4554c04ff20664e61ca3c69be8 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -274,18 +274,21 @@ typedef enum
             [fRatioField setStringValue: @""];
             
             //options fields
-            [fUploadLimitPopUp setEnabled: NO];
-            [fUploadLimitPopUp selectItemAtIndex: -1];
-            [fUploadLimitField setHidden: YES];
-            [fUploadLimitLabel setHidden: YES];
+            [fUploadLimitCheck setEnabled: NO];
+            [fUploadLimitCheck setState: NSOffState];
+            [fUploadLimitField setEnabled: NO];
+            [fUploadLimitLabel setEnabled: NO];
             [fUploadLimitField setStringValue: @""];
             
-            [fDownloadLimitPopUp setEnabled: NO];
-            [fDownloadLimitPopUp selectItemAtIndex: -1];
-            [fDownloadLimitField setHidden: YES];
-            [fDownloadLimitLabel setHidden: YES];
+            [fDownloadLimitCheck setEnabled: NO];
+            [fDownloadLimitCheck setState: NSOffState];
+            [fDownloadLimitField setEnabled: NO];
+            [fDownloadLimitLabel setEnabled: NO];
             [fDownloadLimitField setStringValue: @""];
             
+            [fGlobalLimitCheck setEnabled: NO];
+            [fGlobalLimitCheck setState: NSOffState];
+            
             [fRatioPopUp setEnabled: NO];
             [fRatioPopUp selectItemAtIndex: -1];
             [fRatioLimitField setHidden: YES];
@@ -527,67 +530,59 @@ typedef enum
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent = [enumerator nextObject]; //first torrent
     
-    NSInteger uploadSpeedMode = [torrent speedMode: YES],
+    NSInteger uploadUseSpeedLimit = [torrent usesSpeedLimit: YES] ? NSOnState : NSOffState,
                 uploadSpeedLimit = [torrent speedLimit: YES],
-                downloadSpeedMode = [torrent speedMode: NO],
-                downloadSpeedLimit = [torrent speedLimit: NO];
+                downloadUseSpeedLimit = [torrent usesSpeedLimit: NO] ? NSOnState : NSOffState,
+                downloadSpeedLimit = [torrent speedLimit: NO],
+                globalUseSpeedLimit = [torrent usesGlobalSpeedLimit] ? NSOnState : NSOffState;
     
     while ((torrent = [enumerator nextObject])
-            && (uploadSpeedMode != INVALID || uploadSpeedLimit != INVALID
-                || downloadSpeedMode != INVALID || downloadSpeedLimit != INVALID))
+            && (uploadUseSpeedLimit != NSMixedState || uploadSpeedLimit != INVALID
+                || downloadUseSpeedLimit != NSMixedState || downloadSpeedLimit != INVALID
+                || globalUseSpeedLimit != NSMixedState))
     {
-        if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent speedMode: YES])
-            uploadSpeedMode = INVALID;
+        if (uploadUseSpeedLimit != INVALID && uploadUseSpeedLimit != ([torrent usesSpeedLimit: YES] ? NSOnState : NSOffState))
+            uploadUseSpeedLimit = NSMixedState;
         
         if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent speedLimit: YES])
             uploadSpeedLimit = INVALID;
         
-        if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent speedMode: NO])
-            downloadSpeedMode = INVALID;
+        if (downloadUseSpeedLimit != INVALID && downloadUseSpeedLimit != ([torrent usesSpeedLimit: NO] ? NSOnState : NSOffState))
+            downloadUseSpeedLimit = NSMixedState;
         
         if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent speedLimit: NO])
             downloadSpeedLimit = INVALID;
+        
+        if (globalUseSpeedLimit != INVALID && globalUseSpeedLimit != ([torrent usesGlobalSpeedLimit] ? NSOnState : NSOffState))
+            globalUseSpeedLimit = NSMixedState;
     }
     
     //set upload view
-    NSInteger index;
-    if (uploadSpeedMode == TR_SPEEDLIMIT_SINGLE)
-        index = OPTION_POPUP_LIMIT;
-    else if (uploadSpeedMode == TR_SPEEDLIMIT_UNLIMITED)
-        index = OPTION_POPUP_NO_LIMIT;
-    else if (uploadSpeedMode == TR_SPEEDLIMIT_GLOBAL)
-        index = OPTION_POPUP_GLOBAL;
-    else
-        index = -1;
-    [fUploadLimitPopUp selectItemAtIndex: index];
-    [fUploadLimitPopUp setEnabled: YES];
+    [fUploadLimitCheck setState: uploadUseSpeedLimit];
+    [fUploadLimitCheck setEnabled: YES];
     
-    [fUploadLimitLabel setHidden: uploadSpeedMode != TR_SPEEDLIMIT_SINGLE];
-    [fUploadLimitField setHidden: uploadSpeedMode != TR_SPEEDLIMIT_SINGLE];
+    [fUploadLimitLabel setEnabled: uploadUseSpeedLimit == NSOnState];
+    [fUploadLimitField setEnabled: uploadUseSpeedLimit == NSOnState];
     if (uploadSpeedLimit != INVALID)
         [fUploadLimitField setIntValue: uploadSpeedLimit];
     else
         [fUploadLimitField setStringValue: @""];
     
     //set download view
-    if (downloadSpeedMode == TR_SPEEDLIMIT_SINGLE)
-        index = OPTION_POPUP_LIMIT;
-    else if (downloadSpeedMode == TR_SPEEDLIMIT_UNLIMITED)
-        index = OPTION_POPUP_NO_LIMIT;
-    else if (downloadSpeedMode == TR_SPEEDLIMIT_GLOBAL)
-        index = OPTION_POPUP_GLOBAL;
-    else
-        index = -1;
-    [fDownloadLimitPopUp selectItemAtIndex: index];
-    [fDownloadLimitPopUp setEnabled: YES];
+    [fDownloadLimitCheck setState: downloadUseSpeedLimit];
+    [fDownloadLimitCheck setEnabled: YES];
     
-    [fDownloadLimitLabel setHidden: downloadSpeedMode != TR_SPEEDLIMIT_SINGLE];
-    [fDownloadLimitField setHidden: downloadSpeedMode != TR_SPEEDLIMIT_SINGLE];
+    [fDownloadLimitLabel setEnabled: downloadUseSpeedLimit == NSOnState];
+    [fDownloadLimitField setEnabled: downloadUseSpeedLimit == NSOnState];
     if (downloadSpeedLimit != INVALID)
         [fDownloadLimitField setIntValue: downloadSpeedLimit];
     else
         [fDownloadLimitField setStringValue: @""];
     
+    //set global check
+    [fGlobalLimitCheck setState: globalUseSpeedLimit];
+    [fGlobalLimitCheck setEnabled: YES];
+    
     //get ratio info
     enumerator = [fTorrents objectEnumerator];
     torrent = [enumerator nextObject]; //first torrent
@@ -605,6 +600,7 @@ typedef enum
     }
     
     //set ratio view
+    NSInteger index;
     if (checkRatio == TR_RATIOLIMIT_SINGLE)
         index = OPTION_POPUP_LIMIT;
     else if (checkRatio == TR_RATIOLIMIT_UNLIMITED)
@@ -1181,40 +1177,24 @@ typedef enum
     [fFileController setFilterText: [sender stringValue]];
 }
 
-- (void) setSpeedMode: (id) sender
+- (void) setUseSpeedLimit: (id) sender
 {
-    BOOL upload = sender == fUploadLimitPopUp;
-    NSInteger mode;
-    switch ([sender indexOfSelectedItem])
-    {
-        case OPTION_POPUP_LIMIT:
-            mode = TR_SPEEDLIMIT_SINGLE;
-            break;
-        case OPTION_POPUP_NO_LIMIT:
-            mode = TR_SPEEDLIMIT_UNLIMITED;
-            break;
-        case OPTION_POPUP_GLOBAL:
-            mode = TR_SPEEDLIMIT_GLOBAL;
-            break;
-        default:
-            return;
-    }
+    const BOOL upload = sender == fUploadLimitCheck;
+    const BOOL limit = [sender state] == NSOnState;
     
     for (Torrent * torrent in fTorrents)
-        [torrent setSpeedMode: mode upload: upload];
+        [torrent setUseSpeedLimit: limit upload: upload];
     
     NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField;
-    
-    BOOL single = mode == TR_SPEEDLIMIT_SINGLE;
-    [field setHidden: !single];
-    if (single)
+    [field setEnabled: limit];
+    if (limit)
     {
         [field selectText: self];
-        [[self window] makeKeyAndOrderFront:self];
+        [[self window] makeKeyAndOrderFront: self];
     }
     
     NSTextField * label = upload ? fUploadLimitLabel : fDownloadLimitLabel;
-    [label setHidden: !single];
+    [label setEnabled: limit];
 }
 
 - (void) setSpeedLimit: (id) sender
@@ -1257,6 +1237,14 @@ typedef enum
     }
 }
 
+- (void) setUseGlobalSpeedLimit: (id) sender
+{
+    const BOOL limit = [sender state] == NSOnState;
+    
+    for (Torrent * torrent in fTorrents)
+        [torrent setUseGlobalSpeedLimit: limit];
+}
+
 - (void) setRatioLimit: (id) sender
 {
     CGFloat limit = [sender floatValue];

diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index d812d6dd0d79706a2c1cacf03eb3afaecf1ffb9b..80b7b83370ec924b65f9e804ddad07034782f53e 100644 (file)
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -91,7 +91,7 @@
 }
 
 + (NSString *) stringForRatio: (CGFloat) ratio
-{
+{ratio = .997;
     if (ratio == TR_RATIO_NA)
         return NSLocalizedString(@"N/A", "No Ratio");
     else if (ratio == TR_RATIO_INF)

diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index efc35348a223d91b9c2dedb447b0cf2e769b0d04..8ea6c14a77eff50fd17afdf11ce2d81a2420c4a3 100644 (file)
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -110,10 +110,12 @@ typedef enum
 - (BOOL) seedRatioSet;
 - (CGFloat) progressStopRatio;
 
-- (tr_speedlimit) speedMode: (BOOL) upload;
-- (void) setSpeedMode: (tr_speedlimit) mode upload: (BOOL) upload;
+- (BOOL) usesSpeedLimit: (BOOL) upload;
+- (void) setUseSpeedLimit: (BOOL) use upload: (BOOL) upload;
 - (NSInteger) speedLimit: (BOOL) upload;
 - (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload;
+- (BOOL) usesGlobalSpeedLimit;
+- (void) setUseGlobalSpeedLimit: (BOOL) use;
 
 - (void) setMaxPeerConnect: (uint16_t) count;
 - (uint16_t) maxPeerConnect;

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 049d314e77383904b04991827b675b4d3b70d1fd..01497976c47e50ca3146cdb8c56553cb00246ccd 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -392,14 +392,14 @@ int trashDataFile(const char * filename)
     return fStat->percentRatio;
 }
 
-- (tr_speedlimit) speedMode: (BOOL) upload
+- (BOOL) usesSpeedLimit: (BOOL) upload
 {
-    return tr_torrentGetSpeedMode(fHandle, upload ? TR_UP : TR_DOWN);
+    return tr_torrentIsUsingSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN);
 }
 
-- (void) setSpeedMode: (tr_speedlimit) mode upload: (BOOL) upload
+- (void) setUseSpeedLimit: (BOOL) use upload: (BOOL) upload
 {
-    tr_torrentSetSpeedMode(fHandle, upload ? TR_UP : TR_DOWN, mode);
+    tr_torrentUseSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, use);
 }
 
 - (NSInteger) speedLimit: (BOOL) upload
@@ -412,6 +412,20 @@ int trashDataFile(const char * filename)
     tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, limit);
 }
 
+- (BOOL) usesGlobalSpeedLimit
+{
+    const BOOL up = tr_torrentIsUsingGlobalSpeedLimit(fHandle, TR_UP);
+    const BOOL down = tr_torrentIsUsingGlobalSpeedLimit(fHandle, TR_DOWN);
+    NSAssert(up == down, @"upload and download globallimit setting should have the same");
+    return up;
+}
+
+- (void) setUseGlobalSpeedLimit: (BOOL) use
+{
+    tr_torrentUseGlobalSpeedLimit(fHandle, TR_UP, use);
+    tr_torrentUseGlobalSpeedLimit(fHandle, TR_DOWN, use);
+}
+
 - (void) setMaxPeerConnect: (uint16_t) count
 {
     NSAssert(count > 0, @"max peer count must be greater than 0");
@@ -1861,14 +1875,14 @@ int trashDataFile(const char * filename)
         return;
 
     fQuickPauseDict = [[NSDictionary alloc] initWithObjectsAndKeys:
-                    [NSNumber numberWithInt: [self speedMode: YES]], @"UploadSpeedMode",
+                    [NSNumber numberWithInt: [self usesSpeedLimit: YES]], @"UploadUsesSpeedLimit",
                     [NSNumber numberWithInt: [self speedLimit: YES]], @"UploadSpeedLimit",
-                    [NSNumber numberWithInt: [self speedMode: NO]], @"DownloadSpeedMode",
+                    [NSNumber numberWithInt: [self usesSpeedLimit: NO]], @"DownloadUsesSpeedLimit",
                     [NSNumber numberWithInt: [self speedLimit: NO]], @"DownloadSpeedLimit", nil];
     
-    [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: YES];
+    [self setUseSpeedLimit: YES upload: YES];
     [self setSpeedLimit: 0 upload: YES];
-    [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: NO];
+    [self setUseSpeedLimit: YES upload: NO];
     [self setSpeedLimit: 0 upload: NO];
 }
 
@@ -1877,9 +1891,9 @@ int trashDataFile(const char * filename)
     if (!fQuickPauseDict)
         return;
     
-    [self setSpeedMode: [[fQuickPauseDict objectForKey: @"UploadSpeedMode"] intValue] upload: YES];
+    [self setUseSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadUsesSpeedLimit"] intValue] upload: YES];
     [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadSpeedLimit"] intValue] upload: YES];
-    [self setSpeedMode: [[fQuickPauseDict objectForKey: @"DownloadSpeedMode"] intValue] upload: NO];
+    [self setUseSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadUsesSpeedLimit"] intValue] upload: NO];
     [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadSpeedLimit"] intValue] upload: NO];
     
     [fQuickPauseDict release];

diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 063fdb10e6044cf96d7843d690d307b325e8e081..d72833d01183ca7da07ac0aa020ad6d5c378bd92 100644 (file)
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -580,6 +580,7 @@
     if (!fMenuTorrent || ![menu supermenu])
         return;
     
+    #warning add menu item for global limit
     if (menu == fUploadMenu || menu == fDownloadMenu)
     {
         NSMenuItem * item;
@@ -600,18 +601,16 @@
         }
         
         BOOL upload = menu == fUploadMenu;
-        NSInteger mode = [fMenuTorrent speedMode: upload];
+        
+        BOOL limit = [fMenuTorrent usesSpeedLimit: upload];
         
         item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
-        [item setState: mode == TR_SPEEDLIMIT_SINGLE ? NSOnState : NSOffState];
+        [item setState: limit ? NSOnState : NSOffState];
         [item setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
                             "torrent action menu -> upload/download limit"), [fMenuTorrent speedLimit: upload]]];
         
         item = [menu itemWithTag: ACTION_MENU_UNLIMITED_TAG];
-        [item setState: mode == TR_SPEEDLIMIT_UNLIMITED ? NSOnState : NSOffState];
-        
-        item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
-        [item setState: mode == TR_SPEEDLIMIT_GLOBAL ? NSOnState : NSOffState];
+        [item setState:limit ? NSOnState : NSOffState];
     }
     else if (menu == fRatioMenu)
     {
@@ -722,23 +721,8 @@
 
 - (void) setQuickLimitMode: (id) sender
 {
-    tr_speedlimit mode;
-    switch ([sender tag])
-    {
-        case ACTION_MENU_UNLIMITED_TAG:
-            mode = TR_SPEEDLIMIT_UNLIMITED;
-            break;
-        case ACTION_MENU_LIMIT_TAG:
-            mode = TR_SPEEDLIMIT_SINGLE;
-            break;
-        case ACTION_MENU_GLOBAL_TAG:
-            mode = TR_SPEEDLIMIT_GLOBAL;
-            break;
-        default:
-            return;
-    }
-    
-    [fMenuTorrent setSpeedMode: mode upload: [sender menu] == fUploadMenu];
+    const BOOL limit = [sender tag] == ACTION_MENU_LIMIT_TAG;
+    [fMenuTorrent setUseSpeedLimit: limit upload: [sender menu] == fUploadMenu];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
 }
@@ -746,7 +730,7 @@
 - (void) setQuickLimit: (id) sender
 {
     const BOOL upload = [sender menu] == fUploadMenu;
-    [fMenuTorrent setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: upload];
+    [fMenuTorrent setUseSpeedLimit: YES upload: upload];
     [fMenuTorrent setSpeedLimit: [[sender representedObject] intValue] upload: upload];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];

diff --git a/macosx/en.lproj/InfoWindow.xib b/macosx/en.lproj/InfoWindow.xib
index 7ea45f41e813feb70c3d1bd3703495e3a35bde95..9d30cec04e04f8e5331839592def5b83c5f0f0aa 100644 (file)
--- a/macosx/en.lproj/InfoWindow.xib
+++ b/macosx/en.lproj/InfoWindow.xib
@@ -8,8 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="1057"/>
-                       <integer value="1042"/>
+                       <integer value="1066"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2232,7 +2231,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="180459949">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3871,7 +3870,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 17}, {338, 172}}</string>
                                                                <reference key="NSSuperview" ref="1009918777"/>
-                                                               <reference key="NSNextKeyView" ref="221969066"/>
                                                                <reference key="NSDocView" ref="221969066"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -3905,7 +3903,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 0}, {338, 17}}</string>
                                                                <reference key="NSSuperview" ref="1009918777"/>
-                                                               <reference key="NSNextKeyView" ref="1053875789"/>
                                                                <reference key="NSDocView" ref="1053875789"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -3914,7 +3911,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                </object>
                                                <string key="NSFrame">{{10, 77}, {340, 190}}</string>
                                                <reference key="NSSuperview" ref="180459949"/>
-                                               <reference key="NSNextKeyView" ref="386870512"/>
                                                <int key="NSsFlags">562</int>
                                                <reference key="NSVScroller" ref="70145897"/>
                                                <reference key="NSHScroller" ref="38561669"/>
@@ -4032,7 +4028,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 17}, {338, 48}}</string>
                                                                <reference key="NSSuperview" ref="252354812"/>
-                                                               <reference key="NSNextKeyView" ref="705721384"/>
                                                                <reference key="NSDocView" ref="705721384"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -4066,7 +4061,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 0}, {338, 17}}</string>
                                                                <reference key="NSSuperview" ref="252354812"/>
-                                                               <reference key="NSNextKeyView" ref="842629001"/>
                                                                <reference key="NSDocView" ref="842629001"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -4075,7 +4069,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                </object>
                                                <string key="NSFrame">{{10, 271}, {340, 66}}</string>
                                                <reference key="NSSuperview" ref="180459949"/>
-                                               <reference key="NSNextKeyView" ref="230403242"/>
                                                <int key="NSsFlags">562</int>
                                                <reference key="NSVScroller" ref="58257122"/>
                                                <reference key="NSHScroller" ref="904154524"/>
@@ -4301,12 +4294,11 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        </object>
                                </object>
                                <string key="NSFrameSize">{360, 342}</string>
-                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="175372463">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4395,7 +4387,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                                                        <reference key="NSControlView" ref="40458268"/>
                                                                                                        <int key="NSButtonFlags">1211912703</int>
                                                                                                        <int key="NSButtonFlags2">2</int>
-                                                                                                       <object class="NSButtonImageSource" key="NSAlternateImage">
+                                                                                                       <object class="NSButtonImageSource" key="NSAlternateImage" id="876504139">
                                                                                                                <string key="NSImageName">NSSwitch</string>
                                                                                                        </object>
                                                                                                        <string key="NSAlternateContents"/>
@@ -4444,7 +4436,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 17}, {307, 308}}</string>
                                                                <reference key="NSSuperview" ref="723460874"/>
-                                                               <reference key="NSNextKeyView" ref="40458268"/>
                                                                <reference key="NSDocView" ref="40458268"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -4478,7 +4469,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                </object>
                                                                <string key="NSFrame">{{1, 0}, {307, 17}}</string>
                                                                <reference key="NSSuperview" ref="723460874"/>
-                                                               <reference key="NSNextKeyView" ref="723017189"/>
                                                                <reference key="NSDocView" ref="723017189"/>
                                                                <reference key="NSBGColor" ref="987864771"/>
                                                                <int key="NScvFlags">4</int>
@@ -4487,7 +4477,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                </object>
                                                <string key="NSFrame">{{10, 34}, {320, 326}}</string>
                                                <reference key="NSSuperview" ref="175372463"/>
-                                               <reference key="NSNextKeyView" ref="162592510"/>
                                                <int key="NSsFlags">18</int>
                                                <reference key="NSVScroller" ref="344671998"/>
                                                <reference key="NSHScroller" ref="280304392"/>
@@ -4560,14 +4549,13 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        </object>
                                </object>
                                <string key="NSFrameSize">{340, 365}</string>
-                               <reference key="NSSuperview"/>
                                <object class="NSMutableString" key="NSClassName">
                                        <characters key="NS.bytes">NSView</characters>
                                </object>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="1005910882">
-                               <nil key="NSNextResponder"/>
+                               <reference key="NSNextResponder"/>
                                <int key="NSvFlags">258</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4673,7 +4661,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="100640892">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">266</int>
-                                               <string key="NSFrame">{{9, 142}, {278, 14}}</string>
+                                               <string key="NSFrame">{{9, 159}, {278, 14}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="788714097">
@@ -4689,7 +4677,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="185087800">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{216, 98}, {35, 20}}</string>
+                                               <string key="NSFrame">{{188, 115}, {35, 20}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="73221689">
@@ -4753,7 +4741,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="622120141">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{256, 101}, {29, 14}}</string>
+                                               <string key="NSFrame">{{228, 118}, {29, 14}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="916928751">
@@ -4766,102 +4754,10 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <reference key="NSTextColor" ref="534079857"/>
                                                </object>
                                        </object>
-                                       <object class="NSPopUpButton" id="307561255">
-                                               <reference key="NSNextResponder" ref="1005910882"/>
-                                               <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{98, 96}, {116, 22}}</string>
-                                               <reference key="NSSuperview" ref="1005910882"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSPopUpButtonCell" key="NSCell" id="271393508">
-                                                       <int key="NSCellFlags">-2076049856</int>
-                                                       <int key="NSCellFlags2">133120</int>
-                                                       <reference key="NSSupport" ref="26"/>
-                                                       <reference key="NSControlView" ref="307561255"/>
-                                                       <int key="NSButtonFlags">-2038284033</int>
-                                                       <int key="NSButtonFlags2">1</int>
-                                                       <reference key="NSAlternateImage" ref="615908458"/>
-                                                       <string key="NSAlternateContents"/>
-                                                       <object class="NSMutableString" key="NSKeyEquivalent">
-                                                               <characters key="NS.bytes"/>
-                                                       </object>
-                                                       <int key="NSPeriodicDelay">400</int>
-                                                       <int key="NSPeriodicInterval">75</int>
-                                                       <object class="NSMenuItem" key="NSMenuItem" id="114533395">
-                                                               <reference key="NSMenu" ref="352354933"/>
-                                                               <string key="NSTitle">Global Setting</string>
-                                                               <string key="NSKeyEquiv"/>
-                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                               <int key="NSState">1</int>
-                                                               <object class="NSCustomResource" key="NSOnImage" id="701721519">
-                                                                       <string key="NSClassName">NSImage</string>
-                                                                       <string key="NSResourceName">NSMenuCheckmark</string>
-                                                               </object>
-                                                               <object class="NSCustomResource" key="NSMixedImage" id="333019404">
-                                                                       <string key="NSClassName">NSImage</string>
-                                                                       <string key="NSResourceName">NSMenuMixedState</string>
-                                                               </object>
-                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                               <reference key="NSTarget" ref="271393508"/>
-                                                       </object>
-                                                       <bool key="NSMenuItemRespectAlignment">YES</bool>
-                                                       <object class="NSMenu" key="NSMenu" id="352354933">
-                                                               <object class="NSMutableString" key="NSTitle">
-                                                                       <characters key="NS.bytes">OtherViews</characters>
-                                                               </object>
-                                                               <object class="NSMutableArray" key="NSMenuItems">
-                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                       <reference ref="114533395"/>
-                                                                       <object class="NSMenuItem" id="29729784">
-                                                                               <reference key="NSMenu" ref="352354933"/>
-                                                                               <string key="NSTitle">Unlimited</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="271393508"/>
-                                                                       </object>
-                                                                       <object class="NSMenuItem" id="181918544">
-                                                                               <reference key="NSMenu" ref="352354933"/>
-                                                                               <string key="NSTitle">Limit</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="271393508"/>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                                       <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="697023933">
-                                               <reference key="NSNextResponder" ref="1005910882"/>
-                                               <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{10, 101}, {70, 14}}</string>
-                                               <reference key="NSSuperview" ref="1005910882"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSTextFieldCell" key="NSCell" id="643469985">
-                                                       <int key="NSCellFlags">67239424</int>
-                                                       <int key="NSCellFlags2">272629760</int>
-                                                       <string key="NSContents">Upload rate:</string>
-                                                       <reference key="NSSupport" ref="26"/>
-                                                       <reference key="NSControlView" ref="697023933"/>
-                                                       <reference key="NSBackgroundColor" ref="339856346"/>
-                                                       <reference key="NSTextColor" ref="534079857"/>
-                                               </object>
-                                       </object>
                                        <object class="NSTextField" id="46700455">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{216, 120}, {35, 20}}</string>
+                                               <string key="NSFrame">{{188, 137}, {35, 20}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="354305258">
@@ -4925,7 +4821,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="812134257">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{256, 123}, {29, 14}}</string>
+                                               <string key="NSFrame">{{228, 140}, {29, 14}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="3119739">
@@ -4938,86 +4834,16 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <reference key="NSTextColor" ref="534079857"/>
                                                </object>
                                        </object>
-                                       <object class="NSPopUpButton" id="188523528">
-                                               <reference key="NSNextResponder" ref="1005910882"/>
-                                               <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{98, 118}, {116, 22}}</string>
-                                               <reference key="NSSuperview" ref="1005910882"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSPopUpButtonCell" key="NSCell" id="646947417">
-                                                       <int key="NSCellFlags">-2076049856</int>
-                                                       <int key="NSCellFlags2">133120</int>
-                                                       <reference key="NSSupport" ref="26"/>
-                                                       <reference key="NSControlView" ref="188523528"/>
-                                                       <int key="NSButtonFlags">-2038284033</int>
-                                                       <int key="NSButtonFlags2">1</int>
-                                                       <reference key="NSAlternateImage" ref="615908458"/>
-                                                       <string key="NSAlternateContents"/>
-                                                       <object class="NSMutableString" key="NSKeyEquivalent">
-                                                               <characters key="NS.bytes"/>
-                                                       </object>
-                                                       <int key="NSPeriodicDelay">400</int>
-                                                       <int key="NSPeriodicInterval">75</int>
-                                                       <object class="NSMenuItem" key="NSMenuItem" id="962310350">
-                                                               <reference key="NSMenu" ref="37389461"/>
-                                                               <string key="NSTitle">Global Setting</string>
-                                                               <string key="NSKeyEquiv"/>
-                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                               <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                               <reference key="NSMixedImage" ref="333019404"/>
-                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                               <reference key="NSTarget" ref="646947417"/>
-                                                       </object>
-                                                       <bool key="NSMenuItemRespectAlignment">YES</bool>
-                                                       <object class="NSMenu" key="NSMenu" id="37389461">
-                                                               <object class="NSMutableString" key="NSTitle">
-                                                                       <characters key="NS.bytes">OtherViews</characters>
-                                                               </object>
-                                                               <object class="NSMutableArray" key="NSMenuItems">
-                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                       <reference ref="962310350"/>
-                                                                       <object class="NSMenuItem" id="695817265">
-                                                                               <reference key="NSMenu" ref="37389461"/>
-                                                                               <string key="NSTitle">Unlimited</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="646947417"/>
-                                                                       </object>
-                                                                       <object class="NSMenuItem" id="742464932">
-                                                                               <reference key="NSMenu" ref="37389461"/>
-                                                                               <string key="NSTitle">Limit</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="646947417"/>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                                       <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="925511277">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{10, 123}, {86, 14}}</string>
+                                               <string key="NSFrame">{{10, 137}, {64, 17}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="332181406">
                                                        <int key="NSCellFlags">67239424</int>
                                                        <int key="NSCellFlags2">272629760</int>
-                                                       <string key="NSContents">Download rate:</string>
+                                                       <string key="NSContents">Bandwidth:</string>
                                                        <reference key="NSSupport" ref="26"/>
                                                        <reference key="NSControlView" ref="925511277"/>
                                                        <reference key="NSBackgroundColor" ref="339856346"/>
@@ -5051,8 +4877,14 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                               <reference key="NSMixedImage" ref="333019404"/>
+                                                               <object class="NSCustomResource" key="NSOnImage" id="132824476">
+                                                                       <string key="NSClassName">NSImage</string>
+                                                                       <string key="NSResourceName">NSMenuCheckmark</string>
+                                                               </object>
+                                                               <object class="NSCustomResource" key="NSMixedImage" id="109646542">
+                                                                       <string key="NSClassName">NSImage</string>
+                                                                       <string key="NSResourceName">NSMenuMixedState</string>
+                                                               </object>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <reference key="NSTarget" ref="380288231"/>
                                                        </object>
@@ -5070,8 +4902,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
+                                                                               <reference key="NSOnImage" ref="132824476"/>
+                                                                               <reference key="NSMixedImage" ref="109646542"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="380288231"/>
                                                                        </object>
@@ -5081,8 +4913,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="701721519"/>
-                                                                               <reference key="NSMixedImage" ref="333019404"/>
+                                                                               <reference key="NSOnImage" ref="132824476"/>
+                                                                               <reference key="NSMixedImage" ref="109646542"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="380288231"/>
                                                                        </object>
@@ -5097,7 +4929,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="409725024">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{10, 57}, {77, 14}}</string>
+                                               <string key="NSFrame">{{10, 54}, {77, 17}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="849975794">
@@ -5145,7 +4977,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="79835260">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{147, 10}, {45, 20}}</string>
+                                               <string key="NSFrame">{{144, 10}, {45, 20}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="513731594">
@@ -5207,7 +5039,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <object class="NSTextField" id="51607095">
                                                <reference key="NSNextResponder" ref="1005910882"/>
                                                <int key="NSvFlags">268</int>
-                                               <string key="NSFrame">{{197, 13}, {34, 14}}</string>
+                                               <string key="NSFrame">{{194, 13}, {34, 14}}</string>
                                                <reference key="NSSuperview" ref="1005910882"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="99333053">
@@ -5220,8 +5052,78 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <reference key="NSTextColor" ref="534079857"/>
                                                </object>
                                        </object>
+                                       <object class="NSButton" id="180242884">
+                                               <reference key="NSNextResponder" ref="1005910882"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{76, 116}, {90, 18}}</string>
+                                               <reference key="NSSuperview" ref="1005910882"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSButtonCell" key="NSCell" id="881855213">
+                                                       <int key="NSCellFlags">-2080244224</int>
+                                                       <int key="NSCellFlags2">131072</int>
+                                                       <string key="NSContents">Limit Upload</string>
+                                                       <reference key="NSSupport" ref="26"/>
+                                                       <reference key="NSControlView" ref="180242884"/>
+                                                       <int key="NSButtonFlags">1211912703</int>
+                                                       <int key="NSButtonFlags2">130</int>
+                                                       <object class="NSCustomResource" key="NSNormalImage" id="538268923">
+                                                               <string key="NSClassName">NSImage</string>
+                                                               <string key="NSResourceName">NSSwitch</string>
+                                                       </object>
+                                                       <reference key="NSAlternateImage" ref="876504139"/>
+                                                       <string key="NSAlternateContents"/>
+                                                       <string key="NSKeyEquivalent"/>
+                                                       <int key="NSPeriodicDelay">200</int>
+                                                       <int key="NSPeriodicInterval">25</int>
+                                               </object>
+                                       </object>
+                                       <object class="NSButton" id="798050396">
+                                               <reference key="NSNextResponder" ref="1005910882"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{76, 96}, {224, 18}}</string>
+                                               <reference key="NSSuperview" ref="1005910882"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSButtonCell" key="NSCell" id="873467762">
+                                                       <int key="NSCellFlags">-2080244224</int>
+                                                       <int key="NSCellFlags2">131072</int>
+                                                       <string key="NSContents">Stay within the global bandwidth limit</string>
+                                                       <reference key="NSSupport" ref="26"/>
+                                                       <reference key="NSControlView" ref="798050396"/>
+                                                       <int key="NSButtonFlags">1211912703</int>
+                                                       <int key="NSButtonFlags2">130</int>
+                                                       <reference key="NSNormalImage" ref="538268923"/>
+                                                       <reference key="NSAlternateImage" ref="876504139"/>
+                                                       <string key="NSAlternateContents"/>
+                                                       <string key="NSKeyEquivalent"/>
+                                                       <int key="NSPeriodicDelay">200</int>
+                                                       <int key="NSPeriodicInterval">25</int>
+                                               </object>
+                                       </object>
+                                       <object class="NSButton" id="556264839">
+                                               <reference key="NSNextResponder" ref="1005910882"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{76, 138}, {106, 18}}</string>
+                                               <reference key="NSSuperview" ref="1005910882"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSButtonCell" key="NSCell" id="209993470">
+                                                       <int key="NSCellFlags">-2080244224</int>
+                                                       <int key="NSCellFlags2">131072</int>
+                                                       <string key="NSContents">Limit Download</string>
+                                                       <reference key="NSSupport" ref="26"/>
+                                                       <reference key="NSControlView" ref="556264839"/>
+                                                       <int key="NSButtonFlags">1211912703</int>
+                                                       <int key="NSButtonFlags2">130</int>
+                                                       <reference key="NSNormalImage" ref="538268923"/>
+                                                       <reference key="NSAlternateImage" ref="876504139"/>
+                                                       <string key="NSAlternateContents"/>
+                                                       <string key="NSKeyEquivalent"/>
+                                                       <int key="NSPeriodicDelay">200</int>
+                                                       <int key="NSPeriodicInterval">25</int>
+                                               </object>
+                                       </object>
                                </object>
-                               <string key="NSFrameSize">{351, 161}</string>
+                               <string key="NSFrameSize">{351, 178}</string>
+                               <reference key="NSSuperview"/>
                                <object class="NSMutableString" key="NSClassName">
                                        <characters key="NS.bytes">NSView</characters>
                                </object>
@@ -5698,38 +5600,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        </object>
                                        <int key="connectionID">1166</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">setSpeedMode:</string>
-                                               <reference key="source" ref="1016287627"/>
-                                               <reference key="destination" ref="188523528"/>
-                                       </object>
-                                       <int key="connectionID">1167</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDownloadLimitPopUp</string>
-                                               <reference key="source" ref="1016287627"/>
-                                               <reference key="destination" ref="188523528"/>
-                                       </object>
-                                       <int key="connectionID">1168</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fUploadLimitPopUp</string>
-                                               <reference key="source" ref="1016287627"/>
-                                               <reference key="destination" ref="307561255"/>
-                                       </object>
-                                       <int key="connectionID">1169</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">setSpeedMode:</string>
-                                               <reference key="source" ref="1016287627"/>
-                                               <reference key="destination" ref="307561255"/>
-                                       </object>
-                                       <int key="connectionID">1170</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">fBasicInfoField</string>
@@ -5986,6 +5856,54 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        </object>
                                        <int key="connectionID">1795</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fUploadLimitCheck</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="180242884"/>
+                                       </object>
+                                       <int key="connectionID">1800</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDownloadLimitCheck</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="556264839"/>
+                                       </object>
+                                       <int key="connectionID">1801</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">setUseSpeedLimit:</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="556264839"/>
+                                       </object>
+                                       <int key="connectionID">1803</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">setUseSpeedLimit:</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="180242884"/>
+                                       </object>
+                                       <int key="connectionID">1804</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fGlobalLimitCheck</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="798050396"/>
+                                       </object>
+                                       <int key="connectionID">1807</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">setUseGlobalSpeedLimit:</string>
+                                               <reference key="source" ref="1016287627"/>
+                                               <reference key="destination" ref="798050396"/>
+                                       </object>
+                                       <int key="connectionID">1808</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -7007,11 +6925,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <reference ref="100640892"/>
                                                        <reference ref="185087800"/>
                                                        <reference ref="622120141"/>
-                                                       <reference ref="307561255"/>
-                                                       <reference ref="697023933"/>
                                                        <reference ref="46700455"/>
                                                        <reference ref="812134257"/>
-                                                       <reference ref="188523528"/>
                                                        <reference ref="925511277"/>
                                                        <reference ref="409725024"/>
                                                        <reference ref="336556993"/>
@@ -7020,6 +6935,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <reference ref="51607095"/>
                                                        <reference ref="924921889"/>
                                                        <reference ref="535987563"/>
+                                                       <reference ref="180242884"/>
+                                                       <reference ref="556264839"/>
+                                                       <reference ref="798050396"/>
                                                </object>
                                                <reference key="parent" ref="261172737"/>
                                                <string key="objectName">Options</string>
@@ -7069,24 +6987,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                </object>
                                                <reference key="parent" ref="1005910882"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1074</int>
-                                               <reference key="object" ref="307561255"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="271393508"/>
-                                               </object>
-                                               <reference key="parent" ref="1005910882"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1079</int>
-                                               <reference key="object" ref="697023933"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="643469985"/>
-                                               </object>
-                                               <reference key="parent" ref="1005910882"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1080</int>
                                                <reference key="object" ref="46700455"/>
@@ -7105,15 +7005,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                </object>
                                                <reference key="parent" ref="1005910882"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1083</int>
-                                               <reference key="object" ref="188523528"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="646947417"/>
-                                               </object>
-                                               <reference key="parent" ref="1005910882"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1088</int>
                                                <reference key="object" ref="925511277"/>
@@ -7529,20 +7420,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <reference key="object" ref="916928751"/>
                                                <reference key="parent" ref="622120141"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1552</int>
-                                               <reference key="object" ref="271393508"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="352354933"/>
-                                               </object>
-                                               <reference key="parent" ref="307561255"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1553</int>
-                                               <reference key="object" ref="643469985"/>
-                                               <reference key="parent" ref="697023933"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1554</int>
                                                <reference key="object" ref="354305258"/>
@@ -7557,15 +7434,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <reference key="object" ref="3119739"/>
                                                <reference key="parent" ref="812134257"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1556</int>
-                                               <reference key="object" ref="646947417"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="37389461"/>
-                                               </object>
-                                               <reference key="parent" ref="188523528"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1557</int>
                                                <reference key="object" ref="332181406"/>
@@ -7645,58 +7513,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <reference key="object" ref="917895174"/>
                                                <reference key="parent" ref="97720424"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1075</int>
-                                               <reference key="object" ref="352354933"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="181918544"/>
-                                                       <reference ref="29729784"/>
-                                                       <reference ref="114533395"/>
-                                               </object>
-                                               <reference key="parent" ref="271393508"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1078</int>
-                                               <reference key="object" ref="181918544"/>
-                                               <reference key="parent" ref="352354933"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1077</int>
-                                               <reference key="object" ref="29729784"/>
-                                               <reference key="parent" ref="352354933"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1076</int>
-                                               <reference key="object" ref="114533395"/>
-                                               <reference key="parent" ref="352354933"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1084</int>
-                                               <reference key="object" ref="37389461"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="742464932"/>
-                                                       <reference ref="695817265"/>
-                                                       <reference ref="962310350"/>
-                                               </object>
-                                               <reference key="parent" ref="646947417"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1087</int>
-                                               <reference key="object" ref="742464932"/>
-                                               <reference key="parent" ref="37389461"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1086</int>
-                                               <reference key="object" ref="695817265"/>
-                                               <reference key="parent" ref="37389461"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1085</int>
-                                               <reference key="object" ref="962310350"/>
-                                               <reference key="parent" ref="37389461"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1090</int>
                                                <reference key="object" ref="608360195"/>
@@ -8324,6 +8140,48 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <reference key="object" ref="207200075"/>
                                                <reference key="parent" ref="393260400"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1796</int>
+                                               <reference key="object" ref="180242884"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="881855213"/>
+                                               </object>
+                                               <reference key="parent" ref="1005910882"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1797</int>
+                                               <reference key="object" ref="881855213"/>
+                                               <reference key="parent" ref="180242884"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1798</int>
+                                               <reference key="object" ref="556264839"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="209993470"/>
+                                               </object>
+                                               <reference key="parent" ref="1005910882"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1799</int>
+                                               <reference key="object" ref="209993470"/>
+                                               <reference key="parent" ref="556264839"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1805</int>
+                                               <reference key="object" ref="798050396"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="873467762"/>
+                                               </object>
+                                               <reference key="parent" ref="1005910882"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1806</int>
+                                               <reference key="object" ref="873467762"/>
+                                               <reference key="parent" ref="798050396"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -8476,35 +8334,14 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <string>1070.ImportedFromIB2</string>
                                        <string>1071.IBPluginDependency</string>
                                        <string>1071.ImportedFromIB2</string>
+                                       <string>1073.CustomClassName</string>
                                        <string>1073.IBPluginDependency</string>
                                        <string>1073.ImportedFromIB2</string>
-                                       <string>1074.IBPluginDependency</string>
-                                       <string>1074.ImportedFromIB2</string>
-                                       <string>1075.IBEditorWindowLastContentRect</string>
-                                       <string>1075.IBPluginDependency</string>
-                                       <string>1075.ImportedFromIB2</string>
-                                       <string>1076.IBPluginDependency</string>
-                                       <string>1076.ImportedFromIB2</string>
-                                       <string>1077.IBPluginDependency</string>
-                                       <string>1077.ImportedFromIB2</string>
-                                       <string>1078.IBPluginDependency</string>
-                                       <string>1078.ImportedFromIB2</string>
-                                       <string>1079.IBPluginDependency</string>
-                                       <string>1079.ImportedFromIB2</string>
                                        <string>1080.IBPluginDependency</string>
                                        <string>1080.ImportedFromIB2</string>
+                                       <string>1082.CustomClassName</string>
                                        <string>1082.IBPluginDependency</string>
                                        <string>1082.ImportedFromIB2</string>
-                                       <string>1083.IBPluginDependency</string>
-                                       <string>1083.ImportedFromIB2</string>
-                                       <string>1084.IBPluginDependency</string>
-                                       <string>1084.ImportedFromIB2</string>
-                                       <string>1085.IBPluginDependency</string>
-                                       <string>1085.ImportedFromIB2</string>
-                                       <string>1086.IBPluginDependency</string>
-                                       <string>1086.ImportedFromIB2</string>
-                                       <string>1087.IBPluginDependency</string>
-                                       <string>1087.ImportedFromIB2</string>
                                        <string>1088.IBPluginDependency</string>
                                        <string>1088.ImportedFromIB2</string>
                                        <string>1089.IBPluginDependency</string>
@@ -8597,11 +8434,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <string>1549.IBPluginDependency</string>
                                        <string>1550.IBPluginDependency</string>
                                        <string>1551.IBPluginDependency</string>
-                                       <string>1552.IBPluginDependency</string>
-                                       <string>1553.IBPluginDependency</string>
                                        <string>1554.IBPluginDependency</string>
                                        <string>1555.IBPluginDependency</string>
-                                       <string>1556.IBPluginDependency</string>
                                        <string>1557.IBPluginDependency</string>
                                        <string>1558.IBPluginDependency</string>
                                        <string>1559.IBPluginDependency</string>
@@ -8751,6 +8585,12 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <string>1787.IBPluginDependency</string>
                                        <string>1792.IBPluginDependency</string>
                                        <string>1793.IBPluginDependency</string>
+                                       <string>1796.IBPluginDependency</string>
+                                       <string>1797.IBPluginDependency</string>
+                                       <string>1798.IBPluginDependency</string>
+                                       <string>1799.IBPluginDependency</string>
+                                       <string>1805.IBPluginDependency</string>
+                                       <string>1806.IBPluginDependency</string>
                                        <string>28.IBPluginDependency</string>
                                        <string>28.ImportedFromIB2</string>
                                        <string>29.IBPluginDependency</string>
@@ -8989,7 +8829,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{0, 835}, {351, 161}}</string>
+                                       <string>{{256, 652}, {351, 178}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{519, 803}, {351, 160}}</string>
@@ -9001,33 +8841,12 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
+                                       <string>ColorTextField</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{87, 899}, {138, 54}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
+                                       <string>ColorTextField</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9130,9 +8949,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -9277,6 +9093,12 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -9399,7 +9221,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">1795</int>
+                       <int key="maxID">1808</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -9505,8 +9327,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>setRatioLimit:</string>
                                                        <string>setRatioSetting:</string>
                                                        <string>setSpeedLimit:</string>
-                                                       <string>setSpeedMode:</string>
                                                        <string>setTab:</string>
+                                                       <string>setUseGlobalSpeedLimit:</string>
+                                                       <string>setUseSpeedLimit:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -9521,6 +9344,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
@@ -9542,9 +9366,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>fDateAddedField</string>
                                                        <string>fDateCompletedField</string>
                                                        <string>fDateCreatedField</string>
+                                                       <string>fDownloadLimitCheck</string>
                                                        <string>fDownloadLimitField</string>
                                                        <string>fDownloadLimitLabel</string>
-                                                       <string>fDownloadLimitPopUp</string>
                                                        <string>fDownloadedTotalField</string>
                                                        <string>fDownloadingFromField</string>
                                                        <string>fErrorMessageView</string>
@@ -9552,6 +9376,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>fFileController</string>
                                                        <string>fFileFilterField</string>
                                                        <string>fFilesView</string>
+                                                       <string>fGlobalLimitCheck</string>
                                                        <string>fHashField</string>
                                                        <string>fHaveField</string>
                                                        <string>fImageView</string>
@@ -9587,9 +9412,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>fTrackerField</string>
                                                        <string>fTrackerTable</string>
                                                        <string>fTrackerView</string>
+                                                       <string>fUploadLimitCheck</string>
                                                        <string>fUploadLimitField</string>
                                                        <string>fUploadLimitLabel</string>
-                                                       <string>fUploadLimitPopUp</string>
                                                        <string>fUploadedTotalField</string>
                                                        <string>fUploadingToField</string>
                                                        <string>fWebSeedTable</string>
@@ -9611,9 +9436,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
-                                                       <string>NSPopUpButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextView</string>
@@ -9621,6 +9446,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>FileOutlineController</string>
                                                        <string>NSSearchField</string>
                                                        <string>NSView</string>
+                                                       <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSImageView</string>
@@ -9656,9 +9482,9 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                        <string>NSTextField</string>
                                                        <string>TrackerTableView</string>
                                                        <string>NSView</string>
+                                                       <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
-                                                       <string>NSPopUpButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTableView</string>
@@ -9677,13 +9503,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <string key="minorKey"/>
                                        </object>
                                </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">macosx/NSApplicationAdditions.h</string>
-                                       </object>
-                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSApplication</string>
                                        <string key="superclassName">NSResponder</string>
@@ -9700,13 +9519,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                <string key="minorKey"/>
                                        </object>
                                </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSMenu</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">macosx/NSMenuAdditions.h</string>
-                                       </object>
-                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSMenu</string>
                                        <string key="superclassName">NSObject</string>

diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib
index 110a4b5af01cca294a1499190ebd8c0415b749b2..b97c04c67982cbabaea1daa55f83f89d0b4fbdd1 100644 (file)
--- a/macosx/en.lproj/MainMenu.xib
+++ b/macosx/en.lproj/MainMenu.xib
@@ -9,6 +9,7 @@
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <integer value="3088"/>
+                       <integer value="1945"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4282,16 +4283,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <string key="NSTitle">Download Rate</string>
                                                        <object class="NSMutableArray" key="NSMenuItems">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSMenuItem" id="839294439">
-                                                                       <reference key="NSMenu" ref="137637493"/>
-                                                                       <string key="NSTitle">Global</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="322614661"/>
-                                                                       <reference key="NSMixedImage" ref="3851078"/>
-                                                                       <int key="NSTag">101</int>
-                                                               </object>
                                                                <object class="NSMenuItem" id="701056891">
                                                                        <reference key="NSMenu" ref="137637493"/>
                                                                        <string key="NSTitle">Unlimited</string>
@@ -4339,16 +4330,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <string key="NSTitle">Upload Rate</string>
                                                        <object class="NSMutableArray" key="NSMenuItems">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSMenuItem" id="17038383">
-                                                                       <reference key="NSMenu" ref="192501462"/>
-                                                                       <string key="NSTitle">Global</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="322614661"/>
-                                                                       <reference key="NSMixedImage" ref="3851078"/>
-                                                                       <int key="NSTag">101</int>
-                                                               </object>
                                                                <object class="NSMenuItem" id="67180675">
                                                                        <reference key="NSMenu" ref="192501462"/>
                                                                        <string key="NSTitle">Unlimited</string>
@@ -5950,14 +5931,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">3105</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">setQuickLimitMode:</string>
-                                               <reference key="source" ref="675318801"/>
-                                               <reference key="destination" ref="839294439"/>
-                                       </object>
-                                       <int key="connectionID">3109</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">setQuickLimitMode:</string>
@@ -5974,14 +5947,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">3111</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">setQuickLimitMode:</string>
-                                               <reference key="source" ref="675318801"/>
-                                               <reference key="destination" ref="17038383"/>
-                                       </object>
-                                       <int key="connectionID">3112</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">setQuickLimitMode:</string>
@@ -7610,7 +7575,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="701056891"/>
                                                        <reference ref="222549207"/>
-                                                       <reference ref="839294439"/>
                                                        <reference ref="1015648063"/>
                                                </object>
                                                <reference key="parent" ref="665673233"/>
@@ -7625,11 +7589,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                <reference key="object" ref="222549207"/>
                                                <reference key="parent" ref="137637493"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1961</int>
-                                               <reference key="object" ref="839294439"/>
-                                               <reference key="parent" ref="137637493"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1971</int>
                                                <reference key="object" ref="1015648063"/>
@@ -7649,18 +7608,12 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                <reference key="object" ref="192501462"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="17038383"/>
                                                        <reference ref="67180675"/>
                                                        <reference ref="141452599"/>
                                                        <reference ref="641699304"/>
                                                </object>
                                                <reference key="parent" ref="624203829"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1962</int>
-                                               <reference key="object" ref="17038383"/>
-                                               <reference key="parent" ref="192501462"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1963</int>
                                                <reference key="object" ref="67180675"/>
@@ -8488,11 +8441,13 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <string>1930.ImportedFromIB2</string>
                                        <string>1933.IBPluginDependency</string>
                                        <string>1933.ImportedFromIB2</string>
+                                       <string>1936.IBEditorWindowLastContentRect</string>
                                        <string>1936.IBPluginDependency</string>
                                        <string>1936.ImportedFromIB2</string>
                                        <string>1936.editorWindowContentRectSynchronizationRect</string>
                                        <string>1944.IBPluginDependency</string>
                                        <string>1944.ImportedFromIB2</string>
+                                       <string>1945.IBEditorWindowLastContentRect</string>
                                        <string>1945.IBPluginDependency</string>
                                        <string>1945.ImportedFromIB2</string>
                                        <string>1945.editorWindowContentRectSynchronizationRect</string>
@@ -8500,6 +8455,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <string>1946.ImportedFromIB2</string>
                                        <string>1950.IBPluginDependency</string>
                                        <string>1950.ImportedFromIB2</string>
+                                       <string>1951.IBEditorWindowLastContentRect</string>
                                        <string>1951.IBPluginDependency</string>
                                        <string>1951.ImportedFromIB2</string>
                                        <string>1951.editorWindowContentRectSynchronizationRect</string>
@@ -8509,10 +8465,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <string>196.ImportedFromIB2</string>
                                        <string>1960.IBPluginDependency</string>
                                        <string>1960.ImportedFromIB2</string>
-                                       <string>1961.IBPluginDependency</string>
-                                       <string>1961.ImportedFromIB2</string>
-                                       <string>1962.IBPluginDependency</string>
-                                       <string>1962.ImportedFromIB2</string>
                                        <string>1963.IBPluginDependency</string>
                                        <string>1963.ImportedFromIB2</string>
                                        <string>1964.IBPluginDependency</string>
@@ -9090,11 +9042,13 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
+                                       <string>{{0, 882}, {214, 113}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{381, 469}, {214, 113}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
+                                       <string>{{214, 942}, {135, 53}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{595, 509}, {135, 73}}</string>
@@ -9102,6 +9056,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
+                                       <string>{{214, 922}, {135, 53}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{595, 489}, {135, 73}}</string>
@@ -9125,10 +9080,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>{{595, 459}, {156, 73}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>