Changeset 490

Timestamp:

Jun 30, 2006, 11:43:43 PM (17 years ago)

Author:

livings124

Message:

Speed Limit: a way to quickly change the upload and download limits for when less bandwidth has to be used.

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (2 diffs)
• Defaults.plist (modified) (1 diff)
• English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (4 diffs)
• PrefsController.m (modified) (4 diffs)

trunk/macosx/Controller.h

@@ -50 +50 @@
     NSToolbar                   * fToolbar;
     
-    IBOutlet NSMenuItem         * fAdvancedBarItem;
+    IBOutlet NSMenuItem         * fAdvancedBarItem, * fSpeedLimitItem;
     IBOutlet NSButton           * fActionButton;
     
@@ -125 +125 @@
 - (void) setSort: (id) sender;
 
+- (void) toggleSpeedLimit: (id) sender;
+
 - (void) setLimitGlobalEnabled: (id) sender;
 - (void) setQuickLimitGlobal: (id) sender;

trunk/macosx/Controller.m

@@ -126 +126 @@
     [self showStatusBar: [fDefaults boolForKey: @"StatusBar"] animate: NO];
     
+    //set speed limit
+    BOOL speedLimit = [fDefaults boolForKey: @"SpeedLimit"];
+    [fSpeedLimitItem setState: speedLimit];
+    
     [fActionButton setToolTip: @"Shortcuts for changing global settings."];
 
@@ -916 +920 @@
 }
 
+- (void) toggleSpeedLimit: (id) sender
+{
+    BOOL enable = [fSpeedLimitItem state] == NSOffState;
+
+    [fSpeedLimitItem setState: enable];
+    [fDefaults setBool: enable forKey: @"SpeedLimit"];
+
+    [fPrefsController enableSpeedLimit: enable];
+}
+
 - (void) setLimitGlobalEnabled: (id) sender
 {

trunk/macosx/Defaults.plist

@@ -51 +51 @@
         <key>Sort</key>
         <string>Order</string>
+        <key>SpeedLimit</key>
+        <false/>
+        <key>SpeedLimitDownloadLimit</key>
+        <integer>10</integer>
+        <key>SpeedLimitUploadLimit</key>
+        <integer>10</integer>
         <key>StartSetting</key>
         <string>Start</string>

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -27 +27 @@
                 stopAllTorrents = id; 
                 stopTorrent = id; 
+                toggleSpeedLimit = id; 
                 toggleStatusBar = id; 
             }; 
@@ -46 +47 @@
                 fRatioSetItem = NSMenuItem; 
                 fScrollView = NSScrollView; 
+                fSpeedLimitItem = NSMenuItem; 
                 fStateSortItem = NSMenuItem; 
                 fStatusBar = SmoothAquaView; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -31 +31 @@
         <array>
                 <integer>29</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>8I127</string>
+        <string>8J135</string>
 </dict>
 </plist>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -15 +15 @@
                 setRatioCheck = id; 
                 setShowMessage = id; 
+                setSpeedLimit = id; 
                 setStartSetting = id; 
                 setUpdate = id; 
@@ -39 +40 @@
                 fRemoveCheck = NSButton; 
                 fRemoveDownloadingCheck = NSButton; 
+                fSpeedLimitDownloadField = NSTextField; 
+                fSpeedLimitUploadField = NSTextField; 
                 fStartMatrix = NSMatrix; 
                 fTransfersView = NSView; 

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>153</key>
-                <string>261 290 536 130 0 0 1152 842 </string>
+                <string>302 469 548 217 0 0 1152 842 </string>
                 <key>28</key>
-                <string>308 451 536 254 0 0 1152 842 </string>
+                <string>122 427 548 254 0 0 1152 842 </string>
                 <key>41</key>
-                <string>308 438 536 280 0 0 1152 842 </string>
+                <string>130 394 548 297 0 0 1152 842 </string>
                 <key>66</key>
-                <string>300 526 551 104 0 0 1152 842 </string>
+                <string>182 510 548 104 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -21 +21 @@
         <array>
                 <integer>153</integer>
-                <integer>28</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsController.h

@@ -41 +41 @@
     IBOutlet NSPopUpButton  * fUpdatePopUp;
 
-    IBOutlet NSTextField    * fPortField, * fUploadField, * fDownloadField;
+    IBOutlet NSTextField    * fUploadField, * fDownloadField,
+                            * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
     IBOutlet NSButton       * fUploadCheck, * fDownloadCheck;
+
+    IBOutlet NSTextField    * fPortField;
     
     IBOutlet NSButton       * fRatioCheck;
@@ -53 +56 @@
 
     NSString                * fDownloadFolder;
+    BOOL                    fSpeedLimit;
     NSUserDefaults          * fDefaults;
 }
@@ -58 +62 @@
 - (void) setPrefs: (tr_handle_t *) handle;
 
-- (void) setShowMessage:        (id) sender;
-- (void) setBadge:              (id) sender;
-- (void) setUpdate:             (id) sender;
+- (void) setShowMessage:    (id) sender;
+- (void) setBadge:          (id) sender;
+- (void) setUpdate:         (id) sender;
 - (void) checkUpdate;
 
@@ -70 +74 @@
 - (void) folderSheetShow:       (id) sender;
 
-- (void) setPort:               (id) sender;
+- (void) setPort:       (id) sender;
+- (void) setSpeedLimit: (id) sender;
 
-- (void) setLimit:              (id) sender;
-- (void) setLimitCheck:         (id) sender;
-- (void) setLimitEnabled:       (BOOL) enable type: (NSString *) type;
-- (void) setQuickLimit:         (int) limit type: (NSString *) type;
+- (void) setLimit:          (id) sender;
+- (void) setLimitCheck:     (id) sender;
+- (void) setLimitEnabled:   (BOOL) enable type: (NSString *) type;
+- (void) setQuickLimit:     (int) limit type: (NSString *) type;
 
-- (void) setRatio:              (id) sender;
-- (void) setRatioCheck:                 (id) sender;
-- (void) setRatioEnabled:       (BOOL) enable;
-- (void) setQuickRatio:         (float) ratioLimit;
+- (void) enableSpeedLimit: (BOOL) enable;
+
+- (void) setRatio:          (id) sender;
+- (void) setRatioCheck:     (id) sender;
+- (void) setRatioEnabled:   (BOOL) enable;
+- (void) setQuickRatio: (float) ratioLimit;
 
 @end

trunk/macosx/PrefsController.m

@@ -122 +122 @@
     [fUploadField setIntValue: uploadLimit];
     [fUploadField setEnabled: checkUpload];
-    
-    tr_setUploadLimit(fHandle, checkUpload ? uploadLimit : -1);
 
         //set download limit
@@ -133 +131 @@
     [fDownloadField setEnabled: checkDownload];
     
-    tr_setDownloadLimit(fHandle, checkDownload ? downloadLimit : -1);
+    //set speed limit
+    fSpeedLimit = [fDefaults boolForKey: @"SpeedLimit"];
+    
+    int speedLimitUploadLimit = [fDefaults integerForKey: @"SpeedLimitUploadLimit"];
+    [fSpeedLimitUploadField setIntValue: speedLimitUploadLimit];
+    
+    int speedLimitDownloadLimit = [fDefaults integerForKey: @"SpeedLimitDownloadLimit"];
+    [fSpeedLimitDownloadField setIntValue: speedLimitDownloadLimit];
+    
+    //actually set bandwidth limits
+    if (fSpeedLimit)
+    {
+        tr_setUploadLimit(fHandle, speedLimitUploadLimit);
+        tr_setDownloadLimit(fHandle, speedLimitDownloadLimit);
+    }
+    else
+    {
+        tr_setUploadLimit(fHandle, checkUpload ? uploadLimit : -1);
+        tr_setDownloadLimit(fHandle, checkDownload ? downloadLimit : -1);
+    }
     
     //set ratio limit
@@ -293 +310 @@
     else
     {
-        if (sender == fUploadField)
-            tr_setUploadLimit(fHandle, [fUploadCheck state] == NSOffState ? -1 : limit);
-        else
-            tr_setDownloadLimit(fHandle, [fDownloadCheck state] == NSOffState ? -1 : limit);
+        if (!fSpeedLimit)
+        {
+            if (sender == fUploadField)
+                tr_setUploadLimit(fHandle, [fUploadCheck state] ? limit : -1);
+            else
+                tr_setDownloadLimit(fHandle, [fDownloadCheck state] ? limit : -1);
+        }
         
         [fDefaults setInteger: limit forKey: key];
@@ -352 +372 @@
     [check setState: NSOnState];
     [self setLimitCheck: check];
+}
+
+- (void) enableSpeedLimit: (BOOL) enable
+{
+    if (fSpeedLimit != enable)
+    {
+        fSpeedLimit = enable;
+        [fDefaults setBool: fSpeedLimit forKey: @"SpeedLimit"];
+        
+        if (fSpeedLimit)
+        {
+            tr_setUploadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
+            tr_setDownloadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+        }
+        else
+        {
+            tr_setUploadLimit(fHandle, [fUploadCheck state] ? [fDefaults integerForKey: @"UploadLimit"] : -1);
+            tr_setDownloadLimit(fHandle, [fDownloadCheck state] ? [fDefaults integerForKey: @"DownloadLimit"] : -1);
+        }
+    }
+}
+
+- (void) setSpeedLimit: (id) sender
+{
+    NSString * key;
+    if (sender == fSpeedLimitUploadField)
+        key = @"SpeedLimitUploadLimit";
+    else
+        key = @"SpeedLimitDownloadLimit";
+
+    int limit = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]]
+            || limit < 0)
+    {
+        NSBeep();
+        limit = [fDefaults integerForKey: key];
+        [sender setIntValue: limit];
+    }
+    else
+    {
+        if (fSpeedLimit)
+        {
+            if (sender == fSpeedLimitUploadField)
+                tr_setUploadLimit(fHandle, limit);
+            else
+                tr_setDownloadLimit(fHandle, limit);
+        }
+        
+        [fDefaults setInteger: limit forKey: key];
+    }
 }