mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

let's make things simpler: no need for default individual torrent bandwidth limits...global limits and inspector options are enough

This commit is contained in:
Mitchell Livingston 2007-01-08 15:11:15 +00:00
parent e5b24d929e
commit c6b6e93265
8 changed files with 22 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macosx/Defaults.plist
View File

@ -18,8 +18,6 @@
<integer>9090</integer> <integer>9090</integer>
<key>CheckDownload</key> <key>CheckDownload</key>
<false/> <false/>
<key>CheckDownloadTorrent</key>
<false/>
<key>CheckQuit</key> <key>CheckQuit</key>
<true/> <true/>
<key>CheckQuitDownloading</key> <key>CheckQuitDownloading</key>
@ -30,8 +28,6 @@
<false/> <false/>
<key>CheckUpload</key> <key>CheckUpload</key>
<true/> <true/>
<key>CheckUploadTorrent</key>
<false/>
<key>DeleteOriginalTorrent</key> <key>DeleteOriginalTorrent</key>
<false/> <false/>
<key>DownloadChoice</key> <key>DownloadChoice</key>
@ -40,8 +36,6 @@
<string>~/Desktop</string> <string>~/Desktop</string>
<key>DownloadLimit</key> <key>DownloadLimit</key>
<integer>100</integer> <integer>100</integer>
<key>DownloadLimitTorrent</key>
<integer>50</integer>
<key>DownloadSound</key> <key>DownloadSound</key>
<string>Glass</string> <string>Glass</string>
<key>Filter</key> <key>Filter</key>
@ -108,8 +102,6 @@
<string>Daily</string> <string>Daily</string>
<key>UploadLimit</key> <key>UploadLimit</key>
<integer>20</integer> <integer>20</integer>
<key>UploadLimitTorrent</key>
<integer>20</integer>
<key>UseAdvancedBar</key> <key>UseAdvancedBar</key>
<false/> <false/>
<key>UseIncompleteDownloadFolder</key> <key>UseIncompleteDownloadFolder</key>

6
macosx/English.lproj/PrefsWindow.nib/classes.nib generated
View File

@ -6,7 +6,6 @@
{ {
ACTIONS = { ACTIONS = {
applySpeedSettings = id; applySpeedSettings = id;
applyTorrentLimitSetting = id;
folderSheetShow = id; folderSheetShow = id;
helpForNetwork = id; helpForNetwork = id;
importFolderSheetShow = id; importFolderSheetShow = id;
@ -23,17 +22,14 @@
setRatioStop = id; setRatioStop = id;
setSound = id; setSound = id;
setSpeedLimit = id; setSpeedLimit = id;
setTorrentLimit = id;
setUpdate = id; setUpdate = id;
}; };
CLASS = PrefsController; CLASS = PrefsController;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { OUTLETS = {
fBandwidthView = NSView; fBandwidthView = NSView;
fDownloadCheck = NSButton;
fDownloadField = NSTextField; fDownloadField = NSTextField;
fDownloadSoundPopUp = NSPopUpButton; fDownloadSoundPopUp = NSPopUpButton;
fDownloadTorrentField = NSTextField;
fFolderPopUp = NSPopUpButton; fFolderPopUp = NSPopUpButton;
fGeneralView = NSView; fGeneralView = NSView;
fImportFolderPopUp = NSPopUpButton; fImportFolderPopUp = NSPopUpButton;
@ -53,9 +49,7 @@
fSpeedLimitUploadField = NSTextField; fSpeedLimitUploadField = NSTextField;
fTransfersView = NSView; fTransfersView = NSView;
fUpdatePopUp = NSPopUpButton; fUpdatePopUp = NSPopUpButton;
fUploadCheck = NSButton;
fUploadField = NSTextField; fUploadField = NSTextField;
fUploadTorrentField = NSTextField;
}; };
SUPERCLASS = NSWindowController; SUPERCLASS = NSWindowController;
}, },

10
macosx/English.lproj/PrefsWindow.nib/info.nib generated
View File

@ -7,13 +7,13 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>153</key> <key>153</key>
<string>191 408 571 335 0 0 1152 842 </string> <string>57 332 563 268 0 0 1152 842 </string>
<key>28</key> <key>28</key>
<string>290 434 571 290 0 0 1152 842 </string> <string>156 256 571 290 0 0 1152 842 </string>
<key>41</key> <key>41</key>
<string>151 440 571 305 0 0 1152 842 </string> <string>89 307 563 305 0 0 1152 842 </string>
<key>66</key> <key>66</key>
<string>290 507 571 144 0 0 1152 842 </string> <string>294 507 563 144 0 0 1152 842 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>446.1</string> <string>446.1</string>
@ -23,7 +23,7 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>41</integer> <integer>66</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>8L127</string> <string>8L127</string>

BIN
macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib generated
View File

Binary file not shown.

5
macosx/PrefsController.h
View File

@ -47,9 +47,7 @@
IBOutlet NSPopUpButton * fUpdatePopUp; IBOutlet NSPopUpButton * fUpdatePopUp;
IBOutlet NSTextField * fUploadField, * fDownloadField, IBOutlet NSTextField * fUploadField, * fDownloadField,
* fUploadTorrentField, * fDownloadTorrentField,
* fSpeedLimitUploadField, * fSpeedLimitDownloadField; * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
IBOutlet NSButton * fUploadCheck, * fDownloadCheck;
IBOutlet NSTextField * fPortField, * fNatStatusField, * fPortStatusField; IBOutlet NSTextField * fPortField, * fNatStatusField, * fPortStatusField;
IBOutlet NSButton * fNatCheck; IBOutlet NSButton * fNatCheck;
@ -86,9 +84,6 @@
- (void) updateLimitFields; - (void) updateLimitFields;
- (void) setGlobalLimit: (id) sender; - (void) setGlobalLimit: (id) sender;
- (void) applyTorrentLimitSetting: (id) sender;
- (void) setTorrentLimit: (id) sender;
- (void) setSpeedLimit: (id) sender; - (void) setSpeedLimit: (id) sender;
- (void) setAutoSpeedLimit: (id) sender; - (void) setAutoSpeedLimit: (id) sender;

26
macosx/PrefsController.m
View File

@ -141,10 +141,6 @@
//set limits //set limits
[self updateLimitFields]; [self updateLimitFields];
//set torrent limits
[fUploadTorrentField setIntValue: [fDefaults integerForKey: @"UploadLimitTorrent"]];
[fDownloadTorrentField setIntValue: [fDefaults integerForKey: @"DownloadLimitTorrent"]];
//set speed limit //set speed limit
[fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]]; [fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]];
[fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]]; [fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
@ -392,28 +388,6 @@
[self applySpeedSettings: self]; [self applySpeedSettings: self];
} }
- (void) applyTorrentLimitSetting: (id) sender
{
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateSpeedSetting" object: self];
}
- (void) setTorrentLimit: (id) sender
{
BOOL upload = sender == fUploadTorrentField;
int limit = [sender intValue];
if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]] || limit < 0)
{
NSBeep();
[sender setIntValue: [fDefaults integerForKey: upload ? @"UploadLimitTorrent" : @"DownloadLimitTorrent"]];
return;
}
[fDefaults setInteger: limit forKey: upload ? @"UploadLimitTorrent" : @"DownloadLimitTorrent"];
[self applyTorrentLimitSetting: self];
}
- (void) setSpeedLimit: (id) sender - (void) setSpeedLimit: (id) sender
{ {
BOOL upload = sender == fSpeedLimitUploadField; BOOL upload = sender == fSpeedLimitUploadField;

2
macosx/Torrent.h
View File

@ -101,7 +101,7 @@
- (BOOL) customLimitSetting; - (BOOL) customLimitSetting;
- (void) setCustomLimitSetting: (BOOL) setting; - (void) setCustomLimitSetting: (BOOL) setting;
- (void) updateSpeedSetting: (NSNotification *) notification; - (void) updateSpeedSetting;
- (void) setWaitToStart: (BOOL) wait; - (void) setWaitToStart: (BOOL) wait;
- (BOOL) waitingToStart; - (BOOL) waitingToStart;

33
macosx/Torrent.m
View File

@ -25,6 +25,9 @@
#import "Torrent.h" #import "Torrent.h"
#import "StringAdditions.h" #import "StringAdditions.h"
#define DOWNLOAD_LIMIT_DEFAULT 50
#define UPLOAD_LIMIT_DEFAULT 20
#define BAR_HEIGHT 12.0 #define BAR_HEIGHT 12.0
#define MAX_PIECES 324 #define MAX_PIECES 324
@ -172,8 +175,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
{ {
tr_torrentClose(fLib, fHandle); tr_torrentClose(fLib, fHandle);
[[NSNotificationCenter defaultCenter] removeObserver: self];
if (fDownloadFolder) if (fDownloadFolder)
[fDownloadFolder release]; [fDownloadFolder release];
if (fIncompleteFolder) if (fIncompleteFolder)
@ -545,7 +546,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setLimitUpload: (BOOL) limit - (void) setLimitUpload: (BOOL) limit
{ {
fCheckUpload = limit; fCheckUpload = limit;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
} }
- (int) uploadLimit - (int) uploadLimit
@ -556,7 +557,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setUploadLimit: (int) limit - (void) setUploadLimit: (int) limit
{ {
fUploadLimit = limit; fUploadLimit = limit;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
} }
- (BOOL) checkDownload - (BOOL) checkDownload
@ -567,7 +568,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setLimitDownload: (BOOL) limit - (void) setLimitDownload: (BOOL) limit
{ {
fCheckDownload = limit; fCheckDownload = limit;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
} }
- (int) downloadLimit - (int) downloadLimit
@ -578,7 +579,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setDownloadLimit: (int) limit - (void) setDownloadLimit: (int) limit
{ {
fDownloadLimit = limit; fDownloadLimit = limit;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
} }
- (BOOL) customLimitSetting - (BOOL) customLimitSetting
@ -589,10 +590,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setCustomLimitSetting: (BOOL) setting - (void) setCustomLimitSetting: (BOOL) setting
{ {
fLimitCustom = setting; fLimitCustom = setting;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
} }
- (void) updateSpeedSetting: (NSNotification *) notification - (void) updateSpeedSetting
{ {
if (fLimitCustom) if (fLimitCustom)
{ {
@ -601,10 +602,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
} }
else else
{ {
tr_setUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUploadTorrent"] tr_setUploadLimit(fHandle, -1);
? [fDefaults integerForKey: @"UploadLimitTorrent"] : -1); tr_setDownloadLimit(fHandle, -1);
tr_setDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownloadTorrent"]
? [fDefaults integerForKey: @"DownloadLimitTorrent"] : -1);
} }
} }
@ -1184,11 +1183,11 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fFinishedSeeding = NO; fFinishedSeeding = NO;
fLimitCustom = limitCustom ? [limitCustom boolValue] : NO; fLimitCustom = limitCustom ? [limitCustom boolValue] : NO;
fCheckUpload = checkUpload ? [checkUpload boolValue] : [fDefaults boolForKey: @"CheckUploadTorrent"]; fCheckUpload = checkUpload ? [checkUpload boolValue] : NO;
fUploadLimit = uploadLimit ? [uploadLimit intValue] : [fDefaults integerForKey: @"UploadLimitTorrent"]; fUploadLimit = uploadLimit ? [uploadLimit intValue] : UPLOAD_LIMIT_DEFAULT;
fCheckDownload = checkDownload ? [checkDownload boolValue] : [fDefaults boolForKey: @"CheckDownloadTorrent"]; fCheckDownload = checkDownload ? [checkDownload boolValue] : NO;
fDownloadLimit = downloadLimit ? [downloadLimit intValue] : [fDefaults integerForKey: @"DownloadLimitTorrent"]; fDownloadLimit = downloadLimit ? [downloadLimit intValue] : DOWNLOAD_LIMIT_DEFAULT;
[self updateSpeedSetting: nil]; [self updateSpeedSetting];
fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"]; fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];
fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1; fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;