diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index d1516edf9..a8d7df4ba 100644
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -18,8 +18,6 @@
9090
CheckDownload
- CheckDownloadTorrent
-
CheckQuit
CheckQuitDownloading
@@ -30,8 +28,6 @@
CheckUpload
- CheckUploadTorrent
-
DeleteOriginalTorrent
DownloadChoice
@@ -40,8 +36,6 @@
~/Desktop
DownloadLimit
100
- DownloadLimitTorrent
- 50
DownloadSound
Glass
Filter
@@ -108,8 +102,6 @@
Daily
UploadLimit
20
- UploadLimitTorrent
- 20
UseAdvancedBar
UseIncompleteDownloadFolder
diff --git a/macosx/English.lproj/PrefsWindow.nib/classes.nib b/macosx/English.lproj/PrefsWindow.nib/classes.nib
index 08d9a3602..40dbbb619 100644
--- a/macosx/English.lproj/PrefsWindow.nib/classes.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/classes.nib
@@ -6,7 +6,6 @@
{
ACTIONS = {
applySpeedSettings = id;
- applyTorrentLimitSetting = id;
folderSheetShow = id;
helpForNetwork = id;
importFolderSheetShow = id;
@@ -23,17 +22,14 @@
setRatioStop = id;
setSound = id;
setSpeedLimit = id;
- setTorrentLimit = id;
setUpdate = id;
};
CLASS = PrefsController;
LANGUAGE = ObjC;
OUTLETS = {
fBandwidthView = NSView;
- fDownloadCheck = NSButton;
fDownloadField = NSTextField;
fDownloadSoundPopUp = NSPopUpButton;
- fDownloadTorrentField = NSTextField;
fFolderPopUp = NSPopUpButton;
fGeneralView = NSView;
fImportFolderPopUp = NSPopUpButton;
@@ -53,9 +49,7 @@
fSpeedLimitUploadField = NSTextField;
fTransfersView = NSView;
fUpdatePopUp = NSPopUpButton;
- fUploadCheck = NSButton;
fUploadField = NSTextField;
- fUploadTorrentField = NSTextField;
};
SUPERCLASS = NSWindowController;
},
diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib
index 81b8d5776..d3690e31a 100644
--- a/macosx/English.lproj/PrefsWindow.nib/info.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/info.nib
@@ -7,13 +7,13 @@
IBEditorPositions
153
- 191 408 571 335 0 0 1152 842
+ 57 332 563 268 0 0 1152 842
28
- 290 434 571 290 0 0 1152 842
+ 156 256 571 290 0 0 1152 842
41
- 151 440 571 305 0 0 1152 842
+ 89 307 563 305 0 0 1152 842
66
- 290 507 571 144 0 0 1152 842
+ 294 507 563 144 0 0 1152 842
IBFramework Version
446.1
@@ -23,7 +23,7 @@
IBOpenObjects
- 41
+ 66
IBSystem Version
8L127
diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib
index 5c5d71c41..199d8b516 100644
Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 834b4f5d2..80baa06ac 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -47,9 +47,7 @@
IBOutlet NSPopUpButton * fUpdatePopUp;
IBOutlet NSTextField * fUploadField, * fDownloadField,
- * fUploadTorrentField, * fDownloadTorrentField,
* fSpeedLimitUploadField, * fSpeedLimitDownloadField;
- IBOutlet NSButton * fUploadCheck, * fDownloadCheck;
IBOutlet NSTextField * fPortField, * fNatStatusField, * fPortStatusField;
IBOutlet NSButton * fNatCheck;
@@ -86,9 +84,6 @@
- (void) updateLimitFields;
- (void) setGlobalLimit: (id) sender;
-- (void) applyTorrentLimitSetting: (id) sender;
-- (void) setTorrentLimit: (id) sender;
-
- (void) setSpeedLimit: (id) sender;
- (void) setAutoSpeedLimit: (id) sender;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index dd9ff2e9b..c6c217859 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -141,10 +141,6 @@
//set limits
[self updateLimitFields];
- //set torrent limits
- [fUploadTorrentField setIntValue: [fDefaults integerForKey: @"UploadLimitTorrent"]];
- [fDownloadTorrentField setIntValue: [fDefaults integerForKey: @"DownloadLimitTorrent"]];
-
//set speed limit
[fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]];
[fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
@@ -392,28 +388,6 @@
[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
{
BOOL upload = sender == fSpeedLimitUploadField;
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 4dc240e98..a1c7f5065 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -101,7 +101,7 @@
- (BOOL) customLimitSetting;
- (void) setCustomLimitSetting: (BOOL) setting;
-- (void) updateSpeedSetting: (NSNotification *) notification;
+- (void) updateSpeedSetting;
- (void) setWaitToStart: (BOOL) wait;
- (BOOL) waitingToStart;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 179298277..9a05a8a94 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -25,6 +25,9 @@
#import "Torrent.h"
#import "StringAdditions.h"
+#define DOWNLOAD_LIMIT_DEFAULT 50
+#define UPLOAD_LIMIT_DEFAULT 20
+
#define BAR_HEIGHT 12.0
#define MAX_PIECES 324
@@ -172,8 +175,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
{
tr_torrentClose(fLib, fHandle);
- [[NSNotificationCenter defaultCenter] removeObserver: self];
-
if (fDownloadFolder)
[fDownloadFolder release];
if (fIncompleteFolder)
@@ -545,7 +546,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setLimitUpload: (BOOL) limit
{
fCheckUpload = limit;
- [self updateSpeedSetting: nil];
+ [self updateSpeedSetting];
}
- (int) uploadLimit
@@ -556,7 +557,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setUploadLimit: (int) limit
{
fUploadLimit = limit;
- [self updateSpeedSetting: nil];
+ [self updateSpeedSetting];
}
- (BOOL) checkDownload
@@ -567,7 +568,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setLimitDownload: (BOOL) limit
{
fCheckDownload = limit;
- [self updateSpeedSetting: nil];
+ [self updateSpeedSetting];
}
- (int) downloadLimit
@@ -578,7 +579,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setDownloadLimit: (int) limit
{
fDownloadLimit = limit;
- [self updateSpeedSetting: nil];
+ [self updateSpeedSetting];
}
- (BOOL) customLimitSetting
@@ -589,10 +590,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (void) setCustomLimitSetting: (BOOL) setting
{
fLimitCustom = setting;
- [self updateSpeedSetting: nil];
+ [self updateSpeedSetting];
}
-- (void) updateSpeedSetting: (NSNotification *) notification
+- (void) updateSpeedSetting
{
if (fLimitCustom)
{
@@ -601,10 +602,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
}
else
{
- tr_setUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUploadTorrent"]
- ? [fDefaults integerForKey: @"UploadLimitTorrent"] : -1);
- tr_setDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownloadTorrent"]
- ? [fDefaults integerForKey: @"DownloadLimitTorrent"] : -1);
+ tr_setUploadLimit(fHandle, -1);
+ tr_setDownloadLimit(fHandle, -1);
}
}
@@ -1184,11 +1183,11 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fFinishedSeeding = NO;
fLimitCustom = limitCustom ? [limitCustom boolValue] : NO;
- fCheckUpload = checkUpload ? [checkUpload boolValue] : [fDefaults boolForKey: @"CheckUploadTorrent"];
- fUploadLimit = uploadLimit ? [uploadLimit intValue] : [fDefaults integerForKey: @"UploadLimitTorrent"];
- fCheckDownload = checkDownload ? [checkDownload boolValue] : [fDefaults boolForKey: @"CheckDownloadTorrent"];
- fDownloadLimit = downloadLimit ? [downloadLimit intValue] : [fDefaults integerForKey: @"DownloadLimitTorrent"];
- [self updateSpeedSetting: nil];
+ fCheckUpload = checkUpload ? [checkUpload boolValue] : NO;
+ fUploadLimit = uploadLimit ? [uploadLimit intValue] : UPLOAD_LIMIT_DEFAULT;
+ fCheckDownload = checkDownload ? [checkDownload boolValue] : NO;
+ fDownloadLimit = downloadLimit ? [downloadLimit intValue] : DOWNLOAD_LIMIT_DEFAULT;
+ [self updateSpeedSetting];
fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];
fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;