diff --git a/macosx/Controller.m b/macosx/Controller.m
index 983bbc0a2..f94a90089 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -109,8 +109,8 @@ typedef enum
STATUS_TRANSFER_SESSION_TAG = 3
} statusTag;
-int speedLimitsActionMenu[] = { 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, -1 };
-float ratioLimitsActionMenu[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1 };
+int speedLimitGlobalActionValue[] = { 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, -1 };
+float ratioLimitGlobalActionValue[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1 };
#define GROWL_DOWNLOAD_COMPLETE @"Download Complete"
#define GROWL_SEEDING_COMPLETE @"Seeding Complete"
@@ -2089,13 +2089,13 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
NSMenuItem * item;
int i;
- for (i = 0; speedLimitsActionMenu[i] != -1; i++)
+ for (i = 0; speedLimitGlobalActionValue[i] != -1; i++)
{
item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%d KB/s",
- "Action menu -> upload/download limit"), speedLimitsActionMenu[i]] action: @selector(setQuickLimitGlobal:)
+ "Action menu -> upload/download limit"), speedLimitGlobalActionValue[i]] action: @selector(setQuickLimitGlobal:)
keyEquivalent: @""];
[item setTarget: self];
- [item setRepresentedObject: [NSNumber numberWithInt: speedLimitsActionMenu[i]]];
+ [item setRepresentedObject: [NSNumber numberWithInt: speedLimitGlobalActionValue[i]]];
[menu addItem: item];
[item release];
}
@@ -2107,13 +2107,13 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
NSMenuItem * item;
int i;
- for (i = 0; ratioLimitsActionMenu[i] != -1; i++)
+ for (i = 0; ratioLimitGlobalActionValue[i] != -1; i++)
{
item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%.2f",
- "Action menu -> ratio stop"), ratioLimitsActionMenu[i]] action: @selector(setQuickRatioGlobal:)
+ "Action menu -> ratio stop"), ratioLimitGlobalActionValue[i]] action: @selector(setQuickRatioGlobal:)
keyEquivalent: @""];
[item setTarget: self];
- [item setRepresentedObject: [NSNumber numberWithFloat: ratioLimitsActionMenu[i]]];
+ [item setRepresentedObject: [NSNumber numberWithFloat: ratioLimitGlobalActionValue[i]]];
[menu addItem: item];
[item release];
}
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 644fd7e98..9b2777295 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -9,7 +9,7 @@
@@ -718,8 +718,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -895,8 +895,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -974,8 +974,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -1203,8 +1203,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -1233,8 +1233,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
_NSWindowsMenu
@@ -1384,8 +1384,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -1457,8 +1457,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
1
@@ -1587,8 +1587,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -1642,8 +1642,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -1687,8 +1687,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
-
@@ -2202,8 +1904,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
_popUpItemAction:
@@ -2213,8 +1915,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
_popUpItemAction:
@@ -2263,8 +1965,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -2552,8 +2254,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
_popUpItemAction:
@@ -2627,7 +2329,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -2698,6 +2400,304 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
{400, 199}
{3.40282e+38, 3.40282e+38}
+
@@ -2891,8 +2765,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3076,8 +2824,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -3207,8 +2892,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -3224,8 +2909,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
401
@@ -3251,9 +2936,9 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
-
+
+
+
-1
@@ -3307,8 +2992,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
-999
@@ -4323,182 +4008,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1970
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -6806,76 +6197,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -6926,81 +6233,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8783,21 +7848,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
-
-
-
-
-
+
+
+
+
+
@@ -9254,7 +8319,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -9280,7 +8345,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -9306,7 +8371,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -9384,7 +8449,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -9410,7 +8475,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -9502,1316 +8567,1189 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
3
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index d4dd09d13..9af920a97 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -40,6 +40,9 @@
#define ACTION_MENU_UNLIMITED_TAG 102
#define ACTION_MENU_LIMIT_TAG 103
+int speedLimitActionValue[] = { 0, 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, -1 };
+float ratioLimitActionValue[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1.0 };
+
@interface TorrentTableView (Private)
- (NSRect) pauseRectForRow: (int) row;
@@ -371,13 +374,29 @@
if (menu == fUploadMenu || menu == fDownloadMenu)
{
+ NSMenuItem * item;
+ if ([menu numberOfItems] == 4)
+ {
+ int i;
+ for (i = 0; speedLimitActionValue[i] != -1; i++)
+ {
+ item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%d KB/s",
+ "Action menu -> upload/download limit"), speedLimitActionValue[i]] action: @selector(setQuickLimit:)
+ keyEquivalent: @""];
+ [item setTarget: self];
+ [item setRepresentedObject: [NSNumber numberWithInt: speedLimitActionValue[i]]];
+ [menu addItem: item];
+ [item release];
+ }
+ }
+
BOOL upload = menu == fUploadMenu;
int mode = [fMenuTorrent speedMode: upload];
- NSMenuItem * item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
+ item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
[item setState: mode == TR_SPEEDLIMIT_SINGLE ? NSOnState : NSOffState];
[item setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
- "torrent action context menu -> upload/download limit"), [fMenuTorrent speedLimit: upload]]];
+ "torrent action menu -> upload/download limit"), [fMenuTorrent speedLimit: upload]]];
item = [menu itemWithTag: ACTION_MENU_UNLIMITED_TAG];
[item setState: mode == TR_SPEEDLIMIT_UNLIMITED ? NSOnState : NSOffState];
@@ -387,12 +406,28 @@
}
else if (menu == fRatioMenu)
{
+ NSMenuItem * item;
+ if ([menu numberOfItems] == 4)
+ {
+ int i;
+ for (i = 0; ratioLimitActionValue[i] != -1.0; i++)
+ {
+ item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%.2f",
+ "Action menu -> ratio stop"), ratioLimitActionValue[i]] action: @selector(setQuickRatio:)
+ keyEquivalent: @""];
+ [item setTarget: self];
+ [item setRepresentedObject: [NSNumber numberWithFloat: ratioLimitActionValue[i]]];
+ [menu addItem: item];
+ [item release];
+ }
+ }
+
int mode = [fMenuTorrent ratioSetting];
- NSMenuItem * item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
+ item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
[item setState: mode == NSOnState ? NSOnState : NSOffState];
- [item setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
- "torrent action context menu -> ratio stop"), [fMenuTorrent ratioLimit]]];
+ [item setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)", "torrent action menu -> ratio stop"),
+ [fMenuTorrent ratioLimit]]];
item = [menu itemWithTag: ACTION_MENU_UNLIMITED_TAG];
[item setState: mode == NSOffState ? NSOnState : NSOffState];
@@ -436,7 +471,7 @@
{
BOOL upload = [sender menu] == fUploadMenu;
[fMenuTorrent setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: upload];
- [fMenuTorrent setSpeedLimit: [[sender title] intValue] upload: upload];
+ [fMenuTorrent setSpeedLimit: [[sender representedObject] intValue] upload: upload];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
}
@@ -467,7 +502,7 @@
- (void) setQuickRatio: (id) sender
{
[fMenuTorrent setRatioSetting: NSOnState];
- [fMenuTorrent setRatioLimit: [[sender title] floatValue]];
+ [fMenuTorrent setRatioLimit: [[sender representedObject] floatValue]];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
}