diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index 6daf59d96..2c82e661e 100644
--- 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 4fc5b3b89..83a760822 100644
--- 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 d812d6dd0..80b7b8337 100644
--- 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 efc35348a..8ea6c14a7 100644
--- 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 049d314e7..01497976c 100644
--- 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 063fdb10e..d72833d01 100644
--- 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 7ea45f41e..9d30cec04 100644
--- a/macosx/en.lproj/InfoWindow.xib
+++ b/macosx/en.lproj/InfoWindow.xib
@@ -8,8 +8,7 @@
353.00
{{1, 0}, {338, 17}}
-
4
@@ -3914,7 +3911,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{{10, 77}, {340, 190}}
-
562
@@ -4032,7 +4028,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{{1, 17}, {338, 48}}
-
4
@@ -4066,7 +4061,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{{1, 0}, {338, 17}}
-
4
@@ -4075,7 +4069,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{{10, 271}, {340, 66}}
-
562
@@ -4301,12 +4294,11 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{360, 342}
-
NSView
NSResponder
{{10, 34}, {320, 326}}
-
18
@@ -4560,14 +4549,13 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
{340, 365}
-
NSResponder
-
-